MusicXML: Small fixes/improvements in the test files

diff --git a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
index 1a0c716453d0d0d1144905d777c5c2291cc82f86..f50d741ed12830d5f93ea592ec16abdf0428cdb5 100644 (file)
--- a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
+++ b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
@@ -1,29 +1,17 @@
 <?xml version="1.0"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 0.6 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-       <work> <work-title>/home/reinhold/lilypond-dev-files/07_nokey.xml</work-title></work> 
-       <identification> 
-               <rights>Unknown</rights>
-               <encoding>
-                       <software>Rosegarden-4</software>
-               </encoding>
-       </identification> 
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+       <work><work-title>No key or clef given</work-title></work> 
+       <identification/>
        <part-list>
                <score-part id="0">
-                       <part-name>NoClef Test</part-name>
-                       <score-instrument id="#1">
-                               <instrument-name>0</instrument-name>
-                       </score-instrument>
-                       <midi-instrument id="#1">
-                               <midi-channel>1</midi-channel>
-                               <midi-program>1</midi-program>
-                       </midi-instrument>
+                       <part-name></part-name>
                </score-part>
        </part-list>
        <part id="0">
                <measure number="1">
                        <attributes>
-                               <divisions>960</divisions>
+                               <divisions>1</divisions>
                                <time>
                                <beats>4</beats>
                                <beat-type>4</beat-type>
@@ -34,19 +22,18 @@
                                        <step>C</step>
                                        <octave>4</octave>
                                </pitch>
-                               <duration>3840</duration>
+                               <duration>4</duration>
                                <voice>1</voice>
                                <type>whole</type>
                        </note>
                </measure>
-
                <measure number="2">
                        <note>
                                <pitch>
                                        <step>C</step>
                                        <octave>4</octave>
                                </pitch>
-                               <duration>3840</duration>
+                               <duration>4</duration>
                                <voice>1</voice>
                                <type>whole</type>
                        </note>

diff --git a/input/regression/musicxml/00j-Basics-NoTime-PJB.xml b/input/regression/musicxml/00j-Basics-NoTime-PJB.xml
index 0b274f79869daaaa0903802a3ca1a26113f47b78..e6c9ca066a4379299754ec81d923aaddecdd1fa4 100644 (file)
--- a/input/regression/musicxml/00j-Basics-NoTime-PJB.xml
+++ b/input/regression/musicxml/00j-Basics-NoTime-PJB.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 0.6b Partwise//EN"
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
  "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-       <identification>
-               <encoding>
-                       <software>/usr/bin/vi</software>
-                       <encoding-date>2007-01-22</encoding-date>
-               </encoding>
-       </identification>
+<score-partwise version="2.0">
+  <work><work-title>No time signature given</work-title></work> 
+       <identification/>
        <part-list>
                <score-part id="P1">
-                       <part-name>MIDI Track 1</part-name>
+                       <part-name></part-name>
                </score-part>
        </part-list>
        <part id="P1">
                <measure number="1">
                        <attributes>
-                               <divisions>96</divisions>
+                               <divisions>1</divisions>
                                <key><fifths>0</fifths></key>
                                <staves>2</staves>
                                <clef number="1"><sign>G</sign><line>2</line></clef>
@@ -24,7 +20,7 @@
                        </attributes>
                        <note>
                                <pitch><step>F</step><octave>4</octave></pitch>
-                               <duration>384</duration>
+                               <duration>4</duration>
                                <voice>1</voice>
                                <type>whole</type>
                                <staff>1</staff>
@@ -32,7 +28,7 @@
                        <backup><duration>384</duration></backup>
                        <note>
                                <pitch><step>B</step><octave>2</octave></pitch>
-                               <duration>384</duration>
+                               <duration>4</duration>
                                <voice>2</voice>
                                <type>whole</type>
                                <staff>2</staff>

diff --git a/input/regression/musicxml/00l-Basics-Tie-PJB.xml b/input/regression/musicxml/00l-Basics-Tie-PJB.xml
index 2d18a8ff4fc18a33d21ba5c66caee9f88c177ffa..e467ce7ab7a969823e632543aceb852b698d45af 100644 (file)
--- a/input/regression/musicxml/00l-Basics-Tie-PJB.xml
+++ b/input/regression/musicxml/00l-Basics-Tie-PJB.xml
@@ -2,19 +2,15 @@
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 0.6b Partwise//EN"
  "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
-       <identification>
-               <encoding>
-                       <software>/usr/bin/vi</software>
-                       <encoding-date>2007-02-02</encoding-date>
-               </encoding>
-       </identification>
+       <work><work-title>A tie</work-title></work> 
+       <identification/>
        <part-list>
-               <score-part id="P1"><part-name>MIDI Track 1</part-name></score-part>
+               <score-part id="P1"><part-name></part-name></score-part>
        </part-list>
        <part id="P1">
                <measure number="1">
                        <attributes>
-                               <divisions>96</divisions>
+                               <divisions>1</divisions>
                                <key><fifths>0</fifths></key>
                                <time><beats>4</beats><beat-type>4</beat-type></time>
                                <staves>1</staves>
@@ -22,7 +18,7 @@
                        </attributes>
                        <note>
                                <pitch><step>F</step><octave>4</octave></pitch>
-                               <duration>384</duration>
+                               <duration>4</duration>
                                <tie type="start"/>
                                <voice>1</voice>
                                <type>whole</type>
@@ -33,7 +29,7 @@
                <measure number="2">
                        <note release="-684">
                                <pitch><step>F</step><octave>4</octave></pitch>
-                               <duration>384</duration>
+                               <duration>4</duration>
                                <tie type="stop"/>
                                <voice>1</voice>
                                <type>whole</type>

diff --git a/input/regression/musicxml/03a-Directions-MusicXML.xml b/input/regression/musicxml/03a-Directions-MusicXML.xml
index 7c9d2f9e6a13752441b121e9387fabc82f9148a3..071052e68e5d896764cfa78bdd676b64224e4d6e 100644 (file)
--- a/input/regression/musicxml/03a-Directions-MusicXML.xml
+++ b/input/regression/musicxml/03a-Directions-MusicXML.xml
@@ -741,7 +741,7 @@
         <duration>1</duration>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
-        <lyric number="1"><syllabic>begin</syllabic><text>to fff</text></lyric>\r
+        <lyric number="1"><syllabic>end</syllabic><text>to fff</text></lyric>\r
       </note>\r
       <note>\r
         <rest/>\r

diff --git a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml
index a32187a23b847b69bb548bdce219b38565a0eeff..e98b46b46976f79e25b36bd61237da74a61857a3 100644 (file)
--- a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml
+++ b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml
@@ -1,52 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"\r
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"\r
                                 "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise>\r
-  <movement-title>Finale "Quoted" test</movement-title>\r
+<score-partwise version="2.0">\r
+  <movement-title>"Quotes" in header fields</movement-title>\r
   <identification>\r
-    <creator type="composer">Reinhold "Tester" Kainhofer</creator>\r
+    <creator type="composer">Some "Tester" Name</creator>\r
     <rights>Free for anyone ("Public Domain")</rights>\r
     <encoding>\r
-      <software>Finale 2007 for Windows</software>\r
-      <software>Dolet Light for Finale 2007</software>\r
-      <encoding-date>2007-09-01</encoding-date>\r
+      <software>"Hand-crafted" MusicXML file</software>\r
+      <encoding-date>2008-02-06</encoding-date>\r
     </encoding>\r
   </identification>\r
   <part-list>\r
     <score-part id="P1">\r
-      <part-name>MusicXML Part</part-name>\r
-      <score-instrument id="P1-I1">\r
-        <instrument-name>Grand Piano</instrument-name>\r
-      </score-instrument>\r
-      <midi-instrument id="P1-I1">\r
-        <midi-channel>1</midi-channel>\r
-        <midi-program>1</midi-program>\r
-      </midi-instrument>\r
+      <part-name>Staff "Test"</part-name>\r
     </score-part>\r
   </part-list>\r
   <!--=========================================================-->\r
   <part id="P1">\r
     <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <sound tempo="120"/>\r
       <note>\r
         <rest/>\r
         <duration>4</duration>\r
         <voice>1</voice>\r
+        <type>whole</type>\r
       </note>\r
       <barline location="right">\r
         <bar-style>light-heavy</bar-style>\r