From 20b6e6264d2a7b2a21fe69e3b720f0b71ef6583f Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Wed, 24 Nov 2010 18:10:41 +0100
Subject: [PATCH] MusicXML: Fix invalid MusicXML files

Invalid MusicXML spotted by Richard Lanyon, richard.lanyon at avid . com
---
 .../musicxml/03a-Rhythm-Durations.xml         |  6 +++---
 .../11c-TimeSignatures-CompoundSimple.xml     |  1 -
 .../13c-KeySignatures-NonTraditional.xml      | 16 +++++++--------
 .../musicxml/13d-KeySignatures-Microtones.xml | 14 ++++++-------
 .../musicxml/21f-Chord-ElementInBetween.xml   |  2 +-
 .../musicxml/22d-Parenthesized-Noteheads.xml  | 14 ++++++-------
 input/regression/musicxml/24d-AfterGrace.xml  |  4 ++--
 input/regression/musicxml/31a-Directions.xml  |  8 ++++----
 input/regression/musicxml/32a-Notations.xml   |  4 ++--
 input/regression/musicxml/33a-Spanners.xml    | 14 +++----------
 .../regression/musicxml/71f-AllChordTypes.xml |  1 -
 python/musicxml.py                            | 16 +++++++--------
 scripts/musicxml2ly.py                        | 20 ++++++++++++-------
 13 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/input/regression/musicxml/03a-Rhythm-Durations.xml b/input/regression/musicxml/03a-Rhythm-Durations.xml
index e0dab25041..b9fc0b1508 100644
--- a/input/regression/musicxml/03a-Rhythm-Durations.xml
+++ b/input/regression/musicxml/03a-Rhythm-Durations.xml
@@ -39,7 +39,7 @@
         </pitch>
         <duration>1024</duration>
         <voice>1</voice>
-        <type>longa</type>
+        <type>long</type>
       </note>
     </measure>
     <!--=======================================================-->
@@ -150,7 +150,7 @@
         </pitch>
         <duration>1536</duration>
         <voice>1</voice>
-        <type>longa</type>
+        <type>long</type>
         <dot/>
       </note>
     </measure>
@@ -272,7 +272,7 @@
         </pitch>
         <duration>1792</duration>
         <voice>1</voice>
-        <type>longa</type>
+        <type>long</type>
         <dot/>
         <dot/>
       </note>
diff --git a/input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml b/input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml
index 576ad4e87c..e0c5cb53ff 100644
--- a/input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml
+++ b/input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml
@@ -96,7 +96,6 @@
           <octave>4</octave>
         </pitch>
         <duration>8</duration>
-        <tie/>
         <voice>1</voice>
         <type>whole</type>
       </note>
diff --git a/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml b/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
index 60872a970b..fa77803890 100644
--- a/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
+++ b/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
@@ -22,11 +22,11 @@
       <attributes>
         <divisions>1</divisions>
         <key>
-          <key-step>3</key-step>
+          <key-step>F</key-step>
           <key-alter>1</key-alter>
-          <key-step>5</key-step>
+          <key-step>A</key-step>
           <key-alter>-1</key-alter>
-          <key-step>6</key-step>
+          <key-step>B</key-step>
           <key-alter>-1</key-alter>
         </key>
         <time>
@@ -51,15 +51,15 @@
     <measure number="2">
       <attributes>
         <key>
-          <key-step>0</key-step>
+          <key-step>C</key-step>
           <key-alter>-2</key-alter>
-          <key-step>4</key-step>
+          <key-step>G</key-step>
           <key-alter>2</key-alter>
-          <key-step>1</key-step>
+          <key-step>D</key-step>
           <key-alter>-1</key-alter>
-          <key-step>6</key-step>
+          <key-step>B</key-step>
           <key-alter>1</key-alter>
-          <key-step>5</key-step>
+          <key-step>F</key-step>
           <key-alter>0</key-alter>
           <key-octave number="1">2</key-octave>
           <key-octave number="2">3</key-octave>
diff --git a/input/regression/musicxml/13d-KeySignatures-Microtones.xml b/input/regression/musicxml/13d-KeySignatures-Microtones.xml
index 1115b5f5af..9505e1555e 100644
--- a/input/regression/musicxml/13d-KeySignatures-Microtones.xml
+++ b/input/regression/musicxml/13d-KeySignatures-Microtones.xml
@@ -21,19 +21,19 @@
       <attributes>
         <divisions>1</divisions>
         <key>
-          <key-step>4</key-step>
+          <key-step>G</key-step>
           <key-alter>-1.5</key-alter>
-          <key-step>5</key-step>
+          <key-step>A</key-step>
           <key-alter>-1</key-alter>
-          <key-step>6</key-step>
+          <key-step>B</key-step>
           <key-alter>-0.5</key-alter>
-          <key-step>0</key-step>
+          <key-step>C</key-step>
           <key-alter>0</key-alter>
-          <key-step>1</key-step>
+          <key-step>D</key-step>
           <key-alter>0.5</key-alter>
-          <key-step>2</key-step>
+          <key-step>E</key-step>
           <key-alter>1</key-alter>
-          <key-step>3</key-step>
+          <key-step>F</key-step>
           <key-alter>1.5</key-alter>
         </key>
         <time>
diff --git a/input/regression/musicxml/21f-Chord-ElementInBetween.xml b/input/regression/musicxml/21f-Chord-ElementInBetween.xml
index c0a0b87927..6a7de1cd2f 100644
--- a/input/regression/musicxml/21f-Chord-ElementInBetween.xml
+++ b/input/regression/musicxml/21f-Chord-ElementInBetween.xml
@@ -45,8 +45,8 @@
                 <chord/>
                 <pitch>
                     <step>F</step>
-                    <octave>4</octave>
                     <alter>1</alter>
+                    <octave>4</octave>
                 </pitch>
                 <duration>1</duration>
                 <voice>1</voice>
diff --git a/input/regression/musicxml/22d-Parenthesized-Noteheads.xml b/input/regression/musicxml/22d-Parenthesized-Noteheads.xml
index 4e4fefad3f..297beed22c 100644
--- a/input/regression/musicxml/22d-Parenthesized-Noteheads.xml
+++ b/input/regression/musicxml/22d-Parenthesized-Noteheads.xml
@@ -41,7 +41,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <pitch>
@@ -71,7 +71,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <chord/>
@@ -91,7 +91,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <chord/>
@@ -102,7 +102,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <chord/>
@@ -113,14 +113,14 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <rest/>
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <note>
         <rest>
@@ -130,7 +130,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <notehead parentheses="yes"/>
+        <notehead parentheses="yes">normal</notehead>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
diff --git a/input/regression/musicxml/24d-AfterGrace.xml b/input/regression/musicxml/24d-AfterGrace.xml
index 94816a2ca9..9e5f3136cc 100644
--- a/input/regression/musicxml/24d-AfterGrace.xml
+++ b/input/regression/musicxml/24d-AfterGrace.xml
@@ -5,7 +5,7 @@
   <identification>
     <miscellaneous>
       <miscellaneous-field name="description">Some grace notes and after-graces
-            (indicated by steal-time-previous and steal-time-next).</miscellaneous-field>
+            (indicated by steal-time-previous and steal-time-following).</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
@@ -52,7 +52,7 @@
         <staff>1</staff>
       </note>
       <note>
-        <grace steal-time-next="20"/>
+        <grace steal-time-following="20"/>
         <pitch>
           <step>A</step>
           <octave>5</octave>
diff --git a/input/regression/musicxml/31a-Directions.xml b/input/regression/musicxml/31a-Directions.xml
index 95f32abb68..4e1412426a 100644
--- a/input/regression/musicxml/31a-Directions.xml
+++ b/input/regression/musicxml/31a-Directions.xml
@@ -569,7 +569,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <lyric number="1"><syllabic>continue</syllabic><text>change</text></lyric>
+        <lyric number="1"><syllabic>middle</syllabic><text>change</text></lyric>
       </note>
       <note>
         <pitch><step>C</step><octave>4</octave></pitch>
@@ -674,9 +674,9 @@
       <direction>
         <direction-type>
           <scordatura>
-              <accord string="0"><tuning-step>C</tuning-step><tuning-octave>3</tuning-octave></accord>
-              <accord string="1"><tuning-step>G</tuning-step><tuning-octave>5</tuning-octave></accord>
-              <accord string="2"><tuning-step>E</tuning-step><tuning-octave>5</tuning-octave></accord>
+              <accord string="3"><tuning-step>C</tuning-step><tuning-octave>3</tuning-octave></accord>
+              <accord string="2"><tuning-step>G</tuning-step><tuning-octave>5</tuning-octave></accord>
+              <accord string="1"><tuning-step>E</tuning-step><tuning-octave>5</tuning-octave></accord>
           </scordatura>
         </direction-type>
       </direction>
diff --git a/input/regression/musicxml/32a-Notations.xml b/input/regression/musicxml/32a-Notations.xml
index 06be5dde21..ab92216ff2 100644
--- a/input/regression/musicxml/32a-Notations.xml
+++ b/input/regression/musicxml/32a-Notations.xml
@@ -471,7 +471,7 @@
             <wavy-line placement="below" type="start"/>
           </ornaments>
         </notations>
-        <lyric number="1"><syllabic>continue</syllabic><text>wavy</text></lyric>
+        <lyric number="1"><syllabic>middle</syllabic><text>wavy</text></lyric>
       </note>
       <note>
         <pitch>
@@ -533,7 +533,7 @@
         <voice>1</voice>
         <type>quarter</type>
         <notations>
-          <ornaments><tremolo/></ornaments>
+          <ornaments><tremolo>3</tremolo></ornaments>
         </notations>
         <lyric number="1"><text>trem.</text></lyric>
       </note>
diff --git a/input/regression/musicxml/33a-Spanners.xml b/input/regression/musicxml/33a-Spanners.xml
index 5fd05e6e55..dfcd0b2a38 100644
--- a/input/regression/musicxml/33a-Spanners.xml
+++ b/input/regression/musicxml/33a-Spanners.xml
@@ -734,11 +734,7 @@
     </measure>
     <!--=======================================================-->
     <measure number="19">
-      <direction>
-        <direction-type>
-          <grouping type="start"/>
-        </direction-type>
-      </direction>
+      <grouping type="start"/>
       <note>
         <pitch>
           <step>B</step>
@@ -766,11 +762,7 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
-      <direction>
-        <direction-type>
-          <grouping type="stop"/>
-        </direction-type>
-      </direction>
+      <grouping type="stop"/>
     </measure>
     <!--=======================================================-->
     <measure number="20">
@@ -795,7 +787,7 @@
         <voice>1</voice>
         <type>quarter</type>
         <notations>
-          <ornaments><tremolo type="stop"/></ornaments>
+          <ornaments><tremolo type="stop">2</tremolo></ornaments>
         </notations>
       </note>
       <note>
diff --git a/input/regression/musicxml/71f-AllChordTypes.xml b/input/regression/musicxml/71f-AllChordTypes.xml
index f54ec1f61a..d6abafbb15 100644
--- a/input/regression/musicxml/71f-AllChordTypes.xml
+++ b/input/regression/musicxml/71f-AllChordTypes.xml
@@ -243,7 +243,6 @@
           <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>
diff --git a/python/musicxml.py b/python/musicxml.py
index 76e33ceb7b..be3c61ca8f 100644
--- a/python/musicxml.py
+++ b/python/musicxml.py
@@ -35,6 +35,8 @@ def musicxml_duration_to_log (dur):
              'longa': -2,
              'long': -2}.get (dur, 0)
 
+
+
 def interpret_alter_element (alter_elm):
     alter = 0
     if alter_elm:
@@ -253,9 +255,8 @@ class Pitch (Music_xml_node):
 	return step
     def get_octave (self):
 	ch = self.get_unique_typed_child (get_class (u'octave'))
-
-	step = ch.get_text ().strip ()
-	return int (step)
+	octave = ch.get_text ().strip ()
+	return int (octave)
 
     def get_alteration (self):
 	ch = self.get_maybe_exist_typed_child (get_class (u'alter'))
@@ -417,7 +418,7 @@ class Attributes (Measure_element):
             current_step = 0
             for i in key.get_all_children ():
                 if isinstance (i, KeyStep):
-                    current_step = int (i.get_text ())
+                    current_step = i.get_text ().strip ()
                 elif isinstance (i, KeyAlter):
                     alterations.append ([current_step, interpret_alter_element (i)])
                 elif isinstance (i, KeyOctave):
@@ -1039,15 +1040,14 @@ class Rest (Music_xml_node):
     def get_step (self):
         ch = self.get_maybe_exist_typed_child (get_class (u'display-step'))
         if ch:
-            step = ch.get_text ().strip ()
-            return step
+            return ch.get_text ().strip ()
         else:
             return None
     def get_octave (self):
         ch = self.get_maybe_exist_typed_child (get_class (u'display-octave'))
         if ch:
-            step = ch.get_text ().strip ()
-            return int (step)
+            oct = ch.get_text ().strip ()
+            return int (oct)
         else:
             return None
 
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 6f70baea07..a14119b320 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -342,6 +342,13 @@ class PartGroupInfo:
         error_message (_ ("Unprocessed PartGroupInfo %s encountered") % self)
         return ''
 
+def musicxml_step_to_lily (step):
+    if step:
+        return (ord (step) - ord ('A') + 7 - 2) % 7
+    else:
+        return None
+
+
 def staff_attributes_to_string_tunings (mxl_attr):
     details = mxl_attr.get_maybe_exist_named_child ('staff-details')
     if not details:
@@ -896,7 +903,12 @@ def musicxml_key_to_lily (attributes):
 
     else:
         # Non-standard key signature of the form [[step,alter<,octave>],...]
-        change.non_standard_alterations = key_sig
+        # MusicXML contains C,D,E,F,G,A,B as steps, lily uses 0-7, so convert
+        alterations = []
+        for k in key_sig:
+            k[0] = musicxml_step_to_lily (k[0])
+            alterations.append (k)
+        change.non_standard_alterations = alterations
     return change
 
 def musicxml_transpose_to_lily (attributes):
@@ -2116,12 +2128,6 @@ class VoiceData:
         self.lyrics_dict = {}
         self.lyrics_order = []
 
-def musicxml_step_to_lily (step):
-    if step:
-	return (ord (step) - ord ('A') + 7 - 2) % 7
-    else:
-	return None
-
 def measure_length_from_attributes (attr, current_measure_length):
     len = attr.get_measure_length ()
     if not len:
-- 
2.39.2