Repository: musescore/MuseScore (2026-04-20T06:48:58Z)

Issue:
Fix Em7 and Dm7 fretboard diagrams
The fretboard diagrams for Em7 and Dm7 need to be updated as follows:

<img width="788" height="293" alt="Image" src="https://github.com/user-attachments/assets/263f0dcc-5fb0-4989-b734-489444bb12d5" />

<img width="744" height="222" alt="Image" src="https://github.com/user-attachments/assets/05d015e6-4374-4ea3-970b-80a9edbd9805" />


Discussion:
@Eism Remind me, is it possible to update individual fretboard diagram definitions without manually updating them in the .mscz database file and replacing it?



Patch:
diff --git a/src/engraving/data/harmony_to_diagram.xml b/src/engraving/data/harmony_to_diagram.xml
index 16a23f58593e6..60b9d0bc7187d 100644
--- a/src/engraving/data/harmony_to_diagram.xml
+++ b/src/engraving/data/harmony_to_diagram.xml
@@ -28,458 +28,6 @@
             <name>a</name>
         </Harmony>
     </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <barre start="0" end="-1">1</barre>
-            </fretDiagram>
-            <barre>1</barre>
-        </FretDiagram>
-        <pattern>-[6-O][6-O][5-O]--;B4[0-5]</pattern>
-        <Harmony>
-            <name>ab</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="3">normal</dot>
-                </string>
-                <barre start="1" end="-1">1</barre>
-            </fretDiagram>
-            <barre>1</barre>
-        </FretDiagram>
-        <pattern>X-[3-O][3-O][3-O]-;B1[1-5]</pattern>
-        <Harmony>
-            <name>a#</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="4">normal</dot>
-                </string>
-                <barre start="1" end="-1">2</barre>
-            </fretDiagram>
-            <barre>1</barre>
-        </FretDiagram>
-        <pattern>X-[4-O][4-O][4-O]-;B2[1-5]</pattern>
-        <Harmony>
-            <name>b</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="3">normal</dot>
-                </string>
-                <barre start="1" end="-1">1</barre>
-            </fretDiagram>
-            <barre>1</barre>
-        </FretDiagram>
-        <pattern>X-[3-O][3-O][3-O]-;B1[1-5]</pattern>
-        <Harmony>
-            <name>bb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="3">
-                    <marker>circle</marker>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>circle</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[3-O][2-O]O[1-O]O</pattern>
-        <Harmony>
-            <name>c</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="4">normal</dot>
-                </string>
-                <barre start="1" end="-1">2</barre>
-            </fretDiagram>
-            <barre>1</barre>
-        </FretDiagram>
-        <pattern>X-[4-O][4-O][4-O]-;B2[1-5]</pattern>
-        <Harmony>
-            <name>cb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-                <barre start="2" end="4">3</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[4-O]---X;B6[2-4]</pattern>
-        <Harmony>
-            <name>c#</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <marker>circle</marker>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="5">
-                    <dot fret="2">normal</dot>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XXO[2-O][3-O][2-O]</pattern>
-        <Harmony>
-            <name>d</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-                <barre start="2" end="4">3</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[4-O]---X;B6[2-4]</pattern>
-        <Harmony>
-            <name>db</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>5</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-                <barre start="2" end="4">3</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[6-O]---X;B8[2-4]</pattern>
-        <Harmony>
-            <name>d#</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>circle</marker>
-                </string>
-                <string no="1">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="4">
-                    <marker>circle</marker>
-                </string>
-                <string no="5">
-                    <marker>circle</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>O[2-O][2-O][1-O]OO</pattern>
-        <Harmony>
-            <name>e</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>5</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-                <barre start="2" end="4">3</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[6-O]---X;B8[2-4]</pattern>
-        <Harmony>
-            <name>eb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="2">
-                    <marker>cross</marker>
-                </string>
-                <string no="3">
-                    <marker>cross</marker>
-                </string>
-                <string no="4">
-                    <marker>cross</marker>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[4-O]XXXX</pattern>
-        <Harmony>
-            <name>n.c./c#</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <barre start="0" end="5">1</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>-[3-O][3-O][2-O]--;B1[0-5]</pattern>
-        <Harmony>
-            <name>f</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>circle</marker>
-                </string>
-                <string no="1">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="4">
-                    <marker>circle</marker>
-                </string>
-                <string no="5">
-                    <marker>circle</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>O[2-O][2-O][1-O]OO</pattern>
-        <Harmony>
-            <name>fb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <barre start="0" end="5">2</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>-[4-O][4-O][3-O]--;B2[0-5]</pattern>
-        <Harmony>
-            <name>f#</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="1">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="2">
-                    <marker>circle</marker>
-                </string>
-                <string no="3">
-                    <marker>circle</marker>
-                </string>
-                <string no="4">
-                    <marker>circle</marker>
-                </string>
-                <string no="5">
-                    <dot fret="3">normal</dot>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>[3-O][2-O]OOO[3-O]</pattern>
-        <Harmony>
-            <name>g</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <barre start="0" end="5">2</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>-[4-O][4-O][3-O]--;B2[0-5]</pattern>
-        <Harmony>
-            <name>gb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <barre start="0" end="5">1</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>-[6-O][6-O][5-O]--;B4[0-5]</pattern>
-        <Harmony>
-            <name>g#</name>
-        </Harmony>
-    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -3646,184 +3194,205 @@
                     <dot fret="1">normal</dot>
                 </string>
                 <string no="5">
-                    <dot fret="2">normal</dot>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XX[1-O][2-O][1-O][2-O]</pattern>
-        <Harmony>
-            <name>adim7/eb</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="0">
+                    <dot fret="2">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>XX[1-O][2-O][1-O][2-O]</pattern>
+        <Harmony>
+            <name>adim7/eb</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <dot fret="2">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>XX[5-O][5-O][4-O][5-O]</pattern>
+        <Harmony>
+            <name>adim7/g</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <dot fret="2">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>XX[5-O][5-O][4-O][5-O]</pattern>
+        <Harmony>
+            <name>adim/g</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[3-O][1-O][2-O][1-O]X</pattern>
+        <Harmony>
+            <name>adim/c</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="2">
+                    <marker>cross</marker>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <dot fret="2">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[5-O]X[5-O][4-O][5-O]</pattern>
+        <Harmony>
+            <name>adim/d</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>circle</marker>
+                </string>
+                <string no="1">
+                    <marker>circle</marker>
+                </string>
+                <string no="2">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>OO[1-O][2-O][1-O]X</pattern>
+        <Harmony>
+            <name>adim/e</name>
+        </Harmony>
+    </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
                     <marker>cross</marker>
                 </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <dot fret="2">normal</dot>
-                </string>
             </fretDiagram>
         </FretDiagram>
-        <pattern>XX[5-O][5-O][4-O][5-O]</pattern>
+        <pattern>XX[1-O][2-O][1-O]X</pattern>
         <Harmony>
-            <name>adim7/g</name>
+            <name>adim/eb</name>
         </Harmony>
     </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>3</fretOffset>
             <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <dot fret="2">normal</dot>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XX[5-O][5-O][4-O][5-O]</pattern>
-        <Harmony>
-            <name>adim/g</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
                 <string no="1">
                     <dot fret="3">normal</dot>
                 </string>
                 <string no="2">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[3-O][1-O][2-O][1-O]X</pattern>
-        <Harmony>
-            <name>adim/c</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretOffset>3</fretOffset>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="2">
-                    <marker>cross</marker>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <dot fret="2">normal</dot>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>X[5-O]X[5-O][4-O][5-O]</pattern>
-        <Harmony>
-            <name>adim/d</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>circle</marker>
-                </string>
-                <string no="1">
-                    <marker>circle</marker>
-                </string>
-                <string no="2">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>OO[1-O][2-O][1-O]X</pattern>
-        <Harmony>
-            <name>adim/e</name>
-        </Harmony>
-    </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="1">normal</dot>
+                    <dot fret="3">normal</dot>
                 </string>
                 <string no="3">
                     <dot fret="2">normal</dot>
                 </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
+                <barre start="0" end="5">1</barre>
             </fretDiagram>
         </FretDiagram>
-        <pattern>XX[1-O][2-O][1-O]X</pattern>
+        <pattern>-[6-O][6-O][5-O]--;B4[0-5]</pattern>
         <Harmony>
-            <name>adim/eb</name>
+            <name>ab</name>
         </Harmony>
     </HarmonyToDiagram>
     <HarmonyToDiagram>
@@ -9571,7 +9140,6 @@
                 </string>
                 <barre start="4" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XO[2-O][2-O]--;B1[4-5]</pattern>
         <Harmony>
@@ -11124,6 +10692,29 @@
             <name>a+/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="3">normal</dot>
+                </string>
+                <barre start="1" end="5">1</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X-[3-O][3-O][3-O]-;B1[1-5]</pattern>
+        <Harmony>
+            <name>a#</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>1</fretOffset>
@@ -12392,6 +11983,29 @@
             <name>asus/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="4">normal</dot>
+                </string>
+                <barre start="1" end="5">2</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X-[4-O][4-O][4-O]-;B2[1-5]</pattern>
+        <Harmony>
+            <name>b</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -14827,6 +14441,29 @@
             <name>bdim/f</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="3">normal</dot>
+                </string>
+                <barre start="1" end="5">1</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X-[3-O][3-O][3-O]-;B1[1-5]</pattern>
+        <Harmony>
+            <name>bb</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -15918,24 +15555,23 @@
     </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
-            <fretOffset>5</fretOffset>
             <fretDiagram>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
+                <string no="0">
                     <marker>cross</marker>
                 </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
                 <string no="4">
                     <marker>cross</marker>
                 </string>
                 <string no="5">
                     <marker>cross</marker>
                 </string>
-                <barre start="0" end="2">1</barre>
+                <barre start="1" end="3">1</barre>
             </fretDiagram>
         </FretDiagram>
-        <pattern>-[8-O]-XXX;B6[0-2]</pattern>
+        <pattern>X-[3-O]-XX;B1[1-3]</pattern>
         <Harmony>
             <name>bb7(no3)</name>
         </Harmony>
@@ -17663,28 +17299,18 @@
     </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
+            <fretOffset>5</fretOffset>
             <fretDiagram>
                 <string no="0">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="1">
                     <marker>cross</marker>
                 </string>
-                <string no="2">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="2">normal</dot>
-                </string>
-                <string no="5">
+                <string no="1">
                     <marker>cross</marker>
                 </string>
+                <barre start="2" end="-1">1</barre>
             </fretDiagram>
         </FretDiagram>
-        <pattern>[4-O]X[3-O][3-O][2-O]X</pattern>
+        <pattern>XX----;B6[2-5]</pattern>
         <Harmony>
             <name>bbm/ab</name>
         </Harmony>
@@ -21189,29 +20815,6 @@
             <name>bm(add2)</name>
         </Harmony>
     </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>circle</marker>
-                </string>
-                <string no="2">
-                    <dot fret="4">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="4">normal</dot>
-                </string>
-                <barre start="4" end="5">2</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XO[4-O][4-O]--;B2[4-5]</pattern>
-        <Harmony>
-            <name>bm(add2)/a</name>
-        </Harmony>
-    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -21260,6 +20863,34 @@
             <name>bm9/e</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <marker>circle</marker>
+                </string>
+                <string no="2">
+                    <marker>circle</marker>
+                </string>
+                <string no="3">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>XOO[4-O][2-O]X</pattern>
+        <Harmony>
+            <name>bm(add2)/a</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -22871,6 +22502,34 @@
             <name>bsus/e</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="3">
+                    <marker>circle</marker>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>circle</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[3-O][2-O]O[1-O]O</pattern>
+        <Harmony>
+            <name>c</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -23144,34 +22803,6 @@
             <name>cadd2</name>
         </Harmony>
     </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <marker>circle</marker>
-                </string>
-                <string no="3">
-                    <marker>circle</marker>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>circle</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XXOO[1-O]O</pattern>
-        <Harmony>
-            <name>cadd2/d</name>
-        </Harmony>
-    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>2</fretOffset>
@@ -23301,7 +22932,6 @@
                 </string>
                 <barre start="1" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X-[5-O][5-O]--;B3[1-5]</pattern>
         <Harmony>
@@ -24422,6 +24052,34 @@
             <name>c7b9sus4</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <marker>circle</marker>
+                </string>
+                <string no="4">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="5">
+                    <dot fret="1">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[3-O][3-O]O[2-O][1-O]</pattern>
+        <Harmony>
+            <name>c7sus4(addb9)</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -25576,6 +25234,35 @@
             <name>cadd2/bb</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>2</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>circle</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[5-O][5-O][5-O][3-O]O</pattern>
+        <Harmony>
+            <name>cadd2/d</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -26331,6 +26018,29 @@
             <name>cdim/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="4">normal</dot>
+                </string>
+                <barre start="1" end="5">2</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X-[4-O][4-O][4-O]-;B2[1-5]</pattern>
+        <Harmony>
+            <name>cb</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -27025,7 +26735,6 @@
                 </string>
                 <barre start="2" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>[7-O]X-[7-O][7-O]-;B6[2-5]</pattern>
         <Harmony>
@@ -28544,7 +28253,6 @@
                 </string>
                 <barre start="1" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X-[5-O][6-O][4-O]-;B3[1-5]</pattern>
         <Harmony>
@@ -28598,7 +28306,6 @@
                 </string>
                 <barre start="1" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X-[6-O][5-O][4-O]-;B3[1-5]</pattern>
         <Harmony>
@@ -30206,12 +29913,18 @@
                 <string no="0">
                     <marker>cross</marker>
                 </string>
-                <barre start="1" end="5">1</barre>
+                <string no="1">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+                <barre start="2" end="4">3</barre>
             </fretDiagram>
         </FretDiagram>
-        <pattern>X-----;B4[1-5]</pattern>
+        <pattern>X[4-O]---X;B6[2-4]</pattern>
         <Harmony>
-            <name>c#11</name>
+            <name>c#</name>
         </Harmony>
     </HarmonyToDiagram>
     <HarmonyToDiagram>
@@ -33709,6 +33422,34 @@
             <name>csus/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <marker>circle</marker>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="5">
+                    <dot fret="2">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>XXO[2-O][3-O][2-O]</pattern>
+        <Harmony>
+            <name>d</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>4</fretOffset>
@@ -37027,6 +36768,27 @@
             <name>ddim7/eb</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+                <barre start="2" end="4">3</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[4-O]---X;B6[2-4]</pattern>
+        <Harmony>
+            <name>db</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>2</fretOffset>
@@ -40093,7 +39855,6 @@
                 </string>
                 <barre start="1" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X-[7-O][6-O]--;B4[1-5]</pattern>
         <Harmony>
@@ -40533,17 +40294,12 @@
                     <marker>circle</marker>
                 </string>
                 <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="5">
-                    <dot fret="1">normal</dot>
+                    <dot fret="2">normal</dot>
                 </string>
+                <barre start="4" end="-1">1</barre>
             </fretDiagram>
         </FretDiagram>
-        <pattern>XXO[3-O][1-O][1-O]</pattern>
+        <pattern>XXO[2-O]--;B1[4-5]</pattern>
         <Harmony>
             <name>dm7</name>
         </Harmony>
@@ -43061,6 +42817,27 @@
             <name>d+/f#</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>5</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+                <barre start="2" end="4">3</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[6-O]---X;B8[2-4]</pattern>
+        <Harmony>
+            <name>d#</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -44988,6 +44765,34 @@
             <name>dsus/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>circle</marker>
+                </string>
+                <string no="1">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="4">
+                    <marker>circle</marker>
+                </string>
+                <string no="5">
+                    <marker>circle</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>O[2-O][2-O][1-O]OO</pattern>
+        <Harmony>
+            <name>e</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -45002,7 +44807,6 @@
                 </string>
                 <barre start="2" end="-1">2</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>OO--[3-O]-;B2[2-5]</pattern>
         <Harmony>
@@ -48136,6 +47940,27 @@
             <name>edim/bb</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>5</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+                <barre start="2" end="4">3</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[6-O]---X;B8[2-4]</pattern>
+        <Harmony>
+            <name>eb</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>5</fretOffset>
@@ -50344,7 +50169,6 @@
                 </string>
                 <barre start="3" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X[6-O][5-O]-[6-O]-;B3[3-5]</pattern>
         <Harmony>
@@ -50550,7 +50374,6 @@
                 </string>
                 <barre start="3" end="-1">2</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XX[3-O]-[4-O]-;B2[3-5]</pattern>
         <Harmony>
@@ -50661,34 +50484,6 @@
             <name>ebdim/gb</name>
         </Harmony>
     </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="0">
-                    <marker>cross</marker>
-                </string>
-                <string no="1">
-                    <marker>cross</marker>
-                </string>
-                <string no="2">
-                    <dot fret="1">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="4">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="5">
-                    <marker>cross</marker>
-                </string>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>XX[1-O][3-O][3-O]X</pattern>
-        <Harmony>
-            <name>ebm(#7)</name>
-        </Harmony>
-    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>5</fretOffset>
@@ -51978,6 +51773,30 @@
             <name>ebmaj9/bb</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>5</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="4">
+                    <dot fret="2">normal</dot>
+                </string>
+                <barre start="1" end="5">1</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X-[8-O][7-O][7-O]-;B6[1-5]</pattern>
+        <Harmony>
+            <name>ebm(#7)</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -53512,7 +53331,7 @@
                     <marker>circle</marker>
                 </string>
                 <string no="1">
-                    <dot fret="3">normal</dot>
+                    <dot fret="2">normal</dot>
                 </string>
                 <string no="2">
                     <marker>circle</marker>
@@ -53521,14 +53340,14 @@
                     <marker>circle</marker>
                 </string>
                 <string no="4">
-                    <dot fret="1">normal</dot>
+                    <marker>circle</marker>
                 </string>
                 <string no="5">
                     <marker>circle</marker>
                 </string>
             </fretDiagram>
         </FretDiagram>
-        <pattern>O[3-O]OO[1-O]O</pattern>
+        <pattern>O[2-O]OOOO</pattern>
         <Harmony>
             <name>em7</name>
         </Harmony>
@@ -54451,7 +54270,6 @@
                 </string>
                 <barre start="3" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XO[5-O]-[5-O]-;B3[3-5]</pattern>
         <Harmony>
@@ -56467,6 +56285,26 @@
             <name>esus/g#</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <barre start="0" end="5">1</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>-[3-O][3-O][2-O]--;B1[0-5]</pattern>
+        <Harmony>
+            <name>f</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>2</fretOffset>
@@ -58307,23 +58145,6 @@
             <name>f7(#9b9)</name>
         </Harmony>
     </HarmonyToDiagram>
-    <HarmonyToDiagram>
-        <FretDiagram>
-            <fretDiagram>
-                <string no="1">
-                    <dot fret="3">normal</dot>
-                </string>
-                <string no="3">
-                    <dot fret="3">normal</dot>
-                </string>
-                <barre start="0" end="5">1</barre>
-            </fretDiagram>
-        </FretDiagram>
-        <pattern>-[3-O]-[3-O]--;B1[0-5]</pattern>
-        <Harmony>
-            <name>f7sus4</name>
-        </Harmony>
-    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -59052,7 +58873,6 @@
                 </string>
                 <barre start="0" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>-[4-O][3-O][2-O]--;B1[0-5]</pattern>
         <Harmony>
@@ -59494,6 +59314,34 @@
             <name>fdim/d</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <marker>circle</marker>
+                </string>
+                <string no="1">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="4">
+                    <marker>circle</marker>
+                </string>
+                <string no="5">
+                    <marker>circle</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>O[2-O][2-O][1-O]OO</pattern>
+        <Harmony>
+            <name>fb</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -59805,7 +59653,6 @@
                 </string>
                 <barre start="0" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>-[3-O][3-O]---;B1[0-5]</pattern>
         <Harmony>
@@ -60113,7 +59960,6 @@
                 </string>
                 <barre start="4" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XXO[3-O]--;B1[4-5]</pattern>
         <Harmony>
@@ -62121,6 +61967,26 @@
             <name>f+/g</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="1">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="3">normal</dot>
+                </string>
+                <barre start="0" end="5">2</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>-[4-O][4-O][3-O]--;B2[0-5]</pattern>
+        <Harmony>
+            <name>f#</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretOffset>8</fretOffset>
@@ -65970,7 +65836,6 @@
                 </string>
                 <barre start="3" end="-1">3</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XX[4-O]---;B3[3-5]</pattern>
         <Harmony>
@@ -66732,6 +66597,34 @@
             <name>fsus2no2add9/a</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="0">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="1">
+                    <dot fret="2">normal</dot>
+                </string>
+                <string no="2">
+                    <marker>circle</marker>
+                </string>
+                <string no="3">
+                    <marker>circle</marker>
+                </string>
+                <string no="4">
+                    <marker>circle</marker>
+                </string>
+                <string no="5">
+                    <dot fret="3">normal</dot>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>[3-O][2-O]OOO[3-O]</pattern>
+        <Harmony>
+            <name>g</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -67857,7 +67750,6 @@
                 </string>
                 <barre start="4" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>X[2-O][3-O]O--;B1[4-5]</pattern>
         <Harmony>
@@ -70349,6 +70241,26 @@
             <name>gdim/f</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretDiagram>
+                <string no="1">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="4">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="3">normal</dot>
+                </string>
+                <barre start="0" end="5">2</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>-[4-O][4-O][3-O]--;B2[0-5]</pattern>
+        <Harmony>
+            <name>gb</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -70587,7 +70499,6 @@
                 </string>
                 <barre start="1" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>[2-O]---[2-O]-;B1[1-5]</pattern>
         <Harmony>
@@ -70732,7 +70643,6 @@
                 </string>
                 <barre start="0" end="-1">2</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>-[4-O]-[3-O][4-O]-;B2[0-5]</pattern>
         <Harmony>
@@ -73992,7 +73902,6 @@
                 </string>
                 <barre start="1" end="-1">2</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>[3-O]---[3-O]-;B2[1-5]</pattern>
         <Harmony>
@@ -75820,6 +75729,27 @@
             <name>g+/d</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="1">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="2">
+                    <dot fret="3">normal</dot>
+                </string>
+                <string no="3">
+                    <dot fret="2">normal</dot>
+                </string>
+                <barre start="0" end="5">1</barre>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>-[6-O][6-O][5-O]--;B4[0-5]</pattern>
+        <Harmony>
+            <name>g#</name>
+        </Harmony>
+    </HarmonyToDiagram>
     <HarmonyToDiagram>
         <FretDiagram>
             <fretDiagram>
@@ -76172,7 +76102,6 @@
                 </string>
                 <barre start="3" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>XX[5-O]---;B4[3-5]</pattern>
         <Harmony>
@@ -76787,7 +76716,6 @@
                 </string>
                 <barre start="0" end="-1">1</barre>
             </fretDiagram>
-            <barre>1</barre>
         </FretDiagram>
         <pattern>-[6-O]--[6-O]-;B4[0-5]</pattern>
         <Harmony>
@@ -78378,4 +78306,33 @@
             <name>gsus/f</name>
         </Harmony>
     </HarmonyToDiagram>
+    <HarmonyToDiagram>
+        <FretDiagram>
+            <fretOffset>3</fretOffset>
+            <fretDiagram>
+                <string no="0">
+                    <marker>cross</marker>
+                </string>
+                <string no="1">
+                    <dot fret="1">normal</dot>
+                </string>
+                <string no="2">
+                    <marker>cross</marker>
+                </string>
+                <string no="3">
+                    <marker>cross</marker>
+                </string>
+                <string no="4">
+                    <marker>cross</marker>
+                </string>
+                <string no="5">
+                    <marker>cross</marker>
+                </string>
+            </fretDiagram>
+        </FretDiagram>
+        <pattern>X[4-O]XXXX</pattern>
+        <Harmony>
+            <name>n.c./c#</name>
+        </Harmony>
+    </HarmonyToDiagram>
 </Data>
\ No newline at end of file
diff --git a/tools/harmony_to_diagram/Chord-Diagram Database.mscz b/tools/harmony_to_diagram/Chord-Diagram Database.mscz
index dc2ad8fd6ee1f..ff2f95490ca4c 100644
Binary files a/tools/harmony_to_diagram/Chord-Diagram Database.mscz and b/tools/harmony_to_diagram/Chord-Diagram Database.mscz differ


Test patch:
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams.mscx
index 75fceb6592c88..1a66e3d283738 100755
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams.mscx
@@ -398,7 +398,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             <string no="0">
               <dot>1</dot>
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams01-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams01-ref.mscx
index 120d2d3c5cc39..3b28d4cea1aec 100644
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams01-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams01-ref.mscx
@@ -300,7 +300,7 @@
               <string no="4">
                 <dot fret="3">normal</dot>
                 </string>
-              <barre start="1" end="-1">1</barre>
+              <barre start="1" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
@@ -328,7 +328,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           </voice>
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams02-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams02-ref.mscx
index a9312e4bd5409..a8a290bbf2d10 100644
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams02-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagrams02-ref.mscx
@@ -298,7 +298,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols.mscx
index a8e7c7346e5ac..96e372e2a3810 100755
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols.mscx
@@ -444,7 +444,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             <string no="0">
               <dot>1</dot>
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols01-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols01-ref.mscx
index a43f4a7de5c1b..829eaacca9b8f 100644
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols01-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols01-ref.mscx
@@ -345,7 +345,7 @@
               <string no="4">
                 <dot fret="3">normal</dot>
                 </string>
-              <barre start="1" end="-1">1</barre>
+              <barre start="1" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
diff --git a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols02-ref.mscx b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols02-ref.mscx
index 2dc258ca0fadd..c10aafa93880d 100644
--- a/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols02-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoDiatonicTransposeFretDiagramsChordSymbols02-ref.mscx
@@ -343,7 +343,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams.mscx
index 75fceb6592c88..1a66e3d283738 100755
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams.mscx
@@ -398,7 +398,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             <string no="0">
               <dot>1</dot>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams01-ref.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams01-ref.mscx
index 120d2d3c5cc39..3b28d4cea1aec 100644
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams01-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams01-ref.mscx
@@ -300,7 +300,7 @@
               <string no="4">
                 <dot fret="3">normal</dot>
                 </string>
-              <barre start="1" end="-1">1</barre>
+              <barre start="1" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
@@ -328,7 +328,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           </voice>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams02-ref.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams02-ref.mscx
index a9312e4bd5409..a8a290bbf2d10 100644
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagrams02-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagrams02-ref.mscx
@@ -298,7 +298,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols.mscx
index a8e7c7346e5ac..96e372e2a3810 100755
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols.mscx
@@ -444,7 +444,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             <string no="0">
               <dot>1</dot>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols01-ref.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols01-ref.mscx
index a43f4a7de5c1b..829eaacca9b8f 100644
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols01-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols01-ref.mscx
@@ -345,7 +345,7 @@
               <string no="4">
                 <dot fret="3">normal</dot>
                 </string>
-              <barre start="1" end="-1">1</barre>
+              <barre start="1" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>
diff --git a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols02-ref.mscx b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols02-ref.mscx
index 2dc258ca0fadd..c10aafa93880d 100644
--- a/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols02-ref.mscx
+++ b/src/engraving/tests/transpose_data/undoTransposeFretDiagramsChordSymbols02-ref.mscx
@@ -343,7 +343,7 @@
               <string no="3">
                 <dot fret="2">normal</dot>
                 </string>
-              <barre start="0" end="-1">1</barre>
+              <barre start="0" end="5">1</barre>
               </fretDiagram>
             </FretDiagram>
           <Chord>