From e9419d89897e15f427e846f0cd09cb8fc8f13f84 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 5 Apr 2008 22:43:47 +0200
Subject: [PATCH] MusicXML: Run an XML check on the the test files and correct
 XML errors

---
 buildscripts/musicxml_generate_keys.py        |   6 +-
 input/regression/musicxml/00g-Basics-Keys.xml |   8 +-
 .../musicxml/00h-Basics-TimeSignatures.xml    |   8 +-
 .../musicxml/00i-Basics-NoKeyOrClef.xml       |   4 +-
 .../musicxml/01a-Chord-Rosegarden.xml         |   8 +-
 .../musicxml/01b-Chords-Rosegarden.xml        |   8 +-
 .../musicxml/01c-Chords-Rosegarden.xml        |   8 +-
 .../01d-Chords-SchubertStabatMater.xml        |   8 +-
 .../02c-MultipleNotationChildren-RFK.xml      |   8 +-
 .../musicxml/06h-Lyrics-BeamsMelismata.xml    |   1 -
 .../musicxml/08a-Partorder-Rosegarden.xml     |  64 ++++----
 .../08c-More-than-10-parts-Rosegarden.xml     | 144 +++++++++---------
 input/regression/musicxml/18a-FiguredBass.xml |   1 +
 .../99b-Lyrics-BeamsMelismata-IgnoreBeams.xml |   1 -
 scripts/musicxml2ly.py                        |  30 ++--
 15 files changed, 151 insertions(+), 156 deletions(-)

diff --git a/buildscripts/musicxml_generate_keys.py b/buildscripts/musicxml_generate_keys.py
index cd0f99529f..acf4cf10a8 100755
--- a/buildscripts/musicxml_generate_keys.py
+++ b/buildscripts/musicxml_generate_keys.py
@@ -6,11 +6,11 @@ alterations = [-1, 0, 1]
 def print_measure (nr, fifth, mode, atts = "", final = ""):
     print """    <measure number="%s">
       <attributes>
-%s        <key>
+        <key>
           <fifths>%s</fifths>
           <mode>%s</mode>
         </key>
-      </attributes>
+%s      </attributes>
       <note>
         <pitch>
           <step>C</step>
@@ -20,7 +20,7 @@ def print_measure (nr, fifth, mode, atts = "", final = ""):
         <voice>1</voice>
         <type>half</type>
       </note>
-%s    </measure>""" % (nr, atts,  fifth, mode, final)
+%s    </measure>""" % (nr, fifth, mode, atts, final)
 
 first_atts = """        <divisions>1</divisions>
         <time symbol="common">
diff --git a/input/regression/musicxml/00g-Basics-Keys.xml b/input/regression/musicxml/00g-Basics-Keys.xml
index fd50181ec5..7049164017 100644
--- a/input/regression/musicxml/00g-Basics-Keys.xml
+++ b/input/regression/musicxml/00g-Basics-Keys.xml
@@ -14,6 +14,10 @@
     <measure number="1">
       <attributes>
         <divisions>1</divisions>
+        <key>
+          <fifths>-11</fifths>
+          <mode>major</mode>
+        </key>
         <time symbol="common">
           <beats>2</beats>
           <beat-type>4</beat-type>
@@ -22,10 +26,6 @@
           <sign>G</sign>
           <line>2</line>
         </clef>
-        <key>
-          <fifths>-11</fifths>
-          <mode>major</mode>
-        </key>
       </attributes>
       <note>
         <pitch>
diff --git a/input/regression/musicxml/00h-Basics-TimeSignatures.xml b/input/regression/musicxml/00h-Basics-TimeSignatures.xml
index 547eba1281..9439b47679 100644
--- a/input/regression/musicxml/00h-Basics-TimeSignatures.xml
+++ b/input/regression/musicxml/00h-Basics-TimeSignatures.xml
@@ -18,18 +18,14 @@
           <fifths>0</fifths>
           <mode>major</mode>
         </key>
-        <time symbol="common">
+        <time  symbol="common">
           <beats>2</beats>
-          <beat-type>4</beat-type>
+          <beat-type>2</beat-type>
         </time>
         <clef>
           <sign>G</sign>
           <line>2</line>
         </clef>
-        <time  symbol="common">
-          <beats>2</beats>
-          <beat-type>2</beat-type>
-        </time>
       </attributes>
       <note>
         <pitch>
diff --git a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
index f50d741ed1..25e7bc4732 100644
--- a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
+++ b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
@@ -4,11 +4,11 @@
 	<work><work-title>No key or clef given</work-title></work> 
 	<identification/>
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name></part-name>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>1</divisions>
diff --git a/input/regression/musicxml/01a-Chord-Rosegarden.xml b/input/regression/musicxml/01a-Chord-Rosegarden.xml
index 5407004e24..f953641244 100644
--- a/input/regression/musicxml/01a-Chord-Rosegarden.xml
+++ b/input/regression/musicxml/01a-Chord-Rosegarden.xml
@@ -9,18 +9,18 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name>Chord test</part-name>
-			<score-instrument id="#1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
diff --git a/input/regression/musicxml/01b-Chords-Rosegarden.xml b/input/regression/musicxml/01b-Chords-Rosegarden.xml
index 1f2f95c76c..aeb0b3b525 100644
--- a/input/regression/musicxml/01b-Chords-Rosegarden.xml
+++ b/input/regression/musicxml/01b-Chords-Rosegarden.xml
@@ -9,18 +9,18 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name>Chord test</part-name>
-			<score-instrument id="#1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
diff --git a/input/regression/musicxml/01c-Chords-Rosegarden.xml b/input/regression/musicxml/01c-Chords-Rosegarden.xml
index 1165e7fa06..c5be6e58ae 100644
--- a/input/regression/musicxml/01c-Chords-Rosegarden.xml
+++ b/input/regression/musicxml/01c-Chords-Rosegarden.xml
@@ -9,18 +9,18 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name>Chord test</part-name>
-			<score-instrument id="#1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
diff --git a/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml b/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml
index e9a8984e39..3dce2b83c2 100644
--- a/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml
+++ b/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml
@@ -9,18 +9,18 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name>Chord test</part-name>
-			<score-instrument id="1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
           <measure number="1">
             <attributes>
               <divisions>8</divisions>
diff --git a/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml b/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml
index ae2a60cf67..450201d2cc 100644
--- a/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml
+++ b/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml
@@ -27,10 +27,6 @@
     <measure number="1">
       <attributes>
         <divisions>4</divisions>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
         <key>
           <fifths>0</fifths>
         </key>
@@ -38,6 +34,10 @@
           <beats>3</beats>
           <beat-type>4</beat-type>
         </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
       </attributes>
       <note>
         <pitch>
diff --git a/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml b/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml
index 419c60de96..cf321d823d 100644
--- a/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml
+++ b/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml
@@ -5,7 +5,6 @@
   <movement-title>Lyrics and melismata</movement-title>
   <identification/>
   <defaults/>
-  <credit/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
diff --git a/input/regression/musicxml/08a-Partorder-Rosegarden.xml b/input/regression/musicxml/08a-Partorder-Rosegarden.xml
index 295c969bc6..90f6f9239d 100644
--- a/input/regression/musicxml/08a-Partorder-Rosegarden.xml
+++ b/input/regression/musicxml/08a-Partorder-Rosegarden.xml
@@ -9,48 +9,52 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name>Part 1</part-name>
-			<score-instrument id="#1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
-		<score-part id="1">
+		<score-part id="P1">
 			<part-name>Part 2</part-name>
-			<score-instrument id="#2">
+			<score-instrument id="I2">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#2">
+			<midi-instrument id="I2">
 				<midi-channel>2</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="2">
+		<score-part id="P2">
 			<part-name>Part 3</part-name>
-			<score-instrument id="#3">
+			<score-instrument id="I3">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#3">
+			<midi-instrument id="I3">
 				<midi-channel>3</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="3">
+		<score-part id="P3">
 			<part-name>Part 4</part-name>
-			<score-instrument id="#4">
+			<score-instrument id="I4">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#4">
+			<midi-instrument id="I4">
 				<midi-channel>4</midi-channel>
 			</midi-instrument>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
+				<key>
+				<fifths>1</fifths>
+				<mode>major</mode>
+				</key>
 				<time>
 				<beats>4</beats>
 				<beat-type>4</beat-type>
@@ -59,10 +63,6 @@
 				<sign>G</sign>
 				<line>2</line>
 				</clef>
-				<key>
-				<fifths>1</fifths>
-				<mode>major</mode>
-				</key>
 			</attributes>
 			<note>
 				<pitch>
@@ -87,10 +87,14 @@
 			</note>
 		</measure>
 	</part>
-	<part id="1">
+	<part id="P1">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
+				<key>
+				<fifths>1</fifths>
+				<mode>major</mode>
+				</key>
 				<time>
 				<beats>4</beats>
 				<beat-type>4</beat-type>
@@ -99,10 +103,6 @@
 				<sign>G</sign>
 				<line>2</line>
 				</clef>
-				<key>
-				<fifths>1</fifths>
-				<mode>major</mode>
-				</key>
 			</attributes>
 			<note>
 				<pitch>
@@ -127,10 +127,14 @@
 			</note>
 		</measure>
 	</part>
-	<part id="2">
+	<part id="P2">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
+				<key>
+				<fifths>1</fifths>
+				<mode>major</mode>
+				</key>
 				<time>
 				<beats>4</beats>
 				<beat-type>4</beat-type>
@@ -139,10 +143,6 @@
 				<sign>G</sign>
 				<line>2</line>
 				</clef>
-				<key>
-				<fifths>1</fifths>
-				<mode>major</mode>
-				</key>
 			</attributes>
 			<note>
 				<pitch>
@@ -167,10 +167,14 @@
 			</note>
 		</measure>
 	</part>
-	<part id="3">
+	<part id="P3">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
+				<key>
+				<fifths>1</fifths>
+				<mode>major</mode>
+				</key>
 				<time>
 				<beats>4</beats>
 				<beat-type>4</beat-type>
@@ -179,10 +183,6 @@
 				<sign>G</sign>
 				<line>2</line>
 				</clef>
-				<key>
-				<fifths>1</fifths>
-				<mode>major</mode>
-				</key>
 			</attributes>
 			<note>
 				<pitch>
diff --git a/input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml b/input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml
index 732f0b19a4..10c95818b3 100644
--- a/input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml
+++ b/input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml
@@ -9,165 +9,165 @@
 		</encoding>
 	</identification> 
 	<part-list>
-		<score-part id="0">
+		<score-part id="P0">
 			<part-name></part-name>
-			<score-instrument id="#1">
+			<score-instrument id="I1">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#1">
+			<midi-instrument id="I1">
 				<midi-channel>1</midi-channel>
 				<midi-program>1</midi-program>
 			</midi-instrument>
 		</score-part>
-		<score-part id="1">
+		<score-part id="P1">
 			<part-name></part-name>
-			<score-instrument id="#2">
+			<score-instrument id="I2">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#2">
+			<midi-instrument id="I2">
 				<midi-channel>2</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="2">
+		<score-part id="P2">
 			<part-name></part-name>
-			<score-instrument id="#3">
+			<score-instrument id="I3">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#3">
+			<midi-instrument id="I3">
 				<midi-channel>3</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="3">
+		<score-part id="P3">
 			<part-name></part-name>
-			<score-instrument id="#4">
+			<score-instrument id="I4">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#4">
+			<midi-instrument id="I4">
 				<midi-channel>4</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="4">
+		<score-part id="P4">
 			<part-name></part-name>
-			<score-instrument id="#5">
+			<score-instrument id="I5">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#5">
+			<midi-instrument id="I5">
 				<midi-channel>5</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="5">
+		<score-part id="P5">
 			<part-name></part-name>
-			<score-instrument id="#6">
+			<score-instrument id="I6">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#6">
+			<midi-instrument id="I6">
 				<midi-channel>6</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="6">
+		<score-part id="P6">
 			<part-name></part-name>
-			<score-instrument id="#7">
+			<score-instrument id="I7">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#7">
+			<midi-instrument id="I7">
 				<midi-channel>7</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="7">
+		<score-part id="P7">
 			<part-name></part-name>
-			<score-instrument id="#8">
+			<score-instrument id="I8">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#8">
+			<midi-instrument id="I8">
 				<midi-channel>8</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="8">
+		<score-part id="P8">
 			<part-name></part-name>
-			<score-instrument id="#9">
+			<score-instrument id="I9">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#9">
+			<midi-instrument id="I9">
 				<midi-channel>9</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="9">
+		<score-part id="P9">
 			<part-name></part-name>
-			<score-instrument id="#10[D]">
+			<score-instrument id="I10">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#10[D]">
+			<midi-instrument id="I10">
 				<midi-channel>10</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="10">
+		<score-part id="P10">
 			<part-name></part-name>
-			<score-instrument id="#11">
+			<score-instrument id="I11">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#11">
+			<midi-instrument id="I11">
 				<midi-channel>11</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="11">
+		<score-part id="P11">
 			<part-name></part-name>
-			<score-instrument id="#12">
+			<score-instrument id="I12">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#12">
+			<midi-instrument id="I12">
 				<midi-channel>12</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="12">
+		<score-part id="P12">
 			<part-name></part-name>
-			<score-instrument id="#13">
+			<score-instrument id="I13">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#13">
+			<midi-instrument id="I13">
 				<midi-channel>13</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="13">
+		<score-part id="P13">
 			<part-name></part-name>
-			<score-instrument id="#14">
+			<score-instrument id="I14">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#14">
+			<midi-instrument id="I14">
 				<midi-channel>14</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="14">
+		<score-part id="P14">
 			<part-name></part-name>
-			<score-instrument id="#15">
+			<score-instrument id="I15">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#15">
+			<midi-instrument id="I15">
 				<midi-channel>15</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="15">
+		<score-part id="P15">
 			<part-name></part-name>
-			<score-instrument id="#16">
+			<score-instrument id="I16">
 				<instrument-name>0</instrument-name>
 			</score-instrument>
-			<midi-instrument id="#16">
+			<midi-instrument id="I16">
 				<midi-channel>16</midi-channel>
 			</midi-instrument>
 		</score-part>
-		<score-part id="16">
+		<score-part id="P16">
 			<part-name></part-name>
 		</score-part>
-		<score-part id="17">
+		<score-part id="P17">
 			<part-name></part-name>
 		</score-part>
-		<score-part id="18">
+		<score-part id="P18">
 			<part-name></part-name>
 		</score-part>
-		<score-part id="19">
+		<score-part id="P19">
 			<part-name></part-name>
 		</score-part>
 	</part-list>
-	<part id="0">
+	<part id="P0">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -188,7 +188,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="1">
+	<part id="P1">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -209,7 +209,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="2">
+	<part id="P2">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -230,7 +230,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="3">
+	<part id="P3">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -251,7 +251,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="4">
+	<part id="P4">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -272,7 +272,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="5">
+	<part id="P5">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -293,7 +293,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="6">
+	<part id="P6">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -314,7 +314,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="7">
+	<part id="P7">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -335,7 +335,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="8">
+	<part id="P8">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -356,7 +356,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="9">
+	<part id="P9">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -377,7 +377,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="10">
+	<part id="P10">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -398,7 +398,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="11">
+	<part id="P11">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -419,7 +419,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="12">
+	<part id="P12">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -440,7 +440,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="13">
+	<part id="P13">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -461,7 +461,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="14">
+	<part id="P14">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -482,7 +482,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="15">
+	<part id="P15">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -503,7 +503,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="16">
+	<part id="P16">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -524,7 +524,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="17">
+	<part id="P17">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -545,7 +545,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="18">
+	<part id="P18">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
@@ -566,7 +566,7 @@
 			</note>
 		</measure>
 	</part>
-	<part id="19">
+	<part id="P19">
 		<measure number="1">
 			<attributes>
 				<divisions>960</divisions>
diff --git a/input/regression/musicxml/18a-FiguredBass.xml b/input/regression/musicxml/18a-FiguredBass.xml
index e69ccd82a0..dd576a5d1c 100644
--- a/input/regression/musicxml/18a-FiguredBass.xml
+++ b/input/regression/musicxml/18a-FiguredBass.xml
@@ -91,6 +91,7 @@
         <dot/>
         <stem>up</stem>
       </note>
+      <!-- Check how well the application handles an empty element (invalid MusicXML!) -->
       <figured-bass>
       </figured-bass>
       <note>
diff --git a/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml b/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
index 4844389179..3bceef0e49 100644
--- a/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
+++ b/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
@@ -10,7 +10,6 @@
     </encoding>
   </identification>
   <defaults/>
-  <credit/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index f9effaa432..a2b27e6aad 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -913,42 +913,42 @@ articulations_dict = {
     #"delayed-turn": "?",
     "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato"
     "doit": musicxml_doit_to_lily_event,
-    #"double-tongue": "",
+    #"double-tongue": "?",
     "down-bow": "downbow",
     "falloff": musicxml_falloff_to_lily_event,
     "fingering": musicxml_fingering_event,
-    #"fingernails": "",
-    #"fret": "",
-    #"hammer-on": "",
+    #"fingernails": "?",
+    #"fret": "?",
+    #"hammer-on": "?",
     "harmonic": "flageolet",
-    #"heel": "",
+    #"heel": "?",
     "inverted-mordent": "prall",
     "inverted-turn": "reverseturn",
     "mordent": "mordent",
     "open-string": "open",
-    #"plop": "",
-    #"pluck": "",
-    #"pull-off": "",
+    #"plop": "?",
+    #"pluck": "?",
+    #"pull-off": "?",
     #"schleifer": "?",
-    #"scoop": "",
+    #"scoop": "?",
     #"shake": "?",
     "snap-pizzicato": musicxml_snappizzicato_event,
-    #"spiccato": "",
+    #"spiccato": "?",
     "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo"
     "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato"
     "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped"
-    #"stress": "",
+    #"stress": "?",
     "string": musicxml_string_event,
     "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato"
-    #"tap": "",
+    #"tap": "?",
     "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto"
     "thumb-position": "thumb",
-    #"toe": "",
+    #"toe": "?",
     "turn": "turn",
     "tremolo": musicxml_tremolo_to_lily_event,
     "trill-mark": "trill",
-    #"triple-tongue": "",
-    #"unstress": ""
+    #"triple-tongue": "?",
+    #"unstress": "?"
     "up-bow": "upbow",
     #"wavy-line": "?",
 }
-- 
2.39.2