MusicXML: Implement elisions (multiple lyrics syllables assigned to one note)

[lilypond.git] / input / regression / musicxml / 17f-AllChordTypes.xml

diff --git a/input/regression/musicxml/17f-AllChordTypes.xml b/input/regression/musicxml/17f-AllChordTypes.xml
index d81b4d6a42e4a3323b721ba71366b3ee6f8209a8..facab3489f45939e72843519fb81b109ee6b62f7 100644 (file)
--- a/input/regression/musicxml/17f-AllChordTypes.xml
+++ b/input/regression/musicxml/17f-AllChordTypes.xml
@@ -2,8 +2,15 @@
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
                                 "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
-  <movement-title>All MusicXM chord names/types</movement-title>
-  <identification/>
+  <movement-title>All MusicXML chord names/types with &lt;root&gt;</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All chord types defined in 
+          MusicXML. The staff will only contain one c' note (NO chord) for 
+          all of them, but the chord names should be properly 
+          printed.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
@@ -16,7 +23,7 @@
   <part id="P1">
     <measure number="1">
       <attributes>
-        <divisions>1</divisions>
+        <divisions>2</divisions>
         <key>
           <fifths>0</fifths>
           <mode>major</mode>
@@ -38,9 +45,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major</text></lyric>
       </note>
       <harmony>
         <root>
@@ -50,9 +58,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor</text></lyric>
       </note>
       <harmony>
         <root>
@@ -62,9 +71,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>augmented</text></lyric>
       </note>
       <harmony>
         <root>
@@ -74,9 +84,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>diminished</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -89,9 +100,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>dominant</text></lyric>
       </note>
       <harmony>
         <root>
@@ -101,9 +113,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-seventh</text></lyric>
       </note>
       <harmony>
         <root>
@@ -113,9 +126,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor-seventh</text></lyric>
       </note>
       <harmony>
         <root>
@@ -125,9 +139,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>diminished-seventh</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -140,9 +155,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>augmented-seventh</text></lyric>
       </note>
       <harmony>
         <root>
@@ -152,9 +168,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>half-diminished</text></lyric>
       </note>
       <harmony>
         <root>
@@ -164,9 +181,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-minor</text></lyric>
       </note>
       <harmony>
         <root>
@@ -176,9 +194,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-sixth</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -191,9 +210,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor-sixth</text></lyric>
       </note>
       <harmony>
         <root>
@@ -203,9 +223,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>dominant-ninth</text></lyric>
       </note>
       <harmony>
         <root>
@@ -215,21 +236,24 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-ninth</text></lyric>
       </note>
       <harmony>
         <root>
           <root-step>C</root-step>
         </root>
         <kind>minor-ninth</kind>
+        <lyric number="1"><text>minor-ninth</text></lyric>
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor-ninth</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -242,9 +266,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>dominant-11th</text></lyric>
       </note>
       <harmony>
         <root>
@@ -254,9 +279,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-11th</text></lyric>
       </note>
       <harmony>
         <root>
@@ -266,9 +292,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor-11th</text></lyric>
       </note>
       <harmony>
         <root>
@@ -278,9 +305,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>dominant-13th</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -293,9 +321,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>major-13th</text></lyric>
       </note>
       <harmony>
         <root>
@@ -305,9 +334,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>minor-13th</text></lyric>
       </note>
       <harmony>
         <root>
@@ -317,9 +347,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>suspended-second</text></lyric>
       </note>
       <harmony>
         <root>
@@ -329,9 +360,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>suspended-fourth</text></lyric>
       </note>
     </measure>
     <!--=======================================================-->
@@ -344,9 +376,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>Neapolitan</text></lyric>
       </note>
       <harmony>
         <root>
@@ -356,9 +389,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>Italians</text></lyric>
       </note>
       <harmony>
         <root>
@@ -368,9 +402,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>French</text></lyric>
       </note>
       <harmony>
         <root>
@@ -380,10 +415,11 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-      </note>
+         <lyric number="1"><text>German</text></lyric>
+     </note>
     </measure>
     <!--=======================================================-->
     <measure number="8">
@@ -395,9 +431,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>pedal</text></lyric>
       </note>
       <harmony>
         <root>
@@ -407,9 +444,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>power</text></lyric>
       </note>
       <harmony>
         <root>
@@ -419,9 +457,10 @@
       </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>Tristan</text></lyric>
       </note>
       <harmony>
         <root>
@@ -429,11 +468,127 @@
         </root>
         <kind>other</kind>
       </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>other</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <harmony>
+        <root>
+          <root-step>F</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major</kind>
+        <inversion>2</inversion>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <lyric number="1"><text>Inversion</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>F</root-step>
+          <root-alter>-2</root-alter>
+        </root>
+        <kind>major</kind>
+        <bass>
+          <bass-step>C</bass-step>
+        </bass>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1"><text>Fbb/C</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>G</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major</kind>
+        <bass>
+          <bass-step>D</bass-step>
+          <bass-alter>1</bass-alter>
+        </bass>
+      </harmony>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
         <duration>1</duration>
         <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1"><text>G#/D#</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+      </harmony>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>C</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>3</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>subtract</degree-type>
+        </degree>
+        <degree>
+          <degree-value>5</degree-value>
+          <degree-alter>-1</degree-alter>
+          <degree-type>alter</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>C-3+5b</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>1</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>subtract</degree-type>
+        </degree>
+        <degree>
+          <degree-value>6</degree-value>
+          <degree-alter>-1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
         <type>quarter</type>
+        <lyric number="1"><text>C-1+6b</text></lyric>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>