Add a hack to packed spacing to work around extra columns.

[lilypond.git] / input / regression / musicxml / 15a-Percussion-Finale.xml

diff --git a/input/regression/musicxml/15a-Percussion-Finale.xml b/input/regression/musicxml/15a-Percussion-Finale.xml
index 6cd3b4dc3e2df94447bc98c9d3d7ae843f18a49b..b404932e637ba6c674d01d6c2a5de4c1d598f61d 100644 (file)
--- a/input/regression/musicxml/15a-Percussion-Finale.xml
+++ b/input/regression/musicxml/15a-Percussion-Finale.xml
@@ -1,28 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
                                 "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Percussion Test</movement-title>
-  <identification>
-    <creator type="composer">Reinhold Kainhofer</creator>
-    <rights>Public Domain</rights>
-    <encoding>
-      <software>Finale 2007 for Windows</software>
-      <software>Dolet Light for Finale 2007</software>
-      <encoding-date>2007-09-23</encoding-date>
-    </encoding>
-  </identification>
+<score-partwise version="1.1">
+  <movement-title>Percussion Staves</movement-title>
+  <identification/>
   <part-list>
     <score-part id="P1">
       <part-name>Timpani</part-name>
       <part-abbreviation>Timp.</part-abbreviation>
-      <score-instrument id="P1-I1">
-        <instrument-name>Finger Cymbals</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="start">
       <group-symbol>bracket</group-symbol>
@@ -31,98 +16,10 @@
     <score-part id="P2">
       <part-name>Cymbals</part-name>
       <part-abbreviation>Cym.</part-abbreviation>
-      <score-instrument id="P2-M76">
-        <instrument-name>MIDI77</instrument-name>
-      </score-instrument>
-      <score-instrument id="P2-M74">
-        <instrument-name>MIDI75</instrument-name>
-      </score-instrument>
-      <score-instrument id="P2-X1">
-        <instrument-name>Cymbal Smash</instrument-name>
-      </score-instrument>
-      <score-instrument id="P2-M71">
-        <instrument-name>MIDI72</instrument-name>
-      </score-instrument>
-      <score-instrument id="P2-M69">
-        <instrument-name>MIDI70</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P2-M76">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>77</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P2-M74">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>75</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P2-X1">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>45</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P2-M71">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>72</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P2-M69">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>70</midi-unpitched>
-      </midi-instrument>
     </score-part>
     <score-part id="P3">
-      <part-name>Bass Drums</part-name>
-      <part-abbreviation>B. Dr.</part-abbreviation>
-      <score-instrument id="P3-M64">
-        <instrument-name>MIDI65</instrument-name>
-      </score-instrument>
-      <score-instrument id="P3-M65">
-        <instrument-name>MIDI66</instrument-name>
-      </score-instrument>
-      <score-instrument id="P3-X1">
-        <instrument-name>BD 5</instrument-name>
-      </score-instrument>
-      <score-instrument id="P3-M67">
-        <instrument-name>MIDI68</instrument-name>
-      </score-instrument>
-      <score-instrument id="P3-X8">
-        <instrument-name>BD 1</instrument-name>
-      </score-instrument>
-      <score-instrument id="P3-M77">
-        <instrument-name>MIDI78</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P3-M64">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>65</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P3-M65">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>66</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P3-X1">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>37</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P3-M67">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>68</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P3-X8">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>44</midi-unpitched>
-      </midi-instrument>
-      <midi-instrument id="P3-M77">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>78</midi-unpitched>
-      </midi-instrument>
+      <part-name>Triangle</part-name>
+      <part-abbreviation>Tri.</part-abbreviation>
     </score-part>
     <part-group number="1" type="stop"/>
   </part-list>
@@ -144,7 +41,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -194,23 +90,19 @@
           <beats>4</beats>
           <beat-type>4</beat-type>
         </time>
-        <instruments>6</instruments>
         <clef>
           <sign>percussion</sign>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <unpitched>
           <display-step>E</display-step>
           <display-octave>5</display-octave>
         </unpitched>
         <duration>3</duration>
-        <instrument id="P2-M76"/>
         <voice>1</voice>
         <type>half</type>
         <dot/>
-        <stem>down</stem>
       </note>
       <note>
         <unpitched>
@@ -218,10 +110,8 @@
           <display-octave>5</display-octave>
         </unpitched>
         <duration>1</duration>
-        <instrument id="P2-M76"/>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -231,45 +121,9 @@
           <display-step>D</display-step>
           <display-octave>5</display-octave>
         </unpitched>
-        <duration>1</duration>
-        <instrument id="P2-M74"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>C</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P2-X1"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notehead>x</notehead>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>B</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P2-M71"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>A</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P2-M69"/>
+        <duration>4</duration>
         <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
+        <type>whole</type>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
@@ -281,31 +135,26 @@
     <measure number="1">
       <attributes>
         <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
         <time>
           <beats>4</beats>
           <beat-type>4</beat-type>
         </time>
-        <instruments>7</instruments>
         <clef>
           <sign>percussion</sign>
         </clef>
+        <staff-details>
+          <staff-lines>1</staff-lines>
+        </staff-details>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <unpitched>
           <display-step>F</display-step>
           <display-octave>4</display-octave>
         </unpitched>
         <duration>3</duration>
-        <instrument id="P3-M65"/>
         <voice>1</voice>
         <type>half</type>
         <dot/>
-        <stem>up</stem>
       </note>
       <note>
         <unpitched>
@@ -313,10 +162,8 @@
           <display-octave>4</display-octave>
         </unpitched>
         <duration>1</duration>
-        <instrument id="P3-X1"/>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -326,44 +173,9 @@
           <display-step>E</display-step>
           <display-octave>4</display-octave>
         </unpitched>
-        <duration>1</duration>
-        <instrument id="P3-M64"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>G</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P3-M67"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>F</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P3-M77"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>G</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P3-X8"/>
+        <duration>4</duration>
         <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
+        <type>whole</type>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>