MusicXML: Extend chord names test file (add samples for <degree>, timing, rests)

Signed-off-by: Reinhold Kainhofer <reinhold@kainhofer.com>

diff --git a/input/regression/musicxml/17f-AllChordTypes.xml b/input/regression/musicxml/17f-AllChordTypes.xml
index 18433bb1f8dd90a0b999bc53b6c99701937d54c6..2845ef8a01b610a3a3a15360fff52d580b0a6e71 100644 (file)
--- a/input/regression/musicxml/17f-AllChordTypes.xml
+++ b/input/regression/musicxml/17f-AllChordTypes.xml
@@ -16,7 +16,7 @@
   <part id="P1">\r
     <measure number="1">\r
       <attributes>\r
-        <divisions>1</divisions>\r
+        <divisions>2</divisions>\r
         <key>\r
           <fifths>0</fifths>\r
           <mode>major</mode>\r
@@ -38,9 +38,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -50,9 +51,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -62,9 +64,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>augmented</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -74,9 +77,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>diminished</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -89,9 +93,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>dominant</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -101,9 +106,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-seventh</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -113,9 +119,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor-seventh</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -125,9 +132,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>diminished-seventh</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -140,9 +148,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>augmented-seventh</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -152,9 +161,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>half-diminished</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -164,9 +174,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-minor</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -176,9 +187,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-sixth</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -191,9 +203,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor-sixth</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -203,9 +216,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>dominant-ninth</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -215,21 +229,24 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-ninth</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
           <root-step>C</root-step>\r
         </root>\r
         <kind>minor-ninth</kind>\r
+        <lyric number="1"><text>minor-ninth</text></lyric>\r
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor-ninth</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -242,9 +259,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>dominant-11th</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -254,9 +272,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-11th</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -266,9 +285,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor-11th</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -278,9 +298,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>dominant-13th</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -293,9 +314,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>major-13th</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -305,9 +327,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>minor-13th</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -317,9 +340,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>suspended-second</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -329,9 +353,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>suspended-fourth</text></lyric>\r
       </note>\r
     </measure>\r
     <!--=======================================================-->\r
@@ -344,9 +369,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>Neapolitan</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -356,9 +382,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>Italians</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -368,9 +395,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>French</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -380,10 +408,11 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
-      </note>\r
+         <lyric number="1"><text>German</text></lyric>\r
+     </note>\r
     </measure>\r
     <!--=======================================================-->\r
     <measure number="8">\r
@@ -395,9 +424,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>pedal</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -407,9 +437,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>power</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -419,9 +450,10 @@
       </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
-        <duration>1</duration>\r
+        <duration>2</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>Tristan</text></lyric>\r
       </note>\r
       <harmony>\r
         <root>\r
@@ -429,11 +461,127 @@
         </root>\r
         <kind>other</kind>\r
       </harmony>\r
+      <note>\r
+        <pitch><step>C</step><octave>4</octave></pitch>\r
+        <duration>2</duration>\r
+        <voice>1</voice>\r
+        <type>quarter</type>\r
+        <lyric number="1"><text>other</text></lyric>\r
+      </note>\r
+    </measure>\r
+    <!--=======================================================-->\r
+    <measure number="9">\r
+      <harmony>\r
+        <root>\r
+          <root-step>F</root-step>\r
+          <root-alter>1</root-alter>\r
+        </root>\r
+        <kind>major</kind>\r
+        <inversion>2</inversion>\r
+      </harmony>\r
+      <note>\r
+        <pitch><step>C</step><octave>4</octave></pitch>\r
+        <duration>4</duration>\r
+        <voice>1</voice>\r
+        <type>half</type>\r
+        <lyric number="1"><text>Inversion</text></lyric>\r
+      </note>\r
+      <harmony>\r
+        <root>\r
+          <root-step>F</root-step>\r
+          <root-alter>-2</root-alter>\r
+        </root>\r
+        <kind>major</kind>\r
+        <bass>\r
+          <bass-step>C</bass-step>\r
+          <bass-alter>1</bass-alter>\r
+        </bass>\r
+      </harmony>\r
+      <note>\r
+        <pitch><step>C</step><octave>4</octave></pitch>\r
+        <duration>1</duration>\r
+        <voice>1</voice>\r
+        <type>eighth</type>\r
+        <lyric number="1"><text>Fbb/C</text></lyric>\r
+      </note>\r
+      <harmony>\r
+        <root>\r
+          <root-step>G</root-step>\r
+          <root-alter>1</root-alter>\r
+        </root>\r
+        <kind>major</kind>\r
+        <bass>\r
+          <bass-step>C</bass-step>\r
+        </bass>\r
+      </harmony>\r
       <note>\r
         <pitch><step>C</step><octave>4</octave></pitch>\r
         <duration>1</duration>\r
         <voice>1</voice>\r
+        <type>eighth</type>\r
+        <lyric number="1"><text>G/C</text></lyric>\r
+      </note>\r
+      <harmony>\r
+        <root>\r
+          <root-step>C</root-step>\r
+        </root>\r
+        <kind>major</kind>\r
+      </harmony>\r
+      <note>\r
+        <rest/>\r
+        <duration>2</duration>\r
+        <voice>1</voice>\r
+        <type>quarter</type>\r
+        <lyric number="1"><text>C</text></lyric>\r
+      </note>\r
+    </measure>\r
+    <!--=======================================================-->\r
+    <measure number="10">\r
+      <harmony>\r
+        <root>\r
+          <root-step>C</root-step>\r
+        </root>\r
+        <kind>major</kind>\r
+        <degree>\r
+          <degree-value>3</degree-value>\r
+          <degree-alter>0</degree-alter>\r
+          <degree-type>subtract</degree-type>\r
+        </degree>\r
+        <degree>\r
+          <degree-value>5</degree-value>\r
+          <degree-alter>-1</degree-alter>\r
+          <degree-type>alter</degree-type>\r
+        </degree>\r
+      </harmony>\r
+      <note>\r
+        <pitch><step>C</step><octave>4</octave></pitch>\r
+        <duration>2</duration>\r
+        <voice>1</voice>\r
+        <type>quarter</type>\r
+        <lyric number="1"><text>C-3+5b</text></lyric>\r
+      </note>\r
+      <harmony>\r
+        <root>\r
+          <root-step>C</root-step>\r
+        </root>\r
+        <kind>major</kind>\r
+        <degree>\r
+          <degree-value>1</degree-value>\r
+          <degree-alter>0</degree-alter>\r
+          <degree-type>subtract</degree-type>\r
+        </degree>\r
+        <degree>\r
+          <degree-value>6</degree-value>\r
+          <degree-alter>-1</degree-alter>\r
+          <degree-type>add</degree-type>\r
+        </degree>\r
+      </harmony>\r
+      <note>\r
+        <pitch><step>C</step><octave>4</octave></pitch>\r
+        <duration>2</duration>\r
+        <voice>1</voice>\r
         <type>quarter</type>\r
+        <lyric number="1"><text>C-1+6b</text></lyric>\r
       </note>\r
       <barline location="right">\r
         <bar-style>light-heavy</bar-style>\r