From 8309a9f7123edc6f40c8e58f0d7a3f7e8eebdf35 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Sun, 8 Jan 2023 16:38:48 +1100
Subject: [PATCH] Fix for MuseScore 4

MS4 seems to break with comments in chords.xml
---
 chords_serifjazz.m4.xml              | 119 +++----
 chords_serifjazz_0.925mm_R8.xml      |  99 +++---
 chords_serifjazz_1.375mm_R6.xml      |  99 +++---
 chords_serifjazz_1.750mm_R3.xml      | 449 +++++++++++++++++++++++++++
 chords_serifjazz_1.764mm_Default.xml |  99 +++---
 5 files changed, 615 insertions(+), 250 deletions(-)
 create mode 100644 chords_serifjazz_1.750mm_R3.xml

diff --git a/chords_serifjazz.m4.xml b/chords_serifjazz.m4.xml
index 1b497fa..a122be7 100644
--- a/chords_serifjazz.m4.xml
+++ b/chords_serifjazz.m4.xml
@@ -22,27 +22,27 @@ m4_changecom()m4_dnl
 =====================================================================
 -->
 
-<!-- Superscript amount (negative) -->
+m4_dnl <!-- Superscript amount (negative) -->
   <!ENTITY sup "AMT_SUP">
-<!-- Correction for characters already superscripted in font -->
+m4_dnl <!-- Correction for characters already superscripted in font -->
   <!ENTITY unsup "AMT_UNSUP">
 
   ]>
 
 <museScore version="1.24">
 
-<!--
-      Part I: font list
-            associate symbols (code points) with names
-      If no font family is given or font family is "default" then the
-      configured text style font family is used.
--->
+m4_dnl <!--
+m4_dnl       Part I: font list
+m4_dnl             associate symbols (code points) with names
+m4_dnl       If no font family is given or font family is "default" then the
+m4_dnl       configured text style font family is used.
+m4_dnl -->
 
-  <!-- Use user configured font for other characters -->
+m4_dnl <!-- Use user configured font for other characters -->
   <font family="default">
     </font>
 
-  <!-- Serif font -->
+m4_dnl <!-- Serif font -->
   <font family="FONT_MUSIC">
     <sym code="0x266d" name="b"/>
     <sym code="0x266e" name="natural"/>
@@ -56,7 +56,7 @@ m4_changecom()m4_dnl
 
     </font>
 
-  <!-- Serif font adjusted superscript characters -->
+m4_dnl <!-- Serif font adjusted superscript characters -->
   <font family="FONT_MUSIC">
     <mag>1.4</mag>
 
@@ -65,7 +65,7 @@ m4_changecom()m4_dnl
 
     </font>
 
-  <!-- Sans-serif font -->
+m4_dnl <!-- Sans-serif font -->
   <font family="FONT_SANS">
     <mag>0.7</mag>
 
@@ -139,17 +139,17 @@ m4_changecom()m4_dnl
 
     </font>
 
-<!--
-      Part II: token list
-            define how the various tokens within a chord symbol should be rendered
+m4_dnl <!--
+m4_dnl       Part II: token list
+m4_dnl             define how the various tokens within a chord symbol should be rendered
+m4_dnl
+m4_dnl          name     ordinary text name of token
+m4_dnl                   multiple names may be listed to allow mseveral different tokens to render the same way
+m4_dnl          render   this is a script that contains render commands
+m4_dnl                   see Part III for details
+m4_dnl -->
 
-         name     ordinary text name of token
-                  multiple names may be listed to allow mseveral different tokens to render the same way
-         render   this is a script that contains render commands
-                  see Part III for details
--->
-
-  <!-- Chord qualities -->
+m4_dnl <!-- Chord qualities -->
   <token>
     <name>o</name>
     <render>m:0:&unsup; degree m:-1.0:-&unsup;</render>
@@ -160,22 +160,25 @@ m4_changecom()m4_dnl
     <render>m:0:&unsup; oslash m:-1.0:-&unsup;</render>
     </token>
 
+m4_dnl <!-- used to fix kerning for letter "A" -->
   <token>
-    <name>*</name> <!-- used to fix kerning for letter "A" -->
+    <name>*</name>
     <render>m:-1.0:0</render>
     </token>
 
+m4_dnl <!-- A° -->
   <token>
-    <name>*o</name> <!-- A° -->
+    <name>*o</name>
     <render>m:-2.0:&unsup; degree m:-1.0:-&unsup;</render>
     </token>
 
+m4_dnl <!-- Aø -->
   <token>
-    <name>*h</name> <!-- Aø -->
+    <name>*h</name>
     <render>m:-2.0:&unsup; oslash m:-1.0:-&unsup;</render>
     </token>
 
-  <!-- Modifier text -->
+m4_dnl <!-- Modifier text -->
   <token class="modifier">
     <name>add</name>
     <render>m:0:-&sup; sadd m:0:&sup;</render>
@@ -186,7 +189,7 @@ m4_changecom()m4_dnl
     <render>m:0:-&sup; sus m:0:&sup;</render>
     </token>
 
-  <!-- Modifier numbers -->
+m4_dnl <!-- Modifier numbers -->
   <token class="modifier">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -260,7 +263,7 @@ m4_changecom()m4_dnl
     <render>m:0:-&sup; omit m:0:&sup;</render>
     </token>
 
-  <!-- Extension numbers -->
+m4_dnl <!-- Extension numbers -->
   <token class="extension">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -318,35 +321,35 @@ m4_changecom()m4_dnl
   <renderRoot>:n :a</renderRoot>
   <renderBase>m:-0.2:1 / m:0.2:1 :n :a m:0:-2</renderBase>
 
-<!--
-      Part III: chord list
-            declare a list of chords to be explicitly recognized
-            any chord recognized as matching something on this list
-            will be rendered according to the definition in this list,
-            as opposed to being rendered directly from the chord symbol as typed
-            thus, it provides the ability to define overrides for rendering specific chord symbols
-
-         id       internal chord number
-                  may be omitted if you don't need compatibility with older chord description files
-         name     ordinary text name of chord
-                  multiple names can be used to allow several different representations of the same chord
-                  but there is no need to list the most common variations like "CMaj7" versus "Cma7"
-                  the need for multiple names comes in if you want
-                  significantly different ways of entering the same chord
-                  so listing "mi7b5" and "07" as aliases for the same (half-diminished) chord
-                  would allow them to be recognized as equivalent
-         render   this is a script which contains render commands
-                  commands:
-                        xxx         draw symbol name xxx
-                        m:x:y       add x:y to current position (1/5 spatium units)
-                        :push
-                        :pop
-                        :n          root or base note
-                        :a          accidental
-                  if omitted, chord will be rendered directly from the first name listed above
-                  so you can get all major seventh chords to render as "ma7" by creating a chord definition
-                  with no id or render tag, and just the single name "ma7"
--->
+m4_dnl <!--
+m4_dnl       Part III: chord list
+m4_dnl             declare a list of chords to be explicitly recognized
+m4_dnl             any chord recognized as matching something on this list
+m4_dnl             will be rendered according to the definition in this list,
+m4_dnl             as opposed to being rendered directly from the chord symbol as typed
+m4_dnl             thus, it provides the ability to define overrides for rendering specific chord symbols
+m4_dnl
+m4_dnl          id       internal chord number
+m4_dnl                   may be omitted if you don't need compatibility with older chord description files
+m4_dnl          name     ordinary text name of chord
+m4_dnl                   multiple names can be used to allow several different representations of the same chord
+m4_dnl                   but there is no need to list the most common variations like "CMaj7" versus "Cma7"
+m4_dnl                   the need for multiple names comes in if you want
+m4_dnl                   significantly different ways of entering the same chord
+m4_dnl                   so listing "mi7b5" and "07" as aliases for the same (half-diminished) chord
+m4_dnl                   would allow them to be recognized as equivalent
+m4_dnl          render   this is a script which contains render commands
+m4_dnl                   commands:
+m4_dnl                         xxx         draw symbol name xxx
+m4_dnl                         m:x:y       add x:y to current position (1/5 spatium units)
+m4_dnl                         :push
+m4_dnl                         :pop
+m4_dnl                         :n          root or base note
+m4_dnl                         :a          accidental
+m4_dnl                   if omitted, chord will be rendered directly from the first name listed above
+m4_dnl                   so you can get all major seventh chords to render as "ma7" by creating a chord definition
+m4_dnl                   with no id or render tag, and just the single name "ma7"
+m4_dnl -->
 
 m4_ifdef(`CHORD_FORMS', `
 
@@ -430,7 +433,7 @@ m4_ifdef(`CHORD_FORMS', `
     <render>m:0:-&sup; s7 s( s# s9 s) m:0:&sup;</render>
     </chord>
 
-<!-- Stacked extensions -->
+m4_dnl <!-- Stacked extensions -->
 m4_define(`LTB2', ``m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb('')
 m4_define(`RTB2', ``:push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5'')
 m4_define(`SUP2', ``:push m:0:-10 $1 :pop'')
diff --git a/chords_serifjazz_0.925mm_R8.xml b/chords_serifjazz_0.925mm_R8.xml
index 9a8267c..295d722 100644
--- a/chords_serifjazz_0.925mm_R8.xml
+++ b/chords_serifjazz_0.925mm_R8.xml
@@ -21,27 +21,17 @@
 =====================================================================
 -->
 
-<!-- Superscript amount (negative) -->
   <!ENTITY sup "6.0">
-<!-- Correction for characters already superscripted in font -->
   <!ENTITY unsup "5.1">
 
   ]>
 
 <museScore version="1.24">
 
-<!--
-      Part I: font list
-            associate symbols (code points) with names
-      If no font family is given or font family is "default" then the
-      configured text style font family is used.
--->
 
-  <!-- Use user configured font for other characters -->
   <font family="default">
     </font>
 
-  <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
     <sym code="0x266e" name="natural"/>
@@ -55,7 +45,6 @@
 
     </font>
 
-  <!-- Serif font adjusted superscript characters -->
   <font family="default">
     <mag>1.4</mag>
 
@@ -64,7 +53,6 @@
 
     </font>
 
-  <!-- Sans-serif font -->
   <font family="FreeSans">
     <mag>0.7</mag>
 
@@ -138,17 +126,7 @@
 
     </font>
 
-<!--
-      Part II: token list
-            define how the various tokens within a chord symbol should be rendered
 
-         name     ordinary text name of token
-                  multiple names may be listed to allow mseveral different tokens to render the same way
-         render   this is a script that contains render commands
-                  see Part III for details
--->
-
-  <!-- Chord qualities -->
   <token>
     <name>o</name>
     <render>m:0:&unsup; degree m:-1.0:-&unsup;</render>
@@ -160,21 +138,20 @@
     </token>
 
   <token>
-    <name>*</name> <!-- used to fix kerning for letter "A" -->
-    <render>m:-1.0:0;</render>
+    <name>*</name>
+    <render>m:-1.0:0</render>
     </token>
 
   <token>
-    <name>*o</name> <!-- A° -->
+    <name>*o</name>
     <render>m:-2.0:&unsup; degree m:-1.0:-&unsup;</render>
     </token>
 
   <token>
-    <name>*h</name> <!-- Aø -->
+    <name>*h</name>
     <render>m:-2.0:&unsup; oslash m:-1.0:-&unsup;</render>
     </token>
 
-  <!-- Modifier text -->
   <token class="modifier">
     <name>add</name>
     <render>m:0:-&sup; sadd m:0:&sup;</render>
@@ -185,7 +162,6 @@
     <render>m:0:-&sup; sus m:0:&sup;</render>
     </token>
 
-  <!-- Modifier numbers -->
   <token class="modifier">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -259,7 +235,6 @@
     <render>m:0:-&sup; omit m:0:&sup;</render>
     </token>
 
-  <!-- Extension numbers -->
   <token class="extension">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -317,35 +292,6 @@
   <renderRoot>:n :a</renderRoot>
   <renderBase>m:-0.2:1 / m:0.2:1 :n :a m:0:-2</renderBase>
 
-<!--
-      Part III: chord list
-            declare a list of chords to be explicitly recognized
-            any chord recognized as matching something on this list
-            will be rendered according to the definition in this list,
-            as opposed to being rendered directly from the chord symbol as typed
-            thus, it provides the ability to define overrides for rendering specific chord symbols
-
-         id       internal chord number
-                  may be omitted if you don't need compatibility with older chord description files
-         name     ordinary text name of chord
-                  multiple names can be used to allow several different representations of the same chord
-                  but there is no need to list the most common variations like "CMaj7" versus "Cma7"
-                  the need for multiple names comes in if you want
-                  significantly different ways of entering the same chord
-                  so listing "mi7b5" and "07" as aliases for the same (half-diminished) chord
-                  would allow them to be recognized as equivalent
-         render   this is a script which contains render commands
-                  commands:
-                        xxx         draw symbol name xxx
-                        m:x:y       add x:y to current position (1/5 spatium units)
-                        :push
-                        :pop
-                        :n          root or base note
-                        :a          accidental
-                  if omitted, chord will be rendered directly from the first name listed above
-                  so you can get all major seventh chords to render as "ma7" by creating a chord definition
-                  with no id or render tag, and just the single name "ma7"
--->
 
 
 
@@ -364,6 +310,11 @@
     <render>m m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>m6maj7</name>
+    <render>m m:0:-&sup; s6 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>m9maj7</name>
     <render>m m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
@@ -379,6 +330,11 @@
     <render>+ m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>omaj7</name>
+    <render>m:0:&unsup; degree m:-1.0:-&unsup; m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>mb5</name>
     <render>m m:0:-&sup; s( sb s5 s) m:0:&sup;</render>
@@ -423,19 +379,29 @@
 
 
 
+  <chord>
+    <name>b9#5</name>
+    <render>m:0:-&sup; m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9#5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>7b9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7b9b5</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
@@ -458,19 +424,24 @@
     <render>m m:0:-&sup; s9 s( s# s1 s1 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>7b13b9</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s1 s3 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#11b9</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7#11b9</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>+7#11b9</name>
-    <render>+ m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>+ m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
 
diff --git a/chords_serifjazz_1.375mm_R6.xml b/chords_serifjazz_1.375mm_R6.xml
index c00df92..bf84a2e 100644
--- a/chords_serifjazz_1.375mm_R6.xml
+++ b/chords_serifjazz_1.375mm_R6.xml
@@ -21,27 +21,17 @@
 =====================================================================
 -->
 
-<!-- Superscript amount (negative) -->
   <!ENTITY sup "4.2">
-<!-- Correction for characters already superscripted in font -->
   <!ENTITY unsup "3.5">
 
   ]>
 
 <museScore version="1.24">
 
-<!--
-      Part I: font list
-            associate symbols (code points) with names
-      If no font family is given or font family is "default" then the
-      configured text style font family is used.
--->
 
-  <!-- Use user configured font for other characters -->
   <font family="default">
     </font>
 
-  <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
     <sym code="0x266e" name="natural"/>
@@ -55,7 +45,6 @@
 
     </font>
 
-  <!-- Serif font adjusted superscript characters -->
   <font family="default">
     <mag>1.4</mag>
 
@@ -64,7 +53,6 @@
 
     </font>
 
-  <!-- Sans-serif font -->
   <font family="FreeSans">
     <mag>0.7</mag>
 
@@ -138,17 +126,7 @@
 
     </font>
 
-<!--
-      Part II: token list
-            define how the various tokens within a chord symbol should be rendered
 
-         name     ordinary text name of token
-                  multiple names may be listed to allow mseveral different tokens to render the same way
-         render   this is a script that contains render commands
-                  see Part III for details
--->
-
-  <!-- Chord qualities -->
   <token>
     <name>o</name>
     <render>m:0:&unsup; degree m:-1.0:-&unsup;</render>
@@ -160,21 +138,20 @@
     </token>
 
   <token>
-    <name>*</name> <!-- used to fix kerning for letter "A" -->
-    <render>m:-1.0:0;</render>
+    <name>*</name>
+    <render>m:-1.0:0</render>
     </token>
 
   <token>
-    <name>*o</name> <!-- A° -->
+    <name>*o</name>
     <render>m:-2.0:&unsup; degree m:-1.0:-&unsup;</render>
     </token>
 
   <token>
-    <name>*h</name> <!-- Aø -->
+    <name>*h</name>
     <render>m:-2.0:&unsup; oslash m:-1.0:-&unsup;</render>
     </token>
 
-  <!-- Modifier text -->
   <token class="modifier">
     <name>add</name>
     <render>m:0:-&sup; sadd m:0:&sup;</render>
@@ -185,7 +162,6 @@
     <render>m:0:-&sup; sus m:0:&sup;</render>
     </token>
 
-  <!-- Modifier numbers -->
   <token class="modifier">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -259,7 +235,6 @@
     <render>m:0:-&sup; omit m:0:&sup;</render>
     </token>
 
-  <!-- Extension numbers -->
   <token class="extension">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -317,35 +292,6 @@
   <renderRoot>:n :a</renderRoot>
   <renderBase>m:-0.2:1 / m:0.2:1 :n :a m:0:-2</renderBase>
 
-<!--
-      Part III: chord list
-            declare a list of chords to be explicitly recognized
-            any chord recognized as matching something on this list
-            will be rendered according to the definition in this list,
-            as opposed to being rendered directly from the chord symbol as typed
-            thus, it provides the ability to define overrides for rendering specific chord symbols
-
-         id       internal chord number
-                  may be omitted if you don't need compatibility with older chord description files
-         name     ordinary text name of chord
-                  multiple names can be used to allow several different representations of the same chord
-                  but there is no need to list the most common variations like "CMaj7" versus "Cma7"
-                  the need for multiple names comes in if you want
-                  significantly different ways of entering the same chord
-                  so listing "mi7b5" and "07" as aliases for the same (half-diminished) chord
-                  would allow them to be recognized as equivalent
-         render   this is a script which contains render commands
-                  commands:
-                        xxx         draw symbol name xxx
-                        m:x:y       add x:y to current position (1/5 spatium units)
-                        :push
-                        :pop
-                        :n          root or base note
-                        :a          accidental
-                  if omitted, chord will be rendered directly from the first name listed above
-                  so you can get all major seventh chords to render as "ma7" by creating a chord definition
-                  with no id or render tag, and just the single name "ma7"
--->
 
 
 
@@ -364,6 +310,11 @@
     <render>m m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>m6maj7</name>
+    <render>m m:0:-&sup; s6 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>m9maj7</name>
     <render>m m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
@@ -379,6 +330,11 @@
     <render>+ m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>omaj7</name>
+    <render>m:0:&unsup; degree m:-1.0:-&unsup; m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>mb5</name>
     <render>m m:0:-&sup; s( sb s5 s) m:0:&sup;</render>
@@ -423,19 +379,29 @@
 
 
 
+  <chord>
+    <name>b9#5</name>
+    <render>m:0:-&sup; m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9#5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>7b9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7b9b5</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
@@ -458,19 +424,24 @@
     <render>m m:0:-&sup; s9 s( s# s1 s1 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>7b13b9</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s1 s3 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#11b9</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7#11b9</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>+7#11b9</name>
-    <render>+ m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>+ m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
 
diff --git a/chords_serifjazz_1.750mm_R3.xml b/chords_serifjazz_1.750mm_R3.xml
new file mode 100644
index 0000000..3953915
--- /dev/null
+++ b/chords_serifjazz_1.750mm_R3.xml
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE museScore [
+
+<!--
+=====================================================================
+    musescore-serifjazz-chords (rewrite)
+    Copyright (C) 2020 RunasSudo (Yingtong Li)
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+=====================================================================
+-->
+
+  <!ENTITY sup "3.5">
+  <!ENTITY unsup "2.5">
+
+  ]>
+
+<museScore version="1.24">
+
+
+  <font family="default">
+    </font>
+
+  <font family="default">
+    <sym code="0x266d" name="b"/>
+    <sym code="0x266e" name="natural"/>
+    <sym code="0x266f" name="#"/>
+
+    <sym code="0x1d12a" name="##"/>
+    <sym code="0x1d12b" name="bb"/>
+
+    <sym name="/"/>
+    <sym name="+"/>
+
+    </font>
+
+  <font family="default">
+    <mag>1.4</mag>
+
+    <sym code="0x00b0" name="degree"/>
+    <sym code="0x1d1a9" name="oslash"/>
+
+    </font>
+
+  <font family="FreeSans">
+    <mag>0.7</mag>
+
+    <sym value="sus" name="sus"/>
+    <sym value="add" name="sadd"/>
+
+    <sym name="("/>
+    <sym name=")"/>
+    <sym name="M"/>
+    <sym name="Ma"/>
+    <sym name="MA"/>
+    <sym name="Maj"/>
+    <sym name="maj"/>
+    <sym name="m"/>
+    <sym name="min"/>
+    <sym name="MI"/>
+    <sym name="Mi"/>
+    <sym name="mi"/>
+    <sym name="Min"/>
+    <sym name="aug"/>
+    <sym name="Aug"/>
+    <sym name="dim"/>
+    <sym name="Dim"/>
+    <sym name="alt"/>
+    <sym name="Alt"/>
+    <sym name="bass"/>
+    <sym name="Bass"/>
+    <sym name="pedal"/>
+    <sym name="Pedal"/>
+
+    <sym name="no"/>
+    <sym name="omit"/>
+
+    <sym value="0" name="s0"/>
+    <sym value="1" name="s1"/>
+    <sym value="2" name="s2"/>
+    <sym value="3" name="s3"/>
+    <sym value="4" name="s4"/>
+    <sym value="5" name="s5"/>
+    <sym value="6" name="s6"/>
+    <sym value="7" name="s7"/>
+    <sym value="8" name="s8"/>
+    <sym value="9" name="s9"/>
+
+    <sym value="(" name="s("/>
+    <sym value=")" name="s)"/>
+
+    <sym code="0x239b" name="st("/>
+    <sym code="0x239c" name="sm("/>
+    <sym code="0x239d" name="sb("/>
+    <sym code="0x239e" name="st)"/>
+    <sym code="0x239f" name="sm)"/>
+    <sym code="0x23a0" name="sb)"/>
+
+    </font>
+
+  <font family="default">
+    <mag>0.75</mag>
+    <sym code="0x266d" name="sb"/>
+    <sym code="0x266f" name="s#"/>
+
+    </font>
+
+  <font family="default">
+    <mag>0.75</mag>
+
+    <sym value="," name="s,"/>
+    <sym value="/" name="s/"/>
+    <sym value="," name="s,"/>
+    <sym value="/" name="s/"/>
+
+    </font>
+
+
+  <token>
+    <name>o</name>
+    <render>m:0:&unsup; degree m:-1.0:-&unsup;</render>
+    </token>
+  
+  <token>
+    <name>0</name>
+    <render>m:0:&unsup; oslash m:-1.0:-&unsup;</render>
+    </token>
+
+  <token>
+    <name>*</name>
+    <render>m:-1.0:0</render>
+    </token>
+
+  <token>
+    <name>*o</name>
+    <render>m:-2.0:&unsup; degree m:-1.0:-&unsup;</render>
+    </token>
+
+  <token>
+    <name>*h</name>
+    <render>m:-2.0:&unsup; oslash m:-1.0:-&unsup;</render>
+    </token>
+
+  <token class="modifier">
+    <name>add</name>
+    <render>m:0:-&sup; sadd m:0:&sup;</render>
+    </token>
+
+  <token class="modifier">
+    <name>sus</name>
+    <render>m:0:-&sup; sus m:0:&sup;</render>
+    </token>
+
+  <token class="modifier">
+    <name>0</name>
+    <render>m:0:-&sup; s0 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>1</name>
+    <render>m:0:-&sup; s1 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>2</name>
+    <render>m:0:-&sup; s2 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>3</name>
+    <render>m:0:-&sup; s3 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>4</name>
+    <render>m:0:-&sup; s4 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>5</name>
+    <render>m:0:-&sup; s5 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>6</name>
+    <render>m:0:-&sup; s6 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>7</name>
+    <render>m:0:-&sup; s7 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>8</name>
+    <render>m:0:-&sup; s8 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>9</name>
+    <render>m:0:-&sup; s9 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>11</name>
+    <render>m:0:-&sup; s1 s1 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>13</name>
+    <render>m:0:-&sup; s1 s3 m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>(</name>
+    <render>m:0:-&sup; s( m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>)</name>
+    <render>m:0:-&sup; s) m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>b</name>
+    <render>m:0:-&sup; sb m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>#</name>
+    <render>m:0:-&sup; s# m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>no</name>
+    <render>m:0:-&sup; no m:0:&sup;</render>
+    </token>
+  <token class="modifier">
+    <name>omit</name>
+    <render>m:0:-&sup; omit m:0:&sup;</render>
+    </token>
+
+  <token class="extension">
+    <name>0</name>
+    <render>m:0:-&sup; s0 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>1</name>
+    <render>m:0:-&sup; s1 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>2</name>
+    <render>m:0:-&sup; s2 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>3</name>
+    <render>m:0:-&sup; s3 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>4</name>
+    <render>m:0:-&sup; s4 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>5</name>
+    <render>m:0:-&sup; s5 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>6</name>
+    <render>m:0:-&sup; s6 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>7</name>
+    <render>m:0:-&sup; s7 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>8</name>
+    <render>m:0:-&sup; s8 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>9</name>
+    <render>m:0:-&sup; s9 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>11</name>
+    <render>m:0:-&sup; s1 s1 m:0:&sup;</render>
+    </token>
+  <token class="extension">
+    <name>13</name>
+    <render>m:0:-&sup; s1 s3 m:0:&sup;</render>
+    </token>
+  
+  <token class="extension">
+    <name>6/9</name>
+    <render>m:0:-&sup; s6 m:-0.5:&sup; m:0:-0.5 / m:-0.5:0.5 s9</render>
+    </token>
+
+  <renderRoot>:n :a</renderRoot>
+  <renderBase>m:-0.2:1 / m:0.2:1 :n :a m:0:-2</renderBase>
+
+
+
+
+  <chord>
+    <name>add9</name>
+    <render>m:0:-&sup; s( sadd s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>madd9</name>
+    <render>m m:0:-&sup; s( sadd s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>mmaj7</name>
+    <render>m m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m6maj7</name>
+    <render>m m:0:-&sup; s6 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m9maj7</name>
+    <render>m m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>+maj7</name>
+    <render>+ m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>+9maj7</name>
+    <render>+ m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>omaj7</name>
+    <render>m:0:&unsup; degree m:-1.0:-&unsup; m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>mb5</name>
+    <render>m m:0:-&sup; s( sb s5 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b5</name>
+    <render>m:0:-&sup; s7 s( sb s5 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m7b5</name>
+    <render>m m:0:-&sup; s7 s( sb s5 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>9b5</name>
+    <render>m:0:-&sup; s9 s( sb s5 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m9b5</name>
+    <render>m m:0:-&sup; s9 s( sb s5 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9</name>
+    <render>m:0:-&sup; s7 s( sb s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m7b9</name>
+    <render>m m:0:-&sup; s7 s( sb s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7#9</name>
+    <render>m:0:-&sup; s7 s( s# s9 s) m:0:&sup;</render>
+    </chord>
+
+
+
+
+
+  <chord>
+    <name>b9#5</name>
+    <render>m:0:-&sup; m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7#9b5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9#5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9b5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m7b9b5</name>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>+7b9</name>
+    <render>+ m:0:-&sup; s7 s( sb s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>+7#9</name>
+    <render>+ m:0:-&sup; s7 s( s# s9 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>9#11</name>
+    <render>m:0:-&sup; s9 s( s# s1 s1 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m9#11</name>
+    <render>m m:0:-&sup; s9 s( s# s1 s1 s) m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b13b9</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s1 s3 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7#11b9</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>m7#11b9</name>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>+7#11b9</name>
+    <render>+ m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+
+
+  </museScore>
diff --git a/chords_serifjazz_1.764mm_Default.xml b/chords_serifjazz_1.764mm_Default.xml
index 53e6934..3953915 100644
--- a/chords_serifjazz_1.764mm_Default.xml
+++ b/chords_serifjazz_1.764mm_Default.xml
@@ -21,27 +21,17 @@
 =====================================================================
 -->
 
-<!-- Superscript amount (negative) -->
   <!ENTITY sup "3.5">
-<!-- Correction for characters already superscripted in font -->
   <!ENTITY unsup "2.5">
 
   ]>
 
 <museScore version="1.24">
 
-<!--
-      Part I: font list
-            associate symbols (code points) with names
-      If no font family is given or font family is "default" then the
-      configured text style font family is used.
--->
 
-  <!-- Use user configured font for other characters -->
   <font family="default">
     </font>
 
-  <!-- Serif font -->
   <font family="default">
     <sym code="0x266d" name="b"/>
     <sym code="0x266e" name="natural"/>
@@ -55,7 +45,6 @@
 
     </font>
 
-  <!-- Serif font adjusted superscript characters -->
   <font family="default">
     <mag>1.4</mag>
 
@@ -64,7 +53,6 @@
 
     </font>
 
-  <!-- Sans-serif font -->
   <font family="FreeSans">
     <mag>0.7</mag>
 
@@ -138,17 +126,7 @@
 
     </font>
 
-<!--
-      Part II: token list
-            define how the various tokens within a chord symbol should be rendered
 
-         name     ordinary text name of token
-                  multiple names may be listed to allow mseveral different tokens to render the same way
-         render   this is a script that contains render commands
-                  see Part III for details
--->
-
-  <!-- Chord qualities -->
   <token>
     <name>o</name>
     <render>m:0:&unsup; degree m:-1.0:-&unsup;</render>
@@ -160,21 +138,20 @@
     </token>
 
   <token>
-    <name>*</name> <!-- used to fix kerning for letter "A" -->
-    <render>m:-1.0:0;</render>
+    <name>*</name>
+    <render>m:-1.0:0</render>
     </token>
 
   <token>
-    <name>*o</name> <!-- A° -->
+    <name>*o</name>
     <render>m:-2.0:&unsup; degree m:-1.0:-&unsup;</render>
     </token>
 
   <token>
-    <name>*h</name> <!-- Aø -->
+    <name>*h</name>
     <render>m:-2.0:&unsup; oslash m:-1.0:-&unsup;</render>
     </token>
 
-  <!-- Modifier text -->
   <token class="modifier">
     <name>add</name>
     <render>m:0:-&sup; sadd m:0:&sup;</render>
@@ -185,7 +162,6 @@
     <render>m:0:-&sup; sus m:0:&sup;</render>
     </token>
 
-  <!-- Modifier numbers -->
   <token class="modifier">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -259,7 +235,6 @@
     <render>m:0:-&sup; omit m:0:&sup;</render>
     </token>
 
-  <!-- Extension numbers -->
   <token class="extension">
     <name>0</name>
     <render>m:0:-&sup; s0 m:0:&sup;</render>
@@ -317,35 +292,6 @@
   <renderRoot>:n :a</renderRoot>
   <renderBase>m:-0.2:1 / m:0.2:1 :n :a m:0:-2</renderBase>
 
-<!--
-      Part III: chord list
-            declare a list of chords to be explicitly recognized
-            any chord recognized as matching something on this list
-            will be rendered according to the definition in this list,
-            as opposed to being rendered directly from the chord symbol as typed
-            thus, it provides the ability to define overrides for rendering specific chord symbols
-
-         id       internal chord number
-                  may be omitted if you don't need compatibility with older chord description files
-         name     ordinary text name of chord
-                  multiple names can be used to allow several different representations of the same chord
-                  but there is no need to list the most common variations like "CMaj7" versus "Cma7"
-                  the need for multiple names comes in if you want
-                  significantly different ways of entering the same chord
-                  so listing "mi7b5" and "07" as aliases for the same (half-diminished) chord
-                  would allow them to be recognized as equivalent
-         render   this is a script which contains render commands
-                  commands:
-                        xxx         draw symbol name xxx
-                        m:x:y       add x:y to current position (1/5 spatium units)
-                        :push
-                        :pop
-                        :n          root or base note
-                        :a          accidental
-                  if omitted, chord will be rendered directly from the first name listed above
-                  so you can get all major seventh chords to render as "ma7" by creating a chord definition
-                  with no id or render tag, and just the single name "ma7"
--->
 
 
 
@@ -364,6 +310,11 @@
     <render>m m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>m6maj7</name>
+    <render>m m:0:-&sup; s6 s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>m9maj7</name>
     <render>m m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
@@ -379,6 +330,11 @@
     <render>+ m:0:-&sup; s9 s( maj s7 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>omaj7</name>
+    <render>m:0:&unsup; degree m:-1.0:-&unsup; m:0:-&sup; s( maj s7 s) m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>mb5</name>
     <render>m m:0:-&sup; s( sb s5 s) m:0:&sup;</render>
@@ -423,19 +379,29 @@
 
 
 
+  <chord>
+    <name>b9#5</name>
+    <render>m:0:-&sup; m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
+  <chord>
+    <name>7b9#5</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop s# s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>7b9b5</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7b9b5</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 sb s9 :pop sb s5 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s9 :pop sb s5 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
@@ -458,19 +424,24 @@
     <render>m m:0:-&sup; s9 s( s# s1 s1 s) m:0:&sup;</render>
     </chord>
 
+  <chord>
+    <name>7b13b9</name>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 sb s1 s3 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
+    </chord>
+
   <chord>
     <name>7#11b9</name>
-    <render>m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>m7#11b9</name>
-    <render>m m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>m m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>
 
   <chord>
     <name>+7#11b9</name>
-    <render>+ m:0:-&sup; s7 m:1:5.5 :push m:0:-11 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-11 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-11 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5.5 m:0:&sup;</render>
+    <render>+ m:0:-&sup; s7 m:1:5 :push m:0:-10 st( :pop :push m:0:-5 sm( :pop sb( :push m:0:-10 s# s1 s1 :pop m:2:0 sb s9 m:2:0 :push m:0:-10 st) :pop :push m:0:-5 sm) :pop sb) m:0:-5 m:0:&sup;</render>
     </chord>