From 44e379496877dfe71f59bfba48fd8219391fb2c2 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Wed, 6 Feb 2008 23:08:13 +0100
Subject: [PATCH] MusicXML: Small fixes/improvements in the test files

---
 .../musicxml/00i-Basics-NoKeyOrClef.xml       | 29 ++++----------
 .../musicxml/00j-Basics-NoTime-PJB.xml        | 20 ++++------
 .../musicxml/00l-Basics-Tie-PJB.xml           | 16 +++-----
 .../musicxml/03a-Directions-MusicXML.xml      |  2 +-
 .../musicxml/05a-HeaderQuotes-Finale.xml      | 39 ++++---------------
 5 files changed, 31 insertions(+), 75 deletions(-)

diff --git a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
index 1a0c716453..f50d741ed1 100644
--- 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 0b274f7986..e6c9ca066a 100644
--- 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 2d18a8ff4f..e467ce7ab7 100644
--- 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 7c9d2f9e6a..071052e68e 100644
--- a/input/regression/musicxml/03a-Directions-MusicXML.xml
+++ b/input/regression/musicxml/03a-Directions-MusicXML.xml
@@ -741,7 +741,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>to fff</text></lyric>
+        <lyric number="1"><syllabic>end</syllabic><text>to fff</text></lyric>
       </note>
       <note>
         <rest/>
diff --git a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml
index a32187a23b..e98b46b469 100644
--- 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"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
                                 "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Finale "Quoted" test</movement-title>
+<score-partwise version="2.0">
+  <movement-title>"Quotes" in header fields</movement-title>
   <identification>
-    <creator type="composer">Reinhold "Tester" Kainhofer</creator>
+    <creator type="composer">Some "Tester" Name</creator>
     <rights>Free for anyone ("Public Domain")</rights>
     <encoding>
-      <software>Finale 2007 for Windows</software>
-      <software>Dolet Light for Finale 2007</software>
-      <encoding-date>2007-09-01</encoding-date>
+      <software>"Hand-crafted" MusicXML file</software>
+      <encoding-date>2008-02-06</encoding-date>
     </encoding>
   </identification>
   <part-list>
     <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
+      <part-name>Staff "Test"</part-name>
     </score-part>
   </part-list>
   <!--=========================================================-->
   <part id="P1">
     <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
         <voice>1</voice>
+        <type>whole</type>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
-- 
2.39.5