From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 8 Dec 2008 20:32:33 +0000 (+0100)
Subject: MusicXML: Clean up test suite
X-Git-Tag: release/2.12.0-1~13^2~27^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7fdc4714403efef8b1b12bc55359bb384b87f81c;p=lilypond.git

MusicXML: Clean up test suite

-) Remove all references to Finale
-) Proper test case for all spanners
-) Remove (score|midi)-instrument, stem, sound, position information, etc.
   from test cases. Those will be tested in separate cases
---

diff --git a/buildscripts/musicxml_generate_keys.py b/buildscripts/musicxml_generate_keys.py
index d82b168fa9..7a16ac987f 100644
--- a/buildscripts/musicxml_generate_keys.py
+++ b/buildscripts/musicxml_generate_keys.py
@@ -3,10 +3,10 @@
 notes = "CDEFGAB"
 alterations = [-1, 0, 1]
 
-def print_measure (nr, fifth, mode, atts = "", final = ""):
+def print_measure (nr, fifth, mode, atts1 = "", atts = "", final = ""):
     print """    <measure number="%s">
       <attributes>
-        <key>
+%s        <key>
           <fifths>%s</fifths>
           <mode>%s</mode>
         </key>
@@ -20,10 +20,11 @@ def print_measure (nr, fifth, mode, atts = "", final = ""):
         <voice>1</voice>
         <type>half</type>
       </note>
-%s    </measure>""" % (nr, fifth, mode, atts, final)
+%s    </measure>""" % (nr, atts1, fifth, mode, atts, final)
 
-first_atts = """        <divisions>1</divisions>
-        <time symbol="common">
+first_div = """        <divisions>1</divisions>
+"""
+first_atts = """        <time symbol="common">
           <beats>2</beats>
           <beat-type>4</beat-type>
         </time>
@@ -43,30 +44,35 @@ print """<?xml version="1.0" encoding="UTF-8"?>
                                 "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
   <movement-title>Different Key signatures</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Various key signature: from 11
+            flats to 11 sharps (each one first one measure in major, then one
+            measure in minor)</miscellaneous-field>
+    </miscellaneous>
+  </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
     </score-part>
   </part-list>
   <!--=========================================================-->
-  <part id="P1">
-"""
+  <part id="P1">"""
 
 max_range = 11
 measure = 0
 for fifth in range(-max_range, max_range+1):
     measure += 1
     if fifth == -max_range:
-        print_measure (measure, fifth, "major", first_atts)
+        print_measure (measure, fifth, "major", first_div, first_atts)
     else:
         print_measure (measure, fifth, "major")
     measure += 1
     if fifth == max_range:
-        print_measure (measure, fifth, "minor", "", final_barline)
+        print_measure (measure, fifth, "minor", "", "", final_barline)
     else:
         print_measure (measure, fifth, "minor")
     
 
 print """  </part>
-</score-partwise>
-"""
+</score-partwise>"""
diff --git a/buildscripts/musicxml_generate_timesignatures.py b/buildscripts/musicxml_generate_timesignatures.py
index 20e34cbf84..c4cc78a103 100644
--- a/buildscripts/musicxml_generate_timesignatures.py
+++ b/buildscripts/musicxml_generate_timesignatures.py
@@ -3,35 +3,76 @@
 notes = "CDEFGAB"
 alterations = [-1, 0, 1]
 
-def print_measure (nr, beats, type, params = "", attr = "", barline = ""):
+dot_xml = """        <dot/>
+"""
+tie_xml = """        <tie type="%s"/>
+"""
+tie_notation_xml = """        <notations><tied type="%s"/></notations>
+"""
+
+
+def generate_note (duration, end_tie = False):
+    if duration < 2:
+      (notetype, dur) = ("8th", 1)
+    elif duration < 4:
+      (notetype, dur) = ("quarter", 2)
+    elif duration < 8:
+      (notetype, dur) = ("half", 4)
+    else:
+      (notetype, dur) = ("whole", 8)
+    dur_processed = dur
+    dot = ""
+    if (duration - dur_processed >= dur/2):
+      dot = dot_xml
+      dur_processed += dur/2
+      if (duration - dur_processed >= max(dur/4, 1)):
+        dot += dot_xml
+        dur_processed += dur/4
+    tie = ""
+    tie_notation = ""
+    if end_tie:
+        tie += tie_xml % "stop"
+        tie_notation += tie_notation_xml % "stop"
+    second_note = None
+    if duration - dur_processed > 0:
+        second_note = generate_note (duration-dur_processed, True)
+        tie += tie_xml % "start"
+        tie_notation += tie_notation_xml % "start"
+    note = """      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>%s</duration>
+%s        <voice>1</voice>
+        <type>%s</type>
+%s%s      </note>""" % (dur_processed, tie, notetype, dot, tie_notation)
+    if second_note:
+        return "%s\n%s" % (note, second_note)
+    else:
+        return note
+
+def print_measure (nr, beats, type, params = "", attr = "", attr2 = "", barline = ""):
+    duration = 8*beats/type
+    note = generate_note (duration)
+
     print """    <measure number="%s">
       <attributes>
-%s        <time %s>
+%s        <time%s>
           <beats>%s</beats>
           <beat-type>%s</beat-type>
         </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-%s    </measure>""" % (nr, attr, params, beats, type, barline)
+%s      </attributes>
+%s
+%s    </measure>""" % (nr, attr, params, beats, type, attr2, note, barline)
 
-first_atts = """        <divisions>1</divisions>
+first_key = """        <divisions>2</divisions>
         <key>
           <fifths>0</fifths>
           <mode>major</mode>
         </key>
-        <time symbol="common">
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
+"""
+first_clef = """        <clef>
           <sign>G</sign>
           <line>2</line>
         </clef>
@@ -46,19 +87,24 @@ print """<?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>Different time signatures</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Various time signatures: 2/2 
+            (alla breve), 4/4 (C), 2/2, 3/2, 2/4, 3/4, 4/4, 5/4, 3/8, 6/8, 
+            12/8</miscellaneous-field>
+    </miscellaneous>
+  </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
     </score-part>
   </part-list>
   <!--=========================================================-->
-  <part id="P1">
-"""
+  <part id="P1">"""
 
 measure = 1
 
-print_measure (measure, 2, 2, " symbol=\"common\"", first_atts)
+print_measure (measure, 2, 2, " symbol=\"common\"", first_key, first_clef)
 measure += 1
 
 print_measure (measure, 4, 4, " symbol=\"common\"")
@@ -88,9 +134,8 @@ measure += 1
 print_measure (measure, 6, 8)
 measure += 1
 
-print_measure (measure, 12, 8, "", "", final_barline)
+print_measure (measure, 12, 8, "", "", "", final_barline)
 measure += 1
 
 print """  </part>
-</score-partwise>
-"""
+</score-partwise>"""
diff --git a/input/regression/musicxml/0-Introduction.itexi b/input/regression/musicxml/0-Introduction.itexi
deleted file mode 100644
index 8d9d03f30a..0000000000
--- a/input/regression/musicxml/0-Introduction.itexi
+++ /dev/null
@@ -1,67 +0,0 @@
-@menu
-* Introduction ::
-* Test cases ::
-@end menu
-
-@node Introduction
-@chapter Introduction
-
-@heading Why a MusicXML test suite?
-
-This test suite of sample @uref{http://www.musicxml.org/,MusicXML} files
-is supposed to fill a severe gap for all developers implementing MusicXML
-support in their application: There is no complete test suite of MusicXML
-files available for testing purposes.
-
-@heading Downloading the test suite
-
-The complete set of MusicXML test files contained in this suite can be downloaded
-@uref{MusicXML-TestSuite-0.1.zip,here} as a ZIP archive.
-
-@heading Connection with @uref{http://www.lilypond.org/,LilyPond}
-
-At the same time as providing a generic test suite for MusicXML document,
-this test suite also serves as proofs for the musicxml2ly script provided with
-LilyPond @lilypondversion. The images shown in the @ref{Test cases} chapter
-were generated by running @command{musicxml2ly} and @command{lilypond} on
-the MusicXML files. As @command{musicxml2ly} does not yet perfectly support
-every single aspect of MusicXML, the output is not supposed to be used as 
-a definitive reference rendering, but rather as an indication how one 
-particular application supports and interprets each of the test files.
-
-If something does not seem right in the output, it might either be that this
-feature has not been implemented yet, has been wrongly implemented, or a 
-regression has crept in recently...
-
-In the web version of this document, you can click on the file name 
-or figure for each example to see the corresponding .ly intermediary file.
-
-@heading Structure of this test suite 
-
-Each test file (typically hand-crafted from the MusicXML "specification")
-checks one particular aspect of MusicXML. A short description of the 
-particular feature for a file is given element inside the file in a comment 
-element of the form:
-@example
-  <identification><miscellaneous>
-    <miscellaneous-field name="description"> .... </miscellaneous-field>
-  </miscellaneous></identification>
-@end example
-
-
-The files are categorized by their first two digits with the following meaning:
-@itemize
-@item 01-03 ... Basics: Pitches, Rests, Rhythm
-@item 11-13 ... Staff attributes: Time signatures, Clefs, Key signatures
-@item 21-24 ... Note settings: Chorded notes, note heads, tuplets, grace notes
-@item 31-33 ... Notations and articulations: Dynamics (staff-attached), Notations (note-attached), Spanners
-@item 41-44 ... Parts: Multiple parts, multi-voice parts, multi-staff parts
-@item 45-46 ... Measure issues and repeats
-@item 51-52 ... Page issues: Header fields, page layout
-@item 61-69 ... Vocal music
-@item 71-75 ... Instrument-specific: Guitar (Chord, fretboards), Transposing instruments, Percussion, Figured Bass, Others
-@item 90-99 ... Various Other: Compressed MusicXML files, compatibility with broken MusicXML files exported by other applications
-@end itemize
-
-@node Test cases
-@chapter Test cases
diff --git a/input/regression/musicxml/00-Introduction.itexi b/input/regression/musicxml/00-Introduction.itexi
new file mode 100644
index 0000000000..475daa6832
--- /dev/null
+++ b/input/regression/musicxml/00-Introduction.itexi
@@ -0,0 +1,72 @@
+@menu
+* Introduction ::
+* Test cases ::
+@end menu
+
+@node Introduction
+@chapter Introduction
+
+@heading Why a MusicXML test suite?
+
+This test suite of sample @uref{http://www.musicxml.org/,MusicXML} files
+is supposed to fill a severe gap for all developers implementing MusicXML
+support in their application: There is no complete test suite of MusicXML
+files available for testing purposes.
+
+@heading Downloading the test suite
+
+The complete set of MusicXML test files contained in this suite can be downloaded
+@uref{MusicXML-TestSuite-0.1.zip,here} as a ZIP archive.
+
+@heading Connection with @uref{http://www.lilypond.org/,LilyPond}
+
+At the same time as providing a generic test suite for MusicXML document,
+this test suite also serves as proofs for the musicxml2ly script provided with
+LilyPond @lilypondversion. The images shown in the @ref{Test cases} chapter
+were generated by running @command{musicxml2ly} and @command{lilypond} on
+the MusicXML files. As @command{musicxml2ly} does not yet perfectly support
+every single aspect of MusicXML, the output is not supposed to be used as 
+a definitive reference rendering, but rather as an indication how one 
+particular application supports and interprets each of the test files.
+
+If something does not seem right in the output, it might either be that this
+feature has not been implemented yet, has been wrongly implemented, or a 
+regression has crept in recently...
+
+In the web version of this document, you can click on the file name 
+or figure for each example to see the corresponding .ly intermediary file.
+
+@heading Structure of this test suite 
+
+Each test file (typically hand-crafted from the MusicXML "specification")
+checks one particular aspect of MusicXML. A short description of the 
+particular feature for a file is given element inside the file in a comment 
+element of the form:
+@example
+  <identification><miscellaneous>
+    <miscellaneous-field name="description"> .... </miscellaneous-field>
+  </miscellaneous></identification>
+@end example
+
+
+The files are categorized by their first two digits with the following meaning:
+@itemize
+@item 01-03 ... Basics: Pitches, Rests, Rhythm
+@item 11-13 ... Staff attributes: Time signatures, Clefs, Key signatures
+@item 21-24 ... Note settings: Chorded notes, note heads, tuplets, grace notes
+@item 31-33 ... Notations and articulations: Dynamics (staff-attached), Notations (note-attached), Spanners
+@item 41-44 ... Parts: Multiple parts, multi-voice parts, multi-staff parts
+@item 45-46 ... Measure issues and repeats
+@item 51-52 ... Page issues: Header fields, page layout
+@item 55-59 ... Exact positioning of items, offsets, etc.
+@item 61-69 ... Vocal music
+@item 71-75 ... Instrument-specific: Guitar (Chord, fretboards), Transposing instruments, Percussion, Figured Bass, Others
+@item 81-89 ... MIDI generation (all sound-related issues)
+@item 90-99 ... Various Other: Compressed MusicXML files, compatibility with broken MusicXML files exported by other applications
+@end itemize
+
+Some of the catetories (in particular the exact item positioning and the
+MIDI generation don'thave any test cases yet.
+
+@node Test cases
+@chapter Test cases
diff --git a/input/regression/musicxml/01a-Pitches-Pitches.xml b/input/regression/musicxml/01a-Pitches-Pitches.xml
index 176850dca3..177f2c89db 100644
--- a/input/regression/musicxml/01a-Pitches-Pitches.xml
+++ b/input/regression/musicxml/01a-Pitches-Pitches.xml
@@ -14,13 +14,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -41,7 +34,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>G</step>
@@ -50,7 +42,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -60,7 +51,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -70,7 +60,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -80,7 +69,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -93,7 +81,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -103,7 +90,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -113,7 +99,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -123,7 +108,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -136,7 +120,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -146,7 +129,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -156,7 +138,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -166,7 +147,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -179,7 +159,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -189,7 +168,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -199,7 +177,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -209,7 +186,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -222,7 +198,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -232,7 +207,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -242,7 +216,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -252,12 +225,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
     <measure number="6">
-      <print new-system="yes"/>
       <note>
         <pitch>
           <step>F</step>
@@ -266,7 +237,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -276,7 +246,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -286,7 +255,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -296,7 +264,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -309,7 +276,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -319,7 +285,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -329,7 +294,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -339,7 +303,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -352,7 +315,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -362,7 +324,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -372,7 +333,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -382,7 +342,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -397,7 +356,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -409,7 +367,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -421,7 +378,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -433,7 +389,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -448,7 +403,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -460,7 +414,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -472,7 +425,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -484,12 +436,10 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
     <measure number="11">
-      <print new-system="yes"/>
       <note>
         <pitch>
           <step>A</step>
@@ -500,7 +450,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -512,7 +461,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -524,7 +472,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -536,7 +483,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -551,7 +497,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -563,7 +508,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -575,7 +519,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -587,7 +530,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -602,7 +544,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -614,7 +555,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -626,7 +566,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -638,7 +577,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -653,7 +591,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -665,7 +602,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -677,7 +613,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -689,7 +624,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -704,7 +638,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -716,7 +649,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -728,7 +660,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -740,12 +671,10 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
     <measure number="16">
-      <print new-system="yes"/>
       <note>
         <pitch>
           <step>G</step>
@@ -756,7 +685,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -768,7 +696,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -780,7 +707,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -792,7 +718,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -807,7 +732,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -819,7 +743,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -831,7 +754,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -843,7 +765,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -858,7 +779,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -870,7 +790,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -882,7 +801,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -894,7 +812,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -909,7 +826,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -921,7 +837,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -933,7 +848,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -945,7 +859,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -960,7 +873,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -972,7 +884,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -984,7 +895,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -996,12 +906,10 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
     <measure number="21">
-      <print new-system="yes"/>
       <note>
         <pitch>
           <step>B</step>
@@ -1012,7 +920,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1024,7 +931,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1036,7 +942,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1048,7 +953,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -1063,7 +967,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1075,7 +978,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1087,7 +989,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1099,7 +1000,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -1114,7 +1014,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1126,7 +1025,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1138,7 +1036,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1150,7 +1047,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -1165,7 +1061,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1177,7 +1072,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1189,7 +1083,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1201,7 +1094,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -1216,7 +1108,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>double-sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1228,7 +1119,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>flat-flat</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1240,7 +1130,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1252,12 +1141,10 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
     <measure number="32">
-      <print new-system="yes"/>
       <note>
         <pitch>
           <step>C</step>
@@ -1268,7 +1155,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -1280,7 +1166,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental editorial="yes">sharp</accidental>
-        <stem>down</stem>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
diff --git a/input/regression/musicxml/01b-Pitches-Intervals.xml b/input/regression/musicxml/01b-Pitches-Intervals.xml
index 79d1430c62..c033498d52 100644
--- a/input/regression/musicxml/01b-Pitches-Intervals.xml
+++ b/input/regression/musicxml/01b-Pitches-Intervals.xml
@@ -32,7 +32,6 @@
           <line>2</line>
         </clef>
       </attributes>
-
       <note>
         <pitch>
           <step>C</step>
diff --git a/input/regression/musicxml/01d-Pitches-Microtones.xml b/input/regression/musicxml/01d-Pitches-Microtones.xml
index 659d11c3ce..2019abbf5f 100644
--- a/input/regression/musicxml/01d-Pitches-Microtones.xml
+++ b/input/regression/musicxml/01d-Pitches-Microtones.xml
@@ -13,13 +13,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
diff --git a/input/regression/musicxml/02a-Rests-Durations.xml b/input/regression/musicxml/02a-Rests-Durations.xml
index c5f3f55d01..1398844548 100644
--- a/input/regression/musicxml/02a-Rests-Durations.xml
+++ b/input/regression/musicxml/02a-Rests-Durations.xml
@@ -4,12 +4,6 @@
 <score-partwise>
   <movement-title>Rest unit test</movement-title>
   <identification>
-    <rights>Public Domain</rights>
-    <encoding>
-      <software>Finale 2007 for Windows</software>
-      <software>Dolet Light for Finale 2007</software>
-      <encoding-date>2007-10-26</encoding-date>
-    </encoding>
     <miscellaneous>
       <miscellaneous-field name="description">All different rest lengths: A 
           two-bar multi-measure rest, a whole rest, a half, etc. until a 
@@ -19,13 +13,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -49,7 +36,6 @@
           <multiple-rest>2</multiple-rest>
         </measure-style>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>128</duration>
diff --git a/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml b/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml
index 42d4a74e39..346503e361 100644
--- a/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml
+++ b/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml
@@ -11,13 +11,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -41,7 +34,6 @@
           <multiple-rest>3</multiple-rest>
         </measure-style>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml b/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml
index 8594bd2931..c357e5bf03 100644
--- a/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml
+++ b/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml
@@ -12,13 +12,6 @@
   <part-list>
     <score-part id="P1">
       <part-name print-object="no">MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
diff --git a/input/regression/musicxml/03a-Rhythm-Durations.xml b/input/regression/musicxml/03a-Rhythm-Durations.xml
index 0c162bd8dc..e0dab25041 100644
--- a/input/regression/musicxml/03a-Rhythm-Durations.xml
+++ b/input/regression/musicxml/03a-Rhythm-Durations.xml
@@ -32,7 +32,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -71,7 +70,6 @@
         <duration>128</duration>
         <voice>1</voice>
         <type>half</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -81,7 +79,6 @@
         <duration>64</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -91,8 +88,6 @@
         <duration>32</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">begin</beam>
       </note>
       <note>
         <pitch>
@@ -102,9 +97,6 @@
         <duration>16</duration>
         <voice>1</voice>
         <type>16th</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
       </note>
       <note>
         <pitch>
@@ -114,10 +106,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>32nd</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">begin</beam>
       </note>
       <note>
         <pitch>
@@ -127,11 +115,6 @@
         <duration>4</duration>
         <voice>1</voice>
         <type>64th</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">continue</beam>
-        <beam number="4">begin</beam>
       </note>
       <note>
         <pitch>
@@ -141,12 +124,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>128th</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">continue</beam>
-        <beam number="4">continue</beam>
-        <beam number="5">begin</beam>
       </note>
       <note>
         <pitch>
@@ -156,12 +133,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>128th</type>
-        <stem>down</stem>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-        <beam number="3">end</beam>
-        <beam number="4">end</beam>
-        <beam number="5">end</beam>
       </note>
     </measure>
     <!--=======================================================-->
@@ -224,7 +195,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <dot/>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -235,8 +205,6 @@
         <voice>1</voice>
         <type>eighth</type>
         <dot/>
-        <stem>down</stem>
-        <beam number="1">begin</beam>
       </note>
       <note>
         <pitch>
@@ -247,9 +215,6 @@
         <voice>1</voice>
         <type>16th</type>
         <dot/>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
       </note>
       <note>
         <pitch>
@@ -260,10 +225,6 @@
         <voice>1</voice>
         <type>32nd</type>
         <dot/>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">begin</beam>
       </note>
       <note>
         <pitch>
@@ -274,10 +235,6 @@
         <voice>1</voice>
         <type>64th</type>
         <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">continue</beam>
-        <beam number="4">begin</beam>
       </note>
       <note>
         <pitch>
@@ -288,11 +245,6 @@
         <voice>1</voice>
         <type>128th</type>
         <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">continue</beam>
-        <beam number="4">continue</beam>
-        <beam number="5">begin</beam>
       </note>
       <note>
         <pitch>
@@ -303,11 +255,6 @@
         <voice>1</voice>
         <type>128th</type>
         <dot/>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-        <beam number="3">end</beam>
-        <beam number="4">end</beam>
-        <beam number="5">end</beam>
       </note>
     </measure>
     <!--=======================================================-->
@@ -386,7 +333,6 @@
         <type>eighth</type>
         <dot/>
         <dot/>
-        <beam number="1">begin</beam>
       </note>
       <note>
         <pitch>
@@ -398,8 +344,6 @@
         <type>16th</type>
         <dot/>
         <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
       </note>
       <note>
         <pitch>
@@ -411,9 +355,6 @@
         <type>32nd</type>
         <dot/>
         <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">begin</beam>
       </note>
       <note>
         <pitch>
@@ -425,10 +366,6 @@
         <type>64th</type>
         <dot/>
         <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">continue</beam>
-        <beam number="4">begin</beam>
       </note>
       <note>
         <pitch>
@@ -440,10 +377,6 @@
         <type>64th</type>
         <dot/>
         <dot/>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-        <beam number="3">end</beam>
-        <beam number="4">end</beam>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
diff --git a/input/regression/musicxml/03b-Rhythm-Backup.xml b/input/regression/musicxml/03b-Rhythm-Backup.xml
index 0958d3f372..b0e675496a 100644
--- a/input/regression/musicxml/03b-Rhythm-Backup.xml
+++ b/input/regression/musicxml/03b-Rhythm-Backup.xml
@@ -13,7 +13,6 @@
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
-      <part-abbreviation></part-abbreviation>
     </score-part>
   </part-list>
   <part id="P1">
diff --git a/input/regression/musicxml/03c-Rhythm-DivisionChange.xml b/input/regression/musicxml/03c-Rhythm-DivisionChange.xml
new file mode 100644
index 0000000000..16a54c5f59
--- /dev/null
+++ b/input/regression/musicxml/03c-Rhythm-DivisionChange.xml
@@ -0,0 +1,106 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Although uncommon, the divisions
+            of a quarter note can change somewhere in the middle of a MusicXML
+            file. Here, the first half measure uses a division of 1, which
+            then changes to 8 in the middle of the first measure and to 38
+            in the middle of the second measure.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <attributes>
+        <divisions>8</divisions>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>16</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <attributes>
+        <divisions>38</divisions>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>76</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/11a-TimeSignatures.xml b/input/regression/musicxml/11a-TimeSignatures.xml
index 8d25e39a2b..23339737bd 100644
--- a/input/regression/musicxml/11a-TimeSignatures.xml
+++ b/input/regression/musicxml/11a-TimeSignatures.xml
@@ -4,7 +4,9 @@
 <score-partwise>
   <identification>
     <miscellaneous>
-      <miscellaneous-field name="description">Various time signatures: 2/2 (alla breve), 4/4 (C), 2/2, 3/2, 2/4, 3/4, 4/4, 5/4, 3/8, 6/8, 12/8</miscellaneous-field>
+      <miscellaneous-field name="description">Various time signatures: 2/2 
+            (alla breve), 4/4 (C), 2/2, 3/2, 2/4, 3/4, 4/4, 5/4, 3/8, 6/8, 
+            12/8</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
@@ -14,7 +16,6 @@
   </part-list>
   <!--=========================================================-->
   <part id="P1">
-
     <measure number="1">
       <attributes>
         <divisions>2</divisions>
@@ -22,7 +23,7 @@
           <fifths>0</fifths>
           <mode>major</mode>
         </key>
-        <time  symbol="common">
+        <time symbol="common">
           <beats>2</beats>
           <beat-type>2</beat-type>
         </time>
@@ -43,7 +44,7 @@
     </measure>
     <measure number="2">
       <attributes>
-        <time  symbol="common">
+        <time symbol="common">
           <beats>4</beats>
           <beat-type>4</beat-type>
         </time>
@@ -60,7 +61,7 @@
     </measure>
     <measure number="3">
       <attributes>
-        <time >
+        <time>
           <beats>2</beats>
           <beat-type>2</beat-type>
         </time>
@@ -77,7 +78,7 @@
     </measure>
     <measure number="4">
       <attributes>
-        <time >
+        <time>
           <beats>3</beats>
           <beat-type>2</beat-type>
         </time>
@@ -95,7 +96,7 @@
     </measure>
     <measure number="5">
       <attributes>
-        <time >
+        <time>
           <beats>2</beats>
           <beat-type>4</beat-type>
         </time>
@@ -195,7 +196,7 @@
     </measure>
     <measure number="10">
       <attributes>
-        <time >
+        <time>
           <beats>6</beats>
           <beat-type>8</beat-type>
         </time>
@@ -213,7 +214,7 @@
     </measure>
     <measure number="11">
       <attributes>
-        <time >
+        <time>
           <beats>12</beats>
           <beat-type>8</beat-type>
         </time>
diff --git a/input/regression/musicxml/12a-Clefs.xml b/input/regression/musicxml/12a-Clefs.xml
index c0b5017d0d..85be49ec1a 100644
--- a/input/regression/musicxml/12a-Clefs.xml
+++ b/input/regression/musicxml/12a-Clefs.xml
@@ -15,13 +15,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -42,7 +35,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -182,7 +174,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="9">
-      <print new-system="yes"/>
       <attributes>
         <clef>
           <sign>G</sign>
@@ -328,7 +319,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="17">
-      <print new-system="yes"/>
       <attributes>
         <clef>
           <sign>none</sign>
diff --git a/input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml b/input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml
index 9ba15fd59d..d0ad799e86 100644
--- a/input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml
+++ b/input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml
@@ -18,8 +18,8 @@
 			<attributes>
 				<divisions>1</divisions>
 				<time>
-				<beats>4</beats>
-				<beat-type>4</beat-type>
+					<beats>4</beats>
+					<beat-type>4</beat-type>
 				</time>
 			</attributes>
 			<note>
diff --git a/input/regression/musicxml/13a-KeySignatures.xml b/input/regression/musicxml/13a-KeySignatures.xml
index b8c0fb7ae0..1279fd2d14 100644
--- a/input/regression/musicxml/13a-KeySignatures.xml
+++ b/input/regression/musicxml/13a-KeySignatures.xml
@@ -5,7 +5,9 @@
   <movement-title>Different Key signatures</movement-title>
   <identification>
     <miscellaneous>
-      <miscellaneous-field name="description">Various key signature: from 11 flats to 11 sharps (each one first one measure in major, then one measure in minor)</miscellaneous-field>
+      <miscellaneous-field name="description">Various key signature: from 11
+            flats to 11 sharps (each one first one measure in major, then one
+            measure in minor)</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
@@ -15,7 +17,6 @@
   </part-list>
   <!--=========================================================-->
   <part id="P1">
-
     <measure number="1">
       <attributes>
         <divisions>1</divisions>
@@ -812,4 +813,3 @@
     </measure>
   </part>
 </score-partwise>
-
diff --git a/input/regression/musicxml/13b-KeySignatures-ChurchModes.xml b/input/regression/musicxml/13b-KeySignatures-ChurchModes.xml
index 63bac0bf3b..1f4852d514 100644
--- a/input/regression/musicxml/13b-KeySignatures-ChurchModes.xml
+++ b/input/regression/musicxml/13b-KeySignatures-ChurchModes.xml
@@ -177,4 +177,3 @@
     </measure>
   </part>
 </score-partwise>
-
diff --git a/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml b/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
index bb3cc6e29a..60872a970b 100644
--- a/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
+++ b/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
@@ -83,4 +83,3 @@
     </measure>
   </part>
 </score-partwise>
-
diff --git a/input/regression/musicxml/13d-KeySignatures-Microtones.xml b/input/regression/musicxml/13d-KeySignatures-Microtones.xml
index 0819bcf5ed..1115b5f5af 100644
--- a/input/regression/musicxml/13d-KeySignatures-Microtones.xml
+++ b/input/regression/musicxml/13d-KeySignatures-Microtones.xml
@@ -60,4 +60,3 @@
     </measure>
   </part>
 </score-partwise>
-
diff --git a/input/regression/musicxml/21a-Chord-Basic.xml b/input/regression/musicxml/21a-Chord-Basic.xml
index ef2db31a56..17464b874e 100644
--- a/input/regression/musicxml/21a-Chord-Basic.xml
+++ b/input/regression/musicxml/21a-Chord-Basic.xml
@@ -10,13 +10,6 @@
 	<part-list>
 		<score-part id="P0">
 			<part-name>MusicXML Part</part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
 		</score-part>
 	</part-list>
 	<part id="P0">
@@ -57,12 +50,6 @@
 				<voice>1</voice>
 				<type>quarter</type>
 			</note>
-			<note>
-				<rest/>
-				<duration>1920</duration>
-				<voice>1</voice>
-				<type>half</type>
-			</note>
 		</measure>
 	</part>
 </score-partwise>
diff --git a/input/regression/musicxml/21b-Chords-TwoNotes.xml b/input/regression/musicxml/21b-Chords-TwoNotes.xml
index 6dce4ee94f..7991e247f2 100644
--- a/input/regression/musicxml/21b-Chords-TwoNotes.xml
+++ b/input/regression/musicxml/21b-Chords-TwoNotes.xml
@@ -10,13 +10,6 @@
 	<part-list>
 		<score-part id="P0">
 			<part-name>MusicXML Part</part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
 		</score-part>
 	</part-list>
 	<part id="P0">
diff --git a/input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml b/input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml
index d18ba71faa..f47ef862dd 100644
--- a/input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml
+++ b/input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml
@@ -10,13 +10,6 @@
 	<part-list>
 		<score-part id="P0">
 			<part-name>MusicXML Part</part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
 		</score-part>
 	</part-list>
 	<part id="P0">
@@ -207,9 +200,9 @@
 					<step>A</step>
 					<octave>4</octave>
 				</pitch>
-				<duration>960</duration>
+				<duration>1920</duration>
 				<voice>1</voice>
-				<type>quarter</type>
+				<type>half</type>
 			</note>
 			<note>
 				<chord/>
@@ -217,38 +210,9 @@
 					<step>F</step>
 					<octave>4</octave>
 				</pitch>
-				<duration>960</duration>
+				<duration>1920</duration>
 				<voice>1</voice>
-				<type>quarter</type>
-			</note>
-			<note>
-				<chord/>
-				<pitch>
-					<step>E</step>
-					<octave>5</octave>
-				</pitch>
-				<duration>960</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-			</note>
-			<note>
-				<pitch>
-					<step>A</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>960</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-			</note>
-			<note>
-				<chord/>
-				<pitch>
-					<step>F</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>960</duration>
-				<voice>1</voice>
-				<type>quarter</type>
+				<type>half</type>
 			</note>
 			<note>
 				<chord/>
@@ -256,9 +220,9 @@
 					<step>D</step>
 					<octave>5</octave>
 				</pitch>
-				<duration>960</duration>
+				<duration>1920</duration>
 				<voice>1</voice>
-				<type>quarter</type>
+				<type>half</type>
 			</note>
 		</measure>
 	</part>
diff --git a/input/regression/musicxml/21d-Chords-SchubertStabatMater.xml b/input/regression/musicxml/21d-Chords-SchubertStabatMater.xml
index c809ded659..a89acac99c 100644
--- a/input/regression/musicxml/21d-Chords-SchubertStabatMater.xml
+++ b/input/regression/musicxml/21d-Chords-SchubertStabatMater.xml
@@ -1,27 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 0.6 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
-	<identification> 
-		<miscellaneous>
-			<miscellaneous-field name="description">Chords in the 
+        <identification> 
+                <miscellaneous>
+                        <miscellaneous-field name="description">Chords in the 
                             second measure, after several ornaments in the first 
                             measure and a p at the beginning of the second 
                             measure.</miscellaneous-field>
-		</miscellaneous>
-	</identification> 
-	<part-list>
-		<score-part id="P0">
-			<part-name>MusicXML Part</part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
-		</score-part>
-	</part-list>
-	<part id="P0">
+                </miscellaneous>
+        </identification> 
+        <part-list>
+                <score-part id="P0">
+                        <part-name>MusicXML Part</part-name>
+                </score-part>
+        </part-list>
+        <part id="P0">
           <measure number="1">
             <attributes>
               <divisions>8</divisions>
@@ -38,15 +31,14 @@
                 <line>2</line>
               </clef>
             </attributes>
-            <sound tempo="120"/>
             <direction placement="above">
               <direction-type>
-                <words default-y="15" font-family="Times New Roman" font-size="8,5" font-weight="bold">Largo</words>
+                <words font-weight="bold">Largo</words>
               </direction-type>
             </direction>
             <direction placement="below">
               <direction-type>
-                <dynamics default-y="-80">
+                <dynamics>
                   <fp/>
                 </dynamics>
               </direction-type>
@@ -72,12 +64,10 @@
           <measure number="2">
             <direction placement="below">
               <direction-type>
-                <dynamics default-y="-80">
+                <dynamics>
                   <p/>
                 </dynamics>
               </direction-type>
-              <offset>1</offset>
-              <sound dynamics="54"/>
             </direction>
             <note>
               <pitch>
@@ -88,7 +78,6 @@
               <voice>1</voice>
               <type>quarter</type>
               <dot/>
-              <stem>up</stem>
             </note>
             <note>
               <chord/>
@@ -101,7 +90,6 @@
               <voice>1</voice>
               <type>quarter</type>
               <dot/>
-              <stem>up</stem>
             </note>
             <note>
               <pitch>
@@ -111,7 +99,6 @@
               <duration>4</duration>
               <voice>1</voice>
               <type>eighth</type>
-              <stem>up</stem>
             </note>
             <note>
               <chord/>
@@ -123,7 +110,6 @@
               <duration>4</duration>
               <voice>1</voice>
               <type>eighth</type>
-              <stem>up</stem>
             </note>
             <note>
               <pitch>
@@ -133,7 +119,6 @@
               <duration>8</duration>
               <voice>1</voice>
               <type>quarter</type>
-              <stem>up</stem>
             </note>
             <note>
               <chord/>
@@ -145,7 +130,6 @@
               <duration>8</duration>
               <voice>1</voice>
               <type>quarter</type>
-              <stem>up</stem>
             </note>
             <note>
               <pitch>
@@ -155,7 +139,6 @@
               <duration>8</duration>
               <voice>1</voice>
               <type>quarter</type>
-              <stem>up</stem>
             </note>
             <note>
               <chord/>
@@ -167,8 +150,7 @@
               <duration>8</duration>
               <voice>1</voice>
               <type>quarter</type>
-              <stem>up</stem>
             </note>
           </measure>
-	</part>
+        </part>
 </score-partwise>
diff --git a/input/regression/musicxml/21e-Chords-PickupMeasures.xml b/input/regression/musicxml/21e-Chords-PickupMeasures.xml
index abdf5b2362..23e9715263 100644
--- a/input/regression/musicxml/21e-Chords-PickupMeasures.xml
+++ b/input/regression/musicxml/21e-Chords-PickupMeasures.xml
@@ -6,24 +6,17 @@
     <miscellaneous>
       <miscellaneous-field name="description">Check for proper chord detection 
           after a pickup measure (i.e. the first beat of the measure is not 
-          aligned with multiples of the time signature!</miscellaneous-field>
+          aligned with multiples of the time signature)!</miscellaneous-field>
     </miscellaneous>
   </identification>
     <part-list>
         <score-part id="P2">
             <part-name>MusicXML Part</part-name>
-            <score-instrument id="P2-I2">
-                <instrument-name>Acoustic Grand Piano</instrument-name>
-            </score-instrument>
-            <midi-instrument id="P2-I2">
-                <midi-channel>2</midi-channel>
-                <midi-program>1</midi-program>
-            </midi-instrument>
         </score-part>
     </part-list>
     <!--=========================================================-->
     <part id="P2">
-        <measure implicit="yes" number="0" width="177">
+        <measure implicit="yes" number="0">
             <attributes>
                 <divisions>1</divisions>
             </attributes>
diff --git a/input/regression/musicxml/21f-Chord-ElementInBetween.xml b/input/regression/musicxml/21f-Chord-ElementInBetween.xml
index 95536e6136..c0a0b87927 100644
--- a/input/regression/musicxml/21f-Chord-ElementInBetween.xml
+++ b/input/regression/musicxml/21f-Chord-ElementInBetween.xml
@@ -12,19 +12,12 @@
     <part-list>
         <score-part id="P0">
             <part-name>MusicXML Part</part-name>
-            <score-instrument id="I1">
-                <instrument-name>0</instrument-name>
-            </score-instrument>
-            <midi-instrument id="I1">
-                <midi-channel>1</midi-channel>
-                <midi-program>1</midi-program>
-            </midi-instrument>
         </score-part>
     </part-list>
     <part id="P0">
         <measure number="1">
             <attributes>
-                <divisions>960</divisions>
+                <divisions>1</divisions>
                 <time>
                     <beats>4</beats>
                     <beat-type>4</beat-type>
@@ -39,7 +32,7 @@
                     <step>A</step>
                     <octave>4</octave>
                 </pitch>
-                <duration>960</duration>
+                <duration>1</duration>
                 <voice>1</voice>
                 <type>quarter</type>
             </note>
@@ -55,7 +48,7 @@
                     <octave>4</octave>
                     <alter>1</alter>
                 </pitch>
-                <duration>960</duration>
+                <duration>1</duration>
                 <voice>1</voice>
                 <type>quarter</type>
             </note>
@@ -70,19 +63,19 @@
                     <step>D</step>
                     <octave>4</octave>
                 </pitch>
-                <duration>960</duration>
+                <duration>1</duration>
                 <voice>1</voice>
                 <type>quarter</type>
             </note>
             <note>
                 <rest/>
-                <duration>960</duration>
+                <duration>1</duration>
                 <voice>1</voice>
                 <type>quarter</type>
             </note>
             <note>
                 <rest/>
-                <duration>1920</duration>
+                <duration>2</duration>
                 <voice>1</voice>
                 <type>half</type>
             </note>
diff --git a/input/regression/musicxml/22b-Staff-Notestyles.xml b/input/regression/musicxml/22b-Staff-Notestyles.xml
index 8a6c750d0c..1a15bc8778 100644
--- a/input/regression/musicxml/22b-Staff-Notestyles.xml
+++ b/input/regression/musicxml/22b-Staff-Notestyles.xml
@@ -17,15 +17,6 @@
   <!--=========================================================-->
   <part id="P1">
     <measure number="1">
-      <print>
-        <system-layout>
-          <system-margins>
-            <left-margin>70</left-margin>
-            <right-margin>0</right-margin>
-          </system-margins>
-          <top-system-distance>211</top-system-distance>
-        </system-layout>
-      </print>
       <attributes>
         <divisions>1</divisions>
         <key>
@@ -49,7 +40,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <attributes>
         <measure-style>
@@ -64,7 +54,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <lyric number="1"><text>slash, no stem</text></lyric>
       </note>
       <note>
@@ -75,7 +64,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <attributes>
         <measure-style>
@@ -93,7 +81,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <lyric number="1"><text>slash, with stem</text></lyric>
       </note>
     </measure>
@@ -107,7 +94,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <attributes>
         <measure-style>
@@ -122,7 +108,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <lyric number="1"><text>hidden notes</text></lyric>
       </note>
       <note print-object="no">
@@ -133,7 +118,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <attributes>
         <staff-details>
@@ -148,7 +132,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <lyric number="1"><text>hidden notes, staff lines</text></lyric>
       </note>
     </measure>
@@ -161,7 +144,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>half</type>
-        <stem>up</stem>
       </note>
       <attributes>
         <staff-details>
@@ -176,7 +158,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>half</type>
-        <stem>up</stem>
         <lyric number="1"><text>normal settings restored</text></lyric>
       </note>
       <barline location="right">
diff --git a/input/regression/musicxml/23a-Tuplets-Finale.xml b/input/regression/musicxml/23a-Tuplets-Finale.xml
deleted file mode 100644
index 47f36b1af4..0000000000
--- a/input/regression/musicxml/23a-Tuplets-Finale.xml
+++ /dev/null
@@ -1,512 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Some tuplets (3:2, 3:2, 3:2, 4:2, 
-          4:1, 7:3, 6:2) with the default tuplet bracket displaying the number 
-          of actual notes played. The second tuplet does not have a number 
-          attribute set.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>84</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <beats>30</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>42</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>42</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>42</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>42</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>21</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>1</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>21</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>1</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>21</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>1</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>21</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>1</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>7</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <stem>down</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <stem>up</stem>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/23a-Tuplets.xml b/input/regression/musicxml/23a-Tuplets.xml
new file mode 100644
index 0000000000..4fb2a7c4b6
--- /dev/null
+++ b/input/regression/musicxml/23a-Tuplets.xml
@@ -0,0 +1,474 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Some tuplets (3:2, 3:2, 3:2, 4:2, 
+          4:1, 7:3, 6:2) with the default tuplet bracket displaying the number 
+          of actual notes played. The second tuplet does not have a number 
+          attribute set.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>84</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>14</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>42</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>42</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>42</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>42</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>21</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>1</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>21</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>1</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>21</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>1</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>21</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>1</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>7</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/23b-Tuplets-Styles.xml b/input/regression/musicxml/23b-Tuplets-Styles.xml
index 6b55d4d8ab..c2a7678a80 100644
--- a/input/regression/musicxml/23b-Tuplets-Styles.xml
+++ b/input/regression/musicxml/23b-Tuplets-Styles.xml
@@ -716,11 +716,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes">
-        <system-layout>
-          <system-distance>114</system-distance>
-        </system-layout>
-      </print>
       <note>
         <pitch>
           <step>C</step>
diff --git a/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
index a0810b4fcb..984292ff38 100644
--- a/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
+++ b/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
@@ -14,7 +14,8 @@
           note type (but no number), and the ones in measure 5 specify only a 
           number of tuplet-notes (but no type, which is deduced from the 
           note's type). The first tuplet of measures 3-5 uses 
-          'display-type="actual"', the second one 'display-type="both"'.</miscellaneous-field>
+          'display-type="actual"', the second one 'display-type="both"'.
+          FIXME: The tuplet-normal should coincide with the real notes!</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
diff --git a/input/regression/musicxml/23d-Tuplets-Nested.xml b/input/regression/musicxml/23d-Tuplets-Nested.xml
index b85c0296d0..8daf363455 100644
--- a/input/regression/musicxml/23d-Tuplets-Nested.xml
+++ b/input/regression/musicxml/23d-Tuplets-Nested.xml
@@ -12,13 +12,6 @@
   <part-list>
     <score-part id="P1">
       <part-name print-object="no">MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -54,7 +47,7 @@
         </time-modification>
         <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+          <tuplet bracket="yes" number="1" type="start"/>
         </notations>
       </note>
       <note>
@@ -86,7 +79,7 @@
         </time-modification>
         <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="2" placement="below" type="start">
+          <tuplet bracket="yes" number="2" type="start">
             <tuplet-actual>
               <tuplet-number>5</tuplet-number>
               <tuplet-type>eighth</tuplet-type>
diff --git a/input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml b/input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml
deleted file mode 100644
index 23c2aa2d8c..0000000000
--- a/input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!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>
-		<miscellaneous>
-			<miscellaneous-field name="description">Some "triplets" 
-                            on the end of the first and in the second staff, using only 
-                            &lt;time-modification&gt;, but not explicit tuplet 
-                            bracket. Thus, the duration of the notes in the 
-                            second staff should be scaled properly in comparison 
-                            to staff 1, but no visual indication about the 
-                            tuplets is given.</miscellaneous-field>
-		</miscellaneous>
-	</identification>
-	<part-list>
-		<score-part id="P1"><part-name>MusicXML Part</part-name></score-part>
-	</part-list>
-	<part id="P1">
-		<measure number="1">
-			<attributes>
-				<divisions>96</divisions>
-				<key><fifths>0</fifths></key>
-				<time><beats>4</beats><beat-type>4</beat-type></time>
-				<staves>2</staves>
-				<clef number="1"><sign>G</sign><line>2</line></clef>
-				<clef number="2"><sign>F</sign><line>4</line></clef>
-			</attributes>
-			<note>
-				<pitch><step>F</step><octave>4</octave></pitch>
-				<duration>96</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<staff>1</staff>
-			</note>
-			<note>
-				<pitch><step>G</step><octave>4</octave></pitch>
-				<duration>96</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<staff>1</staff>
-			</note>
-			<note>
-				<pitch><step>A</step><octave>4</octave></pitch>
-				<duration>64</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>1</staff>
-			</note>
-			<note>
-				<pitch><step>B</step><octave>4</octave></pitch>
-				<duration>64</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>1</staff>
-			</note>
-			<note>
-				<pitch><step>C</step><octave>5</octave></pitch>
-				<duration>64</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>1</staff>
-			</note>
-			<backup><duration>384</duration></backup>
-			<note>
-				<pitch><step>A</step><octave>2</octave></pitch>
-				<duration>48</duration>
-				<voice>2</voice>
-				<type>eighth</type>
-				<staff>2</staff>
-				<beam number="1">begin</beam>
-			</note>
-			<note>
-				<pitch><step>B</step><octave>2</octave></pitch>
-				<duration>48</duration>
-				<voice>2</voice>
-				<type>eighth</type>
-				<staff>2</staff>
-				<beam number="1">end</beam>
-			</note>
-			<note>
-				<pitch><step>C</step><octave>3</octave></pitch>
-				<duration>32</duration>
-				<voice>2</voice>
-				<type>eighth</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="1">begin</beam>
-			</note>
-			<note>
-				<pitch><step>D</step><octave>3</octave></pitch>
-				<duration>32</duration>
-				<voice>2</voice>
-				<type>eighth</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="1">continue</beam>
-			</note>
-			<note>
-				<pitch><step>E</step><octave>3</octave></pitch>
-				<duration>32</duration>
-				<voice>2</voice>
-				<type>eighth</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="1">end</beam>
-			</note>
-			<note>
-				<pitch><step>A</step><octave>2</octave></pitch>
-				<duration>24</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<staff>2</staff>
-				<beam number="2">begin</beam>
-			</note>
-			<note>
-				<pitch><step>B</step><octave>2</octave></pitch>
-				<duration>24</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>C</step><octave>3</octave></pitch>
-				<duration>24</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>D</step><octave>3</octave></pitch>
-				<duration>24</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<staff>2</staff>
-				<beam number="2">end</beam>
-			</note>
-
-			<note>
-				<pitch><step>E</step><octave>3</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">begin</beam>
-			</note>
-			<note>
-				<pitch><step>F</step><octave>3</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>G</step><octave>3</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>A</step><octave>3</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>B</step><octave>3</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">continue</beam>
-			</note>
-			<note>
-				<pitch><step>C</step><octave>4</octave></pitch>
-				<duration>16</duration>
-				<voice>2</voice>
-				<type>16th</type>
-				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
-				<staff>2</staff>
-				<beam number="2">end</beam>
-			</note>
-
-		</measure>
-	</part>
-</score-partwise>
diff --git a/input/regression/musicxml/23f-Tuplets-DurationButNoBracket.xml b/input/regression/musicxml/23f-Tuplets-DurationButNoBracket.xml
new file mode 100644
index 0000000000..866d8dc9bb
--- /dev/null
+++ b/input/regression/musicxml/23f-Tuplets-DurationButNoBracket.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<!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>
+		<miscellaneous>
+			<miscellaneous-field name="description">Some "triplets" 
+                            on the end of the first and in the second staff, using only 
+                            &lt;time-modification&gt;, but not explicit tuplet 
+                            bracket. Thus, the duration of the notes in the 
+                            second staff should be scaled properly in comparison 
+                            to staff 1, but no visual indication about the 
+                            tuplets is given.</miscellaneous-field>
+		</miscellaneous>
+	</identification>
+	<part-list>
+		<score-part id="P1"><part-name>MusicXML Part</part-name></score-part>
+	</part-list>
+	<part id="P1">
+		<measure number="1">
+			<attributes>
+				<divisions>96</divisions>
+				<key><fifths>0</fifths></key>
+				<time><beats>4</beats><beat-type>4</beat-type></time>
+				<staves>2</staves>
+				<clef number="1"><sign>G</sign><line>2</line></clef>
+				<clef number="2"><sign>F</sign><line>4</line></clef>
+			</attributes>
+			<note>
+				<pitch><step>F</step><octave>4</octave></pitch>
+				<duration>96</duration>
+				<voice>1</voice>
+				<type>quarter</type>
+				<staff>1</staff>
+			</note>
+			<note>
+				<pitch><step>G</step><octave>4</octave></pitch>
+				<duration>96</duration>
+				<voice>1</voice>
+				<type>quarter</type>
+				<staff>1</staff>
+			</note>
+			<note>
+				<pitch><step>A</step><octave>4</octave></pitch>
+				<duration>64</duration>
+				<voice>1</voice>
+				<type>quarter</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>1</staff>
+			</note>
+			<note>
+				<pitch><step>B</step><octave>4</octave></pitch>
+				<duration>64</duration>
+				<voice>1</voice>
+				<type>quarter</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>1</staff>
+			</note>
+			<note>
+				<pitch><step>C</step><octave>5</octave></pitch>
+				<duration>64</duration>
+				<voice>1</voice>
+				<type>quarter</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>1</staff>
+			</note>
+			<backup><duration>384</duration></backup>
+			<note>
+				<pitch><step>A</step><octave>2</octave></pitch>
+				<duration>48</duration>
+				<voice>2</voice>
+				<type>eighth</type>
+				<staff>2</staff>
+				<beam number="1">begin</beam>
+			</note>
+			<note>
+				<pitch><step>B</step><octave>2</octave></pitch>
+				<duration>48</duration>
+				<voice>2</voice>
+				<type>eighth</type>
+				<staff>2</staff>
+				<beam number="1">end</beam>
+			</note>
+			<note>
+				<pitch><step>C</step><octave>3</octave></pitch>
+				<duration>32</duration>
+				<voice>2</voice>
+				<type>eighth</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="1">begin</beam>
+			</note>
+			<note>
+				<pitch><step>D</step><octave>3</octave></pitch>
+				<duration>32</duration>
+				<voice>2</voice>
+				<type>eighth</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="1">continue</beam>
+			</note>
+			<note>
+				<pitch><step>E</step><octave>3</octave></pitch>
+				<duration>32</duration>
+				<voice>2</voice>
+				<type>eighth</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="1">end</beam>
+			</note>
+			<note>
+				<pitch><step>A</step><octave>2</octave></pitch>
+				<duration>24</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<staff>2</staff>
+				<beam number="2">begin</beam>
+			</note>
+			<note>
+				<pitch><step>B</step><octave>2</octave></pitch>
+				<duration>24</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>C</step><octave>3</octave></pitch>
+				<duration>24</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>D</step><octave>3</octave></pitch>
+				<duration>24</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<staff>2</staff>
+				<beam number="2">end</beam>
+			</note>
+
+			<note>
+				<pitch><step>E</step><octave>3</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">begin</beam>
+			</note>
+			<note>
+				<pitch><step>F</step><octave>3</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>G</step><octave>3</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>A</step><octave>3</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>B</step><octave>3</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">continue</beam>
+			</note>
+			<note>
+				<pitch><step>C</step><octave>4</octave></pitch>
+				<duration>16</duration>
+				<voice>2</voice>
+				<type>16th</type>
+				<time-modification><actual-notes>3</actual-notes><normal-notes>2</normal-notes></time-modification>
+				<staff>2</staff>
+				<beam number="2">end</beam>
+			</note>
+		</measure>
+	</part>
+</score-partwise>
diff --git a/input/regression/musicxml/24a-GraceNotes-Finale.xml b/input/regression/musicxml/24a-GraceNotes-Finale.xml
deleted file mode 100644
index f54a26ef4e..0000000000
--- a/input/regression/musicxml/24a-GraceNotes-Finale.xml
+++ /dev/null
@@ -1,354 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Different kinds of grace notes: 
-          acciaccatura, appoggiatura; beamed grace notes; grace notes with 
-          accidentals; different durations of the grace notes.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>4</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>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <beam number="1">begin</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <notations>
-          <tied type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <beam number="1">begin</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <grace/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/24a-GraceNotes.xml b/input/regression/musicxml/24a-GraceNotes.xml
new file mode 100644
index 0000000000..a194cc3b3d
--- /dev/null
+++ b/input/regression/musicxml/24a-GraceNotes.xml
@@ -0,0 +1,320 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Different kinds of grace notes: 
+          acciaccatura, appoggiatura; beamed grace notes; grace notes with 
+          accidentals; different durations of the grace notes.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>4</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>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>16th</type>
+        <notations>
+          <tied type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <grace/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/24b-ChordAsGraceNote-Finale.xml b/input/regression/musicxml/24b-ChordAsGraceNote-Finale.xml
deleted file mode 100644
index 688f43c2fe..0000000000
--- a/input/regression/musicxml/24b-ChordAsGraceNote-Finale.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Chords as grace notes.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>2</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>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <chord/>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <chord/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/24b-ChordAsGraceNote.xml b/input/regression/musicxml/24b-ChordAsGraceNote.xml
new file mode 100644
index 0000000000..1f00a6f2c0
--- /dev/null
+++ b/input/regression/musicxml/24b-ChordAsGraceNote.xml
@@ -0,0 +1,114 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Chords as grace notes.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>2</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>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <chord/>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <chord/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/24c-GraceNote-MeasureEnd-Finale.xml b/input/regression/musicxml/24c-GraceNote-MeasureEnd-Finale.xml
deleted file mode 100644
index 4138aa09b3..0000000000
--- a/input/regression/musicxml/24c-GraceNote-MeasureEnd-Finale.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A grace note that appears at the 
-          measure end (without any steal-from-* attribute set). Some 
-          applications need to convert this into an after-grace.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="25">
-      <attributes>
-        <divisions>32</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>64</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>64</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">begin</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-      </note>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/24c-GraceNote-MeasureEnd.xml b/input/regression/musicxml/24c-GraceNote-MeasureEnd.xml
new file mode 100644
index 0000000000..ba2c165c42
--- /dev/null
+++ b/input/regression/musicxml/24c-GraceNote-MeasureEnd.xml
@@ -0,0 +1,82 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A grace note that appears at the 
+          measure end (without any steal-from-* attribute set). Some 
+          applications need to convert this into an after-grace.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="25">
+      <attributes>
+        <divisions>32</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+      </note>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/24d-AfterGrace.xml b/input/regression/musicxml/24d-AfterGrace.xml
index 60f568d5f9..94816a2ca9 100644
--- a/input/regression/musicxml/24d-AfterGrace.xml
+++ b/input/regression/musicxml/24d-AfterGrace.xml
@@ -4,19 +4,13 @@
 <score-partwise>
   <identification>
     <miscellaneous>
-      <miscellaneous-field name="description">Some grace notes and after-graces (indicated by steal-time-previous and steal-time-next).</miscellaneous-field>
+      <miscellaneous-field name="description">Some grace notes and after-graces
+            (indicated by steal-time-previous and steal-time-next).</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -45,7 +39,6 @@
         <duration>64</duration>
         <voice>1</voice>
         <type>half</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -56,7 +49,6 @@
         </pitch>
         <voice>1</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -67,7 +59,6 @@
         </pitch>
         <voice>1</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -78,7 +69,6 @@
         </pitch>
         <voice>1</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -89,7 +79,6 @@
         <duration>64</duration>
         <voice>1</voice>
         <type>half</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -100,7 +89,6 @@
         </pitch>
         <voice>1</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">begin</beam>
         <beam number="2">begin</beam>
@@ -113,7 +101,6 @@
         </pitch>
         <voice>1</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">end</beam>
         <beam number="2">end</beam>
diff --git a/input/regression/musicxml/24e-GraceNote-StaffChange.xml b/input/regression/musicxml/24e-GraceNote-StaffChange.xml
new file mode 100644
index 0000000000..9470c0cb6b
--- /dev/null
+++ b/input/regression/musicxml/24e-GraceNote-StaffChange.xml
@@ -0,0 +1,81 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A grace note on a different 
+          staff than the actual note.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="25">
+      <attributes>
+        <divisions>32</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>2</staff>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>2</staff>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/24f-GraceNote-Slur.xml b/input/regression/musicxml/24f-GraceNote-Slur.xml
new file mode 100644
index 0000000000..91d085ed35
--- /dev/null
+++ b/input/regression/musicxml/24f-GraceNote-Slur.xml
@@ -0,0 +1,71 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A grace note with a slur to the
+          actual note. This can be interpreted as acciaccatura or appoggiatura,
+          depending on the existence of a slash.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="25">
+      <attributes>
+        <divisions>32</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>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+       <notations>
+          <slur number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/31a-Directions-MusicXML.xml b/input/regression/musicxml/31a-Directions-MusicXML.xml
deleted file mode 100644
index ca086df535..0000000000
--- a/input/regression/musicxml/31a-Directions-MusicXML.xml
+++ /dev/null
@@ -1,787 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="2.0">
-  <movement-title>MusicXML directions (attached to staff)</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All &lt;direction&gt; elements 
-          defined in MusicXML. The lyrics for each note describes the direction
-          element assigned to that note.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <defaults/>
-  <part-list>
-    <score-part id="P1">
-      <part-name print-object="no">MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <!-- Direction type can contain the following child types:
-         rehearsal+ | segno+ | words+ |
-         coda+ | wedge | dynamics+ | dashes | bracket | pedal | 
-         metronome | octave-shift | harp-pedals | damp | 
-         damp-all | eyeglasses | scordatura | image |
-         accordion-registration | other-direction -->
-    <!-- Rehearsal marks -->
-    <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"/>
-      <direction placement="below">
-        <direction-type>
-          <rehearsal>A</rehearsal>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>reh.A (def=sq.)</text></lyric>
-      </note>
-      <direction placement="above">
-        <direction-type>
-          <rehearsal enclosure="none">B</rehearsal>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>reh.B (none)</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <rehearsal enclosure="square">Test</rehearsal>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>reh.Test (sq.)</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <rehearsal enclosure="circle">Crc</rehearsal>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>reh.Crc (crc.)</text></lyric>
-      </note>
-    </measure>
-    <!-- Segno, Coda, Words (extra unit test for formatting!),  Eyeglasses -->
-    <measure number="2">
-      <direction>
-        <direction-type>
-          <segno/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Segno</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <coda/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Coda</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <words>words</words>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Words</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <eyeglasses/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Eyegl.</text></lyric>
-      </note>
-    </measure>
-    <!-- Dynamics: p | pp | ppp | pppp | ppppp | pppppp |
-        f | ff | fff | ffff | fffff | ffffff | mp | mf | sf |
-        sfp | sfpp | fp | rf | rfz | sfz | sffz | fz | 
-        other-dynamics -->
-    <measure number="3">
-      <direction>
-        <direction-type>
-          <dynamics><p/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>p</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><pp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>pp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><ppp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ppp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><pppp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>pppp</text></lyric>
-      </note>
-    </measure>
-    <measure number="4">
-      <direction>
-        <direction-type>
-          <dynamics><ppppp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ppppp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><pppppp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>pppppp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><f/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>f</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><ff/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ff</text></lyric>
-      </note>
-    </measure>
-    <measure number="5">
-      <direction>
-        <direction-type>
-          <dynamics><fff/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>fff</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><ffff/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ffff</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><fffff/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>fffff</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><ffffff/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ffffff</text></lyric>
-      </note>
-    </measure>
-    <measure number="6">
-      <direction>
-        <direction-type>
-          <dynamics><mp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>mp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><mf/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>mf</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><sf/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>sf</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><sfp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>sfp</text></lyric>
-      </note>
-    </measure>
-    <measure number="7">
-      <direction>
-        <direction-type>
-          <dynamics><sfpp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>sfpp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><fp/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>fp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><rf/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>rf</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><rfz/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>rfz</text></lyric>
-      </note>
-    </measure>
-    <measure number="8">
-      <direction>
-        <direction-type>
-          <dynamics><sfz/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>sfz</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><sffz/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>sffz</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><fz/></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>fz</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dynamics><other-dynamics>abc-ffz</other-dynamics></dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>abc-ffz (oth.)</text></lyric>
-      </note>
-    </measure>
-    <!-- Spanners (there is another unit test for testing the various options):
-         wedge, dashes, bracket, pedal, octave-shift -->
-    <measure number="9">
-      <direction>
-        <direction-type>
-          <wedge type="crescendo"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>hairpin</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <wedge type="stop"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>cresc</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dashes type="start"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>dash</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <dashes type="stop"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>es</text></lyric>
-      </note>
-    </measure>
-    <measure number="10">
-      <direction>
-        <direction-type>
-          <bracket type="start" line-end="none"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>bra</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <bracket type="stop" line-end="none"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>cket</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift type="up"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>oct.</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift type="stop"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>shift</text></lyric>
-      </note>
-    </measure>
-    <measure number="11">
-      <direction>
-        <direction-type>
-          <pedal type="start"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>pedal</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <pedal type="change"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>continue</syllabic><text>change</text></lyric>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <direction>
-        <direction-type>
-          <pedal type="stop"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>mark</text></lyric>
-      </note>
-    </measure>
-    <!-- metronome, harp-pedals, damp, damp-all, scordatura, accordion-registration -->
-    <measure number="12">
-      <direction>
-        <direction-type>
-          <metronome><beat-unit>quarter</beat-unit><per-minute>60</per-minute></metronome>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Metr.</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <harp-pedals>
-            <pedal-tuning>
-              <pedal-step>D</pedal-step>
-              <pedal-alter>0</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>C</pedal-step>
-              <pedal-alter>-1</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>B</pedal-step>
-              <pedal-alter>-1</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>E</pedal-step>
-              <pedal-alter>0</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>F</pedal-step>
-              <pedal-alter>0</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>G</pedal-step>
-              <pedal-alter>1</pedal-alter>
-            </pedal-tuning>
-            <pedal-tuning>
-              <pedal-step>A</pedal-step>
-              <pedal-alter>-1</pedal-alter>
-            </pedal-tuning>
-          </harp-pedals>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Harp ped.</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <damp/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Damp</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <damp-all/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Damp all</text></lyric>
-      </note>
-    </measure>
-    <measure number="13">
-      <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>
-          </scordatura>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Scord.</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>2</accordion-middle>
-              <accordion-low/>
-          </accordion-registration>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Accordion reg.</text></lyric>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-    <!-- Other issues: Multiple direction-type elements: "subito p", ppp<fff -->
-    <measure number="14">
-      <direction placement="below">
-        <direction-type>
-          <words default-y="-80" font-family="Times New Roman" font-size="10.25" font-style="italic">subito</words>
-        </direction-type>
-        <direction-type>
-          <words default-y="-80" font-family="Times New Roman" font-size="10.25"> </words>
-        </direction-type>
-        <direction-type>
-          <dynamics default-y="-80">
-            <p/>
-          </dynamics>
-        </direction-type>
-        <offset>2</offset>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>subp</text></lyric>
-      </note>
-      <direction placement="below">
-        <direction-type>
-          <dynamics><ppp/></dynamics>
-        </direction-type>
-        <direction-type>
-          <wedge type="crescendo"/>
-        </direction-type>
-        <offset>2</offset>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>begin</syllabic><text>ppp cresc</text></lyric>
-      </note>
-      <direction placement="below">
-        <direction-type>
-          <wedge type="stop"/>
-        </direction-type>
-        <direction-type>
-          <dynamics><fff/></dynamics>
-        </direction-type>
-        <offset>2</offset>
-      </direction>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><syllabic>end</syllabic><text>to fff</text></lyric>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>subp</text></lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/31a-Directions.xml b/input/regression/musicxml/31a-Directions.xml
new file mode 100644
index 0000000000..95f32abb68
--- /dev/null
+++ b/input/regression/musicxml/31a-Directions.xml
@@ -0,0 +1,785 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <movement-title>MusicXML directions (attached to staff)</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All &lt;direction&gt; elements 
+          defined in MusicXML. The lyrics for each note describes the direction
+          element assigned to that note.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <!-- Direction type can contain the following child types:
+         rehearsal+ | segno+ | words+ |
+         coda+ | wedge | dynamics+ | dashes | bracket | pedal | 
+         metronome | octave-shift | harp-pedals | damp | 
+         damp-all | eyeglasses | scordatura | image |
+         accordion-registration | other-direction -->
+    <!-- Rehearsal marks -->
+    <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>
+      <direction placement="below">
+        <direction-type>
+          <rehearsal>A</rehearsal>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>reh.A (def=sq.)</text></lyric>
+      </note>
+      <direction placement="above">
+        <direction-type>
+          <rehearsal enclosure="none">B</rehearsal>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>reh.B (none)</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <rehearsal enclosure="square">Test</rehearsal>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>reh.Test (sq.)</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <rehearsal enclosure="circle">Crc</rehearsal>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>reh.Crc (crc.)</text></lyric>
+      </note>
+    </measure>
+    <!-- Segno, Coda, Words (extra unit test for formatting!),  Eyeglasses -->
+    <measure number="2">
+      <direction>
+        <direction-type>
+          <segno/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Segno</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <coda/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Coda</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <words>words</words>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Words</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <eyeglasses/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Eyegl.</text></lyric>
+      </note>
+    </measure>
+    <!-- Dynamics: p | pp | ppp | pppp | ppppp | pppppp |
+        f | ff | fff | ffff | fffff | ffffff | mp | mf | sf |
+        sfp | sfpp | fp | rf | rfz | sfz | sffz | fz | 
+        other-dynamics -->
+    <measure number="3">
+      <direction>
+        <direction-type>
+          <dynamics><p/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>p</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><pp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>pp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><ppp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ppp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><pppp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>pppp</text></lyric>
+      </note>
+    </measure>
+    <measure number="4">
+      <direction>
+        <direction-type>
+          <dynamics><ppppp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ppppp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><pppppp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>pppppp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><f/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>f</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><ff/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ff</text></lyric>
+      </note>
+    </measure>
+    <measure number="5">
+      <direction>
+        <direction-type>
+          <dynamics><fff/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>fff</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><ffff/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ffff</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><fffff/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>fffff</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><ffffff/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ffffff</text></lyric>
+      </note>
+    </measure>
+    <measure number="6">
+      <direction>
+        <direction-type>
+          <dynamics><mp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>mp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><mf/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>mf</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><sf/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>sf</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><sfp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>sfp</text></lyric>
+      </note>
+    </measure>
+    <measure number="7">
+      <direction>
+        <direction-type>
+          <dynamics><sfpp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>sfpp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><fp/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>fp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><rf/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>rf</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><rfz/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>rfz</text></lyric>
+      </note>
+    </measure>
+    <measure number="8">
+      <direction>
+        <direction-type>
+          <dynamics><sfz/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>sfz</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><sffz/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>sffz</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><fz/></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>fz</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dynamics><other-dynamics>abc-ffz</other-dynamics></dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>abc-ffz (oth.)</text></lyric>
+      </note>
+    </measure>
+    <!-- Spanners (there is another unit test for testing the various options):
+         wedge, dashes, bracket, pedal, octave-shift -->
+    <measure number="9">
+      <direction>
+        <direction-type>
+          <wedge type="crescendo"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>hairpin</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <wedge type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>cresc</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dashes type="start"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>dash</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <dashes type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>es</text></lyric>
+      </note>
+    </measure>
+    <measure number="10">
+      <direction>
+        <direction-type>
+          <bracket type="start" line-end="none"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>bra</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <bracket type="stop" line-end="none"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>cket</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift type="up"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>oct.</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>shift</text></lyric>
+      </note>
+    </measure>
+    <measure number="11">
+      <direction>
+        <direction-type>
+          <pedal type="start"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>pedal</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <pedal type="change"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>continue</syllabic><text>change</text></lyric>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <pedal type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>mark</text></lyric>
+      </note>
+    </measure>
+    <!-- metronome, harp-pedals, damp, damp-all, scordatura, accordion-registration -->
+    <measure number="12">
+      <direction>
+        <direction-type>
+          <metronome><beat-unit>quarter</beat-unit><per-minute>60</per-minute></metronome>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Metr.</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <harp-pedals>
+            <pedal-tuning>
+              <pedal-step>D</pedal-step>
+              <pedal-alter>0</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>C</pedal-step>
+              <pedal-alter>-1</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>B</pedal-step>
+              <pedal-alter>-1</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>E</pedal-step>
+              <pedal-alter>0</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>F</pedal-step>
+              <pedal-alter>0</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>G</pedal-step>
+              <pedal-alter>1</pedal-alter>
+            </pedal-tuning>
+            <pedal-tuning>
+              <pedal-step>A</pedal-step>
+              <pedal-alter>-1</pedal-alter>
+            </pedal-tuning>
+          </harp-pedals>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Harp ped.</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <damp/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Damp</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <damp-all/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Damp all</text></lyric>
+      </note>
+    </measure>
+    <measure number="13">
+      <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>
+          </scordatura>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Scord.</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>2</accordion-middle>
+              <accordion-low/>
+          </accordion-registration>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Accordion reg.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+    <!-- Other issues: Multiple direction-type elements: "subito p", ppp<fff -->
+    <measure number="14">
+      <direction placement="below">
+        <direction-type>
+          <words default-y="-80" font-family="Times New Roman" font-size="10.25" font-style="italic">subito</words>
+        </direction-type>
+        <direction-type>
+          <words default-y="-80" font-family="Times New Roman" font-size="10.25"> </words>
+        </direction-type>
+        <direction-type>
+          <dynamics default-y="-80">
+            <p/>
+          </dynamics>
+        </direction-type>
+        <offset>2</offset>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>subp</text></lyric>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <dynamics><ppp/></dynamics>
+        </direction-type>
+        <direction-type>
+          <wedge type="crescendo"/>
+        </direction-type>
+        <offset>2</offset>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>begin</syllabic><text>ppp cresc</text></lyric>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <wedge type="stop"/>
+        </direction-type>
+        <direction-type>
+          <dynamics><fff/></dynamics>
+        </direction-type>
+        <offset>2</offset>
+      </direction>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><syllabic>end</syllabic><text>to fff</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>subp</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/31c-MetronomeMarks.xml b/input/regression/musicxml/31c-MetronomeMarks.xml
index 769b993885..b2b42aae35 100644
--- a/input/regression/musicxml/31c-MetronomeMarks.xml
+++ b/input/regression/musicxml/31c-MetronomeMarks.xml
@@ -8,22 +8,14 @@
           text (note=bpm), note=note, (note=note), (note=bpm)</miscellaneous-field>
     </miscellaneous>
   </identification>
-  <defaults/>
   <part-list>
     <score-part id="P1">
       <part-name></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>
     </score-part>
   </part-list>
   <!--=========================================================-->
   <part id="P1">
-    <measure number="1" width="527">
+    <measure number="1">
       <attributes>
         <divisions>1</divisions>
         <key>
diff --git a/input/regression/musicxml/32a-Notations.xml b/input/regression/musicxml/32a-Notations.xml
index 4b350a71fd..06be5dde21 100644
--- a/input/regression/musicxml/32a-Notations.xml
+++ b/input/regression/musicxml/32a-Notations.xml
@@ -482,7 +482,7 @@
         <type>quarter</type>
         <notations>
           <ornaments>
-            <wavy-line placement="below" relative-x="16" type="stop"/>
+            <wavy-line placement="below" type="stop"/>
           </ornaments>
         </notations>
         <lyric number="1"><syllabic>end</syllabic><text>line</text></lyric>
@@ -1233,6 +1233,5 @@
         <bar-style>light-heavy</bar-style>
       </barline>
     </measure>
-
   </part>
 </score-partwise>
diff --git a/input/regression/musicxml/32b-Articulations-Texts.xml b/input/regression/musicxml/32b-Articulations-Texts.xml
index bc54908c78..15dc26c8c1 100644
--- a/input/regression/musicxml/32b-Articulations-Texts.xml
+++ b/input/regression/musicxml/32b-Articulations-Texts.xml
@@ -3,10 +3,6 @@
  "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
 	<identification>
-		<encoding>
-			<software>/usr/bin/vi</software>
-			<encoding-date>2007-02-01</encoding-date>
-		</encoding>
 		<miscellaneous>
 			<miscellaneous-field name="description">Text markup: 
                             different font sizes, weights and colors.</miscellaneous-field>
@@ -30,14 +26,12 @@
 						Normal, Medium
 					</words>
 				</direction-type>
-				<staff>1</staff>
 			</direction>
 			<note>
 				<pitch><step>F</step><octave>4</octave></pitch>
 				<duration>384</duration>
 				<voice>1</voice>
 				<type>eighth</type>
-				<staff>1</staff>
 			</note>
 			<direction placement="below">
 				<direction-type>
@@ -45,7 +39,6 @@
 						Bold, Medium
 					</words>
 				</direction-type>
-				<staff>1</staff>
 			</direction>
 		</measure>
 		<measure number="2">
@@ -55,14 +48,12 @@
 						Normal, Large
 					</words>
 				</direction-type>
-				<staff>1</staff>
 			</direction>
 			<note>
 				<pitch><step>G</step><octave>4</octave></pitch>
 				<duration>384</duration>
 				<voice>1</voice>
 				<type>whole</type>
-				<staff>1</staff>
 			</note>
 			<direction placement="below">
 				<direction-type>
@@ -70,7 +61,6 @@
 						Bold, Large
 					</words>
 				</direction-type>
-				<staff>1</staff>
 			</direction>
 		</measure>
 		<measure number="3">
@@ -80,14 +70,12 @@
 						Normal, Small
 					</words>
 				</direction-type>
-				<staff>1</staff>
 			</direction>
 			<note>
 				<pitch><step>F</step><octave>4</octave></pitch>
 				<duration>384</duration>
 				<voice>1</voice>
 				<type>whole</type>
-				<staff>1</staff>
 			</note>
                         <direction placement="below">
                             <direction-type>
@@ -95,7 +83,6 @@
                                     Bold, Small
                                 </words>
                             </direction-type>
-                            <staff>1</staff>
                         </direction>
                         <direction placement="below">
                             <direction-type>
@@ -103,7 +90,6 @@
                                     Normal, Small, Colored, Below
                                 </words>
                             </direction-type>
-                            <staff>1</staff>
                         </direction>
 		</measure>
 	</part>
diff --git a/input/regression/musicxml/32c-MultipleNotationChildren.xml b/input/regression/musicxml/32c-MultipleNotationChildren.xml
index 303f7b1778..90a172772b 100644
--- a/input/regression/musicxml/32c-MultipleNotationChildren.xml
+++ b/input/regression/musicxml/32c-MultipleNotationChildren.xml
@@ -43,7 +43,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
         <notations>
           <articulations>
             <staccato placement="above"/>
@@ -64,7 +63,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
         <notations>
           <articulations>
             <staccato placement="above"/>
@@ -83,7 +81,6 @@
         <voice>1</voice>
         <type>quarter</type>
         <accidental>sharp</accidental>
-        <stem>down</stem>
         <notations>
           <articulations>
             <staccato placement="above"/>
diff --git a/input/regression/musicxml/32d-Arpeggio.xml b/input/regression/musicxml/32d-Arpeggio.xml
index 003ab52e9c..17cea0b7dd 100644
--- a/input/regression/musicxml/32d-Arpeggio.xml
+++ b/input/regression/musicxml/32d-Arpeggio.xml
@@ -8,7 +8,6 @@
           (normal, up, down, non-arpeggiate)</miscellaneous-field>
     </miscellaneous>
   </identification>
-  <defaults/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
diff --git a/input/regression/musicxml/33a-Spanners.xml b/input/regression/musicxml/33a-Spanners.xml
index 803fec86eb..5fd05e6e55 100644
--- a/input/regression/musicxml/33a-Spanners.xml
+++ b/input/regression/musicxml/33a-Spanners.xml
@@ -4,36 +4,31 @@
 <score-partwise>
   <identification>
     <miscellaneous>
-      <miscellaneous-field name="description">Several spanners defined in MusicXML</miscellaneous-field>
+      <miscellaneous-field name="description">Several spanners defined in
+           MusicXML: tuplet, slur (solid, dashed), tie,  wedge (cresc, dim),
+           tr + wavy-line, single-note trill spanner, octave-shift (8va,15mb),
+           bracket (solid down/down, dashed down/down, solid none/down,
+           dashed none/up, solid none/none), dashes, glissando (wavy),
+           bend-alter, slide (solid), grouping, two-note tremolo, hammer-on,
+           pull-off, pedal (down, change, up).</miscellaneous-field>
     </miscellaneous>
   </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>
     </score-part>
   </part-list>
   <!--=========================================================-->
   <part id="P1">
-      <!-- Tested spanners: tuplet, slur(solid, dashed), wedge (cresc, dim),
-           wavy-line, octave-shift (8va,8vb,15ma,15mb), bracket (solid, 
-           dashed up/down, dashes, glissando (wavy), slide (solid), 
-           pedal (down,up,change; line/Ped*)  -->
     <measure number="1">
       <attributes>
-        <divisions>24</divisions>
+        <divisions>3</divisions>
         <key>
           <fifths>0</fifths>
           <mode>major</mode>
         </key>
-        <time symbol="common">
-          <beats>4</beats>
+        <time>
+          <beats>3</beats>
           <beat-type>4</beat-type>
         </time>
         <clef>
@@ -41,20 +36,18 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>16</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
         <time-modification>
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <stem>down</stem>
         <notations>
           <tuplet number="1" placement="above" type="start"/>
         </notations>
@@ -64,41 +57,47 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>16</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
         <time-modification>
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>16</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
         <time-modification>
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <stem>down</stem>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
       </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <slur number="1" type="start"/>
         </notations>
@@ -108,36 +107,33 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <slur number="1" type="stop"/>
         </notations>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <slur line-type="dashed" number="1" type="start"/>
         </notations>
@@ -147,62 +143,68 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <slur number="1" type="stop"/>
         </notations>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="3">
+    <measure number="4">
       <direction placement="above">
         <direction-type>
-          <wedge default-y="10" spread="0" type="crescendo"/>
+          <wedge spread="0" type="crescendo"/>
         </direction-type>
-        <offset>1</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction>
         <direction-type>
           <wedge spread="15" type="stop"/>
         </direction-type>
-        <offset>6</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
       <direction placement="above">
         <direction-type>
-          <wedge default-y="13" spread="15" type="diminuendo"/>
+          <wedge spread="15" type="diminuendo"/>
         </direction-type>
       </direction>
       <note>
@@ -210,43 +212,48 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction>
         <direction-type>
           <wedge spread="0" type="stop"/>
         </direction-type>
-        <offset>8</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="4">
+    <measure number="6">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <ornaments>
-            <trill-mark default-y="13"/>
-            <wavy-line default-y="13" number="1" type="start"/>
+            <trill-mark/>
+            <wavy-line number="1" type="start"/>
           </ornaments>
         </notations>
       </note>
@@ -255,40 +262,35 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <ornaments>
-            <wavy-line number="1" type="start"/>
-          </ornaments>
-        </notations>
       </note>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <ornaments>
-            <wavy-line default-y="10" number="1" type="stop"/>
+            <wavy-line number="1" type="stop"/>
           </ornaments>
         </notations>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <ornaments>
             <wavy-line number="1" type="start"/>
@@ -296,179 +298,218 @@
           </ornaments>
         </notations>
       </note>
+      <note>
+        <rest/>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
     </measure>
     <!--=======================================================-->
-    <measure number="5">
+    <measure number="8">
+      <direction>
+        <direction-type>
+          <octave-shift size="8" type="down"/>
+        </direction-type>
+      </direction>
       <note>
         <pitch>
           <step>B</step>
-          <octave>4</octave>
+          <octave>5</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="12" size="8" type="down"/>
-        </direction-type>
-        <offset>-22</offset>
-      </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>5</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction>
         <direction-type>
           <octave-shift size="8" type="stop"/>
         </direction-type>
-        <offset>-22</offset>
+      </direction>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <direction>
+        <direction-type>
+          <octave-shift size="15" type="up"/>
+        </direction-type>
       </direction>
       <note>
         <pitch>
           <step>B</step>
-          <octave>4</octave>
+          <octave>2</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="16" size="15" type="down"/>
-        </direction-type>
-        <offset>-20</offset>
-      </direction>
       <note>
         <pitch>
           <step>B</step>
-          <octave>6</octave>
+          <octave>2</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction>
         <direction-type>
           <octave-shift size="15" type="stop"/>
         </direction-type>
-        <offset>-15</offset>
       </direction>
     </measure>
     <!--=======================================================-->
-    <measure number="6">
-      <print new-system="yes"/>
+    <measure number="10">
       <direction placement="above">
         <direction-type>
-          <bracket default-y="20" line-end="down" line-type="solid" number="1" type="start"/>
+          <bracket line-end="down" line-type="solid" number="1" type="start"/>
         </direction-type>
-        <offset>2</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
           <bracket line-end="down" number="1" type="stop"/>
         </direction-type>
-        <offset>8</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
       <direction placement="above">
         <direction-type>
-          <bracket default-y="4" line-end="down" line-type="dashed" number="1" type="start"/>
+          <bracket line-end="down" line-type="dashed" number="1" type="start"/>
         </direction-type>
-        <offset>3</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
           <bracket line-end="down" number="1" type="stop"/>
         </direction-type>
-        <offset>9</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="7">
+    <measure number="12">
       <direction placement="above">
         <direction-type>
-          <bracket default-y="16" line-end="none" line-type="solid" number="1" type="start"/>
+          <bracket line-end="none" line-type="solid" number="1" type="start"/>
         </direction-type>
-        <offset>4</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
           <bracket line-end="down" number="1" type="stop"/>
         </direction-type>
-        <offset>7</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
       <direction placement="above">
         <direction-type>
-          <bracket default-y="16" line-end="none" line-type="dashed" number="1" type="start"/>
+          <bracket line-end="none" line-type="dashed" number="1" type="start"/>
         </direction-type>
       </direction>
       <note>
@@ -476,106 +517,124 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
-          <bracket line-end="down" number="1" type="stop"/>
+          <bracket line-end="up" number="1" type="stop"/>
         </direction-type>
-        <offset>2</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="8">
+    <measure number="14">
       <direction placement="above">
         <direction-type>
-          <bracket default-y="15" line-end="none" line-type="solid" number="1" type="start"/>
+          <bracket line-end="none" line-type="solid" number="1" type="start"/>
         </direction-type>
-        <offset>5</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
           <bracket line-end="none" number="1" type="stop"/>
         </direction-type>
-        <offset>-11</offset>
       </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
       <direction placement="above">
         <direction-type>
-          <dashes default-y="10" number="1" type="start"/>
+          <dashes number="1" type="start"/>
         </direction-type>
-        <offset>6</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <direction placement="above">
         <direction-type>
           <dashes number="1" type="stop"/>
         </direction-type>
-        <offset>11</offset>
       </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="9">
+    <measure number="16">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <glissando line-type="wavy" number="1" type="start"/>
         </notations>
@@ -585,23 +644,30 @@
           <step>F</step>
           <octave>5</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <glissando line-type="wavy" number="1" type="stop"/>
         </notations>
       </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
           <technical>
             <bend>
@@ -610,57 +676,114 @@
           </technical>
         </notations>
       </note>
-      <note print-object="no">
+      <note>
         <pitch>
-          <step>F</step>
+          <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend>
+              <bend-alter>0</bend-alter>
+            </bend>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
-    <measure number="10">
+    <measure number="18">
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
-          <technical>
-            <bend>
-              <bend-alter>0</bend-alter>
-            </bend>
-          </technical>
+          <slide line-type="solid" number="1" type="start"/>
         </notations>
       </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="solid" number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="19">
+      <direction>
+        <direction-type>
+          <grouping type="start"/>
+        </direction-type>
+      </direction>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <grouping type="stop"/>
+        </direction-type>
+      </direction>
+    </measure>
+    <!--=======================================================-->
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
-          <slide line-type="solid" number="1" type="start"/>
+          <ornaments><tremolo type="start">2</tremolo></ornaments>
         </notations>
       </note>
       <note>
@@ -668,14 +791,125 @@
           <step>B</step>
           <octave>4</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <notations>
-          <slide line-type="solid" number="1" type="stop"/>
+          <ornaments><tremolo type="stop"/></ornaments>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="21">
+      <note>
+        <pitch>
+          <step>B</step><octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="start"/>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step><octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="stop"/>
+          </technical>
         </notations>
       </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="22">
+      <note>
+        <pitch>
+          <step>B</step><octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="start"/>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step><octave>4</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="stop"/>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="23">
+      <direction>
+        <direction-type>
+          <pedal type="start"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <pedal type="change"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <pedal type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
       </barline>
diff --git a/input/regression/musicxml/33b-Spanners-Tie.xml b/input/regression/musicxml/33b-Spanners-Tie.xml
index 90ee9e2073..52e1ce9e2d 100644
--- a/input/regression/musicxml/33b-Spanners-Tie.xml
+++ b/input/regression/musicxml/33b-Spanners-Tie.xml
@@ -25,18 +25,16 @@
 				<tie type="start"/>
 				<voice>1</voice>
 				<type>whole</type>
-				<staff>1</staff>
 				<notations><tied type="start"/></notations>
 			</note>
 		</measure>
 		<measure number="2">
-			<note release="-684">
+			<note>
 				<pitch><step>F</step><octave>4</octave></pitch>
 				<duration>4</duration>
 				<tie type="stop"/>
 				<voice>1</voice>
 				<type>whole</type>
-				<staff>1</staff>
 				<notations><tied type="stop"/></notations>
 			</note>
 		</measure>
diff --git a/input/regression/musicxml/33c-Spanners-Slurs.xml b/input/regression/musicxml/33c-Spanners-Slurs.xml
index dd2eb5e1be..b3d9c7f0a7 100644
--- a/input/regression/musicxml/33c-Spanners-Slurs.xml
+++ b/input/regression/musicxml/33c-Spanners-Slurs.xml
@@ -14,13 +14,6 @@
   <part-list>
     <score-part id="P1">
       <part-name print-object="no">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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -126,12 +119,11 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem default-y="10.5">up</stem>
         <notations>
           <slur number="2" type="stop"/>
         </notations>
       </note>
-      <note default-x="312">
+      <note>
         <pitch>
           <step>G</step>
           <octave>4</octave>
@@ -139,7 +131,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem default-y="5.5">up</stem>
         <notations>
           <slur number="1" type="stop"/>
         </notations>
diff --git a/input/regression/musicxml/33d-Spanners-OctaveShifts-Finale.xml b/input/regression/musicxml/33d-Spanners-OctaveShifts-Finale.xml
deleted file mode 100644
index ed1a344c1d..0000000000
--- a/input/regression/musicxml/33d-Spanners-OctaveShifts-Finale.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All types of octave shifts (15ma, 15mb, 8va, 8vb)</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>8</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>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="16" size="15" type="down"/>
-        </direction-type>
-        <offset>-4</offset>
-      </direction>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift size="15" type="stop"/>
-        </direction-type>
-        <offset>-4</offset>
-      </direction>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="-97" size="15" type="up"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <beam number="1">begin</beam>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift size="15" type="stop"/>
-        </direction-type>
-        <offset>-4</offset>
-      </direction>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="62" size="8" type="down"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <beam number="1">begin</beam>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift size="8" type="stop"/>
-        </direction-type>
-        <offset>-3</offset>
-      </direction>
-      <direction>
-        <direction-type>
-          <octave-shift default-y="-89" size="8" type="up"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>down</stem>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-      </note>
-      <direction>
-        <direction-type>
-          <octave-shift size="8" type="stop"/>
-        </direction-type>
-        <offset>-2</offset>
-      </direction>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/33d-Spanners-OctaveShifts.xml b/input/regression/musicxml/33d-Spanners-OctaveShifts.xml
new file mode 100644
index 0000000000..f872d463bc
--- /dev/null
+++ b/input/regression/musicxml/33d-Spanners-OctaveShifts.xml
@@ -0,0 +1,177 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All types of octave shifts (15ma,
+            15mb, 8va, 8vb)</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>8</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>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="15" type="down"/>
+        </direction-type>
+        <offset>-4</offset>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="15" type="stop"/>
+        </direction-type>
+        <offset>-4</offset>
+      </direction>
+      <direction>
+        <direction-type>
+          <octave-shift size="15" type="up"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="15" type="stop"/>
+        </direction-type>
+        <offset>-4</offset>
+      </direction>
+      <direction>
+        <direction-type>
+          <octave-shift size="8" type="down"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="8" type="stop"/>
+        </direction-type>
+        <offset>-3</offset>
+      </direction>
+      <direction>
+        <direction-type>
+          <octave-shift size="8" type="up"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">continue</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="8" type="stop"/>
+        </direction-type>
+        <offset>-2</offset>
+      </direction>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/33e-Spanners-Glissando.xml b/input/regression/musicxml/33e-Spanners-Glissando.xml
deleted file mode 100644
index 8afe656300..0000000000
--- a/input/regression/musicxml/33e-Spanners-Glissando.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="2.0">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All different types of 
-          glissando defined in MusicXML</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <defaults/>
-  <part-list>
-    <score-part id="P1">
-      <part-name></part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <!-- Glissando styles: glissando/slide, solid/dashed/dotted/wavy -->
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando number="1" type="stop"/>
-        </notations>
-        <lyric number="1"><text>glissando</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="solid" number="1" type="start">text</glissando>
-        </notations>
-        <lyric number="1"><text>solid</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="solid" number="1" type="stop"/>
-        </notations>
-        <lyric number="1"><text>(+text)</text></lyric>
-      </note>
-    </measure>
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="dashed" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>dashed</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="dashed" number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="dotted" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>dotted</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="dotted" number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="wavy" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>wavy</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="wavy" number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide number="1" type="stop"/>
-        </notations>
-        <lyric number="1"><text>slide</text></lyric>
-      </note>
-    </measure>
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="solid" number="1" type="start">text</slide>
-        </notations>
-        <lyric number="1"><text>solid</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="solid" number="1" type="stop"/>
-        </notations>
-        <lyric number="1"><text>(+text)</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="dashed" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>dashed</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="solid" number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="dotted" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>dotted</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="dotted" number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="wavy" number="1" type="start"/>
-        </notations>
-        <lyric number="1"><text>wavy</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="wavy" number="1" type="stop"/>
-        </notations>
-      </note>
-      
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/33e-Spanners-OctaveShifts-InvalidSize.xml b/input/regression/musicxml/33e-Spanners-OctaveShifts-InvalidSize.xml
new file mode 100644
index 0000000000..a97088bb98
--- /dev/null
+++ b/input/regression/musicxml/33e-Spanners-OctaveShifts-InvalidSize.xml
@@ -0,0 +1,87 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Invalid octave-shifts: 27 down,
+            11 up.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="27" type="down"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>7</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="27" type="stop"/>
+        </direction-type>
+      </direction>
+      <direction>
+        <direction-type>
+          <octave-shift size="11" type="up"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction>
+        <direction-type>
+          <octave-shift size="11" type="stop"/>
+        </direction-type>
+      </direction>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/33f-Trill-EndingOnGraceNote-Finale.xml b/input/regression/musicxml/33f-Trill-EndingOnGraceNote-Finale.xml
deleted file mode 100644
index a793d21f2c..0000000000
--- a/input/regression/musicxml/33f-Trill-EndingOnGraceNote-Finale.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A trill spanner that ends on an 
-          after-grace note.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="25">
-      <attributes>
-        <divisions>336</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <beats>6</beats>
-          <beat-type>8</beat-type>
-        </time>
-        <staves>2</staves>
-        <clef number="1">
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-        <clef number="2">
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>84</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">begin</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>84</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-        <notations>
-          <slur number="1" type="stop"/>
-          <ornaments>
-            <trill-mark default-y="39"/>
-            <wavy-line default-y="39" number="1" type="start"/>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>504</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">begin</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-        <beam number="2">end</beam>
-        <notations>
-          <ornaments>
-            <wavy-line number="1" type="stop"/>
-          </ornaments>
-        </notations>
-      </note>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/33f-Trill-EndingOnGraceNote.xml b/input/regression/musicxml/33f-Trill-EndingOnGraceNote.xml
new file mode 100644
index 0000000000..3680850110
--- /dev/null
+++ b/input/regression/musicxml/33f-Trill-EndingOnGraceNote.xml
@@ -0,0 +1,139 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A trill spanner that spans a 
+          grace note and ends on an after-grace note at the end of the 
+          measure.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="25">
+      <attributes>
+        <divisions>336</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>6</beats>
+          <beat-type>8</beat-type>
+        </time>
+        <staves>2</staves>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>84</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <accidental>sharp</accidental>
+        <staff>1</staff>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>84</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+        <notations>
+          <slur number="1" type="stop"/>
+          <ornaments>
+            <trill-mark default-y="39"/>
+            <wavy-line default-y="39" number="1" type="start"/>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>504</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <staff>1</staff>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+        <beam number="1">begin</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+        <notations>
+          <ornaments>
+            <wavy-line number="1" type="stop"/>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/33g-Slur-ChordedNotes.xml b/input/regression/musicxml/33g-Slur-ChordedNotes.xml
index ff7b37717d..4fa677342f 100644
--- a/input/regression/musicxml/33g-Slur-ChordedNotes.xml
+++ b/input/regression/musicxml/33g-Slur-ChordedNotes.xml
@@ -3,6 +3,12 @@
                                 "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise version="1.1">
   <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Slurs on chorded notes: Only the 
+          first note of the chord should get the slur notation. Some 
+          applications print out the slur for all notes -- these should be
+          ignored.</miscellaneous-field>
+    </miscellaneous>
   </identification>
   <part-list>
     <score-part id="P1">
@@ -11,7 +17,7 @@
   </part-list>
   <!--=========================================================-->
   <part id="P1">
-    <measure number="1" width="916">
+    <measure number="1">
       <attributes>
         <divisions>1</divisions>
         <key>
@@ -48,7 +54,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <chord/>
@@ -101,6 +106,9 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
       </note>
       <note>
         <pitch>
diff --git a/input/regression/musicxml/33h-Spanners-Glissando.xml b/input/regression/musicxml/33h-Spanners-Glissando.xml
new file mode 100644
index 0000000000..ab3c99dca4
--- /dev/null
+++ b/input/regression/musicxml/33h-Spanners-Glissando.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All different types of 
+          glissando defined in MusicXML</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name></part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <!-- Glissando styles: glissando/slide, solid/dashed/dotted/wavy -->
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando number="1" type="stop"/>
+        </notations>
+        <lyric number="1"><text>glissando</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="solid" number="1" type="start">text</glissando>
+        </notations>
+        <lyric number="1"><text>solid</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="solid" number="1" type="stop"/>
+        </notations>
+        <lyric number="1"><text>(+text)</text></lyric>
+      </note>
+    </measure>
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="dashed" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>dashed</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="dashed" number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="dotted" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>dotted</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="dotted" number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="wavy" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <glissando line-type="wavy" number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide number="1" type="stop"/>
+        </notations>
+        <lyric number="1"><text>slide</text></lyric>
+      </note>
+    </measure>
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="solid" number="1" type="start">text</slide>
+        </notations>
+        <lyric number="1"><text>solid</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="solid" number="1" type="stop"/>
+        </notations>
+        <lyric number="1"><text>(+text)</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="dashed" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>dashed</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="solid" number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="dotted" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>dotted</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="dotted" number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="wavy" number="1" type="start"/>
+        </notations>
+        <lyric number="1"><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slide line-type="wavy" number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/33y-Spanners-JScore.xml b/input/regression/musicxml/33y-Spanners-JScore.xml
deleted file mode 100644
index 74b0864eea..0000000000
--- a/input/regression/musicxml/33y-Spanners-JScore.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC 
-"-//Recordare//DTD MusicXML 1.0 Partwise//EN" 
-"http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-<identification>
-<encoding>
-<software>JMSL's MusicXMLWriter by Nick Didkovsky. Java Music Specification Language by Nick Didkovsky and Phil Burk, (c) 2003 Nick Didkovsky, Phil Burk.  Available from: http://www.algomusic.com</software>
-</encoding>
-<miscellaneous>
-<miscellaneous-field name="description">Some spanners, exported by JMSL's MusicXMLWriter</miscellaneous-field>
-</miscellaneous>
-</identification>
-<part-list>
-<score-part id="P1" >
-<part-name>MusicXML Part</part-name>
-</score-part>
-</part-list>
-<part id="P1" >
-<measure number="1" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>6</beats><beat-type>8</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<direction placement="above">
-<direction-type>
-<metronome parentheses="yes" relative-y="18">
-<beat-unit>quarter</beat-unit> 
-<per-minute>60</per-minute>
-</metronome>
-</direction-type>
-<offset>72</offset>
-<sound tempo="60" />
-</direction>
-<direction >
-<direction-type >
-<octave-shift type="down" size="8" relative-y="14" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>5</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>5</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>5</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<direction >
-<direction-type >
-<octave-shift type="stop" size="8" />
-</direction-type>
-<offset>-800</offset>
-</direction>
-<direction >
-<direction-type >
-<octave-shift type="up" size="8" relative-y="14" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>3</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>3</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>3</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<direction >
-<direction-type >
-<octave-shift type="stop" size="8" />
-</direction-type>
-<offset>-800</offset>
-</direction>
-</measure>
-<measure number="2" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>6</beats><beat-type>8</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<beam number="1" >begin</beam>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<beam number="1" >continue</beam>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<beam number="1" >end</beam>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>319</duration>
-<voice>1</voice>
-<type>eighth</type>
-<time-modification>
-<actual-notes>3</actual-notes>
-<normal-notes>2</normal-notes>
-<normal-type>eighth</normal-type>
-</time-modification>
-<beam number="1" >begin</beam>
-<notations>
-<tuplet type="start" placement="above" />
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>319</duration>
-<voice>1</voice>
-<type>eighth</type>
-<time-modification>
-<actual-notes>3</actual-notes>
-<normal-notes>2</normal-notes>
-</time-modification>
-<beam number="1" >continue</beam>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>319</duration>
-<voice>1</voice>
-<type>eighth</type>
-<time-modification>
-<actual-notes>3</actual-notes>
-<normal-notes>2</normal-notes>
-</time-modification>
-<beam number="1" >end</beam>
-<notations>
-<tuplet type="stop" />
-</notations>
-</note>
-</measure>
-<measure number="3" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>6</beats><beat-type>8</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<direction >
-<direction-type >
-<wedge type="crescendo" spread="0" relative-y="10" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<direction >
-<direction-type >
-<wedge type="stop" spread="15" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<direction >
-<direction-type >
-<wedge type="diminuendo" spread="15" relative-y="10" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<direction >
-<direction-type >
-<wedge type="stop" spread="0" />
-</direction-type>
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-</measure>
-<measure number="4" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>6</beats><beat-type>8</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<tie type="stop" />
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-<tied type="start" />
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<tie type="stop" />
-<tie type="start" />
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-<tied type="stop" />
-<tied type="start" />
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<tie type="stop" />
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-<tied type="stop" />
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-<slur type="start" number="1" />
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>480</duration>
-<voice>1</voice>
-<type>eighth</type>
-<notations>
-<slur type="stop" number="1" />
-</notations>
-</note>
-</measure>
-</part>
-</score-partwise>
diff --git a/input/regression/musicxml/33z-Spanners-Noteedit.xml b/input/regression/musicxml/33z-Spanners-Noteedit.xml
deleted file mode 100644
index 4edf6b3457..0000000000
--- a/input/regression/musicxml/33z-Spanners-Noteedit.xml
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC
-    "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-    "http://www.musicxml.org/dtds/partwise.dtd">
-
-<score-partwise>
-	<identification>
-		<miscellaneous>
-			<miscellaneous-field name="description">Some spanners, exported by NoteEdit</miscellaneous-field>
-		</miscellaneous>
-	</identification>
-
-	<part-list>
-		<score-part id="P1">
-			<part-name>MusicXML Part</part-name>
-			<score-instrument id="P1-I1">
-				<instrument-name>Klavier 1</instrument-name>
-			</score-instrument>
-			<midi-instrument id="P1-I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
-		</score-part>
-	</part-list>
-
-	<part id="P1">
-		<measure number="1">
-			<attributes>
-				<divisions>1</divisions>
-				<key>
-					<fifths>-1</fifths>
-				</key>
-				<time>
-					<beats>4</beats>
-					<beat-type>4</beat-type>
-				</time>
-				<clef>
-					<sign>G</sign>
-					<line>2</line>
-				</clef>
-			</attributes>
-			<direction placement="below">
-				<direction-type>
-					<wedge type="crescendo" spread="0"/>
-				</direction-type>
-			</direction>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<direction placement="below">
-				<direction-type>
-					<wedge type="stop" spread="15"/>
-				</direction-type>
-			</direction>
-			<direction placement="below">
-				<direction-type>
-					<wedge type="diminuendo" spread="15"/>
-				</direction-type>
-			</direction>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<direction placement="below">
-				<direction-type>
-					<wedge type="stop" spread="0"/>
-				</direction-type>
-			</direction>
-		</measure>
-		<measure number="2">
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<trill-mark/>
-						<wavy-line type="start"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="continue"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="stop"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-		</measure>
-		<measure number="3">
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="start"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="continue"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="continue"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>4</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="continue"/>
-					</ornaments>
-				</notations>
-			</note>
-		</measure>
-		<measure number="4">
-			<direction>
-				<direction-type>
-					<octave-shift type="down" size="8"/>
-				</direction-type>
-			</direction>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>5</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-				<notations>
-					<ornaments>
-						<wavy-line type="stop"/>
-					</ornaments>
-				</notations>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>5</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>5</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<note>
-				<pitch>
-					<step>G</step>
-					<octave>5</octave>
-				</pitch>
-				<duration>1</duration>
-				<voice>1</voice>
-				<type>quarter</type>
-				<stem>up</stem>
-			</note>
-			<direction>
-				<direction-type>
-					<octave-shift type="stop" size="8"/>
-				</direction-type>
-			</direction>
-		</measure>
-	</part>
-</score-partwise>
diff --git a/input/regression/musicxml/41a-MultiParts-Partorder.xml b/input/regression/musicxml/41a-MultiParts-Partorder.xml
index 23b9927d4f..a41f34780b 100644
--- a/input/regression/musicxml/41a-MultiParts-Partorder.xml
+++ b/input/regression/musicxml/41a-MultiParts-Partorder.xml
@@ -4,46 +4,23 @@
 	<identification> 
 		<miscellaneous>
 			<miscellaneous-field name="description">A piece with 
-                            four parts. Are they converted in the correct order?</miscellaneous-field>
+                            four parts (P0, P1, P2, P3; different from what 
+			    Finale creates!). Are they converted in the correct 
+			    order?</miscellaneous-field>
 		</miscellaneous>
 	</identification> 
 	<part-list>
 		<score-part id="P0">
 			<part-name>Part 1</part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
 		</score-part>
 		<score-part id="P1">
 			<part-name>Part 2</part-name>
-			<score-instrument id="I2">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I2">
-				<midi-channel>2</midi-channel>
-			</midi-instrument>
 		</score-part>
 		<score-part id="P2">
 			<part-name>Part 3</part-name>
-			<score-instrument id="I3">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I3">
-				<midi-channel>3</midi-channel>
-			</midi-instrument>
 		</score-part>
 		<score-part id="P3">
 			<part-name>Part 4</part-name>
-			<score-instrument id="I4">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I4">
-				<midi-channel>4</midi-channel>
-			</midi-instrument>
 		</score-part>
 	</part-list>
 	<part id="P0">
diff --git a/input/regression/musicxml/41b-MultiParts-MoreThan10.xml b/input/regression/musicxml/41b-MultiParts-MoreThan10.xml
index f1e3c24191..e97bf3d462 100644
--- a/input/regression/musicxml/41b-MultiParts-MoreThan10.xml
+++ b/input/regression/musicxml/41b-MultiParts-MoreThan10.xml
@@ -4,167 +4,71 @@
 	<identification> 
 		<miscellaneous>
 			<miscellaneous-field name="description">A piece with 
-                            more than 10 parts to check whether the parts are 
+                            20 parts to check whether an application supports
+			    that many parts and whether they are 
                             correctly sorted.</miscellaneous-field>
 		</miscellaneous>
 	</identification> 
 	<part-list>
 		<score-part id="P0">
-			<part-name></part-name>
-			<score-instrument id="I1">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I1">
-				<midi-channel>1</midi-channel>
-				<midi-program>1</midi-program>
-			</midi-instrument>
+			<part-name>P0</part-name>
 		</score-part>
 		<score-part id="P1">
-			<part-name></part-name>
-			<score-instrument id="I2">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I2">
-				<midi-channel>2</midi-channel>
-			</midi-instrument>
+			<part-name>P1</part-name>
 		</score-part>
 		<score-part id="P2">
-			<part-name></part-name>
-			<score-instrument id="I3">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I3">
-				<midi-channel>3</midi-channel>
-			</midi-instrument>
+			<part-name>P2</part-name>
 		</score-part>
 		<score-part id="P3">
-			<part-name></part-name>
-			<score-instrument id="I4">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I4">
-				<midi-channel>4</midi-channel>
-			</midi-instrument>
+			<part-name>P3</part-name>
 		</score-part>
 		<score-part id="P4">
-			<part-name></part-name>
-			<score-instrument id="I5">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I5">
-				<midi-channel>5</midi-channel>
-			</midi-instrument>
+			<part-name>P4</part-name>
 		</score-part>
 		<score-part id="P5">
-			<part-name></part-name>
-			<score-instrument id="I6">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I6">
-				<midi-channel>6</midi-channel>
-			</midi-instrument>
+			<part-name>P5</part-name>
 		</score-part>
 		<score-part id="P6">
-			<part-name></part-name>
-			<score-instrument id="I7">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I7">
-				<midi-channel>7</midi-channel>
-			</midi-instrument>
+			<part-name>P6</part-name>
 		</score-part>
 		<score-part id="P7">
-			<part-name></part-name>
-			<score-instrument id="I8">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I8">
-				<midi-channel>8</midi-channel>
-			</midi-instrument>
+			<part-name>P7</part-name>
 		</score-part>
 		<score-part id="P8">
-			<part-name></part-name>
-			<score-instrument id="I9">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I9">
-				<midi-channel>9</midi-channel>
-			</midi-instrument>
+			<part-name>P8</part-name>
 		</score-part>
 		<score-part id="P9">
-			<part-name></part-name>
-			<score-instrument id="I10">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I10">
-				<midi-channel>10</midi-channel>
-			</midi-instrument>
+			<part-name>P9</part-name>
 		</score-part>
 		<score-part id="P10">
-			<part-name></part-name>
-			<score-instrument id="I11">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I11">
-				<midi-channel>11</midi-channel>
-			</midi-instrument>
+			<part-name>P10</part-name>
 		</score-part>
 		<score-part id="P11">
-			<part-name></part-name>
-			<score-instrument id="I12">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I12">
-				<midi-channel>12</midi-channel>
-			</midi-instrument>
+			<part-name>P11</part-name>
 		</score-part>
 		<score-part id="P12">
-			<part-name></part-name>
-			<score-instrument id="I13">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I13">
-				<midi-channel>13</midi-channel>
-			</midi-instrument>
+			<part-name>P12</part-name>
 		</score-part>
 		<score-part id="P13">
-			<part-name></part-name>
-			<score-instrument id="I14">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I14">
-				<midi-channel>14</midi-channel>
-			</midi-instrument>
+			<part-name>P13</part-name>
 		</score-part>
 		<score-part id="P14">
-			<part-name></part-name>
-			<score-instrument id="I15">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I15">
-				<midi-channel>15</midi-channel>
-			</midi-instrument>
+			<part-name>P14</part-name>
 		</score-part>
 		<score-part id="P15">
-			<part-name></part-name>
-			<score-instrument id="I16">
-				<instrument-name>0</instrument-name>
-			</score-instrument>
-			<midi-instrument id="I16">
-				<midi-channel>16</midi-channel>
-			</midi-instrument>
+			<part-name>P15</part-name>
 		</score-part>
 		<score-part id="P16">
-			<part-name></part-name>
+			<part-name>P16</part-name>
 		</score-part>
 		<score-part id="P17">
-			<part-name></part-name>
+			<part-name>P17</part-name>
 		</score-part>
 		<score-part id="P18">
-			<part-name></part-name>
+			<part-name>P18</part-name>
 		</score-part>
 		<score-part id="P19">
-			<part-name></part-name>
+			<part-name>P19</part-name>
 		</score-part>
 	</part-list>
 	<part id="P0">
diff --git a/input/regression/musicxml/41c-StaffGroups.xml b/input/regression/musicxml/41c-StaffGroups.xml
index 77937d27c7..1a6455174d 100644
--- a/input/regression/musicxml/41c-StaffGroups.xml
+++ b/input/regression/musicxml/41c-StaffGroups.xml
@@ -22,10 +22,6 @@
       <score-instrument id="P1-I1">
         <instrument-name>Piccolo</instrument-name>
       </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>73</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="start">
       <group-symbol>bracket</group-symbol>
@@ -37,10 +33,6 @@
       <score-instrument id="P2-I2">
         <instrument-name>Flute 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P2-I2">
-        <midi-channel>2</midi-channel>
-        <midi-program>74</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P3">
       <part-name>Flute 2</part-name>
@@ -48,10 +40,6 @@
       <score-instrument id="P3-I3">
         <instrument-name>Flute 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P3-I3">
-        <midi-channel>3</midi-channel>
-        <midi-program>74</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <part-group number="3" type="start">
@@ -70,10 +58,6 @@
       <score-instrument id="P4-I4">
         <instrument-name>Oboe</instrument-name>
       </score-instrument>
-      <midi-instrument id="P4-I4">
-        <midi-channel>4</midi-channel>
-        <midi-program>69</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P5">
       <part-name>English Horn</part-name>
@@ -81,10 +65,6 @@
       <score-instrument id="P5-I5">
         <instrument-name>English Horn</instrument-name>
       </score-instrument>
-      <midi-instrument id="P5-I5">
-        <midi-channel>5</midi-channel>
-        <midi-program>70</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="4" type="stop"/>
     <score-part id="P6">
@@ -93,10 +73,6 @@
       <score-instrument id="P6-I6">
         <instrument-name>Clarinet in Eb</instrument-name>
       </score-instrument>
-      <midi-instrument id="P6-I6">
-        <midi-channel>6</midi-channel>
-        <midi-program>72</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="3" type="stop"/>
     <part-group number="1" type="start">
@@ -109,10 +85,6 @@
       <score-instrument id="P7-I7">
         <instrument-name>Clarinet in Bb 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P7-I7">
-        <midi-channel>7</midi-channel>
-        <midi-program>72</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P8">
       <part-name>Clarinet in Bb 2</part-name>
@@ -120,10 +92,6 @@
       <score-instrument id="P8-I8">
         <instrument-name>Clarinet in Bb 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P8-I8">
-        <midi-channel>8</midi-channel>
-        <midi-program>72</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <score-part id="P9">
@@ -132,10 +100,6 @@
       <score-instrument id="P9-I9">
         <instrument-name>Bass Clarinet</instrument-name>
       </score-instrument>
-      <midi-instrument id="P9-I9">
-        <midi-channel>9</midi-channel>
-        <midi-program>72</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="start">
       <group-symbol>bracket</group-symbol>
@@ -147,10 +111,6 @@
       <score-instrument id="P10-I10">
         <instrument-name>Bassoon 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P10-I10">
-        <midi-channel>11</midi-channel>
-        <midi-program>71</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P11">
       <part-name>Bassoon 2</part-name>
@@ -158,10 +118,6 @@
       <score-instrument id="P11-I11">
         <instrument-name>Bassoon 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P11-I11">
-        <midi-channel>12</midi-channel>
-        <midi-program>71</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <score-part id="P12">
@@ -170,10 +126,6 @@
       <score-instrument id="P12-I12">
         <instrument-name>Contrabassoon</instrument-name>
       </score-instrument>
-      <midi-instrument id="P12-I12">
-        <midi-channel>13</midi-channel>
-        <midi-program>71</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="stop"/>
     <part-group number="1" type="start">
@@ -190,10 +142,6 @@
       <score-instrument id="P13-I13">
         <instrument-name>Horn in F 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P13-I13">
-        <midi-channel>14</midi-channel>
-        <midi-program>61</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P14">
       <part-name>Horn in F 2</part-name>
@@ -201,10 +149,6 @@
       <score-instrument id="P14-I14">
         <instrument-name>Horn in F 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P14-I14">
-        <midi-channel>15</midi-channel>
-        <midi-program>61</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <part-group number="1" type="start">
@@ -217,10 +161,6 @@
       <score-instrument id="P15-I15">
         <instrument-name>Trumpet in C 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P15-I15">
-        <midi-channel>16</midi-channel>
-        <midi-program>57</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P16">
       <part-name>Trumpet in C 2</part-name>
@@ -228,10 +168,6 @@
       <score-instrument id="P16-I16">
         <instrument-name>Trumpet in C 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P16-I16">
-        <midi-channel>1</midi-channel>
-        <midi-program>57</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <part-group number="1" type="start">
@@ -244,10 +180,6 @@
       <score-instrument id="P17-I17">
         <instrument-name>Trombone 1</instrument-name>
       </score-instrument>
-      <midi-instrument id="P17-I17">
-        <midi-channel>2</midi-channel>
-        <midi-program>58</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P18">
       <part-name>Trombone 2</part-name>
@@ -255,10 +187,6 @@
       <score-instrument id="P18-I18">
         <instrument-name>Trombone 2</instrument-name>
       </score-instrument>
-      <midi-instrument id="P18-I18">
-        <midi-channel>3</midi-channel>
-        <midi-program>58</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <score-part id="P19">
@@ -267,10 +195,6 @@
       <score-instrument id="P19-I19">
         <instrument-name>Tuba</instrument-name>
       </score-instrument>
-      <midi-instrument id="P19-I19">
-        <midi-channel>4</midi-channel>
-        <midi-program>59</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="stop"/>
     <score-part id="P20">
@@ -279,10 +203,6 @@
       <score-instrument id="P20-I20">
         <instrument-name>Timpani</instrument-name>
       </score-instrument>
-      <midi-instrument id="P20-I20">
-        <midi-channel>5</midi-channel>
-        <midi-program>48</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P21">
       <part-name>Percussion</part-name>
@@ -290,11 +210,6 @@
       <score-instrument id="P21-M76">
         <instrument-name>MIDI77</instrument-name>
       </score-instrument>
-      <midi-instrument id="P21-M76">
-        <midi-channel>10</midi-channel>
-        <midi-program>1</midi-program>
-        <midi-unpitched>77</midi-unpitched>
-      </midi-instrument>
     </score-part>
     <score-part id="P22">
       <part-name>Harp</part-name>
@@ -302,10 +217,6 @@
       <score-instrument id="P22-I22">
         <instrument-name>Harp</instrument-name>
       </score-instrument>
-      <midi-instrument id="P22-I22">
-        <midi-channel>6</midi-channel>
-        <midi-program>47</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P23">
       <part-name>Piano</part-name>
@@ -313,10 +224,6 @@
       <score-instrument id="P23-I23">
         <instrument-name>Piano</instrument-name>
       </score-instrument>
-      <midi-instrument id="P23-I23">
-        <midi-channel>7</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="start">
       <group-symbol>bracket</group-symbol>
@@ -328,10 +235,6 @@
       <score-instrument id="P24-I24">
         <instrument-name>Violin I</instrument-name>
       </score-instrument>
-      <midi-instrument id="P24-I24">
-        <midi-channel>8</midi-channel>
-        <midi-program>49</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P25">
       <part-name>Violin II</part-name>
@@ -339,10 +242,6 @@
       <score-instrument id="P25-I25">
         <instrument-name>Violin II</instrument-name>
       </score-instrument>
-      <midi-instrument id="P25-I25">
-        <midi-channel>9</midi-channel>
-        <midi-program>49</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P26">
       <part-name>Viola</part-name>
@@ -350,10 +249,6 @@
       <score-instrument id="P26-I26">
         <instrument-name>Viola</instrument-name>
       </score-instrument>
-      <midi-instrument id="P26-I26">
-        <midi-channel>11</midi-channel>
-        <midi-program>49</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P27">
       <part-name>Cello</part-name>
@@ -361,10 +256,6 @@
       <score-instrument id="P27-I27">
         <instrument-name>Cello</instrument-name>
       </score-instrument>
-      <midi-instrument id="P27-I27">
-        <midi-channel>12</midi-channel>
-        <midi-program>49</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P28">
       <part-name>Contrabass</part-name>
@@ -372,10 +263,6 @@
       <score-instrument id="P28-I28">
         <instrument-name>Contrabass</instrument-name>
       </score-instrument>
-      <midi-instrument id="P28-I28">
-        <midi-channel>13</midi-channel>
-        <midi-program>49</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
   </part-list>
@@ -402,7 +289,6 @@
           <octave-change>1</octave-change>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -411,7 +297,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -448,7 +333,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -457,7 +341,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -494,7 +377,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>A</step>
@@ -503,7 +385,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -540,7 +421,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -549,7 +429,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -590,7 +469,6 @@
           <chromatic>-7</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -599,7 +477,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -640,7 +517,6 @@
           <chromatic>3</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -649,7 +525,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -690,7 +565,6 @@
           <chromatic>-2</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -700,7 +574,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -741,7 +614,6 @@
           <chromatic>-2</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -751,7 +623,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -793,7 +664,6 @@
           <octave-change>-1</octave-change>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -802,7 +672,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -839,7 +708,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>D</step>
@@ -848,7 +716,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -885,7 +752,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -894,7 +760,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -936,7 +801,6 @@
           <octave-change>-1</octave-change>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -945,7 +809,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -986,7 +849,6 @@
           <chromatic>-7</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -995,7 +857,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1036,7 +897,6 @@
           <chromatic>-7</chromatic>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>G</step>
@@ -1045,7 +905,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1082,7 +941,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -1091,7 +949,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1128,7 +985,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>A</step>
@@ -1137,7 +993,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1174,7 +1029,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -1183,7 +1037,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1220,7 +1073,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -1229,7 +1081,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1266,7 +1117,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -1275,7 +1125,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1312,7 +1161,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -1321,7 +1169,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1358,7 +1205,6 @@
           <sign>percussion</sign>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <unpitched>
           <display-step>E</display-step>
@@ -1368,7 +1214,6 @@
         <instrument id="P21-M76"/>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1410,7 +1255,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>D</step>
@@ -1419,7 +1263,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -1447,7 +1290,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -1492,7 +1334,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>G</step>
@@ -1501,7 +1342,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -1529,7 +1369,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -1569,7 +1408,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -1578,7 +1416,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1615,7 +1452,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -1624,7 +1460,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1661,7 +1496,6 @@
           <line>3</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -1670,7 +1504,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
@@ -1707,7 +1540,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -1716,7 +1548,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
@@ -1758,7 +1589,6 @@
           <octave-change>-1</octave-change>
         </transpose>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
@@ -1767,7 +1597,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <rest/>
diff --git a/input/regression/musicxml/41d-StaffGroups-Nested.xml b/input/regression/musicxml/41d-StaffGroups-Nested.xml
index 28ffdb63da..08f327f6db 100644
--- a/input/regression/musicxml/41d-StaffGroups-Nested.xml
+++ b/input/regression/musicxml/41d-StaffGroups-Nested.xml
@@ -12,13 +12,6 @@
   <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>
     </score-part>
     <part-group number="1" type="start">
       <group-symbol>line</group-symbol>
@@ -26,13 +19,6 @@
     </part-group>
     <score-part id="P2">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P2-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P2-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="start">
       <group-symbol>bracket</group-symbol>
@@ -40,35 +26,14 @@
     </part-group>
     <score-part id="P3">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P3-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P3-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P4">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P4-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P4-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="stop"/>
     <part-group number="1" type="stop"/>
     <score-part id="P5">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P5-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P5-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -89,7 +54,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
@@ -142,7 +106,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>A</step>
@@ -195,7 +158,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>A</step>
@@ -248,7 +210,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>F</step>
@@ -301,7 +262,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>D</step>
diff --git a/input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml b/input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml
index 6050067ebb..9326768ac6 100644
--- a/input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml
+++ b/input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml
@@ -15,13 +15,6 @@ Staff&#xd;
 Name</part-name>
       <part-abbreviation>St.&#xd;
 Nm.</part-abbreviation>
-      <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -42,7 +35,6 @@ Nm.</part-abbreviation>
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>B</step>
diff --git a/input/regression/musicxml/41f-StaffGroups-Overlapping.xml b/input/regression/musicxml/41f-StaffGroups-Overlapping.xml
index c02d14f47f..9b6d2afe9f 100644
--- a/input/regression/musicxml/41f-StaffGroups-Overlapping.xml
+++ b/input/regression/musicxml/41f-StaffGroups-Overlapping.xml
@@ -20,23 +20,9 @@
     </part-group>
     <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>
     </score-part>
     <score-part id="P2">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P2-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P2-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="start">
       <group-name>Group 2</group-name>
@@ -46,34 +32,13 @@
     </part-group>
     <score-part id="P3">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P3-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P3-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <score-part id="P4">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P4-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P4-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="1" type="stop"/>
     <score-part id="P5">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P5-I1">
-        <instrument-name>Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P5-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
     <part-group number="2" type="stop"/>
   </part-list>
@@ -95,7 +60,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -124,7 +88,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -153,7 +116,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -182,7 +144,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -211,7 +172,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml b/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml
index 00922bc734..27f4b2aa76 100644
--- a/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml
+++ b/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml
@@ -11,13 +11,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,7 +31,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>E</step>
@@ -61,12 +53,10 @@
       </note>
       <direction placement="below">
         <direction-type>
-          <dynamics default-y="-80">
+          <dynamics>
             <mf/>
           </dynamics>
         </direction-type>
-        <offset>-3</offset>
-        <sound dynamics="83"/>
       </direction>
       <note>
         <pitch>
diff --git a/input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml b/input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml
index 65279c4ca3..b499bbaf53 100644
--- a/input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml
+++ b/input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml
@@ -12,13 +12,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -52,7 +45,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">begin</beam>
         <notations>
@@ -69,7 +61,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">continue</beam>
         <notations>
@@ -86,7 +77,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">end</beam>
         <notations>
@@ -109,7 +99,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <notations>
           <slur number="1" placement="above" type="start"/>
@@ -123,7 +112,6 @@
         <duration>336</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
         <notations>
           <slur number="1" type="stop"/>
@@ -147,7 +135,6 @@
         <duration>168</duration>
         <voice>3</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">begin</beam>
         <notations>
@@ -164,7 +151,6 @@
         <duration>168</duration>
         <voice>3</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">end</beam>
         <notations>
@@ -181,7 +167,6 @@
         <duration>168</duration>
         <voice>3</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">begin</beam>
         <notations>
@@ -196,7 +181,6 @@
         <duration>84</duration>
         <voice>3</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
         <beam number="2">begin</beam>
@@ -209,7 +193,6 @@
         <duration>84</duration>
         <voice>3</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
         <beam number="2">continue</beam>
@@ -224,7 +207,6 @@
         <voice>3</voice>
         <type>16th</type>
         <accidental>sharp</accidental>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
         <beam number="2">continue</beam>
@@ -237,7 +219,6 @@
         <duration>84</duration>
         <voice>3</voice>
         <type>16th</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">end</beam>
         <beam number="2">end</beam>
@@ -265,14 +246,13 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">begin</beam>
         <notations>
           <articulations>
             <staccato placement="below"/>
           </articulations>
-          <dynamics default-y="-61" placement="below" relative-x="-14">
+          <dynamics placement="below">
             <fp/>
           </dynamics>
         </notations>
@@ -285,7 +265,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">continue</beam>
         <notations>
@@ -302,7 +281,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">end</beam>
         <notations>
@@ -319,7 +297,6 @@
         <duration>168</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
         <notations>
           <slur number="1" placement="above" type="start"/>
@@ -333,7 +310,6 @@
         <duration>336</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>1</staff>
         <notations>
           <slur number="1" type="stop"/>
@@ -350,7 +326,6 @@
         <duration>336</duration>
         <voice>3</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -362,7 +337,6 @@
         <duration>336</duration>
         <voice>3</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -374,7 +348,6 @@
         <duration>336</duration>
         <voice>3</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -386,7 +359,6 @@
         <duration>336</duration>
         <voice>3</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -411,7 +383,6 @@
         <duration>168</duration>
         <voice>3</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>2</staff>
         <notations>
           <articulations>
diff --git a/input/regression/musicxml/43-MultiStaff-Parts.itexi b/input/regression/musicxml/43-MultiStaff-Parts.itexi
index 9adbe48410..c65b084dac 100644
--- a/input/regression/musicxml/43-MultiStaff-Parts.itexi
+++ b/input/regression/musicxml/43-MultiStaff-Parts.itexi
@@ -1 +1 @@
-@unnumberedsec 43 ... One voice on multiple staves
+@unnumberedsec 43 ... One part on multiple staves
diff --git a/input/regression/musicxml/43d-MultiStaff-StaffChange.xml b/input/regression/musicxml/43d-MultiStaff-StaffChange.xml
index dab5d7eb63..e0071b91f7 100644
--- a/input/regression/musicxml/43d-MultiStaff-StaffChange.xml
+++ b/input/regression/musicxml/43d-MultiStaff-StaffChange.xml
@@ -13,13 +13,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -45,16 +38,6 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>8</duration>
-      </backup>
       <note>
         <pitch>
           <step>A</step>
@@ -63,7 +46,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>2</staff>
         <beam number="1">begin</beam>
       </note>
@@ -75,7 +57,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">continue</beam>
       </note>
@@ -87,7 +68,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
       </note>
@@ -99,7 +79,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">end</beam>
       </note>
@@ -111,7 +90,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">begin</beam>
       </note>
@@ -123,7 +101,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>1</staff>
         <beam number="1">continue</beam>
       </note>
@@ -135,7 +112,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
       </note>
@@ -147,7 +123,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>down</stem>
         <staff>2</staff>
         <beam number="1">end</beam>
       </note>
@@ -171,7 +146,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">begin</beam>
       </note>
@@ -184,7 +158,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -196,7 +169,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -208,7 +180,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -219,7 +190,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
         <beam number="1">continue</beam>
       </note>
@@ -232,7 +202,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -244,7 +213,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -255,7 +223,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">continue</beam>
       </note>
@@ -268,7 +235,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -280,7 +246,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -292,7 +257,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -303,7 +267,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>2</staff>
         <beam number="1">end</beam>
       </note>
@@ -316,7 +279,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -328,7 +290,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -340,7 +301,6 @@
         <duration>1</duration>
         <voice>2</voice>
         <type>eighth</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
diff --git a/input/regression/musicxml/43e-Multistaff-ClefDynamics.xml b/input/regression/musicxml/43e-Multistaff-ClefDynamics.xml
index e6c3f1aaf2..9807fb4dc0 100644
--- a/input/regression/musicxml/43e-Multistaff-ClefDynamics.xml
+++ b/input/regression/musicxml/43e-Multistaff-ClefDynamics.xml
@@ -5,20 +5,13 @@
   <identification>
     <miscellaneous>
       <miscellaneous-field name="description">A piano staff with dynamics and 
-          clef changes, that apply only to one voice or one staff, 
-          respectively.</miscellaneous-field>
+          clef changes, where each element (ffff, wedge and clef changes) 
+          applies only to one voice or one staff, respectively.</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -44,15 +37,13 @@
           <line>4</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <direction placement="below">
         <direction-type>
-          <dynamics default-y="-62" relative-x="-6">
+          <dynamics>
             <ffff/>
           </dynamics>
         </direction-type>
         <staff>1</staff>
-        <sound dynamics="141"/>
       </direction>
       <note>
         <pitch>
@@ -62,7 +53,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -73,7 +63,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -84,18 +73,16 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <direction placement="below">
         <direction-type>
-          <dynamics default-y="-61">
+          <dynamics>
             <p/>
           </dynamics>
         </direction-type>
         <offset>1</offset>
         <staff>1</staff>
-        <sound dynamics="54"/>
       </direction>
       <note>
         <pitch>
@@ -105,7 +92,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <backup>
@@ -113,18 +99,8 @@
       </backup>
       <direction placement="below">
         <direction-type>
-          <dynamics default-y="-62" relative-x="-6">
-            <ffff/>
-          </dynamics>
-        </direction-type>
-        <staff>2</staff>
-        <sound dynamics="141"/>
-      </direction>
-      <direction placement="below">
-        <direction-type>
-          <wedge default-y="-58" spread="0" type="crescendo"/>
+          <wedge spread="0" type="crescendo"/>
         </direction-type>
-        <offset>1</offset>
         <staff>2</staff>
       </direction>
       <note>
@@ -135,7 +111,6 @@
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -146,14 +121,12 @@
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <direction>
         <direction-type>
           <wedge spread="15" type="stop"/>
         </direction-type>
-        <offset>3</offset>
         <staff>2</staff>
       </direction>
       <note>
@@ -164,7 +137,6 @@
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
@@ -175,7 +147,6 @@
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>2</staff>
       </note>
     </measure>
@@ -199,7 +170,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -210,7 +180,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -222,7 +191,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -233,7 +201,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <backup>
@@ -243,45 +210,41 @@
         <pitch>
           <step>F</step>
           <alter>1</alter>
-          <octave>3</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>G</step>
-          <octave>3</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>A</step>
-          <octave>3</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>B</step>
-          <octave>3</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
     </measure>
@@ -301,7 +264,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -313,7 +275,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -324,7 +285,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <note>
@@ -335,7 +295,6 @@
         <duration>8</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <staff>1</staff>
       </note>
       <backup>
@@ -344,46 +303,42 @@
       <note>
         <pitch>
           <step>A</step>
-          <octave>2</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>B</step>
-          <octave>2</octave>
+          <octave>4</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>C</step>
           <alter>1</alter>
-          <octave>3</octave>
+          <octave>5</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
       <note>
         <pitch>
           <step>D</step>
-          <octave>3</octave>
+          <octave>5</octave>
         </pitch>
         <duration>8</duration>
         <voice>2</voice>
         <type>quarter</type>
-        <stem>up</stem>
         <staff>2</staff>
       </note>
     </measure>
diff --git a/input/regression/musicxml/45a-SimpleRepeat.xml b/input/regression/musicxml/45a-SimpleRepeat.xml
index 074ba1fd5a..582621a9f6 100644
--- a/input/regression/musicxml/45a-SimpleRepeat.xml
+++ b/input/regression/musicxml/45a-SimpleRepeat.xml
@@ -11,13 +11,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,7 +31,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/45b-RepeatWithAlternatives.xml b/input/regression/musicxml/45b-RepeatWithAlternatives.xml
index a29f1c0a13..329ac07ab6 100644
--- a/input/regression/musicxml/45b-RepeatWithAlternatives.xml
+++ b/input/regression/musicxml/45b-RepeatWithAlternatives.xml
@@ -11,13 +11,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,7 +31,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
diff --git a/input/regression/musicxml/45c-RepeatMultipleTimes.xml b/input/regression/musicxml/45c-RepeatMultipleTimes.xml
index 8ed24f703c..3a5df794f7 100644
--- a/input/regression/musicxml/45c-RepeatMultipleTimes.xml
+++ b/input/regression/musicxml/45c-RepeatMultipleTimes.xml
@@ -10,13 +10,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -37,7 +30,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -70,7 +62,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -107,7 +98,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="8">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml b/input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml
index 2d34453ee4..c90afeb591 100644
--- a/input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml
+++ b/input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml
@@ -11,13 +11,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,7 +31,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -74,7 +66,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -116,7 +107,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="8">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -163,7 +153,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="12">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml b/input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml
index 6b58074814..b4d324ee37 100644
--- a/input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml
+++ b/input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml
@@ -12,13 +12,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -39,7 +32,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -78,7 +70,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -111,7 +102,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="7">
-      <print new-system="yes"/>
       <barline location="left">
         <ending number="1" type="start"/>
       </barline>
@@ -152,7 +142,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="10">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/45f-Repeats-InvalidEndings.xml b/input/regression/musicxml/45f-Repeats-InvalidEndings.xml
index 9ce37f4176..a84052a0af 100644
--- a/input/regression/musicxml/45f-Repeats-InvalidEndings.xml
+++ b/input/regression/musicxml/45f-Repeats-InvalidEndings.xml
@@ -13,13 +13,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -40,7 +33,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -77,7 +69,6 @@
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/45g-Repeats-NotEnded.xml b/input/regression/musicxml/45g-Repeats-NotEnded.xml
index db3cac58a4..c29f6cd38c 100644
--- a/input/regression/musicxml/45g-Repeats-NotEnded.xml
+++ b/input/regression/musicxml/45g-Repeats-NotEnded.xml
@@ -11,13 +11,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,7 +31,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>C</step>
diff --git a/input/regression/musicxml/46a-Barlines.xml b/input/regression/musicxml/46a-Barlines.xml
index 86c9700eef..814a5b4256 100644
--- a/input/regression/musicxml/46a-Barlines.xml
+++ b/input/regression/musicxml/46a-Barlines.xml
@@ -5,19 +5,14 @@
   <identification>
     <miscellaneous>
       <miscellaneous-field name="description">Different types of (non-repeat) 
-          barlines.</miscellaneous-field>
+          barlines: default (no setting), regular, dotted, dashed, heavy,
+          light-light, light-heavy, heavy-light, heavy-heavy, tick, short, 
+          none.</miscellaneous-field>
     </miscellaneous>
   </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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -38,15 +33,11 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
         <voice>1</voice>
       </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="2">
@@ -56,7 +47,7 @@
         <voice>1</voice>
       </note>
       <barline location="right">
-        <bar-style>light-heavy</bar-style>
+        <bar-style>regular</bar-style>
       </barline>
     </measure>
     <!--=======================================================-->
@@ -67,12 +58,11 @@
         <voice>1</voice>
       </note>
       <barline location="right">
-        <bar-style>heavy</bar-style>
+        <bar-style>dotted</bar-style>
       </barline>
     </measure>
     <!--=======================================================-->
     <measure number="4">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -90,7 +80,7 @@
         <voice>1</voice>
       </note>
       <barline location="right">
-        <bar-style>dotted</bar-style>
+        <bar-style>heavy</bar-style>
       </barline>
     </measure>
     <!--=======================================================-->
@@ -101,7 +91,7 @@
         <voice>1</voice>
       </note>
       <barline location="right">
-        <bar-style>none</bar-style>
+        <bar-style>light-light</bar-style>
       </barline>
     </measure>
     <!--=======================================================-->
@@ -111,15 +101,20 @@
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="8">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>heavy-light</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="9">
@@ -128,6 +123,9 @@
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>heavy-heavy</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="10">
@@ -136,6 +134,9 @@
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>tick</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="11">
@@ -144,15 +145,20 @@
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>short</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="12">
-      <print new-system="yes"/>
       <note>
         <rest/>
         <duration>4</duration>
         <voice>1</voice>
       </note>
+      <barline location="right">
+        <bar-style>none</bar-style>
+      </barline>
     </measure>
     <!--=======================================================-->
     <measure number="13">
@@ -161,9 +167,6 @@
         <duration>4</duration>
         <voice>1</voice>
       </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
     </measure>
   </part>
   <!--=========================================================-->
diff --git a/input/regression/musicxml/46b-MidmeasureBarline.xml b/input/regression/musicxml/46b-MidmeasureBarline.xml
index 9323ae47a0..c4517e6cc2 100644
--- a/input/regression/musicxml/46b-MidmeasureBarline.xml
+++ b/input/regression/musicxml/46b-MidmeasureBarline.xml
@@ -11,13 +11,6 @@
     <part-list>
         <score-part id="P1">
             <part-name></part-name>
-            <score-instrument id="P1-I1">
-                <instrument-name>Acoustic Grand Piano</instrument-name>
-            </score-instrument>
-            <midi-instrument id="P1-I1">
-                <midi-channel>2</midi-channel>
-                <midi-program>1</midi-program>
-            </midi-instrument>
         </score-part>
     </part-list>
     <!--=========================================================-->
diff --git a/input/regression/musicxml/46c-Midmeasure-Clef.xml b/input/regression/musicxml/46c-Midmeasure-Clef.xml
index bd8cea47b6..548d105b3a 100644
--- a/input/regression/musicxml/46c-Midmeasure-Clef.xml
+++ b/input/regression/musicxml/46c-Midmeasure-Clef.xml
@@ -4,19 +4,14 @@
 <score-partwise>
   <identification>
     <miscellaneous>
-      <miscellaneous-field name="description">A clef change in the middle of a measure</miscellaneous-field>
+      <miscellaneous-field name="description">A clef change in the middle of a 
+            measure, using either an implicit measure or simply placing 
+            the attributes in the middle of the measure.</miscellaneous-field>
     </miscellaneous>
   </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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -37,7 +32,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
@@ -54,7 +48,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -64,7 +57,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <barline location="right">
         <bar-style>none</bar-style>
@@ -86,7 +78,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -96,7 +87,51 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
diff --git a/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml b/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml
index 5fbd00ac87..337fa9ed1b 100644
--- a/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml
+++ b/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml
@@ -12,13 +12,6 @@
   <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>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -39,7 +32,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
           <pitch>
               <step>E</step>
@@ -48,7 +40,6 @@
           <duration>2</duration>
           <voice>1</voice>
           <type>quarter</type>
-          <stem>up</stem>
       </note>
       <note>
           <pitch>
@@ -58,7 +49,6 @@
           <duration>1</duration>
           <voice>1</voice>
           <type>eighth</type>
-          <stem>up</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -71,7 +61,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -81,7 +70,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <barline location="right">
         <bar-style>none</bar-style>
@@ -97,7 +85,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>up</stem>
       </note>
       <note>
         <pitch>
@@ -107,7 +94,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
@@ -120,7 +106,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
@@ -130,7 +115,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
       </note>
       <note>
         <rest/>
diff --git a/input/regression/musicxml/46e-PickupMeasure-SecondVoiceMessup.xml b/input/regression/musicxml/46e-PickupMeasure-SecondVoiceMessup.xml
deleted file mode 100644
index 8f2bdbc3e0..0000000000
--- a/input/regression/musicxml/46e-PickupMeasure-SecondVoiceMessup.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
-          "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="2.0">
-    <identification>
-      <miscellaneous>
-        <miscellaneous-field name="description">Voice 2 should start at 2nd 
-            beat of first full measure.</miscellaneous-field>
-      </miscellaneous>
-    </identification>
-    <part-list>
-        <score-part id="P1">
-            <part-name></part-name>
-            <score-instrument id="P1-I1">
-                <instrument-name>Acoustic Grand Piano</instrument-name>
-            </score-instrument>
-            <midi-instrument id="P1-I1">
-                <midi-channel>2</midi-channel>
-                <midi-program>1</midi-program>
-            </midi-instrument>
-        </score-part>
-    </part-list>
-    <!--=========================================================-->
-    <part id="P1">
-        <measure implicit="yes" number="0" width="177">
-            <attributes>
-                <divisions>1</divisions>
-            </attributes>
-            <note>
-                <pitch>
-                    <step>C</step>
-                    <octave>5</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-        </measure>
-        <!--=======================================================-->
-        <measure number="1">
-            <attributes>
-                <divisions>1</divisions>
-            </attributes>
-            <note>
-                <pitch>
-                    <step>C</step>
-                    <octave>5</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <pitch>
-                    <step>A</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <pitch>
-                    <step>F</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <pitch>
-                    <step>C</step>
-                    <octave>5</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <backup>
-                <duration>3</duration>
-            </backup>
-            <note>
-                <pitch>
-                    <step>C</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>2</voice>
-                <type>quarter</type>
-            </note>
-        </measure>
-        <!--=======================================================-->
-    </part>
-    <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/46e-PickupMeasure-SecondVoiceStartsLater.xml b/input/regression/musicxml/46e-PickupMeasure-SecondVoiceStartsLater.xml
new file mode 100644
index 0000000000..4dd9631b1e
--- /dev/null
+++ b/input/regression/musicxml/46e-PickupMeasure-SecondVoiceStartsLater.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
+          "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+    <identification>
+      <miscellaneous>
+        <miscellaneous-field name="description">Voice 2 should start at 2nd 
+            beat of first full measure.</miscellaneous-field>
+      </miscellaneous>
+    </identification>
+    <part-list>
+        <score-part id="P1">
+            <part-name></part-name>
+        </score-part>
+    </part-list>
+    <!--=========================================================-->
+    <part id="P1">
+        <measure implicit="yes" number="0">
+            <attributes>
+                <divisions>1</divisions>
+            </attributes>
+            <note>
+                <pitch>
+                    <step>C</step>
+                    <octave>5</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+        </measure>
+        <!--=======================================================-->
+        <measure number="1">
+            <attributes>
+                <divisions>1</divisions>
+            </attributes>
+            <note>
+                <pitch>
+                    <step>C</step>
+                    <octave>5</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <pitch>
+                    <step>A</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <pitch>
+                    <step>F</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <pitch>
+                    <step>C</step>
+                    <octave>5</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <backup>
+                <duration>3</duration>
+            </backup>
+            <note>
+                <pitch>
+                    <step>C</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>2</voice>
+                <type>quarter</type>
+            </note>
+        </measure>
+        <!--=======================================================-->
+    </part>
+    <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/51b-Header-Quotes.xml b/input/regression/musicxml/51b-Header-Quotes.xml
new file mode 100644
index 0000000000..544bb5af1b
--- /dev/null
+++ b/input/regression/musicxml/51b-Header-Quotes.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <movement-title>"Quotes" in header fields</movement-title>
+  <identification>
+    <creator type="composer">Some "Tester" Name</creator>
+    <rights>Free for anyone ("Public Domain")</rights>
+    <encoding>
+      <software>"Hand-crafted" MusicXML file</software>
+      <encoding-date>2008-02-06</encoding-date>
+    </encoding>
+    <miscellaneous>
+      <miscellaneous-field name="description">Several header fields and part 
+          names can contain quotes ("). This test checks whether they are 
+          converted/imported without problems (i.e. whether they are correctly
+          escaped when converting).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Staff "Test"</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/51b-HeaderQuotes-Finale.xml b/input/regression/musicxml/51b-HeaderQuotes-Finale.xml
deleted file mode 100644
index 544bb5af1b..0000000000
--- a/input/regression/musicxml/51b-HeaderQuotes-Finale.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="2.0">
-  <movement-title>"Quotes" in header fields</movement-title>
-  <identification>
-    <creator type="composer">Some "Tester" Name</creator>
-    <rights>Free for anyone ("Public Domain")</rights>
-    <encoding>
-      <software>"Hand-crafted" MusicXML file</software>
-      <encoding-date>2008-02-06</encoding-date>
-    </encoding>
-    <miscellaneous>
-      <miscellaneous-field name="description">Several header fields and part 
-          names can contain quotes ("). This test checks whether they are 
-          converted/imported without problems (i.e. whether they are correctly
-          escaped when converting).</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Staff "Test"</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/52a-PageLayout.xml b/input/regression/musicxml/52a-PageLayout.xml
index 5e254b4b2b..330b9713bb 100644
--- a/input/regression/musicxml/52a-PageLayout.xml
+++ b/input/regression/musicxml/52a-PageLayout.xml
@@ -70,7 +70,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <rest/>
         <duration>4</duration>
diff --git a/input/regression/musicxml/61a-Lyrics-Finale.xml b/input/regression/musicxml/61a-Lyrics-Finale.xml
deleted file mode 100644
index c680a4b22c..0000000000
--- a/input/regression/musicxml/61a-Lyrics-Finale.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Some notes with simple lyrics: Syllables, notes without a syllable, syllable spanners.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </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>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Tra</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>la</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>li</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>Ja!</text>
-          <extend/>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Tra</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ra!</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61a-Lyrics.xml b/input/regression/musicxml/61a-Lyrics.xml
new file mode 100644
index 0000000000..81e0d60835
--- /dev/null
+++ b/input/regression/musicxml/61a-Lyrics.xml
@@ -0,0 +1,183 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Some notes with simple lyrics: 
+            Syllables, notes without a syllable, syllable 
+            spanners.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Tra</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>la</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>li</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>Ja!</text>
+          <extend/>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Tra</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ra!</text>
+          <extend/>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Bah!</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <lyric number="1">
+          <extend/>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61b-MultipleLyrics-Finale.xml b/input/regression/musicxml/61b-MultipleLyrics-Finale.xml
deleted file mode 100644
index c3f80345d9..0000000000
--- a/input/regression/musicxml/61b-MultipleLyrics-Finale.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Multiple (simple) lyrics. The 
-          order of the exported stanzas is relevant (identified by the number 
-          attribute in this test case)</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </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>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>1.Tra</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>begin</syllabic>
-          <text>2.tra</text>
-        </lyric>
-        <lyric number="3">
-          <syllabic>begin</syllabic>
-          <text>3.TRA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>la</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>middle</syllabic>
-          <text>la</text>
-        </lyric>
-        <lyric number="3">
-          <syllabic>middle</syllabic>
-          <text>LA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>la,</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>end</syllabic>
-          <text>la,</text>
-        </lyric>
-        <lyric number="3">
-          <syllabic>end</syllabic>
-          <text>LA,</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>ja!</text>
-          <extend/>
-        </lyric>
-        <lyric number="2">
-          <syllabic>single</syllabic>
-          <text>ja!</text>
-          <extend/>
-        </lyric>
-        <lyric number="3">
-          <syllabic>single</syllabic>
-          <text>JA!</text>
-          <extend/>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Tra</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>begin</syllabic>
-          <text>Tra</text>
-        </lyric>
-        <lyric number="3">
-          <syllabic>begin</syllabic>
-          <text>TRA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ra...</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>end</syllabic>
-          <text>ra.</text>
-        </lyric>
-        <lyric number="3">
-          <syllabic>end</syllabic>
-          <text>RA...</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61b-MultipleLyrics.xml b/input/regression/musicxml/61b-MultipleLyrics.xml
new file mode 100644
index 0000000000..5f9334d2c5
--- /dev/null
+++ b/input/regression/musicxml/61b-MultipleLyrics.xml
@@ -0,0 +1,191 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Multiple (simple) lyrics. The 
+          order of the exported stanzas is relevant (identified by the number 
+          attribute in this test case)</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>1.Tra</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>begin</syllabic>
+          <text>2.tra</text>
+        </lyric>
+        <lyric number="3">
+          <syllabic>begin</syllabic>
+          <text>3.TRA</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>la</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>middle</syllabic>
+          <text>la</text>
+        </lyric>
+        <lyric number="3">
+          <syllabic>middle</syllabic>
+          <text>LA</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>la,</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>end</syllabic>
+          <text>la,</text>
+        </lyric>
+        <lyric number="3">
+          <syllabic>end</syllabic>
+          <text>LA,</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>ja!</text>
+          <extend/>
+        </lyric>
+        <lyric number="2">
+          <syllabic>single</syllabic>
+          <text>ja!</text>
+          <extend/>
+        </lyric>
+        <lyric number="3">
+          <syllabic>single</syllabic>
+          <text>JA!</text>
+          <extend/>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Tra</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>begin</syllabic>
+          <text>Tra</text>
+        </lyric>
+        <lyric number="3">
+          <syllabic>begin</syllabic>
+          <text>TRA</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ra...</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>end</syllabic>
+          <text>ra.</text>
+        </lyric>
+        <lyric number="3">
+          <syllabic>end</syllabic>
+          <text>RA...</text>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61c-Lyrics-Pianostaff-Finale.xml b/input/regression/musicxml/61c-Lyrics-Pianostaff-Finale.xml
deleted file mode 100644
index bfb1d58c3f..0000000000
--- a/input/regression/musicxml/61c-Lyrics-Pianostaff-Finale.xml
+++ /dev/null
@@ -1,289 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Lyrics assigned to the voices of 
-          a piano staff containing two simple staves. Each staff is assigned 
-          exactly one lyrics line.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </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>
-        <staves>2</staves>
-        <clef number="1">
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-        <clef number="2">
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>tra</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>la</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>li</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>ja!</text>
-          <extend/>
-        </lyric>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>TRA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>LA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>LI</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>JA!</text>
-          <extend/>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>tra</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ra!</text>
-        </lyric>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>TRA</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>RA!</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61c-Lyrics-Pianostaff.xml b/input/regression/musicxml/61c-Lyrics-Pianostaff.xml
new file mode 100644
index 0000000000..ca5b8e6b55
--- /dev/null
+++ b/input/regression/musicxml/61c-Lyrics-Pianostaff.xml
@@ -0,0 +1,163 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Lyrics assigned to the voices of 
+          a piano staff containing two simple staves. Each staff is assigned 
+          exactly one lyrics line.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+        <staves>2</staves>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>tra</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>la</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>li</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>ja!</text>
+          <extend/>
+        </lyric>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>TRA</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>LA</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>LI</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>JA!</text>
+          <extend/>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61d-Lyrics-Melisma-Finale.xml b/input/regression/musicxml/61d-Lyrics-Melisma-Finale.xml
deleted file mode 100644
index c2c4f695f9..0000000000
--- a/input/regression/musicxml/61d-Lyrics-Melisma-Finale.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">How to treat lyrics and slurred 
-          notes. Normally, a slurred group of notes is assigned only one lyrics 
-          syllable.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </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>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Me</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <tied type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>lis</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <tie type="stop"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <tied type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ma.</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61d-Lyrics-Melisma.xml b/input/regression/musicxml/61d-Lyrics-Melisma.xml
new file mode 100644
index 0000000000..9258058c02
--- /dev/null
+++ b/input/regression/musicxml/61d-Lyrics-Melisma.xml
@@ -0,0 +1,169 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">How to treat lyrics and slurred 
+          notes. Normally, a slurred group of notes is assigned only one lyrics 
+          syllable.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Me</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <tied type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>lis</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <tie type="stop"/>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <tied type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ma.</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61e-Lyrics-Chords-Finale.xml b/input/regression/musicxml/61e-Lyrics-Chords-Finale.xml
deleted file mode 100644
index 506e0bce0f..0000000000
--- a/input/regression/musicxml/61e-Lyrics-Chords-Finale.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Assigning lyrics to chorded notes.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </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>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Ly</text>
-        </lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>rics</text>
-        </lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>on</text>
-        </lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>chords</text>
-        </lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61e-Lyrics-Chords.xml b/input/regression/musicxml/61e-Lyrics-Chords.xml
new file mode 100644
index 0000000000..945a31d43a
--- /dev/null
+++ b/input/regression/musicxml/61e-Lyrics-Chords.xml
@@ -0,0 +1,132 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Assigning lyrics to chorded 
+            notes.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Ly</text>
+        </lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>rics</text>
+        </lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>on</text>
+        </lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>chords</text>
+        </lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61f-Lyrics-GracedNotes-Finale.xml b/input/regression/musicxml/61f-Lyrics-GracedNotes-Finale.xml
deleted file mode 100644
index 5567bd7bef..0000000000
--- a/input/regression/musicxml/61f-Lyrics-GracedNotes-Finale.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Grace notes shall not mess up the 
-          lyrics, and they shall not be assigned a syllable.</miscellaneous-field>
-    </miscellaneous>
-  </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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>2</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>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>begin</syllabic>
-          <text>Ly</text>
-        </lyric>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>rics</text>
-        </lyric>
-      </note>
-      <note>
-        <grace slash="yes"/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <notations>
-          <tied type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>on</text>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <tied type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>notes</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <beam number="1">begin</beam>
-        <notations>
-          <tied type="start"/>
-        </notations>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <tie type="stop"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <tied type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>with</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>graces</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/61f-Lyrics-GracedNotes.xml b/input/regression/musicxml/61f-Lyrics-GracedNotes.xml
new file mode 100644
index 0000000000..b577b2e0bf
--- /dev/null
+++ b/input/regression/musicxml/61f-Lyrics-GracedNotes.xml
@@ -0,0 +1,209 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Grace notes shall not mess up the 
+          lyrics, and they shall not be assigned a syllable.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>2</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>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>Ly</text>
+        </lyric>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>rics</text>
+        </lyric>
+      </note>
+      <note>
+        <grace slash="yes"/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>eighth</type>
+        <notations>
+          <tied type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>on</text>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <tied type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>notes</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+        <notations>
+          <tied type="start"/>
+        </notations>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <tie type="stop"/>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <tied type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>with</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>graces</text>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61g-Lyrics-NameNumber.xml b/input/regression/musicxml/61g-Lyrics-NameNumber.xml
index fdab72d574..1999d07db1 100644
--- a/input/regression/musicxml/61g-Lyrics-NameNumber.xml
+++ b/input/regression/musicxml/61g-Lyrics-NameNumber.xml
@@ -27,7 +27,6 @@
         <time><beats>6</beats><beat-type>4</beat-type></time>
         <clef><sign>G</sign><line>2</line></clef>
       </attributes>
-      <sound tempo="120"/>
       <note>
         <pitch>
           <step>G</step>
diff --git a/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml b/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml
index 64ac98b1f7..0edcc5f2c0 100644
--- a/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml
+++ b/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml
@@ -9,7 +9,6 @@
           syllable are treated as if they were part of a melisma.</miscellaneous-field>
     </miscellaneous>
   </identification>
-  <defaults/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
diff --git a/input/regression/musicxml/61j-Lyrics-Elisions.xml b/input/regression/musicxml/61j-Lyrics-Elisions.xml
index 960b711247..fd76590df9 100644
--- a/input/regression/musicxml/61j-Lyrics-Elisions.xml
+++ b/input/regression/musicxml/61j-Lyrics-Elisions.xml
@@ -44,7 +44,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <lyric number="1">
           <text>a</text>
         </lyric>
@@ -57,7 +56,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <lyric number="1">
           <text>b c</text>
         </lyric>
@@ -70,7 +68,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <lyric number="1">
           <text>d</text>
           <elision/>
@@ -85,7 +82,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <stem>down</stem>
         <lyric number="1">
           <text>f</text>
           <elision/>
diff --git a/input/regression/musicxml/71a-Chordnames.xml b/input/regression/musicxml/71a-Chordnames.xml
new file mode 100644
index 0000000000..f7339048fb
--- /dev/null
+++ b/input/regression/musicxml/71a-Chordnames.xml
@@ -0,0 +1,185 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A normal staff with several 
+          (complex) chord names displayed.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-seventh</kind>
+        <degree>
+          <degree-value>11</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>B</root-step>
+        </root>
+        <kind>dominant</kind>
+        <degree>
+          <degree-value>5</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>alter</degree-type>
+        </degree>
+        <degree>
+          <degree-value>9</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>E</root-step>
+          <root-alter>-1</root-alter>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>2</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <harmony>
+        <root>
+          <root-step>G</root-step>
+        </root>
+        <kind>minor</kind>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>D</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major-seventh</kind>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>A</root-step>
+        </root>
+        <kind>diminished-seventh</kind>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>A</root-step>
+        </root>
+        <kind>augmented</kind>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/71a-Chords-Finale.xml b/input/regression/musicxml/71a-Chords-Finale.xml
deleted file mode 100644
index 55a1d329fc..0000000000
--- a/input/regression/musicxml/71a-Chords-Finale.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A normal staff with several 
-          (complex) chord names displayed.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </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"/>
-      <harmony default-y="40">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-seventh</kind>
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>B</root-step>
-        </root>
-        <kind>dominant</kind>
-        <degree>
-          <degree-value>5</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>alter</degree-type>
-        </degree>
-        <degree>
-          <degree-value>9</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>E</root-step>
-          <root-alter>-1</root-alter>
-        </root>
-        <kind>major</kind>
-        <degree>
-          <degree-value>2</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <harmony default-y="40">
-        <root>
-          <root-step>G</root-step>
-        </root>
-        <kind>minor</kind>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>D</root-step>
-          <root-alter>1</root-alter>
-        </root>
-        <kind>major-seventh</kind>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>A</root-step>
-        </root>
-        <kind>diminished-seventh</kind>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="40">
-        <root>
-          <root-step>A</root-step>
-        </root>
-        <kind>augmented</kind>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/71b-Fretboards-Finale.xml b/input/regression/musicxml/71b-Fretboards-Finale.xml
deleted file mode 100644
index 4238e3d052..0000000000
--- a/input/regression/musicxml/71b-Fretboards-Finale.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A staff with chord names and some 
-          fretboards shown. (In Finaly, only the fretboards were shown!!!)</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </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"/>
-      <harmony default-y="100">
-        <root>
-          <root-step>D</root-step>
-        </root>
-        <kind>major</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>2</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>0</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-seventh</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>3</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>5</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>4</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>3</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant</kind>
-        <degree>
-          <degree-value>13</degree-value>
-          <degree-alter>-1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>8</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>8</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>8</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>9</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>9</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>0</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/71c-ChordsFrets-Finale.xml b/input/regression/musicxml/71c-ChordsFrets-Finale.xml
deleted file mode 100644
index 281eebb65d..0000000000
--- a/input/regression/musicxml/71c-ChordsFrets-Finale.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A staff with chord names and some 
-          fretboards shown. The fretboards can have an arbitrary number of 
-          frets/strings, can start at an arbitrary fret and can even contain 
-          fingering information.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </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"/>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>0</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-seventh</kind>
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>2</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>5</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>4</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>5</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>2</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>B</root-step>
-        </root>
-        <kind>dominant</kind>
-        <degree>
-          <degree-value>5</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>alter</degree-type>
-        </degree>
-        <degree>
-          <degree-value>9</degree-value>
-          <degree-alter>1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>3</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>E</root-step>
-          <root-alter>-1</root-alter>
-        </root>
-        <kind>major</kind>
-        <degree>
-          <degree-value>2</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>5</frame-frets>
-          <first-fret>11</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>11</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>13</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>15</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>12</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>11</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>11</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <harmony default-y="100">
-        <root>
-          <root-step>G</root-step>
-        </root>
-        <kind>minor</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>3</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>5</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>5</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>3</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>D</root-step>
-          <root-alter>1</root-alter>
-        </root>
-        <kind>major-seventh</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>3</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>A</root-step>
-        </root>
-        <kind>diminished-seventh</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>2</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-        <frame>
-          <frame-strings>10</frame-strings>
-          <frame-frets>3</frame-frets>
-          <frame-note>
-            <string>10</string>
-            <fret>1</fret>
-            <fingering>2</fingering>
-          </frame-note>
-          <frame-note>
-            <string>9</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>7</string>
-            <fret>1</fret>
-            <fingering>4</fingering>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>1</fret>
-            <fingering>5</fingering>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>0</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/71c-ChordsFrets.xml b/input/regression/musicxml/71c-ChordsFrets.xml
new file mode 100644
index 0000000000..cb882c2c69
--- /dev/null
+++ b/input/regression/musicxml/71c-ChordsFrets.xml
@@ -0,0 +1,425 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A staff with chord names and some 
+          fretboards shown. The fretboards can have an arbitrary number of 
+          frets/strings, can start at an arbitrary fret and can even contain 
+          fingering information.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>0</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-seventh</kind>
+        <degree>
+          <degree-value>11</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <first-fret>2</first-fret>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>5</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>4</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>5</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>2</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>B</root-step>
+        </root>
+        <kind>dominant</kind>
+        <degree>
+          <degree-value>5</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>alter</degree-type>
+        </degree>
+        <degree>
+          <degree-value>9</degree-value>
+          <degree-alter>1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>3</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>E</root-step>
+          <root-alter>-1</root-alter>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>2</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>5</frame-frets>
+          <first-fret>11</first-fret>
+          <frame-note>
+            <string>6</string>
+            <fret>11</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>13</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>15</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>12</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>11</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>11</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <harmony>
+        <root>
+          <root-step>G</root-step>
+        </root>
+        <kind>minor</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <first-fret>3</first-fret>
+          <frame-note>
+            <string>6</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>5</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>5</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>3</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>D</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major-seventh</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>3</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>A</root-step>
+        </root>
+        <kind>diminished-seventh</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>2</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <frame>
+          <frame-strings>10</frame-strings>
+          <frame-frets>3</frame-frets>
+          <frame-note>
+            <string>10</string>
+            <fret>1</fret>
+            <fingering>2</fingering>
+          </frame-note>
+          <frame-note>
+            <string>9</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>7</string>
+            <fret>1</fret>
+            <fingering>4</fingering>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>1</fret>
+            <fingering>5</fingering>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>0</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/71d-ChordsFrets-Multistaff.xml b/input/regression/musicxml/71d-ChordsFrets-Multistaff.xml
new file mode 100644
index 0000000000..7b4eab2541
--- /dev/null
+++ b/input/regression/musicxml/71d-ChordsFrets-Multistaff.xml
@@ -0,0 +1,354 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Chords and fretboards assigned to 
+          the voices in a multi-voice, multi-staff part. There should be fret 
+          diagrams above each of the two staves.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</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>
+        <staves>2</staves>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <harmony>
+        <root>
+          <root-step>E</root-step>
+          <root-alter>-1</root-alter>
+        </root>
+        <kind>minor-ninth</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <first-fret>4</first-fret>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>6</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>4</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>6</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>6</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>0</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <harmony>
+        <root>
+          <root-step>D</root-step>
+        </root>
+        <kind>dominant</kind>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>2</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>2</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-seventh</kind>
+        <degree>
+          <degree-value>11</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+        <frame>
+          <frame-strings>6</frame-strings>
+          <frame-frets>4</frame-frets>
+          <frame-note>
+            <string>6</string>
+            <fret>0</fret>
+          </frame-note>
+          <frame-note>
+            <string>5</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>4</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>3</string>
+            <fret>3</fret>
+          </frame-note>
+          <frame-note>
+            <string>2</string>
+            <fret>1</fret>
+          </frame-note>
+          <frame-note>
+            <string>1</string>
+            <fret>1</fret>
+          </frame-note>
+        </frame>
+      </harmony>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>4</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>4</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>4</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>4</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/71d-ChordsFretsOnMultistaff-Finale.xml b/input/regression/musicxml/71d-ChordsFretsOnMultistaff-Finale.xml
deleted file mode 100644
index fba900bb17..0000000000
--- a/input/regression/musicxml/71d-ChordsFretsOnMultistaff-Finale.xml
+++ /dev/null
@@ -1,618 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Chords and fretboards assigned to 
-          the voices in a multi-voice, multi-staff part. There should be fret 
-          diagrams above each of the two staves.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
-    </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>
-        <staves>2</staves>
-        <clef number="1">
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-        <clef number="2">
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>E</root-step>
-          <root-alter>-1</root-alter>
-        </root>
-        <kind>minor-ninth</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>4</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>6</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>4</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>6</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>6</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>0</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>D</root-step>
-        </root>
-        <kind>dominant</kind>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>2</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>2</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-seventh</kind>
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <frame-note>
-            <string>6</string>
-            <fret>0</fret>
-          </frame-note>
-          <frame-note>
-            <string>5</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>3</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>1</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>1</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <harmony default-y="100">
-        <root>
-          <root-step>G</root-step>
-          <root-alter>1</root-alter>
-        </root>
-        <kind>suspended-fourth</kind>
-        <degree>
-          <degree-value>7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <degree>
-          <degree-value>9</degree-value>
-          <degree-alter>-1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <degree>
-          <degree-value>13</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-        <frame>
-          <frame-strings>6</frame-strings>
-          <frame-frets>4</frame-frets>
-          <first-fret>4</first-fret>
-          <frame-note>
-            <string>6</string>
-            <fret>4</fret>
-          </frame-note>
-          <frame-note>
-            <string>4</string>
-            <fret>4</fret>
-          </frame-note>
-          <frame-note>
-            <string>3</string>
-            <fret>6</fret>
-          </frame-note>
-          <frame-note>
-            <string>2</string>
-            <fret>6</fret>
-          </frame-note>
-          <frame-note>
-            <string>1</string>
-            <fret>5</fret>
-          </frame-note>
-        </frame>
-      </harmony>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>4</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/71e-TabStaves-Finale.xml b/input/regression/musicxml/71e-TabStaves-Finale.xml
deleted file mode 100644
index fab65176e4..0000000000
--- a/input/regression/musicxml/71e-TabStaves-Finale.xml
+++ /dev/null
@@ -1,1643 +0,0 @@
-<?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>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Some tablature staves, with 
-          explicit fingering information and different string tunings given 
-          in the MusicXML file.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <part-group number="1" type="start">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P1">
-      <part-name>Guitar</part-name>
-      <part-abbreviation>Gtr.</part-abbreviation>
-      <score-instrument id="P1-I1">
-        <instrument-name>Guitar</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>26</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P2">
-      <part-name>Guitar</part-name>
-      <part-abbreviation>Gtr.</part-abbreviation>
-      <score-instrument id="P2-I2">
-        <instrument-name>Guitar</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P2-I2">
-        <midi-channel>2</midi-channel>
-        <midi-program>26</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P3">
-      <part-name>Guitar</part-name>
-      <part-abbreviation>Gtr.</part-abbreviation>
-      <score-instrument id="P3-I3">
-        <instrument-name>Guitar</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P3-I3">
-        <midi-channel>3</midi-channel>
-        <midi-program>26</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P4">
-      <part-name>Guitar</part-name>
-      <part-abbreviation>Gtr.</part-abbreviation>
-      <score-instrument id="P4-I4">
-        <instrument-name>Guitar</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P4-I4">
-        <midi-channel>4</midi-channel>
-        <midi-program>26</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P5">
-      <part-name>Bass Guitar</part-name>
-      <part-abbreviation>Bass</part-abbreviation>
-      <score-instrument id="P5-I5">
-        <instrument-name>Bass Guitar</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P5-I5">
-        <midi-channel>5</midi-channel>
-        <midi-program>35</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P6">
-      <part-name>Banjo</part-name>
-      <part-abbreviation>Bjo.</part-abbreviation>
-      <score-instrument id="P6-I6">
-        <instrument-name>Banjo</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P6-I6">
-        <midi-channel>6</midi-channel>
-        <midi-program>106</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P7">
-      <part-name>Lute</part-name>
-      <part-abbreviation>L.</part-abbreviation>
-      <score-instrument id="P7-I7">
-        <instrument-name>Lute</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P7-I7">
-        <midi-channel>7</midi-channel>
-        <midi-program>25</midi-program>
-      </midi-instrument>
-    </score-part>
-    <score-part id="P8">
-      <part-name>Ukulele</part-name>
-      <part-abbreviation>Uk.</part-abbreviation>
-      <score-instrument id="P8-I8">
-        <instrument-name>Ukulele</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P8-I8">
-        <midi-channel>8</midi-channel>
-        <midi-program>25</midi-program>
-      </midi-instrument>
-    </score-part>
-    <part-group number="1" type="stop"/>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>6</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>B</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="6">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>5</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>17</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>1</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>2</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>5</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>1</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note print-object="no">
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P2">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>6</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>B</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="6">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>1</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>3</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>2</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>5</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>2</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P3">
-    <measure number="1">
-      <attributes>
-        <divisions>2</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>6</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>F</tuning-step>
-            <tuning-alter>1</tuning-alter>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="6">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>1</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>2</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>3</fret>
-          </technical>
-        </notations>
-      </note>
-      <note print-object="no">
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>5</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>6</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note print-object="no">
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P4">
-    <measure number="1">
-      <attributes>
-        <divisions>2</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>6</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>B</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="6">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>-7</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>D</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>5</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note print-object="no">
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note print-object="no">
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note print-object="no">
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P5">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>4</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>1</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>1</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>1</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>8</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>1</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>1</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>1</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>1</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>none</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note print-object="no">
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P6">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>5</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>C</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>3</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P7">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details show-frets="letters">
-          <staff-lines>6</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>2</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>C</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>F</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>3</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="5">
-            <tuning-step>D</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="6">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>1</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>2</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>7</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>4</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>6</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>5</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P8">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-        <staff-details>
-          <staff-lines>4</staff-lines>
-          <staff-tuning line="1">
-            <tuning-step>A</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="2">
-            <tuning-step>E</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="3">
-            <tuning-step>C</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-          <staff-tuning line="4">
-            <tuning-step>G</tuning-step>
-            <tuning-octave>4</tuning-octave>
-          </staff-tuning>
-        </staff-details>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>24</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>1</string>
-            <fret>4</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>3</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <notations>
-          <technical>
-            <string>2</string>
-            <fret>0</fret>
-          </technical>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/71e-TabStaves.xml b/input/regression/musicxml/71e-TabStaves.xml
new file mode 100644
index 0000000000..e63cf4b881
--- /dev/null
+++ b/input/regression/musicxml/71e-TabStaves.xml
@@ -0,0 +1,1515 @@
+<?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>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Some tablature staves, with 
+          explicit fingering information and different string tunings given 
+          in the MusicXML file.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <part-group number="1" type="start">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P1">
+      <part-name>Guitar</part-name>
+      <part-abbreviation>Gtr.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Guitar</part-name>
+      <part-abbreviation>Gtr.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Guitar</part-name>
+      <part-abbreviation>Gtr.</part-abbreviation>
+    </score-part>
+    <score-part id="P4">
+      <part-name>Guitar</part-name>
+      <part-abbreviation>Gtr.</part-abbreviation>
+    </score-part>
+    <score-part id="P5">
+      <part-name>Bass Guitar</part-name>
+      <part-abbreviation>Bass</part-abbreviation>
+    </score-part>
+    <score-part id="P6">
+      <part-name>Banjo</part-name>
+      <part-abbreviation>Bjo.</part-abbreviation>
+    </score-part>
+    <score-part id="P7">
+      <part-name>Lute</part-name>
+      <part-abbreviation>L.</part-abbreviation>
+    </score-part>
+    <score-part id="P8">
+      <part-name>Ukulele</part-name>
+      <part-abbreviation>Uk.</part-abbreviation>
+    </score-part>
+    <part-group number="1" type="stop"/>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>6</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>B</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="6">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>5</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>17</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>1</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>2</fret>
+          </technical>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>5</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>1</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>6</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>B</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="6">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>1</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>3</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>2</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>5</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>2</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>2</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>6</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>F</tuning-step>
+            <tuning-alter>1</tuning-alter>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="6">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>1</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>2</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>3</fret>
+          </technical>
+        </notations>
+      </note>
+      <note print-object="no">
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>5</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>6</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <measure number="1">
+      <attributes>
+        <divisions>2</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>6</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>B</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="6">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>-7</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>D</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>5</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note print-object="no">
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note print-object="no">
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P5">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>4</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>1</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>1</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>1</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>8</fret>
+          </technical>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>1</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>1</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>1</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>1</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>none</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P6">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>5</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>C</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>3</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P7">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details show-frets="letters">
+          <staff-lines>6</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>2</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>C</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>F</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>3</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="5">
+            <tuning-step>D</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="6">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>1</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>2</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>7</fret>
+          </technical>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>4</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>6</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>5</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P8">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+        <staff-details>
+          <staff-lines>4</staff-lines>
+          <staff-tuning line="1">
+            <tuning-step>A</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="2">
+            <tuning-step>E</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="3">
+            <tuning-step>C</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+          <staff-tuning line="4">
+            <tuning-step>G</tuning-step>
+            <tuning-octave>4</tuning-octave>
+          </staff-tuning>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>24</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>1</string>
+            <fret>4</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>3</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <notations>
+          <technical>
+            <string>2</string>
+            <fret>0</fret>
+          </technical>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/71f-AllChordTypes.xml b/input/regression/musicxml/71f-AllChordTypes.xml
index facab3489f..f54ec1f61a 100644
--- a/input/regression/musicxml/71f-AllChordTypes.xml
+++ b/input/regression/musicxml/71f-AllChordTypes.xml
@@ -14,9 +14,6 @@
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
diff --git a/input/regression/musicxml/73a-Percussion-Finale.xml b/input/regression/musicxml/73a-Percussion-Finale.xml
deleted file mode 100644
index e108cf5f32..0000000000
--- a/input/regression/musicxml/73a-Percussion-Finale.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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 version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Three types of percussion staves: 
-          A five-line staff with bass clef for Timpani, a five-line staff with 
-          percussion clef, and a one-line percussion staff with only unpitched 
-          notes.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Timpani</part-name>
-      <part-abbreviation>Timp.</part-abbreviation>
-    </score-part>
-    <part-group number="1" type="start">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P2">
-      <part-name>Cymbals</part-name>
-      <part-abbreviation>Cym.</part-abbreviation>
-    </score-part>
-    <score-part id="P3">
-      <part-name>Triangle</part-name>
-      <part-abbreviation>Tri.</part-abbreviation>
-    </score-part>
-    <part-group number="1" type="stop"/>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <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>
-        <clef>
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>4</duration>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>whole</type>
-        <notations>
-          <tied type="start"/>
-          <ornaments/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>4</duration>
-        <tie type="stop"/>
-        <voice>1</voice>
-        <type>whole</type>
-        <notations>
-          <tied type="stop"/>
-          <ornaments/>
-        </notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P2">
-    <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>
-        <clef>
-          <sign>percussion</sign>
-        </clef>
-      </attributes>
-      <note>
-        <unpitched>
-          <display-step>E</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>3</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>E</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <unpitched>
-          <display-step>D</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P3">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <time>
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>percussion</sign>
-        </clef>
-        <staff-details>
-          <staff-lines>1</staff-lines>
-        </staff-details>
-      </attributes>
-      <note>
-        <unpitched>
-          <display-step>F</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>3</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-      <note>
-        <unpitched>
-          <display-step>F</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <unpitched>
-          <display-step>E</display-step>
-          <display-octave>4</display-octave>
-        </unpitched>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/73a-Percussion.xml b/input/regression/musicxml/73a-Percussion.xml
new file mode 100644
index 0000000000..9b8d69ce54
--- /dev/null
+++ b/input/regression/musicxml/73a-Percussion.xml
@@ -0,0 +1,201 @@
+<?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 version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Three types of percussion staves: 
+          A five-line staff with bass clef for Timpani, a five-line staff with 
+          percussion clef, and a one-line percussion staff with only unpitched 
+          notes.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Timpani</part-name>
+      <part-abbreviation>Timp.</part-abbreviation>
+    </score-part>
+    <part-group number="1" type="start">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P2">
+      <part-name>Cymbals</part-name>
+      <part-abbreviation>Cym.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Triangle</part-name>
+      <part-abbreviation>Tri.</part-abbreviation>
+    </score-part>
+    <part-group number="1" type="stop"/>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <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>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>4</duration>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>whole</type>
+        <notations>
+          <tied type="start"/>
+          <ornaments/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <tie type="stop"/>
+        <voice>1</voice>
+        <type>half</type>
+        <notations>
+          <tied type="stop"/>
+          <ornaments/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <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>
+        <clef>
+          <sign>percussion</sign>
+        </clef>
+      </attributes>
+      <note>
+        <unpitched>
+          <display-step>E</display-step>
+          <display-octave>5</display-octave>
+        </unpitched>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <unpitched>
+          <display-step>C</display-step>
+          <display-octave>5</display-octave>
+        </unpitched>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <unpitched>
+          <display-step>D</display-step>
+          <display-octave>5</display-octave>
+        </unpitched>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>percussion</sign>
+        </clef>
+        <staff-details>
+          <staff-lines>1</staff-lines>
+        </staff-details>
+      </attributes>
+      <note>
+        <unpitched>
+          <display-step>F</display-step>
+          <display-octave>4</display-octave>
+        </unpitched>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <unpitched>
+          <display-step>F</display-step>
+          <display-octave>4</display-octave>
+        </unpitched>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <unpitched>
+          <display-step>E</display-step>
+          <display-octave>4</display-octave>
+        </unpitched>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/74a-FiguredBass.xml b/input/regression/musicxml/74a-FiguredBass.xml
index 7837c8cf08..9ffb8125e5 100644
--- a/input/regression/musicxml/74a-FiguredBass.xml
+++ b/input/regression/musicxml/74a-FiguredBass.xml
@@ -9,20 +9,13 @@
           note contains an empty &lt;figured-bass&gt; element, which is 
           invalid MusicXML, to check how well applications cope with malformed 
           files.
-      
+
           Note that this file does not contain any extenders!</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
     <score-part id="P1">
       <part-name>MusicXML Part</part-name>
-      <score-instrument id="P1-I1">
-        <instrument-name>Acoustic Grand Piano</instrument-name>
-      </score-instrument>
-      <midi-instrument id="P1-I1">
-        <midi-channel>1</midi-channel>
-        <midi-program>1</midi-program>
-      </midi-instrument>
     </score-part>
   </part-list>
   <!--=========================================================-->
@@ -43,7 +36,6 @@
           <line>2</line>
         </clef>
       </attributes>
-      <sound tempo="120"/>
       <figured-bass>
         <figure><figure-number>3</figure-number></figure>
         <duration>4</duration>
diff --git a/input/regression/musicxml/75a-AccordionRegistrations.xml b/input/regression/musicxml/75a-AccordionRegistrations.xml
index 1a98a65b49..01893680b6 100644
--- a/input/regression/musicxml/75a-AccordionRegistrations.xml
+++ b/input/regression/musicxml/75a-AccordionRegistrations.xml
@@ -8,7 +8,6 @@
           registrations.</miscellaneous-field>
     </miscellaneous>
   </identification>
-  <defaults/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>
diff --git a/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml b/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml
index bd8d196159..1d30c280fb 100644
--- a/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml
+++ b/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml
@@ -16,7 +16,6 @@
                             information or close all beams </miscellaneous-field>
                 </miscellaneous>
         </identification>
-        <defaults/>
         <part-list>
                 <score-part id='P1'>
                         <part-name></part-name>
diff --git a/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml b/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
index ea48a6338d..a2626c0f2e 100644
--- a/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
+++ b/input/regression/musicxml/99b-Lyrics-BeamsMelismata-IgnoreBeams.xml
@@ -14,7 +14,6 @@
           notes.</miscellaneous-field>
     </miscellaneous>
   </identification>
-  <defaults/>
   <part-list>
     <score-part id="P1">
       <part-name></part-name>