]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond
authorWerner Lemberg <wl@gnu.org>
Mon, 8 Dec 2008 06:19:49 +0000 (07:19 +0100)
committerWerner Lemberg <wl@gnu.org>
Mon, 8 Dec 2008 06:19:49 +0000 (07:19 +0100)
322 files changed:
Documentation/TRANSLATION
Documentation/de/translations.html.in
Documentation/de/user/converters.itely
Documentation/de/user/dedication.itely
Documentation/de/user/editorial.itely
Documentation/de/user/expressive.itely
Documentation/de/user/fretted-strings.itely
Documentation/de/user/fundamental.itely
Documentation/de/user/input.itely
Documentation/de/user/install.itely
Documentation/de/user/introduction.itely
Documentation/de/user/keyboards.itely
Documentation/de/user/lilypond-book.itely
Documentation/de/user/lilypond-learning.tely
Documentation/de/user/lilypond-program.tely
Documentation/de/user/lilypond.tely
Documentation/de/user/notation-appendices.itely
Documentation/de/user/notation.itely
Documentation/de/user/percussion.itely
Documentation/de/user/pitches.itely
Documentation/de/user/preface.itely
Documentation/de/user/repeats.itely
Documentation/de/user/rhythms.itely
Documentation/de/user/running.itely
Documentation/de/user/setup.itely
Documentation/de/user/simultaneous.itely
Documentation/de/user/specialist.itely
Documentation/de/user/staff.itely
Documentation/de/user/text.itely
Documentation/de/user/tutorial.itely
Documentation/de/user/tweaks.itely
Documentation/de/user/unfretted-strings.itely
Documentation/de/user/vocal.itely
Documentation/de/user/wind.itely
Documentation/de/user/working.itely
Documentation/es/translations.html.in
Documentation/es/user/lilypond-learning.tely
Documentation/es/user/lilypond-program.tely
Documentation/es/user/lilypond.tely
Documentation/fr/translations.html.in
Documentation/fr/user/lilypond-learning.tely
Documentation/fr/user/lilypond-program.tely
Documentation/fr/user/lilypond.tely
Documentation/po/de.po
Documentation/po/es.po
Documentation/po/fr.po
Documentation/po/lilypond-doc.pot
Documentation/translations.html.in
Documentation/user/music-glossary.tely
input/regression/musicxml/0-Introduction.itexi
input/regression/musicxml/00-Basics.itexi [deleted file]
input/regression/musicxml/00a-Basics-Pitches.xml [deleted file]
input/regression/musicxml/00b-Basics-Intervals.xml [deleted file]
input/regression/musicxml/00c-Basics-Durations.xml [deleted file]
input/regression/musicxml/00d-Basics-RestDurations.xml [deleted file]
input/regression/musicxml/00e-Basics-PitchedRests-PJB.xml [deleted file]
input/regression/musicxml/00f-Basics-Clefs.xml [deleted file]
input/regression/musicxml/00g-Basics-Keys.xml [deleted file]
input/regression/musicxml/00h-Basics-TimeSignatures.xml [deleted file]
input/regression/musicxml/00i-Basics-NoKeyOrClef.xml [deleted file]
input/regression/musicxml/00j-Basics-NoTime-PJB.xml [deleted file]
input/regression/musicxml/00k-Basics-Backup.xml [deleted file]
input/regression/musicxml/00l-Basics-MultiMeasureRests.xml [deleted file]
input/regression/musicxml/00l-Basics-Tie-PJB.xml [deleted file]
input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml [deleted file]
input/regression/musicxml/00n-NoVoiceElement.xml [deleted file]
input/regression/musicxml/00o-Basics-Modes.xml [deleted file]
input/regression/musicxml/00p-Rest-NoType.xml [deleted file]
input/regression/musicxml/00q-Basics-Microtones.xml [deleted file]
input/regression/musicxml/01-Chords.itexi [deleted file]
input/regression/musicxml/01-Pitches.itexi [new file with mode: 0644]
input/regression/musicxml/01a-Chord-Basic.xml [deleted file]
input/regression/musicxml/01a-Pitches-Pitches.xml [new file with mode: 0644]
input/regression/musicxml/01b-Chords-TwoNotes.xml [deleted file]
input/regression/musicxml/01b-Pitches-Intervals.xml [new file with mode: 0644]
input/regression/musicxml/01c-Chords-ThreeNotesDuration.xml [deleted file]
input/regression/musicxml/01c-Pitches-NoVoiceElement.xml [new file with mode: 0644]
input/regression/musicxml/01d-Chords-SchubertStabatMater.xml [deleted file]
input/regression/musicxml/01d-Pitches-Microtones.xml [new file with mode: 0644]
input/regression/musicxml/01e-Chords-PickupMeasures.xml [deleted file]
input/regression/musicxml/01f-Chord-ElementInBetween.xml [deleted file]
input/regression/musicxml/02-Notations-Articulations.itexi [deleted file]
input/regression/musicxml/02-Rests.itexi [new file with mode: 0644]
input/regression/musicxml/02a-Notations-MusicXML.xml [deleted file]
input/regression/musicxml/02a-Rests-Durations.xml [new file with mode: 0644]
input/regression/musicxml/02b-Articulations-Texts-PJB.xml [deleted file]
input/regression/musicxml/02b-Rests-PitchedRests.xml [new file with mode: 0644]
input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml [deleted file]
input/regression/musicxml/02c-Rests-MultiMeasureRests.xml [new file with mode: 0644]
input/regression/musicxml/02d-Arpeggio.xml [deleted file]
input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml [new file with mode: 0644]
input/regression/musicxml/02e-Rests-NoType.xml [new file with mode: 0644]
input/regression/musicxml/03-Directions.itexi [deleted file]
input/regression/musicxml/03-Rhythm.itexi [new file with mode: 0644]
input/regression/musicxml/03a-Directions-MusicXML.xml [deleted file]
input/regression/musicxml/03a-Rhythm-Durations.xml [new file with mode: 0644]
input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml [deleted file]
input/regression/musicxml/03b-Rhythm-Backup.xml [new file with mode: 0644]
input/regression/musicxml/03c-MetronomeMarks.xml [deleted file]
input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken [deleted file]
input/regression/musicxml/04-Spanners.itexi [deleted file]
input/regression/musicxml/04a-Spanners-Finale.xml [deleted file]
input/regression/musicxml/04b-Glissando.xml [deleted file]
input/regression/musicxml/04c-Spanners-Noteedit.xml [deleted file]
input/regression/musicxml/04d-Spanners-JScore.xml [deleted file]
input/regression/musicxml/04e-OctaveShifts-Finale.xml [deleted file]
input/regression/musicxml/04f-Slurs.xml [deleted file]
input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml [deleted file]
input/regression/musicxml/04h-Slur-ChordedNotes.xml [deleted file]
input/regression/musicxml/05-Header.itexi [deleted file]
input/regression/musicxml/05a-HeaderQuotes-Finale.xml [deleted file]
input/regression/musicxml/05b-MultipleRights.xml [deleted file]
input/regression/musicxml/06-Lyrics.itexi [deleted file]
input/regression/musicxml/06a-Lyrics-Finale.xml [deleted file]
input/regression/musicxml/06b-MultipleLyrics-Finale.xml [deleted file]
input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml [deleted file]
input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml [deleted file]
input/regression/musicxml/06e-Lyrics-Chords-Finale.xml [deleted file]
input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml [deleted file]
input/regression/musicxml/06g-Lyrics-NameNumber.xml [deleted file]
input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml [deleted file]
input/regression/musicxml/06i-Lyrics-Chords.xml [deleted file]
input/regression/musicxml/06j-Lyrics-Elisions.xml [deleted file]
input/regression/musicxml/07-NoteSettings.itexi [deleted file]
input/regression/musicxml/07a-Noteheads.xml [deleted file]
input/regression/musicxml/07b-Staff-Notestyles.xml [deleted file]
input/regression/musicxml/07c-Noteheads-Chords.xml [deleted file]
input/regression/musicxml/07d-Parenthesized-Noteheads.xml [deleted file]
input/regression/musicxml/08-Multiple-Parts.itexi [deleted file]
input/regression/musicxml/08a-Partorder-Rosegarden.xml [deleted file]
input/regression/musicxml/08b-StaffGroups-Finale.xml [deleted file]
input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml [deleted file]
input/regression/musicxml/08d-NestedPartsBrackets-Finale.xml [deleted file]
input/regression/musicxml/08e-LinebrokenInstrumentNames-Finale.xml [deleted file]
input/regression/musicxml/08f-PianoStaff-PJB.xml [deleted file]
input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml [deleted file]
input/regression/musicxml/09-Measures.itexi [deleted file]
input/regression/musicxml/09a-SimpleRepeat-Finale.xml [deleted file]
input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml [deleted file]
input/regression/musicxml/09c-Barlines-Finale.xml [deleted file]
input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml [deleted file]
input/regression/musicxml/09e-Alternatives-Finale.xml [deleted file]
input/regression/musicxml/09f-Repeats-Finale.xml [deleted file]
input/regression/musicxml/09g-Endings-Finale.xml [deleted file]
input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml [deleted file]
input/regression/musicxml/09i-MidmeasureBarline.xml [deleted file]
input/regression/musicxml/09j-Midmeasure-Clef-Finale.xml [deleted file]
input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml [deleted file]
input/regression/musicxml/09l-PickupMeasure-SecondVoiceMessup.xml [deleted file]
input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml [deleted file]
input/regression/musicxml/10-Multiple-Voices.itexi [deleted file]
input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml [deleted file]
input/regression/musicxml/11-TimeSignatures.itexi
input/regression/musicxml/11a-TimeSignatures-CompoundSimple.xml [deleted file]
input/regression/musicxml/11a-TimeSignatures.xml [new file with mode: 0644]
input/regression/musicxml/11b-TimeSignatures-CompoundMultiple.xml [deleted file]
input/regression/musicxml/11b-TimeSignatures-NoTime.xml [new file with mode: 0644]
input/regression/musicxml/11c-TimeSignatures-CompoundMixed.xml [deleted file]
input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml [new file with mode: 0644]
input/regression/musicxml/11d-TimeSignatures-CompoundMultiple.xml [new file with mode: 0644]
input/regression/musicxml/11d-TimeSignatures-SingleNumber.xml [deleted file]
input/regression/musicxml/11e-TimeSignatures-CompoundMixed.xml [new file with mode: 0644]
input/regression/musicxml/11e-TimeSignatures-SenzaMisura.xml [deleted file]
input/regression/musicxml/11g-TimeSignatures-SingleNumber.xml [new file with mode: 0644]
input/regression/musicxml/11h-TimeSignatures-SenzaMisura.xml [new file with mode: 0644]
input/regression/musicxml/12-Clefs.itexi [new file with mode: 0644]
input/regression/musicxml/12-Tuplets.itexi [deleted file]
input/regression/musicxml/12a-Clefs.xml [new file with mode: 0644]
input/regression/musicxml/12a-TripletsDuration-NoBracket-PJB.xml [deleted file]
input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml [new file with mode: 0644]
input/regression/musicxml/12b-Tuplets-Finale.xml [deleted file]
input/regression/musicxml/12c-Tuplet-Styles.xml [deleted file]
input/regression/musicxml/12d-Tremolo-Tuplets.xml [deleted file]
input/regression/musicxml/12e-Nested-Tuplets.xml [deleted file]
input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml [deleted file]
input/regression/musicxml/13-Grace-Notes.itexi [deleted file]
input/regression/musicxml/13-KeySignatures.itexi [new file with mode: 0644]
input/regression/musicxml/13a-GraceNotes-Finale.xml [deleted file]
input/regression/musicxml/13a-KeySignatures.xml [new file with mode: 0644]
input/regression/musicxml/13b-ChordAsGraceNote-Finale.xml [deleted file]
input/regression/musicxml/13b-KeySignatures-ChurchModes.xml [new file with mode: 0644]
input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml [deleted file]
input/regression/musicxml/13c-KeySignatures-NonTraditional.xml [new file with mode: 0644]
input/regression/musicxml/13d-AfterGrace.xml [deleted file]
input/regression/musicxml/13d-KeySignatures-Microtones.xml [new file with mode: 0644]
input/regression/musicxml/14-Multi-Staff-Parts.itexi [deleted file]
input/regression/musicxml/14a-MultistaffClefDynamics-Finale.xml [deleted file]
input/regression/musicxml/14b-DifferentKeys-PJB.xml [deleted file]
input/regression/musicxml/14b-DifferentKeysAfterBackup-PJB.xml [deleted file]
input/regression/musicxml/14c-StaffChange-Finale.xml [deleted file]
input/regression/musicxml/15-Percussion.itexi [deleted file]
input/regression/musicxml/15a-Percussion-Finale.xml [deleted file]
input/regression/musicxml/16-TransposingInstruments.itexi [deleted file]
input/regression/musicxml/16a-TransposingInstruments.xml [deleted file]
input/regression/musicxml/16b-TransposingInstruments-Full.xml [deleted file]
input/regression/musicxml/17-Guitar.itexi [deleted file]
input/regression/musicxml/17a-Chords-Finale.xml [deleted file]
input/regression/musicxml/17b-Fretboards-Finale.xml [deleted file]
input/regression/musicxml/17c-ChordsFrets-Finale.xml [deleted file]
input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml [deleted file]
input/regression/musicxml/17e-TabStaves-Finale.xml [deleted file]
input/regression/musicxml/17f-AllChordTypes.xml [deleted file]
input/regression/musicxml/18-Figured-Bass.itexi [deleted file]
input/regression/musicxml/18a-FiguredBass.xml [deleted file]
input/regression/musicxml/19-Page-Layout.itexi [deleted file]
input/regression/musicxml/19a-PageLayout-PrintMusic.xml [deleted file]
input/regression/musicxml/20-Compressed-MusicXML.itexi [deleted file]
input/regression/musicxml/20a-Compressed-MusicXML.mxl [deleted file]
input/regression/musicxml/21-Chords.itexi [new file with mode: 0644]
input/regression/musicxml/21-KeySignatures.itexi [deleted file]
input/regression/musicxml/21a-Chord-Basic.xml [new file with mode: 0644]
input/regression/musicxml/21b-Chords-TwoNotes.xml [new file with mode: 0644]
input/regression/musicxml/21b-KeySignatures-NonTraditional.xml [deleted file]
input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml [new file with mode: 0644]
input/regression/musicxml/21c-KeySignatures-Microtones.xml [deleted file]
input/regression/musicxml/21d-Chords-SchubertStabatMater.xml [new file with mode: 0644]
input/regression/musicxml/21e-Chords-PickupMeasures.xml [new file with mode: 0644]
input/regression/musicxml/21f-Chord-ElementInBetween.xml [new file with mode: 0644]
input/regression/musicxml/22-NoteSettings.itexi [new file with mode: 0644]
input/regression/musicxml/22a-Noteheads.xml [new file with mode: 0644]
input/regression/musicxml/22b-Staff-Notestyles.xml [new file with mode: 0644]
input/regression/musicxml/22c-Noteheads-Chords.xml [new file with mode: 0644]
input/regression/musicxml/22d-Parenthesized-Noteheads.xml [new file with mode: 0644]
input/regression/musicxml/23-Tuplets.itexi [new file with mode: 0644]
input/regression/musicxml/23a-Tuplets-Finale.xml [new file with mode: 0644]
input/regression/musicxml/23b-Tuplets-Styles.xml [new file with mode: 0644]
input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml [new file with mode: 0644]
input/regression/musicxml/23d-Tuplets-Nested.xml [new file with mode: 0644]
input/regression/musicxml/23e-Tuplets-Tremolo.xml [new file with mode: 0644]
input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml [new file with mode: 0644]
input/regression/musicxml/24-Grace-Notes.itexi [new file with mode: 0644]
input/regression/musicxml/24a-GraceNotes-Finale.xml [new file with mode: 0644]
input/regression/musicxml/24b-ChordAsGraceNote-Finale.xml [new file with mode: 0644]
input/regression/musicxml/24c-GraceNote-MeasureEnd-Finale.xml [new file with mode: 0644]
input/regression/musicxml/24d-AfterGrace.xml [new file with mode: 0644]
input/regression/musicxml/31-Directions.itexi [new file with mode: 0644]
input/regression/musicxml/31a-Directions-MusicXML.xml [new file with mode: 0644]
input/regression/musicxml/31b-Directions-MultimeasureRests.xml.broken [new file with mode: 0644]
input/regression/musicxml/31c-MetronomeMarks.xml [new file with mode: 0644]
input/regression/musicxml/32-Notations-Articulations.itexi [new file with mode: 0644]
input/regression/musicxml/32a-Notations.xml [new file with mode: 0644]
input/regression/musicxml/32b-Articulations-Texts.xml [new file with mode: 0644]
input/regression/musicxml/32c-MultipleNotationChildren.xml [new file with mode: 0644]
input/regression/musicxml/32d-Arpeggio.xml [new file with mode: 0644]
input/regression/musicxml/33-Spanners.itexi [new file with mode: 0644]
input/regression/musicxml/33a-Spanners.xml [new file with mode: 0644]
input/regression/musicxml/33b-Spanners-Tie.xml [new file with mode: 0644]
input/regression/musicxml/33c-Spanners-Slurs.xml [new file with mode: 0644]
input/regression/musicxml/33d-Spanners-OctaveShifts-Finale.xml [new file with mode: 0644]
input/regression/musicxml/33e-Spanners-Glissando.xml [new file with mode: 0644]
input/regression/musicxml/33f-Trill-EndingOnGraceNote-Finale.xml [new file with mode: 0644]
input/regression/musicxml/33g-Slur-ChordedNotes.xml [new file with mode: 0644]
input/regression/musicxml/33y-Spanners-JScore.xml [new file with mode: 0644]
input/regression/musicxml/33z-Spanners-Noteedit.xml [new file with mode: 0644]
input/regression/musicxml/41-Multiple-Parts.itexi [new file with mode: 0644]
input/regression/musicxml/41a-MultiParts-Partorder.xml [new file with mode: 0644]
input/regression/musicxml/41b-MultiParts-MoreThan10.xml [new file with mode: 0644]
input/regression/musicxml/41c-StaffGroups.xml [new file with mode: 0644]
input/regression/musicxml/41d-StaffGroups-Nested.xml [new file with mode: 0644]
input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml [new file with mode: 0644]
input/regression/musicxml/41f-StaffGroups-Overlapping.xml [new file with mode: 0644]
input/regression/musicxml/42-MultiVoice-Parts.itexi [new file with mode: 0644]
input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml [new file with mode: 0644]
input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml [new file with mode: 0644]
input/regression/musicxml/43-MultiStaff-Parts.itexi [new file with mode: 0644]
input/regression/musicxml/43a-PianoStaff.xml [new file with mode: 0644]
input/regression/musicxml/43b-MultiStaff-DifferentKeys.xml [new file with mode: 0644]
input/regression/musicxml/43c-MultiStaff-DifferentKeysAfterBackup.xml [new file with mode: 0644]
input/regression/musicxml/43d-MultiStaff-StaffChange.xml [new file with mode: 0644]
input/regression/musicxml/43e-Multistaff-ClefDynamics.xml [new file with mode: 0644]
input/regression/musicxml/45-Repeats.itexi [new file with mode: 0644]
input/regression/musicxml/45a-SimpleRepeat.xml [new file with mode: 0644]
input/regression/musicxml/45b-RepeatWithAlternatives.xml [new file with mode: 0644]
input/regression/musicxml/45c-RepeatMultipleTimes.xml [new file with mode: 0644]
input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml [new file with mode: 0644]
input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml [new file with mode: 0644]
input/regression/musicxml/45f-Repeats-InvalidEndings.xml [new file with mode: 0644]
input/regression/musicxml/45g-Repeats-NotEnded.xml [new file with mode: 0644]
input/regression/musicxml/46-Measures.itexi [new file with mode: 0644]
input/regression/musicxml/46a-Barlines.xml [new file with mode: 0644]
input/regression/musicxml/46b-MidmeasureBarline.xml [new file with mode: 0644]
input/regression/musicxml/46c-Midmeasure-Clef.xml [new file with mode: 0644]
input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml [new file with mode: 0644]
input/regression/musicxml/46e-PickupMeasure-SecondVoiceMessup.xml [new file with mode: 0644]
input/regression/musicxml/51-Header.itexi [new file with mode: 0644]
input/regression/musicxml/51b-HeaderQuotes-Finale.xml [new file with mode: 0644]
input/regression/musicxml/51c-MultipleRights.xml [new file with mode: 0644]
input/regression/musicxml/52-PageLayout.itexi [new file with mode: 0644]
input/regression/musicxml/52a-PageLayout.xml [new file with mode: 0644]
input/regression/musicxml/61-Lyrics.itexi [new file with mode: 0644]
input/regression/musicxml/61a-Lyrics-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61b-MultipleLyrics-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61c-Lyrics-Pianostaff-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61d-Lyrics-Melisma-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61e-Lyrics-Chords-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61f-Lyrics-GracedNotes-Finale.xml [new file with mode: 0644]
input/regression/musicxml/61g-Lyrics-NameNumber.xml [new file with mode: 0644]
input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml [new file with mode: 0644]
input/regression/musicxml/61i-Lyrics-Chords.xml [new file with mode: 0644]
input/regression/musicxml/61j-Lyrics-Elisions.xml [new file with mode: 0644]
input/regression/musicxml/71-Guitar.itexi [new file with mode: 0644]
input/regression/musicxml/71a-Chords-Finale.xml [new file with mode: 0644]
input/regression/musicxml/71b-Fretboards-Finale.xml [new file with mode: 0644]
input/regression/musicxml/71c-ChordsFrets-Finale.xml [new file with mode: 0644]
input/regression/musicxml/71d-ChordsFretsOnMultistaff-Finale.xml [new file with mode: 0644]
input/regression/musicxml/71e-TabStaves-Finale.xml [new file with mode: 0644]
input/regression/musicxml/71f-AllChordTypes.xml [new file with mode: 0644]
input/regression/musicxml/72-TransposingInstruments.itexi [new file with mode: 0644]
input/regression/musicxml/72a-TransposingInstruments.xml [new file with mode: 0644]
input/regression/musicxml/72b-TransposingInstruments-Full.xml [new file with mode: 0644]
input/regression/musicxml/73-Percussion.itexi [new file with mode: 0644]
input/regression/musicxml/73a-Percussion-Finale.xml [new file with mode: 0644]
input/regression/musicxml/74-Figured-Bass.itexi [new file with mode: 0644]
input/regression/musicxml/74a-FiguredBass.xml [new file with mode: 0644]
input/regression/musicxml/75-OtherInstruments.itexi [new file with mode: 0644]
input/regression/musicxml/75a-AccordionRegistrations.xml [new file with mode: 0644]
input/regression/musicxml/90-Compressed-MusicXML.itexi [new file with mode: 0644]
input/regression/musicxml/90a-Compressed-MusicXML.mxl [new file with mode: 0644]
input/regression/musicxml/99-Compatibility.itexi
lilypond-texi2html.init
python/musicxml.py
scm/documentation-generate.scm

index 6a284dd1b7cbb0fb40bdff4b57187df63f939ef2..4fa26678898beb443fc9a601163417c0d919b3e2 100644 (file)
@@ -111,22 +111,22 @@ Files marked with priority 3, 4 or 5 may be submitted individually.
 Word counts (excluding lilypond snippets) are given for each file.
 
 -1- Documentation index and Tutorial
-407   user/lilypond-learning.tely
+429   user/lilypond-learning.tely
 6365  user/tutorial.itely
 23    user/dedication.itely
 423   user/macros.itexi
 171   index.html.in
-6411  po/lilypond-doc.pot (translate to po/<MY_LANGUAGE>.po)
-13800 total
+6420  po/lilypond-doc.pot (translate to po/<MY_LANGUAGE>.po)
+13831 total
 
 -2- Introduction and beginning of Application Usage
 411   user/preface.itely
 3855  user/introduction.itely
-385   user/lilypond-program.tely
+407   user/lilypond-program.tely
 1930  user/install.itely (partial translation)
 1149  user/setup.itely
 2896  user/running.itely
-10626 total
+10648 total
 
 -3- Learning manual
 10318 user/fundamental.itely -- Fundamental concepts
@@ -136,7 +136,7 @@ Word counts (excluding lilypond snippets) are given for each file.
 28389 total
 
 -4- Notation reference
-672   user/lilypond.tely
+695   user/lilypond.tely
 91    user/notation.itely -- Musical notation
 3086  user/pitches.itely
 5013  user/rhythms.itely
@@ -145,9 +145,9 @@ Word counts (excluding lilypond snippets) are given for each file.
 1455  user/simultaneous.itely
 1635  user/staff.itely
 906   user/editorial.itely
-2472  user/text.itely
+2286  user/text.itely
 76    user/specialist.itely -- Specialist notation
-2638  user/vocal.itely
+2670  user/vocal.itely
 1333  user/chords.itely
 702   user/piano.itely
 810   user/percussion.itely
@@ -162,12 +162,12 @@ Word counts (excluding lilypond snippets) are given for each file.
 5202  user/programming-interface.itely -- Interfaces for programmers
 1155  user/notation-appendices.itely -- Notation manual tables
 250   user/cheatsheet.itely -- Cheat sheet
-62521 total
+62390 total
 
 -5- Application usage
-3202  user/lilypond-book.itely -- LilyPond-book
+3185  user/lilypond-book.itely -- LilyPond-book
 1171  user/converters.itely -- Converting from other formats
-4373  total
+4356  total
 
 -6- Appendices whose translation is optional
 310   user/literature.itely
index d2ec108d1449a9b15405a96155689bcea0acd56b..0a8cfd3ee799590c85bdf6b6f00ad1e52a18a341 100644 (file)
@@ -1,4 +1,4 @@
-·<p><i>Zuletzt aktualisiert am·Thu Dec  4 00:21:44 UTC 2008
+·<p><i>Zuletzt aktualisiert am·Sun Dec  7 22:30:55 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -58,11 +58,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Mehr Information</th>
  </tr>
  <tr align="left">
-  <td>Überschriften<br>(407)</td>
+  <td>Überschriften<br>(429)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #47ff24">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -79,7 +79,7 @@ translations.template.html.in; DO NOT EDIT !-->
    Reinhold Kainhofer</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #2cff20">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -143,11 +143,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Mehr Information</th>
  </tr>
  <tr align="left">
-  <td>Überschriften<br>(385)</td>
+  <td>Überschriften<br>(407)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #54ff26">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -156,7 +156,7 @@ translations.template.html.in; DO NOT EDIT !-->
    Reinhold Kainhofer</td>
   <td></td>
   <td><span style="background-color: #dfef77">teilweise (7 %)</span></td>
-  <td><span style="background-color: #62ff28">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -165,31 +165,32 @@ translations.template.html.in; DO NOT EDIT !-->
    Reinhold Kainhofer</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #62ff28">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>3 LilyPond starten<br>(2896)</td>
-  <td>Reinhold Kainhofer</td>
+  <td>Reinhold Kainhofer<br>
+   Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (84 %)</span></td>
-  <td><span style="background-color: #2cff20">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: Noten in den Text integrieren<br>(3202)</td>
+  <td>4 @command{lilypond-book}: Noten in den Text integrieren<br>(3185)</td>
   <td>Reinhold Kainhofer</td>
-  <td></td>
+  <td>Till Rettig</td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #39ff22">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>5 Von anderen Formaten konvertieren<br>(1171)</td>
   <td>Reinhold Kainhofer</td>
-  <td></td>
+  <td>Till Rettig</td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #40fe23">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
 </table>
@@ -197,18 +198,18 @@ translations.template.html.in; DO NOT EDIT !-->
 
 <table align="center" border="2">
  <tr align="center">
-  <th>GNU LilyPond -- Das Notationsprogramm</th>  <th>Übersetzer</th>
+  <th>GNU LilyPond -- Notationsreferenz</th>  <th>Übersetzer</th>
   <th>Übersetzungsüberprüfer</th>
   <th>Übersetzt</th>
   <th>Aktuell</th>
   <th>Mehr Information</th>
  </tr>
  <tr align="left">
-  <td>Überschriften<br>(672)</td>
+  <td>Überschriften<br>(695)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #40fe23">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -224,7 +225,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #33ff21">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -232,7 +233,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #62ff28">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -240,7 +241,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #2cff20">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -248,7 +249,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #33ff21">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -272,15 +273,15 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #4efe25">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.8 Text<br>(2472)</td>
+  <td>1.8 Text<br>(2286)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #ffca45">teilweise</span></td>
+  <td><span style="background-color: #25fe1f">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -292,11 +293,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Notation von Gesang<br>(2638)</td>
+  <td>2.1 Notation von Gesang<br>(2670)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #25fe1f">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -304,39 +305,39 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #40fe23">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>2.3 Bundlose Saiteninstrumente<br>(235)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #d0f0f8">nein</span></td>
-  <td><span style="background-color: #ff6d58">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>2.4 Saiteninstrumente mit Bünden<br>(1759)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (15 %)</span></td>
-  <td><span style="background-color: #ff6d58">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>2.5 Schlagzeug<br>(810)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (42 %)</span></td>
-  <td><span style="background-color: #ff6d58">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
   <td>2.6 Blasinstrumente<br>(136)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (1 %)</span></td>
-  <td><span style="background-color: #ff6d58">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -407,8 +408,8 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>B Notationsübersicht<br>(1155)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (98 %)</span></td>
-  <td><span style="background-color: #e8fe39">teilweise</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
+  <td><span style="background-color: #1fff1f">ja</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
index f645f00a268bde1ed73eb11eac59cb800c202cc5..c0d5f80e1392fb230e241a3ea3ba8da9fa9f09d2 100644 (file)
@@ -1,13 +1,16 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: c1be53409464d49dffa013f3dfeb9eb4910edd92
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.61"
+
 @c Translators: Reinhold Kainhofer
+@c Translation checkers: Till Rettig
 
 @node Converting from other formats
 @chapter Converting from other formats
@@ -21,8 +24,9 @@ findet sich auf der @uref{http://@/lilypond@/.org,Homepage} von LilyPond.
 
 Die im Folgenden beschriebenen Programme sind eigenständige Hilfsprogramme
 und werden üblicherweise von der Kommandozeile aufgerufen. Siehe
-@ref{Command-line usage} für weitere Informationen.
-
+@ref{Command-line usage} für weitere Informationen.  Wenn Sie MacOS
+10.3 oder 10.4 benutzen und Probleme mit diesen Skripten (z. B.
+@code{convert-ly}) haben, lesen Sie @ref{Setup for MacOS X}.
 
 @knownissues
 Leider haben wir nicht ausreichend viele Entwickler, um all die folgenden
@@ -32,12 +36,12 @@ Selbstverständlich sind Patches von Ihnen sehr willkommen!
 
 
 @menu
-* Invoking midi2ly::          Import von MIDI
-* Invoking musicxml2ly::      Import von MusicXML
-* Invoking abc2ly::           Import von ABC
-* Invoking etf2ly::           Import von (alten) Finale-Dateien
+* Invoking midi2ly::          Import von MIDI.
+* Invoking musicxml2ly::      Import von MusicXML.
+* Invoking abc2ly::           Import von ABC.
+* Invoking etf2ly::           Import von (alten) Finale-Dateien.
 * Generating LilyPond files:: Grafische Benutzeroberflächen,
-Musikübersetzer und Programme zur algorithmischen Komposition
+Musikübersetzer und Programme zur algorithmischen Komposition.
 @end menu
 
 @node Invoking midi2ly
@@ -338,7 +342,7 @@ Diese umfassen unter anderem:
 
 @itemize
 @item
-@uref{http://@/denemo@/.sourceforge@/.net/,Denemo}, ein grafisches 
+@uref{http://@/www@/.denemo@/.org/,Denemo}, ein grafisches 
 Programm zum Musiksatz.
 @item
 @uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, ein 
index 509cef7c1af5e1bdda0c61e7809f9d533cfd4a7c..7c2195613a991d0962fa7069936298fd8fa061a4 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78
+    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index 09a4d2de2a1f7e9dce6f5f8be8254cb8f183fb3e..210443747957b70f3ecb51aa461c06d91b4c5392 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 7c57f1469e057f25f5d7a7b75c18f33bb4e5bed9
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -18,8 +18,8 @@ Erscheinung der Noten zu ändern und analytische bzw. pädagogische
 Anmerkungen anzubringen.
 
 @menu
-* Inside the staff::            
-* Outside the staff::           
+* Inside the staff::
+* Outside the staff::
 @end menu
 
 
@@ -30,12 +30,12 @@ Dieser Abschnitt zeigt, wie man Elemente hervorhebt, die sich
 innerhalb des Notensystems befinden.
 
 @menu
-* Selecting notation font size::  
-* Fingering instructions::      
-* Hidden notes::                
-* Coloring objects::            
-* Parentheses::                 
-* Stems::                       
+* Selecting notation font size::
+* Fingering instructions::
+* Hidden notes::
+* Coloring objects::
+* Parentheses::
+* Stems::
 @end menu
 
 @node Selecting notation font size
@@ -120,23 +120,22 @@ Die @code{font-size}-Eigenschaft kann nur für die Layoutobjekte gesetzt
 werden, die Schrift-Dateien benutzen.  Das sind die, welche die
 @code{font-interface}-Layoutschnittstelle unterstützen.
 
+@funindex \huge
+@funindex \teeny
+@funindex \small
+@funindex \tiny
+@funindex \normalsize
+@funindex \large
 
 @predefined
-@funindex \teeny
 @code{\teeny},
-@funindex \tiny
 @code{\tiny},
-@funindex \small
 @code{\small},
-@funindex \normalsize
 @code{\normalsize},
-@funindex \large
 @code{\large},
-@funindex \huge
 @code{\huge}.
 @endpredefined
 
-
 @seealso
 Schnipsel:
 @rlsr{Editorial annotations}.
@@ -202,6 +201,8 @@ Fingersatzanweisungen können manuell oberhalb des Systems gesetzt werden, siehe
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{avoiding-collisions-of-chord-fingering-with-beams.ly}
 
 @seealso
 Notationsreferenz:
@@ -264,7 +265,6 @@ e4(\p f)--
 @code{\unHideNotes}.
 @endpredefined
 
-
 @seealso
 Schnipsel:
 @rlsr{Editorial annotations}.
@@ -351,7 +351,6 @@ gis8 a
 gis4 a
 @end lilypond
 
-
 @seealso
 Notationsreferenz:
 @ref{List of colors}, @ref{The
@@ -360,7 +359,6 @@ tweak command}.
 Schnipsel:
 @rlsr{Editorial annotations}.
 
-
 @cindex x11-Farbe
 @cindex farbige Noten in Akkorden
 @cindex Noten, farbige in Akkorden
@@ -410,7 +408,6 @@ c2-\parenthesize -. d
 c2 \parenthesize r
 @end lilypond
 
-
 @seealso
 Schnipsel:
 @rlsr{Editorial annotations}.
@@ -420,7 +417,6 @@ Referenz der Interna:
 @rinternals{ParenthesesItem},
 @rinternals{parentheses-interface}.
 
-
 @knownissues
 
 Wenn man einen Akkord einklammert, wird um jede Note eine eigene Klammer
@@ -441,13 +437,13 @@ ein Notenhals (@rinternals{Stem}) -Objekt erzeugt. Auch
 für ganze Noten und Pausen werden sie erzeugt, aber unsichtbar 
 gemacht.
 
+@funindex \stemNeutral
+@funindex \stemUp
+@funindex \stemDown
 
 @predefined
-@funindex \stemUp
 @code{\stemUp} (Hälse nach oben),
-@funindex \stemDown
 @code{\stemDown} (Hälse nach unten),
-@funindex \stemNeutral
 @code{\stemNeutral} (Hälse je nach Notenposition).
 @endpredefined
 
@@ -463,7 +459,6 @@ gemacht.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {default-direction-of-stems-on-the-center-line-of-the-staff.ly}
 
-
 @seealso
 Notationsreferenz:
 @ref{Direction and placement}.
@@ -477,6 +472,7 @@ Referenz der Interna:
 @rinternals{stem-interface}.
 
 
+
 @node Outside the staff
 @subsection Outside the staff
 
@@ -484,9 +480,9 @@ Dieser Abschnitt zeigt, wie man Elemente im System von
 außerhalb des Systems hervorhebt.
 
 @menu
-* Balloon help::                
-* Grid lines::                  
-* Analysis brackets::           
+* Balloon help::
+* Grid lines::
+* Analysis brackets::
 @end menu
 
 @node Balloon help
@@ -543,17 +539,16 @@ aber das kann geändert werden.
 }
 @end lilypond
 
-
-@predefined
 @funindex balloonLengthOn
 @funindex balloonLengthOff
-@code{\balloonLengthOn},
 @funindex \balloonLengthOn
 @funindex \balloonLengthOff
+
+@predefined
+@code{\balloonLengthOn},
 @code{\balloonLengthOff}.
 @endpredefined
 
-
 @seealso
 Schnipsel:
 @rlsr{Editorial annotations}.
@@ -684,7 +679,6 @@ Analysis brackets may be nested.
 }
 @end lilypond
 
-
 @seealso
 Schnipsel:
 @rlsr{Editorial annotations}.
index 702390f96c737f93f84cc63d3efaf41220a4c19b..c1fe74d2c84d55a1580dfda6d31314ca7b4f18e5 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: acbcbe3683d629575967b972b64ca5e1589bf330
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -67,7 +67,6 @@ Ausdrucksbezeichnungen zu erstellen.
 
 @funindex -
 
-
 Eine Vielfalt an Symbolen kann über und unter den Noten erscheinen, 
 um zu markieren, auf welche Art die Note ausgeführt werden soll. 
 Hierzu wird folgende Syntax benutzt:
@@ -124,7 +123,7 @@ definiert.  Artikulationszeichen und Onrnamente können manuell
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{tenuto},
 @rglos{accent},
 @rglos{staccato},
@@ -311,7 +310,6 @@ Vertikale Position der Zeichen wird von der Funktion
 @funindex \dynamicNeutral
 @funindex dynamicNeutral
 
-
 @predefined
 @code{\dynamicUp},
 @code{\dynamicDown},
@@ -324,7 +322,6 @@ Vertikale Position der Zeichen wird von der Funktion
 @code{\dimHairpin}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -350,7 +347,7 @@ Vertikale Position der Zeichen wird von der Funktion
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{al niente},
 @rglos{crescendo},
 @rglos{decrescendo},
@@ -373,6 +370,7 @@ Referenz der Interna:
 @rinternals{DynamicLineSpanner}.
 
 
+
 @node New dynamic marks
 @unnumberedsubsubsec New dynamic marks
 
@@ -489,10 +487,10 @@ Ausdrucksbezeichnungen erstellt: Legato- und Phrasierungsbögen,
 Atemzeichen und Glissandos zu unbestimmten Tonhöhen.
 
 @menu
-* Slurs::                       
-* Phrasing slurs::                    
-* Breath marks::                
-* Falls and doits::             
+* Slurs::
+* Phrasing slurs::
+* Breath marks::
+* Falls and doits::
 @end menu
 
 @node Slurs
@@ -576,7 +574,6 @@ g4( e c2)
 @funindex \slurUp
 @funindex slurUp
 
-
 @predefined
 @code{\slurUp},
 @code{\slurDown},
@@ -586,7 +583,6 @@ g4( e c2)
 @code{\slurSolid}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -594,7 +590,7 @@ g4( e c2)
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{slur}.
 
 Handbuch zum Lernen:
@@ -611,6 +607,7 @@ Referenz der Interna:
 @rinternals{Slur}.
 
 
+
 @node Phrasing slurs
 @unnumberedsubsubsec Phrasing slurs
 
@@ -636,6 +633,12 @@ e2) d\)
 @funindex phrasingSlurDown
 @funindex \phrasingSlurNeutral
 @funindex phrasingSlurNeutral
+@funindex phrasingSlurDashed
+@funindex \phrasingSlurDashed
+@funindex \phrasingSlurDotted
+@funindex phrasingSlurDotted
+@funindex \phrasingSlurSolid
+@funindex phrasingSlurSolid
 
 Im typographischen Sinne verhalten sich Phrasierungsbögen genauso wie 
 Legatobögen. Sie werden aber als eigene Objekte behandelt. Ein 
@@ -659,14 +662,29 @@ c4\( g' c,( b) | c1\)
 Simultane oder überlappende Phrasierungsbögen sind nicht
 erlaubt.
 
+Phrasierungsbögen können durchgehend, gepunket oder gestrichelt dargestellt
+werden.  Standard ist der durchgehende Bogen:
+
+@lilypond[verbatim,quote,relative=1]
+c4\( e g2\)
+\phrasingSlurDashed
+g4\( e c2\)
+\phrasingSlurDotted
+c4\( e g2\)
+\phrasingSlurSolid
+g4\( e c2\)
+@end lilypond
+
 
 @predefined
 @code{\phrasingSlurUp},
 @code{\phrasingSlurDown},
-@code{\phrasingSlurNeutral}.
+@code{\phrasingSlurNeutral},
+@code{\phrasingSlurDashed},
+@code{\phrasingSlurDotted},
+@code{\phrasingSlurSolid}.
 @endpredefined
 
-
 @seealso
 Handbuch zum Lernen:
 @rlearning{On the un-nestedness of brackets and ties}.
@@ -681,6 +699,7 @@ Referenz der Interna:
 @rinternals{PhrasingSlur}.
 
 
+
 @node Breath marks
 @unnumberedsubsubsec Breath marks
 
@@ -712,7 +731,7 @@ Divisiones genannt, sind unterstützt.  Für Einzelheiten siehe
 
 
 @seealso
-Musikglossar: 
+Glossar:
 @rglos{caesura}.
 
 Notationsreferenz:
@@ -725,6 +744,7 @@ Referenz der Interna:
 @rinternals{BreathingSign}.
 
 
+
 @node Falls and doits
 @unnumberedsubsubsec Falls and doits
 
@@ -761,7 +781,7 @@ ist @emph{notwendig} um unbestimmte Glissandos zu notieren.
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{fall},
 @rglos{doit}.
 
@@ -807,7 +827,7 @@ Verschiedene Glissando-Stile sind möglich.  Für Einzelheiten siehe
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{glissando}.
 
 Notationsreferenz:
@@ -897,7 +917,6 @@ Ein Arpeggio kann auch explizit ausgeschrieben werden, indem
 @code{\arpeggioParenthesis}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -911,7 +930,7 @@ Ein Arpeggio kann auch explizit ausgeschrieben werden, indem
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{arpeggio}.
 
 Notationsreferenz:
@@ -1011,16 +1030,13 @@ g\stopTrillSpan
 g\stopTrillSpan
 @end lilypond
 
-
-
 @predefined
 @code{\startTrillSpan},
 @code{\stopTrillSpan}.
 @endpredefined
 
-
 @seealso
-Musikglossar:
+Glossar:
 @rglos{trill}.
 
 Notationsreferenz:
index 09a4eca0b5b0317b4ade2ff778f4bc3968bc3b0d..03311ea9b5226bff5c9897bc2992c0595ac105b7 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 19fc0f930f921ca2609e0e60aa26f9d980771b97
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @node Fretted string instruments
 @section Fretted string instruments
 
-@untranslated
+@lilypondfile[quote]{fretted-headword.ly}
+
+Dieser Abschnitt erklärt bestimmte Eigenheiten der Notation für
+gebundene Saiteninstrumente.
+
+@cindex Tabulatur
+@cindex Gitarrentabulatur
+@cindex Banjo-Tabulatur
 
 @menu
 * Common notation for fretted strings::
@@ -23,7 +30,8 @@
 @node Common notation for fretted strings
 @subsection Common notation for fretted strings
 
-@untranslated
+Dieser Abschnitt zeigt Besonderheiten der Notation, die allen
+gebundenen Saiteninstrumenten eigen ist.
 
 @menu
 * References for fretted strings::
 * Default tablatures::
 * Custom tablatures::
 * Fret diagram markups::
+* Predefined fret diagrams::
+* Automatic fret diagrams::
 * Right-hand fingerings::
 @end menu
 
 @node References for fretted strings
 @unnumberedsubsubsec References for fretted strings
 
-@untranslated
+Noten für gebundene Saiteninstrumente wird normalerweise auf
+einem einzelnen System notiert, entweder als traditionelles
+Notensystem oder in Tabulaturform.  Manchmal werden beide
+Arten miteinander verbunden, und besonders in populärer
+Musik ist es üblich, über dem traditionellen System Griffsymbole
+zu setzen.  Gitarre und Banjo sind transponierende Instrumente,
+die eine Oktave tiefer klingen als sie notiert werden.  Partituren
+für diese Instrumente sollten den @qq{Tenorschlüssel}
+(@code{"treble_8"}) benutzen.  Einige Spezifika für gebundene
+Instrumente sind an anderer Stelle erklärt:
+
+@itemize
+@item Fingersatz kann notiert werden, siehe
+@ref{Fingering instructions}.
+
+@item Anweisungen für @notation{Laissez vibrer}-Bögen und
+Bögen zwischen Arpeggios und Tremolos sind beschrieben in
+@ref{Ties}.
+
+@item Hinweise, wie mehrere Stimmen gesetzt werden können, finden sich in
+@ref{Collision resolution}.
+
+@end itemize
+
+
+@seealso
+Notationsreferenz:
+@ref{Fingering instructions},
+@ref{Ties},
+@ref{Collision resolution},
+@ref{Instrument names},
+@ref{Writing music in parallel},
+@ref{Arpeggio},
+@ref{List of articulations},
+@ref{Clef}.
+
 
 @node String number indications
 @unnumberedsubsubsec String number indications
 
-@cindex String numbers
+@cindex Saitenzahl
+@cindex Zahl von Saite
+@cindex Fingersatz versus Saitenzahl
+@cindex Nummerierung von Saite
+
+Die Nummer der Saite, auf der gespielt werden soll, kann
+angezeigt werden, indem @code{\@var{Zahl}} an eine Note
+innerhalb eines Akkord-Konstrukts gesetzt wird:
 
-Saitennummerierung kann zu den Akkorden hinzugefügt werden,
-indem die Saitennummer nach einem Backslash als Zahl angegeben
-wird:
+@lilypond[verbatim,quote,relative=0]
+\clef "treble_8"
+<c\5>4 <e\4> <g\3>2
+<c,\5 e\4 g\3>1
+@end lilypond
+
+Wenn Fingersatz und Saitennummer zusammen benutzt werden, wird
+ihre Position anhand der Reihenfolge entschieden, mit der sie im
+Code auftauchen:
 
-@lilypond[relative,relative=1,ragged-right,fragment]
-<c\1 e\2 g\3>
+@lilypond[verbatim,quote,relative=1]
+\clef "treble_8"
+<g\3-0>2
+<g-0\3>
 @end lilypond
 
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{controlling-the-placement-of-chord-fingerings.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{allowing-fingerings-to-be-printed-inside-the-staff.ly}
+
 
 @seealso
-Programmreferenz:
-@rinternals{StringNumber}.
+Notationsreferenz:
+@ref{Fingering instructions}.
 
-Beispiele:
+Schnipsel:
 @rlsr{Fretted strings}.
 
+Referenz der Interna:
+@rinternals{StringNumber},
+@rinternals{Fingering}.
+
 
 @node Default tablatures
 @unnumberedsubsubsec Default tablatures
 
-@cindex Tablatures basic
+@cindex Tabulatur, Grundlegendes
+
+@funindex TabStaff
+@funindex TabVoice
 
 Tabulatur-Notation wird für die Notation von Zupfinstrumenten benutzt.
 Tonhöhen werden hier nicht durch Notenköpfe, sondern durch Zahlen
-notiert. Diese Zahlen zeigen an, auf welcher Saite und welchem Bund
-der Ton gespielt werden soll. LilyPond bringt beschränkte Unterstützung
+notiert.  Diese Zahlen zeigen an, auf welcher Saite und welchem Bund
+der Ton gespielt werden soll.  LilyPond bringt beschränkte Unterstützung
 für Tabulaturen mit.
 
 Die Saitennummer, die mit einer Note assoziiert ist, wird durch einen
-Backslash, gefolgt von einer Zahl, notiert, etwa @code{c4\3} für eine
-Viertelnote C auf der dritten Saite. In der Standardeinstellung ist
+Backslash, gefolgt von einer Zahl, notiert.  In der Standardeinstellung ist
 die erste Saite die höchste Saite und als Stimmung wird die übliche
-Gitarrenstimmung auf sechs Saiten angenommen. Die Noten werden in
+Gitarrenstimmung auf sechs Saiten angenommen.  Die Noten werden in
 einer Tabulatur gesetzt, indem @rinternals{TabStaff} und
 @rinternals{TabVoice}-Kontexte verwendet werden.
 
@@ -88,44 +162,68 @@ einer Tabulatur gesetzt, indem @rinternals{TabStaff} und
 @end lilypond
 
 @funindex minimumFret
+
 @cindex Bund
 
-Wenn keine Saite angegeben wird, wird die Saite, deren Bund-Zahl
-weniger als der Betrag in @code{minimumFret} beträgt, ausgewählt.
-Der Standardwert für @code{minimumFret} beträgt 0.
+Wenn keine Saite für eine Note angegeben wird, wird die Note der
+Saite zugeordnet, welche die Note auf einem Bund erzeugen kann,
+der größer oder gleich als der Wert von @code{minimumFret}
+ist.  Der Standardwert für @code{minimumFret} beträgt 0.
 
-@example
-e16 fis gis a b4
-\set TabStaff.minimumFret = #8
-e16 fis gis a b4
-@end example
-@lilypond[quote,ragged-right]
-frag = {
-  \key e \major
-  e16 fis gis a b4
-  \set TabStaff.minimumFret = #8
-  e16 fis gis a b4
+@lilypond[quote,ragged-right,verbatim]
+\new StaffGroup <<
+   \new Staff \relative c {
+     \clef "treble_8"
+     c16 d e f g4
+     c,16 d e f g4
+   }
+   \new TabStaff \relative c {
+     c16 d e f g4
+     \set TabStaff.minimumFret = #5
+     c,16 d e f g4
+   }
+>>
+@end lilypond
+
+@cindex Flageolett in Tabulaturen
+@cindex Tabulatur und Flageolett
+@cindex Gleiten in Tabulaturen
+@cindex Tabulaturen und Gleiten
+@cindex Slide in Tabulaturen
+
+Flageolett und Gleiten (Slide) kann zur Tabulatur hinzugefügt
+werden:
+
+@lilypond[fragment, verbatim, quote, relative=1]
+\new TabStaff {
+  \new TabVoice {
+    <c g'\harmonic> d\2\glissando e\2
+  }
 }
-  \new StaffGroup <<
-    \new Staff { \clef "G_8" \frag }
-    \new TabStaff { \frag }
-  >>
 @end lilypond
 
-@commonprop
 
-Um Tabulaturen mit Hälsen nach unten und horizontalen Balken
-zu erstellen, muss der @code{TabStaff} mit folgenden Parametern
-initialisiert werden:
+@snippets
 
-@example
-\stemDown
-\override Beam #'damping = #100000
-@end example
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{stem-and-beam-behavior-in-tablature.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{polyphony-in-tablature.ly}
 
 
 @seealso
-Programmreferenz: @rinternals{TabStaff}, @rinternals{TabVoice}.
+Notationsreferenz:
+@ref{Stems}.
+
+Schnipsel:
+@rlsr{Fretted strings}.
+
+Referenz der Interna:
+@rinternals{TabNoteHead},
+@rinternals{TabStaff},
+@rinternals{TabVoice},
+@rinternals{Beam}.
 
 
 @knownissues
@@ -150,215 +248,1031 @@ melodia = \partcombine { e4 g g g }{ e4 e e e }
 >>
 @end lilypond
 
+Spezialeffekte für Gitarre beschränken sich auf Flageolett und
+Slide.
+
+
 @node Custom tablatures
 @unnumberedsubsubsec Custom tablatures
 
-@cindex Non-guitar tablatures
+@cindex Tabulaturen, eigen
+@cindex eigene Tabulaturen
+@cindex Tabulatur, Banjo
+@cindex Tabulatur, Mandoline
+@cindex Tabulatur, Bassgitarre
+@cindex Saitenstimmung für Bundinstrumente
+@cindex Bundinstrumente, Saitenstimmung
+@cindex Tabulatur, Saitenstimmung
 
-Die Stimmung der Saiten kann verändert werden. Die Stimmung muss als
-eine Scheme-Liste dargestellt werden, in der jeder Saite eine Zahl
-zugewiesen ist, die die Tonhöhe der offenen Saite in Halbtönen
-(gemessen von c') darstellt. Die Liste wird als Definition von
-@code{stringTunings} dargestellt. Die Halbtöne können vom c' aus addiert
-oder subtrahiert werden. Die Reihenfolge der Zahlen bestimmt auch
-die Reihenfolge der Saiten. LilyPond entnimmt aus dieser Liste
-auch die Anzahl der Saiten.
+@funindex StringTunings
 
-Im nächsten Beispiel wird
-@code{stringTunings} für die Tonhöhen @code{e, a, d,} und @code{g} gesetzt.
+LilyPond errechnet automatisch den Bund für eine Note auf Grundlage
+der Saite, zu welcher der Ton zugeordnet ist.  Um das tun zu können,
+muss die Stimmung der Saiten angegeben werden.  Die Stimmung wird
+in der @code{StringTunings}-Eigenschaften bestimmt.
 
-@lilypond[quote,ragged-right,fragment,verbatim]
-\new TabStaff <<
-  \set TabStaff.stringTunings = #'(-5 -10 -15 -20)
-  {
-    a,4 c' a e' e c' a e'
+LilyPond hat vordefinierte Stimmungen für Banjo, Mandoline, Gitarre
+und Bassgitarre.  Für diese Stimmungen wird automatisch die
+richtige Transposition eingesetzt.  Das nächste Beispiel ist für
+Bassgitarre, welche eine Oktave niedriger erklingt, als sie
+geschrieben ist:
+
+@lilypond[quote,ragged-right,verbatim]
+<<
+  \new Staff {
+    \clef "bass_8"
+    \relative c, {
+      c4 d e f
+    }
+  }
+  \new TabStaff {
+    \set TabStaff.stringTunings = #bass-tuning
+    \relative c, {
+      c4 d e f
+    }
   }
 >>
 @end lilypond
 
-LilyPond bringt schon vordefinierte Stimmungen für Banjo, Mandoline,
-Gitarre und Bassgitarre mit.
 
-@example
-\set TabStaff.stringTunings = #bass-tuning
-@end example
+Die Standardstimmung ist die Gitarrenstimmung (@code{guitar-tuning})
+in der EADGHE-Stimmung.  Andere vordefinierte Stimmung sind:
+@code{guitar-open-g-tuning}, @code{mandolin-tuning} und
+@code{banjo-open-g-tuning}.  Die vordefinierten Stimmungen finden
+sich in @code{scm/output-lib.scm}.
+
+Die Stimmung ist eine Scheme-Liste von Tonhöhen der Saiten,
+eine für jede Saite, geordnet von Saitennummer 1 bis n, wobei 1
+die höchste Saite der Tabulatur ist und n die unterste.  Normalerweise
+wird so die Stimmung vom höchsten bis zum tiefsten Ton angegeben,
+aber bei einige Instrumente (etwa Ukulele) werden die Saiten nicht
+aufgrund der Tonhöhe angeordnet.
+
+Eine Tonhöhe in der Liste der Saitenstimmungen ist der Unterschied
+der entsprechenden Tonhöhe zum eingestrichenen C gemessen in
+Halbtönen.  Die Tonöhe muss eine Ganzzahl sein.  LilyPond
+errechnet die Tonhöhe einer Saite, indem die Tonhöhe der
+Saitenstimmung zu der Tonhöhe von c' hinzugerechnet wird.
+
+LilyPond erschließt die Anzahl der Saiten einer Tabulatur
+anhand der Anzahl der Saitenstimmungszahlen in @code{stringTunings}.
+
+Jede beliebige Saitenstimmung kann erzeugt werden.  Als Beispiel
+etwa kann die Saitenstimmung für ein viersaitiges Instrument
+mit den Tonhöhen  @code{a''},  @code{d''},  @code{g'}und @code{c'}
+so definiert werden:
+
+@lilypond[quote,verbatim]
+mynotes = {
+    c'4 e' g' c'' |
+    e'' g'' b'' c'''
+}
 
-Der Standard ist die Gitarrenstimmung (@code{guitar-tuning}) mit den
-Saiten EADGBE. Andere vordefinierte Stimmungen sind
-@code{guitar-open-g-tuning},
-@code{mandolin-tuning} und @code{banjo-open-g-tuning}.
+<<
+  \new Staff {
+    \clef treble
+    \mynotes
+  }
+  \new TabStaff {
+    \set TabStaff.stringTunings = #'(21 14 7 0)
+    \mynotes
+  }
+>>
+@end lilypond
 
 
 @seealso
-In der Datei @file{scm/@/output@/-lib@/.scm} sind die Stimmungen
-definiert.
+Installierte Dateien:
+@file{scm/output-lib.scm}.
 
-Programmreferenz: @rinternals{Tab_note_heads_engraver}.
+Schnipsel:
+@rlsr{Fretted strings}.
 
+Referenz der Interna:
+@rinternals{Tab_note_heads_engraver}.
 
-@knownissues
 
-Spezialeffekte für Gitarren sind noch nicht implementiert.
 
 @node Fret diagram markups
 @unnumberedsubsubsec Fret diagram markups
 
-@cindex Fret-Diagramme
-@cindex Griffsymbole
+@cindex Fret (Bunddiagramme)
+@cindex Griffsymbole, Bundinstrumente
 @cindex Gitarrengriffsymbole
-@cindex Akkordtabulartur
+@cindex Akkordtabulatur
 @cindex Akkorddiagramm
+@cindex Bunddiagramme
+@cindex eigene Bunddiagramme
+@cindex Bunddiagramme, eigene
+
+Bunddiagramme können zu Notation als Textbeschriftung
+hinzugefügt werden.  Die Beschriftung enthält Information zu dem
+gewünschten Bunddiagramm.  Es gibt drei unterschiedliche
+Darstellungsarten: normal, knapp und ausführlich.  Die drei
+Arten erzeugen die gleiche Ausgabe, aber mit jeweils mehr oder
+weniger Einzelheiten.  Einzelheiten zu Textbeschriftunsbefehlen
+findet sich in @ref{Text markup commands}.
+
+Die Standard-Bunddiagrammbeschriftung beinhaltet die Saitennummer
+und die Bundnummer für jeden Punkt, der notiert werden soll.
+Zusätzlich können offenen und nicht gespielte (schwingende) Saiten
+angezeigt werden.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram #"6-x;5-3;4-2;3-o;2-1;1-o;"
+    < d a d' f'> ^\markup
+      \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-1;"
+  }
+>>
+@end lilypond
 
-Akkordtabulaturen (Fret-Diagramme) können zu Noten als eine Beschriftung
-hinzugefügt werden. Die Beschriftung enthält Information über die
-erwünschte Akkordtabulatur, wie das folgende Beispiel zeigt:
+@cindex Barre, Gitarre
 
-@lilypond[verbatim, ragged-right, quote]
+Barre kann hinzugefügt werden:
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       f1 g
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < f, c f a c' f'>1 ^\markup
+      \fret-diagram #"c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
+    < g, d g b d' g'> ^\markup
+      \fret-diagram #"c:6-1-3;6-3;5-5;4-5;3-4;2-3;1-3;"
+  }
+>>
+@end lilypond
+
+@cindex Bunddiagramme, normaler Stil
+@cindex fret (Bunddiagramme)
+
+@funindex fret-diagram
+@funindex \fret-diagram
+
+Die Größe des Bunddiagrammes und die Anzahl der Bünde im Diagramm
+kann geändert werden:
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       f1 g
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < f, c f a c' f'>1 ^\markup
+      \fret-diagram #"s:1.5;c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
+    < g, b, d g b g'> ^\markup
+      \fret-diagram #"h:6;6-3;5-2;4-o;3-o;2-o;1-3;"
+  }
+>>
+@end lilypond
+
+Die Anzahl der Saiten kann geändert werden, um sie für andere
+Instrumente anzupassen, wie etwas Banjo oder Ukulele.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       a1
+     }
+  }
+  \context Staff {
+        %% A chord for ukelele
+    a'1 ^\markup \fret-diagram #"w:4;4-2-2;3-1-1;2-o;1-o;"
+  }
+>>
+@end lilypond
+
+Fingersatz kann auch angezeigt werden, und die Position der
+Fingersatzzahlen kann kontrolliert werden.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram #"f:1;6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"
+    < d a d' f'> ^\markup
+      \fret-diagram #"f:2;6-x;5-x;4-o;3-2-2;2-3-3;1-1-1;"
+  }
+>>
+@end lilypond
+
+Die Größe und Position der Punkte kann geändert werden:
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram #"d:0.35;6-x;5-3;4-2;3-o;2-1;1-o;"
+    < d a d' f'> ^\markup
+      \fret-diagram #"p:0.2;6-x;5-x;4-o;3-2;2-3;1-1;"
+  }
+>>
+@end lilypond
+
+@cindex fret-diagram-terse-Markup
+@cindex Bunddiagramme, knapper Stil
+
+@funindex fret-diagram-terse
+@funindex \fret-diagram-terse
+
+Die Beschriftungsfunktion @code{fret-diagram-terse} (knappe Version)
+lässt die Saitennummern aus: das Vorhandensein einer Saite wird
+durch ein Semikolon ausgedrückt.  Für jede Saite des Diagramms
+muss ein Semikolon gesetzt werden.  Das erste Semikolon entspricht
+der höchsten Saite, das letze der ersten Saite.  Stumme und
+offene Saiten sowie Bundnummern können angezeigt werden.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram-terse #"x;3;2;o;1;o;"
+    < d a d' f'> ^\markup
+      \fret-diagram-terse #"x;x;o;2;3;1;"
+  }
+>>
+@end lilypond
+
+Barre kann im knappen Modus auch angezeigt werden:
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       f1 g
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < f, c f a c' f'>1 ^\markup
+      \fret-diagram-terse #"1-(;3;3;2;1;1-);"
+    < g, d g b d' g'> ^\markup
+      \fret-diagram-terse #"3-(;5;5;4;3;3-);"
+  }
+>>
+@end lilypond
+
+Fingersatz kann im knappen Modus hinzugefügt werden:
+
+@c Need to use override to enable fingerings to show this -- can we do so?
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \override Voice.TextScript
+      #'(fret-diagram-details finger-code) = #'below-string
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;"
+    < d a d' f'> ^\markup
+      \fret-diagram-terse #"x;x;o;2-2;3-3;1-1;"
+  }
+>>
+@end lilypond
+
+Andere Eigenschaften der Bunddiagramme müssen im knappen Modus
+mit @code{\override}-Befehlen angegeben werden.
+
+@cindex fret-diagram-verbose-Markup
+@cindex Bunddiagramme, ausführlicher Stil
+
+@funindex fret-diagram-verbose
+@funindex \fret-diagram-verbose
+
+Die Beschriftungsfunktion @code{fret-diagram-verbose}
+(ausführlicher Stil) ist in der
+Form eine  Scheme-Liste.  Jedes Element stellt ein Element dar,
+dass im Bunddiagramm gesetzt werden soll.
+
+@lilypond[quote, verbatim]
+<<  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1 ^\markup
+      \fret-diagram-verbose #'(
+        (mute 6)
+        (place-fret 5 3)
+        (place-fret 4 2)
+        (open 3)
+        (place-fret 2 1)
+        (open 1)
+      )
+    < d a d' f'> ^\markup
+      \fret-diagram-verbose #'(
+        (mute 6)
+        (mute 5)
+        (open 4)
+        (place-fret 3 2)
+        (place-fret 2 3)
+        (place-fret 1 1)
+      )
+  }
+>>
+@end lilypond
+
+Fingersatz und Barre kann im ausführlichen Modus notiert werden.
+
+@c \override is necessary to make fingering visible
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       f1 g
+     }
+  }
+  \context Staff {
+    \clef "treble_8"
+    \override Voice.TextScript
+      #'(fret-diagram-details finger-code) = #'below-string
+
+    < f, c f a c' f'>1 ^\markup
+      \fret-diagram-verbose #'(
+        (place-fret 6 1)
+        (place-fret 5 3)
+        (place-fret 4 3)
+        (place-fret 3 2)
+        (place-fret 2 1)
+        (place-fret 1 1)
+        (barre 6 1 1)
+      )
+    < g, b, d g b g'> ^\markup
+      \fret-diagram-verbose #'(
+        (place-fret 6 3 2)
+        (place-fret 5 2 1)
+        (open 4)
+        (open 3)
+        (open 2)
+        (place-fret 1 3 3)
+      )
+  }
+>>
+@end lilypond
+
+Alle anderen Bunddiagramm-Eigenschaften müssen im ausführlichen
+Modus mit mit @code{\override}-Befehlen angegeben werden.
+
+@ignore
+The following example shows the three fret-diagram markup
+interfaces, along with examples of common tweaks.  For example,
+the size of the verbose fret diagram is reduced to 0.75, and the
+finger indications are specified to appear below the diagram.  The
+terse diagram includes tweaks to specify placement of finger code
+and color of dots.
+
+@lilypond[verbatim,ragged-right,quote]
 \new Voice {
-  d'^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
-  d' d' d'
-  fis'^\markup \override #'(size . 0.75) {
+  \clef "treble_8"
+  d^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
+  d d d
+  fis^\markup \override #'(size . 0.75) {
     \override #'(finger-code . below-string) {
       \fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)
-                               (place-fret 5 4 3) (place-fret 4 4 4)
-                               (place-fret 3 3 2) (place-fret 2 2 1)
+                               (place-fret 5 4 3)
+                               (place-fret 4 4 4)
+                               (place-fret 3 3 2)
+                               (place-fret 2 2 1)
                                (place-fret 1 2 1))
     }
   }
-  fis' fis' fis'
-  c'^\markup \override #'(dot-radius . 0.35) {
+  fis fis fis
+  c^\markup \override #'(dot-radius . 0.35) {
     \override #'(finger-code . in-dot) {
       \override #'(dot-color . white) {
         \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"
       }
     }
   }
-  c' c' c'
+  c c c
 }
 @end lilypond
+@end ignore
 
-Es gibt drei Modi für die Abbildung der Tabulatur: den Standardmodus,
-einen ausführlichen Modus und einen knappen Modus. Die
-unterschiedlichen Modi werden angewählt, indem an den Befehl
-@code{fret-diagram} die Begriffe @code{-standard}, @code{-verbose}
-bzw. @code{-terse} angehängt werden.  Die Modi produzieren
-gleichwertige Ausgaben, haben aber unterschiedliche Informationen im
-Beschriftungsbefehl. Details über die Beschriftungsbefehle finden sich
-im Abschnitt @ref{Text markup commands}. Alle drei Modi werden im
-obigen Beispiel gezeigt.
+@cindex Bunddiagramme, anpassen
+@cindex eigene Bunddiagramme
+@cindex Anpassen von Bunddiagrammen
 
-Einige graphische Eigenschaften können verändert werden. Genaueres zur
-Schnittstelle für die Griffsymboleigenschaften findet sich unter
-@rinternals{fret-diagram-interface}.
+@funindex fret-diagram-interface
+
+Die graphische Erscheinung eines Bunddiagramms kann den Wünschen
+des Notensetzers angepassen werden.  Hierzu werden die Eigenschaften
+des @code{fret-diagram-interface} (Bunddiagramm-Schnittstelle)
+eingesetzt.  Einzelheiten hierzu
+in @rinternals{fret-diagram-interface}.  Die Eigenschaften der
+Schnittstelle gehören dem @code{Voice.TextScript}-Kontext an.
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{customizing-markup-fret-diagrams.ly}
 
 
 @seealso
-Beispiele:
+Notationsreferenz:
+@ref{Text markup commands}.
+
+Schnipsel:
 @rlsr{Fretted strings}.
 
+Referenz der Interna:
+@rinternals{fret-diagram-interface}.
+
 
-@node Right-hand fingerings
-@unnumberedsubsubsec Right-hand fingerings
 
-Fingersatz für die rechte Hand in Akkorden kann notiert werden, indem
-der Befehl @code{@var{note}-\rightHandFinger @var{finger}}
-benutzt wird.
+@node Predefined fret diagrams
+@unnumberedsubsubsec Predefined fret diagrams
+
+
+@cindex Bunddiagramme
+@cindex Akkord-Diagramme
+
+@funindex FretBoards
+@funindex stringTunings
 
-@lilypond[verbatim,fragment,relative=2]
-  <c-\rightHandFinger #1 e-\rightHandFinger #2 >
+Bunddiagramme können mit dem @code{FretBoards}-Kontext angezeigt
+werden.  Standardmäßig zeigt der @code{FretBoards}-Kontext
+Bunddiagramme an, die in einer Tabelle definiert sind:
+
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+\context FretBoards {
+  \chordmode {
+    c1 d
+  }
+}
 @end lilypond
 
-Zur Erleichterung kann der Befehl @code{\rightHandFinger} zu ein paar
-Buchstaben abgekürzt werden, etwa @code{RH}.
+Die vordefinierten Diagramme sind in der Datei
+@code{predefined-guitar-fretboards.ly} enthalten.  Sie werden
+basierend auf der Tonhöhe eines Akkordes und dem Wert von
+@code{stringTunings} (Saitenstimmung), der gerade benutzt wird,
+gespeichert.  @code{predefined-guitar-fretboards.ly} beinhaltet
+vordefinierte Diagramme für die Gitarrenstimmtung (@code{guitar-tuning}).
+Anhand der Beispiele in dieser Datei können auch für andere
+Instrumente oder Stimmungen Diagramme definiert werden.
+
+Tonhöhen von Akkorden können entweder als Akkordkonstrukte
+oder im Akkordmodus notiert werden (siehe auch
+@ref{Chord mode overview}).
+
+@lilypond[verbatim, ragged-right,quote]
+\include "predefined-guitar-fretboards.ly"
+\context FretBoards {
+  \chordmode {c1}
+  <c' e' g'>1
+}
+@end lilypond
 
-@example
-#(define RH rightHandFinger)
-@end example
+@cindex Akkordbezeichnungen und Bunddiagramme
+@cindex Bunddiagramme und Akkordbezeichnungen
 
-@cindex Fingersatz, rechte Hand, Gitarre
-@cindex Rechte Hand-Fingersatz für Gitarre
+@funindex ChordNames
+@funindex chordmode
+@funindex \chordmode
 
-@commonprop
+Oft wird sowohl eine Akkordbezeichnung als ein Bunddiagramm
+notiert.  Das kann erreicht werden, indem ein
+@code{ChordNames}-Kontext parallel mit einem @code{FretBoards}-Kontext
+gesetzt wird und beiden Kontexten die gleichen Noten zugewiesen
+werden.
 
-Größere Kontrolle über den Fingersatz der rechten Hand kann
-mit einer Definition des Befehls @code{strokeFingerOrientations}
-erreicht werden:
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+mychords = \chordmode{
+  c1 f g
+}
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
-#(define RH rightHandFinger)
-{
-  \set strokeFingerOrientations = #'(up down)
-  <c-\RH #1 es-\RH #2 g-\RH #4 > 4
-  \set strokeFingerOrientations = #'(up right down)
-  <c-\RH #1 es-\RH #2 g-\RH #4 > 4
+<<
+  \context ChordNames {
+    \mychords
+  }
+  \context FretBoards {
+    \mychords
+  }
+>>
+@end lilypond
+
+@cindex Transposition von Bunddiagrammen
+@cindex Bunddiagramme, Transposition
+
+Vordefinierte Bunddiagramme können transponiert werden, solange
+ein Diagramm für den transponierten Akkord in der Bunddiagramm-Tabelle
+vorhanden ist.
+
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+mychords = \chordmode{
+  c1 f g
 }
+
+mychordlist = {
+  \mychords
+  \transpose c e { \mychords}
+}
+<<
+  \context ChordNames {
+    \mychordlist
+  }
+  \context FretBoards {
+    \mychordlist
+  }
+>>
 @end lilypond
 
-Die Buchstaben, die für den Fingersatz verwendet werden, sind in der
-Eigenschaft @code{digit-names} enthalten, aber sie können auch individuell
-verändert werden, indem @code{\rightHandFinger} mit einer Zeichenfolge als
-Argument eingesetzt wird, wie im nächsten Beispiel:
+Die Tabelle der vordefinierten Bunddiagramme enthält sieben
+Akkorde (Dur, Moll, übermäßig, vermindert, Dominantseptakkord,
+große Septime und kleine Septime) für alle 17 Tonarten.  Eine
+vollständige Liste der vordefinierten Bunddiagramme findet sich
+in @ref{Predefined fret diagrams}.  Wenn in der Tabelle für
+einen Akkord kein Wert steht, wird ein Bunddiagramm vom
+@code{FretBoards}-Engraver errechnet, wobei die automatische
+Bunddiagrammfunktion zu Anwendung kommt. Siehe hierzu
+@ref{Automatic fret diagrams}.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
-#(define RH rightHandFinger)
-{
-  \set strokeFingerOrientations = #'(right)
-  \override StrokeFinger #'digit-names = #'#("x" "y" "z" "!" "@")
-  <c-\RH #5 >4
-  <c-\RH "@">4
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+mychords = \chordmode{
+  c1 c:9
 }
+
+<<
+  \context ChordNames {
+    \mychords
+  }
+  \context FretBoards {
+    \mychords
+  }
+>>
 @end lilypond
 
+@cindex Bunddiagramme, eigene definieren
+@cindex Definieren von eigenen Bunddiagrammen
+@cindex Eigene Bunddiagramme definieren
+
+Bunddiagramme können zu der Tabelle hinzugefügt werden.  Um ein
+Diagramm hinzuzufügen, muss der Akkord des Diagramms, die Stimmung
+und die Diagramm-Definition im @code{fret-diagram-terse}-Modus
+definiert werden.
+
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+
+\storePredefinedDiagram \chordmode {c:9}
+                        #guitar-tuning
+                        #"x;3-2;2-1;3-3;3-4;x;"
+
+mychords = \chordmode{
+  c1 c:9
+}
+
+<<
+  \context ChordNames {
+    \mychords
+  }
+  \context FretBoards {
+    \mychords
+  }
+>>
+@end lilypond
+
+Unterschiedliche Bunddiagramme für den selben Akkord können
+gespeichert werden, indem unterschiedliche Oktaven für die
+Tonhöhe benutzt werden.
+
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+
+\storePredefinedDiagram \chordmode {c'}
+                        #guitar-tuning
+                        #(offset-fret 2 (chord-shape 'bes))
+
+mychords = \chordmode{
+  c1 c'
+}
+
+<<
+  \context ChordNames {
+    \mychords
+  }
+  \context FretBoards {
+    \mychords
+  }
+>>
+@end lilypond
+
+@cindex Bundinstrumente, Akkordformen
+@cindex Akkordformen für Bundinstrumente
+
+@funindex \addChordShape
+@funindex add ChordShape
+@funindex storePredefinedDiagram
+@funindex \storePredefinedDiagram
+
+Zusätzlich zu Bunddiagrammen speichert LilyPond auch eine interne
+Liste an Akkordformen.  Die Akkordformen sind Bunddiagramme,
+die am Hals entlang verschoben werden können und dabei unterschiedliche
+Akkorde ergeben.  Akkordformen können zu der internen Liste
+hinzugefügt werden und dann benutzt werden, um vordefinierte
+Bunddiagramme zu definieren.
+
+@lilypond[verbatim, ragged-right, quote]
+\include "predefined-guitar-fretboards.ly"
+
+% add a new chord shape
+
+\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;"
+
+% add some new chords based on the power chord shape
+
+\storePredefinedDiagram \chordmode {f'}
+                        #guitar-tuning
+                        #(chord-shape 'powerf)
+\storePredefinedDiagram \chordmode {g'}
+                        #guitar-tuning
+                        #(offset-fret 2 (chord-shape 'powerf))
+
+mychords = \chordmode{
+  f1 f' g g'
+}
+
+<<
+  \context ChordNames {
+    \mychords
+  }
+  \context FretBoards {
+    \mychords
+  }
+>>
+@end lilypond
+
+Die graphische Form eines Bunddiagramms kann entsprechend den
+eigenen Wünschen verändert werden, indem man die Eigenschaften
+der @code{fret-diagram-interface}-Schnittstellt verändert.
+Einzelheiten hierzu in @rinternals{fret-diagram-interface}.  Die
+Schnittstelleneigenschaften eines vordefinierten Bunddiagrammes
+gehören dem @code{FretBoards.FretBoard}-Kontext an.
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{customizing-fretboard-fret-diagrams.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{defining-predefined-fretboards-for-other-instruments.ly}
+
 
 @seealso
-Program reference: @rinternals{StrokeFinger}
+Notationsreferenz:
+@ref{Custom tablatures},
+@ref{Automatic fret diagrams},
+@ref{Chord mode overview},
+@ref{Predefined fret diagrams}.
+
+Installierte Dateien:
+@file{ly/predefined-guitar-fretboards.ly},
+@file{ly/predefined-guitar-ninth-fretboards.ly}.
+
+Schnipsel:
+@rlsr{Fretted strings}.
+
+Referenz der Interna:
+@rinternals {fret-diagram-interface}.
+
+
+@node Automatic fret diagrams
+@unnumberedsubsubsec Automatic fret diagrams
+
+@cindex Bunddiagramme, automatisch
+@cindex Akkorddiagramme, automatisch
+@cindex automatische Bunddiagramme
+
+Bunddiagramme können automatisch aus notierten Noten erstellt werden.
+Hierzu wird der @code{FretBoards}-Kontext eingesetzt.  Wenn keine
+vordefinierten Diagramme für die ensprechenden Noten mit
+der aktiven Saitenstimmung (@code{stringTunings}) vorhanden sind,
+errechnet der Kontext Saiten und Bünde die benutzt werden können,
+um die Noten zu spielen.
+
+@lilypond[quote,ragged-right,verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       f1 g
+     }
+  }
+  \context FretBoards {
+    < f, c f a c' f'>1
+    < g,\6 b, d g b g'>
+  }
+  \context Staff {
+    \clef "treble_8"
+    < f, c f a c' f'>1
+    < g, b, d g b' g'>
+  }
+>>
+@end lilypond
+
+@funindex predefinedFretboardsOff
+@funindex \predefinedFretboardsOff
+@funindex predefinedFretboardsOn
+@funindex \predefinedFretboardsOn
+
+Da in den Standardeinstellungen keine vordefinierten Diagramme
+geladen werden, ist die automatische Diagrammerstellung das
+Standardverhalten.  Wenn die vordefinierten Diagramme eingesetzt
+werden, kann die automatische Berechnung an- und ausgeschaltet
+werden.
+
+@lilypond[quote,ragged-right,verbatim]
+
+\storePredefinedDiagram <c e g c' e'>
+                        #guitar-tuning
+                        #"x;3-1-(;5-2;5-3;5-4;3-1-1);"
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 c c
+     }
+  }
+  \context FretBoards {
+    <c e g c' e'>1
+    \predefinedFretboardsOff
+    <c e g c' e'>
+    \predefinedFretboardsOn
+    <c e g c' e'>
+  }
+  \context Staff {
+    \clef "treble_8"
+    <c e g c' e'>1
+    <c e g c' e'>
+    <c e g c' e'>
+  }
+>>
+@end lilypond
+
+Manchmal kann die Berechnungsfunktion für Bunddiagramme kein
+passendes Diagramm finden.  Das kann oft umgangen werden, indem
+man manuell einer Note eine bestimmte Saite zuweist.  In vielen
+Fällen muss nur eine Note derart gekennzeichnet werden, der
+Rest wird dann ensprechend durch den @code{FretBoards}-Kontext
+behandelt.
+
+@cindex Bunddiagramme, Fingersatz
+@cindex Fingersatz in Bunddiagrammen
+
+Fingersatz kann zu FretBoard-Bunddiagrammen hinzugefügt werden.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       c1 d:m
+     }
+  }
+  \context FretBoards {
+    < c-3 e-2 g c'-1 e' > 1
+    < d a-2 d'-3 f'-1>
+  }
+  \context Staff {
+    \clef "treble_8"
+    < c e g c' e' > 1
+    < d a d' f'>
+  }
+>>
+@end lilypond
+
+Der kleinste Bund, der benutzt wird, um Saiten und Bünde im
+FretBoard-Kontext zu errechnen, kann mit der
+@code{minimumFret}-Eigenschaft gesetzt werden.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       d1:m d:m
+     }
+  }
+  \context FretBoards {
+    < d a d' f'>
+    \set FretBoards.minimumFret = #5
+    < d a d' f'>
+  }
+  \context Staff {
+    \clef "treble_8"
+    < d a d' f'>
+    < d a d' f'>
+  }
+>>
+@end lilypond
+
+Die Saiten und Bünde des @code{FretBoards}-Kontextes hängen von
+der @code{stringTunings}-Eigesnchaft ab, die die gleiche Bedeitung
+wie im TabStaff-Kontext hat.  Siehe auch @ref{Custom tablatures}
+zu Information über die @code{stringTunings}Eigenschaft.
+
+Die graphische Erscheindung eines Bunddiagrammes kann den
+Bedürfnissen angepasst werden, indem Eigenschaften der
+@code{fret-diagram-interface}-Schnittstelle verändert werden.
+Einzelheiten finden sich in @rinternals{fret-diagram-interface}.
+Die Schnittstelleneigenschaften eines @code{FretBoards}-Diagramms
+gehören dem @code{FretBoards.FretBoard}-Kontext an.
+
+
+@predefined
+@code{\predefinedFretboardsOff},
+@code{\predefinedFretboardsOn}.
+@endpredefined
+
+
+@seealso
+Notationsreferenz:
+@ref{Custom tablatures}.
+
+Schnipsel:
+@rlsr{Fretted strings}.
+
+Referenz der Interna:
+@rinternals {fret-diagram-interface}.
+
+
+@node Right-hand fingerings
+@unnumberedsubsubsec Right-hand fingerings
+
+@cindex Bundinstrumente, Fingersatz der rechten Hand
+@cindex Fingersatz der rechten Hand, Bundinstrumente
+@cindex rechte Hand, Fingersatz für Bundinstrumente
+
+@funindex rightHandFinger
+@funindex \rightHandFinger
+
+
+Fingersatz für die rechte Hand in Akkorden kann mit den
+Bezeichnungen @var{p-i-m-a} notiert werden.  Er muss innerhalb
+eines Akkord-Konstruktes notiert werden.
+
+
+@warning{Nach der Note @strong{muss} ein Minuszeichen gesetzt
+werden und ein Leerzeichen nach dem schließenden @code{>}.}
+
+@lilypond[quote,verbatim,relative=0]
+\clef "treble_8"
+<c-\rightHandFinger #1 >4
+<e-\rightHandFinger #2 >
+<g-\rightHandFinger #3 >
+<c-\rightHandFinger #4 >
+<c,-\rightHandFinger #1 e-\rightHandFinger #2
+  g-\rightHandFinger #3 c-\rightHandFinger #4 >1
+@end lilypond
+
+Zur Erleichterung kann der Befehl @code{\rightHandFinger} zu ein paar
+Buchstaben abgekürzt werden, etwa @code{RH}.
+
+@example
+#(define RH rightHandFinger)
+@end example
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{placement-of-right-hand-fingerings.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{fingerings,-string-indications,-and-right-hand-fingerings.ly}
+
+@seealso
+Schnipsel:
+@rlsr{Fretted strings}.
+
+Referenz der Interna:
+@rinternals{StrokeFinger}.
 
 
 @node Guitar
 @subsection Guitar
 
-@untranslated
+Die meisten der Besonderheiten von Gitarrennotation wurden im
+allgemeinen Abschnitt behandelt, aber es gibt noch einige, die
+hier gezeigt werden sollen.  Teilweise soll ein Lead-sheet nur
+die Akkordsymbole und den Gesangstext enthalten.  Da LilyPond
+ein Notensatzprogramm ist, wird es nicht für derartige
+Projekte empfohlen, die keine eigentliche Notation beinahlten.
+Anstattdessen sollte ein Textbearbeitungsprogramm, oder ein
+Satzprogramm wie GuitarTeX (für erfahrende Benutzer) eingesetzt
+werden.
 
 @menu
 * Indicating position and barring::
-* Indicating harmonics and dampened notes::  
+* Indicating harmonics and dampened notes::
 @end menu
 
 @node Indicating position and barring
 @unnumberedsubsubsec Indicating position and barring
 
-Dieses Beispiel zeigt, wie Griff - und Barre-Angaben
-eingefügt werden können.
+@cindex Position und Barret für Bundinstrumente
+@cindex Bundinstrumente, Position und Barret anzeigen
+@cindex Barret, anzeigen für Bundinstrumente
+
+Das Beispiel zeigt, wie man Griff- und Barreposition
+notieren kann.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=0]
-\clef "G_8"
-b16 d16 g16 b16 e16
+\clef "treble_8"
+b16 d g b e
 \textSpannerDown
 \override TextSpanner #'(bound-details left text) = #"XII "
   g16\startTextSpan
-  b16 e16 g16 e16 b16 g16\stopTextSpan
-e16 b16 g16 d16
+  b16 e g e b g\stopTextSpan
+e16 b g d
 @end lilypond
 
-Gedämpfte (X) Notenköpfe werden in der Gitarrenmusik benutzt, um
-zu signalisieren, dass der Gitarrist eine Note oder einen Akkord spielen
-soll, indem seine Finger die Saiten nur berühren, anstatt sie vollständig
-herunterzudrücken. Damit werden schlagzeugartige Geräusche erreicht,
-die aber noch die ursprüngliche Tonhöhe ahnen lassen. Diese Spielart
-wird mit Kreuz-Notenköpfen notiert, wie im Abschnitt @ref{Special note heads}
-gezeigt.
+
+@seealso
+Notationsreferenz:
+@ref{Text spanners}.
+
+Schnipsel:
+@rlsr{Fretted strings},
+@rlsr{Expressive marks}.
+
 
 @node Indicating harmonics and dampened notes
 @unnumberedsubsubsec Indicating harmonics and dampened notes
 
-@untranslated
+@cindex Bundinstrumente, gedämpfte Noten
+@cindex Bundinstrumente, Flageolett
+@cindex Dämpfung, Bundinstrumente
+@cindex gedämpfte Noten, Bundinstrumente
+@cindex Flageolett, Bundinstrumente
+
+Besondere Notenköpfe können eingesetzt werden, um gedämpfte Noten
+oder Flageoletttöne anzuzeigen.  Flageoletttöne werden normalerweise
+mit einem Text erklärt.
+
+@lilypond[quote,ragged-right,fragment,verbatim]
+\relative c' {
+  \clef "treble_8"
+  \override Staff.NoteHead #'style = #'cross
+  g8 a b c b4
+  \override Staff.NoteHead #'style = #'harmonic-mixed
+  d^\markup { \italic { \fontsize #-2 { "harm. 12" }}} <g b>1
+}
+@end lilypond
+
+
+@seealso
+Notationsreferenz:
+@ref{Special note heads},
+@ref{Note head styles}.
+
+Schnipsel:
+@rlsr{Fretted strings}.
 
 
 @node Banjo
 @subsection Banjo
 
-@untranslated
-
 @menu
 * Banjo tablatures::
 @end menu
@@ -366,13 +1280,16 @@ gezeigt.
 @node Banjo tablatures
 @unnumberedsubsubsec Banjo tablatures
 
-@cindex Banjo tablatures
+@cindex Banjo-Tabulaturen
+@cindex Tabulatur, Banjo
 
-LilyPond unterstützt die Basisnotation für das fünfsaitige Banjo. Die
-Banjo-Tabulatur-Funktion sollte zum Notieren von Banjo-Tabulaturen
+LilyPond hat grundlegende Unterstützung für fünfsaitige Banjo.
+Die Banjo-Tabulatur-Funktion sollte zum Notieren von Banjo-Tabulaturen
 verwendet werden, damit die richtigen Bund-Nummern für die fünfte
 Saite gesetzt werden:
 
+@c due to crazy intervals of banjo music, absolute pitch is recommended
+
 @lilypond[quote,ragged-right,fragment,verbatim]
 \new TabStaff <<
   \set TabStaff.tablatureFormat = #fret-number-tablature-format-banjo
@@ -386,8 +1303,17 @@ Saite gesetzt werden:
 >>
 @end lilypond
 
-Eine Anzahl von üblichen Stimmungen für das Banjo sind in LilyPond
-schon vordefiniert:
+@cindex Banjo-Stimmung
+@cindex Stimmung, Banjo
+
+@funindex banjo-c-tuning
+@funindex banjo-modal-tuning
+@funindex banjo-open-d-tuning
+@funindex banjo-open-dm-tuning
+@funindex four-string-banjo
+
+Eine Anzahl von üblichen Stimmungen für Banjo sind in LilyPond
+vordefiniert: 
 @code{banjo-c-tuning} (gCGBD), @code{banjo-modal-tuning} (gDGCD),
 @code{banjo-open-d-tuning} (aDF#AD) und @code{banjo-open-dm-tuning}
 (aDFAD).
@@ -401,5 +1327,8 @@ indem die @code{four-string-banjo}-Funktion eingesetzt wird:
 
 
 @seealso
-Die Datei @file{scm/@/output@/-lib@/.scm} enthält vordefinierte
-Banjo-Stimmungen.
+Schnipsel:
+@rlsr{Fretted strings}.
+
+Die Datei @file{scm/@/output@/-lib@/.scm} beinhaltet vordefinierte
+Stimmungen für Banjo.
index 66d85e6a2c0611992185f8cecab3978ad990a10e..02e64d6470b717b9bc3749e43f1b61eea208ce7a 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-learning.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -339,7 +339,7 @@ zerlegen lässt.
 @example
 \score @{
   @{   % diese Klammer startet den großen mus. Ausdruck
-    <<
+    \new StaffGroup <<
       @var{...hier eine ganze Wagner-Oper einfügen...}
     >>
   @}   % diese Klammer beendet den Ausdruck
@@ -349,7 +349,8 @@ zerlegen lässt.
 
 Eine Wagner-Oper ist mindestens doppelt so lang wie dieses Handbuch,
 beschränken wir uns also auf einen Sänger und Klavier.  Wir brauchen 
-keine ganze Orchesterpartitur, aber wir brauchen einen Sänger und ein Klavier.
+keine ganze Orchesterpartitur, infolgedessen können wir die Systemgruppe
+(StaffGroup) auslassen, aber wir brauchen einen Sänger und ein Klavier.
 
 @example
 \score @{
index 08c20e32df8e5cdaaa77330fbed0eae593042d71..f17d3f2b6e9d56d073a09dfc585883dc38cfb7fa 100644 (file)
@@ -215,7 +215,8 @@ Prozent-Wiederholungen benutzt werden. Zum Beispiel:
 * MIDI block::                  
 * What goes into the MIDI output?::  
 * Repeats in MIDI::             
-* Controlling MIDI dynamics::   
+* Controlling MIDI dynamics:: 
+* Percussion in MIDI::  
 @end menu
 
 @node Creating MIDI files
@@ -255,3 +256,8 @@ Prozent-Wiederholungen benutzt werden. Zum Beispiel:
 @unnumberedsubsubsec Overall MIDI volume
 @unnumberedsubsubsec Equalizing different instruments (i)
 @unnumberedsubsubsec Equalizing different instruments (ii)
+
+@node Percussion in MIDI
+@subsection Percussion in MIDI
+
+@untranslated
index e960234bfcf2c357594514f88a2757dd8dfb0a62..9cb6b7fac7b43217a7547abde8c4207d41f98e4e 100644 (file)
@@ -1,12 +1,14 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: c6e236bc762071c4580cc15ea52695df646d31f7
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.61"
+
 @c Translators: Till Rettig, Reinhold Kainhofer
 
 @ifclear INSTALL
@@ -50,12 +52,17 @@ darwin-x86  - MacOS X intel
 freebsd-64  - FreeBSD 6.x, x86_64
 freebsd-x86 - FreeBSD 4.x, x86
 linux-64    - Beliebige GNU/Linux Distribution, x86_64
-linux-arm   - Beliebige GNU/Linux Distribution, arm
 linux-ppc   - Beliebige GNU/Linux Distribution, powerpc
 linux-x86   - Beliebige GNU/Linux Distribution, x86
 mingw       - Windows x86
 @end example
 
+@knownissues
+
+Wenn Sie MacOS 10.3 oder 10.4 benutzen und Python-Skripte wie
+@command{convert-ly} und @command{lilypond-book} benutzen wollen,
+lesen Sie @ref{Setup for MacOS X,,,lilypond-program,Application Usage}.
+
 
 @node Compiling from source
 @section Compiling from source
@@ -63,8 +70,16 @@ mingw       - Windows x86
 LilyPond kann auch selbst direkt aus dem Quellcode des git-Depots 
 kompiliert werden. Da jedoch für die Kompilierung definitiv 
 Englisch-Kenntnisse vorhanden sein müssen, soll hier lediglich auf die 
-englische Dokumentation verwiesen werden.
-@c TODO: How do I insert a link to the English docs???
+englische Dokumentation verwiesen werden:
+@c DO NOT translate the following line at all.
+@iftex
+@ref{Compiling from source,,,lilypond-program,Application Usage}.
+@end iftex
+@ifhtml
+@c Please translate the following line (but not the .html file name)
+@uref{Compiling-from-source.html,Compiling from Source}.
+@end ifhtml
+
 
 @c TRANSLATORS:
 @c   Please **do not** translate anything below this line.  Users
index 3e6e0ec312466f9121178468e87d8eaddad1f5f5..19b385d9f00087bed58db4ab893c185eb29bba8c 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index 11a406ff6ddae54d403e57f212f122e86675b688..fd76cbb8f6e35856b17cfc980128fc652e8dc599 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -561,6 +561,11 @@ Anzahl an Symbolen wird benutzt um die Wechsel anzuzeigen.
 Schnipsel:
 @rlsr{Keyboards}.
 
+@menu
+* Harp notation::
+* Harp pedals::
+@end menu
+
 
 @node Harp
 @subsection Harp
@@ -583,3 +588,44 @@ case of glissandi, it would be desirable to have a demonstration
 of different styles.
 
 @end ignore
+
+
+@node Harp pedals
+@unnumberedsubsubsec Harp pedals
+
+@cindex Harfenpedal
+@cindex Pedal, Harfe
+@cindex Pedaldiagramme, Harfe
+
+Harfe haben sieben Saiten in einer Oktave, die entweder als normaler
+Ton, oder aber erhöht bzw. erniedrigt klingen können.  Bei einer
+Hakenharfe kann man jede Saite einzeln einstellen, bei Pedalharfen aber
+wird jede Saite mit der gleichen Notenbezeichnung von einem einzigen
+Pedal kontrolliert.  Vom Spieler aus gesehen von rechts nach links sind
+die Pedale: D, C und H für die linke und E, F, G und A für die rechte
+Seite.  Die Position des Pedals kann mit Textbeschriftungselementen:
+
+@lilypond[quote,verbatim,relative=2]
+\textLengthOn
+cis1_\markup \concat \vcenter { [D \flat C \sharp B|E \sharp F \sharp G A \flat] }
+c!1_\markup \concat \vcenter {[ C \natural ]}
+@end lilypond
+
+@noindent
+oder Pedaldiagrammen angezeigt werden:
+
+@lilypond[quote,verbatim,relative=2]
+\textLengthOn
+cis1_\markup { \harp-pedal #"^v-|vv-^" }
+c!1_\markup { \harp-pedal #"^o--|vv-^" }
+@end lilypond
+
+Der @code{\harp-pedal}-Befehl braucht eine Anzahl an Zeichen, von
+welchen @code{^} die höchste Pedalposition (erniedrigte Tonhöhe),
+@code{-} die mittlere Pedalposition (normale Tonhöhe, @code{v} die
+tiefste Pedalposition (erhöhter Ton) anzeigt.  @code{|} ist ein
+Trenner.  Ein @code{o} vor der Definition umrandet das Symbol.
+
+@seealso
+Notationsreferenz:
+@ruser{Text scripts}
index 8342ecc9fcb2c2a9115a9c55f36f20a9ead94feb..60338da0b8cc7587552fe19b8e160a3d6f5c557d 100644 (file)
@@ -1,18 +1,21 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: 023d49bb18cbc21a03e7711186d961b8b4fc5e80
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.61"
+
 @c Translators: Reinhold Kainhofer
+@c Translation checkers: Till Rettig
+
 
 @node LilyPond-book
 @chapter @command{lilypond-book}: Integrating text and music
 
-
 Wenn Sie in ein Dokument Grafiken Ihres Musiksatzes einfügen möchten, so
 können Sie genauso machen, wie Sie andere Grafiken einfügen würden: Die
 Bilder werden getrennt vom Dokument im PostScript- oder PNG-Format erstellt
@@ -26,7 +29,9 @@ werden dabei Ihrem Dokument angepasst.
 
 @command{lilypond-book} ist ein eigenständiges Programm und wird 
 üblicherweise von der Kommandozeile aufgerufen. Nähere Informationen
-hierzu finden sich in @ref{Command-line usage}.
+hierzu finden sich in @ref{Command-line usage}.  Wenn Sie MacOS 10.3
+oder 10.4 benutzen und Probleme mit @code{lilypond-book} haben, lesen
+Sie @ref{Setup for MacOS X}.
 
 Dieses Vorgehen kann bei @LaTeX{}, HTML, Texinfo oder DocBook Dokumenten
 angewendet werden.
@@ -214,10 +219,11 @@ oder
 \lilypond@{ IHR LILYPOND QUELLCODE @}
 @end example
 
-Der Aufruf von @command{lilypond-book} liefert eine Datei, die dann mit 
-@LaTeX{} weiter verarbeitet werden kann.
+Zusätzlich kann mit @code{\lilypondversion} die benutzte Versionsnummer
+von LilyPond angezeigt werden.  Der Aufruf von @command{lilypond-book}
+liefert eine Datei, die dann mit @LaTeX{} weiter verarbeitet werden kann.
 
-Dies soll hier an einigen Beispielen gezeigt werden. Die @code{lilypond} Umgebung
+Dies soll hier an einigen Beispielen gezeigt werden. Die @code{lilypond}-Umgebung
 
 @example
 \begin[quote,fragment,staffsize=26]@{lilypond@}
@@ -264,7 +270,7 @@ Befehls angeben kann.
 Jedes Musikbeispiele ruft die folgenden Makros auf, wenn sie vom Benutzer
 definiert wurden:
 
-@itemize bullet
+@itemize
 @item @code{\preLilyPondExample} -- wird vor der Musik aufgerufen,
 
 @item @code{\postLilyPondExample} -- wird nach der Musik aufgerufen,
@@ -371,13 +377,14 @@ gewünschten Systeme übergeben wird:
 \begin@{lilypond@}...\end@{lilypond@}
 @end example
 
-
 @seealso
 @command{lilypond-book} stellt auch zahlreiche Kommandozeilen-Optionen zur 
-Verfügung.  Für eine Liste dieser Optionen und andere hilfreiche Details zur
+Verfügung. Für eine Liste dieser Optionen und andere hilfreiche Details zur
 Verarbeitung von @LaTeX{}-Dokumenten, siehe @ref{Invoking lilypond-book}.
 
 
+
+
 @node Texinfo
 @subsection Texinfo
 
@@ -407,6 +414,8 @@ oder
 @@lilypondfile[Optionen,kommen,hier]@{@var{Dateiname}@}
 @end example
 
+Zusätzlich kann mit @code{@@lilypondversion} die aktuelle Versionsnummer
+von LilyPond angezeigt werden.
 Wenn @command{lilypond-book} eine derartige Datei verarbeitet, 
 wird eine Texinfo-Datei mit der Erweiterung @file{.texi} erzeugt,
 die @code{@@image} Befehle für die Ausgabe nach HTML, Info und PDF 
@@ -459,7 +468,6 @@ Musik wird eingegeben als
 @command{lilypond-book} erzeugt dann daraus eine HTML-Datei mit den entsprechenden
 @code{<image>} Tags für die Musikbeispiele in jeweils einem eigenen Absatz.
 
-
 @lilypond[fragment,relative=2]
 \key c \minor c4 es g2
 @end lilypond
@@ -477,6 +485,8 @@ Um Dateien mit Musik einzubinden, kann folgendermaßen vorgegangen werden:
 <lilypondfile @var{Option1} @var{Option2} ...>@var{Dateiname}</lilypondfile>
 @end example
 
+Zusätzlich gibt @code{<lilypondversion/>} die aktuelle Versionsnummer
+von LilyPond aus.
 
 
 @node DocBook
@@ -530,7 +540,7 @@ wobei die Sprache auf @code{lilypond} gesetzt wird:
     <programlisting language="lilypond" role="fragment verbatim staffsize=16 ragged-right relative=2">
 \context Staff \with @{
   \remove Time_signature_engraver
-  \remove Clef_engraver@} 
+  \remove Clef_engraver@}
   @{ c4( fis) @}
     </programlisting>
   </textobject>
@@ -1076,8 +1086,12 @@ Eine @file{EPS}-Datei kann mit folgendem Befehl erzeugt werden:
 
 @example
 lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts   Dateiname.ly
+@end example
 
-Eine @file{PNG}-Datei mittels:
+@noindent
+eine @file{PNG}-Datei mittels:
+
+@example
 lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts --png Dateiname.ly
 @end example
 
index b99dce1685869a4e920381d2228dda025554107b..6515c58de0bb4f1002c37490d39a902dfdfec8dd 100644 (file)
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 
 @c Translators: Till Rettig
 
+@ifnottex
+@node Top
+@top GNU LilyPond -- Handbuch zum Lernen
+@end ifnottex
+
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
@@ -151,9 +156,6 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond -- Handbuch zum Lernen
-
 Das ist des Handbuch zum Erlernen von GNU LilyPond Version @version{}.
 Für einen Überblick über die gesamte Dokumentation von LilyPond und die Intention
 dieses Handbuchs siehe @ref{About the documentation}.
index 4b92af5a8c41ae54e451117f308ba72d7997988f..763930cb5ed3c2285b1976d705b6ba019c6e3a10 100644 (file)
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 
 @c Translators: Till Rettig
 
+@ifnottex
+@node Top
+@top GNU LilyPond -- Programmbenutzung
+@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
+@end ifnottex
 
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-program.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond-program-big-page.html,eine große Seite}
-(auf Englisch) verfügbar.
+@uref{source/Documentation/user/lilypond-program.de.pdf,PDF} und auf
+@uref{source/Documentation/user/lilypond-program-big-page.html,einer großen Seite}
 @end ifclear
 @ifset bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-program.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond-program/index.de.html,Separate HTML-Seiten mit Index}
-verfügbar.
+@uref{source/Documentation/user/lilypond-program.pdf,PDF} und auf
+@uref{source/Documentation/user/lilypond-program/index.html,separaten HTML-Seiten mit Index}
 @end ifset
+verfügbar.
 @end ifhtml
 
 
@@ -62,15 +66,15 @@ Copyright @copyright{} 1999--2008 bei den Autoren
 for courtesy to non-English speakers, but only the notice in English
 legally counts.}
 
-@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung
-für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber
+@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung 
+für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber 
 nur die englische Version gültig.}
 
 @quotation
 Es ist erlaubt, dieses Dokument unter den Bedingungen der
 GNU Free Documentation Lizenz (Version 1.1 oder
-spätere, von der Free Software Foundation publizierte Versionen, ohne
-Invariante Abschnitte),
+spätere, von der Free Software Foundation publizierte Versionen, ohne 
+Invariante Abschnitte), 
 zu kopieren, verbreiten und/oder
 zu verändern. Eine Kopie der Lizenz ist im Abschnitt ``GNU
 Free Documentation License'' angefügt.
@@ -97,15 +101,15 @@ Copyright @copyright{} 1999--2008 bei den Autoren
 for courtesy to non-English speakers, but only the notice in English
 legally counts.}
 
-@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung
-für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber
+@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung 
+für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber 
 nur die englische Version gültig.}
 
 @quotation
 Es ist erlaubt, dieses Dokument unter den Bedingungen der
 GNU Free Documentation Lizenz (Version 1.1 oder
-spätere, von der Free Software Foundation publizierte Versionen, ohne
-Invariante Abschnitte),
+spätere, von der Free Software Foundation publizierte Versionen, ohne 
+Invariante Abschnitte), 
 zu kopieren, verbreiten und/oder
 zu verändern. Eine Kopie der Lizenz ist im Abschnitt ``GNU
 Free Documentation License'' angefügt.
@@ -130,15 +134,15 @@ Copyright 1999--2008 bei den Autoren
 for courtesy to non-English speakers, but only the notice in English
 legally counts.}
 
-@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung
-für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber
+@emph{Die Übersetzung der folgenden Lizenzanmerkung ist zur Orientierung 
+für Leser, die nicht Englisch sprechen. Im rechtlichen Sinne ist aber 
 nur die englische Version gültig.}
 
 @quotation
 Es ist erlaubt, dieses Dokument unter den Bedingungen der
 GNU Free Documentation Lizenz (Version 1.1 oder
 spätere, von der Free Software Foundation publizierte Versionen, ohne
-Invariante Abschnitte),
+Invariante Abschnitte), 
 zu kopieren, verbreiten und/oder
 zu verändern. Eine Kopie der Lizenz ist im Abschnitt ``GNU
 Free Documentation License'' angefügt.
@@ -155,9 +159,6 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond -- Programmbenutzung
-
 Das ist das Handbuch zur Programmbenutzung für GNU LilyPond Version @version{}.
 Für einen Überblick über die gesamte Dokumentation von LilyPond und die Intention
 dieses Handbuchs siehe @rlearning{About the documentation}.
index 8295841a618274eabdb67cbadb020ed3cc69e493..99171ee0383be9672da3f7c0d17e35ae32b843d6 100644 (file)
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: b54fc6953a8d70a3c51e8c3d0cbf9b3fe9652d78
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -56,18 +56,24 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 @c Translators: Till Rettig
 
+@ifnottex
+@node Top
+@top GNU LilyPond -- Notationsreferenz
+@chapheading Das Notensatzprogramm
+@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
+@end ifnottex
 
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond-big-page.html,eine große Seite}
+@uref{source/Documentation/user/lilypond.de.pdf,PDF} und auf
+@uref{source/Documentation/user/lilypond-big-page.html,einer großen Seite}
 (auf Englisch) verfügbar.
 @end ifclear
 @ifset bigpage
 Dieses Dokument ist auch als
 @uref{source/Documentation/user/lilypond.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond/index.de.html,Separate HTML-Seiten mit Index}
+@uref{source/Documentation/user/lilypond/index.de.html,separate HTML-Seiten mit Index}
 verfügbar.
 @end ifset
 @end ifhtml
@@ -188,10 +194,6 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond -- Das Notationsprogramm
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
-
 Das ist das Benutzerhandbuch für GNU LilyPond Version @version{}.
 Für einen Überblick über die gesamte Dokumentation von LilyPond und die Intention
 dieses Handbuchs siehe @rlearning{About the documentation}.
index f2bf71dddcaa1073db784fb337483e5922949de5..38219d460e6c33ca4a3190b03f5218ffb467a3ad 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 2ae5726ea4fcbcd40e42678db32d7da3227ef44a
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -31,14 +31,17 @@ and just before
 @end ignore
 
 @menu
-* Chord name chart::            
-* MIDI instruments::            
+* Chord name chart::   
+* Common chord modifiers::
+* Predefined fretboard diagrams::         
+* MIDI instruments::         
 * List of colors::              
 * The Feta font::               
 * Note head styles::            
 * Text markup commands::        
 * Text markup list commands::   
-* List of articulations::       
+* List of articulations::
+* Percussion notes::   
 * All context properties::      
 * Layout properties::           
 * Identifiers::                 
@@ -53,6 +56,350 @@ ausgegeben werden. Es wird auch die entsprechende Note ausgegeben.
 
 @lilypondfile{chord-names-jazz.ly}
 
+
+@node Common chord modifiers
+@appendixsec Common chord modifiers
+
+Die Tabelle zeigt Modifikatoren für Akkorde, die im @code{\chordmode}-Modus
+benutzt werden können, um übliche Akkordkonstrukte zu notieren.
+
+@multitable @columnfractions .2 .3 .2 .2
+
+@item
+@b{Akkordtyp}
+@tab
+@b{Intervalle}
+@tab
+@b{Modifikator(en)}
+@tab
+@b{Beispiel}
+
+
+@item
+Dur
+@tab
+große Terz, Quinte
+@tab
+@code{5} oder nichts
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:5
+}
+@end lilypond
+
+@item
+Moll
+@tab
+kleine Terz, Quinte
+@tab
+@code{m} oder @code{m5}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m
+}
+@end lilypond
+
+@item
+Übermäßig
+@tab
+Große Terz, übermäßige Quinte
+@tab
+@code{aug}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:aug
+}
+@end lilypond
+
+@item
+Vermindert
+@tab
+Kleine Terz, verminderte Quinte
+@tab
+@code{dim}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim
+}
+@end lilypond
+
+@item
+Dominantsieben
+@tab
+Durdreiklang, kleine Septime
+@tab
+@code{7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:7
+}
+@end lilypond
+
+@item
+Große Septime
+@tab
+Durdreiklang, große Septime
+@tab
+@code{maj7} oder @code{maj}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj7
+}
+@end lilypond
+
+@item
+Kleine Septime
+@tab
+Molldreiklang, kleine Septime
+@tab
+@code{m7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m7
+}
+@end lilypond
+
+@item
+Verminderte Septime
+@tab
+Verminderter Dreiklang, verminderte Septime
+@tab
+@code{dim7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim7
+}
+@end lilypond
+
+@item
+Übermäßige Septime
+@tab
+Übermäßiger Dreiklang, kleine Septime
+@tab
+@code{aug7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:aug7
+}
+@end lilypond
+
+@item
+halbverminderte Septime
+@tab
+Verminderter Dreklang, kleine Sept
+@tab
+@code{dim5m7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim5m7
+}
+@end lilypond
+
+@item
+Kleine MollSept
+@tab
+Molldreiklang, Durseptime
+@tab
+@code{7m5}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:7m5
+}
+@end lilypond
+
+@item
+Große Sexte
+@tab
+Durdreiklang, Sexte
+@tab
+@code{6}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:6
+}
+@end lilypond
+
+@item
+Kleine Sexte
+@tab
+Molldreiklang, Sexte
+@tab
+@code{m6}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m6
+}
+@end lilypond
+
+@item
+Dominantnon
+@tab
+Dominantsept, große None
+@tab
+@code{9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:9
+}
+@end lilypond
+
+@item
+Dur None
+@tab
+TODO
+@tab
+@code{maj9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj9
+}
+@end lilypond
+
+@item
+Moll None
+@tab
+TODO
+@tab
+@code{m9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m9
+}
+@end lilypond
+
+@item
+Dominantundecime
+@tab
+Dominant ninth, perfect eleventh
+@tab
+@code{11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:11
+}
+@end lilypond
+
+@item
+Durundecime
+@tab
+TODO
+@tab
+@code{maj11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj11
+}
+@end lilypond
+
+@item
+Mollundecime
+@tab
+TODO
+@tab
+@code{m11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m11
+}
+@end lilypond
+
+@item
+Dominant-13
+@tab
+Dominant eleventh, major thirteenth
+@tab
+@code{13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:13.11
+}
+@end lilypond
+
+@item
+Dur-13
+@tab
+TODO
+@tab
+@code{maj13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj13.11
+}
+@end lilypond
+
+@item
+Moll-13
+@tab
+TODO
+@tab
+@code{m13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m13.11
+}
+@end lilypond
+
+@item
+erniedrigte Sekunde
+@tab
+TODO
+@tab
+@code{sus2}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:sus2
+}
+@end lilypond
+
+@item
+erniedrigte Quarte
+@tab
+TODO
+@tab
+@code{sus4}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:sus4
+}
+@end lilypond
+
+
+@end multitable
+
+
+@node Predefined fretboard diagrams
+@appendixsec Predefined fretboard diagrams
+
+Die Tabelle zeigt alle vordefinierten Bunddiagramme.
+
+@lilypondfile{display-predefined-fretboards.ly}
+
+
+
 @node MIDI instruments
 @appendixsec MIDI instruments
 
@@ -277,6 +624,13 @@ Hier ist eine Liste, die alle möglichen Zeichen darstellt:
 
 @lilypondfile[ragged-right,quote]{script-chart.ly}
 
+
+@node Percussion notes
+@appendixsec Percussion notes
+
+@lilypondfile[quote]{percussion-chart.ly}
+
+
 @node All context properties
 @appendixsec All context properties
 
index 18f5f0e1240cc371470e9407d138b5df16733baa..eb64524f8c81b70cc39a56b949c6493ad488114f 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 47df71eb9aa3217537cd902ef0161ec3bef88ec5
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index e6f8fd14df5ddbab72a238de291afcc87ad5d2b7..6421de8038eba997e3816b3bca51fecb93cc8f9f 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 19fc0f930f921ca2609e0e60aa26f9d980771b97
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @node Percussion
 @section Percussion
 
-@untranslated
-
-
 @menu
 * Common notation for percussion::
 @end menu
 
+
 @node Common notation for percussion
 @subsection Common notation for percussion
 
@@ -29,42 +27,149 @@ aber hiermit kann auch der Rhythmus einer Melodie dargestellt werden.
 @menu
 * References for percussion::
 * Basic percussion notation::
+* Drum rolls::
+* Pitched percussion::
 * Percussion staves::
+* Custom percussion staves::
 * Ghost notes::
 @end menu
 
+
 @node References for percussion
 @unnumberedsubsubsec References for percussion
 
-@untranslated
+@itemize
+
+@item Viele Schlagzeugmusik kann auf einem rhythmischen System notiert
+werden.  Das wird gezeigt in
+@ref{Showing melody rhythms} und @ref{Instantiating new staves}.
+
+@item MIDI-Ausgabe wird behandelt in
+@ref{Percussion in MIDI}.
+
+@end itemize
+
+
+@seealso
+Notationsreferenz:
+@ref{Showing melody rhythms},
+@ref{Instantiating new staves}.
+@ref{Percussion in MIDI}.
+
+Schnipsel:
+@rlsr{Percussion}.
+
 
 @node Basic percussion notation
 @unnumberedsubsubsec Basic percussion notation
 
-@cindex Percussion
+@cindex Perkussion
 @cindex Drums
 @cindex Schlagzeug
 
-
 Schlagzeug-Noten können im @code{\drummode}-Modus notiert werden, 
-der sich ähnlich verhält wie der Standardmodus für die Noteneingabe. 
+der sich ähnlich verhält wie der Standardmodus für die Noteneingabe.
+Am einfachsten kann der @code{\drums}-Befehl benutzt werden, der sich
+um den richtigen Kontext und Eingabemodus kümmert:
+
+@lilypond[quote,verbatim]
+\drums {
+  hihat4 hh bassdrum bd
+}
+@end lilypond
+
+@noindent
+Das ist die Kurzschreibweise für:
+
+@lilypond[quote,verbatim]
+\new DrumStaff {
+  \drummode {
+    hihat4 hh bassdrum bd
+  }
+}
+@end lilypond
+
 Jedes Schlagzeuginstrument hat einen langen Namen und eine Abkürzung,
-und beide können nebeneinander benutzt werden.
+und beide können nebeneinander benutzt werden.  Eine Liste der
+Notenbezeichnungen für Schlagzeug findet sich in @ref{Percussion notes}.
+
+Beachten Sie, dass normale Tonhöhen (wie @code{cis4}) in einem
+@code{DrumStaff}-Kontext eine Fehlernachricht erzielen.  Schlüssel für
+Schlagzeug werden automatisch hinzugefügt, aber andere Schlüssel können
+auch benutzt werden.
+
+Es gibt einige Probleme mit der MIDI-Unterstützung für Schlagzeuginstrumente.
+Details finden sich in @ref{Percussion in MIDI}.
+
+@seealso
+Notationsreferenz:
+@ref{Percussion in MIDI},
+@ref{Percussion notes}.
+
+Installierte Dateien:
+@file{ly/@/drumpitch@/-init@/.ly}.
+
+Schnipsel:
+@rlsr{Percussion}.
+
+
+@node Drum rolls
+@unnumberedsubsubsec Drum rolls
+
+Trommelwirbel werden mit drei Balken durch den Notenhals notiert. Für
+Viertelnoten oder längere Noten werden die drei Balken explizit notiert,
+Achtel werden mit zwei Balken gezeigt (und der dritte ist der eigentliche
+Balken), und Trommelwirbel mit kürzeren Werten als Achtelnoten
+haben einen Balken zusätzlich zu den eigentlichen Balken der Noten.
+Dieses Verhalten wird mit der Tremolonotation erreicht, wie in
+@ref{Tremolo repeats} gezeigt.  Hier ein Beispiel kleinerer Wirbel:
 
-@lilypond[quote,ragged-right,verbatim]
+@lilypond[quote,verbatim]
 \drums {
-  hihat hh bassdrum bd
+  \time 2/4
+  sn16 sn8 sn16 sn8 sn8:32 ~
+  sn8 sn8 sn4:32 ~
+  sn4 sn8 sn16 sn16
+  sn4 r4
 }
 @end lilypond
 
-Eine vollständige Liste der Schlagwerk-Bezeichnungen findet sich in 
-der Datei @file{ly/@/drumpitch@/-init@/.ly}.
-@c TODO: properly document this.
+Benutzung der Stöcke kann angezeigt werden durch @code{^"R"} oder
+@code{^"L"} nach jeder Note. Die @code{staff-padding}-Eigenschaft
+kann verändert werden, um eine Orientierung an einer gemeinsamen
+Linie zu ermöglichen.
+
+@lilypond[quote,verbatim]
+\drums {
+  \repeat unfold 2 {
+    sn16 ^"L" sn^"R" sn^"L" sn^"L" sn^"R" sn^"L"  sn^"R" sn^"R"
+  }
+}
+@end lilypond
 
 
 @seealso
-Programmreferenz:
-@rinternals{note-event}.
+Schnipsel:
+@rlsr{Percussion}.
+
+
+@node Pitched percussion
+@unnumberedsubsubsec Pitched percussion
+
+Bestimmte Schlagzeuginstrumente mit Tonhöhe (z. B. Xylophone,
+vibraphone und Pauken) werden auf normalen Systemen geschrieben.  Das
+wird in anderen Abschnitten des Handbuchs behandelt.
+
+
+@seealso
+@c TODO: possibly link to an alternate section of NR 3.5, if
+@c "percussion in MIDI" gets a separate subsubsection for
+@c pitched percussion sounds.  -gp
+Notationsreferenz:
+@ref{Percussion in MIDI}.
+
+Schnipsel:
+@rlsr{Percussion}.
 
 
 @node Percussion staves
@@ -75,44 +180,46 @@ Programmreferenz:
 
 Ein Schlagzeug-System besteht üblicherweise aus einem Notensystem 
 mit mehreren Linien, wobei jede Linie ein bestimmtes Schlagzeug-Instrument 
-darstellt.
-
-Um die Noten darstellen zu können, müssen sie sich innerhalb von 
-einem @rinternals{DrumStaff}- und einem 
-@rinternals{DrumVoice}-Kontext befinden.
-
-@lilypond[quote,ragged-right,verbatim]
-up = \drummode { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat }
-down = \drummode { bassdrum4 snare8 bd r bd sn4 }
-  \new DrumStaff <<
-    \new DrumVoice { \voiceOne \up }
-    \new DrumVoice { \voiceTwo \down }
-  >>
+darstellt.  Um die Noten darstellen zu können, müssen sie sich innerhalb von 
+einem @code{DrumStaff}- und einem 
+@code{DrumVoice}-Kontext befinden.
+
+@lilypond[quote,verbatim]
+up = \drummode {
+  crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat
+}
+down = \drummode {
+  bassdrum4 snare8 bd r bd sn4
+}
+\new DrumStaff <<
+  \new DrumVoice { \voiceOne \up }
+  \new DrumVoice { \voiceTwo \down }
+>>
 @end lilypond
+
 Das Beispiel zeigt ausdrücklich definierte mehrstimmige Notation. Die 
 Kurznotation für mehrstimmige Musik, wie sie im Abschnitt 
-@ref{Simultaneous expressions} beschrieben wird, kann auch verwendet werden, 
-wenn die @rinternals{DrumVoice} (Schlagzeugstimmen) am Anfang explizit 
-initialisiert werden.
+@rlearning{I'm hearing Voices} beschrieben wird, kann auch verwendet werden, 
+wenn die Stimmen am Anfang explizit initialisiert werden.
 
-@lilypond[quote,ragged-right,fragment,verbatim]
+@lilypond[quote,verbatim]
 \new DrumStaff <<
-  \new DrumVoice = "1" { s1 *2 }
-  \new DrumVoice = "2" { s1 *2 }
+  \new DrumVoice = "1" { s1*2 }
+  \new DrumVoice = "2" { s1*2 }
   \drummode {
     bd4 sn4 bd4 sn4
-    <<
-      { \repeat unfold 16 hh16 }
-      \\
-      { bd4 sn4 bd4 sn4 }
-    >>
+    << {
+      \repeat unfold 16 hh16
+    } \\ {
+      bd4 sn4 bd4 sn4
+    >>
   }
 >>
 @end lilypond
 
 Es gibt auch weitere Layout-Einstellungen. Um diese zu verwenden, 
 muss die Eigenschaft @code{drumStyleTable} im 
-@rinternals{DrumVoice}-Kontext entsprechend eingestellt werden. 
+@code{DrumVoice}-Kontext entsprechend eingestellt werden. 
 Folgende Variablen sind vordefiniert:
 
 @table @code
@@ -146,6 +253,7 @@ mus = \drummode {
   }
 }
 @end lilypond
+
 Die Schlagzeugdefinitionen unterstützen sechs unterschiedliche 
 Tom Toms. Falls eine geringere Anzahl verwendet wird, kann man 
 einfach die Tom Toms auswählen, deren Notation man haben will. 
@@ -253,10 +361,14 @@ mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
 @end lilypond
 @end table
 
+
+@node Custom percussion staves
+@unnumberedsubsubsec Custom percussion staves
+
 Wenn ihnen keine der vordefinierten Stile gefällt, können Sie auch eine 
 eigene Liste der Positionen und Notenköpfe am Anfang ihrer Datei erstellen.
 
-@lilypond[quote,ragged-right,verbatim]
+@lilypond[quote,verbatim]
 #(define mydrums '(
          (bassdrum     default   #f         -1)
          (snare        default   #f         0)
@@ -274,16 +386,189 @@ down = \drummode { bd4 sn bd toml8 toml }
 @end lilypond
 
 
-@seealso
-Init-Dateien: @file{ly/@/drumpitch@/-init@/.ly}.
+@snippets
+
+FIXME: MOVE ALL THESE TO LSR!  -gp
+
+Hier einige Beispiele:
+
+Zwei Holzblöcke, notiert mit wbh (hoch) und wbl (tief)
+
+@lilypond[quote,verbatim]
+% These lines define the position of the woodblocks in the stave;
+% if you like, you can change it or you can use special note heads
+% for the woodblocks.
+#(define mydrums '((hiwoodblock default #t  3)
+                   (lowoodblock default #t -2)))
+
+woodstaff = {
+  % This defines a staff with only two lines.
+  % It also defines the positions of the two lines.
+  \override Staff.StaffSymbol #'line-positions = #'(-2 3)
+
+  % This is neccessary; if not entered, the barline would be too short!
+  \override Staff.BarLine #'bar-size = #3
+}
 
-Programmreferenz: @rinternals{DrumStaff}, @rinternals{DrumVoice}.
+\new DrumStaff {
+  \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+
+  % with this you load your new drum style table
+  \woodstaff
+
+  \drummode {
+    \time 2/4
+    wbl8 wbl16 wbl wbh8-> wbl |
+    wbl8 wbl16 wbh-> ~ wbh wbl16 r8 |
+  }
+}
+@end lilypond
+
+In diesem Spezialfalls muss die Länge der Taktlinie mit
+@code{\override Staff.BarLine #'bar-size #number} angepasst werden.
+Andernfalls wäre sie zu kurz.  Die Position der beiden Linien muss
+auch definiert werden.
+
+Tamburin, notiert mit @code{tamb}:
 
+@lilypond[quote,verbatim]
+#(define mydrums '((tambourine default #t 0)))
 
-@knownissues
+tambustaff = {
+  \override Staff.StaffSymbol #'line-positions = #'( 0 )
+  \override Staff.BarLine #'bar-size = #3
+  \set DrumStaff.instrumentName = "Tambourine"
+}
 
-Weil in den allgemeinen MIDI-Definitionen kein Rimshot enthalten ist, 
-wird sidestick für diesen Zweck benutzt.
+\new DrumStaff {
+  \tambustaff
+  \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+
+  \drummode {
+    \time 6/8
+    tamb8. tamb16 tamb8 tamb tamb tamb |
+    tamb4. tamb8 tamb tamb |
+    % the trick with the scaled duration and the shorter rest
+    % is neccessary for the correct ending of the trill-span!
+    tamb2.*5/6 \startTrillSpan s8 \stopTrillSpan |
+  }
+}
+@end lilypond
+
+Noten für Tam-Tam (notiert mit @code{tt}):
+
+@lilypond[quote,verbatim]
+#(define mydrums '((tamtam default #t 0)))
+
+tamtamstaff = {
+  \override Staff.StaffSymbol #'line-positions = #'( 0 )
+  \override Staff.BarLine #'bar-size = #3
+  \set DrumStaff.instrumentName = "Tamtam"
+}
+
+\new DrumStaff {
+  \tamtamstaff
+  \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+
+  \drummode {
+    tt 1 \pp \laissezVibrer
+  }
+}
+@end lilypond
+
+Zwei Glocken, notiert mit @code{cb} (Kuhglocke) und @code{rb}
+(Reisterglocke)
+
+@lilypond[quote,verbatim]
+#(define mydrums '((ridebell default #t  3)
+                   (cowbell  default #t -2)))
+
+bellstaff = {
+  \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3)
+  \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+  \override Staff.BarLine #'bar-size = #3
+  \set DrumStaff.instrumentName = "Different Bells"
+}
+
+\new DrumStaff {
+  \bellstaff
+  \drummode {
+    \time 2/4
+    rb8 rb cb cb16 rb-> ~ |
+    rb16 rb8 rb16 cb8 cb |
+  }
+}
+@end lilypond
+
+Here an short example by maestro Stravinsky (from @q{L'histoire du Soldat})
+
+@lilypond[quote,verbatim]
+#(define mydrums '((bassdrum   default #t  4)
+                   (snare      default #t -4)
+                   (tambourine default #t  0)))
+
+global = {
+  \time 3/8 s4.
+  \time 2/4 s2*2
+  \time 3/8 s4.
+  \time 2/4 s2
+}
+
+drumsA = {
+  \context DrumVoice <<
+    { \global }
+    { \drummode {
+        \autoBeamOff
+        \stemDown sn8 \stemUp tamb s8 |
+        sn4 \stemDown sn4 |
+        \stemUp tamb8 \stemDown sn8 \stemUp sn16 \stemDown sn \stemUp sn8 |
+        \stemDown sn8 \stemUp tamb s8 |
+        \stemUp sn4 s8 \stemUp tamb
+      }
+    }
+  >>
+}
+
+drumsB = {
+  \drummode {
+    s4 bd8 s2*2 s4 bd8 s4 bd8 s8
+  }
+}
+
+\layout {
+  indent = #40
+}
+
+\score {
+  \new StaffGroup <<
+    \new DrumStaff {
+      \set DrumStaff.instrumentName = \markup {
+        \column {
+          "Tambourine"
+          "et"
+          "caisse claire s. timbre"
+        }
+      }
+      \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+      \drumsA
+    }
+
+   \new DrumStaff {
+     \set DrumStaff.instrumentName = "Grosse Caisse"
+     \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
+     \drumsB }
+  >>
+}
+@end lilypond
+
+
+@seealso
+Schnipsel:
+@rlsr{Percussion}.
+
+Referenz der Interna:
+@rinternals{DrumStaff},
+@rinternals{DrumVoice}.
 
 
 @node Ghost notes
@@ -292,24 +577,23 @@ wird sidestick für diesen Zweck benutzt.
 Geisternoten für Schlagzeug und Perkussion können mit dem 
 Klammer- (@code{\parenthesize})-Befehl, beschrieben in @ref{Parentheses}, 
 erstellt werden. Im Standard-@code{\drummode}-Modus ist aber 
-das @code{Parenthesis_engraver}-Plugin nicht automatisch enthalten. 
-Sie müssen das Plugin ausdrücklich in den Kontext-Definitionen 
-laden, wie im Abschnitt @rlearning{Modifying context properties}
-detailliert beschrieben.
+das @code{Parenthesis_engraver}-Plugin nicht automatisch enthalten.
 
 @lilypond[quote,ragged-right,verbatim,fragment]
 \new DrumStaff \with {
   \consists "Parenthesis_engraver"
-} <<
-  \context DrumVoice  = "1"  { s1 *2 }
-  \context DrumVoice  = "2" { s1 *2 }
+}
+<<
+  \context DrumVoice  = "1" { s1 }
+  \context DrumVoice  = "2" { s1 }
   \drummode {
     <<
       {
         hh8[ hh] <hh sn> hh16
-        < \parenthesize sn > hh < \parenthesize
-        sn > hh8 <hh sn> hh
-      } \\ {
+        < \parenthesize sn > hh
+        < \parenthesize sn > hh8 <hh sn> hh
+      } \\
+      {
         bd4 r4 bd8 bd r8 bd
       }
     >>
@@ -322,4 +606,6 @@ Um jede Klammer-Definition (@code{\parenthesize}) müssen
  zusätzlich die spitzen 
 Klammern für Akkorde (@code{< >}) gesetzt werden.
 
-
+@seealso
+Schnipsel:
+@rlsr{Percussion}.
index b5a30cfcb1838f64a11c553ab4c461385a551a2f..6e1c37077c885ccc5dca167b1430751b8aa551c1 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 7c57f1469e057f25f5d7a7b75c18f33bb4e5bed9
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -88,9 +88,8 @@ c, c,, e, g
 d,, d, d c
 @end lilypond
 
-
 @seealso
-Musikglossar:
+Glossar:
 @rglos{Pitch names}.
 
 Schnipsel:
@@ -214,7 +213,7 @@ Intervall enthält.
 
 
 @seealso
-Musikglossar:
+Musickgossar:
 @rglos{fifth},
 @rglos{interval},
 @rglos{Pitch names}.
@@ -235,7 +234,6 @@ Referenz der Interna:
 @funindex \chordmode
 @funindex \relative
 
-
 @knownissues
 
 Die relative Veränderung wirkt sich nicht auf 
@@ -371,9 +369,11 @@ cis
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {preventing-extra-naturals-from-being-automatically-added.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{makam-example.ly}
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{sharp},
 @rglos{flat},
 @rglos{double sharp},
@@ -421,55 +421,75 @@ Sprachen als Englisch. Um sie zu benutzen, muss nur die
 entsprechende Datei für die jeweilige Sprache eingefügt werden.
 Zum Beispiel fügt man mit @code{\include "deutsch.ly"} die 
 Notendefinitionen für die deutsche Sprache am Anfang der Datei 
-hinzu. In der Tabelle sind die existierenden Definitionen
-mit den dazugehörigen Notenbezeichnungen dargestellt.
+hinzu. In der Tabelle sind die existierenden Sprachdefinitionen
+mit den dazugehörigen Notenbezeichnungen dargestellt
 
-@smallexample
-@multitable {nederlands.ly} {do re mi fa sol la sib si} {-iss/-is} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
-@headitem Sprache
+@quotation
+@multitable {@file{nederlands.ly}} {do re mi fa sol la sib si}
+@headitem Sprachdatei
   @tab Notenbezeichnung
-  @tab sharp @tab flat @tab double sharp @tab double flat
-@item nederlands.ly
+@item @file{nederlands.ly}
   @tab c d e f g a bes b
-  @tab -is @tab -es @tab -isis @tab -eses
-@item arabic.ly
+@item @file{arabic.ly}
   @tab do re mi fa sol la sib si
-  @tab -d @tab -b @tab -dd @tab -bb
-@item catalan.ly
+@item @file{catalan.ly}
   @tab do re mi fa sol la sib si
-  @tab -d/-s @tab -b @tab -dd/-ss @tab -bb
-@item deutsch.ly
+@item @file{deutsch.ly}
   @tab c d e f g a b h
-  @tab -is @tab -es @tab -isis @tab -eses
-@item english.ly
+@item @file{english.ly}
   @tab c d e f g a bf b
+@item @file{espanol.ly}
+  @tab do re mi fa sol la sib si
+@item @file{italiano.ly}
+  @tab do re mi fa sol la sib si
+@item @file{norsk.ly}
+  @tab c d e f g a b h
+@item @file{portugues.ly}
+  @tab do re mi fa sol la sib si
+@item @file{suomi.ly}
+  @tab c d e f g a b h
+@item @file{svenska.ly}
+  @tab c d e f g a b h
+@item @file{vlaams.ly}
+  @tab do re mi fa sol la sib si
+@end multitable
+@end quotation
+
+@noindent
+und die dazugehörigen Versetzungszeichen-Endungen:
+
+@quotation
+@multitable {@file{nederlands.ly}} {-s/-sharp} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
+@headitem Sprachdatei
+  @tab Kreuz @tab B @tab Doppelkreuz @tab Doppel-B
+@item @file{nederlands.ly}
+  @tab -is @tab -es @tab -isis @tab -eses
+@item @file{arabic.ly}
+  @tab -d @tab -b @tab -dd @tab -bb
+@item @file{catalan.ly}
+  @tab -d/-s @tab -b @tab -dd/-ss @tab -bb
+@item @file{deutsch.ly}
+  @tab -is @tab -es @tab -isis @tab -eses
+@item @file{english.ly}
   @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
     @tab -ff/-flatflat
-@item espanol.ly
-  @tab do re mi fa sol la sib si
+@item @file{espanol.ly}
   @tab -s @tab -b @tab -ss @tab -bb
-@item italiano.ly
-  @tab do re mi fa sol la sib si
+@item @file{italiano.ly}
   @tab -d @tab -b @tab -dd @tab -bb
-@item norsk.ly
-  @tab c d e f g a b h
+@item @file{norsk.ly}
   @tab -iss/-is @tab -ess/-es @tab -ississ/-isis
     @tab -essess/-eses
-@item portugues.ly
-  @tab do re mi fa sol la sib si
+@item @file{portugues.ly}
   @tab -s @tab -b @tab -ss @tab -bb
-@item suomi.ly
-  @tab c d e f g a b h
+@item @file{suomi.ly}
   @tab -is @tab -es @tab -isis @tab -eses
-@item svenska.ly
-  @tab c d e f g a b h
+@item @file{svenska.ly}
   @tab -iss @tab -ess @tab -ississ @tab -essess
-@item vlaams.ly
-  @tab do re mi fa sol la sib si
+@item @file{vlaams.ly}
   @tab -k @tab -b @tab -kk @tab -bb
 @end multitable
-@end smallexample
-
+@end quotation
 
 @noindent
 Auf Holländisch, Deutsch, Norwegisch und Schwedisch (u. a.) werden die 
@@ -495,36 +515,29 @@ Tabelle aufgeführt. Die Präfixe @qq{Semi-} und @qq{Sesqui-} bedeuten
 @qq{halb} bzw. @qq{eineinhalb}. Für alle anderen
 Sprachen sind noch keine eigenen Namen definiert.
 
-@smallexample
-@multitable {nederlands.ly} {do re mi fa sol la sib si} {-iss/-is} {-ess/-es} {-ississ/-isis} {-ississ/-isis}
-@headitem Sprache
-  @tab Notenbezeichnung
-  @tab semi-sharp @tab semi-flat @tab sesqui-sharp @tab sesqui-flat
+@quotation
+@multitable {@file{nederlands.ly}} {@b{semi-sharp}} {@b{semi-flat}} {@b{sesqui-sharp}} {@b{sesqui-flat}}
+@headitem Sprachdatei
+  @tab Vierteltonkreuz @tab Viertelton-B @tab 3/4-tonkreuz @tab 3/4-ton-B
 
-@item nederlands.ly
-  @tab c d e f g a bes b
+@item @file{nederlands.ly}
   @tab -ih @tab -eh @tab -isih @tab -eseh
-@item arabic.ly
-  @tab do re mi fa sol la sib si
+@item @file{arabic.ly}
   @tab -sd @tab -sb @tab -dsd @tab -bsb
-@item deutsch.ly
-  @tab c d e f g a b h
+@item @file{deutsch.ly}
   @tab -ih @tab -eh @tab -isih @tab -eseh
-@item english.ly
-  @tab c d e f g a bf b
+@item @file{english.ly}
   @tab -qs @tab -qf @tab -tqs @tab -tqf
-@item italiano.ly
-  @tab do re mi fa sol la sib si
+@item @file{italiano.ly}
   @tab -sd @tab -sb @tab -dsd @tab -bsb
-@item portugues.ly
-  @tab do re mi fa sol la sib si
+@item @file{portugues.ly}
   @tab -sqt @tab -bqt @tab -stqt @tab -btqt
 @end multitable
-@end smallexample
+@end quotation
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{Pitch names}.
 
 Schnipsel:
@@ -609,7 +622,6 @@ einen Fehler aus, die zweite dagegen ist erfolgreich:
 }
 @end lilypond
 
-
 @seealso
 Schnipsel:
 @rlsr{Pitches}.
@@ -729,7 +741,6 @@ siehe auch @ref{Instrument transpositions}.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {transposing-pitches-with-minimum-accidentals-smart-transpose.ly}
 
-
 @seealso
 Notationsreferenz:
 @ref{Instrument transpositions}.
@@ -740,7 +751,6 @@ Schnipsel:
 Referenz der Interna:
 @rinternals{TransposedMusic}.
 
-
 @funindex \transpose
 @funindex \chordmode
 @funindex \relative
@@ -950,7 +960,7 @@ fis
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{church mode},
 @rglos{scordatura}.
 
@@ -1004,7 +1014,7 @@ haben.
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{octavation}.
 
 Schnipsel:
@@ -1101,7 +1111,7 @@ c2 g
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{concert pitch},
 @rglos{transposing instrument}.
 
@@ -2154,7 +2164,7 @@ Tonart definiert werden.
 
 
 @seealso
-Musikglossar:
+Glossar:
 @rglos{ambitus}.
 
 Schnipsel:
@@ -2227,7 +2237,6 @@ von Akkorden benutzt werden kann:
 Alle möglichen Notenkopf-Stile finden sich in
 @ref{Note head styles}.
 
-
 @seealso
 Schnipsel:
 @rlsr{Pitches}.
@@ -2275,15 +2284,14 @@ sich in @ref{Setting the staff size}.
 }
 @end lilypond
 
+@funindex \easyHeadsOn
+@funindex \easyHeadsOff
 
 @predefined
-@funindex \easyHeadsOn
 @code{\easyHeadsOn},
-@funindex \easyHeadsOff
 @code{\easyHeadsOff}.
 @endpredefined
 
-
 @seealso
 Notationsreferenz:
 @ref{Setting the staff size}.
@@ -2328,15 +2336,14 @@ Die unterschiedlichen Formen richten sich nach der Stufe in der
 Skala, wobei der Grundton der Skala aus dem @code{\key}-Befehl
 entnommen wird.
 
+@funindex \aikenHeads
+@funindex \sacredHarpHeads
 
 @predefined
-@funindex \aikenHeads
 @code{\aikenHeads},
-@funindex \sacredHarpHeads
 @code{\sacredHarpHeads}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -2345,7 +2352,6 @@ entnommen wird.
 @noindent
 Alle Notenkopfstile finden sich in @ref{Note head styles}.
 
-
 @seealso
 Schnipsel:
 @rlsr{Pitches}.
@@ -2388,15 +2394,14 @@ benutzt werden:
 }
 @end lilypond
 
+@funindex \improvisationOn
+@funindex \improvisationOff
 
 @predefined
-@funindex \improvisationOn
 @code{\improvisationOn},
-@funindex \improvisationOff
 @code{\improvisationOff}.
 @endpredefined
 
-
 @seealso
 Schnipsel:
 @rlsr{Pitches}.
index 2017156bfa608a993faf0edef80ded24997a5287..74f370d1582e0d1e5255c284269a97bde3929372 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index bc69ef7cd0853846e68575b4fca90d46d90ea948..8951358c89206a11a1f10a10f519c18590909689 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 5d5dd3611abe9f0599080f6235c436f48c2ba31b
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -42,16 +42,16 @@ Das wird benutzt, um Tremolo-Wiederholungen am Notenhals zu notieren.
 
 
 @menu
-* Long repeats::                
-* Short repeats::              
+* Long repeats::
+* Short repeats::
 @end menu
 
 @node Long repeats
 @subsection Long repeats
 
 @menu
-* Normal repeats::              
-* Manual repeat marks::         
+* Normal repeats::
+* Manual repeat marks::
 * Written-out repeats::
 @end menu
 
@@ -163,7 +163,8 @@ c1
 
 
 @seealso
-Musikglossar: @rglos{repeat}, @rglos{volta}.
+Glossar:
+@rglos{repeat}, @rglos{volta}.
 
 Notationsreferenz: @ref{Bar lines}, @ref{Modifying context plug-ins}.
 
@@ -173,7 +174,6 @@ Referenz der Interna: @rinternals{VoltaBracket},
 @rinternals{RepeatedMusic}, @rinternals{VoltaRepeatedMusic},
 @rinternals{UnfoldedRepeatedMusic}.
 
-
 @knownissues
 
 @cindex verschachtelte Wiederholung
@@ -377,7 +377,6 @@ c1
 c1
 @end lilypond
 
-
 @seealso
 Schnipsel:
 @rlsr{Repeats}.
@@ -387,6 +386,7 @@ Referenz der Interna:
 @rinternals{UnfoldedRepeatedMusic}.
 
 
+
 @node Short repeats
 @subsection Short repeats
 
@@ -396,8 +396,8 @@ von einer Note bis zu zwei Takten, die mit Schrägstrichen oder
 Prozentzeichen dargestellt werden, und Tremolos.
 
 @menu
-* Percent repeats::             
-* Tremolo repeats::                 
+* Percent repeats::
+* Tremolo repeats::
 @end menu
 
 @node Percent repeats
@@ -437,11 +437,14 @@ wobei @var{musikAusdr} ein musikalischer Ausdruck ist.
 {percent-repeat-counter.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{isolated-percent-repeats.ly}
+{percent-repeat-count-visibility.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{isolated-percent-repeats.ly}
 
 @seealso
-Musikglossar: @rglos{percent repeat}, @rglos{simile}.
+Glossar:
+@rglos{percent repeat}, @rglos{simile}.
 
 Schnipsel: @rlsr{Repeats}.
 
@@ -450,7 +453,6 @@ Referenz der Interna: @rinternals{RepeatSlash},
 @rinternals{DoublePercentRepeatCounter},
 @rinternals{PercentRepeatCounter}, @rinternals{PercentRepeatedMusic}.
 
-
 @knownissues
 
 Nur drei Arten von Prozent-Wiederholungen sind unterstützt: ein
@@ -527,15 +529,14 @@ c2:8 c:32
 c: c:
 @end lilypond
 
-
 @seealso
-Schnipsel: @rlsr{Repeats}.
+Schnipsel:
+@rlsr{Repeats}.
 
 @cindex Tremolo über Systeme
 @cindex Systeme, Tremolo zwischen
 @cindex Zwischensystem-Tremolo
 
-
 @knownissues
 
 Tremolo über Notensysteme hinweg funktioniert nicht gut.
index 66b75e42638d790f88dbc7291a5870a9285f6034..765928d5abf6433c0f949dc5ad930007570710cb 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 18b8ce48199720c79c5a34ea16814d9015d20e78
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -119,7 +119,6 @@ nicht berühren.  Fertige Befehle können eingesetzt werden, um
 eine bestimmte Richtung manuell zu erzwingen, zu Einzelheiten
 siehe @ref{Direction and placement}.
 
-
 @predefined
 @code{\autoBeamOff},
 @code{\dotsUp},
@@ -127,7 +126,6 @@ siehe @ref{Direction and placement}.
 @code{\dotsNeutral}.
 @endpredefined
 
-
 @seealso
 Glossar:
 @rglos{breve},
@@ -213,14 +211,12 @@ eingesetzt werden.
 Um die Dauern von Noten zu ändern, ohne die N-tolen-Klammern
 zu setzen, siehe @ref{Scaling durations}.
 
-
 @predefined
 @code{\tupletUp},
 @code{\tupletDown},
 @code{\tupletNeutral}.
 @endpredefined
 
-
 @snippets
 
 @cindex N-tole, Formatierung
@@ -264,7 +260,6 @@ Referenz der Interna:
 @rinternals{TupletNumber},
 @rinternals{TimeScaledMusic}.
 
-
 @knownissues
 @cindex grace notes within tuplet brackets
 Wenn die erste Noten eines Systems ein Vorschlag (eine Verzierung)
@@ -341,7 +336,6 @@ ausgedehnt werden kann:
 Eine Anwendung für diesen Befehl ist polymetrische Notation,
 siehe @ref{Polymetric notation}.
 
-
 @seealso
 Notationsreferenz:
 @ref{Tuplets},
@@ -463,7 +457,6 @@ siehe die vordefinierten Befehle unten oder für Einzelheiten
 Durchgehende, gepunktete oder gestrichelte Bindebögen können
 spezifiziert werden, siehe die vordefinieren Befehle.
 
-
 @predefined
 @code{\tieUp},
 @code{\tieDown},
@@ -473,7 +466,6 @@ spezifiziert werden, siehe die vordefinieren Befehle.
 @code{\tieSolid}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
@@ -482,7 +474,6 @@ spezifiziert werden, siehe die vordefinieren Befehle.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {engraving-ties-manually.ly}
 
-
 @seealso
 Glossar:
 @rglos{tie},
@@ -500,7 +491,6 @@ Referenz der Interna:
 @rinternals{TieColumn},
 @rinternals{Tie}.
 
-
 @knownissues
 
 Der Wechsel zwischen Systemen bei aktiver Überbindung produziert keinen 
@@ -582,7 +572,6 @@ a4\rest d4\rest
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {rest-styles.ly}
 
-
 @seealso
 Notationsreferenz:
 @ref{Full measure rests}.
@@ -656,7 +645,6 @@ Durch ihn wird
 \skip 1 \skip1 \skip 1
 @end lilypond
 
-
 @seealso
 Schnipsel:
 @rlsr{Rhythms}.
@@ -665,6 +653,7 @@ Referenz der Interna:
 @rinternals{SkipMusic}
 
 
+
 @node Full measure rests
 @unnumberedsubsubsec Full measure rests
 
@@ -784,7 +773,6 @@ Wenn eine Mehrtaktpause direkt auf einen Auftakt mit @code{\partial}
 folgt, werden möglicherweise daraus resultierende
 Taktprüfungswarnungen nicht angezeigt.
 
-
 @predefined
 @code{\textLengthOn},
 @code{\textLengthOff},
@@ -793,7 +781,6 @@ Taktprüfungswarnungen nicht angezeigt.
 @code{\expandFullBarRests}.
 @endpredefined
 
-
 @snippets
 
 @cindex Kirchenpausen
@@ -834,7 +821,6 @@ position where the note would be placed in the measure, but if the
 measure length is determined by the length of the text, the text will
 appear to be centered.
 
-
 @seealso
 Glossar:
 @rglos{multi-measure rest}.
@@ -943,35 +929,15 @@ Symbole für Modus und Proprietas der mensuralen Notation
 werden behandelt unter
 @ref{Ancient time signatures}.
 
-
 @predefined
 @code{\numericTimeSignature},
 @code{\defaultTimeSignature}.
 @endpredefined
 
-
 @snippets
 
-@c TODO Send as snippet called "Changing the time signature without affecting the beat length"
-
-The @code{\time} command sets the properties
-@code{timeSignatureFraction}, @code{beatLength}, and
-@code{measureLength} in the @code{Timing} context, which is
-normally aliased to @code{Score}.  Changing the value of
-@code{timeSignatureFraction} causes the new time signature symbol
-to be printed without changing the other properties:
-
-@lilypond[quote,verbatim,relative=2]
-\time 3/4
-a16 a a a a a a a a a a a
-% Change time signature but keep 3/4 beaming
-% due to unchanged beatLength
-\set Score.timeSignatureFraction = #'(12 . 16)
-a16 a a a a a a a a a a a
-\time 12/16
-% Lose 3/4 beaming now beatLength has changed to 16
-a16 a a a a a a a a a a a
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{changing-the-time-signature-without-affecting-the-beaming.ly}
 
 @cindex compound time signatures
 @cindex time signature, compound
@@ -996,6 +962,7 @@ Referenz der Interna:
 @rinternals{Timing_translator}.
 
 
+
 @node Upbeats
 @unnumberedsubsubsec Upbeats
 
@@ -1034,7 +1001,6 @@ die anezigt, wie groß der Abstand zum Taktanfang ist. Deshalb ist
 sie eine negative Zahl; @code{\partial 4} wird also intern übersetzt 
 zu: @qq{Eine Viertel bleibt übrig vom ganzen Takt.}
 
-
 @seealso
 Glossar:
 @rglos{anacrusis}.
@@ -1048,7 +1014,6 @@ Schnipsel:
 Referenz der Interna:
 @rinternals{Timing_translator}.
 
-
 @knownissues
 
 @code{\partial} ist nur für den Anfang eines Stückes vorgesehen. Wenn der 
@@ -1097,13 +1062,11 @@ c4 c d8 d d f4 g4.
 d4 e d c
 @end lilypond
 
-
 @predefined
 @code{\cadenzaOn},
 @code{\cadenzaOff}.
 @endpredefined
 
-
 @seealso
 Glossar:
 @rglos{cadenza}.
@@ -1114,7 +1077,6 @@ Glossar:
 Schnipsel:
 @rlsr{Rhythms}.
 
-
 @knownissues
 
 LilyPond fügt Zeilen- und Seitenumbrüche nur an einer Taktlinie 
@@ -1138,17 +1100,19 @@ einfügen, um anzuzeigen, wo umgebrochen werden darf.
 @cindex Metrum, polymetrisch
 @cindex Unterteilte Taktarten
 
-Polymetrische Notation ist unterstützt, entweder direkt oder
-mit einem Textbeschriftungs-Trick.
+Polymetrische Notation ist unterstützt, entweder direkt, oder
+indem man das sichtbare Taktart-Symbol verändert und zusätzlich
+die Notendauern skaliert.
 
-@strong{Systeme mit unterschiedlichen Taktarten, gleiche
-Taktlänge}
+@strong{@i{Systeme mit unterschiedlichen Taktarten, gleiche
+Taktlänge}}
 
 Diese Art der Notation kann erstellt werden, indem für jedes
 System eine identische Taktart eingestellt wird, aber manuell
 für jeden Takt durch Einstellung von @code{timeSignatureFraction}
 auf den gewünschten Bruch geändert und dann die Länge der
-Noten entsprechenden skaliert wird.  Letzteres geschieht mit dem Befehl
+Noten entsprechenden skaliert wird, siehe auch @ref{Time signature}.
+Die Skalierung geschieht mit dem Befehl
 @code{\scaleDurations}, der auf ähnliche Weise wie @code{\times}
 benutzt wird, aber keine Klammer über den Noten ausgibt. Siehe
 auch @ref{Scaling durations}.
@@ -1157,10 +1121,12 @@ In diesem Beispiel werden Noten mit den Taktarten 3/4, 9/8 und
 10/8 parallel benutzt.  Im zweiten System werden die gezeigten
 Dauern mit 2/3 multipliziert, da 2/3x9/8=3/4, und im dritten
 System werden die gezeigten Dauern mit 3/5 multipliziert, da
-3/5x10/8=3/4.
+3/5x10/8=3/4.  Oft wird es nötig sein, Balken manuell zu setzen,
+weil die Skalierung sich auch auf die automatische Bebalkung
+auswirkt.
 
 @lilypond[quote,verbatim,fragment]
-\relative c' <<
+\relative c' <<
   \new Staff {
     \time 3/4
     c4 c c |
@@ -1170,7 +1136,7 @@ System werden die gezeigten Dauern mit 3/5 multipliziert, da
     \time 3/4
     \set Staff.timeSignatureFraction = #'(9 . 8)
     \scaleDurations #'(2 . 3)
-      \repeat unfold 6 { c8[ c c] }
+    \repeat unfold 6 { c8[ c c] }
   }
   \new Staff {
     \time 3/4
@@ -1178,17 +1144,18 @@ System werden die gezeigten Dauern mit 3/5 multipliziert, da
     \scaleDurations #'(3 . 5) {
       \repeat unfold 2 { c8[ c c] }
       \repeat unfold 2 { c8[ c] } |
-      c4. c4. \times 2/3 { c8 c c } c4
+      c4. c4. \times 2/3 { c8[ c c] } c4
     }
   }
->> }
+>>
 @end lilypond
 
-@strong{Systeme mit unterschiedlichen Taktarten, unterschiedliche
-Taktlänge}
+@strong{@i{Systeme mit unterschiedlichen Taktarten, unterschiedliche
+Taktlänge}}
 
 Jedes System kann auch eine eigene unabhängige Taktart erhalten.
-Dazu muss der @code{Timing_translator} in den @code{Staff}-Kontext
+Dazu muss der @code{Timing_translator} und der
+@code{Default_bar_line_engraver} in den @code{Staff}-Kontext
 verschoben werden.
 
 @lilypond[quote,verbatim]
@@ -1242,17 +1209,18 @@ Glossar:
 @rglos{meter}.
 
 Notationreferenz:
-@ref{Scaling durations}
+@ref{Time signature},
+@ref{Scaling durations}.
 
 Schnipsel:
 @rlsr{Rhythms}.
 
-Referenz der Interna:
+Referenz der Intera:
 @rinternals{TimeSignature},
 @rinternals{Timing_translator},
+@rinternals{Default_bar_line_engraver},
 @rinternals{Staff}.
 
-
 @knownissues
 
 Wenn unterschiedliche Taktarten paralell benutzt werden, werden
@@ -1263,7 +1231,6 @@ gesetzt werden, wie es ohne unterschiedliche Taktarten der
 Fall wäre.
 
 
-
 @node Automatic note splitting
 @unnumberedsubsubsec Automatic note splitting
 
@@ -1294,7 +1261,6 @@ Partituren auf Fehler überprüfen möchte: Wenn die Takte nicht
 vollständig gefüllt sind, zeigt die Überbindung genau an, wie viele 
 Notenwerte noch in dem jeweiligen Takt fehlen.
 
-
 @seealso
 Glossar: @rglos{tie}
 
@@ -1310,7 +1276,6 @@ Referenz der Interna:
 @rinternals{Completion_heads_engraver},
 @rinternals{Forbid_line_break_engraver}.
 
-
 @knownissues
 
 Nicht alle Notenwerte (besonders wenn sie andere rhythmische 
@@ -1322,7 +1287,6 @@ trotzdem keine Triolen etc.
 Pausen werden nicht aufgeteilt.
 
 
-
 @node Showing melody rhythms
 @unnumberedsubsubsec Showing melody rhythms
 
@@ -1375,19 +1339,16 @@ eingeschaltet wird mit @code{\improvisationOn}.
 >>
 @end lilypond
 
-
 @predefined
 @code{\improvisationOn},
 @code{\improvisationOff}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {guitar-strum-rhythms.ly}
 
-
 @seealso
 Schnipsel:
 @rlsr{Rhythms}.
@@ -1397,6 +1358,7 @@ Referenz der Interna:
 @rinternals{Pitch_squash_engraver}.
 
 
+
 @node Beams
 @subsection Beams
 
@@ -1427,7 +1389,8 @@ die Balken auch explizit eingegeben werden, siehe
 Balkenmuster, die sich vom Standard unterscheiden, definiert werden.
 Die Standard-Regeln für die gebräuchlichsten Taktarten sind
 in der Datei @file{scm/@/auto@/-beam@/.scm} definiert.  Wenn
-dort keine Balkenregeln für die aktuelle Taktart vorhanden
+dort keine Balkenregeln für die bestimmte Balkendauer in der
+aktuellen Taktart vorhanden
 sind, wird die Bebalkung geregelt von drei Kontexteigenschaften:
 @code{measureLength}, @code{beatLength} und @code{beatGrouping}.
 Sowohl die Balkenregeln als auch diese Kontexteigenschaften
@@ -1454,13 +1417,11 @@ c4 c8 c8. c16 c8.
 c16 c8
 @end lilypond
 
-
 @predefined
 @code{\autoBeamOff},
 @code{\autoBeamOn}.
 @endpredefined
 
-
 @snippets
 
 @funindex breakable
@@ -1477,14 +1438,13 @@ c16 c8
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {changing-beam-knee-gap.ly}
 
-
 @seealso
 Notationsreferenz:
 @ref{Manual beams},
 @ref{Setting automatic beam behavior}.
 
 Installierte Dateien:
-@file{scm/auto-beam.scm}.
+@file{scm/@/auto@/-beam@/.scm}.
 
 Schnipsel:
 @rlsr{Rhythms}.
@@ -1527,16 +1487,19 @@ verändern.  Mit der ersten Art verändert man Gruppen von
 Noten, die einer bestimmten Taktart entsprechend mit Balken
 versehen werden.  Das muss manuell getan werden für die Taktarten,
 für welche keine fertigen Regeln definiert worden sind.  Die
-zweite Methode verändert die Endpunkte der Balken und muss
+zweite Methode verändert die Definitionen für die Endpunkte
+der Balken und kann für jede Taktart eingesetzt werden.  Diese
+zweite Methode @strong{muss}
 eingesetzt werden für die Taktarten, für welche schon Regeln
-definiert worden sind.  Regeln sind definiert für die Taktarten
-3/2, 3/4, 4/4, 2/4, 4/8, 4/16, 6/8, 9/8 und 12/8.
+definiert worden sind, es sei denn, alle Regeln wurden mit
+@code{revert} rückgängig gemacht.  Regeln sind definiert für
+die Taktarten 3/2, 3/4, 4/4, 2/4, 4/8, 4/16, 6/8, 9/8 und 12/8.
 
 @i{@strong{Die Gruppierung von Noten verändern}}
 
 Wenn keine Regeln für die Beendung von Balken für die aktuelle
-Taktart vorhanden sind, wird die Bebalkung von drei 
-Kontext-Eigenschaften kontrolliert:
+Balkendauer in der benutzen Taktart vorhanden sind, wird die
+Bebalkung von drei Kontext-Eigenschaften kontrolliert:
 @code{measureLength}, @code{beatLength} und @code{beatGrouping}.
 Diese Eigenschaften können in den @code{Score}, @code{Staff} oder
 @code{Voice}-Kontexten gesetzt werden, um ihre Wirkungsweise zu
@@ -1560,13 +1523,25 @@ benutzt, um die Endpunkte der Balken zu bestimmen.
 
 @end itemize
 
-Standardmäßig werden diese Eigenschaften durch die Taktart bestimmt,
-die mit @code{\time} gesetzt wurde.  Die @code{measureLength}
-(Taktlänge) hat standardmäßig genau die gleiche Länge wie die
-Taktlänge, die durch @code{\time} bestimmt wurde, und der
-Standardwert für @code{beatLength} (Schlag-Länge) wird durch
+@warning{Diese drei Eigenschaften werden für einen bestimmten
+Balken @strong{nur dann} aktiv, wenn für diese Balkendauer keine
+Beendungsregeln für die benutzte Taktart definiert sind, oder
+wenn alle diese Regeln mit @code{revert} rückgängig gemacht
+wurden.}
+
+Standardmäßig werden @code{measureLength}
+(Taktlänge) und @code{beatLength} von der Taktart entnommen, die
+mit @code{\time} gesetzt wurde. @code{measureLength} hat
+standardmäßig genau die gleiche Länge wie die Taktlänge und der
+Standardwert für @code{beatLength} (Taktzeit-Länge) wird durch
 den Nenner des Taktart-Bruches bestimmt.
 
+Der Standardwert von @code{beatGrouping} wird aus einer Tabelle
+in der Datei @file{scm/@/music@/-functions@/.scm} entnommen.  Um
+sie zu finden, siehe @rlearning{Other sources of information}.
+Hier werden Taktzeiten-Gruppen für die Taktarten 5/8, 6/8, 8/8,
+9/8 und 12/8 definiert.
+
 Sowohl @code{measureLength} als auch @code{beatLength} sind
 @i{Momente}, Einheiten musikalischer Dauer.  Eine Größe der
 Art @i{Moment} wird durch die Scheme-Funktion
@@ -1581,60 +1556,11 @@ von Zählzeiten für jede Gruppe darstellen.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {grouping-beats.ly}
 
-@c TODO Convert to snippet called "Specifying context with beatGrouping"
-
-By specifying the context, the effect of @code{beatGrouping} can be
-limited to the context specified, and values set in higher-level
-contexts overridden:
-
-@lilypond[quote,verbatim]
-\score {
-  \new Staff <<
-    \time 7/8
-    \new Voice {
-      \relative c'' {
-        \set Staff.beatGrouping = #'(2 3 2)
-        a8 a a a a a a
-      }
-    }
-    \new Voice {
-      \relative c' {
-        \voiceTwo
-        \set Voice.beatGrouping = #'(1 3 3)
-        f8 f f f f f f
-      }
-    }
-  >>
-}
-@end lilypond
-
-
-@c TODO Send as snippet?
-
-The property @code{measureLength} determines where bar lines
-should be inserted and, with @code{beatLength} and
-@code{beatGrouping}, how automatic beams should be generated
-for time signatures for which no beam end rules are defined.
-
-@lilypond[quote,verbatim,relative=2]
-\time 3/4 % auto beam on 1/4 note groups
-a16 a a a a a a a a a a a a a a a
-\time 12/16 % no defined auto-beaming for this time sig
-a16 a a a a a a a a a a a a a a a
-\time 3/4
-a16 a a a a a a a a a a a a a a a
-\set Score.timeSignatureFraction = #'(12 . 16) %keep 3/4 beaming
-                                             % due to beatLength
-a16 a a a a a a a a a a a a a a a
-\set Score.beatLength = #(ly:make-moment 1 8) %beam on 1/8 notes
-a16 a a a a a a a a a a a a a a a
-\set Score.beatLength = #(ly:make-moment 1 16)
-\set Score.beatGrouping = #'(3 4 2 3) %beam on 3/16, 7/16, 9/16, 12/16
-a16 a a a a a a a a a a a a a a a
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{specifying-context-with-beatgrouping.ly}
 
-@c End of snippet
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{using-beatlength-and-beatgrouping.ly}
 
 @funindex subdivideBeams
 
@@ -1652,24 +1578,22 @@ a16 a a a a a a a a a a a a a a a
 
 @strong{@i{Die Endpunkte von Balken bestimmen}}
 
-In normalen Taktarten können automatisch gesetzte Balken an jeder
+In üblichen Taktarten können automatisch gesetzte Balken an jeder
 Note beginnen, aber nur an einigen bestimmten Positionen innerhalb
 des Taktes beendet werden.  Diese Positionen werden durch die
 Eigenschaften in @code{autoBeamSettings} bestimmt.  Sie bestehen
 aus einer Liste an Regeln, die bestimmen, wo Balken enden können.
 Die Standardeinstellungen dieser automatischen Einstellungen 
-befinden sich in der Datei @file{scm/@/auto@/-beam@/.scm}.
+befinden sich in der Datei @file{scm/@/auto@/-beam@/.scm}.  Um diese
+Datei zu finden, siehe @rlearning{Other sources of information}.
 
 Diese Methode @strong{muss} benutzt werden, wenn die Einstellungen
-für die Balken in üblichen Taktarten verändert werden sollen, und
-sie ist auch in vielen anderen Taktarten gut anzuwenden, wenn
-die Taktart sich oft ändert.  Weil die Regeln so formuliert werden
-können, dass sie sich auf eine bestimmte Taktart beziehen, müssen
-sie nur einmal für jede Taktart definiert werden.  Wenn man das
-selbe Ergebnis zu erreichen versucht, indem man die Zählzeiten
-gruppiert, müsste man einen @code{\set}-Befehl nach jedem
-Taktwechsel benutzen, wenn nicht die Standardwerte für die
-Taktart passend sind.
+für die Balken in Taktarten verändert werden sollen, für welche
+schon Regeln existieren, es sei denn, alle diese Regeln wurden
+rückgängig gemacht. Die Methode ist auch in vielen anderen
+Taktarten gut anzuwenden, wenn die Taktart sich oft ändert, oder
+wenn die Balken unterschiedlich für unterschiedliche Balkendauern
+gesetzt werden sollen.
 
 Um eine neue Regel zu der Liste hinzuzufügen, muss folgende
 Syntax verwendet werden:
@@ -1776,9 +1700,6 @@ angewendet werden sollen:
 << {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >>
 @end lilypond
 
-@c TODO Add example using Score for multiple staves?
-@c Hmm.  Not sure it works correctly.  Needs more investigation.
-
 @warning{Wenn eine unerwartete Bebalkung auftritt, schauen Sie
 zuerste die Balkeneinstellungen in @file{scm/@/auto@/-beam@/.scm} 
 nach, ob sich hier Überschneidungen ergeben, weil die
@@ -1831,32 +1752,11 @@ a a a a
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {beam-grouping-in-7-8-time.ly}
 
-
-@ignore
-@c   Seems like setting beam starting points is no longer
-@c   necessary, and/or has no effect.  Remove mention?
-
-The same syntax can be used to specify beam starting points.
-
-@c TODO Does this example add anything?
-
-In this
-example, automatic beams can only end on a dotted quarter note
-@example
-#(override-auto-beam-setting '(end * * * *) 3 8)
-#(override-auto-beam-setting '(end * * * *) 1 2)
-#(override-auto-beam-setting '(end * * * *) 7 8)
-@end example
-
-In 4/4 time signature, this means that automatic beams could end only on
-3/8 and on the fourth beat of the measure (after 3/4, that is 2 times
-3/8, has passed within the measure).
-
-@end ignore
-
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {reverting-default-beam-endings.ly}
 
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{beam-endings-in-score-context.ly}
 
 @predefined
 @funindex \autoBeamOff
@@ -1865,7 +1765,6 @@ In 4/4 time signature, this means that automatic beams could end only on
 @code{\autoBeamOn}.
 @endpredefined
 
-
 @knownissues
 
 Wenn eine Partitur aufhört, während ein automatischer Balken noch
@@ -1875,7 +1774,6 @@ Stimmen, die mit @code{<< @dots{} \\ @dots{} >>} gesetzt wurden.
 Wenn eine polyphone Stimme endet, während ein Balken noch Noten
 erwartet, wird dieser Balken nicht gesetzt.
 
-
 @seealso
 Schnipsel:
 @rlsr{Rhythms}.
@@ -1933,6 +1831,10 @@ f
 g a]
 @end lilypond
 
+@snippets
+
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{flat-flags-and-beam-nibs.ly}
 
 
 @node Feathered beams
@@ -1992,12 +1894,13 @@ Der @code{\featherDurations}-Befehl funktioniert nur mit kurzen
 Notenabschnitten, und wenn die Zahlen in den Brüchen klein
 sind.
 
-
 @seealso
 Snippets:
 @rlsr{Rhythms}.
 
 
+
+
 @node Bars
 @subsection Bars
 
@@ -2147,7 +2050,6 @@ Die automatische erzeugte Taktlinie ist @code{"|"}.  Das kann
 jederzeit durch den Befehl @code{\set Timing.defaultBarType = }
 @var{Takstrichart} geändert werden.
 
-
 @seealso
 Notationsreferenz:
 @ref{Line breaking},
@@ -2164,6 +2066,7 @@ staves), @rinternals{Timing_translator} (for Timing
 properties).
 
 
+
 @node Bar numbers
 @unnumberedsubsubsec Bar numbers
 
@@ -2232,10 +2135,11 @@ c c c c c
 @cindex Taktnummer, Form
 @cindex Aussehen von Taktnummern
 
-The size of the bar number may be changed.  This is illustrated
-in the following example, which also shows how to enclose bar
-numbers in boxes and circles, and shows an alternative way
-of specifying @code{#(#f #t #t)} for @code{break-visibility}.
+Die Größe der Taktnummer kann geändert werden.  Das wird im folgenden
+Beispiel gezeigt, welches auch illustriert, wie man Taktnummern
+in Kästen oder Kreise einfasst und eine Alternative zeigt,
+wie man @code{#(#f #t #t)} für @code{break-visibility} definieren
+kann.
 
 @lilypond[verbatim,quote,relative=1]
 % Prevent bar numbers at the end of a line and permit them elsewhere
@@ -2260,11 +2164,11 @@ of specifying @code{#(#f #t #t)} for @code{break-visibility}.
 @cindex Ausrichtung von Taktlinien
 @cindex Taktlinien, Ausrichtung
 
-Bar numbers by default are left-aligned to their parent object.
-This is usually the left edge of a line or, if numbers are printed
-within a line, the left bar line of the measure.  The numbers may also
-be positioned directly on the bar line or right-aligned to the
-bar line:
+Taktnummern sind standardmäßig links von ihrem Anker angeordnet.
+Der Anker ist meistens das linke Ende einer Zeile, oder, wenn die
+Zahlen innerhalb der Zeile gesetzt werden, die linke Taktlinie
+eines Taktes.  Die Nummern können auch direkt auf der Taktlinie
+positioniert oder rechts davon gesetzt werden:
 
 @lilypond[verbatim,quote,relative=1]
 \set Score.currentBarNumber = #111
@@ -2282,8 +2186,8 @@ c1 c1
 c1 c1
 @end lilypond
 
-Bar numbers can be removed entirely by removing the
-@code{Bar_number_engraver} from the @code{Score} context.
+Taktnummern können vollständig entfernt werden, indem man den
+@code{Bar_number_engraver} aus dem @code{Score}-Kontext entfernt.
 
 @lilypond[verbatim,quote]
 \layout {
@@ -2306,7 +2210,6 @@ Schnipsel:
 Referenz der Interna:
 @rinternals{BarNumber}.
 
-
 @knownissues
 
 Taktnummern können mit der oberen Ecke der Klammer zu Beginn des
@@ -2518,7 +2421,6 @@ mit dem Befehl @code{\musicglyph} ausgegeben werden können.
 sich in
 @ref{Formatting text}.
 
-
 @seealso
 Notationsreferenz:
 @ref{The Feta font},
@@ -2537,6 +2439,7 @@ Referenz der Interna:
 @rinternals{RehearsalMark}.
 
 
+
 @node Special rhythmic concerns
 @subsection Special rhythmic concerns
 
@@ -2746,6 +2649,7 @@ Hauptnote und Verzierung auf verschiedenen Systemen gesetzt.
 Ein Vorschlag (@emph{acciaccatura}) mit mehreren Noten und 
 Balken wird ohne den Schrägstrich gesetzt und sieht einem
 Vorhalt (@emph{appoggiatura}) sehr ähnlich.
+
 @c TODO Add link to LSR snippet to add slash when available
 
 Die Synchronisation von Verzierungen kann auch zu Überraschungen führen. 
@@ -2812,7 +2716,6 @@ MyCadenza = \relative c' {
 >>
 @end lilypond
 
-
 @seealso
 Glossar:
 @rglos{cadenza}.
@@ -2821,6 +2724,7 @@ Schnipsel:
 @rlsr{Rhythms}.
 
 
+
 @node Time administration
 @unnumberedsubsubsec Time administration
 
index 46086d6f1fd060aa637f586e02baed0bf6412421..b2185de99e5f1e5f5914f96df4d2a2030de7b67a 100644 (file)
@@ -1,13 +1,15 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: 317e451cbe00c0fa25e177976327e260f3dc6539
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c Translators: Reinhold Kainhofer
+@c \version "2.11.61"
+
+@c Translators: Reinhold Kainhofer, Till Rettig
 
 @node Running LilyPond
 @chapter Running LilyPond
@@ -43,7 +45,7 @@ Unter @q{Kommandozeile} verstehen wir die Kommandozeile des jeweiligen
 Betriebssystems. Windows Benutzern ist sie vielleicht eher unter den
 englischen Begriffen @q{DOS shell} oder @q{command shell} bekannt.
 MacOS@tie{}X Benutzer kennen sie eher unter @q{Terminal} oder @q{Konsole}.
-Sie sollten auch den Abschnitt @ref{MacOS X on the command-line} konsultieren.
+Sie sollten auch den Abschnitt @ref{Setup for MacOS X} konsultieren.
 
 Wie die Kommandozeile im jeweiligen Betriebssystem benutzt werden kann,
 soll in diesem Handbuch nicht näher beschrieben werden. Sehen Sie bitte
@@ -53,15 +55,15 @@ Internet, wenn Sie mit der Kommandozeile nicht vertraut sind.
 
 @menu
 * Invoking lilypond::
-* Command line options::
+* Command line options for lilypond::
 * Environment variables::
 @end menu
 
 @node Invoking lilypond
-@subsection Invoking lilypond
+@subsection Invoking @command{lilypond}
 
-@cindex LilyPond aufrufen
-@cindex Kommandozeilen-Optionen
+@cindex @command{lilypond} aufrufen
+@cindex Kommandozeilen-Optionen für @command{lilypond}
 @cindex Optionen an der Kommandozeile
 
 Das @command{lilypond} Programm kann folgendermaßen von der Kommandozeile
@@ -104,8 +106,8 @@ erzeugt daher die Dateien @var{Dateiname}@file{-Geige.pdf} und
 
 
 
-@node Command line options
-@subsection Command line options
+@node Command line options for lilypond
+@subsection Command line options for @command{lilypond}
 
 Die folgenden Kommandozeilenoptionen werden von @command{lilypond} unterstützt:
 
@@ -232,34 +234,37 @@ verarbeitet werden kann, um eine @code{.textmetrics}-Datei mit den Textweiten
 zu erstellen. @strong{Achtung:} Diese Funktionalität ist momentan nicht 
 verfügbar, da der Quellcode stark umstrukturiert wurde.
 @item ps
- PostScript-Ausgabeformat.
+PostScript-Ausgabeformat.
+
 @cindex PostScript Ausgabeformat
 
-  Postscript-Dateien enthalten auch TTF-, Type1- und OTF-Schriften. Allerdings 
-  wird die gesamte Schriftart eingefügt und nicht nur die benötigten Zeichen.
-  Vor allem wenn nicht-westliche Zeichensätze benutzt werden, kann dies zu sehr
-  großen Dateien führen.
+Postscript-Dateien enthalten auch TTF-, Type1- und OTF-Schriften. Allerdings 
+wird die gesamte Schriftart eingefügt und nicht nur die benötigten Zeichen.
+Vor allem wenn nicht-westliche Zeichensätze benutzt werden, kann dies zu sehr
+großen Dateien führen.
 
 @item eps
- Erzeugt @q{encapsulated PostScript} (EPS). Jede Seite (oder jedes System) wird
- als eigene @file{EPS}-Datei ausgegeben, inklusive Schriftarten. Außerdem wird
- eine Datei mit allen Seiten (bzw. Systemen) und Schriftarten erzeugt.
+Erzeugt @q{encapsulated PostScript} (EPS). Jede Seite (oder jedes System) wird
+als eigene @file{EPS}-Datei ausgegeben, inklusive Schriftarten. Außerdem wird
+eine Datei mit allen Seiten (bzw. Systemen) und Schriftarten erzeugt.
 
 Dies ist die Standardeinstellung von @command{lilypond-book}.
 
 @item svg
- SVG-Ausgabe (Scalable Vector Graphics). Jede Seite wird als eigene 
- @file{SVG}-Datei ausgegeben, inklusive eingebetteten Schriftarten.
+SVG-Ausgabe (Scalable Vector Graphics). Jede Seite wird als eigene 
+@file{SVG}-Datei ausgegeben, inklusive eingebetteten Schriftarten.
 @cindex SVG (Scalable Vector Graphics)
-  Sie benötigen einen SVG-Betrachter, der eingebettete Schriftarten unterstützt,
-  oder einen SVG-Betrachter, der eingebettete Schriftarten durch OTF-Schriften
-  ersetzen kann. In UNIX und Linux kann z.B. @uref{http://www.inkscape.org,Inkscape}
-  (ab Version 0.42) benutzt werden, nachdem die OTF-Schriften aus dem 
-  LilyPond-Verzeichnis (typischerweise @file{/usr/share/lilypond/VERSION/fonts/otf/})
-  in das Verzeichnis @file{~/.fonts/} kopiert wurden.
+Sie benötigen einen SVG-Betrachter, der eingebettete Schriftarten unterstützt,
+oder einen SVG-Betrachter, der eingebettete Schriftarten durch OTF-Schriften
+ersetzen kann. In UNIX und Linux kann z.B. @uref{http://www.inkscape.org,Inkscape}
+(ab Version 0.42) benutzt werden, nachdem die OTF-Schriften aus dem 
+LilyPond-Verzeichnis (typischerweise @file{/usr/share/lilypond/VERSION/fonts/otf/})
+in das Verzeichnis @file{~/.fonts/} kopiert wurden.
+
 @item scm
- Gibt die rohen Scheme-basierenden Zeichenbefehle aus, wie sie intern von 
-  LilyPond benutzt werden.
+gibt die rohen Scheme-basierenden Zeichenbefehle aus, wie sie intern von 
+LilyPond benutzt werden.
+
 @cindex Scheme dump
 @end table
 
@@ -504,20 +509,174 @@ oberhalb der angegebenen Stelle genauer unter die Lupe nehmen.
 
 
 @node Updating files with convert-ly
-@section Updating with @command{convert-ly}
+@section Updating files with @command{convert-ly}
+
+@cindex Aktualisierung von LilyPond-Dateien
+@cindex Aktualisierung mit convert-ly
+@cindex convert-ly: Aktualisierung
+
+Die Eingabesyntax von LilyPond ändert sich graduell um etwa die
+Eingabe zu erleichtern oder neue Funktionen zu ermöglichen.  Ein
+Nebeneffekt hiervon ist, dass das LilyPond-Übersetzerprogramm nicht
+mehr mit älteren Eingabedateien kompatibel sein kann.  Um dies
+zu umgehen, kann @command{convert-ly} benutzt werden, welches die
+meisten der Syntaxänderungen korrigieren kann.
+
+Das Programm benötigt eine @code{\version}-Information in der
+Eingabedatei, um zu wissen, von welcher Version konvertiert werden
+soll.  In den meisten Fällen genügt es, den Befehl
+
+@example
+convert-ly -e meineDatei.ly
+@end example
+
+@noindent
+auszuführen.
+@c MacOS@tie{}X-Benutzer können diesen Befehl im Menu unter
+@c @code{Compile > Update syntax} finden.
+@c Does it work? TR
 
-@untranslated
+Wenn keine Veränderungen in @code{meineDatei.ly} vorgenommen wurden
+und eine Datei @code{meineDatei.ly.NEW} erstellt wird, it
+@code{meineDatei.ly} schon aktuell.
 
 
-@subsection Command line options
 @menu
+* Command line options for convert-ly::
 * Problems with convert-ly::
 @end menu
 
+@node Command line options for convert-ly
+@subsection Command line options for @command{convert-ly}
+
+@command{convert-ly} konvertiert immer bis zur letzten Syntaxänderung,
+die es beherrscht.  Das heißt, dass die neue @code{version}-Nummer
+in der Datei überlicherweise etwas niedriger ist als die
+Version von @command{convert-ly}.
+
+Um LilyPond-Fragmente in texinfo-Dateien zu aktualisieren, gilt
+der Befehl:
+
+@example
+convert-ly --from=... --to=... --no-version *.itely
+@end example
+
+Um die Änderungen der LilyPond-Syntax zwischen bestimmten Versionen
+zu sehen, kann der Befehl
+
+@example
+convert-ly --from=... --to=... -s
+@end example
+
+@noindent
+benutzt werden.
+
+Viele Dateien können auf einmal aktualisiert werden, indem
+@code{convert-ly} mit den üblichen UNIX-Befehlen kombiniert
+wird.  Das folgende Beispiel aktualisiert alle @code{.ly}-Dateien
+im aktuellen Verzeichnis:
+
+@example
+for f in *.ly; do convert-ly -e $f; done;
+@end example
+
+Die allgemeine Syntax des Programms lautet:
+
+@example
+convert-ly [@var{option}]@dots{} @var{file}@dots{}
+@end example
+
+Folgende Optionen sind möglich:
+
+@table @code
+@item -e,--edit
+Verändere die entsprechende Zeile der Eingabedatei. Überschreibt
+@code{--output}.
+
+@item -f,--from=@var{von-Versionsnummer}
+Setze die Version, ab welcher konvertiert werden soll.  Wenn diese
+Option nicht gesetzt ist, versucht @command{convert-ly}, die
+Version auf Grundlage von @code{\version} zu raten.
+
+@item -n,--no-version
+Normalerweise fügt @command{convert-ly} eine @code{\version}-Zeile
+zur Ausgabe hinzu.  Mit dieser Option kann das unterdrückt werden.
+
+@item -s, --show-rules
+Zeige alle bekannten Konversionsregeln und beende.
+
+@item --to=@var{bis-Versionsnummer}
+Hiermit kann das Ziel der Konversion gesetzt werden.  Standard ist
+die neueste mögliche Version.
+
+@item -h, --help
+Benutzerhilfe ausgeben.
+@end table
+
+
 @node Problems with convert-ly
 @subsection Problems with @code{convert-ly}
 
-@untranslated
+Nicht alle Änderungen der Syntax können konvertiert werden.  Nur
+eine Ausgabeoption kann angegeben werden.  Scheme- und
+LilyPond-Scheme-Code wird sehr unwahrscheinlich korrekt aktualisiert,
+hier ist meistens Nacharbeit erforderlich.
+
+@verbatim
+Hier eine Liste einiger Befehle, die convert-ly nicht konvertieren kann.
+
+Diese Liste ist in Form von Fehlermeldungen, denn convert-ly
+ist so strukturiert, dass nicht alle benötigten Änderungen
+implementiert werden können.  Es handelt sich also eher um eine
+Wunschliste zur Referenz.
+
+1.6->2.0:
+ Bezifferter Bass wird nicht immer korrekt konvertiert, besonders
+ Befehle wie {< >}.  Mats Kommentar hierzu:
+    Um convert-ly korrekt ausführen zu können, müssen alle Vorkommen
+    von '{<' in etwas beliebiges wie '{#' und genauso '>}' in '&}'
+    geändert werden.  Nach der Konversion können sie dann zurück
+    in '{ <' und '> }' verwandelt werden
+ Nicht alle Textbeschriftungen werden richtig konvertiert.  In der
+ alten Syntax  konnten Beschriftungsbefehle mit Klammern gruppiert
+ werden, etwa
+   -#'((bold italic) "string")
+   This will incorrectly be converted into
+   -\markup{{\bold italic} "string"}
+   instead of the correct
+   -\markup{\bold \italic "string"}
+2.0->2.2:
+ \partcombine wird nicht konvertiert
+ \addlyrics => \lyricsto wird nicht konvertiert, dadurch kompilieren
+ manche Dateien mit mehreren Strophen nicht.
+2.0->2.4:
+ \magnify wird nicht nach \fontsize konvertiert.
+    - \magnify #m => \fontsize #f, where f = 6ln(m)/ln(2)
+ remove-tag wird nicht verändert.
+    - \applyMusic #(remove-tag '. . .) => \keepWithTag #'. . .
+ first-page-number wird nicht geändert.
+    - first-page-number no => print-first-page-number = ##f
+ Zeilenumbrüche im \header-Feld werde nicht konvertiert.
+    - \\\\  als Zeilenumbruch in \header{...} => \markup \center-align <
+      "First Line" "Second Line" >
+ Crescendo- und Decrescendo-Enden werden nicht konvertiert.
+    - \rced => \!
+    - \rc => \!
+2.2->2.4:
+ \turnOff (in \set Staff.VoltaBracket = \turnOff eingesetzt) wird nicht korrekt behandelt.
+2.4.2->2.5.9
+ \markup{ \center-align <{ ... }> } sollte umgewandelt werden in:
+ \markup{ \center-align {\line { ... }} }
+ aber im Moment fehlt \line.
+2.4->2.6
+ Besondere LaTeX-Zeichen wie $~$ im Text werden nicht nach UTF(
+ konvertiert.
+2.8
+ \score{} muss jetzt mit einem musikalischen Ausdruck beginnen.
+ Alles andere (insbesondere \header{}) darf erst nach den Noten
+ kommen.
+@end verbatim
+
 
 
 @node Reporting bugs
index 46a6cb72b38613685603ed312e9b683d68e38cfe..5dbc8a1b3354c2d9305771652e508ae9843c9418 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: cdb8fdf689c58f742333f4bf4f92cbfae2e01a5b
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -20,9 +20,9 @@ Kapitel kann als Referenz betrachtet werden, lesen Sie einen Abschnitt nur,
 wenn er auf Sie zutrifft.
 
 @menu
-* Setup for specific Operating Systems::  
-* Text editor support::         
-* Point and click::             
+* Setup for specific Operating Systems::
+* Text editor support::
+* Point and click::
 @end menu
 
 
@@ -32,15 +32,39 @@ wenn er auf Sie zutrifft.
 Dieser Abschnitt erklärt zusätzliche Einstellungen für bestimmte Betriebssysteme.
 
 @menu
-* MacOS X on the command-line::  
+* Setup for MacOS X::
 @end menu
 
+@node Setup for MacOS X
+@subsection Setup for MacOS X
 
-@node MacOS X on the command-line
-@subsection MacOS X on the command-line
+@subsubheading Using Python scripts on MacOS 10.3 or 10.4
 
-Die Skripte (wie lilypond-book, convert-ly, abc2ly und sogar
-lilypond selber) sind innerhalb der .app-Datei für MacOS@tie{}X enthalten. Sie können 
+Das LilyPond-Programmpaket für MacOS X stellt Python nicht zur
+Verfügung, aber Python 2.4 oder höher wird benötigt, um
+Skripte wie @command{convert-ly} zu benutzen.  Wenn Sie MaxOS
+10.3 oder 10.4 besitzen, müssen Sie eine neurere Python-Version
+von @uref{http://python.org/download/} installieren und dann
+die erste Zeile von @command{convert-ly} und @command{lilypond-book}
+auf folgende Weise ändern: Wenn sich das installierte Python-Programm
+in Ihrem @var{PFAD} befindet, muss die erste Zeile heißen:
+
+@example
+#!/usr/bin/env python
+@end example
+
+@noindent
+andernfalls muss sie heißen:
+
+@example
+#!@var{/path/to/newly_installed/python}
+@end example
+
+@subsubheading MacOS X on the command line
+
+Die Skripte (etwa @command{lilypond-book}, @command{convert-ly},
+@command{abc2ly} und sogar @command{lilypond}) befinden sich
+innerhalb der @code{.app}-Datei für MacOS@tie{}X.  Sie können 
 auf der Kommandozeile direkt aufgerufen werden, etwa
 
 @example
@@ -48,8 +72,8 @@ auf der Kommandozeile direkt aufgerufen werden, etwa
 @end example
 
 @noindent
-Entsprechend funktionieren auch die anderen Skripte wie lilypond-book, 
-convert-ly, abc2ly usw.
+Entsprechend funktionieren auch die anderen Skripte wie 
+@command{lilypond-book}, @command{convert-ly}, @command{abc2ly} usw.
 
 Sie können sich auch selber Skripte anlegen, die diesen Pfad automatisch 
 hinzufügen. Erstellen Sie ein Verzeichnis, indem die Skripte gespeichert werden:
@@ -104,12 +128,12 @@ Beachten Sie, dass @var{Pfad/zu} üblicherweise @code{/Applications/} ist.
 Verschiedene Texteditoren haben Unterstützung für LilyPond.
 
 @menu
-* Emacs mode::                  
-* Vim mode::                    
-* jEdit::                       
-* TexShop::                     
-* TextMate::                    
-* LilyKDE::                     
+* Emacs mode::
+* Vim mode::
+* jEdit::
+* TexShop::
+* TextMate::
+* LilyKDE::
 @end menu
 
 @node Emacs mode
index 2e396a48a0d05950d69898cd40cd687c9d32e901..6eac7df68acce028388650dfe27a53117b9d358f 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: acbcbe3683d629575967b972b64ca5e1589bf330
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -66,7 +66,6 @@ Tonhöhe des vorherigen Akkords.
 
 Mehr Information über Akkorden findet sich in @ref{Chord notation}.
 
-
 @seealso
 Musikglossar:
 @rglos{chord}.
@@ -80,7 +79,6 @@ Notationsreferenz:
 Schnipsel:
 @rlsr{Simultaneous notes}.
 
-
 @node Simultaneous expressions
 @unnumberedsubsubsec Simultaneous expressions
 
@@ -146,7 +144,6 @@ werden, sogar gleichzeitig.  In solchen Fällen wird nicht versucht,
 automatisch Zusammenstöße zwischen normalen Noten und Clustern
 aufzulösen.
 
-
 @seealso
 Musikglossar:
 @rglos{cluster}.
@@ -159,7 +156,6 @@ Referenz der Interna:
 @rinternals{ClusterSpannerBeacon},
 @rinternals{Cluster_spanner_engraver}.
 
-
 @knownissues
 
 Cluster sehen nur gut aus, wenn sie wenigstens über zwei Akkorde
@@ -344,7 +340,6 @@ umgeben werden:
 Mit dieser Methode können sich seltsame Balken und Warnungen
 ergeben, wenn die Musikausdrücke nicht den gleichen Rhythmus haben.
 
-
 @predefined
 @code{\voiceOne},
 @code{\voiceTwo},
@@ -353,7 +348,6 @@ ergeben, wenn die Musikausdrücke nicht den gleichen Rhythmus haben.
 @code{\oneVoice}.
 @endpredefined
 
-
 @seealso
 Handbuch zum Lernen:
 @rlearning{Voices contain music},
@@ -400,7 +394,6 @@ erkennbar zu sein:
 Der @code{\voiceNeutralstyle}-Befehl wird benutzt, um wieder
 die Standardausgabe einzuschalten.
 
-
 @predefined
 @code{\voiceOneStyle},
 @code{\voiceTwoStyle},
@@ -409,7 +402,6 @@ die Standardausgabe einzuschalten.
 @code{\voiceNeutralStyle}.
 @endpredefined
 
-
 @seealso
 Handbuch zum Lernen:
 @rlearning{I'm hearing Voices},
@@ -419,6 +411,7 @@ Schnipsel:
 @rlsr{Simultaneous notes}.
 
 
+
 @node Collision resolution
 @unnumberedsubsubsec Collision resolution
 
@@ -564,15 +557,13 @@ Richtungen zeigen (also etwa wie @code{Voice} 1 und 2).
 @code{\mergeDifferentlyDottedOn},
 @code{\mergeDifferentlyDottedOff},
 @code{\mergeDifferentlyHeadedOn},
-@code{\mergeDifferentlyHeadedOff}.
-
+@code{\mergeDifferentlyHeadedOff},
 @code{\shiftOn},
 @code{\shiftOnn},
 @code{\shiftOnnn},
 @code{\shiftOff}.
 @endpredefined
 
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -581,7 +572,6 @@ Richtungen zeigen (also etwa wie @code{Voice} 1 und 2).
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {forcing-horizontal-shift-of-notes.ly}
 
-
 @seealso
 Musikglossar:
 @rglos{polyphony}.
@@ -599,7 +589,6 @@ Referenz der Interna:
 @rinternals{NoteCollision},
 @rinternals{RestCollision}.
 
-
 @knownissues
 
 Wenn @code{\mergeDifferentlyHeadedOn} mit einer Achtel- oder
@@ -708,7 +697,6 @@ die Tonhöhen von @var{musikAusdr1} oder @var{musikAusdr2}.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {changing-partcombine-texts.ly}
 
-
 @seealso
 Musikglossar:
 @rglos{a due},
@@ -724,7 +712,6 @@ Referenz der Interna:
 @rinternals{PartCombineMusic},
 @rinternals{Voice}.
 
-
 @knownissues
 
 @code{\partcombine} kann nur zwei Stimmen bearbeiten.
@@ -868,7 +855,6 @@ global = {
 }
 @end lilypond
 
-
 @seealso
 Handbuch zum Lernen:
 @rlearning{Organizing pieces with variables}.
index 8cb497c90d3ad99a3ea3763478d28201dbb4e5c8..dc2324652e73d723d68c1a38c76a9e7a903439c2 100644 (file)
@@ -1,18 +1,18 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.11.65"
 
 @node Specialist notation
 @chapter Specialist notation
 
-This chapter explains how to create musical notation for specific
-types of instrument or in specific styles.
+Dieser Abschnitt erklärt, wie Notation erstellt wird, die nur für ein
+bestimmtes Instrument oder einen Stil eingesetzt wird.
 
 @menu
 * Vocal music::
index 80a15aae7c7b2f94196c1a0b3b9351743226371b..8edb6c378a520384f4d2b89ecf14437381c202ea 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -306,7 +306,7 @@ befindet.
 >>
 @end lilypond
 
-Neue innere Systemgruppen können definiert werden.  Zu Einzelheiten siehe
+Neue geschachtelte Systemgruppen können definiert werden.  Zu Einzelheiten siehe
 @ref{Defining new contexts}.
 
 
index f3e9f2db0e5cf73f4ed0e6e1263d50a4928a5ed2..2aa3644fc74338a13f0aaa4333e3546b92631a03 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -27,6 +27,13 @@ in anderen Abschnitten: @ref{Vocal music}, @ref{Titles and headers}.
 * Fonts::
 @end menu
 
+
+@node Writing text
+@subsection Writing text
+
+Dieser Abschnitt zeigt verschiedene Arten, wie Text in die Partitur
+eingefügt werden kann.
+
 @cindex Text, andere Sprachen
 
 @warning{Wenn man Zeichen mit Akzenten und Umlaute oder besondere
@@ -35,13 +42,6 @@ kann man die Zeichen einfach direkt in die Datei einfügen.  Die
 Datei muss als UTF-8 gespeichert werden.  Für mehr Information
 siehe @ref{Text encoding}.}
 
-
-@node Writing text
-@subsection Writing text
-
-Dieser Abschnitt zeigt verschiedene Arten, wie Text in die Partitur
-eingefügt werden kann.
-
 @menu
 * Text scripts::
 * Text spanners::
@@ -49,6 +49,7 @@ eingefügt werden kann.
 * Separate text::
 @end menu
 
+
 @node Text scripts
 @unnumberedsubsubsec Text scripts
 
@@ -62,8 +63,8 @@ zeigt.  Derartiger Text kann manuell über oder unter dem
 Notensystem platziert werden, die Syntax hierzu ist beschrieben
 in @ref{Direction and placement}.
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
-d8^"pizz." e f g a4-"scherz." f
+@lilypond[quote,verbatim,relative=2]
+d8^"pizz." g f e a4-"scherz." f
 @end lilypond
 
 Diese Syntax ist eine Kurzform, komplexere Formatierungen
@@ -72,8 +73,8 @@ explizit den @code{\markup}-Befehl mit darauf folgenden
 geschweiften Klammern einsetzt, wie beschrieben in
 @ref{Formatting text}.
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
-d8^\markup { \italic pizz. } e f g
+@lilypond[quote,verbatim,relative=2]
+a8^\markup { \italic pizz. } g f e
 a4_\markup { \tiny scherz. \bold molto } f
 @end lilypond
 
@@ -85,8 +86,8 @@ zweite die Note nach rechts verschiebt.  Das Verhalten wird mit
 dem Befehl @code{\textLengthOn} (Textlänge an) erreicht, rückgängig
 kann es mit dem Befehl @code{\textLengthOff} gemacht werden.
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
-d8^"pizz." e f g
+@lilypond[quote,verbatim,relative=2]
+a8^"pizz." g f e
 \textLengthOn
 a4_"scherzando" f
 @end lilypond
@@ -111,7 +112,6 @@ Schnipsel:
 Referenz der Interna:
 @rinternals{TextScript}.
 
-
 @knownissues
 
 Eine Überprüfung, ob sich auch alle Textbeschriftungen und Gesangstext
@@ -139,7 +139,7 @@ auswirkt.  Solche Objekte, @qq{Strecker} (engl. spanners) genannt,
 können von einer Note bis zu einer anderen mit folgender
 Anweisung erstellt werden:
 
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \override TextSpanner #'(bound-details left text) = "rit."
 b1\startTextSpan
 e,\stopTextSpan
@@ -151,7 +151,7 @@ Standardeinstellungen wird er kursiv ausgegeben, aber eine andere
 Formatierung kann erreicht werden, indem man @code{\markup}-Blöcke
 einsetzt, wie beschrieben in @ref{Formatting text}.
 
-@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
+@lilypond[quote,relative=2,verbatim]
 \override TextSpanner #'(bound-details left text) =
   \markup { \upright "rit." }
 b1\startTextSpan c
@@ -184,6 +184,7 @@ Referenz der Interna:
 @rinternals{TextSpanner}.
 
 
+
 @node Text marks
 @unnumberedsubsubsec Text marks
 
@@ -201,7 +202,7 @@ indem man die Syntax für Zeichen einsetzen, wie beschrieben in
 @c \mark needs to be placed on a separate line (it's not
 @c attached to an object like \markup is). -vv
 
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 c4
 \mark "Allegro"
 c c c
@@ -212,7 +213,7 @@ zu platzieren, weitere Formatierungsmöglichkeiten sind mit dem
 @code{\markup}-Befehl gegeben, wie beschrieben in 
 @ref{Formatting text}:
 
-@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
+@lilypond[fragment,quote,relative=1]
 <c e>1
 \mark \markup { \italic { colla parte } }
 <d f>2 <e g>
@@ -226,8 +227,8 @@ Symbol mit dem Befehl @code{\musicglyph} angegeben wird, wie
 beschrieben in
 @ref{Music notation inside markup}:
 
-@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
-<f bes>2 <d aes'>
+@lilypond[fragment,quote,relative=2]
+<bes f>2 <aes d>
 \mark \markup { \musicglyph #"scripts.ufermata" }
 <e g>1
 @end lilypond
@@ -239,7 +240,7 @@ Ende notiert werden, werden sie zwischen Noten oder über der
 Taktlinie gesetzt.  Wenn sie an einem Zeilenumbruch angegeben
 werden, wird das Zeichen zu Beginn der nächsten Zeile ausgegeben.
 
-@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
+@lilypond[fragment,quote,relative=2]
 \mark "Allegro"
 c1 c
 \mark "assai" \break
@@ -258,7 +259,6 @@ c  c
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {printing-marks-on-every-staff.ly}
 
-
 @seealso
 Notationsreferenz:
 @ref{Rehearsal marks},
@@ -272,7 +272,6 @@ Schnipsel:
 Referenz der Interna:
 @rinternals{RehearsalMark}.
 
-
 @knownissues
 @c  To be removed when Issue 69 in the tracker gets fixed. -vv
 
@@ -309,7 +308,7 @@ in einer Datei vorkommen, wie beschrieben in
 @ref{Multiple scores in a book}.
 
 @c KEEP LY
-@lilypond[quote,ragged-right,verbatim]
+@lilypond[quote,verbatim]
 \score {
   c'1
 }
@@ -334,12 +333,42 @@ sich in @ref{Multi-page markup}.
 @endpredefined
 
 
-@ignore
 @snippets
 
-TODO: add convenient snippets in input/new -vv
+@ignore
+@c TODO Replace following example with this snippet when available
+@c Submitted to LSR 30 Nov 08
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{stand--alone-two--column-markup.ly}
 @end ignore
 
+Text alleine kann auch in mehreren Spalten angeordnet werden.
+
+@lilypond[verbatim,quote]
+\markup {
+ \fill-line {
+  \hspace #1.0
+  \column {
+   \line {"O sacrum convivium" }
+   \line {"in quo Christus sumitur," }
+   \line {"recolitur memoria passionis ejus," }
+   \line {"mens impletur gratia," }
+   \line {"futurae gloriae nobis pignus datur." }
+   \line {"Amen."}
+  }
+  \hspace #2
+  \column {
+   \line { \italic {"O sacred feast"} }
+   \line { \italic {"in which Christ is received,"} }
+   \line { \italic {"the memory of His Passion is renewed,"} }
+   \line { \italic {"the mind is filled with grace," } }
+   \line { \italic {"and a pledge of future glory is given to us." }}
+   \line { \italic {"Amen."}}
+  }
+  \hspace #1.0
+ }
+}
+@end lilypond
 
 @seealso
 Notationsreferenz:
@@ -355,6 +384,7 @@ Referenz der Interna:
 @rinternals{TextScript}.
 
 
+
 @node Formatting text
 @subsection Formatting text
 
@@ -386,7 +416,7 @@ zu setzen.
 
 @cindex Textbeschriftungs-Ausdrücke
 @cindex Text, Syntax
-@cindex markup, syntax
+@cindex markup, Syntax
 
 Die Syntax für Textbeschriftungen ähnelt der normalen Syntax von
 LilyPond: ein @code{\markup}-Ausdruck wird in geschweifte Klammern
@@ -400,8 +430,8 @@ oder weitere Textbefehle befinden, eingeführt mit einem Backslash
 (@code{\}).  Derartige Befehle beziehen sich nur auf den ersten
 der folgenden Ausdrücke.
 
-@lilypond[quote,verbatim,fragment,relative=1]
-e1-\markup intenso
+@lilypond[quote,verbatim,relative=2]
+a1-\markup intenso
 a2^\markup { poco \italic più forte  }
 c e1
 d2_\markup { \italic "string. assai" }
@@ -424,10 +454,10 @@ ausgegeben, wie sie eingeben werden.  Doppelte Anführungsstriche
 können gesetzt werden, indem man ihnen einen Backslash voranstellt.
 
 @c KEEP LY
-@lilypond[quote,verbatim,fragment,relative=1]
-d1^"\italic Text..."
-d_\markup { \italic "... setzt \"kursive\" Buchstaben!" }
-d d
+@lilypond[quote,verbatim,relative=2]
+a1^"\italic Text..."
+a_\markup { \italic "... setzt \"kursive\" Buchstaben!" }
+a a
 @end lilypond
 
 Damit eine Anzahl von Wörtern als ein einziger Ausdruck behandelt
@@ -438,14 +468,14 @@ sie übereinander gestapelt, mittig und aneinander ausgerichtet
 werden.  Im folgenden Beispiel verhält sich der zweite
 @code{\markup}-Ausdruck genauso wie der erste:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=2]
 c1^\markup { \center-column { a bbb c } }
 c1^\markup { \center-column { a { bbb c } } }
 c1^\markup { \center-column { a \line { bbb c } } }
 c1^\markup { \center-column { a "bbb c" } }
 @end lilypond
 
-Textbeschriftung kann auch durch Variblen definiert werden.  Diese
+Textbeschriftung kann auch durch Variablen definiert werden.  Diese
 Variablen können dann direkt an Noten angefügt werden:
 
 @lilypond[quote,verbatim]
@@ -678,7 +708,7 @@ werden.  Standardmäßig wird ein Textobjekt an seiner linken Ecke
 ausgerichtet, darum wird das erste und zweite Objekt gleichermaßen
 an der linken Ecke ausgerichtet.
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=2]
 d1-\markup { poco }
 f
 d-\markup { \left-align poco }
@@ -693,7 +723,7 @@ d-\markup { \right-align poco }
 Die horizontale Ausrichtung kann mit einer Zahl auf einen exakten
 Wert festgelegt werden:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=2]
 a1-\markup { \halign #-1 poco }
 e'
 a,-\markup { \halign #0 poco }
@@ -722,7 +752,7 @@ werden, welcher entweder ein anderes Textelement oder ein
 unsichtbares Objekt sein kann (im Beispiel mit @code{\null} erstellt).
 Der letzte Text im Beispiel hat keinen Anker und wird deshalb auch nicht verschoben.
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=1]
 d2^\markup {
   Acte I
   \raise #2 { Scène 1 }
@@ -747,7 +777,7 @@ Einige Befehle können sowohl die horizontale als auch die vertikale
 Ausrichtung von Textobjekten beeinflussen.  Jedes Objekt, das auf
 diese Weise verschoben wird, benötigt einen Anker:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=1]
 d2^\markup {
   Acte I
   \translate #'(-1 . 2) "Scène 1"
@@ -861,7 +891,6 @@ linksbündig oder im Blocksatz, wie das nächste Beispiel illustriert:
 Eine vollständige Liste der Textausrichtungsbefehle findet sich in
 @ref{Align}.
 
-
 @seealso
 Handbuch zum Lernen:
 @rlearning{Moving objects}.
@@ -880,6 +909,7 @@ Referenz der Interna:
 @rinternals{TextScript}.
 
 
+
 @node Graphic notation inside markup
 @unnumberedsubsubsec Graphic notation inside markup
 
@@ -1005,7 +1035,7 @@ aber Graphiken direkt in den Quelltext unter Verwendung von
 PostScript-Code notiert.  In diesem Fall kann es nötig sein, die
 Größe der Zeichnung explizit anzugeben, wie im Beispiel unten gezeigt:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=1]
 c1^\markup {
   \combine
     \epsfile #X #10 #"./context-example.eps"
@@ -1028,7 +1058,6 @@ c
 Eine ausführliche Liste der Graphik-Befehle findet sich in
 @ref{Graphic}.
 
-
 @seealso
 Notationsreferenz:
 @ref{Graphic},
@@ -1045,6 +1074,7 @@ Installierte Dateien:
 @file{scm/@/stencil@/.scm}.
 
 
+
 @node Music notation inside markup
 @unnumberedsubsubsec Music notation inside markup
 
@@ -1057,7 +1087,7 @@ werden.
 
 Noten und Versetzungszeichen lassen sich mit @code{\markup} einfügen:
 
-@lilypond[quote,verbatim,fragment,relative=2]
+@lilypond[quote,verbatim,relative=2]
 a2 a^\markup {
   \note #"4" #1
   =
@@ -1077,7 +1107,7 @@ a1_\markup {
 
 Andere Notationsobjekte können auch eingefügt werden:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=1]
 g1 bes
 ees-\markup {
   \finger 4
@@ -1101,7 +1131,7 @@ unten gezeigt.  Eine vollständige Liste der verfügbaren Symbole findet
 sich in
 @ref{The Feta font}.
 
-@lilypond[quote,verbatim,fragment,relative=2]
+@lilypond[quote,verbatim,relative=2]
 c2
 c'^\markup { \musicglyph #"eight" }
 c,4
@@ -1109,7 +1139,11 @@ c,8._\markup { \musicglyph #"clefs.G_change" }
 c16
 c2^\markup { \musicglyph #"timesig.neomensural94" }
 @end lilypond
+
 @c TODO: add \lookup here? -vv
+@c Probably better not to document \lookup, which is useful only for
+@c printing braces, and instead document \left-brace and \right-brace
+@c when these become available  -td
 
 @noindent
 Eine andere Möglichkeit, andere als Textsymbole zu schreiben, findet sich
@@ -1119,7 +1153,7 @@ in
 Der Textbeschriftungsmodus unterstützt auch Diagramme für bestimmte
 Instrumente:
 
-@lilypond[quote,verbatim,fragment,relative=2]
+@lilypond[quote,verbatim,relative=2]
 c1^\markup {
   \fret-diagram-terse #"x;x;o;2;3;2;"
 }
@@ -1145,7 +1179,7 @@ Sogar eine ganze Partitur kann in ein Textbeschriftungsobjekt eingefügt
 werden.  In diesem Fall muss die eingefügte @code{\score}-Umgebung
 eine @code{\layout}-Umgebung haben, wie in diesem Beispiel:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=1]
 c4 d^\markup {
   \score {
     \relative { c4 d e f }
@@ -1159,7 +1193,6 @@ c d e f
 Eine vollständige Liste der Musiksymbol-Befehle findet sich in
 @ref{Music}.
 
-
 @seealso
 Notationsreferenz:
 @ref{Music},
@@ -1178,6 +1211,7 @@ Installierte Dateien:
 @file{scm/@/harp@/-pedals@/.scm}.
 
 
+
 @node Multi-page markup
 @unnumberedsubsubsec Multi-page markup
 
@@ -1192,7 +1226,7 @@ fließen zu lassen:
     ...
   }
   \wordwrap-lines {
-    An other very long paragraph.
+    Another very long paragraph.
     ...
   }
   ...
@@ -1213,7 +1247,6 @@ eine Liste von Beschriftungslisten.
 Eine vollständige Liste der Beschriftungslistenbefehle findet sich in
 @ref{Text markup list commands}.
 
-
 @seealso
 Notationsreferenz:
 @ref{Text markup list commands},
@@ -1230,7 +1263,7 @@ Installierte Dateien:
 
 @predefined
 @funindex \markuplines
-@code{\markuplines}
+@code{\markuplines}.
 @endpredefined
 
 
@@ -1260,11 +1293,11 @@ gewählte Schriftart wird dann mit Pango verarbeitet.
 Notationsschriftarten können als eine Ansammlung von besonderen Zeichen
 erklärt werden, wobei die Sonderzeichen in verschiedene Familien
 klassifiziert werden.  Die Syntax des folgenden Beispiels ermöglicht es,
-direkt auf verschiedene Sonderzeichen der @code{feta}-Schriftart
-zuzugreifen.  Das ist die Standardschriftart für Notationselemente in
-LilyPond.
+direkt auf verschiedene nicht textuelle Sonderzeichen der
+@code{feta}-Schriftart zuzugreifen.  Das ist die Standardschriftart
+für Notationselemente in LilyPond.
 
-@lilypond[quote,verbatim,fragment,relative=2]
+@lilypond[quote,verbatim,relative=2]
 a1^\markup {
   \vcenter {
     \override #'(font-encoding . fetaBraces)
@@ -1296,15 +1329,17 @@ Jede Familie kann verschiedene Schriftschnitte besitzen. Im Englischen
 wird unterschieden zwischen @code{shape} für kursive Schnitte und 
 @code{series} für fette Schnitte.  Im folgenden Beispiel wird
 demonstriert, wie man die verschiedenen Eigenschaften auswählen kann.
+Der Wert, der @code{font-size} übergeben wird, entspricht der geforderten
+Änderung in Bezug auf die Standardschriftgröße.
 
-@lilypond[quote,verbatim,fragment,relative=2]
+@lilypond[quote,verbatim,relative=2]
   \override Score.RehearsalMark #'font-family = #'typewriter
   \mark \markup "Ouverture"
-  \key d \major
   \override  Voice.TextScript #'font-shape = #'italic
   \override  Voice.TextScript #'font-series = #'bold
   d'2.^\markup "Allegro"
-  r4
+  \override Voice.TextScript #'font-size = #-3
+  c4^smaller
 @end lilypond
 
 @noindent
@@ -1335,20 +1370,11 @@ erklärt wurden in
 }
 @end lilypond
 
-@ignore
-@c FIXME: This needs an example -vv
-
-The size of the font may be set with the @code{font-size}
-property.  The resulting size is taken relative to the
-@code{text-font-size} as defined in the @code{\paper} block.
-@end ignore
-
 Auch wenn es einfach ist, zwischen den vorefinierten Schriftarten
 umzuschalten, kann man auch eigene Schriftarten verwenden, wie erklärt
 in folgenden Abschnitten: @ref{Single entry fonts} und
 @ref{Entire document fonts}.
 
-
 @seealso
 Notationsreferenz:
 @ref{The Feta font},
@@ -1364,12 +1390,12 @@ Jede Schriftart, die über das Betriebssystem installiert ist und von
 FontConfig erkannt wird, kann in einer Partitur eingefügt werden.  Dazu
 verwendet man folgende Syntax:
 
-@lilypond[quote,verbatim,fragment,relative=1]
+@lilypond[quote,verbatim,relative=2]
 \override Staff.TimeSignature #'font-name = #"Charter"
 \override Staff.TimeSignature #'font-size = #2
 \time 3/4
 
-c1_\markup {
+a1_\markup {
   \override #'(font-name . "Vera Bold")
     { Vera Bold }
 }
@@ -1388,7 +1414,6 @@ lilypond -dshow-available-fonts x
 Das letzte Argument kann ein beliebiges Zeichen sein, aber es darf nicht
 fehlen.
 
-
 @seealso
 Notationsreferenz:
 @ref{Fonts explained},
@@ -1401,14 +1426,15 @@ Installierte Dateien:
 @file{lily/@/font@/-config@/-scheme@/.cc}.
 
 
+
 @node Entire document fonts
 @unnumberedsubsubsec Entire document fonts
 
-Es ist auch möglich, die Schriftart für die gesamte Partitur zu ändern.
-In diesem Fall muss die folgende Syntax benutzt werden, mit der drei
-Schriftarten für die drei unterschiedlichen Familien @code{roman},
-@code{sans} und @code{typewriter} definiert werden.  Einzelheiten zu den
-Familien in @ref{Fonts explained}.
+Es ist auch möglich, die Schriftarten für die gesamte Partitur zu ändern.
+In diesem Fall müssen die Familien @code{roman},
+@code{sans} und @code{typewriter} in genaus dieser Reihenfolge
+entsprechend der Syntax unten definiert werden.  Einzelheiten zu
+Schriftarten in @ref{Fonts explained}.
 
 @cindex Schriftartenfamilien, Definieren
 @funindex make-pango-font-tree
@@ -1434,7 +1460,6 @@ Familien in @ref{Fonts explained}.
 @c we don't do Helvetica / Courier, since GS incorrectly loads
 @c Apple TTF fonts
 
-
 @seealso
 Notationsreferenz:
 @ref{Fonts explained},
index b3b5196cbb44b3514b408bf1d3045d7f29bf8d60..671b6103f169ebe5b1e1087fbe6c22ba238e38b7 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index f670663b0c1e6bad24223f8c86556bdb4631c011..b176852c84831f089a0d3958fb44691c98f89e12 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond-learning.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index 5568e01940de1d0d5feadef81caaf6e8cf594cb7..625bbb39705ec7219a0e44b88bca584dcbb1775f 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: b03ad3631e3a6c5bd657eda5f4ba6963dfb22c36
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @node Unfretted string instruments
 @section Unfretted string instruments
 
-@untranslated
+@lilypondfile[quote]
+{unfretted-headword.ly}
+
+@cindex Streicher
+@cindex Orcherster, Streicher
+@cindex Notation für Streicher
+
+Dieser Abschnitt stellt Information und Referenzen zur Verfügung, die
+beim Setzen von Noten für Saiteninstrumente ohne Bund herangezogen
+werden können.
 
 @menu
 * Common notation for unfretted strings::  
 @node Common notation for unfretted strings
 @subsection Common notation for unfretted strings
 
-@untranslated
+Es gibt wenige Spezifikat für die Notation von Saiteninstrumenten ohne
+Bund.  Die Noten werden auf einem System notiert und meistens ist auch nur
+eine Stimme erforderlich.  Zwei Stimmen können für Doppelgriff- oder
+Divisi-Stellen erforderlich sein.
 
 @menu
-* References for unfretted strings::  
-* Bowing indications::          
-* Harmonics::                   
+* References for unfretted strings::
+* Bowing indications::
+* Harmonics::
 * Snap (Bartok) pizzicato::     
 @end menu
 
 @node References for unfretted strings
 @unnumberedsubsubsec References for unfretted strings
 
-@untranslated
+Die meisten Notationseigenschaften, die für Orchersterstreicher eingesetzt
+werden, sind an anderer Stelle beschrieben:
+
+@itemize
+
+@item Textanweisungen wie @qq{pizz.} oder @qq{arco} werden als einfacher
+Text eingefügt, siehe @ref{Text scripts}.
+
+@item Fingersatz, auch das Zeichen für den Daumen, ist erklärt in
+@ref{Fingering instructions}.
+
+@item Doppelgriffe werden normalerweise als Akkord notiert, siehe hierzu
+@ref{Chorded notes}.  Anweisungen, wie Akkorde gespielt werden sollen, können
+auch hinzugefügt werden, siehe @ref{Arpeggio}.
+
+@item Eine Vorlage für Streichquartett findet sich in
+@rlearning{String quartet}.  Andere sind als Schnipsel zur Verfügung
+gestellt.
+
+@end itemize
+
+@seealso
+Handbuch zum Lernen:
+@rlearning{String quartet}.
+
+Notationsreferenz:
+@ref{Text scripts},
+@ref{Fingering instructions},
+@ref{Chorded notes},
+@ref{Arpeggio}.
+
+Schnipsel:
+@rlsr{Unfretted strings}.
 
 @node Bowing indications
 @unnumberedsubsubsec Bowing indications
 
-@untranslated
+@funindex \upbow
+@funindex \downbow
+@funindex \open
+
+@cindex Bogen, Anzeige
+@cindex Streicher, Bogenanzeige
+@cindex Offene Saite, anzeigen
+@cindex Saite, offen
+
+Hinweise zur Bogenfügung können als Artikulationen erstellt werden, wie
+beschrieben in
+@ref{Articulations and ornamentations}.
+
+Die Befehle @code{\upbow} und @code{\downbow} werden mit Legatobögen
+in folgender Weise eingesetzt:
+
+@lilypond[verbatim,quote,relative=2]
+c4(\downbow d) e(\upbow f)
+@end lilypond
+
+@noindent
+und das nächste Beispiel zeigt drei Arten, eine offene A-Saite auf der
+Geige anzuzeigen:
+
+@lilypond[verbatim,quote,relative=2]
+a4 \open
+a^\markup { \teeny "II" }
+a2^\markup { \small "sul A" }
+@end lilypond
+
+@predefined
+@code{\downbow},
+@code{\upbow},
+@code{\open}.
+@endpredefined
+
+@seealso
+Notation Reference:
+@ref{Articulations and ornamentations},
+@ref{Slurs}.
+
 
 @node Harmonics
 @unnumberedsubsubsec Harmonics
 
+@strong{@i{Natürliches Flageolett}}
 
 @cindex Flageolett
+@funindex \harmonic
+@funindex harmonic
+
+Flageolett-Töne können auf verschiedene Arten notiert werden.
+Üblicherweise werden sie mit einem Rautenkopf notiert, wenn
+ein Ton angezeigt werde, bei dem die Saite berührt wird, wo sie
+sonst abgegriffen würde.
+
+@warning{Flageolett-Töne @strong{müssem} innerhalb von Akkorden
+definiert werden, auch wenn nur eine einzelne Note vorhanden ist.}
+
+@lilypond[verbatim,quote,relative=2]
+<d\harmonic>4 <e\harmonic>2.
+\set harmonicDots = ##t
+<d\harmonic>4 <e\harmonic>2.
+@end lilypond
+
+Alternativ kann auch eine normale Noten die Tonhöhe anzeigen, die
+erklingen soll, wobei ein kleiner Kreis angibt, dass es sich um
+einen Flageolett-Ton handelt:
+
+@lilypond[verbatim,quote,relative=2]
+d2^\flageolet d_\flageolet
+@end lilypond
 
-Flageolett-Töne werden mit einem anderen Notenkopfstil notiert.
-Sie werden eingegeben, indem die Flageolettnote mit dem
-Befehl @code{\harmonic} markiert wird.
+
+@strong{@i{Künstliches Flageolett}}
+
+@cindex künstliches Flageolett
+@cindex Flageolett, künstliches
+
+Künstliche Flageoletttöne werden mit zwei Noten notiert, von denen
+einen einen normalen Notenkopf besitzt und die Griffposition des
+Fingers angibt, während die andere in Rautenform die Position des
+leicht aufgesetzten Fingers anzeigt.
 
 @lilypond[verbatim,quote,relative=1]
 <e a\harmonic>2  <c g'\harmonic>
 @end lilypond
 
+@seealso
+Glossar:
+@rglos{harmonics}.
+
+Notationsreferenz:
+@ref{Special note heads},
+@ref{References for unfretted strings}.
+
+
+
 @node Snap (Bartok) pizzicato
 @unnumberedsubsubsec Snap (Bartok) pizzicato
 
-@untranslated
+@cindex Pizzicato, Bartók
+@cindex Pizzicato, Knall-
+@cindex Bartók-Pizzicato
+@cindex Knall-Pizzicato
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{snap-pizzicato-markup-bartok-pizzicato.ly}
index 33cab3a0506ceb3a396943a9a1cea890369ea6b3..12435f19e8cc02173fad014b4118c62172d35313 100644 (file)
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 2dfe44169bfcad2c5862c82ee08c593517dc2ddd
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -35,8 +35,8 @@ von Vokalmusik und einige spezifische Vokalmusikstile.
 * References for vocal music and lyrics::
 * Opera::
 * Song books::
-* Chants::
 * Spoken music::
+* Chants::
 * Ancient vocal music::
 @end menu
 
@@ -87,6 +87,7 @@ TBC
 
 @c add characters names snippet -vv
 
+
 @node Song books
 @unnumberedsubsubsec Song books
 
@@ -101,6 +102,7 @@ TBC
 Notationsreferenz:
 @ref{Chord notation}.
 
+
 @node Spoken music
 @unnumberedsubsubsec Spoken music
 
@@ -118,12 +120,14 @@ Noten werden mit einem Kreuz als Notenkopf notiert, siehe hierzu
 @c add "improvisation" ref
 @c add "lyrics independents of notes" ref
 
+
 @node Chants
 @unnumberedsubsubsec Chants
 
 @c TODO Add text from lsr and -user
 TBC
 
+
 @node Ancient vocal music
 @unnumberedsubsubsec Ancient vocal music
 
@@ -299,7 +303,6 @@ stropheEins = \lyricmode @{ Joy to the world the Lord is come @}
 
 
 @seealso
-
 Notationsreferenz:
 @ref{Fonts}.
 
@@ -429,7 +432,6 @@ remains empty.
 @end ignore
 
 @seealso
-
 @c TODO: document \new Staff << Voice \lyricsto >> bug
 Referenz der Interna:
 @rinternals{LyricCombineMusic},
@@ -586,7 +588,6 @@ Hier ein Beispiel, dass die manuale Ausrichtung von Gesangstext zeigt:
 @end lilypond
 
 @seealso
-
 Referenz der Interna:
 @rinternals{Lyrics}.
 
@@ -614,7 +615,6 @@ die das entsprechende Symbol (U+203F) beinhaltet, wie etwa DejaVuLGC.
 @end lilypond
 
 @seealso
-
 Referenz der Interna:
 @rinternals{LyricCombineMusic}.
 
@@ -703,13 +703,12 @@ sich in
 
 
 @predefined
-
 @code{\melisma}, @code{\melismaEnd}
 @funindex \melismaEnd
 @funindex \melisma
+@endpredefined
 
 @seealso
-
 @c @lsr{vocal,lyric@/-combine.ly}.
 
 @knownissues
@@ -773,7 +772,6 @@ Dieses Verhalten kann aber auch unterbunden werden, wenn den Eigenschaften
 andere Werte erhalten.
 
 @seealso
-
 Referenz der Interna:
 @rinternals{LyricExtender},
 @rinternals{LyricHyphen}
@@ -997,12 +995,12 @@ TBC
 @subsection Stanzas
 
 @menu
-* Adding stanza numbers ::
+* Adding stanza numbers::
 * Adding dynamics marks to stanzas::
 * Adding singers' names to stanzas::
 * Stanzas with different rhythms::
-* Printing stanzas at the end ::
-* Printing stanzas at the end in multiple columns ::
+* Printing stanzas at the end::
+* Printing stanzas at the end in multiple columns::
 @end menu
 
 
@@ -1125,10 +1123,6 @@ Melisma ignoriert.  Das wird mit der
 @code{ignoreMelismata}-Eigenschaft im @code{Lyrics}-Kontext
 vorgenommen.
 
-Die Einstellung von @code{ignoreMelismata} muss allerdings eine
-Silbe @emph{vor} der Silbe gemacht werden, auf die es sich
-auswirken soll, wie das Beispiel zeigt:
-
 @c  TODO: breaks compile
 @c seems to be fixed, does not break compile anymore --FV
 @lilypond[verbatim,ragged-right,quote]
@@ -1144,18 +1138,15 @@ auswirken soll, wie das Beispiel zeigt:
     more slow -- ly
   }
   \new Lyrics \lyricsto "lahlah" {
-    \set ignoreMelismata = ##t % applies to "fas"
-    go fas -- ter
+    go
+    \set ignoreMelismata = ##t
+    fas -- ter
     \unset ignoreMelismata
     still
   }
 >>
 @end lilypond
 
-@noindent
-Das @code{ignoreMelismata} wirkt sich auf die Silbe @qq{fas} aus,
-es muss also vor der silbe @qq{go} notiert werden.
-
 
 @subsubheading Switching to an alternative melody
 
@@ -1356,7 +1347,6 @@ text = \lyricmode {
 
 
 @seealso
-
 Referenz der Interna:
 @rinternals{LyricText},
 @rinternals{StanzaNumber}.
index 48d53ba9411ce152bfa5ffd0805fe441838b99dd..9e66b1c83ef53a7d4f65c9a01e3f9d627bea9405 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: b03ad3631e3a6c5bd657eda5f4ba6963dfb22c36
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @node Wind instruments
 @section Wind instruments
 
-@untranslated
+@lilypondfile[quote]{wind-headword.ly}
+
+Dieser Abschnitt beinhaltet einige Notationselemente, die
+bei der Notation von Blasinstrumenten auftreten.
 
 @menu
 * Common notation for wind instruments::
 * Bagpipes::
 @end menu
 
+
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
-@untranslated
+Dieser Abschnitt erklärt Eigenheiten, die für die meisten
+Blasinstrumente gültig sind.
 
 @menu
 * References for wind instruments::
 @node References for wind instruments
 @unnumberedsubsubsec References for wind instruments
 
-@untranslated
+@cindex Blasinstrumente
+
+Viele Besonderheiten der Blasinstrumentenotation haben mit
+Atmung und Spielart zu tun:
+
+@itemize
+@item Atmung kann durch Pausen oder mit Atemzeichen angezeigt werden,,
+siehe @ref{Breath marks}.
+@item Legato kann durch Legatobögen angezeigt werden, siehe
+@ref{Slurs}.
+@item Unterschiedliche Artikulationen, Legato, Portato, Staccato,
+werden normalerweise mit Artikulationszeichen angemerkt, teilweise
+auch in Verbindung mit Legatobögen, siehe @ref{Articulations and
+ornamentations} und @ref{List of articulations}.
+@item Flatterzunge wird angezeigt, indem ein Tremolozeichen und eine
+Anmerkung für die ensprechende Note gesetzt wird. Siehe @ref{Tremolo repeats}.
+@end itemize
+
+Es gibt auch noch weitere Aspekte der Notation, die für Blasinstrumente
+relevant sein können:
+
+@itemize
+@item Viele Instrumente sind transponierend, siehe
+@ref{Instrument transpositions}.
+@item Das Zug-Glissando ist charakteristisch für die Posaune, aber
+auch andere Instrumente können Glissandos ausführen. Siehe
+@ref{Glissando}.
+@item Obertonreihenglissandi, die auf allen Blechblasinstrumenten möglich,
+aber besonders üblich für das Waldhorn sind, werden üblicherweise mit
+Verzierungsnoten geschrieben. Siehe
+@ref{Grace notes}.
+@item Tonhöhenschwankungen am Ende eines Tons werden gezeigt in
+@ref{Falls and doits}.
+@item Ventil- oder Klappenschläge werden oft als Kreuznoten
+dargestellt, siehe
+@ref{Special note heads}.
+@item Holzbläser können tiefe Noten überblasen.  Derartige Noten
+werden als @code{flageolet}-Artikulation notiert. Siehe
+@ref{List of articulations}.
+@item Die Benutzung von Dämpfern für Blechblasinstrumente wird meistens
+durch Text gefordert, aber bei schnellem Wechsel bietet es sich an,
+die Artikulationszeichen @code{stopped} und @code{open} zu benutzen.
+Siehe
+@ref{Articulations and ornamentations} und
+@ref{List of articulations}.
+@item Gestopfte Hörner werden mit dem @code{stopped}-Artikulationszeichen
+notiert. Siehe
+@ref{Articulations and ornamentations}.
+@end itemize
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{changing--flageolet-mark-size.ly}
+
+
+@seealso
+Notationsreferenz:
+@ref{Breath marks},
+@ref{Slurs},
+@ref{Articulations and ornamentations},
+@ref{List of articulations},
+@ref{Tremolo repeats},
+@ref{Instrument transpositions},
+@ref{Glissando},
+@ref{Grace notes},
+@ref{Falls and doits},
+@ref{Special note heads},
+
+Schnipsel:
+@rlsr{Winds}
+
 
 @node Fingerings
 @unnumberedsubsubsec Fingerings
 
-@untranslated
+Alle Blasinstrumente außer der Posaune benötigen mehrere Finger, um
+verschiedene Tonhöhen zu produzieren.
+
+TBC
+
 
 @node Bagpipes
 @subsection Bagpipes
 
-@untranslated
+Dieser Abschnitt beinhaltet Information zur Notation von Dudelsackmusik.
 
 @menu
 * Bagpipe definitions::
 * Bagpipe example::
 @end menu
 
+
 @node Bagpipe definitions
 @unnumberedsubsubsec Bagpipe definitions
 
+@cindex Dudelsack
+@cindex Sackpfeife
+@cindex Schottischer Dudelsack
+@funindex \taor
+@funindex taor
+@funindex \hideKeySignature
+@funindex hideKeySignature
+@funindex \showKeySignature
+@funindex showKeySignature
+
 LilyPond besitzt spezielle Definitionen, mit der die Musik
 des schottischen Hochland-Dudelsacks notiert wird. Um sie
 zu benutzen, muss
@@ -82,18 +173,23 @@ Dudelsacknoten in bestimmten Oktaven, so dass man sich nicht mehr um
 { \grg G4 \grg a \grg b \grg c \grg d \grg e \grg f \grA g A }
 @end lilypond
 
-Musik für den Dudelsack wird dem Namen nach in D-Dur
- geschrieben (auch wenn das eigentlich nicht stimmt). Weil
- das aber die einzige Tonart ist, die benutzt werden kann, werden
- die Vorzeichen meistens nicht geschrieben. Damit das funktioniert,
- müssen die Noten immer mit @code{\hideKeySignature} beginnen.
- Wenn die Vorzeichen hingegen angezeigt werden sollen, kann das
- mithilfe des Befehls @code{\showKeySignature} vorgenommen werden.
+Musik für den Dudelsack wird in D-Dur
+geschrieben (auch wenn das eigentlich nicht stimmt). Weil
+das aber die einzige Tonart ist, die benutzt werden kann, werden
+die Vorzeichen meistens nicht geschrieben. Damit das funktioniert,
+müssen die Noten immer mit @code{\hideKeySignature} beginnen.
+Wenn die Vorzeichen hingegen angezeigt werden sollen, kann das
+mithilfe des Befehls @code{\showKeySignature} vorgenommen werden.
+
+Einige moderne Dudelsacknoten benutzen halbe Finger auf c und f, um
+diese Noten zu erniedrigen.  Das kann angezeigt werden mit @code{cflat}
+bzw. @code{fflat}.  Gleicherweise kann das piobaireachd hohe g als
+@code{gflat} geschrieben werden, wenn es in leichter Musik vorkommt.
+
+@seealso
+Schnipsel:
+@rlsr{Winds}
 
-Some modern music use cross fingering on c and f to flatten those notes.
-This can be indicated by @code{cflat} or @code{fflat}. Similarly, the
-piobaireachd high g can be written @code{gflat} when it occurs in light
-music.
 
 @node Bagpipe example
 @unnumberedsubsubsec Bagpipe example
@@ -137,3 +233,7 @@ Dudelsack notiert.
   \bar "|."
 }
 @end lilypond
+
+@seealso
+Schnipsel:
+@rlsr{Winds}
index 87dd7dd3b6b200dabfc7c8ad9ad3a0679bf695c9..d0def4f9e5b612894aeb148515dc3777365deebe 100644 (file)
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 3a8542af9f54c99b53374328af0d5d87005ca49e
+    Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
index 76a31106a828ab4ddc63a884de92d164237ae7d1..b5074eac487bd906de9cdfa3fd725a92288deb9d 100644 (file)
@@ -1,4 +1,4 @@
- <p><i>Actualizado en Thu Dec  4 00:21:44 UTC 2008
+ <p><i>Actualizado en Sun Dec  7 22:30:55 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -54,11 +54,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Más inf.</th>
  </tr>
  <tr align="left">
-  <td>Títulos de sección<br>(407)</td>
+  <td>Títulos de sección<br>(429)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #33ff21">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -74,7 +74,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #2cff20">parcialmente</span></td>
   <td>post-GDP</td>
  </tr>
  <tr align="left">
@@ -137,11 +137,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Más inf.</th>
  </tr>
  <tr align="left">
-  <td>Títulos de sección<br>(385)</td>
+  <td>Títulos de sección<br>(407)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #33ff21">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -169,7 +169,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: integrar texto y música<br>(3202)</td>
+  <td>4 @command{lilypond-book}: integrar texto y música<br>(3185)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
@@ -196,11 +196,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Más inf.</th>
  </tr>
  <tr align="left">
-  <td>Títulos de sección<br>(672)</td>
+  <td>Títulos de sección<br>(695)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #25fe1f">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -268,11 +268,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.8 Texto<br>(2472)</td>
+  <td>1.8 Texto<br>(2286)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #25fe1f">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -284,7 +284,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Música vocal<br>(2638)</td>
+  <td>2.1 Música vocal<br>(2670)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
index 0089e42a5514d97e66e49a41b4ec604d28c719d2..33126812990c9212c52b1dd1d78173c332b4db5a 100644 (file)
@@ -37,7 +37,7 @@ Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond-learning-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
-This document is also available as a
+Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond-learning.es.pdf,PDF} y como
 @uref{source/Documentation/user/lilypond-learning/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
index 01192ad4c0156daad8647a4cf4a211753d19f6b5..abc0499330a62a52fb9098564f173e35d0aa298d 100644 (file)
@@ -39,7 +39,7 @@ Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond-program-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
-This document is also available as a
+Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond-program.es.pdf,PDF} y como
 @uref{source/Documentation/user/lilypond-program/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
index c508f740aa4d49b0e694129c9b664ee1b7aa6c91..6572534d084d198d45608b7b15fd54599e893468 100644 (file)
@@ -76,7 +76,7 @@ Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
-This document is also available as a
+Este documento también está disponible en formato
 @uref{source/Documentation/user/lilypond.es.pdf,PDF} y como
 @uref{source/Documentation/user/lilypond/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
index c6b0aad37a355769b1ca96db3dca8f883e428bec..466fb1d6f4bc02ffb14b114c0e4c48179f24229c 100644 (file)
@@ -1,4 +1,4 @@
- <p><i>Dernière mise à jour Thu Dec  4 00:21:44 UTC 2008
+ <p><i>Dernière mise à jour Sun Dec  7 22:30:55 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -53,12 +53,12 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Autres informations</th>
  </tr>
  <tr align="left">
-  <td>Titre des chapitres<br>(407)</td>
+  <td>Titre des chapitres<br>(429)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude</td>
   <td></td>
   <td><span style="background-color: #1fff1f">oui</span></td>
-  <td><span style="background-color: #1fff1f">oui</span></td>
+  <td><span style="background-color: #33ff21">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
@@ -76,7 +76,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Jean-Charles Malahieude<br>
    Jean-Yves Baudais</td>
   <td><span style="background-color: #1fff1f">oui</span></td>
-  <td><span style="background-color: #2cff20">partiellement</span></td>
+  <td><span style="background-color: #40fe23">partiellement</span></td>
   <td>post-GDP</td>
  </tr>
  <tr align="left">
@@ -150,12 +150,12 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Autres informations</th>
  </tr>
  <tr align="left">
-  <td>Titre des chapitres<br>(385)</td>
+  <td>Titre des chapitres<br>(407)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude</td>
   <td></td>
   <td><span style="background-color: #1fff1f">oui</span></td>
-  <td><span style="background-color: #1fff1f">oui</span></td>
+  <td><span style="background-color: #33ff21">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
@@ -183,7 +183,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book} : association musique-texte<br>(3202)</td>
+  <td>4 @command{lilypond-book} : association musique-texte<br>(3185)</td>
   <td></td>
   <td></td>
   <td><span style="background-color: #d0f0f8">non</span></td>
@@ -210,12 +210,12 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>Autres informations</th>
  </tr>
  <tr align="left">
-  <td>Titre des chapitres<br>(672)</td>
+  <td>Titre des chapitres<br>(695)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude</td>
   <td></td>
   <td><span style="background-color: #1fff1f">oui</span></td>
-  <td><span style="background-color: #1fff1f">oui</span></td>
+  <td><span style="background-color: #25fe1f">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
@@ -291,11 +291,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.8 Texte<br>(2472)</td>
+  <td>1.8 Texte<br>(2286)</td>
   <td>Jean-Charles Malahieude</td>
   <td>Valentin Villenave<br>
    John Mandereau</td>
-  <td><span style="background-color: #dfef77">partiellement (84 %)</span></td>
+  <td><span style="background-color: #dfef77">partiellement (97 %)</span></td>
   <td><span style="background-color: #ff6f57">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
@@ -309,10 +309,10 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Musique vocale<br>(2638)</td>
+  <td>2.1 Musique vocale<br>(2670)</td>
   <td>Valentin Villenave</td>
   <td>Jean-Charles Malahieude</td>
-  <td><span style="background-color: #dfef77">partiellement (57 %)</span></td>
+  <td><span style="background-color: #dfef77">partiellement (56 %)</span></td>
   <td><span style="background-color: #ff6d58">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
index 509c305bee0386adbcb84355bc21f1b186e18c28..d885376b469041a25a149d9bbef1b37baae6b6dc 100644 (file)
 @top GNU LilyPond --- Manuel d'initiation
 @end ifnottex
 
+
 @ifhtml
-Ce document est également disponible au format
-@uref{source/Documentation/user/lilypond-learning.fr.pdf,PDF}.
+@ifclear bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond-learning.fr.pdf,format PDF},
+et en une seule
+@uref{source/Documentation/user/lilypond-learning-big-page.fr.html,grande page}.
+@end ifclear
+@ifset bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond-learning.fr.pdf,format PDF},
+et en @uref{source/Documentation/user/lilypond-learning/index.fr.html,pages HTML
+séparées}.
+@end ifset
 @end ifhtml
 
 @c urg, makeinfo 4.9.91 French translation is funky
index eb1953e370f862ac1b5ef8e3c0241974e2f4aeb3..a36c8cc8f4d48eeb6541a37b7cbe5036f3731cd4 100644 (file)
 @end ifnottex
 
 @ifhtml
-Ce document est également disponible au format
-@uref{source/Documentation/user/lilypond-program.fr.pdf,PDF}.
+@ifclear bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond-program.fr.pdf,format PDF},
+et en une seule
+@uref{source/Documentation/user/lilypond-program-big-page.fr.html,grande page}.
+@end ifclear
+@ifset bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond-program.fr.pdf,format PDF},
+et en @uref{source/Documentation/user/lilypond-program/index.fr.html,pages HTML
+séparées}.
+@end ifset
 @end ifhtml
 
 @c urg, makeinfo 4.9.91 French translation is funky
index 0a2bb003322da500d79ee0d372c9a266dcd6099c..4615ab8c4527a5ea7d5c6a4d25d20704f33e38c5 100644 (file)
 @end ifnottex
 
 @ifhtml
-Ce document est également disponible au format
-@uref{source/Documentation/user/lilypond.fr.pdf,PDF}.
+@ifclear bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond.fr.pdf,format PDF},
+et en une seule
+@uref{source/Documentation/user/lilypond-big-page.fr.html,grande page}.
+@end ifclear
+@ifset bigpage
+Ce document est également disponible au
+@uref{source/Documentation/user/lilypond.fr.pdf,format PDF},
+et en @uref{source/Documentation/user/lilypond/index.fr.html,pages HTML
+séparées}.
+@end ifset
 @end ifhtml
 
 @c urg, makeinfo 4.9.91 French translation is funky
index 844d3d0d47ef9bcff7cdd351d05b1aa332e462b3..e20d750800ad65bf76269a9d4397261e2d01fab5 100644 (file)
@@ -2,14 +2,14 @@
 # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen
 # This file is distributed under the same license as the lilypond package.
 # Till Rettig <till.rettig@gmx.de>, 2007,2008
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-22 20:22+0100\n"
-"PO-Revision-Date: 2008-11-23 20:56+0200\n"
+"POT-Creation-Date: 2008-12-07 23:30+0100\n"
+"PO-Revision-Date: 2008-12-06 22:53+0200\n"
 "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
@@ -417,23 +417,23 @@ msgstr "g ist 5 aufwärts oder 2 runter, also g unter dem b"
 msgid "f is 4 up or 3 down, so is the f below"
 msgstr "f ist 4 aufwärts oder 3 runter, also f unter dem b"
 
-#. Documentation/user/tutorial.itely:1796 (variable)
+#. Documentation/user/tutorial.itely:1791 (variable)
 #. Documentation/user/working.itely:214 (variable)
 #. Documentation/user/working.itely:229 (variable)
-#. Documentation/user/pitches.itely:1041 (context id)
+#. Documentation/user/pitches.itely:1035 (context id)
 msgid "violin"
 msgstr "Geige"
 
-#. Documentation/user/tutorial.itely:1801 (variable)
+#. Documentation/user/tutorial.itely:1796 (variable)
 #. input/lsr/string-quartet-template-simple.ly:62 (variable)
 msgid "cello"
 msgstr "Cello"
 
-#. Documentation/user/tutorial.itely:1826 (variable)
+#. Documentation/user/tutorial.itely:1821 (variable)
 msgid "tripletA"
 msgstr "TrioleA"
 
-#. Documentation/user/tutorial.itely:1827 (variable)
+#. Documentation/user/tutorial.itely:1822 (variable)
 msgid "barA"
 msgstr "barA"
 
@@ -1002,6 +1002,7 @@ msgstr "Fingersatz"
 #. @node in Documentation/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/user/expressive.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely
 #. @subheading in Documentation/es/user/tutorial.itely
@@ -1438,27 +1439,27 @@ msgstr "Absolute Notenbezeichnungen"
 msgid "After the tutorial"
 msgstr "Nach der Übung"
 
-#. Documentation/user/fundamental.itely:325 (context id)
-#. Documentation/user/fundamental.itely:368 (context id)
+#. Documentation/user/fundamental.itely:324 (context id)
+#. Documentation/user/fundamental.itely:367 (context id)
 #. input/lsr/piano-template-with-centered-lyrics.ly:51 (context id)
 msgid "singer"
 msgstr "Sänger"
 
-#. Documentation/user/fundamental.itely:326 (context id)
-#. Documentation/user/fundamental.itely:369 (context id)
+#. Documentation/user/fundamental.itely:325 (context id)
+#. Documentation/user/fundamental.itely:368 (context id)
 msgid "vocal"
 msgstr "Gesang"
 
-#. Documentation/user/fundamental.itely:329 (context id)
-#. Documentation/user/fundamental.itely:372 (context id)
+#. Documentation/user/fundamental.itely:328 (context id)
+#. Documentation/user/fundamental.itely:371 (context id)
 #. input/lsr/jazz-combo-template.ly:218 (variable)
 #. input/lsr/jazz-combo-template.ly:278 (context id)
 msgid "piano"
 msgstr "Klavier"
 
-#. Documentation/user/fundamental.itely:330 (context id)
-#. Documentation/user/fundamental.itely:363 (variable)
-#. Documentation/user/fundamental.itely:373 (context id)
+#. Documentation/user/fundamental.itely:329 (context id)
+#. Documentation/user/fundamental.itely:362 (variable)
+#. Documentation/user/fundamental.itely:372 (context id)
 #. Documentation/user/fundamental.itely:2669 (variable)
 #. Documentation/user/fundamental.itely:2711 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:19 (variable)
@@ -1476,9 +1477,9 @@ msgstr "Klavier"
 msgid "upper"
 msgstr "oben"
 
-#. Documentation/user/fundamental.itely:331 (context id)
-#. Documentation/user/fundamental.itely:364 (variable)
-#. Documentation/user/fundamental.itely:374 (context id)
+#. Documentation/user/fundamental.itely:330 (context id)
+#. Documentation/user/fundamental.itely:363 (variable)
+#. Documentation/user/fundamental.itely:373 (context id)
 #. Documentation/user/fundamental.itely:2676 (variable)
 #. Documentation/user/fundamental.itely:2712 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:23 (variable)
@@ -1496,20 +1497,22 @@ msgstr "oben"
 msgid "lower"
 msgstr "unten"
 
-#. Documentation/user/fundamental.itely:361 (variable)
-#. Documentation/user/simultaneous.itely:239 (context id)
-#. Documentation/user/vocal.itely:568 (context id)
-#. Documentation/user/vocal.itely:797 (context id)
-#. Documentation/user/vocal.itely:818 (context id)
-#. Documentation/user/vocal.itely:1222 (variable)
-#. Documentation/user/vocal.itely:1264 (variable)
+#. Documentation/user/fundamental.itely:360 (variable)
+#. Documentation/user/simultaneous.itely:241 (context id)
+#. Documentation/user/vocal.itely:571 (context id)
+#. Documentation/user/vocal.itely:803 (context id)
+#. Documentation/user/vocal.itely:824 (context id)
+#. Documentation/user/vocal.itely:1224 (variable)
+#. Documentation/user/vocal.itely:1266 (variable)
+#. Documentation/user/ancient.itely:2413 (context id)
+#. Documentation/user/ancient.itely:2452 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:24 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:35 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
 #. input/lsr/guitar-strum-rhythms.ly:56 (context id)
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:37 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes-and-chords.ly:29 (variable)
@@ -1519,10 +1522,10 @@ msgstr "unten"
 msgid "melody"
 msgstr "Melodie"
 
-#. Documentation/user/fundamental.itely:362 (variable)
-#. Documentation/user/vocal.itely:1045 (variable)
-#. Documentation/user/vocal.itely:1227 (variable)
-#. Documentation/user/vocal.itely:1268 (variable)
+#. Documentation/user/fundamental.itely:361 (variable)
+#. Documentation/user/vocal.itely:1051 (variable)
+#. Documentation/user/vocal.itely:1229 (variable)
+#. Documentation/user/vocal.itely:1270 (variable)
 #. input/lsr/piano-template-with-centered-lyrics.ly:45 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:36 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:36 (variable)
@@ -1531,7 +1534,7 @@ msgid "text"
 msgstr "Text"
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:518 (context id)
+#. Documentation/user/staff.itely:514 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1571,16 +1574,16 @@ msgstr ""
 "Stimme·\\\"1\\\"··············Stimme·\\\"2\\\"            Stimme \\\"3\\\""
 
 #. Documentation/user/fundamental.itely:711 (comment)
-#. Documentation/user/simultaneous.itely:737 (comment)
-#. Documentation/user/simultaneous.itely:762 (comment)
-#. Documentation/user/simultaneous.itely:789 (comment)
+#. Documentation/user/simultaneous.itely:742 (comment)
+#. Documentation/user/simultaneous.itely:767 (comment)
+#. Documentation/user/simultaneous.itely:794 (comment)
 msgid "Bar 1"
 msgstr "Takt 1"
 
 #. Documentation/user/fundamental.itely:722 (comment)
-#. Documentation/user/simultaneous.itely:742 (comment)
-#. Documentation/user/simultaneous.itely:767 (comment)
-#. Documentation/user/simultaneous.itely:795 (comment)
+#. Documentation/user/simultaneous.itely:747 (comment)
+#. Documentation/user/simultaneous.itely:772 (comment)
+#. Documentation/user/simultaneous.itely:800 (comment)
 msgid "Bar 2"
 msgstr "Takt 2"
 
@@ -1650,11 +1653,11 @@ msgstr "Erste Stimme einrichten"
 
 #. Documentation/user/fundamental.itely:1199 (context id)
 #. Documentation/user/fundamental.itely:2441 (context id)
-#. Documentation/user/vocal.itely:503 (context id)
-#. Documentation/user/vocal.itely:1233 (context id)
-#. Documentation/user/vocal.itely:1274 (context id)
-#. Documentation/user/keyboards.itely:327 (context id)
-#. Documentation/user/fretted-strings.itely:241 (context id)
+#. Documentation/user/vocal.itely:506 (context id)
+#. Documentation/user/vocal.itely:1235 (context id)
+#. Documentation/user/vocal.itely:1276 (context id)
+#. Documentation/user/keyboards.itely:329 (context id)
+#. Documentation/user/fretted-strings.itely:243 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable)
 #. input/lsr/jazz-combo-template.ly:204 (context id)
 #. input/lsr/jazz-combo-template.ly:213 (context id)
@@ -1665,8 +1668,8 @@ msgstr "eins"
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3468 (variable)
-#. Documentation/user/simultaneous.itely:783 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/simultaneous.itely:788 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
 #. input/lsr/incipit.ly:57 (variable)
@@ -1717,37 +1720,37 @@ msgid "SopMusic"
 msgstr "SoprNoten"
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3470 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "AltoMusic"
 msgstr "AltNoten"
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3471 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "TenorMusic"
 msgstr "TenorNoten"
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3472 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "BassMusic"
 msgstr "BassNoten"
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3473 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseOne"
 msgstr "StropheEins"
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3474 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseTwo"
 msgstr "StropheZwei"
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3475 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseThree"
 msgstr "StropheDrei"
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3476 (variable)
+#. Documentation/user/tweaks.itely:3477 (variable)
 msgid "VerseFour"
 msgstr "StropheVier"
 
@@ -1756,20 +1759,20 @@ msgid "Sop"
 msgstr "Sopr"
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3483 (context id)
-#. Documentation/user/input.itely:946 (context id)
+#. Documentation/user/tweaks.itely:3484 (context id)
+#. Documentation/user/input.itely:951 (context id)
 msgid "Alto"
 msgstr "Alt"
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3491 (context id)
-#. Documentation/user/input.itely:948 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 msgid "Tenor"
 msgstr "Tenor"
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3492 (context id)
-#. Documentation/user/input.itely:953 (context id)
+#. Documentation/user/tweaks.itely:3493 (context id)
+#. Documentation/user/input.itely:958 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr "Bass"
@@ -1789,7 +1792,7 @@ msgstr "StrophenText"
 #. Documentation/user/fundamental.itely:1361 (context id)
 #. Documentation/user/fundamental.itely:1428 (context id)
 #. Documentation/user/fundamental.itely:1489 (context id)
-#. Documentation/user/vocal.itely:820 (context id)
+#. Documentation/user/vocal.itely:826 (context id)
 #. input/lsr/score-for-diatonic-accordion.ly:59 (variable)
 msgid "verse"
 msgstr "Strophe"
@@ -1924,7 +1927,7 @@ msgstr "zur Standardgröße zurückgehen"
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:938 (variable)
+#. Documentation/user/input.itely:943 (variable)
 msgid "sopranoMusic"
 msgstr "SopranNoten"
 
@@ -1941,7 +1944,7 @@ msgid "sopranoWords"
 msgstr "SopranText"
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:939 (variable)
+#. Documentation/user/input.itely:944 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1956,7 +1959,7 @@ msgid "altoWords"
 msgstr "AltText"
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:940 (variable)
+#. Documentation/user/input.itely:945 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1971,7 +1974,7 @@ msgid "tenorWords"
 msgstr "TenorText"
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:941 (variable)
+#. Documentation/user/input.itely:946 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2136,13 +2139,14 @@ msgstr "Musikalische Ausdrücke ineinander verschachteln"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:547 (context id)
-#. Documentation/user/staff.itely:560 (context id)
-#. Documentation/user/staff.itely:568 (context id)
-#. Documentation/user/staff.itely:587 (context id)
-#. Documentation/user/staff.itely:600 (context id)
+#. Documentation/user/staff.itely:543 (context id)
+#. Documentation/user/staff.itely:556 (context id)
+#. Documentation/user/staff.itely:564 (context id)
+#. Documentation/user/staff.itely:583 (context id)
+#. Documentation/user/staff.itely:596 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
+#. @rglos in Documentation/fr/user/tweaks.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
@@ -2375,225 +2379,225 @@ msgstr "Vierstimmige SATB-Partitur"
 msgid "Building a score from scratch"
 msgstr "Eine Partitur von Grund auf erstellen"
 
-#. Documentation/user/tweaks.itely:595 (comment)
-#. Documentation/user/tweaks.itely:730 (comment)
+#. Documentation/user/tweaks.itely:596 (comment)
+#. Documentation/user/tweaks.itely:731 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "Dicke aller folgenden Bögen von 1.2 zu 5.0 vergrößern"
 
-#. Documentation/user/tweaks.itely:664 (comment)
-#. Documentation/user/tweaks.itely:703 (comment)
-#. Documentation/user/tweaks.itely:706 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
+#. Documentation/user/tweaks.itely:704 (comment)
+#. Documentation/user/tweaks.itely:707 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Nur die Dicke des direkt folgenden Bogens vergrößern"
 
-#. Documentation/user/tweaks.itely:734 (comment)
+#. Documentation/user/tweaks.itely:735 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr "Die Dicke aller folgenden Bögen zurücksezten auf 1.2"
 
-#. Documentation/user/tweaks.itely:1394 (comment)
+#. Documentation/user/tweaks.itely:1395 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "Keine Schlüssel in diesem System"
 
-#. Documentation/user/tweaks.itely:1396 (comment)
+#. Documentation/user/tweaks.itely:1397 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "Keine Taktangabe in diesem System"
 
-#. Documentation/user/tweaks.itely:1460 (comment)
+#. Documentation/user/tweaks.itely:1461 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Alle Schriftgrößen um ~24% verkleinern"
 
-#. Documentation/user/tweaks.itely:1526 (comment)
+#. Documentation/user/tweaks.itely:1527 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr "Die Halslänge und Linienabstand anpassen"
 
-#. Documentation/user/tweaks.itely:1956 (comment)
-#. Documentation/user/tweaks.itely:2026 (comment)
+#. Documentation/user/tweaks.itely:1957 (comment)
+#. Documentation/user/tweaks.itely:2027 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Details für späteren Text-Spanner setzen"
 
-#. Documentation/user/tweaks.itely:1959 (comment)
-#. Documentation/user/tweaks.itely:2029 (comment)
+#. Documentation/user/tweaks.itely:1960 (comment)
+#. Documentation/user/tweaks.itely:2030 (comment)
 msgid "Place dynamics above staff"
 msgstr "Dynamik-Zeichen über System setzen"
 
-#. Documentation/user/tweaks.itely:1961 (comment)
-#. Documentation/user/tweaks.itely:2033 (comment)
+#. Documentation/user/tweaks.itely:1962 (comment)
+#. Documentation/user/tweaks.itely:2034 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Beginn der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:1964 (comment)
-#. Documentation/user/tweaks.itely:1971 (comment)
-#. Documentation/user/tweaks.itely:2036 (comment)
-#. Documentation/user/tweaks.itely:2043 (comment)
+#. Documentation/user/tweaks.itely:1965 (comment)
+#. Documentation/user/tweaks.itely:1972 (comment)
+#. Documentation/user/tweaks.itely:2037 (comment)
+#. Documentation/user/tweaks.itely:2044 (comment)
 msgid "Add Dynamic Text"
 msgstr "Dynamik-Text hinzufügen"
 
-#. Documentation/user/tweaks.itely:1966 (comment)
-#. Documentation/user/tweaks.itely:2038 (comment)
+#. Documentation/user/tweaks.itely:1967 (comment)
+#. Documentation/user/tweaks.itely:2039 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Dynamic Line Spanner hinzufügen"
 
-#. Documentation/user/tweaks.itely:1968 (comment)
-#. Documentation/user/tweaks.itely:2040 (comment)
+#. Documentation/user/tweaks.itely:1969 (comment)
+#. Documentation/user/tweaks.itely:2041 (comment)
 msgid "Add Text Script"
 msgstr "Textbeschriftung hinzufügen"
 
-#. Documentation/user/tweaks.itely:1973 (comment)
-#. Documentation/user/tweaks.itely:2045 (comment)
+#. Documentation/user/tweaks.itely:1974 (comment)
+#. Documentation/user/tweaks.itely:2046 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Ende der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:2031 (comment)
+#. Documentation/user/tweaks.itely:2032 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr "Nächste Ottava-Klammer unter Text-Spanner setzen"
 
-#. Documentation/user/tweaks.itely:2093 (comment)
+#. Documentation/user/tweaks.itely:2094 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Noten spreizen um dem Text Platz zu machen"
 
-#. Documentation/user/tweaks.itely:2116 (comment)
+#. Documentation/user/tweaks.itely:2117 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Dieser Text ist kurz genug um ohne Kollision zu passen"
 
-#. Documentation/user/tweaks.itely:2120 (comment)
+#. Documentation/user/tweaks.itely:2121 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Dieser ist zu lang, darum wird der nach oben verschoben"
 
-#. Documentation/user/tweaks.itely:2124 (comment)
-#. Documentation/user/tweaks.itely:2129 (comment)
+#. Documentation/user/tweaks.itely:2125 (comment)
+#. Documentation/user/tweaks.itely:2130 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Abschalten der automatischen Vermeidung von Zusammenstößen"
 
-#. Documentation/user/tweaks.itely:2131 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "and turn on textLengthOn"
 msgstr "und Textlänge berücksichtigen"
 
-#. Documentation/user/tweaks.itely:2132 (comment)
+#. Documentation/user/tweaks.itely:2133 (comment)
 msgid "Spaces at end are honored"
 msgstr "Leerzeichen am Ende werden beachtet"
 
-#. Documentation/user/tweaks.itely:2239 (comment)
+#. Documentation/user/tweaks.itely:2240 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Breite um einen Linienabstand vergrößern"
 
-#. Documentation/user/tweaks.itely:2522 (comment)
+#. Documentation/user/tweaks.itely:2523 (comment)
 msgid "This will not work, see below:"
 msgstr "Das funktioniert nicht, siehe unten"
 
-#. Documentation/user/tweaks.itely:2526 (comment)
+#. Documentation/user/tweaks.itely:2527 (comment)
 msgid "This works:"
 msgstr "Das funktioniert:"
 
-#. Documentation/user/tweaks.itely:2577 (variable)
+#. Documentation/user/tweaks.itely:2578 (variable)
 msgid "naturalplusflat"
 msgstr "AuflösungB"
 
-#. Documentation/user/tweaks.itely:2618 (comment)
+#. Documentation/user/tweaks.itely:2619 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Breite um eine Einheit vergrößern"
 
-#. Documentation/user/tweaks.itely:2620 (comment)
+#. Documentation/user/tweaks.itely:2621 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 "Dynamik-Zeichen an einer Linie ausrichten, die 2 Einheiten über dem System "
 "ist"
 
-#. Documentation/user/tweaks.itely:2924 (variable)
-#. Documentation/user/tweaks.itely:2973 (variable)
-#. Documentation/user/tweaks.itely:3034 (variable)
-#. Documentation/user/tweaks.itely:3104 (variable)
-#. Documentation/user/tweaks.itely:3169 (variable)
-#. Documentation/user/tweaks.itely:3229 (variable)
+#. Documentation/user/tweaks.itely:2925 (variable)
+#. Documentation/user/tweaks.itely:2974 (variable)
+#. Documentation/user/tweaks.itely:3035 (variable)
+#. Documentation/user/tweaks.itely:3105 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/tweaks.itely:3230 (variable)
 msgid "rhMusic"
 msgstr "rhNoten"
 
-#. Documentation/user/tweaks.itely:2929 (comment)
-#. Documentation/user/tweaks.itely:2978 (comment)
-#. Documentation/user/tweaks.itely:3041 (comment)
-#. Documentation/user/tweaks.itely:3113 (comment)
-#. Documentation/user/tweaks.itely:3178 (comment)
+#. Documentation/user/tweaks.itely:2930 (comment)
+#. Documentation/user/tweaks.itely:2979 (comment)
+#. Documentation/user/tweaks.itely:3042 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
+#. Documentation/user/tweaks.itely:3179 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Beginn des polyphonen Abschnitts mit vier Stimmen"
 
-#. Documentation/user/tweaks.itely:2942 (variable)
-#. Documentation/user/tweaks.itely:2991 (variable)
-#. Documentation/user/tweaks.itely:3054 (variable)
-#. Documentation/user/tweaks.itely:3128 (variable)
-#. Documentation/user/tweaks.itely:3195 (variable)
-#. Documentation/user/tweaks.itely:3257 (variable)
+#. Documentation/user/tweaks.itely:2943 (variable)
+#. Documentation/user/tweaks.itely:2992 (variable)
+#. Documentation/user/tweaks.itely:3055 (variable)
+#. Documentation/user/tweaks.itely:3129 (variable)
+#. Documentation/user/tweaks.itely:3196 (variable)
+#. Documentation/user/tweaks.itely:3258 (variable)
 msgid "lhMusic"
 msgstr "lhNoten"
 
-#. Documentation/user/tweaks.itely:2951 (context id)
-#. Documentation/user/tweaks.itely:3000 (context id)
-#. Documentation/user/tweaks.itely:3063 (context id)
-#. Documentation/user/tweaks.itely:3137 (context id)
-#. Documentation/user/tweaks.itely:3204 (context id)
-#. Documentation/user/tweaks.itely:3266 (context id)
-#. Documentation/user/input.itely:959 (context id)
+#. Documentation/user/tweaks.itely:2952 (context id)
+#. Documentation/user/tweaks.itely:3001 (context id)
+#. Documentation/user/tweaks.itely:3064 (context id)
+#. Documentation/user/tweaks.itely:3138 (context id)
+#. Documentation/user/tweaks.itely:3205 (context id)
+#. Documentation/user/tweaks.itely:3267 (context id)
+#. Documentation/user/input.itely:964 (context id)
 msgid "RH"
 msgstr "RH"
 
-#. Documentation/user/tweaks.itely:2955 (context id)
-#. Documentation/user/tweaks.itely:3004 (context id)
-#. Documentation/user/tweaks.itely:3067 (context id)
-#. Documentation/user/tweaks.itely:3141 (context id)
-#. Documentation/user/tweaks.itely:3208 (context id)
-#. Documentation/user/tweaks.itely:3270 (context id)
-#. Documentation/user/input.itely:965 (context id)
+#. Documentation/user/tweaks.itely:2956 (context id)
+#. Documentation/user/tweaks.itely:3005 (context id)
+#. Documentation/user/tweaks.itely:3068 (context id)
+#. Documentation/user/tweaks.itely:3142 (context id)
+#. Documentation/user/tweaks.itely:3209 (context id)
+#. Documentation/user/tweaks.itely:3271 (context id)
+#. Documentation/user/input.itely:970 (context id)
 msgid "LH"
 msgstr "LH"
 
-#. Documentation/user/tweaks.itely:3182 (comment)
-#. Documentation/user/tweaks.itely:3244 (comment)
+#. Documentation/user/tweaks.itely:3183 (comment)
+#. Documentation/user/tweaks.itely:3245 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 "Verschiebe das c2 aus der Hauptnotenkolumne, damit Verschmelzung funktioniert"
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3247 (comment)
+#. Documentation/user/tweaks.itely:3186 (comment)
+#. Documentation/user/tweaks.itely:3248 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "Hals vom d2 muss nach unten, damit Verschmelzung gelingt"
 
-#. Documentation/user/tweaks.itely:3242 (comment)
+#. Documentation/user/tweaks.itely:3243 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "c2 neu positionieren rechts von der verschmolzenen Note"
 
-#. Documentation/user/tweaks.itely:3378 (comment)
-#. Documentation/user/tweaks.itely:3400 (comment)
+#. Documentation/user/tweaks.itely:3379 (comment)
+#. Documentation/user/tweaks.itely:3401 (comment)
 msgid "Visible tempo marking"
 msgstr "Sichtbare Tempo-Bezeichnung"
 
-#. Documentation/user/tweaks.itely:3382 (comment)
-#. Documentation/user/tweaks.itely:3404 (comment)
+#. Documentation/user/tweaks.itely:3383 (comment)
+#. Documentation/user/tweaks.itely:3405 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Unsichtbare Tempo-Bezeichnung um Fermate im MIDI zu verlängern"
 
-#. Documentation/user/tweaks.itely:3385 (comment)
-#. Documentation/user/tweaks.itely:3407 (comment)
+#. Documentation/user/tweaks.itely:3386 (comment)
+#. Documentation/user/tweaks.itely:3408 (comment)
 msgid "New tempo for next section"
 msgstr "Neues Tempo im nächsten Abschnitt"
 
-#. Documentation/user/tweaks.itely:3459 (variable)
+#. Documentation/user/tweaks.itely:3460 (variable)
 msgid "emphasize"
 msgstr "emphasize"
 
-#. Documentation/user/tweaks.itely:3463 (variable)
+#. Documentation/user/tweaks.itely:3464 (variable)
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "SopranoMusic"
 msgstr "SopranNoten"
 
-#. Documentation/user/tweaks.itely:3482 (context id)
-#. Documentation/user/input.itely:944 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:949 (context id)
 msgid "Soprano"
 msgstr "Sopran"
 
-#. Documentation/user/tweaks.itely:3691 (comment)
+#. Documentation/user/tweaks.itely:3692 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
-msgstr "Anordngen um Farbe von der color-notehead-Prozedur zu erhalten"
+msgstr "Anordnungen um Farbe von der color-notehead-Prozedur zu erhalten"
 
 #. @node in Documentation/user/tweaks.itely
 #. @chapter in Documentation/user/tweaks.itely
@@ -2684,18 +2688,21 @@ msgid "Properties of layout objects"
 msgstr "Eigenschaften von Layoutobjekten"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Finding the context"
 msgstr "Den Kontext finden"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Overriding once only"
 msgstr "Nur einmal mit \\override verändern"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Reverting"
@@ -2713,6 +2720,7 @@ msgid "Properties found in interfaces"
 msgstr "Eigenschaften, die Schnittstellen besitzen können"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Specifying the context in lyric mode"
@@ -2752,24 +2760,28 @@ msgid "Visibility and color of objects"
 msgstr "Sichtbarkeit und Farbe von Objekten"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "stencil"
 msgstr "stencil (Matrize)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "break-visibility"
 msgstr "break-visibility (unsichtbar machen)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "transparent"
 msgstr "transparent (durchsichtig)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "color"
@@ -2829,6 +2841,7 @@ msgid "Within-staff objects"
 msgstr "within-staff (Objekte innerhalb des Notensystems)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Fingering"
@@ -2838,16 +2851,20 @@ msgstr "Fingersatz"
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside-staff objects"
 msgstr "Objekte außerhalb des Notensystems"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "\\textLengthOn"
 msgstr "\\textLengthOn (Textlänge berücksichtigen)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Grob sizing"
@@ -2887,12 +2904,14 @@ msgid "Fixing overlapping notation"
 msgstr "Überlappende Notation in Ordnung bringen"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "padding property"
 msgstr "padding (Fülleigenschafte)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "left-padding and right-padding"
@@ -2901,36 +2920,42 @@ msgstr ""
 "links)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-padding property"
 msgstr "staff-padding (Systemfüllungseigenschaft)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "self-alignment-X property"
 msgstr "self-alignment-X (Selbstausrichtung-X-Eigenschaft)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-position property"
 msgstr "staff-position (Position innerhalb des Systems)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "extra-offset property"
 msgstr "extra-offset (Genaues Positionieren)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "positions property"
 msgstr "Ausrichtungseigenschaft"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "force-hshift property"
@@ -2970,12 +2995,14 @@ msgid "Other uses for tweaks"
 msgstr "Andere Benutzung von Optimierungen"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Tying notes across voices"
 msgstr "Noten zwischen unterschiedlichen Stimmen überbinden"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Simulating a fermata in MIDI"
@@ -3604,16 +3631,20 @@ msgstr "Setup für bestimmte Betriebssysteme"
 #. @subsection in Documentation/user/setup.itely
 #. @node in Documentation/es/user/setup.itely
 #. @subsection in Documentation/es/user/setup.itely
+#. @node in Documentation/de/user/setup.itely
+#. @subsection in Documentation/de/user/setup.itely
 msgid "Setup for MacOS X"
 msgstr "Einrichtung für MacOS X"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "Using Python scripts on MacOS 10.3 or 10.4"
 msgstr "Benutzung von Python-Skripten unter MacOS 10.3 oder 10.4"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "MacOS X on the command line"
 msgstr "MacOS X auf der Kommandozeile"
 
@@ -3743,22 +3774,24 @@ msgstr "Benutzung auf der Kommandozeile"
 #. @subsection in Documentation/fr/user/running.itely
 #. @node in Documentation/es/user/running.itely
 #. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking lilypond"
 msgstr "lilypond aufrufen"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking @command{lilypond}"
 msgstr "@command{lilypond} aufrufen"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for lilypond"
 msgstr "Optionen von lilypond auf der Kommandozeile"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{lilypond}"
 msgstr "Optionen auf der Kommandozeile für @command{lilypond}"
 
@@ -3793,16 +3826,19 @@ msgstr "Dateien mit convert-ly aktualisieren"
 
 #. @section in Documentation/user/running.itely
 #. @section in Documentation/es/user/running.itely
+#. @section in Documentation/de/user/running.itely
 msgid "Updating files with @command{convert-ly}"
 msgstr "Dateien mit @command{convert-ly} aktualisieren"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for convert-ly"
 msgstr "Optionen von convert-ly auf der Kommandozeile"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{convert-ly}"
 msgstr "Optionen von @command{convert-ly} auf der Kommandozeile"
 
@@ -3986,8 +4022,6 @@ msgstr "Formatabhängige Anweisungen"
 #. @subsection in Documentation/fr/user/running.itely
 #. @subheading in Documentation/fr/user/lilypond-book.itely
 #. @subheading in Documentation/es/user/lilypond-book.itely
-#. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 #. @subheading in Documentation/de/user/lilypond-book.itely
 msgid "Command line options"
 msgstr "Optionen auf der Kommandozeile"
@@ -4158,11 +4192,11 @@ msgstr "Index der LilyPond-Befehle"
 msgid "Musical notation"
 msgstr "Musikalische Notation"
 
-#. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:1028 (variable)
-#. Documentation/user/input.itely:1047 (variable)
-#. Documentation/user/input.itely:1084 (variable)
-#. Documentation/user/input.itely:1099 (variable)
+#. Documentation/user/pitches.itely:666 (variable)
+#. Documentation/user/input.itely:1033 (variable)
+#. Documentation/user/input.itely:1052 (variable)
+#. Documentation/user/input.itely:1089 (variable)
+#. Documentation/user/input.itely:1104 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
@@ -4172,35 +4206,35 @@ msgstr "Musikalische Notation"
 msgid "music"
 msgstr "Noten"
 
-#. Documentation/user/pitches.itely:1045 (comment)
+#. Documentation/user/pitches.itely:1039 (comment)
 msgid "not strictly necessary, but a good reminder"
 msgstr "nicht unbdingt nötig, aber gut zu erinnern"
 
-#. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1084 (variable)
+#. Documentation/user/pitches.itely:1046 (context id)
+#. Documentation/user/staff.itely:1076 (variable)
 msgid "clarinet"
 msgstr "Klarinette"
 
-#. Documentation/user/pitches.itely:1137 (variable)
+#. Documentation/user/pitches.itely:1130 (variable)
 msgid "musicA"
 msgstr "NotenA"
 
-#. Documentation/user/pitches.itely:1151 (variable)
+#. Documentation/user/pitches.itely:1144 (variable)
 msgid "musicB"
 msgstr "NotenB"
 
-#. Documentation/user/pitches.itely:1170 (context id)
-#. Documentation/user/keyboards.itely:170 (context id)
-#. Documentation/user/keyboards.itely:264 (context id)
+#. Documentation/user/pitches.itely:1163 (context id)
+#. Documentation/user/keyboards.itely:171 (context id)
+#. Documentation/user/keyboards.itely:265 (context id)
 #. Documentation/user/percussion.itely:175 (variable)
 #. Documentation/user/percussion.itely:365 (variable)
 #. input/lsr/jazz-combo-template.ly:241 (variable)
 msgid "up"
 msgstr "oben"
 
-#. Documentation/user/pitches.itely:1174 (context id)
-#. Documentation/user/keyboards.itely:180 (context id)
-#. Documentation/user/keyboards.itely:273 (context id)
+#. Documentation/user/pitches.itely:1167 (context id)
+#. Documentation/user/keyboards.itely:181 (context id)
+#. Documentation/user/keyboards.itely:274 (context id)
 #. Documentation/user/percussion.itely:178 (variable)
 #. Documentation/user/percussion.itely:366 (variable)
 #. input/lsr/jazz-combo-template.ly:247 (variable)
@@ -4446,36 +4480,36 @@ msgstr "Notenköpfe mit besonderen Formen"
 msgid "Improvisation"
 msgstr "Improvisation"
 
-#. Documentation/user/rhythms.itely:285 (comment)
+#. Documentation/user/rhythms.itely:287 (comment)
 msgid "Alter durations to triplets"
 msgstr "Dauern zu Triolen verändern"
 
-#. Documentation/user/rhythms.itely:287 (comment)
-#. Documentation/user/rhythms.itely:312 (comment)
+#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:314 (comment)
 msgid "Normal durations"
 msgstr "Normale Tondauern"
 
-#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:291 (comment)
 msgid "Double the duration of chord"
 msgstr "Dauer der Akkorde verdoppeln"
 
-#. Documentation/user/rhythms.itely:291 (comment)
+#. Documentation/user/rhythms.itely:293 (comment)
 msgid "Duration of quarter, appears like sixteenth"
 msgstr "Dauer einer Vietel, erscheint vie eine Sechszehntel"
 
-#. Documentation/user/rhythms.itely:314 (comment)
+#. Documentation/user/rhythms.itely:316 (comment)
 msgid "Scale music by *2/3"
 msgstr "Noten mit 2/3 skalieren"
 
-#. Documentation/user/rhythms.itely:318 (comment)
+#. Documentation/user/rhythms.itely:320 (comment)
 msgid "Scale music by *2"
 msgstr "Noten *2 skalieren"
 
-#. Documentation/user/rhythms.itely:403 (comment)
+#. Documentation/user/rhythms.itely:404 (comment)
 msgid "First alternative: following note is tied normally"
 msgstr "Erste Weiche: nächste Note ist normal gebunden"
 
-#. Documentation/user/rhythms.itely:405 (comment)
+#. Documentation/user/rhythms.itely:406 (comment)
 msgid "Second alternative: following note has a repeated tie"
 msgstr "Zweite Weiche: folgende Note hat einen Wiederholten Bindebogen"
 
@@ -4495,136 +4529,137 @@ msgstr "Setze Longa-Pause, gleich zwei Breven"
 msgid "Print a breve rest"
 msgstr "Setze Breve-Pause"
 
-#. Documentation/user/rhythms.itely:631 (comment)
+#. Documentation/user/rhythms.itely:630 (comment)
 msgid "This is valid input, but does nothing"
 msgstr "Gültiger Eingabecode, aber tut nichts"
 
-#. Documentation/user/rhythms.itely:657 (comment)
-#. Documentation/user/rhythms.itely:710 (comment)
+#. Documentation/user/rhythms.itely:656 (comment)
+#. Documentation/user/rhythms.itely:709 (comment)
 msgid "Rest measures contracted to single measure"
 msgstr "Pausentakte zu einem einzelnen Takt zusammegezogen"
 
-#. Documentation/user/rhythms.itely:706 (comment)
+#. Documentation/user/rhythms.itely:705 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:35 (comment)
 msgid "Default behavior"
 msgstr "Standart"
 
-#. Documentation/user/rhythms.itely:713 (comment)
+#. Documentation/user/rhythms.itely:712 (comment)
 msgid "Rest measures expanded"
 msgstr "Pausentakte \tausklappen"
 
-#. Documentation/user/rhythms.itely:746 (comment)
+#. Documentation/user/rhythms.itely:745 (comment)
 msgid "This fails, as the wrong object name is specified"
 msgstr ""
 "Das funktioniert nicht, weil die falsche Objektbezeichnung angegeben ist"
 
-#. Documentation/user/rhythms.itely:749 (comment)
+#. Documentation/user/rhythms.itely:748 (comment)
 msgid "This is correct and works"
 msgstr "Das stimmt und funktioniert"
 
-#. Documentation/user/rhythms.itely:871 (comment)
+#. Documentation/user/rhythms.itely:873 (comment)
 msgid "Default style"
 msgstr "Standardstil"
 
-#. Documentation/user/rhythms.itely:874 (comment)
+#. Documentation/user/rhythms.itely:876 (comment)
 msgid "Change to numeric style"
 msgstr "Wechsel zum nummerierten Stil"
 
-#. Documentation/user/rhythms.itely:878 (comment)
+#. Documentation/user/rhythms.itely:880 (comment)
 msgid "Revert to default style"
 msgstr "Zurück zum Standard"
 
-#. Documentation/user/rhythms.itely:1017 (comment)
+#. Documentation/user/rhythms.itely:1021 (comment)
 msgid "Show all bar numbers"
 msgstr "Alle Taknummern anzeigen"
 
-#. Documentation/user/rhythms.itely:1134 (comment)
+#. Documentation/user/rhythms.itely:1140 (comment)
 msgid "Now each staff has its own time signature."
 msgstr "Jetzt hat jedes System eine eigene Taktart"
 
-#. Documentation/user/rhythms.itely:1256 (context id)
+#. Documentation/user/rhythms.itely:1262 (context id)
 msgid "myRhythm"
 msgstr "meinRhythmus"
 
-#. Documentation/user/rhythms.itely:1585 (comment)
+#. Documentation/user/rhythms.itely:1598 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr "1/16-Balken für alle Taktarten beim 1/16-Moment beenden"
 
-#. Documentation/user/rhythms.itely:1589 (comment)
+#. Documentation/user/rhythms.itely:1602 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr "1/23-Balken für alle Taktarten beim 1/16-Moment beenden"
 
-#. Documentation/user/rhythms.itely:1599 (comment)
+#. Documentation/user/rhythms.itely:1612 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr "Balken aller Längen im 5/8-Takt am 2/8-Moment beenden"
 
-#. Documentation/user/rhythms.itely:1614 (comment)
+#. Documentation/user/rhythms.itely:1627 (comment)
 msgid "rhythm 3-1-1-2"
 msgstr "Rhythmus 3-1-1-2"
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1628 (comment)
 msgid "Context not specified - does not work correctly"
 msgstr "Kontext nicht angegeben - funktioniert nicht richtig"
 
-#. Documentation/user/rhythms.itely:1621 (comment)
+#. Documentation/user/rhythms.itely:1634 (comment)
 msgid "Works correctly with context specified"
 msgstr "Funktioniert richtig mit angegebenem Kontext"
 
-#. Documentation/user/rhythms.itely:1654 (comment)
+#. Documentation/user/rhythms.itely:1667 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr "Regel annullieren, dass 1/16-Balken im 4/4-Takt am 1/4-Moment enden"
 
-#. Documentation/user/rhythms.itely:1667 (comment)
+#. Documentation/user/rhythms.itely:1680 (comment)
 msgid "this won't revert it!"
 msgstr "Das macht es nicth rückgängig"
 
-#. Documentation/user/rhythms.itely:1669 (comment)
+#. Documentation/user/rhythms.itely:1682 (comment)
 msgid "this will"
 msgstr "Das schon"
 
-#. Documentation/user/rhythms.itely:1802 (comment)
+#. Documentation/user/rhythms.itely:1815 (comment)
 msgid "revert to non-feathered beams"
 msgstr "in nichtgespreizte Balken zurückverwandeln"
 
-#. Documentation/user/rhythms.itely:2025 (comment)
-#. Documentation/user/rhythms.itely:2041 (comment)
+#. Documentation/user/rhythms.itely:2037 (comment)
+#. Documentation/user/rhythms.itely:2053 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Erste Taktnummer soll auch gesetzt werden"
 
-#. Documentation/user/rhythms.itely:2042 (comment)
-#. Documentation/user/rhythms.itely:2090 (comment)
+#. Documentation/user/rhythms.itely:2054 (comment)
+#. Documentation/user/rhythms.itely:2102 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Jeden zweiten Takt eine Taktnummer setzen"
 
-#. Documentation/user/rhythms.itely:2058 (comment)
+#. Documentation/user/rhythms.itely:2070 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr "Taktnummern am Zeilenende verbieten und woanders erlauben"
 
-#. Documentation/user/rhythms.itely:2062 (comment)
-#. Documentation/user/rhythms.itely:2088 (comment)
+#. Documentation/user/rhythms.itely:2074 (comment)
+#. Documentation/user/rhythms.itely:2100 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Taktnummer um Faktor zwei vergrößern"
 
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2078 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Einen Kasten um die folgenden Taktnummern zeichnen"
 
-#. Documentation/user/rhythms.itely:2071 (comment)
+#. Documentation/user/rhythms.itely:2083 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Einen Kreis um die folgenden Taktnummern zeichnen"
 
-#. Documentation/user/rhythms.itely:2093 (comment)
+#. Documentation/user/rhythms.itely:2105 (comment)
 msgid "Center-align bar numbers"
 msgstr "Taktnummern zentrieren"
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2108 (comment)
 msgid "Right-align bar numbers"
 msgstr "Taktnummern rechtsbündig"
 
-#. Documentation/user/rhythms.itely:2199 (variable)
+#. Documentation/user/rhythms.itely:2210 (variable)
 msgid "pipeSymbol"
 msgstr "pipeSymbol"
 
-#. Documentation/user/rhythms.itely:2587 (variable)
+#. Documentation/user/rhythms.itely:2598 (variable)
 msgid "MyCadenza"
 msgstr "MeineKadenz"
 
@@ -4975,30 +5010,30 @@ msgstr "An Kadenzen ausrichten"
 msgid "Time administration"
 msgstr "Verwaltung der Zeiteinheiten"
 
-#. Documentation/user/expressive.itely:388 (variable)
-#. Documentation/user/expressive.itely:456 (variable)
+#. Documentation/user/expressive.itely:386 (variable)
+#. Documentation/user/expressive.itely:454 (variable)
 msgid "moltoF"
 msgstr "moltoF"
 
-#. Documentation/user/expressive.itely:409 (variable)
-#. Documentation/user/expressive.itely:439 (variable)
+#. Documentation/user/expressive.itely:407 (variable)
+#. Documentation/user/expressive.itely:437 (variable)
 msgid "roundF"
 msgstr "rundF"
 
-#. Documentation/user/expressive.itely:411 (variable)
-#. Documentation/user/expressive.itely:443 (variable)
+#. Documentation/user/expressive.itely:409 (variable)
+#. Documentation/user/expressive.itely:441 (variable)
 msgid "boxF"
 msgstr "KastenF"
 
-#. Documentation/user/expressive.itely:426 (variable)
+#. Documentation/user/expressive.itely:424 (variable)
 msgid "sfzp"
 msgstr "sfzp"
 
-#. Documentation/user/expressive.itely:444 (variable)
+#. Documentation/user/expressive.itely:442 (variable)
 msgid "roundFdynamic"
 msgstr "rundFDynamik"
 
-#. Documentation/user/expressive.itely:445 (variable)
+#. Documentation/user/expressive.itely:443 (variable)
 msgid "boxFdynamic"
 msgstr "KastenFDynamik"
 
@@ -5303,27 +5338,27 @@ msgstr "gleichartig"
 msgid "Tremolo repeats"
 msgstr "Tremolo-Wiederholung"
 
-#. Documentation/user/simultaneous.itely:93 (comment)
+#. Documentation/user/simultaneous.itely:94 (comment)
 msgid "explicit single voice"
 msgstr "explizit eine Stimme"
 
-#. Documentation/user/simultaneous.itely:99 (comment)
+#. Documentation/user/simultaneous.itely:100 (comment)
 msgid "single first note"
 msgstr "einzelne erste Note"
 
-#. Documentation/user/simultaneous.itely:111 (comment)
+#. Documentation/user/simultaneous.itely:112 (comment)
 msgid "no single first note"
 msgstr "keine einzelne erste Note"
 
-#. Documentation/user/simultaneous.itely:617 (variable)
+#. Documentation/user/simultaneous.itely:621 (variable)
 msgid "instrumentOne"
 msgstr "InstrumentEins"
 
-#. Documentation/user/simultaneous.itely:625 (variable)
+#. Documentation/user/simultaneous.itely:629 (variable)
 msgid "instrumentTwo"
 msgstr "InstrumentZwei"
 
-#. Documentation/user/simultaneous.itely:801 (comment)
+#. Documentation/user/simultaneous.itely:806 (comment)
 msgid "Bar 3 ..."
 msgstr "Takt 3 ..."
 
@@ -5462,24 +5497,24 @@ msgstr "Stimme"
 msgid "Writing music in parallel"
 msgstr "Musik parallel notieren"
 
-#. Documentation/user/staff.itely:1053 (variable)
-#. Documentation/user/staff.itely:1068 (variable)
-#. Documentation/user/staff.itely:1222 (variable)
+#. Documentation/user/staff.itely:1045 (variable)
+#. Documentation/user/staff.itely:1060 (variable)
+#. Documentation/user/staff.itely:1213 (variable)
 msgid "flute"
 msgstr "Flöte"
 
-#. Documentation/user/staff.itely:1173 (variable)
-#. Documentation/user/staff.itely:1194 (variable)
+#. Documentation/user/staff.itely:1164 (variable)
+#. Documentation/user/staff.itely:1185 (variable)
 msgid "oboe"
 msgstr "Oboe"
 
-#. Documentation/user/staff.itely:1243 (variable)
-#. Documentation/user/staff.itely:1259 (context id)
+#. Documentation/user/staff.itely:1234 (variable)
+#. Documentation/user/staff.itely:1250 (context id)
 msgid "piccolo"
 msgstr "Piccolo"
 
-#. Documentation/user/staff.itely:1251 (variable)
-#. Documentation/user/staff.itely:1260 (context id)
+#. Documentation/user/staff.itely:1242 (variable)
+#. Documentation/user/staff.itely:1251 (context id)
 msgid "cbassoon"
 msgstr "Ktrfgt"
 
@@ -5707,7 +5742,7 @@ msgstr "Stichnoten"
 msgid "Formatting cue notes"
 msgstr "Stichnoten formatieren"
 
-#. Documentation/user/editorial.itely:321 (comment)
+#. Documentation/user/editorial.itely:325 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr "Das ist Unsinn, die Hälsen bleiben schwarz"
 
@@ -5843,7 +5878,7 @@ msgstr "Gitternetzlinien"
 msgid "Analysis brackets"
 msgstr "Analyseklammern"
 
-#. Documentation/user/text.itely:418 (variable)
+#. Documentation/user/text.itely:421 (variable)
 msgid "allegro"
 msgstr "Allegro"
 
@@ -6027,36 +6062,36 @@ msgstr "Schriftart des gesamten Dokuments"
 msgid "Specialist notation"
 msgstr "Spezielle Notation"
 
-#. Documentation/user/vocal.itely:509 (comment)
+#. Documentation/user/vocal.itely:512 (comment)
 msgid "not recommended: left aligns syllables"
 msgstr "nicht empfohlen: Silben links ausrichten"
 
-#. Documentation/user/vocal.itely:512 (comment)
+#. Documentation/user/vocal.itely:515 (comment)
 msgid "wrong: durations needed"
 msgstr "Falsch: brache Dauern"
 
-#. Documentation/user/vocal.itely:515 (comment)
+#. Documentation/user/vocal.itely:518 (comment)
 msgid "correct"
 msgstr "richtig"
 
-#. Documentation/user/vocal.itely:664 (context id)
+#. Documentation/user/vocal.itely:667 (context id)
 msgid "lala"
 msgstr "lala"
 
-#. Documentation/user/vocal.itely:802 (context id)
+#. Documentation/user/vocal.itely:808 (context id)
 msgid "splitpart"
 msgstr "StimmeTeilen"
 
-#. Documentation/user/vocal.itely:847 (variable)
+#. Documentation/user/vocal.itely:853 (variable)
 msgid "voice"
 msgstr "Stimme"
 
-#. Documentation/user/vocal.itely:854 (variable)
+#. Documentation/user/vocal.itely:860 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:22 (variable)
 msgid "lyr"
 msgstr "Text"
 
-#. Documentation/user/vocal.itely:1053 (context id)
+#. Documentation/user/vocal.itely:1059 (context id)
 msgid "tune"
 msgstr "Melodie"
 
@@ -6064,40 +6099,36 @@ msgstr "Melodie"
 msgid "lahlah"
 msgstr "Lalala"
 
-#. Documentation/user/vocal.itely:1112 (comment)
-msgid "applies to \\\"fas\\\""
-msgstr "gehört zu \\\"fas\\\""
-
-#. Documentation/user/vocal.itely:1282 (comment)
+#. Documentation/user/vocal.itely:1284 (comment)
 msgid "moves the column off the left margin;"
 msgstr "Spalte vom linken Rand wegbewegen"
 
-#. Documentation/user/vocal.itely:1283 (comment)
+#. Documentation/user/vocal.itely:1285 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr "Kann entfernt werden, wenn wenig Platz auf der Seite ist"
 
-#. Documentation/user/vocal.itely:1291 (comment)
-#. Documentation/user/vocal.itely:1309 (comment)
+#. Documentation/user/vocal.itely:1293 (comment)
+#. Documentation/user/vocal.itely:1311 (comment)
 msgid "adds vertical spacing between verses"
 msgstr "Vertikaler Abstand zwischen Strophen"
 
-#. Documentation/user/vocal.itely:1299 (comment)
+#. Documentation/user/vocal.itely:1301 (comment)
 msgid "adds horizontal spacing between columns;"
 msgstr "Horizontalen Abstand zwischen Spalten hinzufügen;"
 
-#. Documentation/user/vocal.itely:1300 (comment)
+#. Documentation/user/vocal.itely:1302 (comment)
 msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr "Wenn sie immer noch zu eng sind, mehr \\\" \\\"-Paare hinzufügen"
 
-#. Documentation/user/vocal.itely:1301 (comment)
+#. Documentation/user/vocal.itely:1303 (comment)
 msgid "until the result looks good"
 msgstr "bis das Resultat gut aussieht"
 
-#. Documentation/user/vocal.itely:1317 (comment)
+#. Documentation/user/vocal.itely:1319 (comment)
 msgid "gives some extra space on the right margin;"
 msgstr "zusätzlichen Platz für den rechten Rand"
 
-#. Documentation/user/vocal.itely:1318 (comment)
+#. Documentation/user/vocal.itely:1320 (comment)
 msgid "can be removed if page space is tight"
 msgstr "kann entfernt werden, wenn wenig Platz auf der Seite ist"
 
@@ -6411,7 +6442,6 @@ msgstr "Strophen mit unterschiedlichem Rhythmus"
 
 #. @subsubheading in Documentation/user/vocal.itely
 #. @subsubheading in Documentation/es/user/vocal.itely
-#. @subsubheading in Documentation/de/user/vocal.itely
 msgid "Ignoring melismata"
 msgstr "Melismen ignorieren"
 
@@ -6443,35 +6473,35 @@ msgstr "Die Strophen am Ende ausdrucken"
 msgid "Printing stanzas at the end in multiple columns"
 msgstr "Die Strophen am Ende in mehreren Spalten drucken"
 
-#. Documentation/user/keyboards.itely:182 (comment)
+#. Documentation/user/keyboards.itely:183 (comment)
 msgid "keep staff alive"
 msgstr "System aufrecht erhalten"
 
-#. Documentation/user/keyboards.itely:265 (context id)
+#. Documentation/user/keyboards.itely:266 (context id)
 msgid "melOne"
 msgstr "melEins"
 
-#. Documentation/user/keyboards.itely:333 (context id)
-#. Documentation/user/fretted-strings.itely:242 (context id)
+#. Documentation/user/keyboards.itely:335 (context id)
+#. Documentation/user/fretted-strings.itely:244 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable)
 #. input/lsr/jazz-combo-template.ly:205 (context id)
 #. input/lsr/jazz-combo-template.ly:214 (context id)
 msgid "two"
 msgstr "zwei"
 
-#. Documentation/user/keyboards.itely:385 (comment)
+#. Documentation/user/keyboards.itely:389 (comment)
 msgid "stems may overlap the other staff"
 msgstr "Hals kann das andere System überschneiden"
 
-#. Documentation/user/keyboards.itely:387 (comment)
+#. Documentation/user/keyboards.itely:391 (comment)
 msgid "extend the stems to reach other other staff"
 msgstr "Hälse verlängern um anderes System zu erreichen"
 
-#. Documentation/user/keyboards.itely:389 (comment)
+#. Documentation/user/keyboards.itely:393 (comment)
 msgid "do not print extra flags"
 msgstr "keine doppelten Fähnchen"
 
-#. Documentation/user/keyboards.itely:391 (comment)
+#. Documentation/user/keyboards.itely:395 (comment)
 msgid "prevent beaming as needed"
 msgstr "Balken verhindern"
 
@@ -6607,6 +6637,20 @@ msgstr "Diskant-Symbole"
 msgid "Harp"
 msgstr "Harfe"
 
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#, fuzzy
+msgid "Harp notation"
+msgstr "Notation auf Systemen"
+
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#. @node in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
+#, fuzzy
+msgid "Harp pedals"
+msgstr "Klavierpedal"
+
 #. @node in Documentation/user/unfretted-strings.itely
 #. @section in Documentation/user/unfretted-strings.itely
 #. @node in Documentation/fr/user/unfretted-strings.itely
@@ -6664,6 +6708,7 @@ msgstr "Flageolett"
 
 #. @rglos in Documentation/user/unfretted-strings.itely
 #. @rglos in Documentation/es/user/unfretted-strings.itely
+#. @rglos in Documentation/de/user/unfretted-strings.itely
 msgid "harmonics"
 msgstr "Flageolett"
 
@@ -6681,45 +6726,45 @@ msgstr "Bartók-Pizzicato"
 msgid "Snap (Bartók) pizzicato"
 msgstr "Bartók-Pizzicato"
 
-#. Documentation/user/fretted-strings.itely:238 (variable)
+#. Documentation/user/fretted-strings.itely:240 (variable)
 msgid "melodia"
 msgstr "Melodie"
 
-#. Documentation/user/fretted-strings.itely:243 (context id)
+#. Documentation/user/fretted-strings.itely:245 (context id)
 msgid "shared"
 msgstr "gemeinsam"
 
-#. Documentation/user/fretted-strings.itely:244 (context id)
+#. Documentation/user/fretted-strings.itely:246 (context id)
 msgid "solo"
 msgstr "solo"
 
-#. Documentation/user/fretted-strings.itely:321 (variable)
+#. Documentation/user/fretted-strings.itely:323 (variable)
 msgid "mynotes"
 msgstr "meineNoten"
 
-#. Documentation/user/fretted-strings.itely:448 (comment)
+#. Documentation/user/fretted-strings.itely:450 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:27 (comment)
 msgid "A chord for ukelele"
 msgstr "Akkord für Ukulele"
 
-#. Documentation/user/fretted-strings.itely:768 (variable)
-#. Documentation/user/fretted-strings.itely:791 (variable)
-#. Documentation/user/fretted-strings.itely:820 (variable)
-#. Documentation/user/fretted-strings.itely:849 (variable)
-#. Documentation/user/fretted-strings.itely:873 (variable)
-#. Documentation/user/fretted-strings.itely:917 (variable)
+#. Documentation/user/fretted-strings.itely:770 (variable)
+#. Documentation/user/fretted-strings.itely:793 (variable)
+#. Documentation/user/fretted-strings.itely:822 (variable)
+#. Documentation/user/fretted-strings.itely:851 (variable)
+#. Documentation/user/fretted-strings.itely:875 (variable)
+#. Documentation/user/fretted-strings.itely:919 (variable)
 msgid "mychords"
 msgstr "meineAkkorde"
 
-#. Documentation/user/fretted-strings.itely:795 (variable)
+#. Documentation/user/fretted-strings.itely:797 (variable)
 msgid "mychordlist"
 msgstr "meineAkkordliste"
 
-#. Documentation/user/fretted-strings.itely:904 (comment)
+#. Documentation/user/fretted-strings.itely:906 (comment)
 msgid "add a new chord shape"
 msgstr "Neues Akkordmuster hinzufügen"
 
-#. Documentation/user/fretted-strings.itely:908 (comment)
+#. Documentation/user/fretted-strings.itely:910 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr "neue Akkorde basierend auf dem power-chord-Muster hinzufügen"
 
@@ -6804,6 +6849,8 @@ msgstr "Bund-Diagramm-Beschriftung"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Predefined fret diagrams"
 msgstr "Vordefinierte Bund-Diagramme"
 
@@ -6811,6 +6858,8 @@ msgstr "Vordefinierte Bund-Diagramme"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Automatic fret diagrams"
 msgstr "Automatische Bund-Diagramme"
 
@@ -6989,6 +7038,8 @@ msgstr "Grundlagen der Schlagzeugnotation"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Drum rolls"
 msgstr "Trommelwirbel"
 
@@ -6996,6 +7047,8 @@ msgstr "Trommelwirbel"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Pitched percussion"
 msgstr "Schlagzeug mit Tonhöhe"
 
@@ -7014,6 +7067,8 @@ msgstr "Schlagzeugsysteme"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Custom percussion staves"
 msgstr "Eigene Schlagzeugsysteme"
 
@@ -7098,16 +7153,16 @@ msgstr "Dudelsack-Beispiele"
 msgid "myChords"
 msgstr "meineAkkorde"
 
-#. Documentation/user/chords.itely:981 (comment)
-#. Documentation/user/chords.itely:1002 (comment)
+#. Documentation/user/chords.itely:984 (comment)
+#. Documentation/user/chords.itely:1005 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr "Noten auf dem gleichen System wie die Symbole"
 
-#. Documentation/user/chords.itely:1061 (comment)
+#. Documentation/user/chords.itely:1068 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr "Linien stimmen hier, mit dem gleichen Rhythmus wie im Bass"
 
-#. Documentation/user/chords.itely:1073 (comment)
+#. Documentation/user/chords.itely:1080 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr "Linien stimmen nicht, obwohl der Rhythmus der gleiche ist"
 
@@ -7248,18 +7303,40 @@ msgstr "Eingabe des Generalbass'"
 msgid "Displaying figured bass"
 msgstr "Generalbass anzeigen"
 
-#. Documentation/user/ancient.itely:355 (context id)
+#. Documentation/user/ancient.itely:357 (context id)
 msgid "discantus"
 msgstr "Discantus"
 
-#. Documentation/user/ancient.itely:821 (variable)
+#. Documentation/user/ancient.itely:823 (variable)
 msgid "ficta"
 msgstr "ficta"
 
-#. Documentation/user/ancient.itely:973 (context id)
+#. Documentation/user/ancient.itely:976 (context id)
 msgid "cantus"
 msgstr "cantus"
 
+#. Documentation/user/ancient.itely:2399 (variable)
+#. Documentation/user/ancient.itely:2434 (variable)
+#. Documentation/user/ancient.itely:2502 (context id)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
+msgid "chant"
+msgstr "Hymnus"
+
+#. Documentation/user/ancient.itely:2405 (variable)
+#. Documentation/user/ancient.itely:2445 (variable)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
+msgid "verba"
+msgstr "verba"
+
+#. Documentation/user/ancient.itely:2487 (variable)
+msgid "spiritus"
+msgstr ""
+
+#. Documentation/user/ancient.itely:2495 (variable)
+#, fuzzy
+msgid "spirLyr"
+msgstr "SoprText"
+
 #. @node in Documentation/user/ancient.itely
 #. @section in Documentation/user/ancient.itely
 #. @node in Documentation/fr/user/ancient.itely
@@ -7624,7 +7701,7 @@ msgstr "Weitere Literatur"
 msgid "not printed"
 msgstr "nicht gedruckt"
 
-#. Documentation/user/input.itely:942 (variable)
+#. Documentation/user/input.itely:947 (variable)
 msgid "allLyrics"
 msgstr "alleText"
 
@@ -7960,46 +8037,48 @@ msgstr "Verschidene Instrumente angleichen (ii)"
 #. @subsection in Documentation/user/input.itely
 #. @node in Documentation/es/user/input.itely
 #. @subsection in Documentation/es/user/input.itely
+#. @node in Documentation/de/user/input.itely
+#. @subsection in Documentation/de/user/input.itely
 msgid "Percussion in MIDI"
 msgstr "Schlagzeug in MIDI"
 
-#. Documentation/user/spacing.itely:875 (comment)
+#. Documentation/user/spacing.itely:864 (comment)
 msgid "this does nothing"
 msgstr "Das macht gar nichts"
 
-#. Documentation/user/spacing.itely:876 (comment)
+#. Documentation/user/spacing.itely:865 (comment)
 msgid "a break here would work"
 msgstr "ein Umbruch hier würde funktionieren"
 
-#. Documentation/user/spacing.itely:877 (comment)
+#. Documentation/user/spacing.itely:866 (comment)
 msgid "as does this break"
 msgstr "wie dieser Umbruch"
 
-#. Documentation/user/spacing.itely:889 (comment)
+#. Documentation/user/spacing.itely:878 (comment)
 msgid "now the break is allowed"
 msgstr "jetzt ist der Umbruch erlaubt"
 
-#. Documentation/user/spacing.itely:1777 (comment)
+#. Documentation/user/spacing.itely:1757 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "jetzt ist der Text näher am System"
 
-#. Documentation/user/spacing.itely:1779 (comment)
+#. Documentation/user/spacing.itely:1759 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr "indem outside-staff-priority auf Nicht-Zahl gesetzt wird,"
 
-#. Documentation/user/spacing.itely:1780 (comment)
+#. Documentation/user/spacing.itely:1760 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr " werden vertikale Zusammenstöße vermieden"
 
-#. Documentation/user/spacing.itely:1783 (comment)
+#. Documentation/user/spacing.itely:1763 (comment)
 msgid "now they will collide"
 msgstr "jetzt kollidieren sie"
 
-#. Documentation/user/spacing.itely:1808 (comment)
+#. Documentation/user/spacing.itely:1788 (comment)
 msgid "the markup is too close to the following note"
 msgstr "Beschriftung zu nah an der folgenden Note"
 
-#. Documentation/user/spacing.itely:1811 (comment)
+#. Documentation/user/spacing.itely:1791 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "Setzen von outside-staff-horizontal-padding hilft"
 
@@ -8384,61 +8463,61 @@ msgstr "allein keine Wirkung"
 msgid "effective only when both overrides are present"
 msgstr "gilt nur, wenn beide \"override\" vorhanden sind"
 
-#. Documentation/user/changing-defaults.itely:2432 (comment)
+#. Documentation/user/changing-defaults.itely:2430 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr "Taktlinie am Ende der Zeile entfernen"
 
-#. Documentation/user/changing-defaults.itely:2478 (comment)
+#. Documentation/user/changing-defaults.itely:2476 (comment)
 msgid "Try to remove all key signatures"
 msgstr "Versuche alle Tonarten zu entfernen"
 
-#. Documentation/user/changing-defaults.itely:2897 (comment)
+#. Documentation/user/changing-defaults.itely:2896 (comment)
 msgid "move horizontally left"
 msgstr "horizontal nach links verschieben"
 
-#. Documentation/user/changing-defaults.itely:2899 (comment)
+#. Documentation/user/changing-defaults.itely:2898 (comment)
 msgid "move vertically up"
 msgstr "vertikal hochschieben"
 
-#. Documentation/user/changing-defaults.itely:2900 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "third finger"
 msgstr "dritter Finger"
 
-#. Documentation/user/changing-defaults.itely:2946 (comment)
+#. Documentation/user/changing-defaults.itely:2945 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr "RehearsalMark zentrieren über dem Schlüssel"
 
-#. Documentation/user/changing-defaults.itely:2952 (comment)
+#. Documentation/user/changing-defaults.itely:2951 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr "RehearsalMark zentrieren über der Taktart (TimeSignature)"
 
-#. Documentation/user/changing-defaults.itely:2966 (comment)
+#. Documentation/user/changing-defaults.itely:2965 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr "RehearsalMark zentrieren über der Tonart (KeySignature)"
 
-#. Documentation/user/changing-defaults.itely:2973 (comment)
-#. Documentation/user/changing-defaults.itely:2989 (comment)
-#. Documentation/user/changing-defaults.itely:2996 (comment)
+#. Documentation/user/changing-defaults.itely:2972 (comment)
+#. Documentation/user/changing-defaults.itely:2988 (comment)
+#. Documentation/user/changing-defaults.itely:2995 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten"
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2977 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten"
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr "nach rechts um 3,5 Linienabstände verschieben"
 
-#. Documentation/user/changing-defaults.itely:2997 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr "nach links um 2 Linienabstände verschieben"
 
-#. Documentation/user/changing-defaults.itely:3046 (variable)
+#. Documentation/user/changing-defaults.itely:3045 (variable)
 msgid "XinO"
 msgstr "XinO"
 
@@ -9282,6 +9361,8 @@ msgstr "Liste der Akkordbezeichnungen"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Common chord modifiers"
 msgstr "Übliche Akkord-Variablen"
 
@@ -9289,6 +9370,8 @@ msgstr "Übliche Akkord-Variablen"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Predefined fretboard diagrams"
 msgstr "Vordefinierte Bund-Diagramme"
 
@@ -9386,6 +9469,8 @@ msgstr "Liste der Arktikulationszeichen"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Percussion notes"
 msgstr "Schlagzeugnoten"
 
@@ -9455,40 +9540,33 @@ msgstr "Übliche Veränderungen der Einstellungen"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Hauteurs"
-msgstr ""
+msgstr "Hauteurs"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Durées et rythme"
-msgstr ""
+msgstr "Durées·et·rythme"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Silences"
-msgstr ""
+msgstr "Silences"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Métrique"
-msgstr ""
+msgstr "Métrique"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Tout ensemble"
-msgstr ""
+msgstr "Tout·ensemble"
 
 #. @subheading in Documentation/fr/user/tutorial.itely
 msgid "Exemples cliquables"
-msgstr ""
+msgstr "Exemples·cliquables"
 
 #. @node in Documentation/fr/user/tweaks.itely
 #. @subsection in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr "Objekte außerhalb des Notensystems"
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-msgid "Common tweaks"
-msgstr "Übliche Optimierungen"
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -9504,13 +9582,10 @@ msgstr "GNU LilyPond -- Die Programmbenutzung"
 
 #. @node in Documentation/fr/user/setup.itely
 #. @subsection in Documentation/fr/user/setup.itely
-#. @node in Documentation/de/user/setup.itely
-#. @subsection in Documentation/de/user/setup.itely
 msgid "MacOS X on the command-line"
 msgstr "MacOS X auf der Kommandozeile"
 
 #. @section in Documentation/fr/user/running.itely
-#. @section in Documentation/de/user/running.itely
 msgid "Updating with @command{convert-ly}"
 msgstr "Dateien mit @command{convert-ly} aktualisieren"
 
@@ -9575,11 +9650,11 @@ msgstr "Text über mehrere Seiten"
 
 #. @subsubheading in Documentation/fr/user/vocal.itely
 msgid "Mélismes dans certaines strophes seulement"
-msgstr ""
+msgstr "Mélismes·dans·certaines·strophes·seulement"
 
 #. @subsubheading in Documentation/fr/user/vocal.itely
 msgid "Basculer vers une mélodie alternative"
-msgstr ""
+msgstr "Basculer·vers·une·mélodie·alternative"
 
 #. @node in Documentation/fr/user/ancient.itely
 #. @subsection in Documentation/fr/user/ancient.itely
@@ -9703,7 +9778,7 @@ msgstr "Eine Korrektur konstruieren"
 
 #. @node in Documentation/fr/user/changing-defaults.itely
 msgid "Using Scheme code instead of tweak"
-msgstr ""
+msgstr "Using·Scheme·code·instead·of·tweak"
 
 #. @top in Documentation/es/user/lilypond-learning.tely
 msgid "GNU LilyPond: Manual de aprendizaje"
@@ -9711,23 +9786,23 @@ msgstr "GNU LilyPond -- Das Handbuch zum Lernen"
 
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Instrucciones predefinidas"
-msgstr ""
+msgstr "Instrucciones·predefinidas"
 
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Fragmentos de código seleccionados"
-msgstr ""
+msgstr "Fragmentos·de·código·seleccionados"
 
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Propiedades trucadas frecuentemente"
-msgstr ""
+msgstr "Propiedades·trucadas·frecuentemente"
 
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Véase también"
-msgstr ""
+msgstr "Véase·también"
 
 #. @subsubheading in Documentation/es/user/macros.itexi
 msgid "Advertencias y problemas conocidos"
-msgstr ""
+msgstr "Advertencias·y·problemas·conocido"
 
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
@@ -9741,7 +9816,7 @@ msgstr "Vorschläge, wie LilyPond-Dateien geschrieben werden sollen"
 
 #. @rglos in Documentation/es/user/working.itely
 msgid "baritone"
-msgstr ""
+msgstr "baritone"
 
 #. @top in Documentation/es/user/lilypond-program.tely
 msgid "GNU LilyPond: Manual de utilización del programa"
@@ -9757,7 +9832,7 @@ msgstr "GNU LilyPond -- Das Notensatzprogramm"
 
 #. @rglos in Documentation/es/user/pitches.itely
 msgid "semitone"
-msgstr ""
+msgstr "semitone"
 
 #. @top in Documentation/de/user/lilypond-learning.tely
 msgid "GNU LilyPond -- Handbuch zum Lernen"
@@ -9778,8 +9853,18 @@ msgid "GNU LilyPond -- Programmbenutzung"
 msgstr "GNU LilyPond -- Programmbenutzung"
 
 #. @top in Documentation/de/user/lilypond.tely
-msgid "GNU LilyPond -- Das Notationsprogramm"
-msgstr "GNU LilyPond -- Das Notationsprogramm"
+#, fuzzy
+msgid "GNU LilyPond -- Notationsreferenz"
+msgstr "GNU LilyPond -- Die Notationsreferenz"
+
+#. @chapheading in Documentation/de/user/lilypond.tely
+msgid "Das Notensatzprogramm"
+msgstr ""
+
+#. @subsubheading in Documentation/de/user/vocal.itely
+#, fuzzy
+msgid "Ignorieren von Melismen"
+msgstr "Melismen ignorieren"
 
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
@@ -9970,14 +10055,12 @@ msgstr "RehearsalMark über der Tonart (KeySignature) zentrieren"
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:77 (comment)
 msgid ""
 "the RehearsalMark will be aligned with the left edge of the KeySignature"
-msgstr ""
-"RehearsalMark mit der linken Ecke von KeySignature ausrichten"
+msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:71 (comment)
 msgid ""
 "the RehearsalMark will be aligned with the right edge of the KeySignature"
-msgstr ""
-"RehearsalMark mit der rechten Ecke von KeySignature ausrichten"
+msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:78 (comment)
 msgid "and then shifted right by one unit."
@@ -10056,14 +10139,6 @@ msgstr "\\break·%·11·(16*1)"
 msgid "\\break % 12 (8*1)"
 msgstr "\\break·%·12·(8*1)"
 
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
-msgid "chant"
-msgstr "Hymnus"
-
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
-msgid "verba"
-msgstr "verba"
-
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:49 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:96 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:115 (comment)
@@ -10289,7 +10364,9 @@ msgstr "ergeben sich bessere Zeilenumbrüche und"
 #. input/lsr/incipit.ly:279 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:285 (comment)
 msgid "overall spacing if you comment in the following command."
-msgstr "auch die Aufteilung der Noten verbessert sich."
+msgstr ""
+"auch die Aufteilung der Noten verbessert sich, wenn der folgende Befehl "
+"benutzt wird:"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:269 (comment)
 #. input/lsr/incipit.ly:280 (comment)
@@ -10334,19 +10411,23 @@ msgstr "qBalken"
 msgid "Use the macro"
 msgstr "Makro benutzen"
 
-#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:41 (comment)
+msgid "Corrected to avoid collisions"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:28 (comment)
 msgid "Set default beaming for all staves"
 msgstr "Automatische Bebalkung für alle Systeme"
 
-#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:36 (comment)
 msgid "Modify beaming for just this staff"
 msgstr "Balken nur für dieses System verändern"
 
-#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:42 (comment)
 msgid "Inherit beaming from Score context"
 msgstr "Bebalkung vom Score-Kontext geerbt"
 
-#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:48 (comment)
 msgid "Modify beaming for this voice only"
 msgstr "Balken nur für diese Stimme ändern"
 
@@ -10380,7 +10461,8 @@ msgstr "Kopf von book, wird vom ersten Abschnitt in book geerbt"
 
 #. input/lsr/book-parts.ly:52 (comment)
 msgid "a different page breaking function may be used on each part"
-msgstr "andere Seitenumbruchfunktionen können für jeden Abschnitt benutzt werden"
+msgstr ""
+"andere Seitenumbruchfunktionen können für jeden Abschnitt benutzt werden"
 
 #. input/lsr/breathing-signs.ly:19 (comment)
 msgid "this bar contains no \\breathe"
@@ -10518,7 +10600,7 @@ msgstr "origPartitur"
 
 #. input/lsr/clip-systems.ly:55 (comment)
 msgid "Each clip-region is a (START . END) pair"
-msgstr ""
+msgstr "Jede Clip-Region ist ein (START . END) Paar"
 
 #. input/lsr/clip-systems.ly:56 (comment)
 msgid "where both are rhythmic-locations."
@@ -10526,23 +10608,23 @@ msgstr "wobei beide rhythmische Plätze sind"
 
 #. input/lsr/clip-systems.ly:58 (comment)
 msgid "(make-rhythmic-locations BAR-NUMBER NUM DEN)"
-msgstr ""
+msgstr "(make-rhythmic-locations TAKT-NUMMER ZÄHLER NENNER)"
 
 #. input/lsr/clip-systems.ly:59 (comment)
 msgid "means NUM/DEN whole-notes into bar numbered BAR-NUMBER"
-msgstr ""
+msgstr "bedeutet ZÄHLER/NENNER ganze Noten in den Takt mit Nummer TAKT-NUMMER"
 
 #. input/lsr/coloring-notes-depending-on-their-pitch.ly:13 (comment)
 msgid "Association list of pitches to colors."
-msgstr ""
+msgstr "Tonhöhen bestimmten Farben zuweisen."
 
 #. input/lsr/coloring-notes-depending-on-their-pitch.ly:34 (comment)
 msgid "Compare pitch and alteration (not octave)."
-msgstr ""
+msgstr "Tonhöhen und Alteration vergleichen (nicht Oktaven)."
 
 #. input/lsr/combining-dynamics-with-markup-texts.ly:24 (variable)
 msgid "piuF"
-msgstr ""
+msgstr "piuF"
 
 #. input/lsr/combining-two-parts-on-the-same-staff.ly:51 (variable)
 msgid "musicUp"
@@ -10563,7 +10645,7 @@ msgstr "KlammerF"
 
 #. input/lsr/creating-simultaneous-rehearsal-marks.ly:40 (comment)
 msgid "the hidden measure and bar line"
-msgstr ""
+msgstr "versteckter Takt und Taktlinie"
 
 #. input/lsr/customizing-fretboard-fret-diagrams.ly:40 (comment)
 #. input/lsr/customizing-markup-fret-diagrams.ly:31 (comment)
@@ -10580,7 +10662,7 @@ msgstr "Melodie"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:38 (comment)
 msgid "C major for guitar, no barre, using defaults"
-msgstr ""
+msgstr "C-Dur für Gitarre, kein Barre, Standardeinstellungen"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:39 (comment)
 #. input/lsr/customizing-markup-fret-diagrams.ly:89 (comment)
@@ -10592,7 +10674,7 @@ msgstr "knapper Stil"
 #. input/lsr/fret-diagrams-explained-and-developed.ly:48 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:69 (comment)
 msgid "C major for guitar, barred on third fret"
-msgstr ""
+msgstr "C-Dur für Gitarre, Barre auf dem dritten Bund"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:43 (comment)
 #. input/lsr/customizing-markup-fret-diagrams.ly:65 (comment)
@@ -10603,12 +10685,12 @@ msgstr "ausführlicher Stil"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:44 (comment)
 msgid "size 1.0"
-msgstr ""
+msgstr "Größe 1.0"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:45 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:50 (comment)
 msgid "roman fret label, finger labels below string, straight barre"
-msgstr ""
+msgstr "römische Bundnummer, Fingersatz unter der Saite, grades Barre"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:47 (comment)
 msgid "standard size"
@@ -10616,32 +10698,33 @@ msgstr "Standardgröße"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:66 (comment)
 msgid "landscape orientation, arabic numbers, M for mute string"
-msgstr ""
+msgstr "quer liegend, arabische Nummern, M (mute) für stumme Saite"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:67 (comment)
 msgid "no barre, fret label down or left, small mute label font"
 msgstr ""
+"kein Barre, Bundbezeichnung unten oder links, kleine Schrift für stumme Saite"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:88 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:96 (comment)
 msgid "simple D chord"
-msgstr ""
+msgstr "einfacher D-Akkord"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:90 (comment)
 msgid "larger dots, centered dots, fewer frets"
-msgstr ""
+msgstr "größere Punkte, zentrierte Punkte, weniger Bünde"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:91 (comment)
 msgid "label below string"
-msgstr ""
+msgstr "Bezeichnung darunter"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:40 (comment)
 msgid "add FretBoards for the Cuatro"
-msgstr ""
+msgstr "Bunddiagramme für Cuatro hinzufügen"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:41 (comment)
 msgid "Note: This section could be put into a separate file"
-msgstr ""
+msgstr "Achtung: dieser Abschnitt gehört in eine eigene Datei"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment)
 msgid "predefined-cuatro-fretboards.ly"
@@ -10649,15 +10732,15 @@ msgstr "predefined-cuatro-fretboards.ly"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment)
 msgid "and \\included into each of your compositions"
-msgstr ""
+msgstr "und wird mit \\include in jede Quelldatei eingefügt"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:45 (variable)
 msgid "cuatroTuning"
-msgstr ""
+msgstr "cuatroStimmung"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:47 (variable)
 msgid "dSix"
-msgstr ""
+msgstr "dSexte"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable)
 msgid "dMajor"
@@ -10665,11 +10748,11 @@ msgstr "dDur"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable)
 msgid "aMajSeven"
-msgstr ""
+msgstr "aGrSept"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:50 (variable)
 msgid "dMajSeven"
-msgstr ""
+msgstr "dGrSept"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable)
 msgid "gMajor"
@@ -10677,15 +10760,15 @@ msgstr "gDur"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
-msgstr ""
+msgstr "Ende der eigenständigen Datei /predefined-cuatro-fretboards.ly"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
-msgstr ""
+msgstr "primerosBezeichnungen"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:78 (variable)
 msgid "primeros"
-msgstr ""
+msgstr "primeros"
 
 #. input/lsr/demo-midiinstruments.ly:23 (variable)
 msgid "baseMelody"
@@ -10693,19 +10776,19 @@ msgstr "basisMelodie"
 
 #. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment)
 msgid "Must be lower than the actual number of staff lines"
-msgstr ""
+msgstr "Muss geringer sein als die aktuelle Zahl der Notenlinien"
 
 #. input/lsr/displaying-complex-chords.ly:16 (variable)
 msgid "fixA"
-msgstr ""
+msgstr "fixA"
 
 #. input/lsr/displaying-complex-chords.ly:20 (variable)
 msgid "fixB"
-msgstr ""
+msgstr "fixB"
 
 #. input/lsr/double-glissando.ly:20 (comment)
 msgid "new voice ( = \\voiceOne), hidden"
-msgstr ""
+msgstr "neue Stimme ( = \\voiceOne), versteckt"
 
 #. input/lsr/double-glissando.ly:22 (comment)
 msgid "attach glissando to note heads"
@@ -10713,15 +10796,15 @@ msgstr "Glissando an Notenkopf angehängt"
 
 #. input/lsr/double-glissando.ly:27 (comment)
 msgid "original voice with chords rearranged so that"
-msgstr ""
+msgstr "originale Stimme mit Akkorden umgruppiert,"
 
 #. input/lsr/double-glissando.ly:28 (comment)
 msgid "glissando is attached to a & c"
-msgstr ""
+msgstr "so dass Glissando an a & c gefügt wird"
 
 #. input/lsr/embedding-native-postscript-in-a--markup-block.ly:23 (comment)
 msgid "PostScript is a registered trademark of Adobe Systems Inc."
-msgstr ""
+msgstr "PostScript ist eine registrierte Handelsmarke von Adobe Systems Inc."
 
 #. input/lsr/engravers-one-by-one.ly:75 (comment)
 msgid "sample music"
@@ -10737,7 +10820,7 @@ msgstr "bottomStimme"
 
 #. input/lsr/engravers-one-by-one.ly:92 (variable)
 msgid "hoom"
-msgstr ""
+msgstr "hoom"
 
 #. input/lsr/engravers-one-by-one.ly:103 (variable)
 msgid "pah"
@@ -10745,7 +10828,7 @@ msgstr "pah"
 
 #. input/lsr/engravers-one-by-one.ly:113 (comment)
 msgid "setup for Request->Element conversion. Guru-only"
-msgstr ""
+msgstr "setup·for·Request->Element·conversion.·Guru-only"
 
 #. input/lsr/engravers-one-by-one.ly:116 (variable)
 #. input/lsr/engravers-one-by-one.ly:221 (variable)
@@ -10757,15 +10840,15 @@ msgstr "DasSystem"
 
 #. input/lsr/engravers-one-by-one.ly:148 (comment)
 msgid "explicitly set instrument, so we don't get "
-msgstr ""
+msgstr "explizit Instrument angeben, damit keine"
 
 #. input/lsr/engravers-one-by-one.ly:149 (comment)
 msgid "weird effects when doing instrument names for"
-msgstr ""
+msgstr "seltsamen Effekte auftreten, wenn die Instrumentbezeichnungen"
 
 #. input/lsr/engravers-one-by-one.ly:150 (comment)
 msgid "piano staves"
-msgstr "Klaviersystem"
+msgstr "Klaviersysteme erstellt werden"
 
 #. input/lsr/engravers-one-by-one.ly:159 (variable)
 #. input/lsr/engravers-one-by-one.ly:248 (variable)
@@ -10776,15 +10859,15 @@ msgstr "MeineStimme"
 
 #. input/lsr/engravers-one-by-one.ly:174 (comment)
 msgid "must come before all"
-msgstr ""
+msgstr "muss vor allem anderen kommen"
 
 #. input/lsr/engravers-one-by-one.ly:184 (comment)
 msgid "\\consists \\\"Rest_engraver\\\""
-msgstr ""
+msgstr "\\consists·\\\"Rest_engraver\\\""
 
 #. input/lsr/flamenco-notation.ly:46 (comment)
 msgid "Cut here ----- Start 'flamenco.ly' "
-msgstr ""
+msgstr "Hier ausschneiden: Beginn von 'flamenco.ly'"
 
 #. input/lsr/flamenco-notation.ly:48 (comment)
 msgid "Text indicators"
@@ -10792,15 +10875,15 @@ msgstr "Textanweisungen"
 
 #. input/lsr/flamenco-notation.ly:49 (variable)
 msgid "abanico"
-msgstr ""
+msgstr "abanico"
 
 #. input/lsr/flamenco-notation.ly:50 (variable)
 msgid "rasgueaso"
-msgstr ""
+msgstr "rasgueaso"
 
 #. input/lsr/flamenco-notation.ly:51 (variable)
 msgid "alzapua"
-msgstr ""
+msgstr "alzapua"
 
 #. input/lsr/flamenco-notation.ly:53 (comment)
 msgid "Finger stroke symbols"
@@ -10808,7 +10891,7 @@ msgstr "Schlag-Symbole"
 
 #. input/lsr/flamenco-notation.ly:54 (variable)
 msgid "strokeUp"
-msgstr ""
+msgstr "SchlagHoch"
 
 #. input/lsr/flamenco-notation.ly:64 (variable)
 msgid "strokeDown"
@@ -10824,15 +10907,15 @@ msgstr "golpe"
 
 #. input/lsr/flamenco-notation.ly:89 (variable)
 msgid "strokeUpGolpe"
-msgstr ""
+msgstr "SchlagHochGolpe"
 
 #. input/lsr/flamenco-notation.ly:90 (variable)
 msgid "iUpGolpe"
-msgstr ""
+msgstr "iHochGolpe"
 
 #. input/lsr/flamenco-notation.ly:92 (comment)
 msgid "Strokes for all fingers"
-msgstr ""
+msgstr "Schläge für alle Finger"
 
 #. input/lsr/flamenco-notation.ly:93 (variable)
 msgid "pUp"
@@ -10876,7 +10959,7 @@ msgstr "xRunter"
 
 #. input/lsr/flamenco-notation.ly:105 (comment)
 msgid "Just handy :)"
-msgstr ""
+msgstr "Sehr geschickt :)"
 
 #. input/lsr/flamenco-notation.ly:106 (variable)
 msgid "tupletOff"
@@ -10904,21 +10987,21 @@ msgstr "Hier ausschneiden --- Ende 'flamenco.ly' "
 
 #. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment)
 msgid "Example 1"
-msgstr ""
+msgstr "Beispiel 1"
 
 #. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment)
 msgid "Example 2"
-msgstr ""
+msgstr "Beispiel 2"
 
 #. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment)
 msgid "Example 3"
-msgstr ""
+msgstr "Beispiel 3"
 
 #. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment)
 msgid "Example 4"
-msgstr ""
+msgstr "Beispiel 4"
 
-#. input/lsr/flute-slap-notation.ly:17 (variable)
+#. input/lsr/flute-slap-notation.ly:18 (variable)
 msgid "slap"
 msgstr "schlag"
 
@@ -10927,18 +11010,21 @@ msgid ""
 "Tip taken from http://lists.gnu.org/archive/html/lilypond-user/2007-12/"
 "msg00215.html"
 msgstr ""
+"Tipp von http://lists.gnu.org/archive/html/lilypond-user/2007-12/msg00215."
+"html"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:37 (comment)
 msgid "A chord for ukelele, with formatting defined in definition string"
-msgstr ""
+msgstr "Ein Akkord für Ukulele, mit Formatierung in der Definition enthalten"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:38 (comment)
 msgid "1.2 * size, 4 strings, 4 frets, fingerings below string"
-msgstr ""
+msgstr "1.2 * Größe, 4 Saiten, vier Bünde, Fingersatz unterhalb"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:39 (comment)
 msgid "dot radius .35 of fret spacing, dot position 0.55 of fret spacing"
 msgstr ""
+"Punktgröße .35 von Bundzwischenraum, Punktposition .55 von Bundzwischenraum"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:52 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:72 (comment)
@@ -10948,57 +11034,62 @@ msgstr "110% der Standardgröße"
 
 #. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment)
 msgid "this moves them up one staff space from the default position"
-msgstr ""
+msgstr "damit werden sie einen Notenlinienzwischenraum hochgeschoben"
 
 #. input/lsr/grid-lines--changing-their-appearance.ly:51 (comment)
 msgid "set up grids"
-msgstr ""
+msgstr "Gitter einstellen"
 
 #. input/lsr/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "set the grid interval to one quarter note"
-msgstr ""
+msgstr "den Gitter-Abstand auf eine Viertelnote setzen"
 
 #. input/lsr/grid-lines--changing-their-appearance.ly:59 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr ""
+"damit werden sie nach rechts um einen halben Notenlinienabstand verschoben"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:36 (comment)
 msgid "hides staff and notes so that only the grid lines are visible"
-msgstr ""
+msgstr "versteckt System und Noten so dass nur die Gitterlinien sichtbar sind"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:43 (comment)
 msgid "dummy notes to force regular note spacing"
-msgstr ""
+msgstr "Blindnoten damit die Noten regelmäßig verteilt sind"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:59 (comment)
 msgid "center grid lines horizontally below note heads"
-msgstr ""
+msgstr "Gitterlinien horizontal unter Notenköpfen zentrieren"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:66 (comment)
 msgid "set line length and positioning:"
-msgstr ""
+msgstr "Länge und Position von Linien setzen:"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:67 (comment)
 msgid "two staff spaces above center line on hidden staff"
 msgstr ""
+"zwei Notenlinienzwischenräume über der Mittellinie auf dem versteckten System"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
 msgid "to four spaces below center line on visible staff"
-msgstr ""
+msgstr "bis vier Zwischenräume unter der Mittellinie des sichtbaren Systems"
 
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:51 (variable)
 msgid "drum"
 msgstr "Trommel"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:54 (comment)
 msgid "Solution 1: Using a simple markup with a particular halign value"
 msgstr ""
+"Lösung 1: Benutzung von einfacher Beschriftung mit horizontaler Verschiebung"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:55 (comment)
 msgid ""
 "Drawback: It's a markup, not a dynamic command, so \\dynamicDown etc. will "
 "have no effect"
 msgstr ""
+"Nachteil: nur Beschriftung, keine Dynamik, also wirkt sich \\dynamicDown usw."
+"nicht aus"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:56 (variable)
 msgid "semppMarkup"
@@ -11009,84 +11100,99 @@ msgid ""
 "Solution 2: Using a dynamic script and shifting with \\once\\override ... "
 "#'X-offset = .."
 msgstr ""
+"Lösung 2: Dynamik-Skript benutzen und mit \\once\\override·...·#'X-"
+"offset·=·.. verschieben"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:59 (comment)
 msgid "Drawback: \\once\\override needed for every invocation"
-msgstr ""
+msgstr "Nachteil: \\once\\override muss jedes Mal geschrieben werden"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:60 (variable)
 msgid "semppK"
-msgstr ""
+msgstr "semppK"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:62 (comment)
 msgid ""
 "Solution 3: Padding the dynamic script so the center-alignment puts it to "
 "the correct position"
 msgstr ""
+"Lösung 3: Dynamik-Skript so verschieben mit padding, dass es "
+"automatischdurch center-alignment an die richtige Position kommt"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:63 (comment)
 msgid ""
 "Drawback: the padding really reserves the space, nothing else can be there"
 msgstr ""
+"Nachteil: Die Verschiebung lässt den Platz frei, dort kann nichts anderes "
+"stehen"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:64 (variable)
 msgid "semppT"
-msgstr ""
+msgstr "semppT"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:72 (comment)
 msgid "Solution 4: Dynamic, setting the dimensions of the additional text to 0"
-msgstr ""
+msgstr "Lösung 4: Dynamik, Dimensionen des zusätzlichen Textes auf 0 setzen"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:73 (comment)
 msgid ""
 "Drawback: To lilypond \\\"sempre\\\" has no extent, so it might put other "
 "stuff there => collisions"
 msgstr ""
+"Nachteil: LilyPond glaubt, dass \\\"sempre\\\" keinen Platz einnimmt undkann "
+"andere Elemente hier hintun --> Kollisionen"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:74 (comment)
 msgid ""
 "Drawback: Also, there seems to be some spacing, so it's not exactly the "
 msgstr ""
+"Nachteil: Es gibt offensichtlich noch Ränder, so dass es nicht genau die"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:75 (comment)
 msgid "same alignment as without the additional text"
-msgstr ""
+msgstr "gleiche Postionierung ist wie ohne den zusätzlichen Text"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:76 (variable)
 msgid "semppM"
-msgstr ""
+msgstr "semppM"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:78 (comment)
 msgid "Solution 5: Dynamic with explicit shifting inside the scheme function"
 msgstr ""
+"Lösung 5: Dynamik mit ausdrücklicher Verschiebung innerhalb von Scheme-"
+"Funktion"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:79 (variable)
 msgid "semppG"
-msgstr ""
+msgstr "semppG"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:85 (comment)
 msgid ""
 "Solution 6: Dynamic with explicit alignment. This has only effect, if one "
 "sets X-offset!"
 msgstr ""
+"Lösung 6: Dynamik mit expliziter Ausrichtung. Das wirkt sich nur dann aus,"
+"wenn X-offset auch gesetzt wird!"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:86 (comment)
 msgid "Drawback: One needs to set DynamicText #'X-offset!"
-msgstr ""
+msgstr "Nachteil: #'X-offset von DynamicText muss gesetzt werden"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:87 (comment)
 msgid ""
 "Drawback: Aligned at the right edge of the additional text, not at the "
 "center of pp"
 msgstr ""
+"Nachteil: An der rechten Ecke des zusätzlichen Textes ausgerichtet, nichtan "
+"der Mitte von pp"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:88 (variable)
 msgid "semppMII"
-msgstr ""
+msgstr "semppMII"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:114 (comment)
 msgid "Setting to ##f (false) gives the same resul"
-msgstr ""
+msgstr "Auf falsch (##f) setzen ergibt gleiches Ergebnis"
 
 #. input/lsr/how-to-change-fret-diagram-position.ly:28 (variable)
 #. input/lsr/score-for-diatonic-accordion.ly:61 (variable)
@@ -11098,29 +11204,29 @@ msgstr "Harmonien"
 
 #. input/lsr/how-to-change-fret-diagram-position.ly:31 (comment)
 msgid "THE FOLLOWING IS THE COMMAND TO MOVE THE CHORD NAME"
-msgstr ""
+msgstr "DAS IST DER BEFEHL UM AKKORDBEZEICHNUNG ZU VERSCHIEBEN"
 
 #. input/lsr/how-to-change-fret-diagram-position.ly:34 (comment)
 msgid "THIS LINE IS THE SECOND METHOD"
-msgstr ""
+msgstr "DIESE ZEILE IST DIE ZWEITE METHODE"
 
 #. input/lsr/how-to-change-fret-diagram-position.ly:44 (comment)
 msgid "THE FOLLOWING IS THE COMMAND TO MOVE THE FRET DIAGRAM"
-msgstr ""
+msgstr "DAS IST DER BEFEHL UM DAS BUNDDIAGRAMM ZU VERSCHIEBEN"
 
 #. input/lsr/how-to-change-fret-diagram-position.ly:47 (comment)
 msgid "HERE IS THE SECOND METHOD"
-msgstr ""
+msgstr "HIER DIE ZWEITE METHODE"
 
 #. input/lsr/incipit.ly:62 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:35 (comment)
 msgid "make the staff lines invisible on staves"
-msgstr ""
+msgstr "Taktlinien auf dem System unsichtbar machen"
 
 #. input/lsr/incipit.ly:74 (variable)
 #. input/lsr/incipit.ly:75 (context id)
 msgid "discantusIncipit"
-msgstr ""
+msgstr "discantusIncipit"
 
 #. input/lsr/incipit.ly:111 (variable)
 #. input/lsr/incipit.ly:112 (context id)
@@ -11147,28 +11253,29 @@ msgstr "bassusIncipit"
 #. input/lsr/incipit.ly:251 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:258 (comment)
 msgid "Keep the bass lyrics outside of the staff group to avoid bar lines"
-msgstr ""
+msgstr "Gesangstext von Bass außerhalb der StaffGroup, um Taktlinien"
 
 #. input/lsr/incipit.ly:252 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:259 (comment)
 msgid "between the lyrics."
-msgstr ""
+msgstr "zwischen dem Text ·zu·vermeiden"
 
 #. input/lsr/incipit.ly:257 (comment)
 msgid "no bar lines in staves"
-msgstr ""
+msgstr "keine Taktlinien auf Systemen"
 
 #. input/lsr/incipit.ly:260 (comment)
 msgid "the next three instructions keep the lyrics between the bar lines"
 msgstr ""
+"mit den drei nächsten Befehlen wird der Text zwischen den Taktlinien gehalten"
 
 #. input/lsr/incipit.ly:275 (comment)
 msgid "breaking also at those bar lines where a note overlaps"
-msgstr ""
+msgstr "auch an den Takten umbrechen, wo eine Note aus dem Takt heraussteht"
 
 #. input/lsr/incipit.ly:276 (comment)
 msgid "into the next measure.  The command is commented out in this"
-msgstr ""
+msgstr "Der Befehl ist hier auskommentiert"
 
 #. input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly:16 (variable)
 msgid "tuning"
@@ -11176,11 +11283,11 @@ msgstr "Stimmung"
 
 #. input/lsr/jazz-combo-template.ly:52 (comment)
 msgid "#(set-global-staff-size 16)"
-msgstr ""
+msgstr "#(set-global-staff-size·16)"
 
 #. input/lsr/jazz-combo-template.ly:55 (comment)
 msgid "Some macros %%%%%%%%%%%%%%%%%%%"
-msgstr ""
+msgstr "Einige Makros %%%%%%%%%%%%%%%%%%%"
 
 #. input/lsr/jazz-combo-template.ly:57 (variable)
 msgid "sl"
@@ -11192,15 +11299,15 @@ msgstr "nsl"
 
 #. input/lsr/jazz-combo-template.ly:65 (variable)
 msgid "crOn"
-msgstr ""
+msgstr "crOn"
 
 #. input/lsr/jazz-combo-template.ly:66 (variable)
 msgid "crOff"
-msgstr ""
+msgstr "crOff"
 
 #. input/lsr/jazz-combo-template.ly:68 (comment)
 msgid "insert chord name style stuff here."
-msgstr ""
+msgstr "Akkordbezeichnungen hierher"
 
 #. input/lsr/jazz-combo-template.ly:70 (variable)
 msgid "jazzChords"
@@ -11208,7 +11315,7 @@ msgstr "jazzAkkorde"
 
 #. input/lsr/jazz-combo-template.ly:72 (comment)
 msgid "Keys'n'thangs %%%%%%%%%%%%%%%%%"
-msgstr ""
+msgstr "Taktart/Tonart %%%%%%%%%%%%%%%%%"
 
 #. input/lsr/jazz-combo-template.ly:76 (variable)
 msgid "Key"
@@ -11216,11 +11323,11 @@ msgstr "Tonart"
 
 #. input/lsr/jazz-combo-template.ly:78 (comment)
 msgid "############ Horns ############"
-msgstr ""
+msgstr "############·Hörner·############"
 
 #. input/lsr/jazz-combo-template.ly:80 (comment)
 msgid "------ Trumpet ------"
-msgstr ""
+msgstr "------·Trompete·------"
 
 #. input/lsr/jazz-combo-template.ly:81 (variable)
 msgid "trpt"
@@ -11237,7 +11344,7 @@ msgstr "trompete"
 
 #. input/lsr/jazz-combo-template.ly:97 (comment)
 msgid "------ Alto Saxophone ------"
-msgstr ""
+msgstr "------·Altsaxophon·------"
 
 #. input/lsr/jazz-combo-template.ly:98 (variable)
 msgid "alto"
@@ -11253,7 +11360,7 @@ msgstr "altSax"
 
 #. input/lsr/jazz-combo-template.ly:114 (comment)
 msgid "------ Baritone Saxophone ------"
-msgstr ""
+msgstr "------·Baritonsaxophon·------"
 
 #. input/lsr/jazz-combo-template.ly:115 (variable)
 msgid "bari"
@@ -11265,11 +11372,11 @@ msgstr "bariHarmonie"
 
 #. input/lsr/jazz-combo-template.ly:126 (variable)
 msgid "bariSax"
-msgstr ""
+msgstr "bariSax"
 
 #. input/lsr/jazz-combo-template.ly:135 (comment)
 msgid "------ Trombone ------"
-msgstr ""
+msgstr "------ Posaune ------"
 
 #. input/lsr/jazz-combo-template.ly:136 (variable)
 msgid "tbone"
@@ -11277,7 +11384,7 @@ msgstr "pos"
 
 #. input/lsr/jazz-combo-template.ly:140 (variable)
 msgid "tboneHarmony"
-msgstr ""
+msgstr "PosHarmonie"
 
 #. input/lsr/jazz-combo-template.ly:143 (variable)
 #. input/lsr/jazz-combo-template.ly:272 (context id)
@@ -11286,15 +11393,15 @@ msgstr "posaune"
 
 #. input/lsr/jazz-combo-template.ly:152 (comment)
 msgid "############ Rhythm Section #############"
-msgstr ""
+msgstr "############·Rhythmus-Abschnitt·#############"
 
 #. input/lsr/jazz-combo-template.ly:154 (comment)
 msgid "------ Guitar ------"
-msgstr ""
+msgstr "------ Gitarre ------"
 
 #. input/lsr/jazz-combo-template.ly:155 (variable)
 msgid "gtr"
-msgstr ""
+msgstr "gtr"
 
 #. input/lsr/jazz-combo-template.ly:163 (variable)
 msgid "gtrHarmony"
@@ -11309,7 +11416,7 @@ msgstr "Gitarre"
 
 #. input/lsr/jazz-combo-template.ly:176 (comment)
 msgid "------ Piano ------"
-msgstr ""
+msgstr "------ Klavier ------"
 
 #. input/lsr/jazz-combo-template.ly:177 (variable)
 msgid "rhUpper"
@@ -11337,20 +11444,20 @@ msgstr "KlavierLH"
 
 #. input/lsr/jazz-combo-template.ly:226 (comment)
 msgid "------ Bass Guitar ------"
-msgstr ""
+msgstr "------ Bassgitarre ------"
 
 #. input/lsr/jazz-combo-template.ly:240 (comment)
 msgid "------ Drums ------"
-msgstr ""
+msgstr "------ Schlagzeugt ------"
 
 #. input/lsr/jazz-combo-template.ly:254 (variable)
 msgid "drumContents"
-msgstr ""
+msgstr "SchlagInhalt"
 
 #. input/lsr/jazz-combo-template.ly:263 (comment)
 #, python-format
 msgid "It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%%"
-msgstr ""
+msgstr "Alles zusammengefügt: %%%%%%%%%%%%%%%%%%%%%%"
 
 #. input/lsr/jazz-combo-template.ly:267 (context id)
 msgid "horns"
@@ -11366,7 +11473,7 @@ msgstr "bariakk"
 
 #. input/lsr/jazz-combo-template.ly:271 (context id)
 msgid "barisax"
-msgstr ""
+msgstr "barsisax"
 
 #. input/lsr/jazz-combo-template.ly:276 (context id)
 msgid "chords"
@@ -11382,15 +11489,15 @@ msgstr "Bassfiguren"
 
 #. input/lsr/manually-controlling-beam-positions.ly:21 (comment)
 msgid "from upper staffline (position 4) to center (position 0)"
-msgstr ""
+msgstr "von oberer Notenlinie (Position 4) bis Mitte (Position 0)"
 
 #. input/lsr/manually-controlling-beam-positions.ly:24 (comment)
 msgid "from center to one above center (position 2)"
-msgstr ""
+msgstr "von Mitte bis eins über der Mitte (Position 2)"
 
 #. input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly:19 (variable)
 msgid "speakOn"
-msgstr ""
+msgstr "sprechAn"
 
 #. input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly:31 (variable)
 msgid "speakOff"
@@ -11398,11 +11505,11 @@ msgstr "sprechAus"
 
 #. input/lsr/markup-lines.ly:19 (comment)
 msgid "Candide, Voltaire"
-msgstr ""
+msgstr "Candide, Voltaire"
 
 #. input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly:32 (comment)
 msgid "the final bar line is not interrupted"
-msgstr ""
+msgstr "Letze Taktlinie ist nicht unterbrochen"
 
 #. input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly:17 (variable)
 msgid "normalPos"
@@ -11410,7 +11517,7 @@ msgstr "normalPos"
 
 #. input/lsr/modern-tab-text-clef.ly:16 (variable)
 msgid "TAB"
-msgstr ""
+msgstr "TAB"
 
 #. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:51 (variable)
 msgid "dashPlus"
@@ -11418,15 +11525,15 @@ msgstr "dashPlus"
 
 #. input/lsr/modifying-tuplet-bracket-length.ly:23 (comment)
 msgid "Set tuplets to be extendable..."
-msgstr ""
+msgstr "Ntolen so definieren, dass sie erweiterbar sind"
 
 #. input/lsr/modifying-tuplet-bracket-length.ly:25 (comment)
 msgid "...to cover all items up to the next note"
-msgstr ""
+msgstr "um alle Objekte bis zu nächsten Note"
 
 #. input/lsr/modifying-tuplet-bracket-length.ly:29 (comment)
 msgid "...or to cover just whitespace"
-msgstr ""
+msgstr "oder auch nur Leerzeichen zu überbrücken"
 
 #. input/lsr/percussion-beaters.ly:18 (variable)
 msgid "stick"
@@ -11434,15 +11541,15 @@ msgstr "Stock"
 
 #. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment)
 msgid "Permit line breaks within tuplets"
-msgstr ""
+msgstr "Zeilenumbrüche innerhalb von N-tolen zulassen"
 
 #. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:41 (comment)
 msgid "Allow beams to be broken at line breaks"
-msgstr ""
+msgstr "Balken können an Umbrüchen gebrochen werden"
 
 #. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:48 (comment)
 msgid "Insert a manual line break within a tuplet"
-msgstr ""
+msgstr "Manuellen Zeilenumbruch in N-tole"
 
 #. input/lsr/piano-template-with-centered-dynamics.ly:51 (variable)
 msgid "pedal"
@@ -11454,69 +11561,70 @@ msgstr "Dynamik-Kontext definieren"
 
 #. input/lsr/piano-template-with-centered-dynamics.ly:85 (comment)
 msgid "modify PianoStaff context to accept Dynamics context"
-msgstr ""
+msgstr "PianoStaff-Kontext verändern, dass er Dynamics-Kontext akzeptiert"
 
 #. input/lsr/polyphony-in-tablature.ly:38 (context id)
 msgid "tab"
-msgstr ""
+msgstr "tab"
 
 #. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
 msgid "Multi-measure rests by default are set under the second line"
-msgstr ""
+msgstr "Ganztaktpausen werden unter die zweite Linie gesetzt"
 
 #. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
 msgid "They can be moved with an override"
-msgstr ""
+msgstr "Sie können mit override verschoben werden"
 
 #. input/lsr/positioning-multi--measure-rests.ly:46 (comment)
 msgid "A value of 0 is the default position;"
-msgstr ""
+msgstr "Ein Wert von O ist die Standardposition"
 
 #. input/lsr/positioning-multi--measure-rests.ly:47 (comment)
 msgid "the following trick moves the rest to the center line"
-msgstr ""
+msgstr "hiermit wird die Pause zur Mittellinie verschoben"
 
 #. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
 msgstr ""
+"Ganztaktpausen in Stimmen mit ungerader Zahl sind unter der obersten Linie"
 
 #. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
-msgstr ""
+msgstr "Ganztaktpausen in geraden Stimmen sind unter der untersten Linie"
 
 #. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
-msgstr ""
+msgstr "auch in leeren Takten bleichen sie getrennt"
 
 #. input/lsr/positioning-multi--measure-rests.ly:56 (comment)
 msgid "This brings them together even though there are two voices"
-msgstr ""
+msgstr "Hiermit werden sie zusammegefügt, auch wenn sie zwei Stimmen sind"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:28 (comment)
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:49 (comment)
 msgid "Set segno sign as rehearsal mark and adjust size if needed"
-msgstr ""
+msgstr "Segno-Zeichen als Übungszeichen definieren und Größe evtl. anpassen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:29 (comment)
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:51 (comment)
 msgid "\\once \\override Score.RehearsalMark #'font-size = #3"
-msgstr ""
+msgstr "\\once·\\override·Score.RehearsalMark·#'font-size·=·#3"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:35 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size if needed"
-msgstr ""
+msgstr "Coda-Zeichen als Übungszeichen definieren und Größe evtl. anpassen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:42 (comment)
 msgid "Should Coda be on anew line?"
-msgstr ""
+msgstr "Soll Coda auf einer neuen Zeile sein?"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:43 (comment)
 msgid "Coda NOT on new line: use \\nobreak"
-msgstr ""
+msgstr "Coda NICHT auf neuer Zeile: benutze \\nobreak"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:44 (comment)
 msgid "Coda on new line: DON'T use \\nobreak"
-msgstr ""
+msgstr "Coda auf neuer Zeile: NICHT \\nobreak benutzen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:45 (comment)
 msgid "\\noBreak"
@@ -11524,38 +11632,39 @@ msgstr "\\noBreak"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:54 (comment)
 msgid "Here begins the trickery! "
-msgstr ""
+msgstr "Her beginnt der Trick"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:55 (comment)
 msgid ""
 "\\cadenzaOn will suppress the bar count and \\stopStaff removes the staff "
 "lines."
 msgstr ""
+"\\cadenzaOn unterdrückt die Taktzählung und \\stopStaff entfernt Notenlinien"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:58 (comment)
 msgid "Some examples of possible text-displays "
-msgstr ""
+msgstr "Eine Beispiel für mögliche Textanzeige"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:60 (comment)
 msgid "text line-aligned"
-msgstr "Text and Zeile ausgerichtet"
+msgstr "Text an Zeile ausgerichtet"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:61 (comment)
 msgid "=================="
-msgstr ""
+msgstr "=================="
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:62 (comment)
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:68 (comment)
 msgid "Move text to the desired position"
-msgstr ""
+msgstr "Text zur gewünschten Position verschieben"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:63 (comment)
 msgid "\\once \\override TextScript #'extra-offset = #'( 2 . -3.5 )"
-msgstr ""
+msgstr "\\once·\\override·TextScript·#'extra-offset·=·#'(·2·.·-3.5·)"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:64 (comment)
 msgid "| s1*0^\\markup { D.S. al Coda } }"
-msgstr ""
+msgstr "|·s1*0^\\markup·{·D.S.·al·Coda·}·}"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:66 (comment)
 msgid "text center-aligned"
@@ -11563,79 +11672,84 @@ msgstr "Text zentriert"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:67 (comment)
 msgid "===================="
-msgstr ""
+msgstr "===================="
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:69 (comment)
 msgid "\\once \\override TextScript #'extra-offset = #'( 6 . -5.0 )"
-msgstr ""
+msgstr "\\once·\\override·TextScript·#'extra-offset·=·#'(·6·.·-5.0·)"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:70 (comment)
 msgid "| s1*0^\\markup { \\center-column { D.S. \\\"al Coda\\\" } }"
-msgstr ""
+msgstr "|·s1*0^\\markup·{·\\center-column·{·D.S.·\\\"al·Coda\\\"·}·}"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:72 (comment)
 msgid "text and symbols center-aligned"
-msgstr ""
+msgstr "Text und Symbole zentriert"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:73 (comment)
 msgid "==============================="
-msgstr ""
+msgstr "==============================="
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:74 (comment)
 msgid ""
 "Move text to the desired position and tweak spacing for optimum text "
 "alignment"
 msgstr ""
+"Text zur gewünschten Position verschieben und Platzbedarf für "
+"optimalesErgebnis verändern."
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:75 (comment)
 msgid "\\once \\override TextScript #'extra-offset = #'( 8 . -5.5 )"
-msgstr ""
+msgstr "\\once·\\override·TextScript·#'extra-offset·=·#'(·8·.·-5.5·)"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:81 (comment)
 msgid "Increasing the unfold counter will expand the staff-free space"
 msgstr ""
+"wenn der unfold-Zähler höher gesetzt wird, vergrößert sich der Platz ohne "
+"System"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:86 (comment)
 msgid "Resume bar count and show staff lines again"
-msgstr ""
+msgstr "Taktzählung aufnehmen und Notenlinien anzeigen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:90 (comment)
 msgid "Should Coda be on new line?"
-msgstr ""
+msgstr "Soll Coda auf einer neuen Zeile sein?"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:91 (comment)
 msgid "Coda NOT on new line: DON'T use \\break"
-msgstr ""
+msgstr "Coda NICHT auf neuer Zeile: NICHT \\break benutzen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:92 (comment)
 msgid "Coda on new line: use \\break"
-msgstr ""
+msgstr "Coda auf neuer Zeile: \\break benutzen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:95 (comment)
 msgid "Show up, you clef and key!"
-msgstr ""
+msgstr "Schlüssel/Tonart"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:99 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size and position"
-msgstr ""
+msgstr "Coda-Zeichen als Übungszeichen setzen und Position/Größe anpassen"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:101 (comment)
 msgid ""
 "Put the coda sign ontop of the (treble-)clef dependend on coda's line-"
 "position"
 msgstr ""
+"Coda-Zeichen über den Schlüssel setzen abhängig von Zeilenpositionvon Coda"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:103 (comment)
 msgid "Coda NOT on new line, use this:"
-msgstr ""
+msgstr "Coda NICHT auf neuer Zeile:"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:104 (comment)
 msgid "\\once \\override Score.RehearsalMark #'extra-offset = #'( -2 . 1.75 )"
-msgstr ""
+msgstr "\\once·\\override·Score.RehearsalMark·#'extra-offset·=·#'(·-2·.·1.75·)"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:106 (comment)
 msgid "Coda on new line, use this:"
-msgstr ""
+msgstr "Coda auf neuer Zeile:"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:112 (comment)
 msgid "The coda"
@@ -11659,15 +11773,15 @@ msgstr "Schlagzeug"
 
 #. input/lsr/quoting-another-voice-with-transposition.ly:37 (variable)
 msgid "quoteTest"
-msgstr ""
+msgstr "zitatTest"
 
 #. input/lsr/quoting-another-voice-with-transposition.ly:38 (comment)
 msgid "french horn"
-msgstr ""
+msgstr "Waldhorn"
 
 #. input/lsr/quoting-another-voice.ly:27 (variable)
 msgid "quoteMe"
-msgstr ""
+msgstr "zitiereMich"
 
 #. input/lsr/quoting-another-voice.ly:32 (variable)
 msgid "original"
@@ -11675,19 +11789,19 @@ msgstr "Original"
 
 #. input/lsr/removing-the-first-empty-line.ly:43 (comment)
 msgid "To use the setting globally, uncomment the following line:"
-msgstr ""
+msgstr "Um die Einstellung global zu benutzen, diese Zeile benutzen:"
 
 #. input/lsr/removing-the-first-empty-line.ly:44 (comment)
 msgid "\\override VerticalAxisGroup #'remove-first = ##t"
-msgstr ""
+msgstr "\\override·VerticalAxisGroup·#'remove-first·=·##t"
 
 #. input/lsr/removing-the-first-empty-line.ly:53 (comment)
 msgid "To use the setting globally, comment this line,"
-msgstr ""
+msgstr "Um Einstellung global zu benutzen, folgende Zeile auskommentieren"
 
 #. input/lsr/removing-the-first-empty-line.ly:54 (comment)
 msgid "uncomment the line in the \\layout block above"
-msgstr ""
+msgstr "und die Zeile im \\layout-Block oben benutzen"
 
 #. input/lsr/reverting-default-beam-endings.ly:29 (comment)
 msgid "Default beaming"
@@ -11695,11 +11809,11 @@ msgstr "Standartbebalkung"
 
 #. input/lsr/reverting-default-beam-endings.ly:32 (comment)
 msgid "Revert default values in scm/auto-beam.scm for 12/8 time"
-msgstr ""
+msgstr "Standardwerte von scm/auto-beam.scm für 12/8-Takt herstellen"
 
 #. input/lsr/reverting-default-beam-endings.ly:38 (comment)
 msgid "Set new values for beam endings"
-msgstr ""
+msgstr "Neue Werte für Balkenenden"
 
 #. input/lsr/rhythmic-slashes.ly:25 (comment)
 msgid "Macro to print single slash"
@@ -11711,11 +11825,11 @@ msgstr "rs"
 
 #. input/lsr/rhythmic-slashes.ly:33 (comment)
 msgid "Function to print a specified number of slashes"
-msgstr ""
+msgstr "Funktoin, um eine bestimmte Anzahl an Strichen zu setzen"
 
 #. input/lsr/rhythmic-slashes.ly:34 (variable)
 msgid "comp"
-msgstr ""
+msgstr "comp"
 
 #. input/lsr/score-for-diatonic-accordion.ly:69 (variable)
 msgid "NoStem"
@@ -11731,98 +11845,105 @@ msgstr "NullBalken"
 
 #. input/lsr/score-for-diatonic-accordion.ly:73 (variable)
 msgid "staffTabLine"
-msgstr ""
+msgstr "systemTabZeile"
 
 #. input/lsr/score-for-diatonic-accordion.ly:78 (comment)
 msgid ""
 "Shows one horizontal line. The vertical line (simulating a bar-line) is "
 "simulated with a gridline"
 msgstr ""
+"Zeigt eine horizontale Zeile. Vertikale Linie (wie eine Taktlinie) wirdmit "
+"einer Gitterlinie simuliert"
 
 #. input/lsr/score-for-diatonic-accordion.ly:83 (comment)
 msgid ""
 "disable the following line to see the the noteheads while writing the song "
 msgstr ""
+"nächste Zeile auskommentieren, um Noten während des Schreibens zu sehen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:87 (comment)
 msgid "The beam between 8th-notes is used to draw the push-line"
-msgstr ""
+msgstr "Balken zwischen Achteln wird benutzt um Zug-Linie zu zeichnen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:88 (comment)
 msgid "How to fast write the push-lines: "
-msgstr ""
+msgstr "Zug-Linie schnell schreiben:"
 
 #. input/lsr/score-for-diatonic-accordion.ly:89 (comment)
 msgid ""
 "1. write repeatedly 'c c c c c c c c |' for the whole length of the song "
 msgstr ""
+"1. wiederholgt 'c·c·c·c·c·c·c·c·|' über die gesamte Länge des Stückes "
+"schreiben"
 
 #. input/lsr/score-for-diatonic-accordion.ly:90 (comment)
 msgid "2. uncomment the line \\NoNoteHead"
-msgstr ""
+msgstr "2. \\NoNoteHead auskommentieren"
 
 #. input/lsr/score-for-diatonic-accordion.ly:91 (comment)
 msgid "3. compile"
-msgstr ""
+msgstr "3. kompilieren"
 
 #. input/lsr/score-for-diatonic-accordion.ly:92 (comment)
 msgid "4. Mark the positions on which push/pull changes. "
-msgstr ""
+msgstr "4. Positionen mit Zugrichtungsänderung markieren"
 
 #. input/lsr/score-for-diatonic-accordion.ly:93 (comment)
 msgid ""
 "In the score-picture click on the position the push- or pull-part starts "
-msgstr ""
+msgstr "im Partiturbild auf die Position der Zug-Anfänge klicken"
 
 #. input/lsr/score-for-diatonic-accordion.ly:94 (comment)
 msgid "(on the noteHead, the cursor will change to a hand-icon)."
-msgstr ""
+msgstr "(über dem Notenkopf ändert sich die Maus in eine Hand)"
 
 #. input/lsr/score-for-diatonic-accordion.ly:95 (comment)
 msgid "The cursor in the source code will jump just at this position."
-msgstr ""
+msgstr "Die Maus in der Quelldatei geht zur gewünschten Position"
 
 #. input/lsr/score-for-diatonic-accordion.ly:96 (comment)
 msgid "a) If a push-part starts there, replace the 'c' by an 'e['"
-msgstr ""
+msgstr "a) wenn ein Schub hier beginng, 'c' mit 'e[' ersetzen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:97 (comment)
 msgid "b) If a pull-part starts there, replace the 'c' by an 's'"
-msgstr ""
+msgstr "b) wenn ein Zug hier beginnt, 'c' mit 's' ersetzen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:98 (comment)
 msgid "5. Switch into 'overwrite-mode' by pressing the 'ins' key. "
-msgstr ""
+msgstr "5. in den Überschreibmodus wechseln mit der \"Einfg\"-Taste"
 
 #. input/lsr/score-for-diatonic-accordion.ly:99 (comment)
 msgid "6. For the pull-parts overwrite the 'c' with 's' "
-msgstr ""
+msgstr "6. Für Zug 'c' mit 's' überschreiben"
 
 #. input/lsr/score-for-diatonic-accordion.ly:100 (comment)
 msgid "7. For every push-part replace the last 'c' with 'e]' "
-msgstr ""
+msgstr "7. für jeden Schub das letzte 'c' mit 'e]' ersetzen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:101 (comment)
 msgid "8. Switch into 'insert-mode' again "
-msgstr ""
+msgstr "8. In den Einfügen-Modus wechseln"
 
 #. input/lsr/score-for-diatonic-accordion.ly:102 (comment)
 msgid ""
 "9. At last it should look lik e.g. (s s e[ c | c c c c c c c c | c c c c c c "
 "e] s s)"
 msgstr ""
+"9. Es sollte jetzt aussehen wie (s·s·e[·c·|·c·c·c·c·c·c·c·c·|·c·c·c·c·c·c·e]"
+"·s·s)"
 
 #. input/lsr/score-for-diatonic-accordion.ly:103 (comment)
 msgid "10. re-enable the line \\NoNoteHead"
-msgstr ""
+msgstr "10 \\NoNoteHead wieder einkommentieren"
 
 #. input/lsr/score-for-diatonic-accordion.ly:113 (comment)
 msgid "Accordion melody in tabulator score\t\t"
-msgstr ""
+msgstr "Akkordeonmelodie in Tabulaturen-Partitur\t\t"
 
 #. input/lsr/score-for-diatonic-accordion.ly:114 (comment)
 msgid "1. Place a copy of the piano melody below"
-msgstr ""
+msgstr "1. Eine Kopie der Klaviermelodie unten benutzen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:115 (comment)
 #. input/lsr/score-for-diatonic-accordion.ly:134 (comment)
@@ -11830,16 +11951,20 @@ msgid ""
 "2. Separate piano melody into pull- and push-parts according to the "
 "staffTabLine you've already made      "
 msgstr ""
+"2. Klaviermelodie in Zug- und Schubteile teilen, wie schon mitsystemTabLinie "
+"gemacht"
 
 #. input/lsr/score-for-diatonic-accordion.ly:116 (comment)
 msgid ""
 "3. For each line: Double the line. Remark the 1st one (Keeps unchanged as "
 "reference) and then change the second line using the transformation paper"
 msgstr ""
+"3. Für jede Zeile: verdoppele die Zeile. die erste bleibt als Referenz, die "
+"zweite wirdmit dem Transformationspapier verändert"
 
 #. input/lsr/score-for-diatonic-accordion.ly:117 (comment)
 msgid "or the macros 'conv2diaton push.bsh' and 'conv2diaton pull.bsh' "
-msgstr ""
+msgstr "oder den Makros 'conv2diaton·push.bsh'·and·'conv2diaton·pull.bsh'·"
 
 #. input/lsr/score-for-diatonic-accordion.ly:118 (comment)
 #. input/lsr/score-for-diatonic-accordion.ly:137 (comment)
@@ -11849,61 +11974,63 @@ msgstr "Tipps:"
 #. input/lsr/score-for-diatonic-accordion.ly:119 (comment)
 #. input/lsr/score-for-diatonic-accordion.ly:138 (comment)
 msgid "- In jEdit Search & Replace mark the Option 'Keep Dialog'"
-msgstr ""
+msgstr "- In jEdit Suchen und Ersetzen die Option wählen: 'Keep Dialog'"
 
 #. input/lsr/score-for-diatonic-accordion.ly:121 (variable)
 msgid "AccordionTabTwoCBesDur"
-msgstr ""
+msgstr "AccordionTabTwoCBesDur"
 
 #. input/lsr/score-for-diatonic-accordion.ly:122 (comment)
 msgid "pull 1"
-msgstr ""
+msgstr "Zug 1"
 
 #. input/lsr/score-for-diatonic-accordion.ly:123 (comment)
 msgid "<f' bes'>8 <f' a'>8 <d' bes'>8 | "
-msgstr ""
+msgstr "<f'·bes'>8·<f'·a'>8·<d'·bes'>8·|·"
 
 #. input/lsr/score-for-diatonic-accordion.ly:125 (comment)
 msgid "push 2"
-msgstr ""
+msgstr "Schub 2"
 
 #. input/lsr/score-for-diatonic-accordion.ly:126 (comment)
 msgid "<g' c''>4 <f' d''> <g' ees''> <f' a'> | "
-msgstr ""
+msgstr "<g'·c''>4·<f'·d''>·<g'·ees''>·<f'·a'>·|·"
 
 #. input/lsr/score-for-diatonic-accordion.ly:128 (comment)
 msgid "pull 3"
-msgstr ""
+msgstr "Zug 3"
 
 #. input/lsr/score-for-diatonic-accordion.ly:129 (comment)
 msgid "<f' bes'>2 r8 }"
-msgstr ""
+msgstr "<f'·bes'>2·r8·}"
 
 #. input/lsr/score-for-diatonic-accordion.ly:133 (comment)
 msgid "1. Place a copy of the piano melody above"
-msgstr ""
+msgstr "1. Eine Kopie der Klaviermelodie oben machen"
 
 #. input/lsr/score-for-diatonic-accordion.ly:135 (comment)
 msgid ""
 "3. For each line: Double the line. Remark the 1st one (Keeps unchanged as "
 "reference) and then "
 msgstr ""
+"3. Für jede Zeile: Zeile verdoppeln. Erste bleibt unverändert (Referenz), "
+"dann"
 
 #. input/lsr/score-for-diatonic-accordion.ly:136 (comment)
 msgid "change the second line using the transformation paper"
-msgstr ""
+msgstr "wird die zweite anhand des Transformationspapiers verändert"
 
 #. input/lsr/score-for-diatonic-accordion.ly:139 (comment)
 msgid "- "
-msgstr ""
+msgstr ""
 
 #. input/lsr/score-for-diatonic-accordion.ly:150 (comment)
 msgid "4/4 - tact. How many beats per bar"
-msgstr ""
+msgstr "4/4-Takt. Wie viele Takzeiten im Takt"
 
 #. input/lsr/score-for-diatonic-accordion.ly:152 (comment)
 msgid "The following line has to be adjusted O-F-T-E-N."
-msgstr ""
+msgstr "Die nächste Zeile muss sehr oft angepasst werden"
 
 #. input/lsr/score-for-diatonic-accordion.ly:161 (variable)
 msgid "staffVoice"
@@ -11919,11 +12046,11 @@ msgstr "systemAkkordionMel"
 
 #. input/lsr/score-for-diatonic-accordion.ly:176 (comment)
 msgid "Set the accidentals (Vorzeichen) for each note, "
-msgstr ""
+msgstr "Versetzungszeichen für jede Note"
 
 #. input/lsr/score-for-diatonic-accordion.ly:177 (comment)
 msgid "do not remember them for the rest of the measure.  "
-msgstr ""
+msgstr "im Rest des Taktes nicht erinnern"
 
 #. input/lsr/score-for-diatonic-accordion.ly:196 (variable)
 msgid "BassRhytm"
@@ -11931,40 +12058,45 @@ msgstr "BassRhythmus"
 
 #. input/lsr/score-for-diatonic-accordion.ly:197 (variable)
 msgid "LyricBassRhythmI"
-msgstr ""
+msgstr "LyricBassRhythmI"
 
 #. input/lsr/score-for-diatonic-accordion.ly:199 (variable)
 msgid "staffBassRhytm"
-msgstr ""
+msgstr "systemBassRhythmus"
 
 #. input/lsr/score-for-diatonic-accordion.ly:200 (comment)
 msgid ""
 "This is not a RhythmicStaff  because it must be possible to append lyrics."
-msgstr ""
+msgstr "Das ist kein RhythmicStaff weil hier Text hinzugefügt werden muss"
 
 #. input/lsr/score-for-diatonic-accordion.ly:202 (comment)
 msgid "x.y"
-msgstr ""
+msgstr "x.y"
 
 #. input/lsr/score-for-diatonic-accordion.ly:204 (comment)
 msgid ""
 "Shows one horizontal line. The vertical line (simulating a bar-line) is "
 "simulated by a grid"
 msgstr ""
+"Zeigt eine horizontale Linie. Die vertikale Linie (wie eine Taktlinie) "
+"istvon einer Gitterlinie simuliert"
 
 #. input/lsr/score-for-diatonic-accordion.ly:205 (comment)
 msgid "Search for 'grid' in this page to find all related functions "
 msgstr ""
+"Suche 'grid' (Gitter) in dieser Seite um alle wichtigen Funktionen zu finden"
 
 #. input/lsr/score-for-diatonic-accordion.ly:208 (context id)
 msgid "VoiceBassRhytm"
-msgstr ""
+msgstr "StimmeBassRhythmus"
 
 #. input/lsr/score-for-diatonic-accordion.ly:221 (comment)
 msgid ""
 "The vertical line (simulating a bar-line) in the staffBassRhytm is a "
 "gridline "
 msgstr ""
+"Die·vertikale·Linie·(wie·eine·Taktlinie) im "
+"systemBassRhythmus·istvon·einer·Gitterlinie·simuliert "
 
 #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:24 (comment)
 msgid "Define the fret diagrams to be used"
@@ -12013,10 +12145,11 @@ msgstr "schlagPizzicato"
 #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:56 (comment)
 msgid "now it can be used as \\snappizzicato after the note/chord"
 msgstr ""
+"jetzt kann es als \\schlagPizzicato nach einer Note/Akkord benutzt werden"
 
 #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:57 (comment)
 msgid "Note that a direction (-, ^ or _) is required."
-msgstr ""
+msgstr "Eine Richtung (-, ^ oder _) wird benötigt"
 
 #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:60 (comment)
 msgid "This does NOT work:"
@@ -12024,11 +12157,11 @@ msgstr "Das funktioniert NICHT:"
 
 #. input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly:61 (comment)
 msgid "<c e g>\\snapPizzicato"
-msgstr ""
+msgstr "<c·e·g>\\schlagPizzicato"
 
 #. input/lsr/stemlets.ly:35 (comment)
 msgid "N.B. use Score.Stem to set for the whole score."
-msgstr ""
+msgstr "Score.Stem benutzen, um es für die gesamte Partitur zu setzen"
 
 #. input/lsr/string-quartet-template-simple.ly:34 (variable)
 msgid "violinOne"
@@ -12044,11 +12177,11 @@ msgstr "Bratsche"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:63 (comment)
 msgid "piece.ly"
-msgstr ""
+msgstr "piece.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:64 (comment)
 msgid "(This is the global definitions file)"
-msgstr ""
+msgstr "(Globale Definitionen)"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:71 (variable)
 msgid "Violinone"
@@ -12058,7 +12191,7 @@ msgstr "Geigeeins"
 #. input/lsr/string-quartet-template-with-separate-parts.ly:82 (comment)
 #. input/lsr/string-quartet-template-with-separate-parts.ly:89 (comment)
 msgid "*********************************"
-msgstr ""
+msgstr "**********************************"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:77 (variable)
 msgid "Violintwo"
@@ -12074,11 +12207,11 @@ msgstr "Cello"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:96 (comment)
 msgid "**********************************"
-msgstr ""
+msgstr "**********************************"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:107 (comment)
 msgid "These are the other files you need to save on your computer"
-msgstr ""
+msgstr "Das sind die anderen Dateien, die gespeichert werden müssen"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:109 (comment)
 msgid "score.ly"
@@ -12086,7 +12219,7 @@ msgstr "score.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:110 (comment)
 msgid "(This is the main file)"
-msgstr ""
+msgstr "(Das ist die Hauptdatei)"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:113 (comment)
 #, python-format
@@ -12094,26 +12227,28 @@ msgid ""
 "\\include \\\"piece.ly\\\"             %%% uncomment this line when using a "
 "separate file"
 msgstr ""
+"\\include·\\\"piece.ly\\\"·············%%%·Zeile einkommentierten, wenn eine "
+"extraDatei benutzt wird"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment)
 msgid "{ Uncomment this block when using separate files"
-msgstr ""
+msgstr "{ Diesen Block einkommentieren, wenn extra Dateien benutzt werden"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:124 (comment)
 msgid "vn1.ly"
-msgstr ""
+msgstr "vn1.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:125 (comment)
 msgid "(This is the Violin 1 part file)"
-msgstr ""
+msgstr "(Stimme der ersten Geige)"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:134 (comment)
 msgid "vn2.ly"
-msgstr ""
+msgstr "vn2.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:135 (comment)
 msgid "(This is the Violin 2 part file)"
-msgstr ""
+msgstr "(Stimme der zweiten Geige)"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:144 (comment)
 msgid "vla.ly"
@@ -12121,15 +12256,15 @@ msgstr "vla.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:145 (comment)
 msgid "(This is the Viola part file)"
-msgstr ""
+msgstr "(Stimme der Bratsche)"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:154 (comment)
 msgid "vlc.ly"
-msgstr ""
+msgstr "vlc.ly"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:155 (comment)
 msgid "(This is the Cello part file)"
-msgstr ""
+msgstr "(Stimme des Cellos)"
 
 #. input/lsr/sub-dividing-beams.ly:50 (comment)
 msgid "Set beam sub-group length to an eighth note"
@@ -12146,22 +12281,27 @@ msgstr "ignorieren"
 #. input/lsr/three-sided-box.ly:16 (comment)
 msgid "New command to add a three sided box, with sides north, west and south"
 msgstr ""
+"Neuer Befehl um einen Kasten mit drei Seiten (Nord, West und Süd) zu "
+"erstellen"
 
 #. input/lsr/three-sided-box.ly:17 (comment)
 msgid "Based on the box-stencil command defined in scm/stencil.scm"
-msgstr ""
+msgstr "Basierend auf dem box-stencil-Befehl, definiert in scm/stencil.scm"
 
 #. input/lsr/three-sided-box.ly:18 (comment)
 msgid "Note that you use \\\";\\\" to comment a line in Scheme"
 msgstr ""
+"Achtung: \\\";\\\" wird benutzt um eine Zeile in Scheme auszukommentieren"
 
 #. input/lsr/three-sided-box.ly:32 (comment)
 msgid "The corresponding markup command, based on the \\box command defined "
 msgstr ""
+"Der entsprechende Beschriftungbefehl, basierend auf dem \\box-Befehl "
+"definiert"
 
 #. input/lsr/three-sided-box.ly:33 (comment)
 msgid "in scm/define-markup-commands.scm"
-msgstr ""
+msgstr "in scm/define-markup-commands.scm"
 
 #. input/lsr/three-sided-box.ly:47 (comment)
 msgid "Test it:"
@@ -12169,39 +12309,39 @@ msgstr "testen:"
 
 #. input/lsr/tick-bar-lines.ly:21 (comment)
 msgid "Use 'bar-size to control the height of the tick,"
-msgstr ""
+msgstr "'bar-size benutzen um die Höhe des Häkchens zu bestimmen,"
 
 #. input/lsr/tick-bar-lines.ly:22 (comment)
 msgid "and 'extra-offset to determine its position."
-msgstr ""
+msgstr "'extra-offset, umd seine Position zu bestimmen."
 
 #. input/lsr/tick-bar-lines.ly:24 (comment)
 msgid "With 'extra-offset set to zero, the tick will be"
-msgstr ""
+msgstr "Mit 'extra-offset auf Null gesetzt, wird das Häkchen"
 
 #. input/lsr/tick-bar-lines.ly:25 (comment)
 msgid "centered around the middle line of the staff."
-msgstr ""
+msgstr "um die Mittellinie des Systems zentriert"
 
 #. input/lsr/tick-bar-lines.ly:27 (comment)
 msgid "Replace Staff.BarLine with Score.BarLine to"
-msgstr ""
+msgstr "Staff.BarLine mit Score.BarLine ersetzen"
 
 #. input/lsr/tick-bar-lines.ly:28 (comment)
 msgid "apply the method to the whole score."
-msgstr ""
+msgstr "um die Methode auf die gesamte Partitur anzuwenden"
 
 #. input/lsr/tick-bar-lines.ly:38 (comment)
 msgid "Revert the overrides to get back a normal"
-msgstr ""
+msgstr "alles rückgängig machen und eine normale"
 
 #. input/lsr/tick-bar-lines.ly:39 (comment)
 msgid "bar line at the end."
-msgstr ""
+msgstr "Taktlinie am Ende setzen"
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:127 (variable)
 msgid "incipitDiscantus"
-msgstr ""
+msgstr "incipitDiscantus"
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:151 (variable)
 msgid "incipitAltus"
@@ -12219,10 +12359,13 @@ msgstr "IncipitBassus"
 msgid ""
 "StaffGroup is used instead of ChoirStaff to get bar lines between systems"
 msgstr ""
+"StaffGroup wird anstelle von ChoirStaff benutzt, um Taktlinien zwischen "
+"Systemen zu haben"
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:269 (comment)
 msgid "the next three instructions keep the lyrics between the barlines"
 msgstr ""
+"die nächsten drei Anweisungen, um den Text zwischen den Taktlinien zu halten"
 
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:131 (variable)
 msgid "naturalizeMusic"
@@ -12230,7 +12373,7 @@ msgstr "AuflösungszeichenNoten"
 
 #. input/lsr/tweaking-clef-properties.ly:111 (comment)
 msgid "The default treble clef"
-msgstr ""
+msgstr "Standard-Sopranschlüssel"
 
 #. input/lsr/tweaking-clef-properties.ly:113 (comment)
 msgid "The standard bass clef"
@@ -12238,11 +12381,11 @@ msgstr "Standard-Bassschlüssel"
 
 #. input/lsr/tweaking-clef-properties.ly:118 (comment)
 msgid "The baritone clef"
-msgstr ""
+msgstr "Baritonschlüssel"
 
 #. input/lsr/tweaking-clef-properties.ly:123 (comment)
 msgid "The standard choral tenor clef"
-msgstr ""
+msgstr "Standard-Chortenorschlüssel"
 
 #. input/lsr/tweaking-clef-properties.ly:129 (comment)
 msgid "A non-standard clef"
@@ -12258,55 +12401,55 @@ msgstr "das normale Verhältnis zwischen Noten und Schlüsseln"
 
 #. input/lsr/tweaking-clef-properties.ly:151 (comment)
 msgid "Here we go back to the normal clef:"
-msgstr ""
+msgstr "Wieder der normale Schlüssel:"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:34 (comment)
 msgid "The default in 3/4 time is to beam in three groups"
-msgstr ""
+msgstr "Standard in 3/4-Takt sind drei bebalkte Gruppen"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
 msgid "each of a quarter note length"
-msgstr ""
+msgstr "jede mit der Dauer einer Viertel"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:39 (comment)
 msgid "No auto-beaming is defined for 12/16"
-msgstr ""
+msgstr "Keine autom. Bebalkung definiert für 12/16"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
 msgid "Change time signature symbol, but retain underlying 3/4 beaming"
-msgstr ""
+msgstr "Taktart-Symbol ändern, aber 3/4-Bebalkung beibehalten"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
-msgstr ""
+msgstr "3/4-Taktart Standardgruppen (1 1 1) und beatLenght von 1/8"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
-msgstr ""
+msgstr "stimme nicht überein mit measureLenght von 3/4, sodass die Balken"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
 msgid "are grouped at beatLength intervals"
-msgstr ""
+msgstr "anhand von beatLength-Intervallen gruppiert werden"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:53 (comment)
 msgid "Specify beams in groups of (3 3 2 3) 1/16th notes"
-msgstr ""
+msgstr "Definition von Balken in Gruppen von (3 3 2 3) 1/16-Noten"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:54 (comment)
 msgid "3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,"
-msgstr ""
+msgstr "3+3+2+3=11, und 11*16<>3/4, also trifft beatGrouping nicht zu,"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:55 (comment)
 msgid "and beams are grouped at beatLength (1/16) intervals"
-msgstr ""
+msgstr "und Balken werden gruppiert anhand von beatLength (1/16)-Intervallen"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:60 (comment)
 msgid "Specify beams in groups of (3 4 2 3) 1/16th notes"
-msgstr ""
+msgstr "Definition von Balkengruppen für (3 4 2 3) 1/16-Noten"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:61 (comment)
 msgid "3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies"
-msgstr ""
+msgstr "3+4+2+3=12, und 12*1/16=3/4, also beatGrouping wird verwendet"
 
 #. input/lsr/using-postscript-to-generate-special-note-head-shapes.ly:17 (variable)
 msgid "parallelogram"
@@ -12322,35 +12465,36 @@ msgstr "normaleNotenköpfe"
 
 #. input/lsr/utf-8.ly:34 (comment)
 msgid "end verbatim - this comment is a hack to prevent texinfo.tex"
-msgstr ""
+msgstr "Ende von verbatim -- Dieser Kommentar ist ein Trick um texinfo.tex"
 
 #. input/lsr/utf-8.ly:35 (comment)
 msgid "from choking on non-European UTF-8 subsets"
 msgstr ""
+"daran zu hindern, sich an nicht-europäische UTF-8-Untergruppen zu stören"
 
 #. input/lsr/utf-8.ly:36 (comment)
 msgid "Cyrillic font"
-msgstr ""
+msgstr "Kyrillische Schrift"
 
 #. input/lsr/utf-8.ly:37 (variable)
 msgid "bulgarian"
-msgstr ""
+msgstr "Bulgarisch"
 
 #. input/lsr/utf-8.ly:41 (variable)
 msgid "hebrew"
-msgstr ""
+msgstr "Hebräisch"
 
 #. input/lsr/utf-8.ly:45 (variable)
 msgid "japanese"
-msgstr "japanisch"
+msgstr "Japanisch"
 
 #. input/lsr/utf-8.ly:52 (comment)
 msgid "\\\"a legal song to you\\\""
-msgstr ""
+msgstr "\\\"a·legal·song·to·you\\\""
 
 #. input/lsr/utf-8.ly:53 (variable)
 msgid "portuguese"
-msgstr ""
+msgstr "Portugiesisch"
 
 #. input/lsr/vertically-centered-common-lyrics.ly:19 (variable)
 msgid "leftbrace"
@@ -12370,7 +12514,7 @@ msgstr "Textnachoben"
 
 #. input/lsr/vertically-centered-common-lyrics.ly:36 (variable)
 msgid "skipFour"
-msgstr ""
+msgstr "überspringeVier"
 
 #. input/lsr/vertically-centered-common-lyrics.ly:38 (variable)
 msgid "lyricsA"
@@ -12390,7 +12534,7 @@ msgstr "TextD"
 
 #. input/lsr/vertically-centered-common-lyrics.ly:49 (context id)
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:37 (variable)
@@ -12408,7 +12552,7 @@ msgstr "SopranText"
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:67 (context id)
 #. input/lsr/vocal-ensemble-template.ly:72 (context id)
 msgid "women"
-msgstr ""
+msgstr "frauen"
 
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:82 (context id)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:77 (context id)
@@ -12420,40 +12564,41 @@ msgstr "Männer"
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:89 (comment)
 #. input/lsr/vocal-ensemble-template.ly:102 (comment)
 msgid "a little smaller so lyrics"
-msgstr ""
+msgstr "etwas kleiner, damit der Text"
 
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (comment)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:90 (comment)
 #. input/lsr/vocal-ensemble-template.ly:103 (comment)
 msgid "can be closer to the staff"
-msgstr "kann näher am System sein"
+msgstr "näher am System sein kann"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:73 (comment)
 msgid "we could remove the line about this with the line below, since we want"
 msgstr ""
+"die Zeile oberhalb könnte mir der Zeile unterhalb entfernt werden, weil"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:74 (comment)
 msgid "the alto lyrics to be below the alto Voice anyway."
-msgstr ""
+msgstr "der Alt-Text sowieso unter der Altstimme sein soll"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:75 (comment)
 msgid "\\new Lyrics \\lyricsto altos \\altoWords"
-msgstr ""
+msgstr "\\new·Lyrics·\\lyricsto·altos·\\altoWords"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:84 (comment)
 msgid "again, we could replace the line above this with the line below."
-msgstr ""
+msgstr "die Zeile oberhalb könnte mit der Zeile unterhalb ersetzt werden"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:85 (comment)
 msgid "\\new Lyrics \\lyricsto basses \\bassWords"
-msgstr ""
+msgstr "\\new·Lyrics·\\lyricsto·basses·\\bassWords"
 
 #. input/lsr/volta-multi-staff.ly:13 (variable)
 msgid "voltaMusic"
 msgstr "KlammerNoten"
 
 msgid "Up:"
-msgstr "Nach oben:"
+msgstr "NachOben:"
 
 msgid "Next:"
 msgstr "Weiter:"
@@ -12470,6 +12615,15 @@ msgstr "Fußnoten"
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
+#~ msgid "applies to \\\"fas\\\""
+#~ msgstr "gehört zu \\\"fas\\\""
+
+#~ msgid "Common tweaks"
+#~ msgstr "Übliche Optimierungen"
+
+#~ msgid "GNU LilyPond -- Das Notationsprogramm"
+#~ msgstr "GNU LilyPond -- Das Notationsprogramm"
+
 #~ msgid "System start delimiters"
 #~ msgstr "Klammern am Systemanfang"
 
index f69c6319587e1b0accf18942e28e1e597b0e3f10..efb8bac7c768da231f4c3024f2fcf8a24cf2e2c2 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 11:30+0100\n"
+"POT-Creation-Date: 2008-12-07 23:30+0100\n"
 "PO-Revision-Date: 2008-12-03 11:45+0100\n"
 "Last-Translator: Francisco Vila <francisco.vila@hispalinux.es>\n"
 "Language-Team: Español\n"
@@ -1505,8 +1505,8 @@ msgstr "inferior"
 #. Documentation/user/vocal.itely:571 (context id)
 #. Documentation/user/vocal.itely:803 (context id)
 #. Documentation/user/vocal.itely:824 (context id)
-#. Documentation/user/vocal.itely:1222 (variable)
-#. Documentation/user/vocal.itely:1264 (variable)
+#. Documentation/user/vocal.itely:1224 (variable)
+#. Documentation/user/vocal.itely:1266 (variable)
 #. Documentation/user/ancient.itely:2413 (context id)
 #. Documentation/user/ancient.itely:2452 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:24 (context id)
@@ -1515,7 +1515,7 @@ msgstr "inferior"
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
 #. input/lsr/guitar-strum-rhythms.ly:56 (context id)
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:37 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes-and-chords.ly:29 (variable)
@@ -1527,8 +1527,8 @@ msgstr "melodia"
 
 #. Documentation/user/fundamental.itely:361 (variable)
 #. Documentation/user/vocal.itely:1051 (variable)
-#. Documentation/user/vocal.itely:1227 (variable)
-#. Documentation/user/vocal.itely:1268 (variable)
+#. Documentation/user/vocal.itely:1229 (variable)
+#. Documentation/user/vocal.itely:1270 (variable)
 #. input/lsr/piano-template-with-centered-lyrics.ly:45 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:36 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:36 (variable)
@@ -1657,8 +1657,8 @@ msgstr "Iniciar la primera voz"
 #. Documentation/user/fundamental.itely:1199 (context id)
 #. Documentation/user/fundamental.itely:2441 (context id)
 #. Documentation/user/vocal.itely:506 (context id)
-#. Documentation/user/vocal.itely:1233 (context id)
-#. Documentation/user/vocal.itely:1274 (context id)
+#. Documentation/user/vocal.itely:1235 (context id)
+#. Documentation/user/vocal.itely:1276 (context id)
 #. Documentation/user/keyboards.itely:329 (context id)
 #. Documentation/user/fretted-strings.itely:243 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable)
@@ -2398,7 +2398,8 @@ msgstr "Aumentar solamente el grosor de la ligadura siguiente"
 
 #. Documentation/user/tweaks.itely:735 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
-msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
+msgstr ""
+"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
 
 #. Documentation/user/tweaks.itely:1395 (comment)
 msgid "Don't print clefs in this staff"
@@ -2414,7 +2415,8 @@ msgstr "Reducir el tamaño de la fuente en un 24% aprox."
 
 #. Documentation/user/tweaks.itely:1527 (comment)
 msgid "Reduce stem length and line spacing to match"
-msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
+msgstr ""
+"Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
 
 #. Documentation/user/tweaks.itely:1957 (comment)
 #. Documentation/user/tweaks.itely:2027 (comment)
@@ -2456,7 +2458,8 @@ msgstr "Detener el corchete de octava"
 
 #. Documentation/user/tweaks.itely:2032 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
-msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto"
+msgstr ""
+"Situar el corchete de octava ulterior por debajo de los extensores de texto"
 
 #. Documentation/user/tweaks.itely:2094 (comment)
 msgid "Cause notes to space out to accommodate text"
@@ -2922,7 +2925,8 @@ msgstr "la propiedad padding (relleno)"
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "left-padding and right-padding"
-msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)"
+msgstr ""
+"left-padding y right-padding (relleno por la izquierda y por la derecha)"
 
 #. @subheading in Documentation/user/tweaks.itely
 #. @subheading in Documentation/fr/user/tweaks.itely
@@ -3636,16 +3640,20 @@ msgstr "Ajustes para sistemas operativos específicos"
 #. @subsection in Documentation/user/setup.itely
 #. @node in Documentation/es/user/setup.itely
 #. @subsection in Documentation/es/user/setup.itely
+#. @node in Documentation/de/user/setup.itely
+#. @subsection in Documentation/de/user/setup.itely
 msgid "Setup for MacOS X"
 msgstr "Configuración para MacOS X"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "Using Python scripts on MacOS 10.3 or 10.4"
 msgstr "Uso de guiones Python en MacOS 10.3 o 10.4"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "MacOS X on the command line"
 msgstr "MacOS X sobre línea de órdenes"
 
@@ -3775,22 +3783,24 @@ msgstr "Utilización desde la línea de órdenes"
 #. @subsection in Documentation/fr/user/running.itely
 #. @node in Documentation/es/user/running.itely
 #. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking lilypond"
 msgstr "Invocar a LilyPond"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking @command{lilypond}"
 msgstr "Invocar @command{lilypond}"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for lilypond"
 msgstr "Opciones de la línea de órdenes para lilypond"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{lilypond}"
 msgstr "Opciones de la línea de órdenes para @command{lilypond}"
 
@@ -3825,16 +3835,19 @@ msgstr "Actualizar ficheros con convert-ly"
 
 #. @section in Documentation/user/running.itely
 #. @section in Documentation/es/user/running.itely
+#. @section in Documentation/de/user/running.itely
 msgid "Updating files with @command{convert-ly}"
 msgstr "Actualizar ficheros con @command{convert-ly}"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for convert-ly"
 msgstr "Opciones de la línea de órdenes para convert-ly"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{convert-ly}"
 msgstr "Opciones de la línea de órdenes para @command{convert-ly}"
 
@@ -4018,8 +4031,6 @@ msgstr "Instrucciones específicas de formato"
 #. @subsection in Documentation/fr/user/running.itely
 #. @subheading in Documentation/fr/user/lilypond-book.itely
 #. @subheading in Documentation/es/user/lilypond-book.itely
-#. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 #. @subheading in Documentation/de/user/lilypond-book.itely
 msgid "Command line options"
 msgstr "Opciones de la línea de órdenes"
@@ -4540,7 +4551,7 @@ msgid "Rest measures contracted to single measure"
 msgstr "Compases en silencio contraídos a un solo compás"
 
 #. Documentation/user/rhythms.itely:705 (comment)
-#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:24 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:35 (comment)
 msgid "Default behavior"
 msgstr "Comportamiento predeterminado"
 
@@ -4582,7 +4593,8 @@ msgstr "misDuraciones"
 
 #. Documentation/user/rhythms.itely:1598 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
-msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16"
+msgstr ""
+"finalizar barras de semicorchea para todos los compases en el momento 1/16"
 
 #. Documentation/user/rhythms.itely:1602 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
@@ -4636,7 +4648,8 @@ msgstr "Imprimir el número de compás cada dos compases"
 
 #. Documentation/user/rhythms.itely:2070 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
-msgstr "No poner números de compás al final de la línea, pero sí en otros lugares"
+msgstr ""
+"No poner números de compás al final de la línea, pero sí en otros lugares"
 
 #. Documentation/user/rhythms.itely:2074 (comment)
 #. Documentation/user/rhythms.itely:2100 (comment)
@@ -5752,7 +5765,8 @@ msgstr "Formateo de las notas de aviso"
 
 #. Documentation/user/editorial.itely:325 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
-msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
+msgstr ""
+"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
 
 #. @node in Documentation/user/editorial.itely
 #. @section in Documentation/user/editorial.itely
@@ -5886,7 +5900,7 @@ msgstr "Líneas de rejilla"
 msgid "Analysis brackets"
 msgstr "Corchetes de análisis"
 
-#. Documentation/user/text.itely:455 (variable)
+#. Documentation/user/text.itely:421 (variable)
 msgid "allegro"
 msgstr "allegro"
 
@@ -6105,40 +6119,40 @@ msgstr "letra"
 msgid "tune"
 msgstr "melodia"
 
-#. Documentation/user/vocal.itely:1104 (context id)
+#. Documentation/user/vocal.itely:1101 (context id)
 msgid "lahlah"
 msgstr "lala"
 
-#. Documentation/user/vocal.itely:1282 (comment)
+#. Documentation/user/vocal.itely:1284 (comment)
 msgid "moves the column off the left margin;"
 msgstr "aleja la columna del margen izquierdo;"
 
-#. Documentation/user/vocal.itely:1283 (comment)
+#. Documentation/user/vocal.itely:1285 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr "se puede quitar si el espaciado de la página es apretado"
 
-#. Documentation/user/vocal.itely:1291 (comment)
-#. Documentation/user/vocal.itely:1309 (comment)
+#. Documentation/user/vocal.itely:1293 (comment)
+#. Documentation/user/vocal.itely:1311 (comment)
 msgid "adds vertical spacing between verses"
 msgstr "añade espaciado vertical entre estrofas"
 
-#. Documentation/user/vocal.itely:1299 (comment)
+#. Documentation/user/vocal.itely:1301 (comment)
 msgid "adds horizontal spacing between columns;"
 msgstr "añade espaciado horizontal entre columnas;"
 
-#. Documentation/user/vocal.itely:1300 (comment)
+#. Documentation/user/vocal.itely:1302 (comment)
 msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr "si aún están muy juntas, añada más parejas \\\" \\\""
 
-#. Documentation/user/vocal.itely:1301 (comment)
+#. Documentation/user/vocal.itely:1303 (comment)
 msgid "until the result looks good"
 msgstr "hasta que el resultado resulte adecuado"
 
-#. Documentation/user/vocal.itely:1317 (comment)
+#. Documentation/user/vocal.itely:1319 (comment)
 msgid "gives some extra space on the right margin;"
 msgstr "aplica más separación en el margen derecho;"
 
-#. Documentation/user/vocal.itely:1318 (comment)
+#. Documentation/user/vocal.itely:1320 (comment)
 msgid "can be removed if page space is tight"
 msgstr "se puede quitar si el espaciado de la página es apretado"
 
@@ -6648,6 +6662,20 @@ msgstr "Símbolos de Discanto"
 msgid "Harp"
 msgstr "Arpa"
 
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#, fuzzy
+msgid "Harp notation"
+msgstr "Notación de los pentagramas"
+
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#. @node in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
+#, fuzzy
+msgid "Harp pedals"
+msgstr "Pedales de piano"
+
 #. @node in Documentation/user/unfretted-strings.itely
 #. @section in Documentation/user/unfretted-strings.itely
 #. @node in Documentation/fr/user/unfretted-strings.itely
@@ -6705,6 +6733,7 @@ msgstr "Armónicos"
 
 #. @rglos in Documentation/user/unfretted-strings.itely
 #. @rglos in Documentation/es/user/unfretted-strings.itely
+#. @rglos in Documentation/de/user/unfretted-strings.itely
 msgid "harmonics"
 msgstr "armónicos"
 
@@ -6845,6 +6874,8 @@ msgstr "Marcas de diagramas de trastes"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Predefined fret diagrams"
 msgstr "Diagramas predefinidos de trastes"
 
@@ -6852,6 +6883,8 @@ msgstr "Diagramas predefinidos de trastes"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Automatic fret diagrams"
 msgstr "Diagramas de traste automáticos"
 
@@ -6947,7 +6980,8 @@ msgstr "También define las posiciones de las dos líneas."
 
 #. Documentation/user/percussion.itely:396 (comment)
 msgid "This is neccessary; if not entered, the barline would be too short!"
-msgstr "Esto es necesario; si no se pone, la línea divisoria sería demasiado corta."
+msgstr ""
+"Esto es necesario; si no se pone, la línea divisoria sería demasiado corta."
 
 #. Documentation/user/percussion.itely:403 (comment)
 msgid "with this you load your new drum style table"
@@ -7029,6 +7063,8 @@ msgstr "Notación básica de percusión"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Drum rolls"
 msgstr "Redobles"
 
@@ -7036,6 +7072,8 @@ msgstr "Redobles"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Pitched percussion"
 msgstr "Percusión afinada"
 
@@ -7054,6 +7092,8 @@ msgstr "Pautas de percusión"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Custom percussion staves"
 msgstr "Pautas de percusión personalizadas"
 
@@ -8025,46 +8065,49 @@ msgstr "Balance entre instrumentos (i)"
 #. @subsection in Documentation/user/input.itely
 #. @node in Documentation/es/user/input.itely
 #. @subsection in Documentation/es/user/input.itely
+#. @node in Documentation/de/user/input.itely
+#. @subsection in Documentation/de/user/input.itely
 msgid "Percussion in MIDI"
 msgstr "Percusión en MIDI"
 
-#. Documentation/user/spacing.itely:868 (comment)
+#. Documentation/user/spacing.itely:864 (comment)
 msgid "this does nothing"
 msgstr "esto no hace nada"
 
-#. Documentation/user/spacing.itely:869 (comment)
+#. Documentation/user/spacing.itely:865 (comment)
 msgid "a break here would work"
 msgstr "un salto aquí funcionaría"
 
-#. Documentation/user/spacing.itely:870 (comment)
+#. Documentation/user/spacing.itely:866 (comment)
 msgid "as does this break"
 msgstr "como por ejemplo este salto"
 
-#. Documentation/user/spacing.itely:882 (comment)
+#. Documentation/user/spacing.itely:878 (comment)
 msgid "now the break is allowed"
 msgstr "ahora se permite el salto de línea"
 
-#. Documentation/user/spacing.itely:1761 (comment)
+#. Documentation/user/spacing.itely:1757 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "esta vez el texto estará más cerca del pentagrama"
 
-#. Documentation/user/spacing.itely:1763 (comment)
+#. Documentation/user/spacing.itely:1759 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
-msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número,"
+msgstr ""
+"ajustando el valor de outside-staff-priority a algo que no sea un número,"
 
-#. Documentation/user/spacing.itely:1764 (comment)
+#. Documentation/user/spacing.itely:1760 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr "desactivamos la evitación automática de colisiones"
 
-#. Documentation/user/spacing.itely:1767 (comment)
+#. Documentation/user/spacing.itely:1763 (comment)
 msgid "now they will collide"
 msgstr "ahora se producirá la colisión"
 
-#. Documentation/user/spacing.itely:1792 (comment)
+#. Documentation/user/spacing.itely:1788 (comment)
 msgid "the markup is too close to the following note"
 msgstr "el marcado está demasiado cerca de la nota siguiente"
 
-#. Documentation/user/spacing.itely:1795 (comment)
+#. Documentation/user/spacing.itely:1791 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "ajustar outside-staff-horizontal-padding corrige esto"
 
@@ -8486,11 +8529,13 @@ msgstr "la RehearsalMark se centra sobre la armadura"
 #. Documentation/user/changing-defaults.itely:2972 (comment)
 #. Documentation/user/changing-defaults.itely:2988 (comment)
 #. Documentation/user/changing-defaults.itely:2995 (comment)
-msgid "The RehearsalMark will be aligned with the left edge of the KeySignature"
+msgid ""
+"The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la izquierda con la armadura"
 
 #. Documentation/user/changing-defaults.itely:2977 (comment)
-msgid "The RehearsalMark will be aligned with the right edge of the KeySignature"
+msgid ""
+"The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la derecha con la armadura"
 
 #. Documentation/user/changing-defaults.itely:2989 (comment)
@@ -9349,6 +9394,8 @@ msgstr "Carta de nombres de acordes"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Common chord modifiers"
 msgstr "Modificadores de acorde más usuales"
 
@@ -9356,6 +9403,8 @@ msgstr "Modificadores de acorde más usuales"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Predefined fretboard diagrams"
 msgstr "Diagramas predefinidos de trastes"
 
@@ -9453,6 +9502,8 @@ msgstr "Lista de articulaciones"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Percussion notes"
 msgstr "Notas de percusión"
 
@@ -9565,13 +9616,10 @@ msgstr ""
 
 #. @node in Documentation/fr/user/setup.itely
 #. @subsection in Documentation/fr/user/setup.itely
-#. @node in Documentation/de/user/setup.itely
-#. @subsection in Documentation/de/user/setup.itely
 msgid "MacOS X on the command-line"
 msgstr "MacOS X sobre línea de órdenes"
 
 #. @section in Documentation/fr/user/running.itely
-#. @section in Documentation/de/user/running.itely
 msgid "Updating with @command{convert-ly}"
 msgstr "Actualizar ficheros con @command{convert-ly}"
 
@@ -9842,7 +9890,12 @@ msgid "GNU LilyPond -- Programmbenutzung"
 msgstr ""
 
 #. @top in Documentation/de/user/lilypond.tely
-msgid "GNU LilyPond -- Das Notationsprogramm"
+#, fuzzy
+msgid "GNU LilyPond -- Notationsreferenz"
+msgstr "GNU LilyPond: Referencia de la notación"
+
+#. @chapheading in Documentation/de/user/lilypond.tely
+msgid "Das Notensatzprogramm"
 msgstr ""
 
 #. @subsubheading in Documentation/de/user/vocal.itely
@@ -10036,11 +10089,13 @@ msgstr "la RehearsalMark se centra sobre la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:65 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:77 (comment)
-msgid "the RehearsalMark will be aligned with the left edge of the KeySignature"
+msgid ""
+"the RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la izquierda con la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:71 (comment)
-msgid "the RehearsalMark will be aligned with the right edge of the KeySignature"
+msgid ""
+"the RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la derecha con la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:78 (comment)
@@ -10166,7 +10221,8 @@ msgstr "ARREGLAR: esablecer de nuevo printKeyCancellation a #t no debe"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:77 (comment)
 msgid "occur in the first bar after the incipit.  Dto. for forceClef."
-msgstr "ocurrir en el primer compás después del incipit. Lo mismo para forceClef."
+msgstr ""
+"ocurrir en el primer compás después del incipit. Lo mismo para forceClef."
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:78 (comment)
 msgid "Therefore, we need an extra \\skip."
@@ -10318,7 +10374,8 @@ msgstr "sin ligaduras de expresión"
 #. input/lsr/incipit.ly:274 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:280 (comment)
 msgid "Comment in the below \\\"\\remove\\\" command to allow line"
-msgstr "Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir"
+msgstr ""
+"Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:264 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:281 (comment)
@@ -10336,7 +10393,8 @@ msgstr ""
 #. input/lsr/incipit.ly:277 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:283 (comment)
 msgid "short example score, but especially for large scores, you"
-msgstr "partitura corta de ejemplo, pero especialmente para partituras extensas,"
+msgstr ""
+"partitura corta de ejemplo, pero especialmente para partituras extensas,"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:267 (comment)
 #. input/lsr/incipit.ly:278 (comment)
@@ -10348,7 +10406,8 @@ msgstr "probablemente consiga unos saltos de línea mejores y así mejorar"
 #. input/lsr/incipit.ly:279 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:285 (comment)
 msgid "overall spacing if you comment in the following command."
-msgstr "el espaciado general si elimina el comentario de la instrucción siguiente."
+msgstr ""
+"el espaciado general si elimina el comentario de la instrucción siguiente."
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:269 (comment)
 #. input/lsr/incipit.ly:280 (comment)
@@ -10393,7 +10452,7 @@ msgstr "barraNegras"
 msgid "Use the macro"
 msgstr "Usar el macro"
 
-#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:30 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:41 (comment)
 msgid "Corrected to avoid collisions"
 msgstr "Corregido para evitar colisiones"
 
@@ -10423,7 +10482,9 @@ msgstr "bloque paper del book, que se hereda por todas las bookparts"
 
 #. input/lsr/book-parts.ly:24 (comment)
 msgid "Page footer: add a different part-tagline at part last page"
-msgstr "Pie de la página: añadir una línea de pie diferente para la parte en la última página de la parte"
+msgstr ""
+"Pie de la página: añadir una línea de pie diferente para la parte en la "
+"última página de la parte"
 
 #. input/lsr/book-parts.ly:28 (comment)
 msgid "Copyright header field only on book first page."
@@ -10431,7 +10492,8 @@ msgstr "Campo de cabecera Copyright sólo en la primera página del libro"
 
 #. input/lsr/book-parts.ly:32 (comment)
 msgid "Part tagline header field only on each part last page."
-msgstr "Cebecera de lína de pie de la parte sólo en la última página de cada parte"
+msgstr ""
+"Cebecera de lína de pie de la parte sólo en la última página de cada parte"
 
 #. input/lsr/book-parts.ly:36 (comment)
 msgid "Tagline header field only on book last page."
@@ -10465,7 +10527,8 @@ msgstr ""
 
 #. input/lsr/breathing-signs.ly:26 (comment)
 msgid "rvarcomma and lvarcomma are variations of the default rcomma and lcomma"
-msgstr "rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas"
+msgstr ""
+"rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas"
 
 #. input/lsr/breathing-signs.ly:27 (comment)
 msgid "N.B.: must use Staff context here, since we start a Voice below"
@@ -10565,7 +10628,8 @@ msgstr "cambiaMusicaExcepciones"
 
 #. input/lsr/chord-name-exceptions.ly:31 (comment)
 msgid "Convert music to list and prepend to existing exceptions."
-msgstr "Convertir la música en una lista y añadirla a las excepciones existentes."
+msgstr ""
+"Convertir la música en una lista y añadirla a las excepciones existentes."
 
 #. input/lsr/chord-name-exceptions.ly:32 (variable)
 msgid "chExceptions"
@@ -10593,7 +10657,8 @@ msgstr "(make-rhythmic-locations NUM-COMPAS NUMERADOR DENOMINADOR)"
 
 #. input/lsr/clip-systems.ly:59 (comment)
 msgid "means NUM/DEN whole-notes into bar numbered BAR-NUMBER"
-msgstr "significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS"
+msgstr ""
+"significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS"
 
 #. input/lsr/coloring-notes-depending-on-their-pitch.ly:13 (comment)
 msgid "Association list of pitches to colors."
@@ -10744,7 +10809,8 @@ msgstr "solMayor"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
-msgstr "fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly"
+msgstr ""
+"fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly"
 
 #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
@@ -10985,7 +11051,7 @@ msgstr "Ejemplo 3"
 msgid "Example 4"
 msgstr "Ejemplo 4"
 
-#. input/lsr/flute-slap-notation.ly:17 (variable)
+#. input/lsr/flute-slap-notation.ly:18 (variable)
 msgid "slap"
 msgstr "slap"
 
@@ -10999,7 +11065,8 @@ msgstr ""
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:37 (comment)
 msgid "A chord for ukelele, with formatting defined in definition string"
-msgstr "Acorde para el ukelele, con el formato definido en la cadena de definición"
+msgstr ""
+"Acorde para el ukelele, con el formato definido en la cadena de definición"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:38 (comment)
 msgid "1.2 * size, 4 strings, 4 frets, fingerings below string"
@@ -11055,9 +11122,11 @@ msgstr "dos espacios por encima de la línea central sobre el pentagrama oculto"
 
 #. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
 msgid "to four spaces below center line on visible staff"
-msgstr "hasta cuatro espacios por debajo de la línea central sobre el pentagrama visible"
+msgstr ""
+"hasta cuatro espacios por debajo de la línea central sobre el pentagrama "
+"visible"
 
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:51 (variable)
 msgid "drum"
 msgstr "percusion"
 
@@ -11102,7 +11171,8 @@ msgstr ""
 "alignment lo ponga en la posición correcta"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:63 (comment)
-msgid "Drawback: the padding really reserves the space, nothing else can be there"
+msgid ""
+"Drawback: the padding really reserves the space, nothing else can be there"
 msgstr ""
 "Inconveniente: el relleno reserva el espacio realmente, no puede haber nada "
 "más aquí"
@@ -11126,7 +11196,8 @@ msgstr ""
 "podría dar lugar a colisiones"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:74 (comment)
-msgid "Drawback: Also, there seems to be some spacing, so it's not exactly the "
+msgid ""
+"Drawback: Also, there seems to be some spacing, so it's not exactly the "
 msgstr ""
 "Inconveniente: asimismo, parece haber algo de espacio, por lo que no es "
 "exactamente"
@@ -11573,11 +11644,13 @@ msgstr "el truco siguiente mueve el silencio a la línea central"
 
 #. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
-msgstr "Los silencios multicompás de las voces impares están bajo la línea superior"
+msgstr ""
+"Los silencios multicompás de las voces impares están bajo la línea superior"
 
 #. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
-msgstr "Los silencios multicompás de las voces pares están bajo la línea inferior"
+msgstr ""
+"Los silencios multicompás de las voces pares están bajo la línea inferior"
 
 #. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
@@ -11599,7 +11672,8 @@ msgstr ""
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:35 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size if needed"
-msgstr "Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario"
+msgstr ""
+"Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:42 (comment)
 msgid "Should Coda be on anew line?"
@@ -11625,7 +11699,8 @@ msgstr "¡Aquí comienzan los trucos!"
 msgid ""
 "\\cadenzaOn will suppress the bar count and \\stopStaff removes the staff "
 "lines."
-msgstr "\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama"
+msgstr ""
+"\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:58 (comment)
 msgid "Some examples of possible text-displays "
@@ -11715,7 +11790,8 @@ msgstr "¡Mostraos, clave y armadura!"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:99 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size and position"
-msgstr "Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición"
+msgstr ""
+"Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:101 (comment)
 msgid ""
@@ -11785,7 +11861,8 @@ msgstr ""
 
 #. input/lsr/removing-the-first-empty-line.ly:53 (comment)
 msgid "To use the setting globally, comment this line,"
-msgstr "Para usar el ajuste globalmente, haga un comentario de la línea siguiente:"
+msgstr ""
+"Para usar el ajuste globalmente, haga un comentario de la línea siguiente:"
 
 #. input/lsr/removing-the-first-empty-line.ly:54 (comment)
 msgid "uncomment the line in the \\layout block above"
@@ -11844,7 +11921,8 @@ msgstr ""
 "se simula con una línea de rejilla"
 
 #. input/lsr/score-for-diatonic-accordion.ly:83 (comment)
-msgid "disable the following line to see the the noteheads while writing the song "
+msgid ""
+"disable the following line to see the the noteheads while writing the song "
 msgstr ""
 "Deshabilite la línea siguiente para ver las cabezas mientras escribe la "
 "canción"
@@ -11858,7 +11936,8 @@ msgid "How to fast write the push-lines: "
 msgstr "Cuán rápido escribir las líneas de cerrar:"
 
 #. input/lsr/score-for-diatonic-accordion.ly:89 (comment)
-msgid "1. write repeatedly 'c c c c c c c c |' for the whole length of the song "
+msgid ""
+"1. write repeatedly 'c c c c c c c c |' for the whole length of the song "
 msgstr "1. escribir repetidamente 'c c c c c c c c |' en toda la canción"
 
 #. input/lsr/score-for-diatonic-accordion.ly:90 (comment)
@@ -11874,7 +11953,8 @@ msgid "4. Mark the positions on which push/pull changes. "
 msgstr "4. Marcar las posiciones en las que cambia el abrir o cerrar"
 
 #. input/lsr/score-for-diatonic-accordion.ly:93 (comment)
-msgid "In the score-picture click on the position the push- or pull-part starts "
+msgid ""
+"In the score-picture click on the position the push- or pull-part starts "
 msgstr ""
 "En la imagen de la partitura pulse sobre la posición en que inician las "
 "partes de abrir o cerrar"
@@ -11893,7 +11973,8 @@ msgstr "a) Si en ese lugar empieza una parte de cerrar, cambie la 'c' por 'e['"
 
 #. input/lsr/score-for-diatonic-accordion.ly:97 (comment)
 msgid "b) If a pull-part starts there, replace the 'c' by an 's'"
-msgstr "b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'"
+msgstr ""
+"b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'"
 
 #. input/lsr/score-for-diatonic-accordion.ly:98 (comment)
 msgid "5. Switch into 'overwrite-mode' by pressing the 'ins' key. "
@@ -12052,7 +12133,8 @@ msgid "staffBassRhytm"
 msgstr "duracionesPentagramaBajo"
 
 #. input/lsr/score-for-diatonic-accordion.ly:200 (comment)
-msgid "This is not a RhythmicStaff  because it must be possible to append lyrics."
+msgid ""
+"This is not a RhythmicStaff  because it must be possible to append lyrics."
 msgstr "Esto no es un RhythmicStaff porque se debe poder aplicar letra."
 
 #. input/lsr/score-for-diatonic-accordion.ly:202 (comment)
@@ -12218,7 +12300,8 @@ msgstr ""
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment)
 msgid "{ Uncomment this block when using separate files"
-msgstr "{ Quite la marca de comentario de este bloque si está usando archivos aparte"
+msgstr ""
+"{ Quite la marca de comentario de este bloque si está usando archivos aparte"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:124 (comment)
 msgid "vn1.ly"
@@ -12341,7 +12424,8 @@ msgid "incipitBassus"
 msgstr ""
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:226 (comment)
-msgid "StaffGroup is used instead of ChoirStaff to get bar lines between systems"
+msgid ""
+"StaffGroup is used instead of ChoirStaff to get bar lines between systems"
 msgstr ""
 "StaffGroup se usa en lugar de ChoirStaff para tener líneas divisorias entre "
 "los sistemas"
@@ -12406,7 +12490,8 @@ msgstr "Cambiar el símbolo de compás, manteniendo el barrado subyacente de 3/4
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
-msgstr "El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4"
+msgstr ""
+"El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4"
 
 #. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
@@ -12607,4 +12692,3 @@ msgstr "Notas al pie"
 # this is the same translation that babel LaTex package uses . FVD
 msgid "Table of Contents"
 msgstr "Índice general"
-
index dba2faaaf1ab8abf21ff555e23bc2a317df07327..e6df81c03b5a1f451f31b5e716829ddb2fee3afe 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-22 20:22+0100\n"
+"POT-Creation-Date: 2008-12-07 23:30+0100\n"
 "PO-Revision-Date: 2008-11-09 13:14+0100\n"
 "Last-Translator: Jean-Charles Malahieude <lolyfan-AT-wanadoo-DOT-fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
@@ -423,23 +423,23 @@ msgstr "sol est à 5 crans de plus ou 2 de moins, il sera donc en dessous"
 msgid "f is 4 up or 3 down, so is the f below"
 msgstr "fa est à 4 crans de plus ou 3 de moins, il sera donc en dessous"
 
-#. Documentation/user/tutorial.itely:1796 (variable)
+#. Documentation/user/tutorial.itely:1791 (variable)
 #. Documentation/user/working.itely:214 (variable)
 #. Documentation/user/working.itely:229 (variable)
-#. Documentation/user/pitches.itely:1041 (context id)
+#. Documentation/user/pitches.itely:1035 (context id)
 msgid "violin"
 msgstr "violon"
 
-#. Documentation/user/tutorial.itely:1801 (variable)
+#. Documentation/user/tutorial.itely:1796 (variable)
 #. input/lsr/string-quartet-template-simple.ly:62 (variable)
 msgid "cello"
 msgstr "cello"
 
-#. Documentation/user/tutorial.itely:1826 (variable)
+#. Documentation/user/tutorial.itely:1821 (variable)
 msgid "tripletA"
 msgstr "trioletA"
 
-#. Documentation/user/tutorial.itely:1827 (variable)
+#. Documentation/user/tutorial.itely:1822 (variable)
 msgid "barA"
 msgstr "mesureA"
 
@@ -1011,6 +1011,7 @@ msgstr "doigté"
 #. @node in Documentation/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/user/expressive.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely
 #. @subheading in Documentation/es/user/tutorial.itely
@@ -1450,27 +1451,27 @@ msgstr "Noms de note absolus"
 msgid "After the tutorial"
 msgstr "Après le tutoriel"
 
-#. Documentation/user/fundamental.itely:325 (context id)
-#. Documentation/user/fundamental.itely:368 (context id)
+#. Documentation/user/fundamental.itely:324 (context id)
+#. Documentation/user/fundamental.itely:367 (context id)
 #. input/lsr/piano-template-with-centered-lyrics.ly:51 (context id)
 msgid "singer"
 msgstr "chanteur"
 
-#. Documentation/user/fundamental.itely:326 (context id)
-#. Documentation/user/fundamental.itely:369 (context id)
+#. Documentation/user/fundamental.itely:325 (context id)
+#. Documentation/user/fundamental.itely:368 (context id)
 msgid "vocal"
 msgstr "vocal"
 
-#. Documentation/user/fundamental.itely:329 (context id)
-#. Documentation/user/fundamental.itely:372 (context id)
+#. Documentation/user/fundamental.itely:328 (context id)
+#. Documentation/user/fundamental.itely:371 (context id)
 #. input/lsr/jazz-combo-template.ly:218 (variable)
 #. input/lsr/jazz-combo-template.ly:278 (context id)
 msgid "piano"
 msgstr "piano"
 
-#. Documentation/user/fundamental.itely:330 (context id)
-#. Documentation/user/fundamental.itely:363 (variable)
-#. Documentation/user/fundamental.itely:373 (context id)
+#. Documentation/user/fundamental.itely:329 (context id)
+#. Documentation/user/fundamental.itely:362 (variable)
+#. Documentation/user/fundamental.itely:372 (context id)
 #. Documentation/user/fundamental.itely:2669 (variable)
 #. Documentation/user/fundamental.itely:2711 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:19 (variable)
@@ -1488,9 +1489,9 @@ msgstr "piano"
 msgid "upper"
 msgstr "superieur"
 
-#. Documentation/user/fundamental.itely:331 (context id)
-#. Documentation/user/fundamental.itely:364 (variable)
-#. Documentation/user/fundamental.itely:374 (context id)
+#. Documentation/user/fundamental.itely:330 (context id)
+#. Documentation/user/fundamental.itely:363 (variable)
+#. Documentation/user/fundamental.itely:373 (context id)
 #. Documentation/user/fundamental.itely:2676 (variable)
 #. Documentation/user/fundamental.itely:2712 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:23 (variable)
@@ -1508,20 +1509,22 @@ msgstr "superieur"
 msgid "lower"
 msgstr "inferieur"
 
-#. Documentation/user/fundamental.itely:361 (variable)
-#. Documentation/user/simultaneous.itely:239 (context id)
-#. Documentation/user/vocal.itely:568 (context id)
-#. Documentation/user/vocal.itely:797 (context id)
-#. Documentation/user/vocal.itely:818 (context id)
-#. Documentation/user/vocal.itely:1222 (variable)
-#. Documentation/user/vocal.itely:1264 (variable)
+#. Documentation/user/fundamental.itely:360 (variable)
+#. Documentation/user/simultaneous.itely:241 (context id)
+#. Documentation/user/vocal.itely:571 (context id)
+#. Documentation/user/vocal.itely:803 (context id)
+#. Documentation/user/vocal.itely:824 (context id)
+#. Documentation/user/vocal.itely:1224 (variable)
+#. Documentation/user/vocal.itely:1266 (variable)
+#. Documentation/user/ancient.itely:2413 (context id)
+#. Documentation/user/ancient.itely:2452 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:24 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:35 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
 #. input/lsr/guitar-strum-rhythms.ly:56 (context id)
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:37 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes-and-chords.ly:29 (variable)
@@ -1531,10 +1534,10 @@ msgstr "inferieur"
 msgid "melody"
 msgstr "melodie"
 
-#. Documentation/user/fundamental.itely:362 (variable)
-#. Documentation/user/vocal.itely:1045 (variable)
-#. Documentation/user/vocal.itely:1227 (variable)
-#. Documentation/user/vocal.itely:1268 (variable)
+#. Documentation/user/fundamental.itely:361 (variable)
+#. Documentation/user/vocal.itely:1051 (variable)
+#. Documentation/user/vocal.itely:1229 (variable)
+#. Documentation/user/vocal.itely:1270 (variable)
 #. input/lsr/piano-template-with-centered-lyrics.ly:45 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:36 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:36 (variable)
@@ -1543,7 +1546,7 @@ msgid "text"
 msgstr "texte"
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:518 (context id)
+#. Documentation/user/staff.itely:514 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1582,16 +1585,16 @@ msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
 msgstr "Voix \\\"1\\\"       Voix \\\"2\\\"                   Voix \\\"3\\\""
 
 #. Documentation/user/fundamental.itely:711 (comment)
-#. Documentation/user/simultaneous.itely:737 (comment)
-#. Documentation/user/simultaneous.itely:762 (comment)
-#. Documentation/user/simultaneous.itely:789 (comment)
+#. Documentation/user/simultaneous.itely:742 (comment)
+#. Documentation/user/simultaneous.itely:767 (comment)
+#. Documentation/user/simultaneous.itely:794 (comment)
 msgid "Bar 1"
 msgstr "Mesure 1"
 
 #. Documentation/user/fundamental.itely:722 (comment)
-#. Documentation/user/simultaneous.itely:742 (comment)
-#. Documentation/user/simultaneous.itely:767 (comment)
-#. Documentation/user/simultaneous.itely:795 (comment)
+#. Documentation/user/simultaneous.itely:747 (comment)
+#. Documentation/user/simultaneous.itely:772 (comment)
+#. Documentation/user/simultaneous.itely:800 (comment)
 msgid "Bar 2"
 msgstr "Mesure 2"
 
@@ -1661,11 +1664,11 @@ msgstr "Initialisation de la première voix"
 
 #. Documentation/user/fundamental.itely:1199 (context id)
 #. Documentation/user/fundamental.itely:2441 (context id)
-#. Documentation/user/vocal.itely:503 (context id)
-#. Documentation/user/vocal.itely:1233 (context id)
-#. Documentation/user/vocal.itely:1274 (context id)
-#. Documentation/user/keyboards.itely:327 (context id)
-#. Documentation/user/fretted-strings.itely:241 (context id)
+#. Documentation/user/vocal.itely:506 (context id)
+#. Documentation/user/vocal.itely:1235 (context id)
+#. Documentation/user/vocal.itely:1276 (context id)
+#. Documentation/user/keyboards.itely:329 (context id)
+#. Documentation/user/fretted-strings.itely:243 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable)
 #. input/lsr/jazz-combo-template.ly:204 (context id)
 #. input/lsr/jazz-combo-template.ly:213 (context id)
@@ -1676,8 +1679,8 @@ msgstr "un"
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3468 (variable)
-#. Documentation/user/simultaneous.itely:783 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/simultaneous.itely:788 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
 #. input/lsr/incipit.ly:57 (variable)
@@ -1728,37 +1731,37 @@ msgid "SopMusic"
 msgstr "SopMusique"
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3470 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "AltoMusic"
 msgstr "AltoMusique"
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3471 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "TenorMusic"
 msgstr "TenorMusique"
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3472 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "BassMusic"
 msgstr "BasseMusique"
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3473 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseOne"
 msgstr "CoupletUn"
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3474 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseTwo"
 msgstr "CoupletDeux"
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3475 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseThree"
 msgstr "CoupletTrois"
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3476 (variable)
+#. Documentation/user/tweaks.itely:3477 (variable)
 msgid "VerseFour"
 msgstr "CoupletQuatre"
 
@@ -1767,20 +1770,20 @@ msgid "Sop"
 msgstr "Sop"
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3483 (context id)
-#. Documentation/user/input.itely:946 (context id)
+#. Documentation/user/tweaks.itely:3484 (context id)
+#. Documentation/user/input.itely:951 (context id)
 msgid "Alto"
 msgstr "Alto"
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3491 (context id)
-#. Documentation/user/input.itely:948 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 msgid "Tenor"
 msgstr "Tenor"
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3492 (context id)
-#. Documentation/user/input.itely:953 (context id)
+#. Documentation/user/tweaks.itely:3493 (context id)
+#. Documentation/user/input.itely:958 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr "Basse"
@@ -1800,7 +1803,7 @@ msgstr "coupletparoles"
 #. Documentation/user/fundamental.itely:1361 (context id)
 #. Documentation/user/fundamental.itely:1428 (context id)
 #. Documentation/user/fundamental.itely:1489 (context id)
-#. Documentation/user/vocal.itely:820 (context id)
+#. Documentation/user/vocal.itely:826 (context id)
 #. input/lsr/score-for-diatonic-accordion.ly:59 (variable)
 msgid "verse"
 msgstr "couplet"
@@ -1935,7 +1938,7 @@ msgstr "retour à la taille par défaut"
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:938 (variable)
+#. Documentation/user/input.itely:943 (variable)
 msgid "sopranoMusic"
 msgstr "sopranoMusique"
 
@@ -1952,7 +1955,7 @@ msgid "sopranoWords"
 msgstr "sopranoParoles"
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:939 (variable)
+#. Documentation/user/input.itely:944 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1967,7 +1970,7 @@ msgid "altoWords"
 msgstr "altoParoles"
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:940 (variable)
+#. Documentation/user/input.itely:945 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1982,7 +1985,7 @@ msgid "tenorWords"
 msgstr "tenorParoles"
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:941 (variable)
+#. Documentation/user/input.itely:946 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2147,13 +2150,14 @@ msgstr "Expressions musicales imbriquées"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:547 (context id)
-#. Documentation/user/staff.itely:560 (context id)
-#. Documentation/user/staff.itely:568 (context id)
-#. Documentation/user/staff.itely:587 (context id)
-#. Documentation/user/staff.itely:600 (context id)
+#. Documentation/user/staff.itely:543 (context id)
+#. Documentation/user/staff.itely:556 (context id)
+#. Documentation/user/staff.itely:564 (context id)
+#. Documentation/user/staff.itely:583 (context id)
+#. Documentation/user/staff.itely:596 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
+#. @rglos in Documentation/fr/user/tweaks.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
@@ -2386,223 +2390,223 @@ msgstr "Partition pour chœur à quatre voix mixtes"
 msgid "Building a score from scratch"
 msgstr "Écriture d'une partition à partir de zéro"
 
-#. Documentation/user/tweaks.itely:595 (comment)
-#. Documentation/user/tweaks.itely:730 (comment)
+#. Documentation/user/tweaks.itely:596 (comment)
+#. Documentation/user/tweaks.itely:731 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "L'épaisseur de toutes les liaisons à venir passe de 1,2 à 5,0"
 
-#. Documentation/user/tweaks.itely:664 (comment)
-#. Documentation/user/tweaks.itely:703 (comment)
-#. Documentation/user/tweaks.itely:706 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
+#. Documentation/user/tweaks.itely:704 (comment)
+#. Documentation/user/tweaks.itely:707 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Épaississement de la prochaine liaison seulement"
 
-#. Documentation/user/tweaks.itely:734 (comment)
+#. Documentation/user/tweaks.itely:735 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr "Retour à l'épaisseur par défaut de 1,2 pour les prochaines liaisons"
 
-#. Documentation/user/tweaks.itely:1394 (comment)
+#. Documentation/user/tweaks.itely:1395 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "pas de clef pour cette portée"
 
-#. Documentation/user/tweaks.itely:1396 (comment)
+#. Documentation/user/tweaks.itely:1397 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "pas de métrique pour cette portée"
 
-#. Documentation/user/tweaks.itely:1460 (comment)
+#. Documentation/user/tweaks.itely:1461 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Réduction d'environ 24 % de toutes les tailles de fonte"
 
-#. Documentation/user/tweaks.itely:1526 (comment)
+#. Documentation/user/tweaks.itely:1527 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 "Réduction de la taille des hampes et de l'interligne pour ne pas déborder"
 
-#. Documentation/user/tweaks.itely:1956 (comment)
-#. Documentation/user/tweaks.itely:2026 (comment)
+#. Documentation/user/tweaks.itely:1957 (comment)
+#. Documentation/user/tweaks.itely:2027 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Réglage des détails du texte avec extension"
 
-#. Documentation/user/tweaks.itely:1959 (comment)
-#. Documentation/user/tweaks.itely:2029 (comment)
+#. Documentation/user/tweaks.itely:1960 (comment)
+#. Documentation/user/tweaks.itely:2030 (comment)
 msgid "Place dynamics above staff"
 msgstr "Positionnement des nuances au-dessus de la portée"
 
-#. Documentation/user/tweaks.itely:1961 (comment)
-#. Documentation/user/tweaks.itely:2033 (comment)
+#. Documentation/user/tweaks.itely:1962 (comment)
+#. Documentation/user/tweaks.itely:2034 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Début du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:1964 (comment)
-#. Documentation/user/tweaks.itely:1971 (comment)
-#. Documentation/user/tweaks.itely:2036 (comment)
-#. Documentation/user/tweaks.itely:2043 (comment)
+#. Documentation/user/tweaks.itely:1965 (comment)
+#. Documentation/user/tweaks.itely:1972 (comment)
+#. Documentation/user/tweaks.itely:2037 (comment)
+#. Documentation/user/tweaks.itely:2044 (comment)
 msgid "Add Dynamic Text"
 msgstr "Ajout d'une nuance textuelle"
 
-#. Documentation/user/tweaks.itely:1966 (comment)
-#. Documentation/user/tweaks.itely:2038 (comment)
+#. Documentation/user/tweaks.itely:1967 (comment)
+#. Documentation/user/tweaks.itely:2039 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Ajout d'une nuance graphique"
 
-#. Documentation/user/tweaks.itely:1968 (comment)
-#. Documentation/user/tweaks.itely:2040 (comment)
+#. Documentation/user/tweaks.itely:1969 (comment)
+#. Documentation/user/tweaks.itely:2041 (comment)
 msgid "Add Text Script"
 msgstr "Ajout d'un commentaire textuel"
 
-#. Documentation/user/tweaks.itely:1973 (comment)
-#. Documentation/user/tweaks.itely:2045 (comment)
+#. Documentation/user/tweaks.itely:1974 (comment)
+#. Documentation/user/tweaks.itely:2046 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Fin du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:2031 (comment)
+#. Documentation/user/tweaks.itely:2032 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr "Positionnement du crochet d'octavation sous le texte avec extension"
 
-#. Documentation/user/tweaks.itely:2093 (comment)
+#. Documentation/user/tweaks.itely:2094 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Force les notes à s'espacer selon le texte"
 
-#. Documentation/user/tweaks.itely:2116 (comment)
+#. Documentation/user/tweaks.itely:2117 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Ce morceau de texte est assez court pour ne pas faire de collision"
 
-#. Documentation/user/tweaks.itely:2120 (comment)
+#. Documentation/user/tweaks.itely:2121 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Celui-ci est trop long pour tenir, il est déplacé vers le haut"
 
-#. Documentation/user/tweaks.itely:2124 (comment)
-#. Documentation/user/tweaks.itely:2129 (comment)
+#. Documentation/user/tweaks.itely:2125 (comment)
+#. Documentation/user/tweaks.itely:2130 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Désactivation du processus d'évitement de collision"
 
-#. Documentation/user/tweaks.itely:2131 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "and turn on textLengthOn"
 msgstr "activation de textLengthOn"
 
-#. Documentation/user/tweaks.itely:2132 (comment)
+#. Documentation/user/tweaks.itely:2133 (comment)
 msgid "Spaces at end are honored"
 msgstr "Les espaces de la fin sont pris en compte"
 
-#. Documentation/user/tweaks.itely:2239 (comment)
+#. Documentation/user/tweaks.itely:2240 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Élargissement d'un espace"
 
-#. Documentation/user/tweaks.itely:2522 (comment)
+#. Documentation/user/tweaks.itely:2523 (comment)
 msgid "This will not work, see below:"
 msgstr "La commande suivante est sans résultat ; voir plus loin."
 
-#. Documentation/user/tweaks.itely:2526 (comment)
+#. Documentation/user/tweaks.itely:2527 (comment)
 msgid "This works:"
 msgstr "Celle-ci produit le résultat escompté"
 
-#. Documentation/user/tweaks.itely:2577 (variable)
+#. Documentation/user/tweaks.itely:2578 (variable)
 msgid "naturalplusflat"
 msgstr "becarreplusbemol"
 
-#. Documentation/user/tweaks.itely:2618 (comment)
+#. Documentation/user/tweaks.itely:2619 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Élargissement d'une unité"
 
-#. Documentation/user/tweaks.itely:2620 (comment)
+#. Documentation/user/tweaks.itely:2621 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 "Alignement des nuances sur une ligne de base à 2 unités au-dessus de la "
 "portée"
 
-#. Documentation/user/tweaks.itely:2924 (variable)
-#. Documentation/user/tweaks.itely:2973 (variable)
-#. Documentation/user/tweaks.itely:3034 (variable)
-#. Documentation/user/tweaks.itely:3104 (variable)
-#. Documentation/user/tweaks.itely:3169 (variable)
-#. Documentation/user/tweaks.itely:3229 (variable)
+#. Documentation/user/tweaks.itely:2925 (variable)
+#. Documentation/user/tweaks.itely:2974 (variable)
+#. Documentation/user/tweaks.itely:3035 (variable)
+#. Documentation/user/tweaks.itely:3105 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/tweaks.itely:3230 (variable)
 msgid "rhMusic"
 msgstr "mdMusique"
 
-#. Documentation/user/tweaks.itely:2929 (comment)
-#. Documentation/user/tweaks.itely:2978 (comment)
-#. Documentation/user/tweaks.itely:3041 (comment)
-#. Documentation/user/tweaks.itely:3113 (comment)
-#. Documentation/user/tweaks.itely:3178 (comment)
+#. Documentation/user/tweaks.itely:2930 (comment)
+#. Documentation/user/tweaks.itely:2979 (comment)
+#. Documentation/user/tweaks.itely:3042 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
+#. Documentation/user/tweaks.itely:3179 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Début d'une section polyphonique de quatre voix"
 
-#. Documentation/user/tweaks.itely:2942 (variable)
-#. Documentation/user/tweaks.itely:2991 (variable)
-#. Documentation/user/tweaks.itely:3054 (variable)
-#. Documentation/user/tweaks.itely:3128 (variable)
-#. Documentation/user/tweaks.itely:3195 (variable)
-#. Documentation/user/tweaks.itely:3257 (variable)
+#. Documentation/user/tweaks.itely:2943 (variable)
+#. Documentation/user/tweaks.itely:2992 (variable)
+#. Documentation/user/tweaks.itely:3055 (variable)
+#. Documentation/user/tweaks.itely:3129 (variable)
+#. Documentation/user/tweaks.itely:3196 (variable)
+#. Documentation/user/tweaks.itely:3258 (variable)
 msgid "lhMusic"
 msgstr "mgMusique"
 
-#. Documentation/user/tweaks.itely:2951 (context id)
-#. Documentation/user/tweaks.itely:3000 (context id)
-#. Documentation/user/tweaks.itely:3063 (context id)
-#. Documentation/user/tweaks.itely:3137 (context id)
-#. Documentation/user/tweaks.itely:3204 (context id)
-#. Documentation/user/tweaks.itely:3266 (context id)
-#. Documentation/user/input.itely:959 (context id)
+#. Documentation/user/tweaks.itely:2952 (context id)
+#. Documentation/user/tweaks.itely:3001 (context id)
+#. Documentation/user/tweaks.itely:3064 (context id)
+#. Documentation/user/tweaks.itely:3138 (context id)
+#. Documentation/user/tweaks.itely:3205 (context id)
+#. Documentation/user/tweaks.itely:3267 (context id)
+#. Documentation/user/input.itely:964 (context id)
 msgid "RH"
 msgstr "MD"
 
-#. Documentation/user/tweaks.itely:2955 (context id)
-#. Documentation/user/tweaks.itely:3004 (context id)
-#. Documentation/user/tweaks.itely:3067 (context id)
-#. Documentation/user/tweaks.itely:3141 (context id)
-#. Documentation/user/tweaks.itely:3208 (context id)
-#. Documentation/user/tweaks.itely:3270 (context id)
-#. Documentation/user/input.itely:965 (context id)
+#. Documentation/user/tweaks.itely:2956 (context id)
+#. Documentation/user/tweaks.itely:3005 (context id)
+#. Documentation/user/tweaks.itely:3068 (context id)
+#. Documentation/user/tweaks.itely:3142 (context id)
+#. Documentation/user/tweaks.itely:3209 (context id)
+#. Documentation/user/tweaks.itely:3271 (context id)
+#. Documentation/user/input.itely:970 (context id)
 msgid "LH"
 msgstr "MG"
 
-#. Documentation/user/tweaks.itely:3182 (comment)
-#. Documentation/user/tweaks.itely:3244 (comment)
+#. Documentation/user/tweaks.itely:3183 (comment)
+#. Documentation/user/tweaks.itely:3245 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr "Déplace le do2 pour que la fusion puisse fonctionner"
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3247 (comment)
+#. Documentation/user/tweaks.itely:3186 (comment)
+#. Documentation/user/tweaks.itely:3248 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "La hampe du ré2 ira vers le bas pour permettre la fusion"
 
-#. Documentation/user/tweaks.itely:3242 (comment)
+#. Documentation/user/tweaks.itely:3243 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "Repositionnement du do2 à droite de la note fusionnée"
 
-#. Documentation/user/tweaks.itely:3378 (comment)
-#. Documentation/user/tweaks.itely:3400 (comment)
+#. Documentation/user/tweaks.itely:3379 (comment)
+#. Documentation/user/tweaks.itely:3401 (comment)
 msgid "Visible tempo marking"
 msgstr "Indication de tempo visible"
 
-#. Documentation/user/tweaks.itely:3382 (comment)
-#. Documentation/user/tweaks.itely:3404 (comment)
+#. Documentation/user/tweaks.itely:3383 (comment)
+#. Documentation/user/tweaks.itely:3405 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Indication de tempo invisible ; utilisée pour le MIDI"
 
-#. Documentation/user/tweaks.itely:3385 (comment)
-#. Documentation/user/tweaks.itely:3407 (comment)
+#. Documentation/user/tweaks.itely:3386 (comment)
+#. Documentation/user/tweaks.itely:3408 (comment)
 msgid "New tempo for next section"
 msgstr "Nouveau tempo pour la section suivante"
 
-#. Documentation/user/tweaks.itely:3459 (variable)
+#. Documentation/user/tweaks.itely:3460 (variable)
 msgid "emphasize"
 msgstr "emphase"
 
-#. Documentation/user/tweaks.itely:3463 (variable)
+#. Documentation/user/tweaks.itely:3464 (variable)
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "SopranoMusic"
 msgstr "sopranoMusique"
 
-#. Documentation/user/tweaks.itely:3482 (context id)
-#. Documentation/user/input.itely:944 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:949 (context id)
 msgid "Soprano"
 msgstr "Soprano"
 
-#. Documentation/user/tweaks.itely:3691 (comment)
+#. Documentation/user/tweaks.itely:3692 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr "Arranger pour obtenir une couleur par la procédure color-notehead"
 
@@ -2695,18 +2699,21 @@ msgid "Properties of layout objects"
 msgstr "Propriétés des objets de rendu"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Finding the context"
 msgstr "Détermination du contexte adéquat"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Overriding once only"
 msgstr "Redéfinition pour une seule occurence"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Reverting"
@@ -2724,6 +2731,7 @@ msgid "Properties found in interfaces"
 msgstr "Propriétés listées par interface"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Specifying the context in lyric mode"
@@ -2763,24 +2771,28 @@ msgid "Visibility and color of objects"
 msgstr "Visibilité et couleur des objets"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "stencil"
 msgstr "stencil"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "break-visibility"
 msgstr "visibilité des barres (break-visibility)"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "transparent"
 msgstr "transparence"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "color"
@@ -2840,6 +2852,7 @@ msgid "Within-staff objects"
 msgstr "Objets inclus dans la portée"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Fingering"
@@ -2849,16 +2862,20 @@ msgstr "Doigtés"
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside-staff objects"
 msgstr "Objets hors de la portée"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "\\textLengthOn"
 msgstr "\\textLengthOn"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Grob sizing"
@@ -2898,48 +2915,56 @@ msgid "Fixing overlapping notation"
 msgstr "Correction des collisions d'objets"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "padding property"
 msgstr "la propriété padding"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "left-padding and right-padding"
 msgstr "left-padding et right-padding"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-padding property"
 msgstr "la propriété staff-padding"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "self-alignment-X property"
 msgstr "la propriété self-alignment-X"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-position property"
 msgstr "la propriété staff-position"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "extra-offset property"
 msgstr "la propriété extra-offset"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "positions property"
 msgstr "la propriété positions"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "force-hshift property"
@@ -2979,12 +3004,14 @@ msgid "Other uses for tweaks"
 msgstr "Autres utilisations des retouches"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Tying notes across voices"
 msgstr "Liaison entre plusieurs voix"
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Simulating a fermata in MIDI"
@@ -3613,16 +3640,20 @@ msgstr "Spécificités pour certains systèmes"
 #. @subsection in Documentation/user/setup.itely
 #. @node in Documentation/es/user/setup.itely
 #. @subsection in Documentation/es/user/setup.itely
+#. @node in Documentation/de/user/setup.itely
+#. @subsection in Documentation/de/user/setup.itely
 msgid "Setup for MacOS X"
 msgstr "Spécificités pour MacOS X"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "Using Python scripts on MacOS 10.3 or 10.4"
 msgstr "Utilisation de scripts Python sur MacOS 10.3 ou 10.4"
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "MacOS X on the command line"
 msgstr "MacOS X et la ligne de commande"
 
@@ -3752,22 +3783,24 @@ msgstr "Utilisation en ligne de commande"
 #. @subsection in Documentation/fr/user/running.itely
 #. @node in Documentation/es/user/running.itely
 #. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking lilypond"
 msgstr "Lancement de lilypond"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking @command{lilypond}"
 msgstr "Lancement de @command{lilypond}"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for lilypond"
 msgstr "Options en ligne de commande pour lilypond"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{lilypond}"
 msgstr "Options en ligne de commande pour @command{lilypond}"
 
@@ -3802,16 +3835,19 @@ msgstr "Mise à jour des fichiers avec convert-ly"
 
 #. @section in Documentation/user/running.itely
 #. @section in Documentation/es/user/running.itely
+#. @section in Documentation/de/user/running.itely
 msgid "Updating files with @command{convert-ly}"
 msgstr "Mise à jour des fichiers avec @command{convert-ly}"
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for convert-ly"
 msgstr "Options en ligne de commande pour convert-ly"
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{convert-ly}"
 msgstr "Options en ligne de commande pour @command{convert-ly}"
 
@@ -3995,8 +4031,6 @@ msgstr "Instructions spécifiques à certains formats"
 #. @subsection in Documentation/fr/user/running.itely
 #. @subheading in Documentation/fr/user/lilypond-book.itely
 #. @subheading in Documentation/es/user/lilypond-book.itely
-#. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 #. @subheading in Documentation/de/user/lilypond-book.itely
 msgid "Command line options"
 msgstr "Options en ligne de commande"
@@ -4167,11 +4201,11 @@ msgstr "Index des commandes LilyPond"
 msgid "Musical notation"
 msgstr "Notation musicale générale"
 
-#. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:1028 (variable)
-#. Documentation/user/input.itely:1047 (variable)
-#. Documentation/user/input.itely:1084 (variable)
-#. Documentation/user/input.itely:1099 (variable)
+#. Documentation/user/pitches.itely:666 (variable)
+#. Documentation/user/input.itely:1033 (variable)
+#. Documentation/user/input.itely:1052 (variable)
+#. Documentation/user/input.itely:1089 (variable)
+#. Documentation/user/input.itely:1104 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
@@ -4181,35 +4215,35 @@ msgstr "Notation musicale générale"
 msgid "music"
 msgstr "musique"
 
-#. Documentation/user/pitches.itely:1045 (comment)
+#. Documentation/user/pitches.itely:1039 (comment)
 msgid "not strictly necessary, but a good reminder"
 msgstr "pas strictement nécessaire, mais en pense-bête"
 
-#. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1084 (variable)
+#. Documentation/user/pitches.itely:1046 (context id)
+#. Documentation/user/staff.itely:1076 (variable)
 msgid "clarinet"
 msgstr "clarinette"
 
-#. Documentation/user/pitches.itely:1137 (variable)
+#. Documentation/user/pitches.itely:1130 (variable)
 msgid "musicA"
 msgstr "musiqueA"
 
-#. Documentation/user/pitches.itely:1151 (variable)
+#. Documentation/user/pitches.itely:1144 (variable)
 msgid "musicB"
 msgstr "musiqueB"
 
-#. Documentation/user/pitches.itely:1170 (context id)
-#. Documentation/user/keyboards.itely:170 (context id)
-#. Documentation/user/keyboards.itely:264 (context id)
+#. Documentation/user/pitches.itely:1163 (context id)
+#. Documentation/user/keyboards.itely:171 (context id)
+#. Documentation/user/keyboards.itely:265 (context id)
 #. Documentation/user/percussion.itely:175 (variable)
 #. Documentation/user/percussion.itely:365 (variable)
 #. input/lsr/jazz-combo-template.ly:241 (variable)
 msgid "up"
 msgstr "haut"
 
-#. Documentation/user/pitches.itely:1174 (context id)
-#. Documentation/user/keyboards.itely:180 (context id)
-#. Documentation/user/keyboards.itely:273 (context id)
+#. Documentation/user/pitches.itely:1167 (context id)
+#. Documentation/user/keyboards.itely:181 (context id)
+#. Documentation/user/keyboards.itely:274 (context id)
 #. Documentation/user/percussion.itely:178 (variable)
 #. Documentation/user/percussion.itely:366 (variable)
 #. input/lsr/jazz-combo-template.ly:247 (variable)
@@ -4455,36 +4489,36 @@ msgstr "Têtes de note à forme variable"
 msgid "Improvisation"
 msgstr "Improvisation"
 
-#. Documentation/user/rhythms.itely:285 (comment)
+#. Documentation/user/rhythms.itely:287 (comment)
 msgid "Alter durations to triplets"
 msgstr "Modification des durées pour obtenir un triolet"
 
-#. Documentation/user/rhythms.itely:287 (comment)
-#. Documentation/user/rhythms.itely:312 (comment)
+#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:314 (comment)
 msgid "Normal durations"
 msgstr "Durées normales"
 
-#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:291 (comment)
 msgid "Double the duration of chord"
 msgstr "Doublement de la durée de l'accord"
 
-#. Documentation/user/rhythms.itely:291 (comment)
+#. Documentation/user/rhythms.itely:293 (comment)
 msgid "Duration of quarter, appears like sixteenth"
 msgstr "Bien que durant une noire, apparaît comme une double croche"
 
-#. Documentation/user/rhythms.itely:314 (comment)
+#. Documentation/user/rhythms.itely:316 (comment)
 msgid "Scale music by *2/3"
 msgstr "Échelonnement de la musique par 2/3"
 
-#. Documentation/user/rhythms.itely:318 (comment)
+#. Documentation/user/rhythms.itely:320 (comment)
 msgid "Scale music by *2"
 msgstr "Échelonnement de la musique par 2"
 
-#. Documentation/user/rhythms.itely:403 (comment)
+#. Documentation/user/rhythms.itely:404 (comment)
 msgid "First alternative: following note is tied normally"
 msgstr "Première alternative : la note qui suit est liée normalement"
 
-#. Documentation/user/rhythms.itely:405 (comment)
+#. Documentation/user/rhythms.itely:406 (comment)
 msgid "Second alternative: following note has a repeated tie"
 msgstr "Seconde alternative : la liaison est rappelée"
 
@@ -4504,142 +4538,143 @@ msgstr "Affiche une longa, équivalant à deux double-pauses"
 msgid "Print a breve rest"
 msgstr "Affiche une double-pause"
 
-#. Documentation/user/rhythms.itely:631 (comment)
+#. Documentation/user/rhythms.itely:630 (comment)
 msgid "This is valid input, but does nothing"
 msgstr "Cette entrée est tout à fait valide, mais ne fait rien"
 
-#. Documentation/user/rhythms.itely:657 (comment)
-#. Documentation/user/rhythms.itely:710 (comment)
+#. Documentation/user/rhythms.itely:656 (comment)
+#. Documentation/user/rhythms.itely:709 (comment)
 msgid "Rest measures contracted to single measure"
 msgstr "Contraction des mesures de silence consécutives en une seule"
 
-#. Documentation/user/rhythms.itely:706 (comment)
+#. Documentation/user/rhythms.itely:705 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:35 (comment)
 msgid "Default behavior"
 msgstr "Comportement par défaut"
 
-#. Documentation/user/rhythms.itely:713 (comment)
+#. Documentation/user/rhythms.itely:712 (comment)
 msgid "Rest measures expanded"
 msgstr "Expansion des mesures de silence"
 
-#. Documentation/user/rhythms.itely:746 (comment)
+#. Documentation/user/rhythms.itely:745 (comment)
 msgid "This fails, as the wrong object name is specified"
 msgstr "Ceci échouera, il y a erreur sur l'objet spécifié"
 
-#. Documentation/user/rhythms.itely:749 (comment)
+#. Documentation/user/rhythms.itely:748 (comment)
 msgid "This is correct and works"
 msgstr "Formulation correcte, qui fonctionnera"
 
-#. Documentation/user/rhythms.itely:871 (comment)
+#. Documentation/user/rhythms.itely:873 (comment)
 msgid "Default style"
 msgstr "Style par défaut"
 
-#. Documentation/user/rhythms.itely:874 (comment)
+#. Documentation/user/rhythms.itely:876 (comment)
 msgid "Change to numeric style"
 msgstr "Adoption du style numérique"
 
-#. Documentation/user/rhythms.itely:878 (comment)
+#. Documentation/user/rhythms.itely:880 (comment)
 msgid "Revert to default style"
 msgstr "Retour au style par défaut"
 
-#. Documentation/user/rhythms.itely:1017 (comment)
+#. Documentation/user/rhythms.itely:1021 (comment)
 msgid "Show all bar numbers"
 msgstr "Affichage de tous les numéros de mesure"
 
-#. Documentation/user/rhythms.itely:1134 (comment)
+#. Documentation/user/rhythms.itely:1140 (comment)
 msgid "Now each staff has its own time signature."
 msgstr "Chaque portée dispose désormais de sa propre métrique."
 
-#. Documentation/user/rhythms.itely:1256 (context id)
+#. Documentation/user/rhythms.itely:1262 (context id)
 msgid "myRhythm"
 msgstr "monRythme"
 
-#. Documentation/user/rhythms.itely:1585 (comment)
+#. Documentation/user/rhythms.itely:1598 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr ""
 "fin des ligatures de doubles croches, quelle que soit la métrique, au moment "
 "1/16"
 
-#. Documentation/user/rhythms.itely:1589 (comment)
+#. Documentation/user/rhythms.itely:1602 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr ""
 "fin des ligatures de triples croches, quelle que soit la métrique, au moment "
 "1/16"
 
-#. Documentation/user/rhythms.itely:1599 (comment)
+#. Documentation/user/rhythms.itely:1612 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr ""
 "fin de ligature, pour une métrique à 5/8, sur la deuxième croche de la mesure"
 
-#. Documentation/user/rhythms.itely:1614 (comment)
+#. Documentation/user/rhythms.itely:1627 (comment)
 msgid "rhythm 3-1-1-2"
 msgstr "subdivision 3-1-1-2"
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1628 (comment)
 msgid "Context not specified - does not work correctly"
 msgstr "Contexte non spécifié -- cela ne fonctionne pas"
 
-#. Documentation/user/rhythms.itely:1621 (comment)
+#. Documentation/user/rhythms.itely:1634 (comment)
 msgid "Works correctly with context specified"
 msgstr "Fonctionne car le contexte est spécifié"
 
-#. Documentation/user/rhythms.itely:1654 (comment)
+#. Documentation/user/rhythms.itely:1667 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr ""
 "annulation de la règle de fin de ligature des doubles croches, dans une "
 "mesure à 4/4, au moment de la première noire"
 
-#. Documentation/user/rhythms.itely:1667 (comment)
+#. Documentation/user/rhythms.itely:1680 (comment)
 msgid "this won't revert it!"
 msgstr "ceci n'est pas en concordance"
 
-#. Documentation/user/rhythms.itely:1669 (comment)
+#. Documentation/user/rhythms.itely:1682 (comment)
 msgid "this will"
 msgstr "ceci est conforme"
 
-#. Documentation/user/rhythms.itely:1802 (comment)
+#. Documentation/user/rhythms.itely:1815 (comment)
 msgid "revert to non-feathered beams"
 msgstr "retour à des liens de croches rectilignes"
 
-#. Documentation/user/rhythms.itely:2025 (comment)
-#. Documentation/user/rhythms.itely:2041 (comment)
+#. Documentation/user/rhythms.itely:2037 (comment)
+#. Documentation/user/rhythms.itely:2053 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Le numéro de la première mesure est imprimé"
 
-#. Documentation/user/rhythms.itely:2042 (comment)
-#. Documentation/user/rhythms.itely:2090 (comment)
+#. Documentation/user/rhythms.itely:2054 (comment)
+#. Documentation/user/rhythms.itely:2102 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Affichage du numéro toutes les deux mesures"
 
-#. Documentation/user/rhythms.itely:2058 (comment)
+#. Documentation/user/rhythms.itely:2070 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr "Affichage du numéro à chaque mesure, hormis en fin de ligne"
 
-#. Documentation/user/rhythms.itely:2062 (comment)
-#. Documentation/user/rhythms.itely:2088 (comment)
+#. Documentation/user/rhythms.itely:2074 (comment)
+#. Documentation/user/rhythms.itely:2100 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Augmentation de la taille des numéros de mesure au double"
 
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2078 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un rectangle"
 
-#. Documentation/user/rhythms.itely:2071 (comment)
+#. Documentation/user/rhythms.itely:2083 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un cercle"
 
-#. Documentation/user/rhythms.itely:2093 (comment)
+#. Documentation/user/rhythms.itely:2105 (comment)
 msgid "Center-align bar numbers"
 msgstr "Alignement au centre des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2108 (comment)
 msgid "Right-align bar numbers"
 msgstr "Alignement à droite des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2199 (variable)
+#. Documentation/user/rhythms.itely:2210 (variable)
 msgid "pipeSymbol"
 msgstr "pipeSymbole"
 
-#. Documentation/user/rhythms.itely:2587 (variable)
+#. Documentation/user/rhythms.itely:2598 (variable)
 msgid "MyCadenza"
 msgstr "MaCadence"
 
@@ -4990,30 +5025,30 @@ msgstr "Alignement et cadences"
 msgid "Time administration"
 msgstr "Gestion du temps"
 
-#. Documentation/user/expressive.itely:388 (variable)
-#. Documentation/user/expressive.itely:456 (variable)
+#. Documentation/user/expressive.itely:386 (variable)
+#. Documentation/user/expressive.itely:454 (variable)
 msgid "moltoF"
 msgstr "moltoF"
 
-#. Documentation/user/expressive.itely:409 (variable)
-#. Documentation/user/expressive.itely:439 (variable)
+#. Documentation/user/expressive.itely:407 (variable)
+#. Documentation/user/expressive.itely:437 (variable)
 msgid "roundF"
 msgstr "suggereF"
 
-#. Documentation/user/expressive.itely:411 (variable)
-#. Documentation/user/expressive.itely:443 (variable)
+#. Documentation/user/expressive.itely:409 (variable)
+#. Documentation/user/expressive.itely:441 (variable)
 msgid "boxF"
 msgstr "cadreF"
 
-#. Documentation/user/expressive.itely:426 (variable)
+#. Documentation/user/expressive.itely:424 (variable)
 msgid "sfzp"
 msgstr "sfzp"
 
-#. Documentation/user/expressive.itely:444 (variable)
+#. Documentation/user/expressive.itely:442 (variable)
 msgid "roundFdynamic"
 msgstr "nuanceFcercle"
 
-#. Documentation/user/expressive.itely:445 (variable)
+#. Documentation/user/expressive.itely:443 (variable)
 msgid "boxFdynamic"
 msgstr "nuanceFcadre"
 
@@ -5318,27 +5353,27 @@ msgstr "simile"
 msgid "Tremolo repeats"
 msgstr "Répétition en trémolo"
 
-#. Documentation/user/simultaneous.itely:93 (comment)
+#. Documentation/user/simultaneous.itely:94 (comment)
 msgid "explicit single voice"
 msgstr "voix unique explicite"
 
-#. Documentation/user/simultaneous.itely:99 (comment)
+#. Documentation/user/simultaneous.itely:100 (comment)
 msgid "single first note"
 msgstr "première note unique"
 
-#. Documentation/user/simultaneous.itely:111 (comment)
+#. Documentation/user/simultaneous.itely:112 (comment)
 msgid "no single first note"
 msgstr "pas de première note unique"
 
-#. Documentation/user/simultaneous.itely:617 (variable)
+#. Documentation/user/simultaneous.itely:621 (variable)
 msgid "instrumentOne"
 msgstr "instrumentUn"
 
-#. Documentation/user/simultaneous.itely:625 (variable)
+#. Documentation/user/simultaneous.itely:629 (variable)
 msgid "instrumentTwo"
 msgstr "instrumentDeux"
 
-#. Documentation/user/simultaneous.itely:801 (comment)
+#. Documentation/user/simultaneous.itely:806 (comment)
 msgid "Bar 3 ..."
 msgstr "Mesure 3..."
 
@@ -5477,24 +5512,24 @@ msgstr "partie"
 msgid "Writing music in parallel"
 msgstr "Saisie la musique en parallèle"
 
-#. Documentation/user/staff.itely:1053 (variable)
-#. Documentation/user/staff.itely:1068 (variable)
-#. Documentation/user/staff.itely:1222 (variable)
+#. Documentation/user/staff.itely:1045 (variable)
+#. Documentation/user/staff.itely:1060 (variable)
+#. Documentation/user/staff.itely:1213 (variable)
 msgid "flute"
 msgstr "flute"
 
-#. Documentation/user/staff.itely:1173 (variable)
-#. Documentation/user/staff.itely:1194 (variable)
+#. Documentation/user/staff.itely:1164 (variable)
+#. Documentation/user/staff.itely:1185 (variable)
 msgid "oboe"
 msgstr "hautbois"
 
-#. Documentation/user/staff.itely:1243 (variable)
-#. Documentation/user/staff.itely:1259 (context id)
+#. Documentation/user/staff.itely:1234 (variable)
+#. Documentation/user/staff.itely:1250 (context id)
 msgid "piccolo"
 msgstr "piccolo"
 
-#. Documentation/user/staff.itely:1251 (variable)
-#. Documentation/user/staff.itely:1260 (context id)
+#. Documentation/user/staff.itely:1242 (variable)
+#. Documentation/user/staff.itely:1251 (context id)
 msgid "cbassoon"
 msgstr "cbasson"
 
@@ -5722,7 +5757,7 @@ msgstr "Citation d'autres voix"
 msgid "Formatting cue notes"
 msgstr "Mise en forme d'une citation"
 
-#. Documentation/user/editorial.itely:321 (comment)
+#. Documentation/user/editorial.itely:325 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr "pour cette erreur manifeste, notez que les hampes restent en noir"
 
@@ -5858,7 +5893,7 @@ msgstr "Quadrillage temporel"
 msgid "Analysis brackets"
 msgstr "Crochets d'analyse"
 
-#. Documentation/user/text.itely:418 (variable)
+#. Documentation/user/text.itely:421 (variable)
 msgid "allegro"
 msgstr "allegro"
 
@@ -6042,37 +6077,37 @@ msgstr "Choix des fontes par défaut"
 msgid "Specialist notation"
 msgstr "Notation spécialisée"
 
-#. Documentation/user/vocal.itely:509 (comment)
+#. Documentation/user/vocal.itely:512 (comment)
 #, fuzzy
 msgid "not recommended: left aligns syllables"
 msgstr "peu recommandable : les paroles sont alignées à gauche"
 
-#. Documentation/user/vocal.itely:512 (comment)
+#. Documentation/user/vocal.itely:515 (comment)
 msgid "wrong: durations needed"
 msgstr "mauvais : il manque les durées"
 
-#. Documentation/user/vocal.itely:515 (comment)
+#. Documentation/user/vocal.itely:518 (comment)
 msgid "correct"
 msgstr "correct"
 
-#. Documentation/user/vocal.itely:664 (context id)
+#. Documentation/user/vocal.itely:667 (context id)
 msgid "lala"
 msgstr "global"
 
-#. Documentation/user/vocal.itely:802 (context id)
+#. Documentation/user/vocal.itely:808 (context id)
 msgid "splitpart"
 msgstr "partieSeparee"
 
-#. Documentation/user/vocal.itely:847 (variable)
+#. Documentation/user/vocal.itely:853 (variable)
 msgid "voice"
 msgstr "voix"
 
-#. Documentation/user/vocal.itely:854 (variable)
+#. Documentation/user/vocal.itely:860 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:22 (variable)
 msgid "lyr"
 msgstr "paroles"
 
-#. Documentation/user/vocal.itely:1053 (context id)
+#. Documentation/user/vocal.itely:1059 (context id)
 msgid "tune"
 msgstr "melodie"
 
@@ -6080,45 +6115,41 @@ msgstr "melodie"
 msgid "lahlah"
 msgstr "lala"
 
-#. Documentation/user/vocal.itely:1112 (comment)
-msgid "applies to \\\"fas\\\""
-msgstr "s'applique à \\\"fas\\\""
-
-#. Documentation/user/vocal.itely:1282 (comment)
+#. Documentation/user/vocal.itely:1284 (comment)
 #, fuzzy
 msgid "moves the column off the left margin;"
 msgstr "décalage par rapport à la marge de gauche"
 
-#. Documentation/user/vocal.itely:1283 (comment)
+#. Documentation/user/vocal.itely:1285 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr "peut être supprimé si l'espace sur la page est réduit"
 
-#. Documentation/user/vocal.itely:1291 (comment)
-#. Documentation/user/vocal.itely:1309 (comment)
+#. Documentation/user/vocal.itely:1293 (comment)
+#. Documentation/user/vocal.itely:1311 (comment)
 msgid "adds vertical spacing between verses"
 msgstr "ajout d'espace vertical entre les couplets"
 
-#. Documentation/user/vocal.itely:1299 (comment)
+#. Documentation/user/vocal.itely:1301 (comment)
 #, fuzzy
 msgid "adds horizontal spacing between columns;"
 msgstr "ajout d'espace horizontal entre les colonnes"
 
-#. Documentation/user/vocal.itely:1300 (comment)
+#. Documentation/user/vocal.itely:1302 (comment)
 #, fuzzy
 msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr ""
 "si elles sont toujours trop proches, ajouter d'autres paires de \\\" \\\""
 
-#. Documentation/user/vocal.itely:1301 (comment)
+#. Documentation/user/vocal.itely:1303 (comment)
 msgid "until the result looks good"
 msgstr "jusqu'à ce que le résultat soit acceptable."
 
-#. Documentation/user/vocal.itely:1317 (comment)
+#. Documentation/user/vocal.itely:1319 (comment)
 #, fuzzy
 msgid "gives some extra space on the right margin;"
 msgstr "décalage par rapport à la marge de droite"
 
-#. Documentation/user/vocal.itely:1318 (comment)
+#. Documentation/user/vocal.itely:1320 (comment)
 msgid "can be removed if page space is tight"
 msgstr "peut être supprimé si l'espace sur la page est réduit"
 
@@ -6432,7 +6463,6 @@ msgstr "Rythme différent selon le couplet"
 
 #. @subsubheading in Documentation/user/vocal.itely
 #. @subsubheading in Documentation/es/user/vocal.itely
-#. @subsubheading in Documentation/de/user/vocal.itely
 msgid "Ignoring melismata"
 msgstr "Désactivation du traitement des mélismes"
 
@@ -6464,35 +6494,35 @@ msgstr "Paroles en fin de partition"
 msgid "Printing stanzas at the end in multiple columns"
 msgstr "Paroles sur plusieurs colonnes en fin de partition"
 
-#. Documentation/user/keyboards.itely:182 (comment)
+#. Documentation/user/keyboards.itely:183 (comment)
 msgid "keep staff alive"
 msgstr "maintient la portée active"
 
-#. Documentation/user/keyboards.itely:265 (context id)
+#. Documentation/user/keyboards.itely:266 (context id)
 msgid "melOne"
 msgstr "melodieUn"
 
-#. Documentation/user/keyboards.itely:333 (context id)
-#. Documentation/user/fretted-strings.itely:242 (context id)
+#. Documentation/user/keyboards.itely:335 (context id)
+#. Documentation/user/fretted-strings.itely:244 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable)
 #. input/lsr/jazz-combo-template.ly:205 (context id)
 #. input/lsr/jazz-combo-template.ly:214 (context id)
 msgid "two"
 msgstr "deux"
 
-#. Documentation/user/keyboards.itely:385 (comment)
+#. Documentation/user/keyboards.itely:389 (comment)
 msgid "stems may overlap the other staff"
 msgstr "autorise les hampes à déborder sur l'autre portée"
 
-#. Documentation/user/keyboards.itely:387 (comment)
+#. Documentation/user/keyboards.itely:391 (comment)
 msgid "extend the stems to reach other other staff"
 msgstr "étend les hampes pour qu'elles atteignent l'autre portée"
 
-#. Documentation/user/keyboards.itely:389 (comment)
+#. Documentation/user/keyboards.itely:393 (comment)
 msgid "do not print extra flags"
 msgstr "pas de crochet superflu"
 
-#. Documentation/user/keyboards.itely:391 (comment)
+#. Documentation/user/keyboards.itely:395 (comment)
 msgid "prevent beaming as needed"
 msgstr "on empêche la formation de la ligature automatique"
 
@@ -6628,6 +6658,20 @@ msgstr "Symboles de jeux"
 msgid "Harp"
 msgstr "Harpe"
 
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#, fuzzy
+msgid "Harp notation"
+msgstr "Notation sur la portée"
+
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#. @node in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
+#, fuzzy
+msgid "Harp pedals"
+msgstr "Pédales de piano"
+
 #. @node in Documentation/user/unfretted-strings.itely
 #. @section in Documentation/user/unfretted-strings.itely
 #. @node in Documentation/fr/user/unfretted-strings.itely
@@ -6685,6 +6729,7 @@ msgstr "Harmoniques"
 
 #. @rglos in Documentation/user/unfretted-strings.itely
 #. @rglos in Documentation/es/user/unfretted-strings.itely
+#. @rglos in Documentation/de/user/unfretted-strings.itely
 msgid "harmonics"
 msgstr "harmoniques"
 
@@ -6702,45 +6747,45 @@ msgstr "Pizzicato Bartok"
 msgid "Snap (Bartók) pizzicato"
 msgstr "Pizzicato Bartók"
 
-#. Documentation/user/fretted-strings.itely:238 (variable)
+#. Documentation/user/fretted-strings.itely:240 (variable)
 msgid "melodia"
 msgstr "melodie"
 
-#. Documentation/user/fretted-strings.itely:243 (context id)
+#. Documentation/user/fretted-strings.itely:245 (context id)
 msgid "shared"
 msgstr "partage"
 
-#. Documentation/user/fretted-strings.itely:244 (context id)
+#. Documentation/user/fretted-strings.itely:246 (context id)
 msgid "solo"
 msgstr "solo"
 
-#. Documentation/user/fretted-strings.itely:321 (variable)
+#. Documentation/user/fretted-strings.itely:323 (variable)
 msgid "mynotes"
 msgstr "mesnotes"
 
-#. Documentation/user/fretted-strings.itely:448 (comment)
+#. Documentation/user/fretted-strings.itely:450 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:27 (comment)
 msgid "A chord for ukelele"
 msgstr "Un accord pour ukulele"
 
-#. Documentation/user/fretted-strings.itely:768 (variable)
-#. Documentation/user/fretted-strings.itely:791 (variable)
-#. Documentation/user/fretted-strings.itely:820 (variable)
-#. Documentation/user/fretted-strings.itely:849 (variable)
-#. Documentation/user/fretted-strings.itely:873 (variable)
-#. Documentation/user/fretted-strings.itely:917 (variable)
+#. Documentation/user/fretted-strings.itely:770 (variable)
+#. Documentation/user/fretted-strings.itely:793 (variable)
+#. Documentation/user/fretted-strings.itely:822 (variable)
+#. Documentation/user/fretted-strings.itely:851 (variable)
+#. Documentation/user/fretted-strings.itely:875 (variable)
+#. Documentation/user/fretted-strings.itely:919 (variable)
 msgid "mychords"
 msgstr "mesaccords"
 
-#. Documentation/user/fretted-strings.itely:795 (variable)
+#. Documentation/user/fretted-strings.itely:797 (variable)
 msgid "mychordlist"
 msgstr "malistedaccords"
 
-#. Documentation/user/fretted-strings.itely:904 (comment)
+#. Documentation/user/fretted-strings.itely:906 (comment)
 msgid "add a new chord shape"
 msgstr "ajout d'un nouveau canevas d'accord"
 
-#. Documentation/user/fretted-strings.itely:908 (comment)
+#. Documentation/user/fretted-strings.itely:910 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr "ajout de nouveaux accords basés sur le nouveau canevas"
 
@@ -6825,6 +6870,8 @@ msgstr "Tablatures sous forme d'étiquette"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Predefined fret diagrams"
 msgstr "Tablatures prédéfinies"
 
@@ -6832,6 +6879,8 @@ msgstr "Tablatures prédéfinies"
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Automatic fret diagrams"
 msgstr "Tablatures automatiques"
 
@@ -7012,6 +7061,8 @@ msgstr "Notation de base pour percussions"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Drum rolls"
 msgstr "Roulements de tambour"
 
@@ -7019,6 +7070,8 @@ msgstr "Roulements de tambour"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Pitched percussion"
 msgstr "Percussions avec hauteurs"
 
@@ -7037,6 +7090,8 @@ msgstr "Portée de percussion"
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Custom percussion staves"
 msgstr "Portées de percussion personnalisées"
 
@@ -7121,17 +7176,17 @@ msgstr "Exemple pour la cornemuse"
 msgid "myChords"
 msgstr "mesAccords"
 
-#. Documentation/user/chords.itely:981 (comment)
-#. Documentation/user/chords.itely:1002 (comment)
+#. Documentation/user/chords.itely:984 (comment)
+#. Documentation/user/chords.itely:1005 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr "Assemblage des notes et de la basse chiffrée sur une même portée"
 
-#. Documentation/user/chords.itely:1061 (comment)
+#. Documentation/user/chords.itely:1068 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr ""
 "Les prolongateurs sont corrects, ils suivent bien le rythme de la basse"
 
-#. Documentation/user/chords.itely:1073 (comment)
+#. Documentation/user/chords.itely:1080 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr "Les prolongateurs sont erronés, bien que le rythme soit le même"
 
@@ -7272,18 +7327,42 @@ msgstr "Saisie de la basse chiffrée"
 msgid "Displaying figured bass"
 msgstr "Gravure de la basse chiffrée"
 
-#. Documentation/user/ancient.itely:355 (context id)
+#. Documentation/user/ancient.itely:357 (context id)
 msgid "discantus"
 msgstr "discantus"
 
-#. Documentation/user/ancient.itely:821 (variable)
+#. Documentation/user/ancient.itely:823 (variable)
 msgid "ficta"
 msgstr "ficta"
 
-#. Documentation/user/ancient.itely:973 (context id)
+#. Documentation/user/ancient.itely:976 (context id)
 msgid "cantus"
 msgstr "cantus"
 
+#. Documentation/user/ancient.itely:2399 (variable)
+#. Documentation/user/ancient.itely:2434 (variable)
+#. Documentation/user/ancient.itely:2502 (context id)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
+#, fuzzy
+msgid "chant"
+msgstr "Chants"
+
+#. Documentation/user/ancient.itely:2405 (variable)
+#. Documentation/user/ancient.itely:2445 (variable)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
+#, fuzzy
+msgid "verba"
+msgstr "couplet"
+
+#. Documentation/user/ancient.itely:2487 (variable)
+msgid "spiritus"
+msgstr ""
+
+#. Documentation/user/ancient.itely:2495 (variable)
+#, fuzzy
+msgid "spirLyr"
+msgstr "sopranoParoles"
+
 #. @node in Documentation/user/ancient.itely
 #. @section in Documentation/user/ancient.itely
 #. @node in Documentation/fr/user/ancient.itely
@@ -7648,7 +7727,7 @@ msgstr "Autres sources d'information"
 msgid "not printed"
 msgstr "non imprimé"
 
-#. Documentation/user/input.itely:942 (variable)
+#. Documentation/user/input.itely:947 (variable)
 msgid "allLyrics"
 msgstr "tuttiParoles"
 
@@ -7984,46 +8063,48 @@ msgstr "Égalisation de plusieurs instruments (ii)"
 #. @subsection in Documentation/user/input.itely
 #. @node in Documentation/es/user/input.itely
 #. @subsection in Documentation/es/user/input.itely
+#. @node in Documentation/de/user/input.itely
+#. @subsection in Documentation/de/user/input.itely
 msgid "Percussion in MIDI"
 msgstr "MIDI et percussions"
 
-#. Documentation/user/spacing.itely:875 (comment)
+#. Documentation/user/spacing.itely:864 (comment)
 msgid "this does nothing"
 msgstr "ceci est sans effet"
 
-#. Documentation/user/spacing.itely:876 (comment)
+#. Documentation/user/spacing.itely:865 (comment)
 msgid "a break here would work"
 msgstr "une rupture serait ici acceptée"
 
-#. Documentation/user/spacing.itely:877 (comment)
+#. Documentation/user/spacing.itely:866 (comment)
 msgid "as does this break"
 msgstr "à l'instar de celle-ci"
 
-#. Documentation/user/spacing.itely:889 (comment)
+#. Documentation/user/spacing.itely:878 (comment)
 msgid "now the break is allowed"
 msgstr "le saut de ligne est maintenant autorisé"
 
-#. Documentation/user/spacing.itely:1777 (comment)
+#. Documentation/user/spacing.itely:1757 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "cette fois, le texte est plus proche de la portée"
 
-#. Documentation/user/spacing.itely:1779 (comment)
+#. Documentation/user/spacing.itely:1759 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr "definir outside-staff-priority à autre chose qu'un nombre"
 
-#. Documentation/user/spacing.itely:1780 (comment)
+#. Documentation/user/spacing.itely:1760 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr "désactive l'évitement automatique de collision"
 
-#. Documentation/user/spacing.itely:1783 (comment)
+#. Documentation/user/spacing.itely:1763 (comment)
 msgid "now they will collide"
 msgstr "il y a maintenant chevauchement"
 
-#. Documentation/user/spacing.itely:1808 (comment)
+#. Documentation/user/spacing.itely:1788 (comment)
 msgid "the markup is too close to the following note"
 msgstr "le texte est trop proche de la note qui suit"
 
-#. Documentation/user/spacing.itely:1811 (comment)
+#. Documentation/user/spacing.itely:1791 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "définir outside-staff-horizontal-padding règle le problème"
 
@@ -8408,61 +8489,61 @@ msgstr "ne fonctionne pas tout seul"
 msgid "effective only when both overrides are present"
 msgstr "effectivité si les deux modifications sont explicitées"
 
-#. Documentation/user/changing-defaults.itely:2432 (comment)
+#. Documentation/user/changing-defaults.itely:2430 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr "Suppression de la barre de mesure à la fin de la ligne en cours"
 
-#. Documentation/user/changing-defaults.itely:2478 (comment)
+#. Documentation/user/changing-defaults.itely:2476 (comment)
 msgid "Try to remove all key signatures"
 msgstr "Tentative de suppression de toutes les armures"
 
-#. Documentation/user/changing-defaults.itely:2897 (comment)
+#. Documentation/user/changing-defaults.itely:2896 (comment)
 msgid "move horizontally left"
 msgstr "déplacement vers la droite"
 
-#. Documentation/user/changing-defaults.itely:2899 (comment)
+#. Documentation/user/changing-defaults.itely:2898 (comment)
 msgid "move vertically up"
 msgstr "déplacement vers le haut"
 
-#. Documentation/user/changing-defaults.itely:2900 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "third finger"
 msgstr "troisième doigt"
 
-#. Documentation/user/changing-defaults.itely:2946 (comment)
+#. Documentation/user/changing-defaults.itely:2945 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr "Pour centrer le repère au-dessus de la clef"
 
-#. Documentation/user/changing-defaults.itely:2952 (comment)
+#. Documentation/user/changing-defaults.itely:2951 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr "Pour centrer le repère au-dessus de la métrique"
 
-#. Documentation/user/changing-defaults.itely:2966 (comment)
+#. Documentation/user/changing-defaults.itely:2965 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr "Pour centrer le repère au-dessus de l'armure"
 
-#. Documentation/user/changing-defaults.itely:2973 (comment)
-#. Documentation/user/changing-defaults.itely:2989 (comment)
-#. Documentation/user/changing-defaults.itely:2996 (comment)
+#. Documentation/user/changing-defaults.itely:2972 (comment)
+#. Documentation/user/changing-defaults.itely:2988 (comment)
+#. Documentation/user/changing-defaults.itely:2995 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "Pour aligner le repère sur le coin gauche de l'armure"
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2977 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "Pour aligner le repère sur le coin droit de l'armure"
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr "puis décaler vers la droite de 3,5 espaces"
 
-#. Documentation/user/changing-defaults.itely:2997 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr "puis décaler vers la gauche de 2 espaces"
 
-#. Documentation/user/changing-defaults.itely:3046 (variable)
+#. Documentation/user/changing-defaults.itely:3045 (variable)
 msgid "XinO"
 msgstr "XdansO"
 
@@ -9306,6 +9387,8 @@ msgstr "Table des noms d'accord"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Common chord modifiers"
 msgstr "Modificateurs d'accord usuels"
 
@@ -9313,6 +9396,8 @@ msgstr "Modificateurs d'accord usuels"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Predefined fretboard diagrams"
 msgstr "Tablatures prédéfinies"
 
@@ -9410,6 +9495,8 @@ msgstr "Liste des signes d'articulation"
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Percussion notes"
 msgstr "Notes utilisées en percussion"
 
@@ -9504,16 +9591,9 @@ msgstr ""
 
 #. @node in Documentation/fr/user/tweaks.itely
 #. @subsection in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr "Objets hors de la portée"
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-msgid "Common tweaks"
-msgstr "Retouches courantes"
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -9530,13 +9610,10 @@ msgstr "GNU LilyPond --- Utilisation du programme"
 
 #. @node in Documentation/fr/user/setup.itely
 #. @subsection in Documentation/fr/user/setup.itely
-#. @node in Documentation/de/user/setup.itely
-#. @subsection in Documentation/de/user/setup.itely
 msgid "MacOS X on the command-line"
 msgstr "MacOS X et la ligne de commande"
 
 #. @section in Documentation/fr/user/running.itely
-#. @section in Documentation/de/user/running.itely
 msgid "Updating with @command{convert-ly}"
 msgstr "Mise à jour avec @command{convert-ly}"
 
@@ -9805,9 +9882,19 @@ msgid "GNU LilyPond -- Programmbenutzung"
 msgstr "GNU LilyPond --- utilisation du programme"
 
 #. @top in Documentation/de/user/lilypond.tely
-msgid "GNU LilyPond -- Das Notationsprogramm"
+#, fuzzy
+msgid "GNU LilyPond -- Notationsreferenz"
+msgstr "GNU LilyPond --- Manuel de notation"
+
+#. @chapheading in Documentation/de/user/lilypond.tely
+msgid "Das Notensatzprogramm"
 msgstr ""
 
+#. @subsubheading in Documentation/de/user/vocal.itely
+#, fuzzy
+msgid "Ignorieren von Melismen"
+msgstr "Désactivation du traitement des mélismes"
+
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
 msgid "Common properties"
@@ -10108,16 +10195,6 @@ msgstr ""
 msgid "\\break % 12 (8*1)"
 msgstr ""
 
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
-#, fuzzy
-msgid "chant"
-msgstr "Chants"
-
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
-#, fuzzy
-msgid "verba"
-msgstr "couplet"
-
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:49 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:96 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:115 (comment)
@@ -10409,19 +10486,23 @@ msgstr "Barres de ligature"
 msgid "Use the macro"
 msgstr ""
 
-#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:41 (comment)
+msgid "Corrected to avoid collisions"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:28 (comment)
 msgid "Set default beaming for all staves"
 msgstr "définition des règles de ligature pour toutes les portées"
 
-#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:36 (comment)
 msgid "Modify beaming for just this staff"
 msgstr "changement des règles de ligature seulement pour cette portée"
 
-#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:42 (comment)
 msgid "Inherit beaming from Score context"
 msgstr "héritage des règles de ligature du contexte Score"
 
-#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:48 (comment)
 #, fuzzy
 msgid "Modify beaming for this voice only"
 msgstr "changement des règles de ligature seulement pour cette portée"
@@ -11043,7 +11124,7 @@ msgstr ""
 msgid "Example 4"
 msgstr ""
 
-#. input/lsr/flute-slap-notation.ly:17 (variable)
+#. input/lsr/flute-slap-notation.ly:18 (variable)
 #, fuzzy
 msgid "slap"
 msgstr "dièse"
@@ -11112,7 +11193,7 @@ msgstr ""
 msgid "to four spaces below center line on visible staff"
 msgstr ""
 
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:51 (variable)
 #, fuzzy
 msgid "drum"
 msgstr "percuA"
@@ -12704,6 +12785,12 @@ msgstr "Notes de bas de page"
 msgid "Table of Contents"
 msgstr "Table des matières"
 
+#~ msgid "applies to \\\"fas\\\""
+#~ msgstr "s'applique à \\\"fas\\\""
+
+#~ msgid "Common tweaks"
+#~ msgstr "Retouches courantes"
+
 #~ msgid "System start delimiters"
 #~ msgstr "Délimitations en début de système"
 
index cad7e9bbaa1c40346bdd40feff7c347a68d10149..7ca2c853998a049c32b9fc59cb557e7b6dc35354 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-22 20:22+0100\n"
+"POT-Creation-Date: 2008-12-07 23:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -411,23 +411,23 @@ msgstr ""
 msgid "f is 4 up or 3 down, so is the f below"
 msgstr ""
 
-#. Documentation/user/tutorial.itely:1796 (variable)
+#. Documentation/user/tutorial.itely:1791 (variable)
 #. Documentation/user/working.itely:214 (variable)
 #. Documentation/user/working.itely:229 (variable)
-#. Documentation/user/pitches.itely:1041 (context id)
+#. Documentation/user/pitches.itely:1035 (context id)
 msgid "violin"
 msgstr ""
 
-#. Documentation/user/tutorial.itely:1801 (variable)
+#. Documentation/user/tutorial.itely:1796 (variable)
 #. input/lsr/string-quartet-template-simple.ly:62 (variable)
 msgid "cello"
 msgstr ""
 
-#. Documentation/user/tutorial.itely:1826 (variable)
+#. Documentation/user/tutorial.itely:1821 (variable)
 msgid "tripletA"
 msgstr ""
 
-#. Documentation/user/tutorial.itely:1827 (variable)
+#. Documentation/user/tutorial.itely:1822 (variable)
 msgid "barA"
 msgstr ""
 
@@ -996,6 +996,7 @@ msgstr ""
 #. @node in Documentation/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/user/expressive.itely
 #. @subheading in Documentation/fr/user/tutorial.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @node in Documentation/fr/user/expressive.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely
 #. @subheading in Documentation/es/user/tutorial.itely
@@ -1432,27 +1433,27 @@ msgstr ""
 msgid "After the tutorial"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:325 (context id)
-#. Documentation/user/fundamental.itely:368 (context id)
+#. Documentation/user/fundamental.itely:324 (context id)
+#. Documentation/user/fundamental.itely:367 (context id)
 #. input/lsr/piano-template-with-centered-lyrics.ly:51 (context id)
 msgid "singer"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:326 (context id)
-#. Documentation/user/fundamental.itely:369 (context id)
+#. Documentation/user/fundamental.itely:325 (context id)
+#. Documentation/user/fundamental.itely:368 (context id)
 msgid "vocal"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:329 (context id)
-#. Documentation/user/fundamental.itely:372 (context id)
+#. Documentation/user/fundamental.itely:328 (context id)
+#. Documentation/user/fundamental.itely:371 (context id)
 #. input/lsr/jazz-combo-template.ly:218 (variable)
 #. input/lsr/jazz-combo-template.ly:278 (context id)
 msgid "piano"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:330 (context id)
-#. Documentation/user/fundamental.itely:363 (variable)
-#. Documentation/user/fundamental.itely:373 (context id)
+#. Documentation/user/fundamental.itely:329 (context id)
+#. Documentation/user/fundamental.itely:362 (variable)
+#. Documentation/user/fundamental.itely:372 (context id)
 #. Documentation/user/fundamental.itely:2669 (variable)
 #. Documentation/user/fundamental.itely:2711 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:19 (variable)
@@ -1470,9 +1471,9 @@ msgstr ""
 msgid "upper"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:331 (context id)
-#. Documentation/user/fundamental.itely:364 (variable)
-#. Documentation/user/fundamental.itely:374 (context id)
+#. Documentation/user/fundamental.itely:330 (context id)
+#. Documentation/user/fundamental.itely:363 (variable)
+#. Documentation/user/fundamental.itely:373 (context id)
 #. Documentation/user/fundamental.itely:2676 (variable)
 #. Documentation/user/fundamental.itely:2712 (context id)
 #. input/lsr/changing-the-number-of-lines-in-a-staff.ly:23 (variable)
@@ -1490,20 +1491,22 @@ msgstr ""
 msgid "lower"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:361 (variable)
-#. Documentation/user/simultaneous.itely:239 (context id)
-#. Documentation/user/vocal.itely:568 (context id)
-#. Documentation/user/vocal.itely:797 (context id)
-#. Documentation/user/vocal.itely:818 (context id)
-#. Documentation/user/vocal.itely:1222 (variable)
-#. Documentation/user/vocal.itely:1264 (variable)
+#. Documentation/user/fundamental.itely:360 (variable)
+#. Documentation/user/simultaneous.itely:241 (context id)
+#. Documentation/user/vocal.itely:571 (context id)
+#. Documentation/user/vocal.itely:803 (context id)
+#. Documentation/user/vocal.itely:824 (context id)
+#. Documentation/user/vocal.itely:1224 (variable)
+#. Documentation/user/vocal.itely:1266 (variable)
+#. Documentation/user/ancient.itely:2413 (context id)
+#. Documentation/user/ancient.itely:2452 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:24 (context id)
 #. input/lsr/adjusting-lyrics-vertical-spacing.ly:35 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
 #. input/lsr/guitar-strum-rhythms.ly:56 (context id)
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:37 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes-and-chords.ly:29 (variable)
@@ -1513,10 +1516,10 @@ msgstr ""
 msgid "melody"
 msgstr ""
 
-#. Documentation/user/fundamental.itely:362 (variable)
-#. Documentation/user/vocal.itely:1045 (variable)
-#. Documentation/user/vocal.itely:1227 (variable)
-#. Documentation/user/vocal.itely:1268 (variable)
+#. Documentation/user/fundamental.itely:361 (variable)
+#. Documentation/user/vocal.itely:1051 (variable)
+#. Documentation/user/vocal.itely:1229 (variable)
+#. Documentation/user/vocal.itely:1270 (variable)
 #. input/lsr/piano-template-with-centered-lyrics.ly:45 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:36 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:36 (variable)
@@ -1525,7 +1528,7 @@ msgid "text"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:518 (context id)
+#. Documentation/user/staff.itely:514 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1564,16 +1567,16 @@ msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
 msgstr ""
 
 #. Documentation/user/fundamental.itely:711 (comment)
-#. Documentation/user/simultaneous.itely:737 (comment)
-#. Documentation/user/simultaneous.itely:762 (comment)
-#. Documentation/user/simultaneous.itely:789 (comment)
+#. Documentation/user/simultaneous.itely:742 (comment)
+#. Documentation/user/simultaneous.itely:767 (comment)
+#. Documentation/user/simultaneous.itely:794 (comment)
 msgid "Bar 1"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:722 (comment)
-#. Documentation/user/simultaneous.itely:742 (comment)
-#. Documentation/user/simultaneous.itely:767 (comment)
-#. Documentation/user/simultaneous.itely:795 (comment)
+#. Documentation/user/simultaneous.itely:747 (comment)
+#. Documentation/user/simultaneous.itely:772 (comment)
+#. Documentation/user/simultaneous.itely:800 (comment)
 msgid "Bar 2"
 msgstr ""
 
@@ -1643,11 +1646,11 @@ msgstr ""
 
 #. Documentation/user/fundamental.itely:1199 (context id)
 #. Documentation/user/fundamental.itely:2441 (context id)
-#. Documentation/user/vocal.itely:503 (context id)
-#. Documentation/user/vocal.itely:1233 (context id)
-#. Documentation/user/vocal.itely:1274 (context id)
-#. Documentation/user/keyboards.itely:327 (context id)
-#. Documentation/user/fretted-strings.itely:241 (context id)
+#. Documentation/user/vocal.itely:506 (context id)
+#. Documentation/user/vocal.itely:1235 (context id)
+#. Documentation/user/vocal.itely:1276 (context id)
+#. Documentation/user/keyboards.itely:329 (context id)
+#. Documentation/user/fretted-strings.itely:243 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:16 (variable)
 #. input/lsr/jazz-combo-template.ly:204 (context id)
 #. input/lsr/jazz-combo-template.ly:213 (context id)
@@ -1658,8 +1661,8 @@ msgstr ""
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3468 (variable)
-#. Documentation/user/simultaneous.itely:783 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/simultaneous.itely:788 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
 #. input/lsr/incipit.ly:57 (variable)
@@ -1710,37 +1713,37 @@ msgid "SopMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3470 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "AltoMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3471 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "TenorMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3472 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "BassMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3473 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseOne"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3474 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseTwo"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3475 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseThree"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3476 (variable)
+#. Documentation/user/tweaks.itely:3477 (variable)
 msgid "VerseFour"
 msgstr ""
 
@@ -1749,20 +1752,20 @@ msgid "Sop"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3483 (context id)
-#. Documentation/user/input.itely:946 (context id)
+#. Documentation/user/tweaks.itely:3484 (context id)
+#. Documentation/user/input.itely:951 (context id)
 msgid "Alto"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3491 (context id)
-#. Documentation/user/input.itely:948 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 msgid "Tenor"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3492 (context id)
-#. Documentation/user/input.itely:953 (context id)
+#. Documentation/user/tweaks.itely:3493 (context id)
+#. Documentation/user/input.itely:958 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr ""
@@ -1782,7 +1785,7 @@ msgstr ""
 #. Documentation/user/fundamental.itely:1361 (context id)
 #. Documentation/user/fundamental.itely:1428 (context id)
 #. Documentation/user/fundamental.itely:1489 (context id)
-#. Documentation/user/vocal.itely:820 (context id)
+#. Documentation/user/vocal.itely:826 (context id)
 #. input/lsr/score-for-diatonic-accordion.ly:59 (variable)
 msgid "verse"
 msgstr ""
@@ -1917,7 +1920,7 @@ msgstr ""
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:938 (variable)
+#. Documentation/user/input.itely:943 (variable)
 msgid "sopranoMusic"
 msgstr ""
 
@@ -1934,7 +1937,7 @@ msgid "sopranoWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:939 (variable)
+#. Documentation/user/input.itely:944 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1949,7 +1952,7 @@ msgid "altoWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:940 (variable)
+#. Documentation/user/input.itely:945 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1964,7 +1967,7 @@ msgid "tenorWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:941 (variable)
+#. Documentation/user/input.itely:946 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2129,13 +2132,14 @@ msgstr ""
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:547 (context id)
-#. Documentation/user/staff.itely:560 (context id)
-#. Documentation/user/staff.itely:568 (context id)
-#. Documentation/user/staff.itely:587 (context id)
-#. Documentation/user/staff.itely:600 (context id)
+#. Documentation/user/staff.itely:543 (context id)
+#. Documentation/user/staff.itely:556 (context id)
+#. Documentation/user/staff.itely:564 (context id)
+#. Documentation/user/staff.itely:583 (context id)
+#. Documentation/user/staff.itely:596 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
+#. @rglos in Documentation/fr/user/tweaks.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
@@ -2368,220 +2372,220 @@ msgstr ""
 msgid "Building a score from scratch"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:595 (comment)
-#. Documentation/user/tweaks.itely:730 (comment)
+#. Documentation/user/tweaks.itely:596 (comment)
+#. Documentation/user/tweaks.itely:731 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:664 (comment)
-#. Documentation/user/tweaks.itely:703 (comment)
-#. Documentation/user/tweaks.itely:706 (comment)
+#. Documentation/user/tweaks.itely:665 (comment)
+#. Documentation/user/tweaks.itely:704 (comment)
+#. Documentation/user/tweaks.itely:707 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:734 (comment)
+#. Documentation/user/tweaks.itely:735 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1394 (comment)
+#. Documentation/user/tweaks.itely:1395 (comment)
 msgid "Don't print clefs in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1396 (comment)
+#. Documentation/user/tweaks.itely:1397 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1460 (comment)
+#. Documentation/user/tweaks.itely:1461 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1526 (comment)
+#. Documentation/user/tweaks.itely:1527 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1956 (comment)
-#. Documentation/user/tweaks.itely:2026 (comment)
+#. Documentation/user/tweaks.itely:1957 (comment)
+#. Documentation/user/tweaks.itely:2027 (comment)
 msgid "Set details for later Text Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1959 (comment)
-#. Documentation/user/tweaks.itely:2029 (comment)
+#. Documentation/user/tweaks.itely:1960 (comment)
+#. Documentation/user/tweaks.itely:2030 (comment)
 msgid "Place dynamics above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1961 (comment)
-#. Documentation/user/tweaks.itely:2033 (comment)
+#. Documentation/user/tweaks.itely:1962 (comment)
+#. Documentation/user/tweaks.itely:2034 (comment)
 msgid "Start Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1964 (comment)
-#. Documentation/user/tweaks.itely:1971 (comment)
-#. Documentation/user/tweaks.itely:2036 (comment)
-#. Documentation/user/tweaks.itely:2043 (comment)
+#. Documentation/user/tweaks.itely:1965 (comment)
+#. Documentation/user/tweaks.itely:1972 (comment)
+#. Documentation/user/tweaks.itely:2037 (comment)
+#. Documentation/user/tweaks.itely:2044 (comment)
 msgid "Add Dynamic Text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1966 (comment)
-#. Documentation/user/tweaks.itely:2038 (comment)
+#. Documentation/user/tweaks.itely:1967 (comment)
+#. Documentation/user/tweaks.itely:2039 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1968 (comment)
-#. Documentation/user/tweaks.itely:2040 (comment)
+#. Documentation/user/tweaks.itely:1969 (comment)
+#. Documentation/user/tweaks.itely:2041 (comment)
 msgid "Add Text Script"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1973 (comment)
-#. Documentation/user/tweaks.itely:2045 (comment)
+#. Documentation/user/tweaks.itely:1974 (comment)
+#. Documentation/user/tweaks.itely:2046 (comment)
 msgid "Stop Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2031 (comment)
+#. Documentation/user/tweaks.itely:2032 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2093 (comment)
+#. Documentation/user/tweaks.itely:2094 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2116 (comment)
+#. Documentation/user/tweaks.itely:2117 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2120 (comment)
+#. Documentation/user/tweaks.itely:2121 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2124 (comment)
-#. Documentation/user/tweaks.itely:2129 (comment)
+#. Documentation/user/tweaks.itely:2125 (comment)
+#. Documentation/user/tweaks.itely:2130 (comment)
 msgid "Turn off collision avoidance"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2131 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "and turn on textLengthOn"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2132 (comment)
+#. Documentation/user/tweaks.itely:2133 (comment)
 msgid "Spaces at end are honored"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2239 (comment)
+#. Documentation/user/tweaks.itely:2240 (comment)
 msgid "Extend width by 1 staff space"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2522 (comment)
+#. Documentation/user/tweaks.itely:2523 (comment)
 msgid "This will not work, see below:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2526 (comment)
+#. Documentation/user/tweaks.itely:2527 (comment)
 msgid "This works:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2577 (variable)
+#. Documentation/user/tweaks.itely:2578 (variable)
 msgid "naturalplusflat"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2618 (comment)
+#. Documentation/user/tweaks.itely:2619 (comment)
 msgid "Extend width by 1 unit"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2620 (comment)
+#. Documentation/user/tweaks.itely:2621 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2924 (variable)
-#. Documentation/user/tweaks.itely:2973 (variable)
-#. Documentation/user/tweaks.itely:3034 (variable)
-#. Documentation/user/tweaks.itely:3104 (variable)
-#. Documentation/user/tweaks.itely:3169 (variable)
-#. Documentation/user/tweaks.itely:3229 (variable)
+#. Documentation/user/tweaks.itely:2925 (variable)
+#. Documentation/user/tweaks.itely:2974 (variable)
+#. Documentation/user/tweaks.itely:3035 (variable)
+#. Documentation/user/tweaks.itely:3105 (variable)
+#. Documentation/user/tweaks.itely:3170 (variable)
+#. Documentation/user/tweaks.itely:3230 (variable)
 msgid "rhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2929 (comment)
-#. Documentation/user/tweaks.itely:2978 (comment)
-#. Documentation/user/tweaks.itely:3041 (comment)
-#. Documentation/user/tweaks.itely:3113 (comment)
-#. Documentation/user/tweaks.itely:3178 (comment)
+#. Documentation/user/tweaks.itely:2930 (comment)
+#. Documentation/user/tweaks.itely:2979 (comment)
+#. Documentation/user/tweaks.itely:3042 (comment)
+#. Documentation/user/tweaks.itely:3114 (comment)
+#. Documentation/user/tweaks.itely:3179 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2942 (variable)
-#. Documentation/user/tweaks.itely:2991 (variable)
-#. Documentation/user/tweaks.itely:3054 (variable)
-#. Documentation/user/tweaks.itely:3128 (variable)
-#. Documentation/user/tweaks.itely:3195 (variable)
-#. Documentation/user/tweaks.itely:3257 (variable)
+#. Documentation/user/tweaks.itely:2943 (variable)
+#. Documentation/user/tweaks.itely:2992 (variable)
+#. Documentation/user/tweaks.itely:3055 (variable)
+#. Documentation/user/tweaks.itely:3129 (variable)
+#. Documentation/user/tweaks.itely:3196 (variable)
+#. Documentation/user/tweaks.itely:3258 (variable)
 msgid "lhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2951 (context id)
-#. Documentation/user/tweaks.itely:3000 (context id)
-#. Documentation/user/tweaks.itely:3063 (context id)
-#. Documentation/user/tweaks.itely:3137 (context id)
-#. Documentation/user/tweaks.itely:3204 (context id)
-#. Documentation/user/tweaks.itely:3266 (context id)
-#. Documentation/user/input.itely:959 (context id)
+#. Documentation/user/tweaks.itely:2952 (context id)
+#. Documentation/user/tweaks.itely:3001 (context id)
+#. Documentation/user/tweaks.itely:3064 (context id)
+#. Documentation/user/tweaks.itely:3138 (context id)
+#. Documentation/user/tweaks.itely:3205 (context id)
+#. Documentation/user/tweaks.itely:3267 (context id)
+#. Documentation/user/input.itely:964 (context id)
 msgid "RH"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2955 (context id)
-#. Documentation/user/tweaks.itely:3004 (context id)
-#. Documentation/user/tweaks.itely:3067 (context id)
-#. Documentation/user/tweaks.itely:3141 (context id)
-#. Documentation/user/tweaks.itely:3208 (context id)
-#. Documentation/user/tweaks.itely:3270 (context id)
-#. Documentation/user/input.itely:965 (context id)
+#. Documentation/user/tweaks.itely:2956 (context id)
+#. Documentation/user/tweaks.itely:3005 (context id)
+#. Documentation/user/tweaks.itely:3068 (context id)
+#. Documentation/user/tweaks.itely:3142 (context id)
+#. Documentation/user/tweaks.itely:3209 (context id)
+#. Documentation/user/tweaks.itely:3271 (context id)
+#. Documentation/user/input.itely:970 (context id)
 msgid "LH"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3182 (comment)
-#. Documentation/user/tweaks.itely:3244 (comment)
+#. Documentation/user/tweaks.itely:3183 (comment)
+#. Documentation/user/tweaks.itely:3245 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3247 (comment)
+#. Documentation/user/tweaks.itely:3186 (comment)
+#. Documentation/user/tweaks.itely:3248 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3242 (comment)
+#. Documentation/user/tweaks.itely:3243 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3378 (comment)
-#. Documentation/user/tweaks.itely:3400 (comment)
+#. Documentation/user/tweaks.itely:3379 (comment)
+#. Documentation/user/tweaks.itely:3401 (comment)
 msgid "Visible tempo marking"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3382 (comment)
-#. Documentation/user/tweaks.itely:3404 (comment)
+#. Documentation/user/tweaks.itely:3383 (comment)
+#. Documentation/user/tweaks.itely:3405 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3385 (comment)
-#. Documentation/user/tweaks.itely:3407 (comment)
+#. Documentation/user/tweaks.itely:3386 (comment)
+#. Documentation/user/tweaks.itely:3408 (comment)
 msgid "New tempo for next section"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3459 (variable)
+#. Documentation/user/tweaks.itely:3460 (variable)
 msgid "emphasize"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3463 (variable)
+#. Documentation/user/tweaks.itely:3464 (variable)
 msgid "normal"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3469 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "SopranoMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3482 (context id)
-#. Documentation/user/input.itely:944 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:949 (context id)
 msgid "Soprano"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3691 (comment)
+#. Documentation/user/tweaks.itely:3692 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr ""
 
@@ -2674,18 +2678,21 @@ msgid "Properties of layout objects"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Finding the context"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Overriding once only"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Reverting"
@@ -2703,6 +2710,7 @@ msgid "Properties found in interfaces"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Specifying the context in lyric mode"
@@ -2742,24 +2750,28 @@ msgid "Visibility and color of objects"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "stencil"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "break-visibility"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "transparent"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "color"
@@ -2819,6 +2831,7 @@ msgid "Within-staff objects"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Fingering"
@@ -2828,16 +2841,20 @@ msgstr ""
 #. @subsection in Documentation/user/tweaks.itely
 #. @node in Documentation/es/user/tweaks.itely
 #. @subsection in Documentation/es/user/tweaks.itely
+#. @node in Documentation/de/user/tweaks.itely
+#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside-staff objects"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "\\textLengthOn"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Grob sizing"
@@ -2877,48 +2894,56 @@ msgid "Fixing overlapping notation"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "padding property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "left-padding and right-padding"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-padding property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "self-alignment-X property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "staff-position property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "extra-offset property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "positions property"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "force-hshift property"
@@ -2958,12 +2983,14 @@ msgid "Other uses for tweaks"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Tying notes across voices"
 msgstr ""
 
 #. @subheading in Documentation/user/tweaks.itely
+#. @subheading in Documentation/fr/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "Simulating a fermata in MIDI"
@@ -3592,16 +3619,20 @@ msgstr ""
 #. @subsection in Documentation/user/setup.itely
 #. @node in Documentation/es/user/setup.itely
 #. @subsection in Documentation/es/user/setup.itely
+#. @node in Documentation/de/user/setup.itely
+#. @subsection in Documentation/de/user/setup.itely
 msgid "Setup for MacOS X"
 msgstr ""
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "Using Python scripts on MacOS 10.3 or 10.4"
 msgstr ""
 
 #. @subsubheading in Documentation/user/setup.itely
 #. @subsubheading in Documentation/es/user/setup.itely
+#. @subsubheading in Documentation/de/user/setup.itely
 msgid "MacOS X on the command line"
 msgstr ""
 
@@ -3731,22 +3762,24 @@ msgstr ""
 #. @subsection in Documentation/fr/user/running.itely
 #. @node in Documentation/es/user/running.itely
 #. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking lilypond"
 msgstr ""
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Invoking @command{lilypond}"
 msgstr ""
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for lilypond"
 msgstr ""
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{lilypond}"
 msgstr ""
 
@@ -3781,16 +3814,19 @@ msgstr ""
 
 #. @section in Documentation/user/running.itely
 #. @section in Documentation/es/user/running.itely
+#. @section in Documentation/de/user/running.itely
 msgid "Updating files with @command{convert-ly}"
 msgstr ""
 
 #. @node in Documentation/user/running.itely
 #. @node in Documentation/es/user/running.itely
+#. @node in Documentation/de/user/running.itely
 msgid "Command line options for convert-ly"
 msgstr ""
 
 #. @subsection in Documentation/user/running.itely
 #. @subsection in Documentation/es/user/running.itely
+#. @subsection in Documentation/de/user/running.itely
 msgid "Command line options for @command{convert-ly}"
 msgstr ""
 
@@ -3974,8 +4010,6 @@ msgstr ""
 #. @subsection in Documentation/fr/user/running.itely
 #. @subheading in Documentation/fr/user/lilypond-book.itely
 #. @subheading in Documentation/es/user/lilypond-book.itely
-#. @node in Documentation/de/user/running.itely
-#. @subsection in Documentation/de/user/running.itely
 #. @subheading in Documentation/de/user/lilypond-book.itely
 msgid "Command line options"
 msgstr ""
@@ -4146,11 +4180,11 @@ msgstr ""
 msgid "Musical notation"
 msgstr ""
 
-#. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:1028 (variable)
-#. Documentation/user/input.itely:1047 (variable)
-#. Documentation/user/input.itely:1084 (variable)
-#. Documentation/user/input.itely:1099 (variable)
+#. Documentation/user/pitches.itely:666 (variable)
+#. Documentation/user/input.itely:1033 (variable)
+#. Documentation/user/input.itely:1052 (variable)
+#. Documentation/user/input.itely:1089 (variable)
+#. Documentation/user/input.itely:1104 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
@@ -4160,35 +4194,35 @@ msgstr ""
 msgid "music"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1045 (comment)
+#. Documentation/user/pitches.itely:1039 (comment)
 msgid "not strictly necessary, but a good reminder"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1084 (variable)
+#. Documentation/user/pitches.itely:1046 (context id)
+#. Documentation/user/staff.itely:1076 (variable)
 msgid "clarinet"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1137 (variable)
+#. Documentation/user/pitches.itely:1130 (variable)
 msgid "musicA"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1151 (variable)
+#. Documentation/user/pitches.itely:1144 (variable)
 msgid "musicB"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1170 (context id)
-#. Documentation/user/keyboards.itely:170 (context id)
-#. Documentation/user/keyboards.itely:264 (context id)
+#. Documentation/user/pitches.itely:1163 (context id)
+#. Documentation/user/keyboards.itely:171 (context id)
+#. Documentation/user/keyboards.itely:265 (context id)
 #. Documentation/user/percussion.itely:175 (variable)
 #. Documentation/user/percussion.itely:365 (variable)
 #. input/lsr/jazz-combo-template.ly:241 (variable)
 msgid "up"
 msgstr ""
 
-#. Documentation/user/pitches.itely:1174 (context id)
-#. Documentation/user/keyboards.itely:180 (context id)
-#. Documentation/user/keyboards.itely:273 (context id)
+#. Documentation/user/pitches.itely:1167 (context id)
+#. Documentation/user/keyboards.itely:181 (context id)
+#. Documentation/user/keyboards.itely:274 (context id)
 #. Documentation/user/percussion.itely:178 (variable)
 #. Documentation/user/percussion.itely:366 (variable)
 #. input/lsr/jazz-combo-template.ly:247 (variable)
@@ -4434,36 +4468,36 @@ msgstr ""
 msgid "Improvisation"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:285 (comment)
+#. Documentation/user/rhythms.itely:287 (comment)
 msgid "Alter durations to triplets"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:287 (comment)
-#. Documentation/user/rhythms.itely:312 (comment)
+#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:314 (comment)
 msgid "Normal durations"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:289 (comment)
+#. Documentation/user/rhythms.itely:291 (comment)
 msgid "Double the duration of chord"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:291 (comment)
+#. Documentation/user/rhythms.itely:293 (comment)
 msgid "Duration of quarter, appears like sixteenth"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:314 (comment)
+#. Documentation/user/rhythms.itely:316 (comment)
 msgid "Scale music by *2/3"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:318 (comment)
+#. Documentation/user/rhythms.itely:320 (comment)
 msgid "Scale music by *2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:403 (comment)
+#. Documentation/user/rhythms.itely:404 (comment)
 msgid "First alternative: following note is tied normally"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:405 (comment)
+#. Documentation/user/rhythms.itely:406 (comment)
 msgid "Second alternative: following note has a repeated tie"
 msgstr ""
 
@@ -4483,135 +4517,136 @@ msgstr ""
 msgid "Print a breve rest"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:631 (comment)
+#. Documentation/user/rhythms.itely:630 (comment)
 msgid "This is valid input, but does nothing"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:657 (comment)
-#. Documentation/user/rhythms.itely:710 (comment)
+#. Documentation/user/rhythms.itely:656 (comment)
+#. Documentation/user/rhythms.itely:709 (comment)
 msgid "Rest measures contracted to single measure"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:706 (comment)
+#. Documentation/user/rhythms.itely:705 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:35 (comment)
 msgid "Default behavior"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:713 (comment)
+#. Documentation/user/rhythms.itely:712 (comment)
 msgid "Rest measures expanded"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:746 (comment)
+#. Documentation/user/rhythms.itely:745 (comment)
 msgid "This fails, as the wrong object name is specified"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:749 (comment)
+#. Documentation/user/rhythms.itely:748 (comment)
 msgid "This is correct and works"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:871 (comment)
+#. Documentation/user/rhythms.itely:873 (comment)
 msgid "Default style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:874 (comment)
+#. Documentation/user/rhythms.itely:876 (comment)
 msgid "Change to numeric style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:878 (comment)
+#. Documentation/user/rhythms.itely:880 (comment)
 msgid "Revert to default style"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1017 (comment)
+#. Documentation/user/rhythms.itely:1021 (comment)
 msgid "Show all bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1134 (comment)
+#. Documentation/user/rhythms.itely:1140 (comment)
 msgid "Now each staff has its own time signature."
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1256 (context id)
+#. Documentation/user/rhythms.itely:1262 (context id)
 msgid "myRhythm"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1585 (comment)
+#. Documentation/user/rhythms.itely:1598 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1589 (comment)
+#. Documentation/user/rhythms.itely:1602 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1599 (comment)
+#. Documentation/user/rhythms.itely:1612 (comment)
 msgid "end beams of all durations in 5/8 time signature at the 2/8 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1614 (comment)
+#. Documentation/user/rhythms.itely:1627 (comment)
 msgid "rhythm 3-1-1-2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1615 (comment)
+#. Documentation/user/rhythms.itely:1628 (comment)
 msgid "Context not specified - does not work correctly"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1621 (comment)
+#. Documentation/user/rhythms.itely:1634 (comment)
 msgid "Works correctly with context specified"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1654 (comment)
+#. Documentation/user/rhythms.itely:1667 (comment)
 msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1667 (comment)
+#. Documentation/user/rhythms.itely:1680 (comment)
 msgid "this won't revert it!"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1669 (comment)
+#. Documentation/user/rhythms.itely:1682 (comment)
 msgid "this will"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1802 (comment)
+#. Documentation/user/rhythms.itely:1815 (comment)
 msgid "revert to non-feathered beams"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2025 (comment)
-#. Documentation/user/rhythms.itely:2041 (comment)
+#. Documentation/user/rhythms.itely:2037 (comment)
+#. Documentation/user/rhythms.itely:2053 (comment)
 msgid "Permit first bar number to be printed"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2042 (comment)
-#. Documentation/user/rhythms.itely:2090 (comment)
+#. Documentation/user/rhythms.itely:2054 (comment)
+#. Documentation/user/rhythms.itely:2102 (comment)
 msgid "Print a bar number every second measure"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2058 (comment)
+#. Documentation/user/rhythms.itely:2070 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2062 (comment)
-#. Documentation/user/rhythms.itely:2088 (comment)
+#. Documentation/user/rhythms.itely:2074 (comment)
+#. Documentation/user/rhythms.itely:2100 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2078 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2071 (comment)
+#. Documentation/user/rhythms.itely:2083 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2093 (comment)
+#. Documentation/user/rhythms.itely:2105 (comment)
 msgid "Center-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2108 (comment)
 msgid "Right-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2199 (variable)
+#. Documentation/user/rhythms.itely:2210 (variable)
 msgid "pipeSymbol"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2587 (variable)
+#. Documentation/user/rhythms.itely:2598 (variable)
 msgid "MyCadenza"
 msgstr ""
 
@@ -4962,30 +4997,30 @@ msgstr ""
 msgid "Time administration"
 msgstr ""
 
-#. Documentation/user/expressive.itely:388 (variable)
-#. Documentation/user/expressive.itely:456 (variable)
+#. Documentation/user/expressive.itely:386 (variable)
+#. Documentation/user/expressive.itely:454 (variable)
 msgid "moltoF"
 msgstr ""
 
-#. Documentation/user/expressive.itely:409 (variable)
-#. Documentation/user/expressive.itely:439 (variable)
+#. Documentation/user/expressive.itely:407 (variable)
+#. Documentation/user/expressive.itely:437 (variable)
 msgid "roundF"
 msgstr ""
 
-#. Documentation/user/expressive.itely:411 (variable)
-#. Documentation/user/expressive.itely:443 (variable)
+#. Documentation/user/expressive.itely:409 (variable)
+#. Documentation/user/expressive.itely:441 (variable)
 msgid "boxF"
 msgstr ""
 
-#. Documentation/user/expressive.itely:426 (variable)
+#. Documentation/user/expressive.itely:424 (variable)
 msgid "sfzp"
 msgstr ""
 
-#. Documentation/user/expressive.itely:444 (variable)
+#. Documentation/user/expressive.itely:442 (variable)
 msgid "roundFdynamic"
 msgstr ""
 
-#. Documentation/user/expressive.itely:445 (variable)
+#. Documentation/user/expressive.itely:443 (variable)
 msgid "boxFdynamic"
 msgstr ""
 
@@ -5290,27 +5325,27 @@ msgstr ""
 msgid "Tremolo repeats"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:93 (comment)
+#. Documentation/user/simultaneous.itely:94 (comment)
 msgid "explicit single voice"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:99 (comment)
+#. Documentation/user/simultaneous.itely:100 (comment)
 msgid "single first note"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:111 (comment)
+#. Documentation/user/simultaneous.itely:112 (comment)
 msgid "no single first note"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:617 (variable)
+#. Documentation/user/simultaneous.itely:621 (variable)
 msgid "instrumentOne"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:625 (variable)
+#. Documentation/user/simultaneous.itely:629 (variable)
 msgid "instrumentTwo"
 msgstr ""
 
-#. Documentation/user/simultaneous.itely:801 (comment)
+#. Documentation/user/simultaneous.itely:806 (comment)
 msgid "Bar 3 ..."
 msgstr ""
 
@@ -5449,24 +5484,24 @@ msgstr ""
 msgid "Writing music in parallel"
 msgstr ""
 
-#. Documentation/user/staff.itely:1053 (variable)
-#. Documentation/user/staff.itely:1068 (variable)
-#. Documentation/user/staff.itely:1222 (variable)
+#. Documentation/user/staff.itely:1045 (variable)
+#. Documentation/user/staff.itely:1060 (variable)
+#. Documentation/user/staff.itely:1213 (variable)
 msgid "flute"
 msgstr ""
 
-#. Documentation/user/staff.itely:1173 (variable)
-#. Documentation/user/staff.itely:1194 (variable)
+#. Documentation/user/staff.itely:1164 (variable)
+#. Documentation/user/staff.itely:1185 (variable)
 msgid "oboe"
 msgstr ""
 
-#. Documentation/user/staff.itely:1243 (variable)
-#. Documentation/user/staff.itely:1259 (context id)
+#. Documentation/user/staff.itely:1234 (variable)
+#. Documentation/user/staff.itely:1250 (context id)
 msgid "piccolo"
 msgstr ""
 
-#. Documentation/user/staff.itely:1251 (variable)
-#. Documentation/user/staff.itely:1260 (context id)
+#. Documentation/user/staff.itely:1242 (variable)
+#. Documentation/user/staff.itely:1251 (context id)
 msgid "cbassoon"
 msgstr ""
 
@@ -5694,7 +5729,7 @@ msgstr ""
 msgid "Formatting cue notes"
 msgstr ""
 
-#. Documentation/user/editorial.itely:321 (comment)
+#. Documentation/user/editorial.itely:325 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
 msgstr ""
 
@@ -5830,7 +5865,7 @@ msgstr ""
 msgid "Analysis brackets"
 msgstr ""
 
-#. Documentation/user/text.itely:418 (variable)
+#. Documentation/user/text.itely:421 (variable)
 msgid "allegro"
 msgstr ""
 
@@ -6014,36 +6049,36 @@ msgstr ""
 msgid "Specialist notation"
 msgstr ""
 
-#. Documentation/user/vocal.itely:509 (comment)
+#. Documentation/user/vocal.itely:512 (comment)
 msgid "not recommended: left aligns syllables"
 msgstr ""
 
-#. Documentation/user/vocal.itely:512 (comment)
+#. Documentation/user/vocal.itely:515 (comment)
 msgid "wrong: durations needed"
 msgstr ""
 
-#. Documentation/user/vocal.itely:515 (comment)
+#. Documentation/user/vocal.itely:518 (comment)
 msgid "correct"
 msgstr ""
 
-#. Documentation/user/vocal.itely:664 (context id)
+#. Documentation/user/vocal.itely:667 (context id)
 msgid "lala"
 msgstr ""
 
-#. Documentation/user/vocal.itely:802 (context id)
+#. Documentation/user/vocal.itely:808 (context id)
 msgid "splitpart"
 msgstr ""
 
-#. Documentation/user/vocal.itely:847 (variable)
+#. Documentation/user/vocal.itely:853 (variable)
 msgid "voice"
 msgstr ""
 
-#. Documentation/user/vocal.itely:854 (variable)
+#. Documentation/user/vocal.itely:860 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:22 (variable)
 msgid "lyr"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1053 (context id)
+#. Documentation/user/vocal.itely:1059 (context id)
 msgid "tune"
 msgstr ""
 
@@ -6051,40 +6086,36 @@ msgstr ""
 msgid "lahlah"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1112 (comment)
-msgid "applies to \\\"fas\\\""
-msgstr ""
-
-#. Documentation/user/vocal.itely:1282 (comment)
+#. Documentation/user/vocal.itely:1284 (comment)
 msgid "moves the column off the left margin;"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1283 (comment)
+#. Documentation/user/vocal.itely:1285 (comment)
 msgid "can be removed if space on the page is tight"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1291 (comment)
-#. Documentation/user/vocal.itely:1309 (comment)
+#. Documentation/user/vocal.itely:1293 (comment)
+#. Documentation/user/vocal.itely:1311 (comment)
 msgid "adds vertical spacing between verses"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1299 (comment)
+#. Documentation/user/vocal.itely:1301 (comment)
 msgid "adds horizontal spacing between columns;"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1300 (comment)
+#. Documentation/user/vocal.itely:1302 (comment)
 msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1301 (comment)
+#. Documentation/user/vocal.itely:1303 (comment)
 msgid "until the result looks good"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1317 (comment)
+#. Documentation/user/vocal.itely:1319 (comment)
 msgid "gives some extra space on the right margin;"
 msgstr ""
 
-#. Documentation/user/vocal.itely:1318 (comment)
+#. Documentation/user/vocal.itely:1320 (comment)
 msgid "can be removed if page space is tight"
 msgstr ""
 
@@ -6398,7 +6429,6 @@ msgstr ""
 
 #. @subsubheading in Documentation/user/vocal.itely
 #. @subsubheading in Documentation/es/user/vocal.itely
-#. @subsubheading in Documentation/de/user/vocal.itely
 msgid "Ignoring melismata"
 msgstr ""
 
@@ -6430,35 +6460,35 @@ msgstr ""
 msgid "Printing stanzas at the end in multiple columns"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:182 (comment)
+#. Documentation/user/keyboards.itely:183 (comment)
 msgid "keep staff alive"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:265 (context id)
+#. Documentation/user/keyboards.itely:266 (context id)
 msgid "melOne"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:333 (context id)
-#. Documentation/user/fretted-strings.itely:242 (context id)
+#. Documentation/user/keyboards.itely:335 (context id)
+#. Documentation/user/fretted-strings.itely:244 (context id)
 #. input/lsr/adding-fingerings-to-tablatures.ly:17 (variable)
 #. input/lsr/jazz-combo-template.ly:205 (context id)
 #. input/lsr/jazz-combo-template.ly:214 (context id)
 msgid "two"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:385 (comment)
+#. Documentation/user/keyboards.itely:389 (comment)
 msgid "stems may overlap the other staff"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:387 (comment)
+#. Documentation/user/keyboards.itely:391 (comment)
 msgid "extend the stems to reach other other staff"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:389 (comment)
+#. Documentation/user/keyboards.itely:393 (comment)
 msgid "do not print extra flags"
 msgstr ""
 
-#. Documentation/user/keyboards.itely:391 (comment)
+#. Documentation/user/keyboards.itely:395 (comment)
 msgid "prevent beaming as needed"
 msgstr ""
 
@@ -6594,6 +6624,18 @@ msgstr ""
 msgid "Harp"
 msgstr ""
 
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+msgid "Harp notation"
+msgstr ""
+
+#. @node in Documentation/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/user/keyboards.itely
+#. @node in Documentation/de/user/keyboards.itely
+#. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely
+msgid "Harp pedals"
+msgstr ""
+
 #. @node in Documentation/user/unfretted-strings.itely
 #. @section in Documentation/user/unfretted-strings.itely
 #. @node in Documentation/fr/user/unfretted-strings.itely
@@ -6651,6 +6693,7 @@ msgstr ""
 
 #. @rglos in Documentation/user/unfretted-strings.itely
 #. @rglos in Documentation/es/user/unfretted-strings.itely
+#. @rglos in Documentation/de/user/unfretted-strings.itely
 msgid "harmonics"
 msgstr ""
 
@@ -6668,45 +6711,45 @@ msgstr ""
 msgid "Snap (Bartók) pizzicato"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:238 (variable)
+#. Documentation/user/fretted-strings.itely:240 (variable)
 msgid "melodia"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:243 (context id)
+#. Documentation/user/fretted-strings.itely:245 (context id)
 msgid "shared"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:244 (context id)
+#. Documentation/user/fretted-strings.itely:246 (context id)
 msgid "solo"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:321 (variable)
+#. Documentation/user/fretted-strings.itely:323 (variable)
 msgid "mynotes"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:448 (comment)
+#. Documentation/user/fretted-strings.itely:450 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:27 (comment)
 msgid "A chord for ukelele"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:768 (variable)
-#. Documentation/user/fretted-strings.itely:791 (variable)
-#. Documentation/user/fretted-strings.itely:820 (variable)
-#. Documentation/user/fretted-strings.itely:849 (variable)
-#. Documentation/user/fretted-strings.itely:873 (variable)
-#. Documentation/user/fretted-strings.itely:917 (variable)
+#. Documentation/user/fretted-strings.itely:770 (variable)
+#. Documentation/user/fretted-strings.itely:793 (variable)
+#. Documentation/user/fretted-strings.itely:822 (variable)
+#. Documentation/user/fretted-strings.itely:851 (variable)
+#. Documentation/user/fretted-strings.itely:875 (variable)
+#. Documentation/user/fretted-strings.itely:919 (variable)
 msgid "mychords"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:795 (variable)
+#. Documentation/user/fretted-strings.itely:797 (variable)
 msgid "mychordlist"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:904 (comment)
+#. Documentation/user/fretted-strings.itely:906 (comment)
 msgid "add a new chord shape"
 msgstr ""
 
-#. Documentation/user/fretted-strings.itely:908 (comment)
+#. Documentation/user/fretted-strings.itely:910 (comment)
 msgid "add some new chords based on the power chord shape"
 msgstr ""
 
@@ -6791,6 +6834,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Predefined fret diagrams"
 msgstr ""
 
@@ -6798,6 +6843,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/fretted-strings.itely
 #. @node in Documentation/es/user/fretted-strings.itely
 #. @unnumberedsubsubsec in Documentation/es/user/fretted-strings.itely
+#. @node in Documentation/de/user/fretted-strings.itely
+#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely
 msgid "Automatic fret diagrams"
 msgstr ""
 
@@ -6975,6 +7022,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Drum rolls"
 msgstr ""
 
@@ -6982,6 +7031,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Pitched percussion"
 msgstr ""
 
@@ -7000,6 +7051,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/percussion.itely
 #. @node in Documentation/es/user/percussion.itely
 #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely
+#. @node in Documentation/de/user/percussion.itely
+#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely
 msgid "Custom percussion staves"
 msgstr ""
 
@@ -7084,16 +7137,16 @@ msgstr ""
 msgid "myChords"
 msgstr ""
 
-#. Documentation/user/chords.itely:981 (comment)
-#. Documentation/user/chords.itely:1002 (comment)
+#. Documentation/user/chords.itely:984 (comment)
+#. Documentation/user/chords.itely:1005 (comment)
 msgid "Put notes on same Staff as figures"
 msgstr ""
 
-#. Documentation/user/chords.itely:1061 (comment)
+#. Documentation/user/chords.itely:1068 (comment)
 msgid "The extenders are correct here, with the same rhythm as the bass"
 msgstr ""
 
-#. Documentation/user/chords.itely:1073 (comment)
+#. Documentation/user/chords.itely:1080 (comment)
 msgid "The extenders are incorrect here, even though the timing is the same"
 msgstr ""
 
@@ -7234,18 +7287,39 @@ msgstr ""
 msgid "Displaying figured bass"
 msgstr ""
 
-#. Documentation/user/ancient.itely:355 (context id)
+#. Documentation/user/ancient.itely:357 (context id)
 msgid "discantus"
 msgstr ""
 
-#. Documentation/user/ancient.itely:821 (variable)
+#. Documentation/user/ancient.itely:823 (variable)
 msgid "ficta"
 msgstr ""
 
-#. Documentation/user/ancient.itely:973 (context id)
+#. Documentation/user/ancient.itely:976 (context id)
 msgid "cantus"
 msgstr ""
 
+#. Documentation/user/ancient.itely:2399 (variable)
+#. Documentation/user/ancient.itely:2434 (variable)
+#. Documentation/user/ancient.itely:2502 (context id)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
+msgid "chant"
+msgstr ""
+
+#. Documentation/user/ancient.itely:2405 (variable)
+#. Documentation/user/ancient.itely:2445 (variable)
+#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
+msgid "verba"
+msgstr ""
+
+#. Documentation/user/ancient.itely:2487 (variable)
+msgid "spiritus"
+msgstr ""
+
+#. Documentation/user/ancient.itely:2495 (variable)
+msgid "spirLyr"
+msgstr ""
+
 #. @node in Documentation/user/ancient.itely
 #. @section in Documentation/user/ancient.itely
 #. @node in Documentation/fr/user/ancient.itely
@@ -7610,7 +7684,7 @@ msgstr ""
 msgid "not printed"
 msgstr ""
 
-#. Documentation/user/input.itely:942 (variable)
+#. Documentation/user/input.itely:947 (variable)
 msgid "allLyrics"
 msgstr ""
 
@@ -7946,46 +8020,48 @@ msgstr ""
 #. @subsection in Documentation/user/input.itely
 #. @node in Documentation/es/user/input.itely
 #. @subsection in Documentation/es/user/input.itely
+#. @node in Documentation/de/user/input.itely
+#. @subsection in Documentation/de/user/input.itely
 msgid "Percussion in MIDI"
 msgstr ""
 
-#. Documentation/user/spacing.itely:875 (comment)
+#. Documentation/user/spacing.itely:864 (comment)
 msgid "this does nothing"
 msgstr ""
 
-#. Documentation/user/spacing.itely:876 (comment)
+#. Documentation/user/spacing.itely:865 (comment)
 msgid "a break here would work"
 msgstr ""
 
-#. Documentation/user/spacing.itely:877 (comment)
+#. Documentation/user/spacing.itely:866 (comment)
 msgid "as does this break"
 msgstr ""
 
-#. Documentation/user/spacing.itely:889 (comment)
+#. Documentation/user/spacing.itely:878 (comment)
 msgid "now the break is allowed"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1777 (comment)
+#. Documentation/user/spacing.itely:1757 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1779 (comment)
+#. Documentation/user/spacing.itely:1759 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1780 (comment)
+#. Documentation/user/spacing.itely:1760 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1783 (comment)
+#. Documentation/user/spacing.itely:1763 (comment)
 msgid "now they will collide"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1808 (comment)
+#. Documentation/user/spacing.itely:1788 (comment)
 msgid "the markup is too close to the following note"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1811 (comment)
+#. Documentation/user/spacing.itely:1791 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr ""
 
@@ -8370,61 +8446,61 @@ msgstr ""
 msgid "effective only when both overrides are present"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2432 (comment)
+#. Documentation/user/changing-defaults.itely:2430 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2478 (comment)
+#. Documentation/user/changing-defaults.itely:2476 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2897 (comment)
+#. Documentation/user/changing-defaults.itely:2896 (comment)
 msgid "move horizontally left"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2899 (comment)
+#. Documentation/user/changing-defaults.itely:2898 (comment)
 msgid "move vertically up"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2900 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "third finger"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2946 (comment)
+#. Documentation/user/changing-defaults.itely:2945 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2952 (comment)
+#. Documentation/user/changing-defaults.itely:2951 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2966 (comment)
+#. Documentation/user/changing-defaults.itely:2965 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2973 (comment)
-#. Documentation/user/changing-defaults.itely:2989 (comment)
-#. Documentation/user/changing-defaults.itely:2996 (comment)
+#. Documentation/user/changing-defaults.itely:2972 (comment)
+#. Documentation/user/changing-defaults.itely:2988 (comment)
+#. Documentation/user/changing-defaults.itely:2995 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2977 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2997 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:3046 (variable)
+#. Documentation/user/changing-defaults.itely:3045 (variable)
 msgid "XinO"
 msgstr ""
 
@@ -9268,6 +9344,8 @@ msgstr ""
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Common chord modifiers"
 msgstr ""
 
@@ -9275,6 +9353,8 @@ msgstr ""
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Predefined fretboard diagrams"
 msgstr ""
 
@@ -9372,6 +9452,8 @@ msgstr ""
 #. @appendixsec in Documentation/user/notation-appendices.itely
 #. @node in Documentation/es/user/notation-appendices.itely
 #. @appendixsec in Documentation/es/user/notation-appendices.itely
+#. @node in Documentation/de/user/notation-appendices.itely
+#. @appendixsec in Documentation/de/user/notation-appendices.itely
 msgid "Percussion notes"
 msgstr ""
 
@@ -9465,16 +9547,9 @@ msgstr ""
 
 #. @node in Documentation/fr/user/tweaks.itely
 #. @subsection in Documentation/fr/user/tweaks.itely
-#. @node in Documentation/de/user/tweaks.itely
-#. @subsection in Documentation/de/user/tweaks.itely
 msgid "Outside staff objects"
 msgstr ""
 
-#. @node in Documentation/fr/user/tweaks.itely
-#. @section in Documentation/fr/user/tweaks.itely
-msgid "Common tweaks"
-msgstr ""
-
 #. @node in Documentation/fr/user/working.itely
 #. @subsection in Documentation/fr/user/working.itely
 #. @node in Documentation/es/user/working.itely
@@ -9490,13 +9565,10 @@ msgstr ""
 
 #. @node in Documentation/fr/user/setup.itely
 #. @subsection in Documentation/fr/user/setup.itely
-#. @node in Documentation/de/user/setup.itely
-#. @subsection in Documentation/de/user/setup.itely
 msgid "MacOS X on the command-line"
 msgstr ""
 
 #. @section in Documentation/fr/user/running.itely
-#. @section in Documentation/de/user/running.itely
 msgid "Updating with @command{convert-ly}"
 msgstr ""
 
@@ -9764,7 +9836,15 @@ msgid "GNU LilyPond -- Programmbenutzung"
 msgstr ""
 
 #. @top in Documentation/de/user/lilypond.tely
-msgid "GNU LilyPond -- Das Notationsprogramm"
+msgid "GNU LilyPond -- Notationsreferenz"
+msgstr ""
+
+#. @chapheading in Documentation/de/user/lilypond.tely
+msgid "Das Notensatzprogramm"
+msgstr ""
+
+#. @subsubheading in Documentation/de/user/vocal.itely
+msgid "Ignorieren von Melismen"
 msgstr ""
 
 #. @node in Documentation/de/user/changing-defaults.itely
@@ -10040,14 +10120,6 @@ msgstr ""
 msgid "\\break % 12 (8*1)"
 msgstr ""
 
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:37 (variable)
-msgid "chant"
-msgstr ""
-
-#. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:44 (variable)
-msgid "verba"
-msgstr ""
-
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:49 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:96 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:115 (comment)
@@ -10318,19 +10390,23 @@ msgstr ""
 msgid "Use the macro"
 msgstr ""
 
-#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+#. input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly:41 (comment)
+msgid "Corrected to avoid collisions"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:28 (comment)
 msgid "Set default beaming for all staves"
 msgstr ""
 
-#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:36 (comment)
 msgid "Modify beaming for just this staff"
 msgstr ""
 
-#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:42 (comment)
 msgid "Inherit beaming from Score context"
 msgstr ""
 
-#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:48 (comment)
 msgid "Modify beaming for this voice only"
 msgstr ""
 
@@ -10900,7 +10976,7 @@ msgstr ""
 msgid "Example 4"
 msgstr ""
 
-#. input/lsr/flute-slap-notation.ly:17 (variable)
+#. input/lsr/flute-slap-notation.ly:18 (variable)
 msgid "slap"
 msgstr ""
 
@@ -10968,7 +11044,7 @@ msgstr ""
 msgid "to four spaces below center line on visible staff"
 msgstr ""
 
-#. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
+#. input/lsr/heavily-customized-polymetric-time-signatures.ly:51 (variable)
 msgid "drum"
 msgstr ""
 
index f09ed1aabeb367e9029f91a8b190ac2bc227d9c4..eaf5025adad8d1d7bfd3b0afc6ade19afcbbdb5b 100644 (file)
@@ -38,7 +38,7 @@ translations.template.html.in; DO NOT EDIT !-->
   is finished.
 </p>
 
- <p><i>Last updated Thu Dec  4 00:21:44 UTC 2008
+ <p><i>Last updated Sun Dec  7 22:30:55 UTC 2008
 </i></p>
 <table align="center" border="2">
  <tr align="center">
@@ -47,19 +47,19 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>es</th>
  </tr>
  <tr align="left">
-  <td>Section titles<br>(407)</td>
+  <td>Section titles<br>(429)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #47ff24">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -85,16 +85,16 @@ translations.template.html.in; DO NOT EDIT !-->
    <small>Jean-Charles Malahieude<br>
    Jean-Yves Baudais</small><br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #2cff20">partially up to date</span><br>
+   <span style="background-color: #40fe23">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    Reinhold Kainhofer<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #2cff20">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #2cff20">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -209,19 +209,19 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>es</th>
  </tr>
  <tr align="left">
-  <td>Section titles<br>(385)</td>
+  <td>Section titles<br>(407)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #54ff26">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -233,7 +233,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig<br>
    Reinhold Kainhofer<br>
    <span style="background-color: #dfef77">partially translated (7 %)</span><br>
-   <span style="background-color: #62ff28">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #dfef77">partially translated (11 %)</span><br>
@@ -247,7 +247,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>Till Rettig<br>
    Reinhold Kainhofer<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #62ff28">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -259,8 +259,9 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>   <span style="background-color: #d0f0f8">not translated</span><br>
   </td>
   <td>Reinhold Kainhofer<br>
-   <span style="background-color: #dfef77">partially translated (84 %)</span><br>
-   <span style="background-color: #2cff20">partially up to date</span><br>
+   Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -268,12 +269,13 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: Integrating text and music<br>(3202)</td>
+  <td>4 @command{lilypond-book}: Integrating text and music<br>(3185)</td>
   <td>   <span style="background-color: #d0f0f8">not translated</span><br>
   </td>
   <td>Reinhold Kainhofer<br>
+   <small>Till Rettig</small><br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #39ff22">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -287,8 +289,9 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #acff31">partially up to date</span><br>
   </td>
   <td>Reinhold Kainhofer<br>
+   <small>Till Rettig</small><br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #40fe23">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -305,19 +308,19 @@ translations.template.html.in; DO NOT EDIT !-->
   <th>es</th>
  </tr>
  <tr align="left">
-  <td>Section titles<br>(672)</td>
+  <td>Section titles<br>(695)</td>
   <td>John Mandereau<br>
    Jean-Charles Malahieude<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #25fe1f">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #40fe23">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #25fe1f">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -346,7 +349,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #33ff21">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -363,7 +366,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #62ff28">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -380,7 +383,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #2cff20">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -397,7 +400,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #33ff21">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -447,7 +450,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #4efe25">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -455,20 +458,20 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>1.8 Text<br>(2472)</td>
+  <td>1.8 Text<br>(2286)</td>
   <td>Jean-Charles Malahieude<br>
    <small>Valentin Villenave<br>
    John Mandereau</small><br>
-   <span style="background-color: #dfef77">partially translated (84 %)</span><br>
+   <span style="background-color: #dfef77">partially translated (97 %)</span><br>
    <span style="background-color: #ff6f57">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #ffca45">partially up to date</span><br>
+   <span style="background-color: #25fe1f">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #25fe1f">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -488,15 +491,15 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>2.1 Vocal music<br>(2638)</td>
+  <td>2.1 Vocal music<br>(2670)</td>
   <td>Valentin Villenave<br>
    <small>Jean-Charles Malahieude</small><br>
-   <span style="background-color: #dfef77">partially translated (57 %)</span><br>
+   <span style="background-color: #dfef77">partially translated (56 %)</span><br>
    <span style="background-color: #ff6d58">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #25fe1f">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -513,7 +516,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #40fe23">partially up to date</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -529,8 +532,8 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #ff6d58">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #d0f0f8">not translated</span><br>
-   <span style="background-color: #ff6d58">partially up to date</span><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -546,8 +549,8 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #ff6d58">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (15 %)</span><br>
-   <span style="background-color: #ff6d58">partially up to date</span><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -563,8 +566,8 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #ff6d58">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (42 %)</span><br>
-   <span style="background-color: #ff6d58">partially up to date</span><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -580,8 +583,8 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #ff6d58">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (1 %)</span><br>
-   <span style="background-color: #ff6d58">partially up to date</span><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -710,8 +713,8 @@ translations.template.html.in; DO NOT EDIT !-->
    <span style="background-color: #e8fe39">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (98 %)</span><br>
-   <span style="background-color: #e8fe39">partially up to date</span><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
index 554f9fdcb8b05ef8ca9103f574b60740470f2acc..03d7f43e3db3e9f361fe83047d46b5ae84faef7f 100644 (file)
 * Glossary: (lilypond/music-glossary).  Glossary of music terms.
 @end direntry
 
-@ifhtml
-@ifclear bigpage
-This document is also available as a
-@uref{source/Documentation/user/music-glossary.pdf,PDF} and as
-@uref{source/Documentation/user/music-glossary-big-page.html,one big page}.
-@end ifclear
-@ifset bigpage
-This document is also available as a
-@uref{source/Documentation/user/music-glossary.pdf,PDF} and as a
-@uref{source/Documentation/user/music-glossary/index.html,HTML indexed multiple pages}.
-@end ifset
-@end ifhtml
-
 @titlepage
 @title Music Glossary
 @author Christian Mondrup   @c Original author of LilyPond glossary
@@ -73,6 +60,19 @@ Copyright @copyright{} 1999--2008 by the authors
 
 @ifnottex
 
+@ifhtml
+@ifclear bigpage
+This document is also available as a
+@uref{source/Documentation/user/music-glossary.pdf,PDF} and as
+@uref{source/Documentation/user/music-glossary-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/music-glossary.pdf,PDF} and as a
+@uref{source/Documentation/user/music-glossary/index.html,HTML indexed multiple pages}.
+@end ifset
+@end ifhtml
+
 This glossary was brought you by:
 
 @itemize
index f0045e83d8dde6d23afb5cca4a2da247b90449d3..8d9d03f30a4e677aca96da07524d7e2f62224392 100644 (file)
@@ -51,25 +51,16 @@ element of the form:
 
 The files are categorized by their first two digits with the following meaning:
 @itemize
-@item 00 ... Basics: Pitches, durations, rests, clefs, keys, time sigs, ties, etc.
-@item 01 ... Chords
-@item 02 ... MusicXML notations and articulations (articulations, ornaments, technicals, text markup)
-@item 03 ... MusicXML directions (dynamics; single symbols, not spanners like hairpins)
-@item 04 ... Spanners (hairpin, octave shift, trill, glissando, etc.)
-@item 05 ... Header information (title, composer, poet, etc.)
-@item 06 ... Lyrics
-@item 08 ... Multiple parts (staves)
-@item 09 ... Measure issues: Repeats, barlines, pickup measures, mid-measure barlines/repeats
-@item 10 ... Multiple voices per staff
-@item 12 ... Triplets, Tuplets
-@item 13 ... Grace notes
-@item 14 ... Multi-staff parts (one voice on multiple staves, e.g. PianoStaff)
-@item 15 ... Percussion
-@item 17 ... Guitar notation: Chord names, Fretboards, Tablature notation
-@item 18 ... Figured bass
-@item 19 ... Page layout: font/paper size, margins, spacing
-@item 20 ... Compressed MusicXML files
-@item 99 ... Compatibility modes with broken MusicXML exporters (i.e. ignore beams for Sibelius 5)
+@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
diff --git a/input/regression/musicxml/00-Basics.itexi b/input/regression/musicxml/00-Basics.itexi
deleted file mode 100644 (file)
index 1fafab0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Basics (pitches, durations, ...)
-
diff --git a/input/regression/musicxml/00a-Basics-Pitches.xml b/input/regression/musicxml/00a-Basics-Pitches.xml
deleted file mode 100644 (file)
index 176850d..0000000
+++ /dev/null
@@ -1,1291 +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>
-  <movement-title>Pitches and accidentals</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All pitches from G to c'''' in 
-          ascending steps; First without accidentals, then with a sharp and then 
-          with a flat accidental. Double alterations and cautionary accidentals 
-          are tested at the end.</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"/>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</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>
-      <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="5">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</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>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <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>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>7</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <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>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="14">
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="15">
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <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>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>7</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="17">
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="18">
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="19">
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="20">
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <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>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="22">
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="23">
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="24">
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>7</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat</accidental>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="31">
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>2</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>double-sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-2</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>flat-flat</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <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>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental editorial="yes">sharp</accidental>
-        <stem>down</stem>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/00b-Basics-Intervals.xml b/input/regression/musicxml/00b-Basics-Intervals.xml
deleted file mode 100644 (file)
index 79d1430..0000000
+++ /dev/null
@@ -1,831 +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>
-  <movement-title>Various piches and interval sizes</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All pitch intervals in ascending 
-          jump size.</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>2</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>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</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>E</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</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>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</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>G</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</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>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>1</alter>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-1</alter>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-  </part>
-</score-partwise>
-
diff --git a/input/regression/musicxml/00c-Basics-Durations.xml b/input/regression/musicxml/00c-Basics-Durations.xml
deleted file mode 100644 (file)
index 83b19ae..0000000
+++ /dev/null
@@ -1,455 +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>
-  <movement-title>Note durations</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All note durations, from long, 
-          brevis, whole until 128th; First with their plain values, then dotted 
-          and finally doubly-dotted.</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>64</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <beats>16</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>1024</duration>
-        <voice>1</voice>
-        <type>longa</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>512</duration>
-        <voice>1</voice>
-        <type>breve</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>256</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>128</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>64</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>32</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>16</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>5</octave>
-        </pitch>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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>
-    <!--=======================================================-->
-    <measure number="4">
-      <attributes>
-        <time>
-          <beats>24</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1536</duration>
-        <voice>1</voice>
-        <type>longa</type>
-        <dot/>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>768</duration>
-        <voice>1</voice>
-        <type>breve</type>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>384</duration>
-        <voice>1</voice>
-        <type>whole</type>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>192</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>96</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>48</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <dot/>
-        <stem>down</stem>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <dot/>
-        <stem>down</stem>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>12</duration>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>6</duration>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>3</duration>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>3</duration>
-        <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>
-    <!--=======================================================-->
-    <measure number="6">
-      <attributes>
-        <time>
-          <beats>28</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1792</duration>
-        <voice>1</voice>
-        <type>longa</type>
-        <dot/>
-        <dot/>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>896</duration>
-        <voice>1</voice>
-        <type>breve</type>
-        <dot/>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>448</duration>
-        <voice>1</voice>
-        <type>whole</type>
-        <dot/>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>224</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>112</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>56</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <dot/>
-        <dot/>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>28</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <dot/>
-        <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>14</duration>
-        <voice>1</voice>
-        <type>32nd</type>
-        <dot/>
-        <dot/>
-        <beam number="1">continue</beam>
-        <beam number="2">continue</beam>
-        <beam number="3">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>7</duration>
-        <voice>1</voice>
-        <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>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>7</duration>
-        <voice>1</voice>
-        <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>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/00d-Basics-RestDurations.xml b/input/regression/musicxml/00d-Basics-RestDurations.xml
deleted file mode 100644 (file)
index c5f3f55..0000000
+++ /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>
-  <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 
-          128th-rest; Then the same with dotted durations.</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>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>
-        <measure-style>
-          <multiple-rest>2</multiple-rest>
-        </measure-style>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>128</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>128</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>128</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <rest/>
-        <duration>64</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>16</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>16th</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>32nd</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>64th</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>128th</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>128th</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>96</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <rest/>
-        <duration>48</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>16th</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>6</duration>
-        <voice>1</voice>
-        <type>32nd</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>3</duration>
-        <voice>1</voice>
-        <type>64th</type>
-        <dot/>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>128th</type>
-        <dot/>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/00e-Basics-PitchedRests-PJB.xml b/input/regression/musicxml/00e-Basics-PitchedRests-PJB.xml
deleted file mode 100644 (file)
index 28fafc3..0000000
+++ /dev/null
@@ -1,63 +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>
-               <miscellaneous>
-                       <miscellaneous-field name="description">Rests can have 
-                            explicit pitches, where they are displayed. The 
-                            first rest uses no explicit position and should use 
-                            the default position, all others are explicitly 
-                            positioned somewhere else.</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>5</beats><beat-type>4</beat-type></time>
-                               <staves>1</staves>
-                               <clef number="1"><sign>G</sign><line>2</line></clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>96</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <staff>1</staff>
-                       </note>
-                       <note>
-                               <rest><display-step>E</display-step><display-octave>4</display-octave></rest>
-                               <duration>96</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <staff>1</staff>
-                       </note>
-                       <note>
-                               <rest><display-step>F</display-step><display-octave>5</display-octave></rest>
-                               <duration>96</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <staff>1</staff>
-                       </note>
-                       <note>
-                               <rest><display-step>A</display-step><display-octave>3</display-octave></rest>
-                               <duration>96</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <staff>1</staff>
-                       </note>
-                       <note>
-                               <rest><display-step>C</display-step><display-octave>6</display-octave></rest>
-                               <duration>96</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <staff>1</staff>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00f-Basics-Clefs.xml b/input/regression/musicxml/00f-Basics-Clefs.xml
deleted file mode 100644 (file)
index 34cd960..0000000
+++ /dev/null
@@ -1,371 +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>
-  <movement-title>Clefs</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Various clefs: G, C, F, percussion, 
-          TAB and none; some are also possible with octavation and  on other 
-          staff lines than their default (e.g. soprano/alto/tenor/bariton C 
-          clefs); Each measure shows a different clef (measure 17 has the "none" 
-          clef), only measure 18 has the same treble clef as measure 
-          1.</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>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>3</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <attributes>
-        <clef>
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <attributes>
-        <clef>
-          <sign>percussion</sign>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <attributes>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-          <clef-octave-change>-1</clef-octave-change>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <attributes>
-        <clef>
-          <sign>F</sign>
-          <line>4</line>
-          <clef-octave-change>-1</clef-octave-change>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <attributes>
-        <clef>
-          <sign>F</sign>
-          <line>3</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <print new-system="yes"/>
-      <attributes>
-        <clef>
-          <sign>G</sign>
-          <line>1</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>5</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>1</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <attributes>
-        <clef>
-          <sign>percussion</sign>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="14">
-      <attributes>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-          <clef-octave-change>1</clef-octave-change>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="15">
-      <attributes>
-        <clef>
-          <sign>F</sign>
-          <line>4</line>
-          <clef-octave-change>1</clef-octave-change>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="16">
-      <attributes>
-        <clef>
-          <sign>TAB</sign>
-          <line>5</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="17">
-      <print new-system="yes"/>
-      <attributes>
-        <clef>
-          <sign>none</sign>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="18">
-      <attributes>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <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/00g-Basics-Keys.xml b/input/regression/musicxml/00g-Basics-Keys.xml
deleted file mode 100644 (file)
index b8c0fb7..0000000
+++ /dev/null
@@ -1,815 +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>
-  <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">
-
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>-11</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="2">
-      <attributes>
-        <key>
-          <fifths>-11</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="3">
-      <attributes>
-        <key>
-          <fifths>-10</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="4">
-      <attributes>
-        <key>
-          <fifths>-10</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="5">
-      <attributes>
-        <key>
-          <fifths>-9</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="6">
-      <attributes>
-        <key>
-          <fifths>-9</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="7">
-      <attributes>
-        <key>
-          <fifths>-8</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="8">
-      <attributes>
-        <key>
-          <fifths>-8</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="9">
-      <attributes>
-        <key>
-          <fifths>-7</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="10">
-      <attributes>
-        <key>
-          <fifths>-7</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="11">
-      <attributes>
-        <key>
-          <fifths>-6</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="12">
-      <attributes>
-        <key>
-          <fifths>-6</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="13">
-      <attributes>
-        <key>
-          <fifths>-5</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="14">
-      <attributes>
-        <key>
-          <fifths>-5</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="15">
-      <attributes>
-        <key>
-          <fifths>-4</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="16">
-      <attributes>
-        <key>
-          <fifths>-4</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="17">
-      <attributes>
-        <key>
-          <fifths>-3</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="18">
-      <attributes>
-        <key>
-          <fifths>-3</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="19">
-      <attributes>
-        <key>
-          <fifths>-2</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="20">
-      <attributes>
-        <key>
-          <fifths>-2</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="21">
-      <attributes>
-        <key>
-          <fifths>-1</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="22">
-      <attributes>
-        <key>
-          <fifths>-1</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="23">
-      <attributes>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="24">
-      <attributes>
-        <key>
-          <fifths>0</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="25">
-      <attributes>
-        <key>
-          <fifths>1</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="26">
-      <attributes>
-        <key>
-          <fifths>1</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="27">
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="28">
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="29">
-      <attributes>
-        <key>
-          <fifths>3</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="30">
-      <attributes>
-        <key>
-          <fifths>3</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="31">
-      <attributes>
-        <key>
-          <fifths>4</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="32">
-      <attributes>
-        <key>
-          <fifths>4</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="33">
-      <attributes>
-        <key>
-          <fifths>5</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="34">
-      <attributes>
-        <key>
-          <fifths>5</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="35">
-      <attributes>
-        <key>
-          <fifths>6</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="36">
-      <attributes>
-        <key>
-          <fifths>6</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="37">
-      <attributes>
-        <key>
-          <fifths>7</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="38">
-      <attributes>
-        <key>
-          <fifths>7</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="39">
-      <attributes>
-        <key>
-          <fifths>8</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="40">
-      <attributes>
-        <key>
-          <fifths>8</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="41">
-      <attributes>
-        <key>
-          <fifths>9</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="42">
-      <attributes>
-        <key>
-          <fifths>9</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="43">
-      <attributes>
-        <key>
-          <fifths>10</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="44">
-      <attributes>
-        <key>
-          <fifths>10</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="45">
-      <attributes>
-        <key>
-          <fifths>11</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="46">
-      <attributes>
-        <key>
-          <fifths>11</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</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/00h-Basics-TimeSignatures.xml b/input/regression/musicxml/00h-Basics-TimeSignatures.xml
deleted file mode 100644 (file)
index 8d25e39..0000000
+++ /dev/null
@@ -1,236 +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">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">
-
-    <measure number="1">
-      <attributes>
-        <divisions>2</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time  symbol="common">
-          <beats>2</beats>
-          <beat-type>2</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <measure number="2">
-      <attributes>
-        <time  symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <measure number="3">
-      <attributes>
-        <time >
-          <beats>2</beats>
-          <beat-type>2</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <measure number="4">
-      <attributes>
-        <time >
-          <beats>3</beats>
-          <beat-type>2</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>whole</type>
-        <dot/>
-      </note>
-    </measure>
-    <measure number="5">
-      <attributes>
-        <time >
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="6">
-      <attributes>
-        <time>
-          <beats>3</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>6</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-    </measure>
-    <measure number="7">
-      <attributes>
-        <time>
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <measure number="8">
-      <attributes>
-        <time>
-          <beats>5</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <tie type="start"/>
-        <voice>1</voice>
-        <type>whole</type>
-        <notations><tied type="start"/></notations>
-      </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>
-    </measure>
-    <measure number="9">
-      <attributes>
-        <time>
-          <beats>3</beats>
-          <beat-type>8</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>3</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-      </note>
-    </measure>
-    <measure number="10">
-      <attributes>
-        <time >
-          <beats>6</beats>
-          <beat-type>8</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>6</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-    </measure>
-    <measure number="11">
-      <attributes>
-        <time >
-          <beats>12</beats>
-          <beat-type>8</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>whole</type>
-        <dot/>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml b/input/regression/musicxml/00i-Basics-NoKeyOrClef.xml
deleted file mode 100644 (file)
index 9ba15fd..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!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">A score without 
-                            any key or clef defined. The default (4/4 in treble 
-                            clef) should be used.</miscellaneous-field>
-               </miscellaneous>
-       </identification>
-       <part-list>
-               <score-part id="P0">
-                       <part-name></part-name>
-               </score-part>
-       </part-list>
-       <part id="P0">
-               <measure number="1">
-                       <attributes>
-                               <divisions>1</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>C</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>4</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-               <measure number="2">
-                       <note>
-                               <pitch>
-                                       <step>C</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>4</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00j-Basics-NoTime-PJB.xml b/input/regression/musicxml/00j-Basics-NoTime-PJB.xml
deleted file mode 100644 (file)
index a70af96..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!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">A score without 
-                            a time signature (but with a key and clefs)</miscellaneous-field>
-               </miscellaneous>
-       </identification>
-       <part-list>
-               <score-part id="P1">
-                       <part-name></part-name>
-               </score-part>
-       </part-list>
-       <part id="P1">
-               <measure number="1">
-                       <attributes>
-                               <divisions>1</divisions>
-                               <key><fifths>0</fifths></key>
-                               <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>4</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <staff>1</staff>
-                       </note>
-                       <backup><duration>384</duration></backup>
-                       <note>
-                               <pitch><step>B</step><octave>2</octave></pitch>
-                               <duration>4</duration>
-                               <voice>2</voice>
-                               <type>whole</type>
-                               <staff>2</staff>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00k-Basics-Backup.xml b/input/regression/musicxml/00k-Basics-Backup.xml
deleted file mode 100644 (file)
index 0958d3f..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
-
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Two voices with a backup, that 
-          does not jump to the beginning for the measure for voice 2, but 
-          somewhere in the middle. Voice 2 thus won't have any notes or rests 
-          for the first beat of the measures.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name></part-name>
-      <part-abbreviation></part-abbreviation>
-    </score-part>
-  </part-list>
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>2</divisions>
-        <key><fifths>0</fifths></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>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <backup>
-        <duration>2</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-  </part>
-</score-partwise>
-
diff --git a/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml b/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml
deleted file mode 100644 (file)
index 42d4a74..0000000
+++ /dev/null
@@ -1,306 +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">Four multi-measure rests: 3 
-          measures, 15 measures, 1 measure, and 12 measures.</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>
-        <measure-style>
-          <multiple-rest>3</multiple-rest>
-        </measure-style>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <attributes>
-        <measure-style>
-          <multiple-rest>15</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="14">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="15">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="16">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="17">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="18">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="19">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="20">
-      <attributes>
-        <measure-style>
-          <multiple-rest>12</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="21">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="22">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="23">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="24">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="25">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="26">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="27">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="28">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="29">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="30">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="31">
-      <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/00l-Basics-Tie-PJB.xml b/input/regression/musicxml/00l-Basics-Tie-PJB.xml
deleted file mode 100644 (file)
index 90ee9e2..0000000
+++ /dev/null
@@ -1,44 +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>
-               <miscellaneous>
-                       <miscellaneous-field name="description">Two simple tied whole notes</miscellaneous-field>
-               </miscellaneous>
-       </identification>
-       <part-list>
-               <score-part id="P1"><part-name></part-name></score-part>
-       </part-list>
-       <part id="P1">
-               <measure number="1">
-                       <attributes>
-                               <divisions>1</divisions>
-                               <key><fifths>0</fifths></key>
-                               <time><beats>4</beats><beat-type>4</beat-type></time>
-                               <staves>1</staves>
-                               <clef number="1"><sign>G</sign><line>2</line></clef>
-                       </attributes>
-                       <note>
-                               <pitch><step>F</step><octave>4</octave></pitch>
-                               <duration>4</duration>
-                               <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">
-                               <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>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml b/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml
deleted file mode 100644 (file)
index 8594bd2..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Multi-Measure rests should always 
-          be converted into durations that are a multiple of the time 
-          signature.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <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>
-  <!--=========================================================-->
-  <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>
-        <measure-style>
-          <multiple-rest>2</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <attributes>
-        <time>
-          <beats>3</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <measure-style>
-          <multiple-rest>3</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>3</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <rest/>
-        <duration>3</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>3</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <attributes>
-        <time>
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <measure-style>
-          <multiple-rest>2</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <attributes>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <measure-style>
-          <multiple-rest>2</multiple-rest>
-        </measure-style>
-      </attributes>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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/00n-NoVoiceElement.xml b/input/regression/musicxml/00n-NoVoiceElement.xml
deleted file mode 100644 (file)
index 2f782c1..0000000
+++ /dev/null
@@ -1,44 +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="2.0">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">The &lt;voice&gt; element 
-        of notes is optional in MusicXML (although Dolet always writes it out). 
-        Here, there is one note with lyrics, but without a voice assigned. It 
-        should still be correctly converted.</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>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>16</duration>
-        <type>whole</type>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>A</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/00o-Basics-Modes.xml b/input/regression/musicxml/00o-Basics-Modes.xml
deleted file mode 100644 (file)
index 63bac0b..0000000
+++ /dev/null
@@ -1,180 +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 different modes: major, 
-        minor, ionian, dorian, phrygian, lydian, mixolydian, aeolian, and 
-        locrian; All modes are given with 2 sharps.</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>2</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"><text>major</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>minor</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>ionian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>ionian</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>dorian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>dorian</text></lyric>
-      </note>
-    </measure>
-    <measure number="2">
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>phrygian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>phrygian</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>lydian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>lydian</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>mixolydian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>mixolydian</text></lyric>
-      </note>
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>aeolian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>aeolian</text></lyric>
-      </note>
-    </measure>
-    <measure number="3">
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>locrian</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>locrian</text></lyric>
-      </note>
-    </measure>
-  </part>
-</score-partwise>
-
diff --git a/input/regression/musicxml/00p-Rest-NoType.xml b/input/regression/musicxml/00p-Rest-NoType.xml
deleted file mode 100644 (file)
index 0b72a4d..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">In some cases, a rest might 
-          not have its type attribute set (this happens, for example, with
-          voices in Finale, where you don't manually insert a 
-          rest).</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure implicit="yes" number="0">
-      <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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>1</duration>
-      </backup>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>2</voice>
-        <staff>2</staff>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="1">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>2</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/00q-Basics-Microtones.xml b/input/regression/musicxml/00q-Basics-Microtones.xml
deleted file mode 100644 (file)
index 659d11c..0000000
+++ /dev/null
@@ -1,132 +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 microtones: c 
-          flat-and-a-half, d half-flat, e half-sharp, f sharp-and-a half. 
-          Once in the lower and once in the upper region of the 
-          staff.</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>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1.5</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-0.5</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>0.5</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1.5</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>-1.5</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <alter>-0.5</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>0.5</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1.5</alter>
-          <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/01-Chords.itexi b/input/regression/musicxml/01-Chords.itexi
deleted file mode 100644 (file)
index f82d299..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Chorded notes
-
diff --git a/input/regression/musicxml/01-Pitches.itexi b/input/regression/musicxml/01-Pitches.itexi
new file mode 100644 (file)
index 0000000..0bb6257
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 01 ... Pitches
diff --git a/input/regression/musicxml/01a-Chord-Basic.xml b/input/regression/musicxml/01a-Chord-Basic.xml
deleted file mode 100644 (file)
index ef2db31..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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">One simple chord 
-                            consisting of two notes.</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">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <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>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>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>960</duration>
-                               <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/01a-Pitches-Pitches.xml b/input/regression/musicxml/01a-Pitches-Pitches.xml
new file mode 100644 (file)
index 0000000..176850d
--- /dev/null
@@ -0,0 +1,1291 @@
+<?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>Pitches and accidentals</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All pitches from G to c'''' in 
+          ascending steps; First without accidentals, then with a sharp and then 
+          with a flat accidental. Double alterations and cautionary accidentals 
+          are tested at the end.</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"/>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</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>
+      <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="5">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</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>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <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>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>7</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <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>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="14">
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <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>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>7</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="18">
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="19">
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <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>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="22">
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="23">
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="24">
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>7</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat</accidental>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="31">
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>2</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>double-sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-2</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>flat-flat</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <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>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental editorial="yes">sharp</accidental>
+        <stem>down</stem>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/01b-Chords-TwoNotes.xml b/input/regression/musicxml/01b-Chords-TwoNotes.xml
deleted file mode 100644 (file)
index 6dce4ee..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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">Some subsequent 
-                            (identical) two-note chords.</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">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <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>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>
-                       </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>
-                       </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>
-                       </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>
-                       </note>
-               </measure>
-
-               <measure number="2">
-                       <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>
-                       </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>
-                       </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>
-                       </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>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/01b-Pitches-Intervals.xml b/input/regression/musicxml/01b-Pitches-Intervals.xml
new file mode 100644 (file)
index 0000000..79d1430
--- /dev/null
@@ -0,0 +1,831 @@
+<?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>Various piches and interval sizes</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All pitch intervals in ascending 
+          jump size.</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>2</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>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</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>E</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</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>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</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>G</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</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>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>1</alter>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-1</alter>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
+
diff --git a/input/regression/musicxml/01c-Chords-ThreeNotesDuration.xml b/input/regression/musicxml/01c-Chords-ThreeNotesDuration.xml
deleted file mode 100644 (file)
index d18ba71..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-<?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">Some three-note 
-                            chords, with various durations.</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">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>F</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>1440</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <dot/>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>A</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>1440</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <dot/>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>C</step>
-                                       <octave>5</octave>
-                               </pitch>
-                               <duration>1440</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <dot/>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>A</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>480</duration>
-                               <voice>1</voice>
-                               <type>eighth</type>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>5</octave>
-                               </pitch>
-                               <duration>480</duration>
-                               <voice>1</voice>
-                               <type>eighth</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>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>C</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>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>C</step>
-                                       <octave>5</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-               </measure>
-
-               <measure number="2">
-                       <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>
-                       </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>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>F</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>
-                       </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>
-                       </note>
-                       <note>
-                               <chord/>
-                               <pitch>
-                                       <step>D</step>
-                                       <octave>5</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/01c-Pitches-NoVoiceElement.xml b/input/regression/musicxml/01c-Pitches-NoVoiceElement.xml
new file mode 100644 (file)
index 0000000..2f782c1
--- /dev/null
@@ -0,0 +1,44 @@
+<?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="2.0">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">The &lt;voice&gt; element 
+        of notes is optional in MusicXML (although Dolet always writes it out). 
+        Here, there is one note with lyrics, but without a voice assigned. It 
+        should still be correctly converted.</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>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>16</duration>
+        <type>whole</type>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>A</text>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml b/input/regression/musicxml/01d-Chords-SchubertStabatMater.xml
deleted file mode 100644 (file)
index c809ded..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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 
-                            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">
-          <measure number="1">
-            <attributes>
-              <divisions>8</divisions>
-              <key>
-                <fifths>-4</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="above">
-              <direction-type>
-                <words default-y="15" font-family="Times New Roman" font-size="8,5" font-weight="bold">Largo</words>
-              </direction-type>
-            </direction>
-            <direction placement="below">
-              <direction-type>
-                <dynamics default-y="-80">
-                  <fp/>
-                </dynamics>
-              </direction-type>
-              <offset>3</offset>
-            </direction>
-            <note>
-              <pitch>
-                <step>F</step>
-                <octave>4</octave>
-              </pitch>
-              <duration>32</duration>
-              <voice>1</voice>
-              <type>whole</type>
-              <notations>
-                <articulations>
-                  <accent placement="below"/>
-                </articulations>
-                <fermata type="upright"/>
-              </notations>
-            </note>
-          </measure>
-          <!--=======================================================-->
-          <measure number="2">
-            <direction placement="below">
-              <direction-type>
-                <dynamics default-y="-80">
-                  <p/>
-                </dynamics>
-              </direction-type>
-              <offset>1</offset>
-              <sound dynamics="54"/>
-            </direction>
-            <note>
-              <pitch>
-                <step>F</step>
-                <octave>4</octave>
-              </pitch>
-              <duration>12</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <dot/>
-              <stem>up</stem>
-            </note>
-            <note>
-              <chord/>
-              <pitch>
-                <step>A</step>
-                <alter>-1</alter>
-                <octave>4</octave>
-              </pitch>
-              <duration>12</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <dot/>
-              <stem>up</stem>
-            </note>
-            <note>
-              <pitch>
-                <step>F</step>
-                <octave>4</octave>
-              </pitch>
-              <duration>4</duration>
-              <voice>1</voice>
-              <type>eighth</type>
-              <stem>up</stem>
-            </note>
-            <note>
-              <chord/>
-              <pitch>
-                <step>A</step>
-                <alter>-1</alter>
-                <octave>4</octave>
-              </pitch>
-              <duration>4</duration>
-              <voice>1</voice>
-              <type>eighth</type>
-              <stem>up</stem>
-            </note>
-            <note>
-              <pitch>
-                <step>G</step>
-                <octave>4</octave>
-              </pitch>
-              <duration>8</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <stem>up</stem>
-            </note>
-            <note>
-              <chord/>
-              <pitch>
-                <step>B</step>
-                <alter>-1</alter>
-                <octave>4</octave>
-              </pitch>
-              <duration>8</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <stem>up</stem>
-            </note>
-            <note>
-              <pitch>
-                <step>G</step>
-                <octave>4</octave>
-              </pitch>
-              <duration>8</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <stem>up</stem>
-            </note>
-            <note>
-              <chord/>
-              <pitch>
-                <step>B</step>
-                <alter>-1</alter>
-                <octave>4</octave>
-              </pitch>
-              <duration>8</duration>
-              <voice>1</voice>
-              <type>quarter</type>
-              <stem>up</stem>
-            </note>
-          </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/01d-Pitches-Microtones.xml b/input/regression/musicxml/01d-Pitches-Microtones.xml
new file mode 100644 (file)
index 0000000..659d11c
--- /dev/null
@@ -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">Some microtones: c 
+          flat-and-a-half, d half-flat, e half-sharp, f sharp-and-a half. 
+          Once in the lower and once in the upper region of the 
+          staff.</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>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1.5</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-0.5</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>0.5</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1.5</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>-1.5</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <alter>-0.5</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>0.5</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1.5</alter>
+          <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/01e-Chords-PickupMeasures.xml b/input/regression/musicxml/01e-Chords-PickupMeasures.xml
deleted file mode 100644 (file)
index abdf5b2..0000000
+++ /dev/null
@@ -1,94 +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">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>
-    </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">
-            <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">
-            <note>
-                <pitch>
-                    <step>C</step>
-                    <octave>5</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <chord/>
-                <pitch>
-                    <step>A</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <chord/>
-                <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>
-            <note>
-                <chord/>
-                <pitch>
-                    <step>A</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>1</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-        </measure>
-        <!--=======================================================-->
-    </part>
-    <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/01f-Chord-ElementInBetween.xml b/input/regression/musicxml/01f-Chord-ElementInBetween.xml
deleted file mode 100644 (file)
index 95536e6..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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">Between the individual notes of 
-            a chord there can be direction or harmony elements, which should be 
-            properly assigned to the chord (or the position of the 
-            chord).</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">
-        <measure number="1">
-            <attributes>
-                <divisions>960</divisions>
-                <time>
-                    <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>960</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <direction>
-              <direction-type>
-                <segno/>
-              </direction-type>
-            </direction>
-            <note>
-                <chord/>
-                <pitch>
-                    <step>F</step>
-                    <octave>4</octave>
-                    <alter>1</alter>
-                </pitch>
-                <duration>960</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <direction>
-                <direction-type>
-                    <dynamics><p/></dynamics>
-                </direction-type>
-            </direction>
-            <note>
-                <chord/>
-                <pitch>
-                    <step>D</step>
-                    <octave>4</octave>
-                </pitch>
-                <duration>960</duration>
-                <voice>1</voice>
-                <type>quarter</type>
-            </note>
-            <note>
-                <rest/>
-                <duration>960</duration>
-                <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/02-Notations-Articulations.itexi b/input/regression/musicxml/02-Notations-Articulations.itexi
deleted file mode 100644 (file)
index b56bc9a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Notations and Articulations
-
diff --git a/input/regression/musicxml/02-Rests.itexi b/input/regression/musicxml/02-Rests.itexi
new file mode 100644 (file)
index 0000000..ba92d1e
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 02 ... Rests
diff --git a/input/regression/musicxml/02a-Notations-MusicXML.xml b/input/regression/musicxml/02a-Notations-MusicXML.xml
deleted file mode 100644 (file)
index 4b350a7..0000000
+++ /dev/null
@@ -1,1238 +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 notations (attached to note)</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All &lt;notation&gt; elements 
-          defined in MusicXML. The lyrics show the notation assigned to each 
-          note.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name></part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <!-- General Notation elements (no spanners, which are tested separately):
-         fermata | arpeggiate | non-arpeggiate | accidental-mark -->
-    <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>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <fermata type="upright"/>
-        </notations>
-        <lyric number="1"><text>ferm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <fermata>normal</fermata>
-        </notations>
-        <lyric number="1"><text>normal ferm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <fermata>angled</fermata>
-        </notations>
-        <lyric number="1"><text>angled ferm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <fermata>square</fermata>
-        </notations>
-        <lyric number="1"><text>square ferm.</text></lyric>
-      </note>
-    </measure>
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <fermata type="inverted"/>
-        </notations>
-        <lyric number="1"><text>inv.ferm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-        <lyric number="1"><text>arp.</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><non-arpeggiate type="bottom"/></notations>
-        <lyric number="1"><text>non-arp.</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><non-arpeggiate type="top"/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <accidental-mark placement="above">double-sharp</accidental-mark>
-        </notations>
-        <lyric number="1"><text>acc.mark</text></lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-
-    <!-- Articulations: 
-            accent | strong-accent | staccato | tenuto |
-            detached-legato | staccatissimo | spiccato |
-            scoop | plop | doit | falloff | breath-mark |
-            caesura | stress | unstress | other-articulation -->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><accent/></articulations>
-        </notations>
-        <lyric number="1"><text>acc.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><strong-accent/></articulations>
-        </notations>
-        <lyric number="1"><text>str.-acc.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><staccato/></articulations>
-        </notations>
-        <lyric number="1"><text>stacc.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><tenuto/></articulations>
-        </notations>
-        <lyric number="1"><text>ten.</text></lyric>
-      </note>
-    </measure>
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><detached-legato/></articulations>
-        </notations>
-        <lyric number="1"><text>det.-leg.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><staccatissimo/></articulations>
-        </notations>
-        <lyric number="1"><text>stacc.ss</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><spiccato/></articulations>
-        </notations>
-        <lyric number="1"><text>spicc.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><scoop/></articulations>
-        </notations>
-        <lyric number="1"><text>scoop</text></lyric>
-      </note>
-    </measure>
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><plop/></articulations>
-        </notations>
-        <lyric number="1"><text>plop</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><doit/></articulations>
-        </notations>
-        <lyric number="1"><text>doit</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><falloff/></articulations>
-        </notations>
-        <lyric number="1"><text>falloff</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><breath-mark/></articulations>
-        </notations>
-        <lyric number="1"><text>breath</text></lyric>
-      </note>
-    </measure>
-    <measure number="6">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><caesura/></articulations>
-        </notations>
-        <lyric number="1"><text>caes.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><stress/></articulations>
-        </notations>
-        <lyric number="1"><text>stress</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations><unstress/></articulations>
-        </notations>
-        <lyric number="1"><text>unstr.</text></lyric>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-
-    <!-- Ornaments:
-         trill-mark | turn | delayed-turn | inverted-turn |
-         shake | wavy-line | mordent | inverted-mordent | 
-         schleifer | tremolo | other-ornament), 
-         accidental-mark 
-         
-         Test cases for various tremolo options are in a separate 
-         unit test file
-         -->
-    <measure number="7">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><trill-mark/></ornaments>
-        </notations>
-        <lyric number="1"><text>tr.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><turn/></ornaments>
-        </notations>
-        <lyric number="1"><text>turn</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><delayed-turn/></ornaments>
-        </notations>
-        <lyric number="1"><text>del.turn</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><inverted-turn/></ornaments>
-        </notations>
-        <lyric number="1"><text>inv.turn</text></lyric>
-      </note>
-    </measure>
-    <measure number="8">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><shake/></ornaments>
-        </notations>
-        <lyric number="1"><text>shake</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments>
-            <wavy-line placement="below" type="start"/>
-          </ornaments>
-        </notations>
-        <lyric number="1"><syllabic>begin</syllabic><text>wavy</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments>
-            <wavy-line placement="below" type="stop"/>
-            <wavy-line placement="below" type="start"/>
-          </ornaments>
-        </notations>
-        <lyric number="1"><syllabic>continue</syllabic><text>wavy</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments>
-            <wavy-line placement="below" relative-x="16" type="stop"/>
-          </ornaments>
-        </notations>
-        <lyric number="1"><syllabic>end</syllabic><text>line</text></lyric>
-      </note>
-    </measure>
-    <measure number="9">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><mordent/></ornaments>
-        </notations>
-        <lyric number="1"><text>mord.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><inverted-mordent/></ornaments>
-        </notations>
-        <lyric number="1"><text>inv.mord.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><schleifer/></ornaments>
-        </notations>
-        <lyric number="1"><text>schl.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments><tremolo/></ornaments>
-        </notations>
-        <lyric number="1"><text>trem.</text></lyric>
-      </note>
-    </measure>
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments>
-            <turn/>
-            <accidental-mark>natural</accidental-mark>
-          </ornaments>
-        </notations>
-        <lyric number="1"><text>turn+acc.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <ornaments>
-            <turn/>
-            <accidental-mark placement="above">sharp</accidental-mark>
-            <accidental-mark placement="above">three-quarters-flat</accidental-mark>
-          </ornaments>
-        </notations>
-        <lyric number="1"><text>turn+acc.(ab.+bel./rel to turn)</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>
-
-    <!-- Technical:
-         up-bow | down-bow | harmonic | open-string |
-         thumb-position | fingering | pluck | double-tongue |
-         triple-tongue | stopped | snap-pizzicato | fret |
-         string | hammer-on | pull-off | bend | tap | heel |
-         toe | fingernails | other-technical -->
-    <measure number="11">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><up-bow/></technical>
-        </notations>
-        <lyric number="1"><text>up-b.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><down-bow/></technical>
-        </notations>
-        <lyric number="1"><text>down-b.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic/></technical>
-        </notations>
-        <lyric number="1"><text>harm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic><natural/></harmonic></technical>
-        </notations>
-        <lyric number="1"><text>nat.harm.</text></lyric>
-      </note>
-    </measure>
-    <measure number="12">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic><artificial/></harmonic></technical>
-        </notations>
-        <lyric number="1"><text>art.harm.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic><natural/><base-pitch/></harmonic></technical>
-        </notations>
-        <lyric number="1"><text>nat.h./base</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic><natural/><touching-pitch/></harmonic></technical>
-        </notations>
-        <lyric number="1"><text>nat.h./touching</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><harmonic><natural/><sounding-pitch/></harmonic></technical>
-        </notations>
-        <lyric number="1"><text>nat.h./sounding</text></lyric>
-      </note>
-    </measure>
-    <measure number="13">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><open-string/></technical>
-        </notations>
-        <lyric number="1"><text>open-str.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><thumb-position/></technical>
-        </notations>
-        <lyric number="1"><text>thumb-pos.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering/></technical>
-        </notations>
-        <lyric number="1"><text>empty fing.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>1</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.1</text></lyric>
-      </note>
-    </measure>
-    <measure number="14">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>2</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.2</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>3</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.3</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>4</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.4</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>5</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.5</text></lyric>
-      </note>
-    </measure>
-    <measure number="15">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>something</fingering></technical>
-        </notations>
-        <lyric number="1"><text>fing.sth.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingering>5</fingering><fingering substitution="yes">3</fingering><fingering alternate="yes">2</fingering></technical>
-        </notations>
-        <lyric number="1"><text>mult.fing.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><pluck/></technical>
-        </notations>
-        <lyric number="1"><text>empty pluck</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><pluck>a</pluck></technical>
-        </notations>
-        <lyric number="1"><text>pluck a</text></lyric>
-      </note>
-    </measure>
-    <measure number="16">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><double-tongue/></technical>
-        </notations>
-        <lyric number="1"><text>dbl.tng.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><triple-tongue/></technical>
-        </notations>
-        <lyric number="1"><text>trpl.tng.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><stopped/></technical>
-        </notations>
-        <lyric number="1"><text>stopped</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><snap-pizzicato/></technical>
-        </notations>
-        <lyric number="1"><text>snp.pizz.</text></lyric>
-      </note>
-    </measure>
-    <measure number="17">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fret/></technical>
-        </notations>
-        <lyric number="1"><text>empty fret</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fret>0</fret></technical>
-        </notations>
-        <lyric number="1"><text>fret0</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><string/></technical>
-        </notations>
-        <lyric number="1"><text>empty str.</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <string>5</string>
-          </technical>
-        </notations>
-        <lyric number="1"><text>str. 5</text></lyric>
-      </note>
-    </measure>
-    <measure number="18">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <hammer-on type="start"/>
-          </technical>
-        </notations>
-        <lyric number="1"><syllabic>begin</syllabic><text>hammer</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <hammer-on type="stop"/>
-          </technical>
-        </notations>
-        <lyric number="1"><syllabic>end</syllabic><text>on</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <pull-off type="start"/>
-          </technical>
-        </notations>
-        <lyric number="1"><syllabic>begin</syllabic><text>pull</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <pull-off type="stop"/>
-          </technical>
-        </notations>
-        <lyric number="1"><syllabic>end</syllabic><text>off</text></lyric>
-      </note>
-    </measure>
-    <measure number="19">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <bend><bend-alter>4</bend-alter></bend>
-          </technical>
-        </notations>
-        <lyric number="1"><text>bend</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <bend><bend-alter>3</bend-alter><release/><with-bar/></bend>
-          </technical>
-        </notations>
-        <lyric number="1"><text>b.3 with-bar</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <bend><bend-alter>-0.5</bend-alter><pre-bend/></bend>
-          </technical>
-        </notations>
-        <lyric number="1"><text>pre-b. -0.5</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical>
-            <bend><bend-alter>3.5</bend-alter><release/></bend>
-          </technical>
-        </notations>
-        <lyric number="1"><text>b. release 3.5</text></lyric>
-      </note>
-    </measure>
-    <measure number="20">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><tap/></technical>
-        </notations>
-        <lyric number="1"><text>tap</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><tap>T</tap></technical>
-        </notations>
-        <lyric number="1"><text>tap T</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><heel/></technical>
-        </notations>
-        <lyric number="1"><text>heel</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><toe substitution="yes"/></technical>
-        </notations>
-        <lyric number="1"><text>toe</text></lyric>
-      </note>
-    </measure>
-    <measure number="21">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <technical><fingernails/></technical>
-        </notations>
-        <lyric number="1"><text>fingern.</text></lyric>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-    
-    <!-- Dynamics, attached to notes by putting them inside <notations> tags -->
-    <measure number="22">
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <dynamics><f/></dynamics>
-        </notations>
-        <lyric number="1"><text>f</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <dynamics><ppp/></dynamics>
-        </notations>
-        <lyric number="1"><text>ppp</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <dynamics><sfp/></dynamics>
-        </notations>
-        <lyric number="1"><text>sfp</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <dynamics><other-dynamics>sfffz</other-dynamics></dynamics>
-        </notations>
-        <lyric number="1"><text>Oth.dyn.</text></lyric>
-      </note>
-    </measure>
-    
-    <!-- General tests: multiple notations, directions, etc. -->
-    <measure number="23">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations>
-            <strong-accent placement="above" type="up"/>
-            <staccato placement="above"/>
-          </articulations>
-        </notations>
-        <lyric number="1"><text>both above</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <articulations>
-            <accent placement="below"/>
-            <tenuto placement="below"/>
-            <staccato placement="above"/>
-          </articulations>
-        </notations>
-        <lyric number="1"><text>ab./bel./bel.</text></lyric>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</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/02a-Rests-Durations.xml b/input/regression/musicxml/02a-Rests-Durations.xml
new file mode 100644 (file)
index 0000000..c5f3f55
--- /dev/null
@@ -0,0 +1,193 @@
+<?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>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 
+          128th-rest; Then the same with dotted durations.</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>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>
+        <measure-style>
+          <multiple-rest>2</multiple-rest>
+        </measure-style>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>128</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>128</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>128</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <rest/>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>32</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>16</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>32nd</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>64th</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>128th</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>128th</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>96</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>32</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <rest/>
+        <duration>48</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>32nd</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>64th</type>
+        <dot/>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>128th</type>
+        <dot/>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/02b-Articulations-Texts-PJB.xml b/input/regression/musicxml/02b-Articulations-Texts-PJB.xml
deleted file mode 100644 (file)
index bc54908..0000000
+++ /dev/null
@@ -1,110 +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-01</encoding-date>
-               </encoding>
-               <miscellaneous>
-                       <miscellaneous-field name="description">Text markup: 
-                            different font sizes, weights and colors.</miscellaneous-field>
-               </miscellaneous>
-       </identification>
-       <part-list>
-               <score-part id="P1"><part-name></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>1</staves>
-                               <clef number="1"><sign>G</sign><line>2</line></clef>
-                       </attributes>
-                       <direction placement="above">
-                               <direction-type>
-                                       <words default-x="-1" default-y="15" font-size="medium" font-weight="normal"> 
-                                               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>
-                                       <words default-x="1" default-y="15" justify="left" font-size="medium" font-weight="bold"> 
-                                               Bold, Medium
-                                       </words>
-                               </direction-type>
-                               <staff>1</staff>
-                       </direction>
-               </measure>
-               <measure number="2">
-                       <direction placement="above">
-                               <direction-type>
-                                       <words default-x="1" default-y="15" font-size="large" font-weight="normal"> 
-                                               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>
-                                       <words default-x="1" default-y="15" font-size="large" font-weight="bold"> 
-                                               Bold, Large
-                                       </words>
-                               </direction-type>
-                               <staff>1</staff>
-                       </direction>
-               </measure>
-               <measure number="3">
-                       <direction placement="above">
-                               <direction-type>
-                                       <words default-x="1" default-y="15" font-size="small" font-weight="normal"> 
-                                               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>
-                                <words default-x="1" default-y="15" font-size="small" font-weight="bold"> 
-                                    Bold, Small
-                                </words>
-                            </direction-type>
-                            <staff>1</staff>
-                        </direction>
-                        <direction placement="below">
-                            <direction-type>
-                                <words default-x="1" default-y="-15" font-size="small" color="#FF8000"> 
-                                    Normal, Small, Colored, Below
-                                </words>
-                            </direction-type>
-                            <staff>1</staff>
-                        </direction>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/02b-Rests-PitchedRests.xml b/input/regression/musicxml/02b-Rests-PitchedRests.xml
new file mode 100644 (file)
index 0000000..28fafc3
--- /dev/null
@@ -0,0 +1,63 @@
+<?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>
+               <miscellaneous>
+                       <miscellaneous-field name="description">Rests can have 
+                            explicit pitches, where they are displayed. The 
+                            first rest uses no explicit position and should use 
+                            the default position, all others are explicitly 
+                            positioned somewhere else.</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>5</beats><beat-type>4</beat-type></time>
+                               <staves>1</staves>
+                               <clef number="1"><sign>G</sign><line>2</line></clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>96</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <staff>1</staff>
+                       </note>
+                       <note>
+                               <rest><display-step>E</display-step><display-octave>4</display-octave></rest>
+                               <duration>96</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <staff>1</staff>
+                       </note>
+                       <note>
+                               <rest><display-step>F</display-step><display-octave>5</display-octave></rest>
+                               <duration>96</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <staff>1</staff>
+                       </note>
+                       <note>
+                               <rest><display-step>A</display-step><display-octave>3</display-octave></rest>
+                               <duration>96</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <staff>1</staff>
+                       </note>
+                       <note>
+                               <rest><display-step>C</display-step><display-octave>6</display-octave></rest>
+                               <duration>96</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <staff>1</staff>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml b/input/regression/musicxml/02c-MultipleNotationChildren-RFK.xml
deleted file mode 100644 (file)
index 303f7b1..0000000
+++ /dev/null
@@ -1,96 +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">
-          It should not make any difference whether two articulations are given
-          inside two different notation elements, inside two different articulations 
-          children of the same notation element or inside the same articulations
-          element. Thus, all three notes should have a staccato and an accent.
-      </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>
-        </key>
-        <time>
-          <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>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-        <notations>
-          <articulations>
-            <staccato placement="above"/>
-          </articulations>
-        </notations>
-        <notations>
-          <articulations>
-            <accent placement="above"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-        <notations>
-          <articulations>
-            <staccato placement="above"/>
-          </articulations>
-          <articulations>
-            <accent placement="above"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <accidental>sharp</accidental>
-        <stem>down</stem>
-        <notations>
-          <articulations>
-            <staccato placement="above"/>
-            <accent placement="above"/>
-          </articulations>
-        </notations>
-      </note>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml b/input/regression/musicxml/02c-Rests-MultiMeasureRests.xml
new file mode 100644 (file)
index 0000000..42d4a74
--- /dev/null
@@ -0,0 +1,306 @@
+<?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">Four multi-measure rests: 3 
+          measures, 15 measures, 1 measure, and 12 measures.</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>
+        <measure-style>
+          <multiple-rest>3</multiple-rest>
+        </measure-style>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <attributes>
+        <measure-style>
+          <multiple-rest>15</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="14">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="16">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="18">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="19">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="20">
+      <attributes>
+        <measure-style>
+          <multiple-rest>12</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="21">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="22">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="23">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="24">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="25">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="26">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="27">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="28">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="29">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="30">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="31">
+      <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/02d-Arpeggio.xml b/input/regression/musicxml/02d-Arpeggio.xml
deleted file mode 100644 (file)
index 003ab52..0000000
+++ /dev/null
@@ -1,246 +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">Different Arpeggio directions 
-          (normal, up, down, non-arpeggiate)</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <defaults/>
-  <part-list>
-    <score-part id="P1">
-      <part-name></part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <!-- Different Arpeggiate styles: neutral, up, down and non-arpeggiate (bracket) -->
-    <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>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="up"/></notations>
-        <lyric number="1"><text>up</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="up"/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="up"/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="down"/></notations>
-        <lyric number="1"><text>down</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="down"/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate direction="down"/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><non-arpeggiate type="bottom"/></notations>
-        <lyric number="1"><text>non-arp.</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><non-arpeggiate type="top"/></notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step><octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step><octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations><arpeggiate/></notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml b/input/regression/musicxml/02d-Rests-Multimeasure-TimeSignatures.xml
new file mode 100644 (file)
index 0000000..8594bd2
--- /dev/null
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Multi-Measure rests should always 
+          be converted into durations that are a multiple of the time 
+          signature.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <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>
+  <!--=========================================================-->
+  <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>
+        <measure-style>
+          <multiple-rest>2</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <attributes>
+        <time>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <measure-style>
+          <multiple-rest>3</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>3</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <attributes>
+        <time>
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <measure-style>
+          <multiple-rest>2</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <attributes>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <measure-style>
+          <multiple-rest>2</multiple-rest>
+        </measure-style>
+      </attributes>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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/02e-Rests-NoType.xml b/input/regression/musicxml/02e-Rests-NoType.xml
new file mode 100644 (file)
index 0000000..0b72a4d
--- /dev/null
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">In some cases, a rest might 
+          not have its type attribute set (this happens, for example, with
+          voices in Finale, where you don't manually insert a 
+          rest).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure implicit="yes" number="0">
+      <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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>1</duration>
+      </backup>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>2</voice>
+        <staff>2</staff>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="1">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>2</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/03-Directions.itexi b/input/regression/musicxml/03-Directions.itexi
deleted file mode 100644 (file)
index a6b5b71..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Dynamics and other single symbols
-
diff --git a/input/regression/musicxml/03-Rhythm.itexi b/input/regression/musicxml/03-Rhythm.itexi
new file mode 100644 (file)
index 0000000..8a5afb2
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 03 ... Rhythm
diff --git a/input/regression/musicxml/03a-Directions-MusicXML.xml b/input/regression/musicxml/03a-Directions-MusicXML.xml
deleted file mode 100644 (file)
index ca086df..0000000
+++ /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/03a-Rhythm-Durations.xml b/input/regression/musicxml/03a-Rhythm-Durations.xml
new file mode 100644 (file)
index 0000000..0c162bd
--- /dev/null
@@ -0,0 +1,454 @@
+<?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 note durations, from long, 
+          brevis, whole until 128th; First with their plain values, then dotted 
+          and finally doubly-dotted.</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>64</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>16</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>1024</duration>
+        <voice>1</voice>
+        <type>longa</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>512</duration>
+        <voice>1</voice>
+        <type>breve</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>256</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>128</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>32</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>16</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>5</octave>
+        </pitch>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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>
+    <!--=======================================================-->
+    <measure number="4">
+      <attributes>
+        <time>
+          <beats>24</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1536</duration>
+        <voice>1</voice>
+        <type>longa</type>
+        <dot/>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>768</duration>
+        <voice>1</voice>
+        <type>breve</type>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>384</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>192</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>96</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>48</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+        <stem>down</stem>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <dot/>
+        <stem>down</stem>
+        <beam number="1">continue</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>12</duration>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>6</duration>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>3</duration>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>3</duration>
+        <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>
+    <!--=======================================================-->
+    <measure number="6">
+      <attributes>
+        <time>
+          <beats>28</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1792</duration>
+        <voice>1</voice>
+        <type>longa</type>
+        <dot/>
+        <dot/>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>896</duration>
+        <voice>1</voice>
+        <type>breve</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>448</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>224</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>112</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+        <dot/>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <dot/>
+        <dot/>
+        <beam number="1">continue</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>14</duration>
+        <voice>1</voice>
+        <type>32nd</type>
+        <dot/>
+        <dot/>
+        <beam number="1">continue</beam>
+        <beam number="2">continue</beam>
+        <beam number="3">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>7</duration>
+        <voice>1</voice>
+        <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>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>7</duration>
+        <voice>1</voice>
+        <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>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml b/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml
deleted file mode 100644 (file)
index 1a98a65..0000000
+++ /dev/null
@@ -1,360 +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 possible accordion 
-          registrations.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <defaults/>
-  <part-list>
-    <score-part id="P1">
-      <part-name></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>
-        <direction-type>
-          <accordion-registration>
-              <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>0/0/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-middle>1</accordion-middle>
-          </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>0/1/0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-middle>1</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>0/1/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-middle>2</accordion-middle>
-          </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>0/2/0</text></lyric>
-      </note>
-    </measure>
-    <measure number="2">
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <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>0/2/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-middle>3</accordion-middle>
-          </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>0/3/0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-middle>3</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>0/3/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <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>1/0/1</text></lyric>
-      </note>
-    </measure>
-    <measure number="3">
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-          </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>1/0/0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>1</accordion-middle>
-          </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>1/1/0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>1</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>1/1/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>2</accordion-middle>
-          </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>1/2/0</text></lyric>
-      </note>
-    </measure>
-    <measure number="4">
-      <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>1/2/1</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>3</accordion-middle>
-          </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>1/3/0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>3</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>1/3/1</text></lyric>
-      </note>
-      <!-- Special cases: No accordion-(high|middle|low) given, empty middle, 
-           middle with invalid value, middle with 0 -->
-      <direction>
-        <direction-type>
-          <accordion-registration>
-          </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>empty</text></lyric>
-      </note>
-    </measure>
-    <measure number="5">
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <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>empty M</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>test</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>inval.M</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>0</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>M=0</text></lyric>
-      </note>
-      <direction>
-        <direction-type>
-          <accordion-registration>
-              <accordion-high/>
-              <accordion-middle>5</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>M=5</text></lyric>
-      </note>
-      
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/03b-Rhythm-Backup.xml b/input/regression/musicxml/03b-Rhythm-Backup.xml
new file mode 100644 (file)
index 0000000..0958d3f
--- /dev/null
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Two voices with a backup, that 
+          does not jump to the beginning for the measure for voice 2, but 
+          somewhere in the middle. Voice 2 thus won't have any notes or rests 
+          for the first beat of the measures.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name></part-name>
+      <part-abbreviation></part-abbreviation>
+    </score-part>
+  </part-list>
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>2</divisions>
+        <key><fifths>0</fifths></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>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <backup>
+        <duration>2</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
+
diff --git a/input/regression/musicxml/03c-MetronomeMarks.xml b/input/regression/musicxml/03c-MetronomeMarks.xml
deleted file mode 100644 (file)
index 769b993..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Tempo Markings: note=bpm, 
-          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">
-      <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>
-        <direction-type>
-          <metronome>
-            <beat-unit>quarter</beat-unit>
-            <beat-unit-dot/>
-            <per-minute>100</per-minute>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-      <direction>
-        <direction-type>
-          <words>Adagio</words>
-        </direction-type>
-        <direction-type>
-          <metronome>
-            <beat-unit>long</beat-unit>
-            <per-minute>100</per-minute>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <direction>
-        <direction-type>
-          <metronome>
-            <beat-unit>quarter</beat-unit>
-            <beat-unit-dot/>
-            <beat-unit>half</beat-unit>
-            <beat-unit-dot/>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-      <direction>
-        <direction-type>
-          <metronome>
-            <beat-unit>long</beat-unit>
-            <beat-unit>32nd</beat-unit>
-            <beat-unit-dot/>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <direction>
-        <direction-type>
-          <metronome parentheses="yes">
-            <beat-unit>quarter</beat-unit>
-            <beat-unit-dot/>
-            <beat-unit>half</beat-unit>
-            <beat-unit-dot/>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-      <direction>
-        <direction-type>
-          <metronome parentheses="yes">
-            <beat-unit>quarter</beat-unit>
-            <beat-unit-dot/>
-            <per-minute>77</per-minute>
-          </metronome>
-        </direction-type>
-      </direction>
-      <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>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken b/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken
deleted file mode 100644 (file)
index 7b3285d..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <movement-title>MusicXML directions (attached to staff)</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Directions between some 
-        multi-measure rests should still be converted to the correct 
-        position.</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">
-    <!--=======================================================-->
-    <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>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-      </note>
-      <direction placement="above">
-        <direction-type>
-          <words font-family="Times New Roman" font-size="9.6" font-weight="bold">TEST</words>
-        </direction-type>
-        <offset>-4</offset>
-      </direction>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>32</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/04-Spanners.itexi b/input/regression/musicxml/04-Spanners.itexi
deleted file mode 100644 (file)
index 27b2453..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Spanners
-
diff --git a/input/regression/musicxml/04a-Spanners-Finale.xml b/input/regression/musicxml/04a-Spanners-Finale.xml
deleted file mode 100644 (file)
index 803fec8..0000000
+++ /dev/null
@@ -1,685 +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">Several spanners defined in MusicXML</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>
-        <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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>16</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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>16</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>
-        <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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur line-type="dashed" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <direction placement="above">
-        <direction-type>
-          <wedge default-y="10" spread="0" type="crescendo"/>
-        </direction-type>
-        <offset>1</offset>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <direction placement="above">
-        <direction-type>
-          <wedge default-y="13" spread="15" type="diminuendo"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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"/>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <ornaments>
-            <wavy-line default-y="10" number="1" type="stop"/>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <ornaments>
-            <wavy-line number="1" type="start"/>
-            <wavy-line number="1" type="stop"/>
-          </ornaments>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <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>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        </pitch>
-        <duration>24</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"/>
-      <direction placement="above">
-        <direction-type>
-          <bracket default-y="20" 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>
-        <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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <direction placement="above">
-        <direction-type>
-          <bracket default-y="4" 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>
-        <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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <direction placement="above">
-        <direction-type>
-          <bracket default-y="16" 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>
-        <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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <direction placement="above">
-        <direction-type>
-          <bracket default-y="16" line-end="none" line-type="dashed" number="1" type="start"/>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>2</offset>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <direction placement="above">
-        <direction-type>
-          <bracket default-y="15" 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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-      <direction placement="above">
-        <direction-type>
-          <dashes default-y="10" number="1" type="start"/>
-        </direction-type>
-        <offset>6</offset>
-      </direction>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</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>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="wavy" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <glissando line-type="wavy" number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <technical>
-            <bend>
-              <bend-alter>6</bend-alter>
-            </bend>
-          </technical>
-        </notations>
-      </note>
-      <note print-object="no">
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <technical>
-            <bend>
-              <bend-alter>0</bend-alter>
-            </bend>
-          </technical>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="solid" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>24</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <notations>
-          <slide line-type="solid" 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/04b-Glissando.xml b/input/regression/musicxml/04b-Glissando.xml
deleted file mode 100644 (file)
index 8afe656..0000000
+++ /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/04c-Spanners-Noteedit.xml b/input/regression/musicxml/04c-Spanners-Noteedit.xml
deleted file mode 100644 (file)
index 4edf6b3..0000000
+++ /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/04d-Spanners-JScore.xml b/input/regression/musicxml/04d-Spanners-JScore.xml
deleted file mode 100644 (file)
index 74b0864..0000000
+++ /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/04e-OctaveShifts-Finale.xml b/input/regression/musicxml/04e-OctaveShifts-Finale.xml
deleted file mode 100644 (file)
index ed1a344..0000000
+++ /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/04f-Slurs.xml b/input/regression/musicxml/04f-Slurs.xml
deleted file mode 100644 (file)
index dd2eb5e..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">A note can be the end of one 
-          slur and the start of a new slur. Also, in MusicXML, nested slurs 
-          are possible like in the second measure where one slur goes over all
-          four notes, and another slur goes from the second to the third 
-          note.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <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>
-  <!--=========================================================-->
-  <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>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </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="stop"/>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <slur number="1" type="stop"/>
-          <slur number="1" placement="below" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notations>
-          <slur number="2" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <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">
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem default-y="5.5">up</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/04g-Trill-EndingOnGraceNote-Finale.xml b/input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml
deleted file mode 100644 (file)
index a793d21..0000000
+++ /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/04h-Slur-ChordedNotes.xml b/input/regression/musicxml/04h-Slur-ChordedNotes.xml
deleted file mode 100644 (file)
index ff7b377..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name print-object="no">MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1" width="916">
-      <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>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </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>
-        <chord/>
-        <pitch>
-          <step>G</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>
-        <chord/>
-        <pitch>
-          <step>D</step>
-          <octave>5</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>
-        <notations>
-          <slur number="1" type="stop"/>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>D</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>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/05-Header.itexi b/input/regression/musicxml/05-Header.itexi
deleted file mode 100644 (file)
index ad0d757..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Header information
-
diff --git a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml
deleted file mode 100644 (file)
index 544bb5a..0000000
+++ /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/05b-MultipleRights.xml b/input/regression/musicxml/05b-MultipleRights.xml
deleted file mode 100644 (file)
index 40102cd..0000000
+++ /dev/null
@@ -1,32 +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>
-    <rights>Copyright © XXXX by Y. ZZZZ.</rights>
-    <rights>Released To The Public Domain.</rights>
-    <miscellaneous>
-      <miscellaneous-field name="description">There can be multiple 
-        &lt;rights&gt; tags in the identification element of the score. The 
-        conversion shall still work, ideally using both of 
-        them.</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">
-      <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/06-Lyrics.itexi b/input/regression/musicxml/06-Lyrics.itexi
deleted file mode 100644 (file)
index 1049671..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Lyrics
-
diff --git a/input/regression/musicxml/06a-Lyrics-Finale.xml b/input/regression/musicxml/06a-Lyrics-Finale.xml
deleted file mode 100644 (file)
index c680a4b..0000000
+++ /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/06b-MultipleLyrics-Finale.xml b/input/regression/musicxml/06b-MultipleLyrics-Finale.xml
deleted file mode 100644 (file)
index c3f8034..0000000
+++ /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/06c-Lyrics-Pianostaff-Finale.xml b/input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml
deleted file mode 100644 (file)
index bfb1d58..0000000
+++ /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/06d-Lyrics-Melisma-Finale.xml b/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml
deleted file mode 100644 (file)
index c2c4f69..0000000
+++ /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/06e-Lyrics-Chords-Finale.xml b/input/regression/musicxml/06e-Lyrics-Chords-Finale.xml
deleted file mode 100644 (file)
index 506e0bc..0000000
+++ /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/06f-Lyrics-GracedNotes-Finale.xml b/input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml
deleted file mode 100644 (file)
index 5567bd7..0000000
+++ /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/06g-Lyrics-NameNumber.xml b/input/regression/musicxml/06g-Lyrics-NameNumber.xml
deleted file mode 100644 (file)
index fdab72d..0000000
+++ /dev/null
@@ -1,120 +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 lyrics syllable can have both 
-          a number and a name attribute. The question is: What should be used 
-          to put syllables of the same voice together. This example uses 
-          different number/name combinations to check how different 
-          applications handle this unspecified case (The advice on the 
-          MusicXML mailing list was "there is no correct way, each 
-          application can do what it thinks is best").</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><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>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1" name="Verse">
-          <syllabic>begin</syllabic>
-          <text>Verse1A</text>
-        </lyric>
-        <lyric number="1" name="Chorus">
-          <syllabic>begin</syllabic>
-          <text>Chorus1A</text>
-        </lyric>
-        <lyric number="1" name="Chorus">
-          <syllabic>begin</syllabic>
-          <text>AnotherChorus1A</text>
-        </lyric>
-        <lyric number="2" name="Chorus">
-          <syllabic>begin</syllabic>
-          <text>Chorus1A</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>begin</syllabic>
-          <text>1B</text>
-        </lyric>
-        <lyric number="2">
-          <syllabic>begin</syllabic>
-          <text>2B</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1" name="Verse">
-          <syllabic>begin</syllabic>
-          <text>Verse1C</text>
-        </lyric>
-        <lyric number="2" name="Chorus">
-          <syllabic>begin</syllabic>
-          <text>Chorus2C</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1" name="Chorus">
-          <syllabic>begin</syllabic>
-          <text>Chorus1D</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric name="Verse">
-          <syllabic>begin</syllabic>
-          <text>VerseE</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric>
-          <syllabic>begin</syllabic>
-          <text>NoneF</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml b/input/regression/musicxml/06h-Lyrics-BeamsMelismata.xml
deleted file mode 100644 (file)
index 64ac98b..0000000
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Beaming or slurs can indicate 
-          melismata for lyrics. Also make sure that notes without an explicit
-          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>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>2</divisions>
-      </attributes>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-        <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>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch><step>A</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>lis</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ma</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch><step>B</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <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>eighth</type>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>A</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>lis</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ma</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>B</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</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>eighth</type>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch><step>A</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>lis</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ma</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>B</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</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>eighth</type>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>A</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>middle</syllabic>
-          <text>lis</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>C</step><octave>5</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1">
-          <syllabic>end</syllabic>
-          <text>ma</text>
-          <extend/>
-        </lyric>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>B</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/06i-Lyrics-Chords.xml b/input/regression/musicxml/06i-Lyrics-Chords.xml
deleted file mode 100644 (file)
index 8f3db1e..0000000
+++ /dev/null
@@ -1,72 +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">Each note of a chord can have
-          some lyrics attached. In this case, each note of the chord has lyrics 
-          of the form "Lyrics [123]" attached, where each lyrics has a different 
-          number attribute to distinguish them. These syllables should be 
-          imported into three different stanzas and the timing should be 
-          correct.</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>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Lyrics 1</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="2"><text>Lyrics 2</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="3"><text>Lyrics 3</text></lyric>
-      </note>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/06j-Lyrics-Elisions.xml b/input/regression/musicxml/06j-Lyrics-Elisions.xml
deleted file mode 100644 (file)
index 960b711..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Multiple lyrics syllables 
-          assigned to a single note are implemented either using a space in 
-          the lyrics or by using the &lt;elision&gt; lyrics element. This 
-          testcase checks both of them. First, a note with on syllable is
-          given, then a note with two syllables separated by a spcae and finally
-          a note with two and one with three syllables implemented using 
-          &lt;elision&gt; 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>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>
-        <stem>down</stem>
-        <lyric number="1">
-          <text>a</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <text>b c</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <text>d</text>
-          <elision/>
-          <text>e</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <text>f</text>
-          <elision/>
-          <text>g</text>
-          <elision/>
-          <text>h</text>
-        </lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/07-NoteSettings.itexi b/input/regression/musicxml/07-NoteSettings.itexi
deleted file mode 100644 (file)
index f73f6e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-@section Note settings, heads, etc.
diff --git a/input/regression/musicxml/07a-Noteheads.xml b/input/regression/musicxml/07a-Noteheads.xml
deleted file mode 100644 (file)
index 2874887..0000000
+++ /dev/null
@@ -1,1387 +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 note styles, using the 
-          &lt;notehead&gt; element. First, each note head style is printed 
-          with four quarter notes, two with filled heads, two with unfilled 
-          heads, where first the stem is up and then the stem is down. After 
-          that, each note head style is printed with a half note (should have 
-          an unfilled head by default). Finally, the Aiken note head styles are 
-          tested, once with stem up and once with stem down.</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>
-        <notehead>slash</notehead>
-        <lyric number="1"><text>slash</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>slash</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">slash</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">slash</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>triangle</notehead>
-        <lyric number="1"><text>triangle</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>triangle</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">triangle</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">triangle</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>diamond</notehead>
-        <lyric number="1"><text>diamond</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>diamond</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">diamond</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">diamond</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>square</notehead>
-        <lyric number="1"><text>square</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>square</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">square</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">square</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>cross</notehead>
-        <lyric number="1"><text>cross</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>cross</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">cross</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">cross</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>x</notehead>
-        <lyric number="1"><text>x</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>x</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">x</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">x</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>circle-x</notehead>
-        <lyric number="1"><text>circle-x</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>circle-x</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">circle-x</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">circle-x</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>inverted triangle</notehead>
-        <lyric number="1"><text>inverted triangle</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>inverted triangle</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">inverted triangle</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">inverted triangle</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow down</notehead>
-        <lyric number="1"><text>arrow down</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow down</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">arrow down</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">arrow down</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow up</notehead>
-        <lyric number="1"><text>arrow up</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow up</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">arrow up</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">arrow up</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>slashed</notehead>
-        <lyric number="1"><text>slashed</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>slashed</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">slashed</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">slashed</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>back slashed</notehead>
-        <lyric number="1"><text>back slashed</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>back slashed</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">back slashed</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">back slashed</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>normal</notehead>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>normal</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">normal</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">normal</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="14">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>cluster</notehead>
-        <lyric number="1"><text>cluster</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>cluster</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">cluster</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">cluster</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="15">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>none</notehead>
-        <lyric number="1"><text>none</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>none</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">none</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">none</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="16">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>slash</notehead>
-        <lyric number="1"><text>slash</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>triangle</notehead>
-        <lyric number="1"><text>triangle</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="17">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>diamond</notehead>
-        <lyric number="1"><text>diamond</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>square</notehead>
-        <lyric number="1"><text>square</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="18">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>cross</notehead>
-        <lyric number="1"><text>cross</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>x</notehead>
-        <lyric number="1"><text>x</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="19">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>circle-x</notehead>
-        <lyric number="1"><text>circle-x</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>inverted triangle</notehead>
-        <lyric number="1"><text>inverted triangle</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="20">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>arrow down</notehead>
-        <lyric number="1"><text>arrow down</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>arrow up</notehead>
-        <lyric number="1"><text>arrow up</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="21">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>slashed</notehead>
-        <lyric number="1"><text>slashed</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>back slashed</notehead>
-        <lyric number="1"><text>back slashed</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="22">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>normal</notehead>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <notehead>cluster</notehead>
-        <lyric number="1"><text>cluster</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="23">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-        <lyric number="1"><text>do</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">do</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">do</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="24">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>re</notehead>
-        <lyric number="1"><text>re</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>re</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">re</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">re</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="25">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>mi</notehead>
-        <lyric number="1"><text>mi</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>mi</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">mi</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">mi</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="26">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>fa</notehead>
-        <lyric number="1"><text>fa</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>fa</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">fa</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">fa</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="27">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>so</notehead>
-        <lyric number="1"><text>so</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>so</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">so</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">so</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="28">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>la</notehead>
-        <lyric number="1"><text>la</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>la</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">la</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">la</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="29">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>ti</notehead>
-        <lyric number="1"><text>ti</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>ti</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">ti</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead filled="no">ti</notehead>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="30">
-      <attributes>
-        <key>
-          <fifths>3</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-        <lyric number="1"><text>do</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>re</notehead>
-        <lyric number="1"><text>re</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>mi</notehead>
-        <lyric number="1"><text>mi</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>fa</notehead>
-        <lyric number="1"><text>fa</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="31">
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>so</notehead>
-        <lyric number="1"><text>so</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>la</notehead>
-        <lyric number="1"><text>la</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>ti</notehead>
-        <lyric number="1"><text>ti</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-        <lyric number="1"><text>do</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="32">
-      <attributes>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-        <lyric number="1"><text>do</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>re</notehead>
-        <lyric number="1"><text>re</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>mi</notehead>
-        <lyric number="1"><text>mi</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>fa</notehead>
-        <lyric number="1"><text>fa</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="33">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>so</notehead>
-        <lyric number="1"><text>so</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>la</notehead>
-        <lyric number="1"><text>la</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>ti</notehead>
-        <lyric number="1"><text>ti</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>6</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>do</notehead>
-        <lyric number="1"><text>do</text></lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/07b-Staff-Notestyles.xml b/input/regression/musicxml/07b-Staff-Notestyles.xml
deleted file mode 100644 (file)
index 8a6c750..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Staff-connected note styles: 
-        slash notation, hidden notes (with and without hidden staff
-        lines)</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">
-      <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>
-          <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>
-        <stem>down</stem>
-      </note>
-      <attributes>
-        <measure-style>
-          <slash type="start" use-stems="no"/>
-        </measure-style>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1"><text>slash, no stem</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <attributes>
-        <measure-style>
-          <slash type="stop"/>
-        </measure-style>
-        <measure-style>
-          <slash type="start" use-stems="yes"/>
-        </measure-style>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1"><text>slash, with stem</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <attributes>
-        <measure-style>
-          <slash type="stop"/>
-        </measure-style>
-      </attributes>
-      <note print-object="no">
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <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">
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <attributes>
-        <staff-details>
-          <staff-lines>0</staff-lines>
-        </staff-details>
-      </attributes>
-      <note print-object="no">
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1"><text>hidden notes, staff lines</text></lyric>
-      </note>
-    </measure>
-    <measure number="3">
-      <note print-object="no">
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>up</stem>
-      </note>
-      <attributes>
-        <staff-details>
-          <staff-lines>5</staff-lines>
-        </staff-details>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <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">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/07c-Noteheads-Chords.xml b/input/regression/musicxml/07c-Noteheads-Chords.xml
deleted file mode 100644 (file)
index 5196040..0000000
+++ /dev/null
@@ -1,179 +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 note styles for 
-          individual notes inside a chord, using the 
-          &lt;notehead&gt; element.</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>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>normal</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>triangle</notehead>
-        <lyric number="2"><text>triangle</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>slash</notehead>
-        <lyric number="3"><text>slash</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>cross</notehead>
-        <lyric number="1"><text>cross</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>square</notehead>
-        <lyric number="2"><text>square</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>diamond</notehead>
-        <lyric number="3"><text>diamond</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>inverted triangle</notehead>
-        <lyric number="1"><text>inverted triangle</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>circle-x</notehead>
-        <lyric number="2"><text>circle-x</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>x</notehead>
-        <lyric number="3"><text>x</text></lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>slashed</notehead>
-        <lyric number="1"><text>slashed</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow up</notehead>
-        <lyric number="2"><text>arrow up</text></lyric>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead>arrow down</notehead>
-        <lyric number="3"><text>arrow down</text></lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/07d-Parenthesized-Noteheads.xml b/input/regression/musicxml/07d-Parenthesized-Noteheads.xml
deleted file mode 100644 (file)
index 4e4fefa..0000000
+++ /dev/null
@@ -1,140 +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">Parenthesized note heads. First,
-          a single parenthesized note is tested, once with a normal and then 
-          with a non-standard notehead, then two chords with some/all
-          parenthesized noteheads and finally a parenthesized rest.</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>6</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>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes">x</notehead>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</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>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes"/>
-      </note>
-      <note>
-        <rest>
-          <display-step>E</display-step>
-          <display-octave>4</display-octave>
-        </rest>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <notehead parentheses="yes"/>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-</score-partwise>
diff --git a/input/regression/musicxml/08-Multiple-Parts.itexi b/input/regression/musicxml/08-Multiple-Parts.itexi
deleted file mode 100644 (file)
index cab81b0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Multiple parts (staves)
-
diff --git a/input/regression/musicxml/08a-Partorder-Rosegarden.xml b/input/regression/musicxml/08a-Partorder-Rosegarden.xml
deleted file mode 100644 (file)
index 23b9927..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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">A piece with 
-                            four parts. 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">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <key>
-                               <fifths>1</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>C</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>1920</duration>
-                               <voice>1</voice>
-                               <type>half</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P1">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <key>
-                               <fifths>1</fifths>
-                               <mode>major</mode>
-                               </key>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>E</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>1920</duration>
-                               <voice>1</voice>
-                               <type>half</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P2">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <key>
-                               <fifths>1</fifths>
-                               <mode>major</mode>
-                               </key>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>1920</duration>
-                               <voice>1</voice>
-                               <type>half</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P3">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <key>
-                               <fifths>1</fifths>
-                               <mode>major</mode>
-                               </key>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>B</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>960</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                       </note>
-                       <note>
-                               <rest/>
-                               <duration>960</duration>
-                               <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/08b-StaffGroups-Finale.xml b/input/regression/musicxml/08b-StaffGroups-Finale.xml
deleted file mode 100644 (file)
index 77937d2..0000000
+++ /dev/null
@@ -1,1790 +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 huge orchestra score with 28 
-          parts and different kinds of nested bracketed groups. Each part/group 
-          is assigned a name and an abbreviation to be shown before the staff. 
-          Also, most of the groups show unbroken barlines, while the barlines 
-          are broken between the groups.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <part-group number="2" type="start">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P1">
-      <part-name>Piccolo</part-name>
-      <part-abbreviation>Picc.</part-abbreviation>
-      <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>
-      <group-barline>no</group-barline>
-    </part-group>
-    <score-part id="P2">
-      <part-name>Flute 1</part-name>
-      <part-abbreviation>Fl. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>Fl. 2</part-abbreviation>
-      <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">
-      <group-name>Oboe through Clarinet</group-name>
-      <group-abbreviation>O to Cl</group-abbreviation>
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <part-group number="4" type="start">
-      <group-symbol>line</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P4">
-      <part-name>Oboe</part-name>
-      <part-abbreviation>Ob.</part-abbreviation>
-      <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>
-      <part-abbreviation>E. Hn.</part-abbreviation>
-      <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">
-      <part-name>Clarinet in Eb</part-name>
-      <part-abbreviation>Eb Cl.</part-abbreviation>
-      <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">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>no</group-barline>
-    </part-group>
-    <score-part id="P7">
-      <part-name>Clarinet in Bb 1</part-name>
-      <part-abbreviation>Bb Cl. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>Bb Cl. 2</part-abbreviation>
-      <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">
-      <part-name>Bass Clarinet</part-name>
-      <part-abbreviation>B. Cl.</part-abbreviation>
-      <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>
-      <group-barline>no</group-barline>
-    </part-group>
-    <score-part id="P10">
-      <part-name>Bassoon 1</part-name>
-      <part-abbreviation>Bsn. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>Bsn. 2</part-abbreviation>
-      <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">
-      <part-name>Contrabassoon</part-name>
-      <part-abbreviation>C. Bn.</part-abbreviation>
-      <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">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>no</group-barline>
-    </part-group>
-    <part-group number="2" type="start">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P13">
-      <part-name>Horn in F 1</part-name>
-      <part-abbreviation>Hn. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>Hn. 2</part-abbreviation>
-      <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">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>no</group-barline>
-    </part-group>
-    <score-part id="P15">
-      <part-name>Trumpet in C 1</part-name>
-      <part-abbreviation>C Tpt. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>C Tpt. 2</part-abbreviation>
-      <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">
-      <group-symbol>bracket</group-symbol>
-      <group-barline>no</group-barline>
-    </part-group>
-    <score-part id="P17">
-      <part-name>Trombone 1</part-name>
-      <part-abbreviation>Tbn. 1</part-abbreviation>
-      <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>
-      <part-abbreviation>Tbn. 2</part-abbreviation>
-      <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">
-      <part-name>Tuba</part-name>
-      <part-abbreviation>Tuba</part-abbreviation>
-      <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">
-      <part-name>Timpani</part-name>
-      <part-abbreviation>Timp.</part-abbreviation>
-      <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>
-      <part-abbreviation>Perc.</part-abbreviation>
-      <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>
-      <part-abbreviation>Hp.</part-abbreviation>
-      <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>
-      <part-abbreviation>Pno.</part-abbreviation>
-      <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>
-      <group-barline>yes</group-barline>
-    </part-group>
-    <score-part id="P24">
-      <part-name>Violin I</part-name>
-      <part-abbreviation>Vln. I</part-abbreviation>
-      <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>
-      <part-abbreviation>Vln. II</part-abbreviation>
-      <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>
-      <part-abbreviation>Vla.</part-abbreviation>
-      <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>
-      <part-abbreviation>Vc.</part-abbreviation>
-      <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>
-      <part-abbreviation>Cb.</part-abbreviation>
-      <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>
-  <!--=========================================================-->
-  <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>
-        <transpose>
-          <diatonic>0</diatonic>
-          <chromatic>0</chromatic>
-          <octave-change>1</octave-change>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <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 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>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P3">
-    <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>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P4">
-    <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>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </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>1</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>
-        <transpose>
-          <diatonic>-4</diatonic>
-          <chromatic>-7</chromatic>
-        </transpose>
-      </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>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </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>3</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>
-        <transpose>
-          <diatonic>2</diatonic>
-          <chromatic>3</chromatic>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </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>2</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </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>2</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P9">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>2</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-          <octave-change>-1</octave-change>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P10">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P11">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P12">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-        <transpose>
-          <diatonic>0</diatonic>
-          <chromatic>0</chromatic>
-          <octave-change>-1</octave-change>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P13">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>1</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>
-        <transpose>
-          <diatonic>-4</diatonic>
-          <chromatic>-7</chromatic>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P14">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>1</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>
-        <transpose>
-          <diatonic>-4</diatonic>
-          <chromatic>-7</chromatic>
-        </transpose>
-      </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>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P15">
-    <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>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P16">
-    <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>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P17">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P18">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P19">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P20">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P21">
-    <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>
-        <instruments>2</instruments>
-        <clef>
-          <sign>percussion</sign>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <unpitched>
-          <display-step>E</display-step>
-          <display-octave>5</display-octave>
-        </unpitched>
-        <duration>1</duration>
-        <instrument id="P21-M76"/>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P22">
-    <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>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <staff>1</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>2</voice>
-        <type>half</type>
-        <staff>2</staff>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P23">
-    <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>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <staff>1</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>4</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>2</voice>
-        <type>half</type>
-        <staff>2</staff>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P24">
-    <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>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P25">
-    <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>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P26">
-    <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>C</sign>
-          <line>3</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P27">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P28">
-    <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>F</sign>
-          <line>4</line>
-        </clef>
-        <transpose>
-          <diatonic>0</diatonic>
-          <chromatic>0</chromatic>
-          <octave-change>-1</octave-change>
-        </transpose>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <rest/>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <rest/>
-        <duration>2</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/08c-More-than-10-parts-Rosegarden.xml b/input/regression/musicxml/08c-More-than-10-parts-Rosegarden.xml
deleted file mode 100644 (file)
index f1e3c24..0000000
+++ /dev/null
@@ -1,590 +0,0 @@
-<?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">A piece with 
-                            more than 10 parts to check whether the parts 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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </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>
-               </score-part>
-               <score-part id="P16">
-                       <part-name></part-name>
-               </score-part>
-               <score-part id="P17">
-                       <part-name></part-name>
-               </score-part>
-               <score-part id="P18">
-                       <part-name></part-name>
-               </score-part>
-               <score-part id="P19">
-                       <part-name></part-name>
-               </score-part>
-       </part-list>
-       <part id="P0">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P1">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P2">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P3">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P4">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P5">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P6">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P7">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P8">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P9">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P10">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P11">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P12">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P13">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P14">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P15">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P16">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P17">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P18">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-       <part id="P19">
-               <measure number="1">
-                       <attributes>
-                               <divisions>960</divisions>
-                               <time>
-                               <beats>4</beats>
-                               <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                               <sign>G</sign>
-                               <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <rest/>
-                               <duration>3840</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/08d-NestedPartsBrackets-Finale.xml b/input/regression/musicxml/08d-NestedPartsBrackets-Finale.xml
deleted file mode 100644 (file)
index 28ffdb6..0000000
+++ /dev/null
@@ -1,340 +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">Two properly nested part groups: 
-          One group  (with a square bracket) goes from staff 2 to 4) and another 
-          group (with a curly bracket) goes from staff 3 to 4.</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-group number="1" type="start">
-      <group-symbol>line</group-symbol>
-      <group-barline>yes</group-barline>
-    </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>
-      <group-barline>yes</group-barline>
-    </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>
-  <!--=========================================================-->
-  <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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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="P2">
-    <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>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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>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>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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="P4">
-    <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>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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="P5">
-    <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>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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/08e-LinebrokenInstrumentNames-Finale.xml b/input/regression/musicxml/08e-LinebrokenInstrumentNames-Finale.xml
deleted file mode 100644 (file)
index 6050067..0000000
+++ /dev/null
@@ -1,323 +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">Part names and abbreviations can 
-          contain line breaks.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Long&#xd;
-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>
-  <!--=========================================================-->
-  <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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <print new-system="yes"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="14">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="15">
-      <print new-system="yes"/>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="16">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="17">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="18">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="19">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="20">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="21">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="22">
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="23">
-      <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/08f-PianoStaff-PJB.xml b/input/regression/musicxml/08f-PianoStaff-PJB.xml
deleted file mode 100644 (file)
index d68add6..0000000
+++ /dev/null
@@ -1,42 +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>
-               <miscellaneous>
-                       <miscellaneous-field name="description">A simple piano staff</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>384</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <staff>1</staff>
-                       </note>
-                       <backup><duration>384</duration></backup>
-                       <note>
-                               <pitch><step>B</step><octave>2</octave></pitch>
-                               <duration>384</duration>
-                               <voice>2</voice>
-                               <type>whole</type>
-                               <staff>2</staff>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml b/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml
deleted file mode 100644 (file)
index c02d14f..0000000
+++ /dev/null
@@ -1,226 +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">MusicXML allows for overlapping 
-          part-groups, while many applications do not allow overlapping groups, 
-          but require them to be properly nested. In this case, one group 
-          (with a square bracket) goes from staff 2 to 4) and another group 
-          (with a curly bracket) goes from staff 3 to 5.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <part-group number="1" type="start">
-      <group-name>Group 1</group-name>
-      <group-abbreviation>Gr1</group-abbreviation>
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </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>
-      <group-abbreviation>Grp2</group-abbreviation>
-      <group-symbol>bracket</group-symbol>
-      <group-barline>yes</group-barline>
-    </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>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </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 symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P3">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P4">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </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>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/09-Measures.itexi b/input/regression/musicxml/09-Measures.itexi
deleted file mode 100644 (file)
index ed7457d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Measures, Barlines, Repeats
-
diff --git a/input/regression/musicxml/09a-SimpleRepeat-Finale.xml b/input/regression/musicxml/09a-SimpleRepeat-Finale.xml
deleted file mode 100644 (file)
index 074ba1f..0000000
+++ /dev/null
@@ -1,65 +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 simple, repeated measure 
-          (repeated 5 times)</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <repeat direction="backward" times="5"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <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/09b-RepeatWithAlternatives-Finale.xml b/input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml
deleted file mode 100644 (file)
index a29f1c0..0000000
+++ /dev/null
@@ -1,107 +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 simple repeat with two 
-          alternative endings (volta brackets).</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>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <ending number="1" type="start"/>
-      </barline>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="1" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <barline location="left">
-        <ending number="2" type="start"/>
-      </barline>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <ending number="2" type="discontinue"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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/09c-Barlines-Finale.xml b/input/regression/musicxml/09c-Barlines-Finale.xml
deleted file mode 100644 (file)
index 86c9700..0000000
+++ /dev/null
@@ -1,170 +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 types of (non-repeat) 
-          barlines.</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>heavy</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>dashed</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>dotted</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>none</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="13">
-      <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/09d-RepeatMultipleTimes-Finale.xml b/input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml
deleted file mode 100644 (file)
index 8ed24f7..0000000
+++ /dev/null
@@ -1,122 +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">Repeats can also be nested.</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <bar-style>heavy-light</bar-style>
-        <repeat direction="forward"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <repeat direction="backward" times="5"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <repeat direction="backward" times="3"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <print new-system="yes"/>
-      <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/09e-Alternatives-Finale.xml b/input/regression/musicxml/09e-Alternatives-Finale.xml
deleted file mode 100644 (file)
index 2d34453..0000000
+++ /dev/null
@@ -1,178 +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">Nested repeats, each with 
-          alternative endings.</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <ending number="1" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="1" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <barline location="left">
-        <ending number="2" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="2" type="stop"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <barline location="left">
-        <ending number="3" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="3" type="discontinue"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <barline location="left">
-        <ending number="1" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="1" type="stop"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="11">
-      <barline location="left">
-        <ending number="5" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="5" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="12">
-      <print new-system="yes"/>
-      <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/09f-Repeats-Finale.xml b/input/regression/musicxml/09f-Repeats-Finale.xml
deleted file mode 100644 (file)
index 6b58074..0000000
+++ /dev/null
@@ -1,167 +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 more nested repeats with 
-          alternatives. The barline between measure 7 and 8 will probably be 
-          messed up! (Should be a repeat on both sides!)</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <ending number="1" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="1" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <barline location="left">
-        <ending number="2" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="2" type="discontinue"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <barline location="left">
-        <bar-style>heavy-light</bar-style>
-        <repeat direction="forward"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <print new-system="yes"/>
-      <barline location="left">
-        <ending number="1" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="1" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <barline location="left">
-        <bar-style>heavy-light</bar-style>
-        <repeat direction="forward"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <print new-system="yes"/>
-      <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/09g-Endings-Finale.xml b/input/regression/musicxml/09g-Endings-Finale.xml
deleted file mode 100644 (file)
index 9ce37f4..0000000
+++ /dev/null
@@ -1,105 +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 more nested repeats with 
-          alternatives, where the MusicXML file does not make sense in the 
-          first place. How well are applications able to cope with improper 
-          repeats and alternatives?</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>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <ending number="1, 2, 3" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="1, 2, 3" type="stop"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <barline location="left">
-        <ending number="2" type="start"/>
-      </barline>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <ending number="2" type="discontinue"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-        <ending number="2" type="stop"/>
-        <repeat direction="backward"/>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <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/09h-RepeatsNoEndBar-Finale.xml b/input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml
deleted file mode 100644 (file)
index db3cac5..0000000
+++ /dev/null
@@ -1,73 +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 forward-repeating bar line 
-          without an ending repeat bar.</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>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <barline location="left">
-        <bar-style>heavy-light</bar-style>
-        <repeat direction="forward"/>
-      </barline>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <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/09i-MidmeasureBarline.xml b/input/regression/musicxml/09i-MidmeasureBarline.xml
deleted file mode 100644 (file)
index 9323ae4..0000000
+++ /dev/null
@@ -1,73 +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">Barlines can appear at 
-            mid-measure positions, without using an implicit 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 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>
-            <barline location="middle">
-                <bar-style>dotted</bar-style>
-            </barline>
-            <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>
-        </measure>
-        <!--=======================================================-->
-    </part>
-    <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/09j-Midmeasure-Clef-Finale.xml b/input/regression/musicxml/09j-Midmeasure-Clef-Finale.xml
deleted file mode 100644 (file)
index bd8cea4..0000000
+++ /dev/null
@@ -1,107 +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 clef change in the middle of a 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>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <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>
-      </note>
-      <barline location="right">
-        <bar-style>none</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure implicit="yes" number="X1">
-      <attributes>
-        <clef>
-          <sign>C</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <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>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml b/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml
deleted file mode 100644 (file)
index 5fbd00a..0000000
+++ /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">A 3/8 pickup measure, a measure 
-          that is split into one (incomplete, only 2/4) measure and an implicit 
-          measure, and an incomplete measure (containg 3/4).</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 implicit="yes" number="0">
-      <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>E</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>2</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-      </note>
-      <note>
-          <pitch>
-              <step>E</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>eighth</type>
-          <stem>up</stem>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="1">
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <barline location="right">
-        <bar-style>none</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure implicit="yes" number="X1">
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</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>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-      </note>
-      <note>
-        <rest/>
-        <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/09l-PickupMeasure-SecondVoiceMessup.xml b/input/regression/musicxml/09l-PickupMeasure-SecondVoiceMessup.xml
deleted file mode 100644 (file)
index 8f2bdbc..0000000
+++ /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/09m-MultiVoice-MidMeasureClefChange-Finale.xml b/input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml
deleted file mode 100644 (file)
index 65279c4..0000000
+++ /dev/null
@@ -1,426 +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 multi-voice / multi-staff part 
-          with a clef change in the middle of a measure and a &lt;backward&gt; 
-          for voice 2 jumping back beyond that clef change.</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="84">
-      <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>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">begin</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">continue</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <attributes>
-        <clef number="1">
-          <sign>F</sign>
-          <line>4</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <backup>
-        <duration>1008</duration>
-      </backup>
-      <note>
-        <rest/>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">begin</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">end</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">begin</beam>
-        <notations>
-          <slur number="1" placement="below" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</octave>
-        </pitch>
-        <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>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <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>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>2</octave>
-        </pitch>
-        <duration>84</duration>
-        <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>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>2</octave>
-        </pitch>
-        <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>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-light</bar-style>
-      </barline>
-    </measure>
-    <!--=======================================================-->
-    <measure number="85">
-      <attributes>
-        <clef number="1">
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <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">
-            <fp/>
-          </dynamics>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">continue</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <notations>
-          <slur number="1" placement="above" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-      </note>
-      <backup>
-        <duration>1008</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>336</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <staff>2</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>336</duration>
-        <voice>3</voice>
-        <type>quarter</type>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>168</duration>
-        <voice>3</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <notations>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/10-Multiple-Voices.itexi b/input/regression/musicxml/10-Multiple-Voices.itexi
deleted file mode 100644 (file)
index a4aac9c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Multiple voices per staff
-
diff --git a/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml b/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml
deleted file mode 100644 (file)
index 00922bc..0000000
+++ /dev/null
@@ -1,286 +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">Two voices share one staff. Each 
-        voice is assigned some lyrics.</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>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>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>16</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>up</stem>
-        <notations>
-          <articulations>
-            <accent placement="below"/>
-          </articulations>
-          <fermata type="upright"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>This</text>
-        </lyric>
-      </note>
-      <direction placement="below">
-        <direction-type>
-          <dynamics default-y="-80">
-            <mf/>
-          </dynamics>
-        </direction-type>
-        <offset>-3</offset>
-        <sound dynamics="83"/>
-      </direction>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>is</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>the</text>
-        </lyric>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>16</duration>
-        <voice>2</voice>
-        <type>half</type>
-        <stem>down</stem>
-        <notations>
-          <articulations>
-            <accent placement="below"/>
-          </articulations>
-          <fermata type="upright"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>This</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>is</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>the</text>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest>
-          <display-step>A</display-step>
-          <display-octave>5</display-octave>
-        </rest>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>lyrics</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <stem>up</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>of</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>Voice1</text>
-        </lyric>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </backup>
-      <note>
-        <rest>
-          <display-step>C</display-step>
-          <display-octave>4</display-octave>
-        </rest>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>lyrics</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <dot/>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="start"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>of</text>
-        </lyric>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <notations>
-          <slur number="1" type="stop"/>
-        </notations>
-        <lyric number="1">
-          <syllabic>single</syllabic>
-          <text>Voice1</text>
-        </lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
index 2f59dccaea635330e12c1a100211e3616cfc3a73..06d868461deb167d6d74ea58ced3548725c0abc2 100644 (file)
@@ -1,2 +1 @@
-@section Time signatures
-
+@unnumberedsec 11 ... Time signatures
diff --git a/input/regression/musicxml/11a-TimeSignatures-CompoundSimple.xml b/input/regression/musicxml/11a-TimeSignatures-CompoundSimple.xml
deleted file mode 100644 (file)
index 576ad4e..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Compound time signatures with 
-          same denominator: (3+2)/8 and (5+3+1)/4.</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>
-          <beats>3+2</beats>
-          <beat-type>8</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <attributes>
-        <time>
-          <beats>5+3+1</beats>
-          <beat-type>4</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <tie/>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>6</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</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/11a-TimeSignatures.xml b/input/regression/musicxml/11a-TimeSignatures.xml
new file mode 100644 (file)
index 0000000..8d25e39
--- /dev/null
@@ -0,0 +1,236 @@
+<?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">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">
+
+    <measure number="1">
+      <attributes>
+        <divisions>2</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time  symbol="common">
+          <beats>2</beats>
+          <beat-type>2</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <measure number="2">
+      <attributes>
+        <time  symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <measure number="3">
+      <attributes>
+        <time >
+          <beats>2</beats>
+          <beat-type>2</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <measure number="4">
+      <attributes>
+        <time >
+          <beats>3</beats>
+          <beat-type>2</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <dot/>
+      </note>
+    </measure>
+    <measure number="5">
+      <attributes>
+        <time >
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="6">
+      <attributes>
+        <time>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+    </measure>
+    <measure number="7">
+      <attributes>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <measure number="8">
+      <attributes>
+        <time>
+          <beats>5</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <tie type="start"/>
+        <voice>1</voice>
+        <type>whole</type>
+        <notations><tied type="start"/></notations>
+      </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>
+    </measure>
+    <measure number="9">
+      <attributes>
+        <time>
+          <beats>3</beats>
+          <beat-type>8</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>3</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+      </note>
+    </measure>
+    <measure number="10">
+      <attributes>
+        <time >
+          <beats>6</beats>
+          <beat-type>8</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+    </measure>
+    <measure number="11">
+      <attributes>
+        <time >
+          <beats>12</beats>
+          <beat-type>8</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <dot/>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/11b-TimeSignatures-CompoundMultiple.xml b/input/regression/musicxml/11b-TimeSignatures-CompoundMultiple.xml
deleted file mode 100644 (file)
index 37a5fa3..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Compound time signatures with 
-          separate fractions displayed: 3/8+2/8+3/4 and 5/2+1/8.</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>
-          <beats>3</beats>
-          <beat-type>8</beat-type>
-          <beats>2</beats>
-          <beat-type>8</beat-type>
-          <beats>3</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <attributes>
-        <time>
-          <beats>5</beats>
-          <beat-type>2</beat-type>
-          <beats>1</beats>
-          <beat-type>8</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>16</duration>
-        <voice>1</voice>
-        <type>breve</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/11b-TimeSignatures-NoTime.xml b/input/regression/musicxml/11b-TimeSignatures-NoTime.xml
new file mode 100644 (file)
index 0000000..a70af96
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<!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">A score without 
+                            a time signature (but with a key and clefs)</miscellaneous-field>
+               </miscellaneous>
+       </identification>
+       <part-list>
+               <score-part id="P1">
+                       <part-name></part-name>
+               </score-part>
+       </part-list>
+       <part id="P1">
+               <measure number="1">
+                       <attributes>
+                               <divisions>1</divisions>
+                               <key><fifths>0</fifths></key>
+                               <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>4</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                               <staff>1</staff>
+                       </note>
+                       <backup><duration>384</duration></backup>
+                       <note>
+                               <pitch><step>B</step><octave>2</octave></pitch>
+                               <duration>4</duration>
+                               <voice>2</voice>
+                               <type>whole</type>
+                               <staff>2</staff>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/11c-TimeSignatures-CompoundMixed.xml b/input/regression/musicxml/11c-TimeSignatures-CompoundMixed.xml
deleted file mode 100644 (file)
index 8d8cf5f..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Compound time signatures of
-          mixed type: (3+2)/8+3/4.</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>
-          <beats>3+2</beats>
-          <beat-type>8</beat-type>
-          <beats>3</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</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/11c-TimeSignatures-CompoundSimple.xml b/input/regression/musicxml/11c-TimeSignatures-CompoundSimple.xml
new file mode 100644 (file)
index 0000000..576ad4e
--- /dev/null
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Compound time signatures with 
+          same denominator: (3+2)/8 and (5+3+1)/4.</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>
+          <beats>3+2</beats>
+          <beat-type>8</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <attributes>
+        <time>
+          <beats>5+3+1</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <tie/>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</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/11d-TimeSignatures-CompoundMultiple.xml b/input/regression/musicxml/11d-TimeSignatures-CompoundMultiple.xml
new file mode 100644 (file)
index 0000000..37a5fa3
--- /dev/null
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Compound time signatures with 
+          separate fractions displayed: 3/8+2/8+3/4 and 5/2+1/8.</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>
+          <beats>3</beats>
+          <beat-type>8</beat-type>
+          <beats>2</beats>
+          <beat-type>8</beat-type>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <attributes>
+        <time>
+          <beats>5</beats>
+          <beat-type>2</beat-type>
+          <beats>1</beats>
+          <beat-type>8</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>16</duration>
+        <voice>1</voice>
+        <type>breve</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/11d-TimeSignatures-SingleNumber.xml b/input/regression/musicxml/11d-TimeSignatures-SingleNumber.xml
deleted file mode 100644 (file)
index 510b669..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Time signature displayed as a
-          single number.</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="single-number">
-          <beats>3</beats>
-          <beat-type>8</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/11e-TimeSignatures-CompoundMixed.xml b/input/regression/musicxml/11e-TimeSignatures-CompoundMixed.xml
new file mode 100644 (file)
index 0000000..8d8cf5f
--- /dev/null
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Compound time signatures of
+          mixed type: (3+2)/8+3/4.</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>
+          <beats>3+2</beats>
+          <beat-type>8</beat-type>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</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/11e-TimeSignatures-SenzaMisura.xml b/input/regression/musicxml/11e-TimeSignatures-SenzaMisura.xml
deleted file mode 100644 (file)
index 32b3729..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Senza-misura time signature</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>
-          <senza-misura/>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <beam number="1">end</beam>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/11g-TimeSignatures-SingleNumber.xml b/input/regression/musicxml/11g-TimeSignatures-SingleNumber.xml
new file mode 100644 (file)
index 0000000..510b669
--- /dev/null
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Time signature displayed as a
+          single number.</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="single-number">
+          <beats>3</beats>
+          <beat-type>8</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/11h-TimeSignatures-SenzaMisura.xml b/input/regression/musicxml/11h-TimeSignatures-SenzaMisura.xml
new file mode 100644 (file)
index 0000000..32b3729
--- /dev/null
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Senza-misura time signature</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>
+          <senza-misura/>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/12-Clefs.itexi b/input/regression/musicxml/12-Clefs.itexi
new file mode 100644 (file)
index 0000000..2adf8b5
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 12 ... Clefs
diff --git a/input/regression/musicxml/12-Tuplets.itexi b/input/regression/musicxml/12-Tuplets.itexi
deleted file mode 100644 (file)
index 372e3cd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Triplets, Tuplets
-
diff --git a/input/regression/musicxml/12a-Clefs.xml b/input/regression/musicxml/12a-Clefs.xml
new file mode 100644 (file)
index 0000000..c0b5017
--- /dev/null
@@ -0,0 +1,370 @@
+<?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">Various clefs: G, C, F, percussion, 
+          TAB and none; some are also possible with octavation and  on other 
+          staff lines than their default (e.g. soprano/alto/tenor/bariton C 
+          clefs); Each measure shows a different clef (measure 17 has the "none" 
+          clef), only measure 18 has the same treble clef as measure 
+          1.</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>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>3</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <attributes>
+        <clef>
+          <sign>percussion</sign>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+          <clef-octave-change>-1</clef-octave-change>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          <clef-octave-change>-1</clef-octave-change>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>3</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <print new-system="yes"/>
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>1</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>5</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>1</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <attributes>
+        <clef>
+          <sign>percussion</sign>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="14">
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+          <clef-octave-change>1</clef-octave-change>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          <clef-octave-change>1</clef-octave-change>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="16">
+      <attributes>
+        <clef>
+          <sign>TAB</sign>
+          <line>5</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
+      <print new-system="yes"/>
+      <attributes>
+        <clef>
+          <sign>none</sign>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="18">
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <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/12a-TripletsDuration-NoBracket-PJB.xml b/input/regression/musicxml/12a-TripletsDuration-NoBracket-PJB.xml
deleted file mode 100644 (file)
index 23c2aa2..0000000
+++ /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/12b-Clefs-NoKeyOrClef.xml b/input/regression/musicxml/12b-Clefs-NoKeyOrClef.xml
new file mode 100644 (file)
index 0000000..9ba15fd
--- /dev/null
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!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">A score without 
+                            any key or clef defined. The default (4/4 in treble 
+                            clef) should be used.</miscellaneous-field>
+               </miscellaneous>
+       </identification>
+       <part-list>
+               <score-part id="P0">
+                       <part-name></part-name>
+               </score-part>
+       </part-list>
+       <part id="P0">
+               <measure number="1">
+                       <attributes>
+                               <divisions>1</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                       </attributes>
+                       <note>
+                               <pitch>
+                                       <step>C</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>4</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+               <measure number="2">
+                       <note>
+                               <pitch>
+                                       <step>C</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>4</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/12b-Tuplets-Finale.xml b/input/regression/musicxml/12b-Tuplets-Finale.xml
deleted file mode 100644 (file)
index 47f36b1..0000000
+++ /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/12c-Tuplet-Styles.xml b/input/regression/musicxml/12c-Tuplet-Styles.xml
deleted file mode 100644 (file)
index 6b55d4d..0000000
+++ /dev/null
@@ -1,1033 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Different tuplet styles:
-          default, none, x:y, x:y-note; Each with bracket, slur and none.
-          Finally, non-standard 4:3 and 17:2 tuplets are given.</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">
-    <measure number="1">
-      <attributes>
-        <divisions>408</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>5</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>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" number="1" show-number="none" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" number="1" show-number="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" number="1" show-number="both" show-type="actual" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" number="1" show-number="both" show-type="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" line-shape="curved" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" line-shape="curved" number="1" show-number="none" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="actual" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="no" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="no" number="1" show-number="none" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="no" number="1" show-number="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="no" number="1" show-number="both" show-type="actual" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="no" number="1" show-number="both" show-type="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <print new-system="yes">
-        <system-layout>
-          <system-distance>114</system-distance>
-        </system-layout>
-      </print>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>153</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" placement="below" show-number="both" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>153</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>153</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>153</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>4</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>17</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" placement="below" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</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>eighth</type>
-        <time-modification>
-          <actual-notes>17</actual-notes>
-          <normal-notes>3</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>204</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>204</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/12d-Tremolo-Tuplets.xml b/input/regression/musicxml/12d-Tremolo-Tuplets.xml
deleted file mode 100644 (file)
index eee4d0f..0000000
+++ /dev/null
@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Tremolo tuplets are tuplets on 
-          single notes with a tremolo ornament. The application shall correctly
-          import these notes with 2/3 or their time...</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">
-    <measure number="1">
-      <attributes>
-        <divisions>36</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <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>12</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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 number="1" type="stop"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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 number="1" type="stop"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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 number="1" type="stop"/>
-          <articulations>
-            <staccato placement="below"/>
-          </articulations>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>72</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>4</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>12</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 number="1" type="stop"/>
-        </notations>
-      </note>
-      <direction placement="below">
-        <direction-type>
-          <dynamics>
-            <fp/>
-          </dynamics>
-        </direction-type>
-      </direction>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>72</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>4</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>72</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>6</actual-notes>
-          <normal-notes>4</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>36</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>eighth</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="start"/>
-          <tuplet number="1" type="stop"/>
-          <ornaments>
-            <tremolo>1</tremolo>
-          </ornaments>
-        </notations>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/12e-Nested-Tuplets.xml b/input/regression/musicxml/12e-Nested-Tuplets.xml
deleted file mode 100644 (file)
index b85c029..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Tuplets can be nested. Here 
-          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written
-          eighth notes).</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <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>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>30</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time>
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>10</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>quarter</normal-type>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>10</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>quarter</normal-type>
-        </time-modification>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>15</actual-notes>
-          <normal-notes>4</normal-notes>
-        </time-modification>
-        <beam number="1">begin</beam>
-        <notations>
-          <tuplet bracket="yes" number="2" placement="below" type="start">
-            <tuplet-actual>
-              <tuplet-number>5</tuplet-number>
-              <tuplet-type>eighth</tuplet-type>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-number>2</tuplet-number>
-              <tuplet-type>eighth</tuplet-type>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>15</actual-notes>
-          <normal-notes>4</normal-notes>
-        </time-modification>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>15</actual-notes>
-          <normal-notes>4</normal-notes>
-        </time-modification>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>15</actual-notes>
-          <normal-notes>4</normal-notes>
-        </time-modification>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>15</actual-notes>
-          <normal-notes>4</normal-notes>
-        </time-modification>
-        <beam number="1">end</beam>
-        <notations>
-          <tuplet number="2" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>10</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>quarter</normal-type>
-        </time-modification>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>10</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>quarter</normal-type>
-        </time-modification>
-        <beam number="1">end</beam>
-        <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/12f-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml
deleted file mode 100644 (file)
index a0810b4..0000000
+++ /dev/null
@@ -1,615 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Displaying tuplet note types,
-          that might not coincide with the displayed note. The first two tuplets 
-          take the type from the note, the second two from the 
-          &lt;time-modification> element, the remaining pair of tuplets from the 
-          &lt;tuplet> notation element. The tuplets in measure 3 specify both 
-          a number of notes and a type inside the &lt;tuplet-actual> and 
-          &lt;tuplet-normal> elements, the ones in measure 4 specify only a 
-          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>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name print-object="no">MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>408</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>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-number>7</tuplet-number>
-              <tuplet-type>quarter</tuplet-type>
-              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-number>5</tuplet-number>
-              <tuplet-type>quarter</tuplet-type>
-              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-number>7</tuplet-number>
-              <tuplet-type>half</tuplet-type>
-              <tuplet-dot/>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-number>5</tuplet-number>
-              <tuplet-type>16th</tuplet-type>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-type>quarter</tuplet-type>
-              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-type>quarter</tuplet-type>
-              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-type>half</tuplet-type>
-              <tuplet-dot/>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-type>16th</tuplet-type>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-          <normal-type>breve</normal-type>
-          <normal-dot/>
-          <normal-dot/>
-        </time-modification>
-        <notations>
-          <tuplet number="1" type="stop"/>
-        </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-type="actual" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-number>7</tuplet-number>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-number>5</tuplet-number>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>136</duration>
-        <voice>1</voice>
-        <type>eighth</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>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-        <notations>
-          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
-            <tuplet-actual>
-              <tuplet-number>7</tuplet-number>
-              <tuplet-dot/>
-            </tuplet-actual>
-            <tuplet-normal>
-              <tuplet-number>5</tuplet-number>
-            </tuplet-normal>
-          </tuplet>
-        </notations>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</actual-notes>
-          <normal-notes>2</normal-notes>
-        </time-modification>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>408</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <dot/>
-        <time-modification>
-          <actual-notes>3</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/13-Grace-Notes.itexi b/input/regression/musicxml/13-Grace-Notes.itexi
deleted file mode 100644 (file)
index fd3636a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Grace notes
-
diff --git a/input/regression/musicxml/13-KeySignatures.itexi b/input/regression/musicxml/13-KeySignatures.itexi
new file mode 100644 (file)
index 0000000..944ac6e
--- /dev/null
@@ -0,0 +1,2 @@
+@unnumberedsec 13 ... Key signatures
+
diff --git a/input/regression/musicxml/13a-GraceNotes-Finale.xml b/input/regression/musicxml/13a-GraceNotes-Finale.xml
deleted file mode 100644 (file)
index f54a26e..0000000
+++ /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/13a-KeySignatures.xml b/input/regression/musicxml/13a-KeySignatures.xml
new file mode 100644 (file)
index 0000000..b8c0fb7
--- /dev/null
@@ -0,0 +1,815 @@
+<?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 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">
+
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-11</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="2">
+      <attributes>
+        <key>
+          <fifths>-11</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="3">
+      <attributes>
+        <key>
+          <fifths>-10</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="4">
+      <attributes>
+        <key>
+          <fifths>-10</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="5">
+      <attributes>
+        <key>
+          <fifths>-9</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="6">
+      <attributes>
+        <key>
+          <fifths>-9</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="7">
+      <attributes>
+        <key>
+          <fifths>-8</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="8">
+      <attributes>
+        <key>
+          <fifths>-8</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="9">
+      <attributes>
+        <key>
+          <fifths>-7</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="10">
+      <attributes>
+        <key>
+          <fifths>-7</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="11">
+      <attributes>
+        <key>
+          <fifths>-6</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="12">
+      <attributes>
+        <key>
+          <fifths>-6</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="13">
+      <attributes>
+        <key>
+          <fifths>-5</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="14">
+      <attributes>
+        <key>
+          <fifths>-5</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="15">
+      <attributes>
+        <key>
+          <fifths>-4</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="16">
+      <attributes>
+        <key>
+          <fifths>-4</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="17">
+      <attributes>
+        <key>
+          <fifths>-3</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="18">
+      <attributes>
+        <key>
+          <fifths>-3</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="19">
+      <attributes>
+        <key>
+          <fifths>-2</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="20">
+      <attributes>
+        <key>
+          <fifths>-2</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="21">
+      <attributes>
+        <key>
+          <fifths>-1</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="22">
+      <attributes>
+        <key>
+          <fifths>-1</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="23">
+      <attributes>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="24">
+      <attributes>
+        <key>
+          <fifths>0</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="25">
+      <attributes>
+        <key>
+          <fifths>1</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="26">
+      <attributes>
+        <key>
+          <fifths>1</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="27">
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="28">
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="29">
+      <attributes>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="30">
+      <attributes>
+        <key>
+          <fifths>3</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="31">
+      <attributes>
+        <key>
+          <fifths>4</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="32">
+      <attributes>
+        <key>
+          <fifths>4</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="33">
+      <attributes>
+        <key>
+          <fifths>5</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="34">
+      <attributes>
+        <key>
+          <fifths>5</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="35">
+      <attributes>
+        <key>
+          <fifths>6</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="36">
+      <attributes>
+        <key>
+          <fifths>6</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="37">
+      <attributes>
+        <key>
+          <fifths>7</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="38">
+      <attributes>
+        <key>
+          <fifths>7</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="39">
+      <attributes>
+        <key>
+          <fifths>8</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="40">
+      <attributes>
+        <key>
+          <fifths>8</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="41">
+      <attributes>
+        <key>
+          <fifths>9</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="42">
+      <attributes>
+        <key>
+          <fifths>9</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="43">
+      <attributes>
+        <key>
+          <fifths>10</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="44">
+      <attributes>
+        <key>
+          <fifths>10</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="45">
+      <attributes>
+        <key>
+          <fifths>11</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="46">
+      <attributes>
+        <key>
+          <fifths>11</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</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/13b-ChordAsGraceNote-Finale.xml b/input/regression/musicxml/13b-ChordAsGraceNote-Finale.xml
deleted file mode 100644 (file)
index 688f43c..0000000
+++ /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/13b-KeySignatures-ChurchModes.xml b/input/regression/musicxml/13b-KeySignatures-ChurchModes.xml
new file mode 100644 (file)
index 0000000..63bac0b
--- /dev/null
@@ -0,0 +1,180 @@
+<?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 different modes: major, 
+        minor, ionian, dorian, phrygian, lydian, mixolydian, aeolian, and 
+        locrian; All modes are given with 2 sharps.</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>2</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"><text>major</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>minor</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>ionian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>ionian</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>dorian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>dorian</text></lyric>
+      </note>
+    </measure>
+    <measure number="2">
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>phrygian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>phrygian</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>lydian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>lydian</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>mixolydian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>mixolydian</text></lyric>
+      </note>
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>aeolian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>aeolian</text></lyric>
+      </note>
+    </measure>
+    <measure number="3">
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>locrian</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>locrian</text></lyric>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
+
diff --git a/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml b/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml
deleted file mode 100644 (file)
index 4138aa0..0000000
+++ /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/13c-KeySignatures-NonTraditional.xml b/input/regression/musicxml/13c-KeySignatures-NonTraditional.xml
new file mode 100644 (file)
index 0000000..bb3cc6e
--- /dev/null
@@ -0,0 +1,86 @@
+<?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">Non-traditional key signatures,
+          where each alteration is separately given. Here we have (f sharp, 
+          a flat, b flat) and (c flatflat, g sharp sharp, d flat, b sharp, f 
+          natural), where in the second case an explicit octave is given for 
+          each alteration.</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>
+          <key-step>3</key-step>
+          <key-alter>1</key-alter>
+          <key-step>5</key-step>
+          <key-alter>-1</key-alter>
+          <key-step>6</key-step>
+          <key-alter>-1</key-alter>
+        </key>
+        <time>
+          <beats>2</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>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+    </measure>
+    <measure number="2">
+      <attributes>
+        <key>
+          <key-step>0</key-step>
+          <key-alter>-2</key-alter>
+          <key-step>4</key-step>
+          <key-alter>2</key-alter>
+          <key-step>1</key-step>
+          <key-alter>-1</key-alter>
+          <key-step>6</key-step>
+          <key-alter>1</key-alter>
+          <key-step>5</key-step>
+          <key-alter>0</key-alter>
+          <key-octave number="1">2</key-octave>
+          <key-octave number="2">3</key-octave>
+          <key-octave number="3">4</key-octave>
+          <key-octave number="4">5</key-octave>
+          <key-octave number="5">6</key-octave>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</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/13d-AfterGrace.xml b/input/regression/musicxml/13d-AfterGrace.xml
deleted file mode 100644 (file)
index 60f568d..0000000
+++ /dev/null
@@ -1,124 +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 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>
-  <!--=========================================================-->
-  <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>
-        <grace steal-time-previous="20"/>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <grace steal-time-next="20"/>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <grace/>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <voice>1</voice>
-        <type>16th</type>
-        <stem>up</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/13d-KeySignatures-Microtones.xml b/input/regression/musicxml/13d-KeySignatures-Microtones.xml
new file mode 100644 (file)
index 0000000..0819bcf
--- /dev/null
@@ -0,0 +1,63 @@
+<?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">Non-traditional key signatures
+          with microtone alterations: (g flat-and-a-half,
+          a flat, b half-flat, c natural, d half-sharp, e sharp, f 
+          sharp-and-a-half).</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>
+          <key-step>4</key-step>
+          <key-alter>-1.5</key-alter>
+          <key-step>5</key-step>
+          <key-alter>-1</key-alter>
+          <key-step>6</key-step>
+          <key-alter>-0.5</key-alter>
+          <key-step>0</key-step>
+          <key-alter>0</key-alter>
+          <key-step>1</key-step>
+          <key-alter>0.5</key-alter>
+          <key-step>2</key-step>
+          <key-alter>1</key-alter>
+          <key-step>3</key-step>
+          <key-alter>1.5</key-alter>
+        </key>
+        <time>
+          <beats>2</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>2</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/14-Multi-Staff-Parts.itexi b/input/regression/musicxml/14-Multi-Staff-Parts.itexi
deleted file mode 100644 (file)
index 3e3d4c9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section One voice on multiple staves
-
diff --git a/input/regression/musicxml/14a-MultistaffClefDynamics-Finale.xml b/input/regression/musicxml/14a-MultistaffClefDynamics-Finale.xml
deleted file mode 100644 (file)
index e6c3f1a..0000000
+++ /dev/null
@@ -1,413 +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 piano staff with dynamics and 
-          clef changes, that apply 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>
-  <!--=========================================================-->
-  <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>
-        <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"/>
-      <direction placement="below">
-        <direction-type>
-          <dynamics default-y="-62" relative-x="-6">
-            <ffff/>
-          </dynamics>
-        </direction-type>
-        <staff>1</staff>
-        <sound dynamics="141"/>
-      </direction>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <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">
-            <p/>
-          </dynamics>
-        </direction-type>
-        <offset>1</offset>
-        <staff>1</staff>
-        <sound dynamics="54"/>
-      </direction>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </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"/>
-        </direction-type>
-        <offset>1</offset>
-        <staff>2</staff>
-      </direction>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</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>
-        </pitch>
-        <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>
-        <pitch>
-          <step>C</step>
-          <octave>3</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>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>2</staff>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <attributes>
-        <key>
-          <fifths>2</fifths>
-          <mode>major</mode>
-        </key>
-        <clef number="2">
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>3</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>
-        </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>
-        </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>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <attributes>
-        <clef number="1">
-          <sign>C</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>2</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>
-        </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>
-        </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>
-        </pitch>
-        <duration>8</duration>
-        <voice>2</voice>
-        <type>quarter</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>1</voice>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>32</duration>
-      </backup>
-      <note>
-        <rest/>
-        <duration>32</duration>
-        <voice>2</voice>
-        <staff>2</staff>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/14b-DifferentKeys-PJB.xml b/input/regression/musicxml/14b-DifferentKeys-PJB.xml
deleted file mode 100644 (file)
index 03a84a9..0000000
+++ /dev/null
@@ -1,46 +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>
-               <miscellaneous>
-                       <miscellaneous-field name="description">A piano staff 
-                            with different keys and clefs for each of its 
-                            staves. The keys and clefs for both staves are given 
-                            at the very beginning 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="1">
-                       <attributes>
-                               <divisions>96</divisions>
-                               <key number="1"><fifths>0</fifths></key>
-                               <key number="2"><fifths>2</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>384</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <staff>1</staff>
-                       </note>
-                       <backup><duration>384</duration></backup>
-                       <note>
-                               <pitch><step>B</step><octave>2</octave></pitch>
-                               <duration>384</duration>
-                               <voice>2</voice>
-                               <type>whole</type>
-                               <staff>2</staff>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/14b-DifferentKeysAfterBackup-PJB.xml b/input/regression/musicxml/14b-DifferentKeysAfterBackup-PJB.xml
deleted file mode 100644 (file)
index 7a20cad..0000000
+++ /dev/null
@@ -1,50 +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>
-               <miscellaneous>
-                       <miscellaneous-field name="description">A piano staff 
-                            with different keys and clefs for each of its 
-                            staves. The key and clef for the second staff is 
-                            given only after a backward, just before the first
-                            note of the second staff is given, but after the 
-                            whole measure for staff 1 has been 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 number="1"><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>
-                       </attributes>
-                       <note>
-                               <pitch><step>F</step><octave>4</octave></pitch>
-                               <duration>384</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <staff>1</staff>
-                       </note>
-                       <backup><duration>384</duration></backup>
-                       <attributes>
-                               <key number="2"><fifths>2</fifths></key>
-                               <clef number="2"><sign>F</sign><line>4</line></clef>
-                       </attributes>
-                       <note>
-                               <pitch><step>B</step><octave>2</octave></pitch>
-                               <duration>384</duration>
-                               <voice>2</voice>
-                               <type>whole</type>
-                               <staff>2</staff>
-                       </note>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/14c-StaffChange-Finale.xml b/input/regression/musicxml/14c-StaffChange-Finale.xml
deleted file mode 100644 (file)
index dab5d7e..0000000
+++ /dev/null
@@ -1,359 +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">Staff changes in a piano staff. 
-          The voice from the second staff has some notes/chords on the first 
-          staff. The final two chords have some notes on the first, some on 
-          the second staff.</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>2</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>
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>8</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>1</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>down</stem>
-        <staff>2</staff>
-        <beam number="1">end</beam>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <rest/>
-        <duration>8</duration>
-        <voice>1</voice>
-        <staff>1</staff>
-      </note>
-      <backup>
-        <duration>8</duration>
-      </backup>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">begin</beam>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">continue</beam>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>3</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>2</staff>
-        <beam number="1">end</beam>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>E</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <chord/>
-        <pitch>
-          <step>G</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>2</voice>
-        <type>eighth</type>
-        <stem>up</stem>
-        <staff>1</staff>
-      </note>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>2</voice>
-        <type>half</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/15-Percussion.itexi b/input/regression/musicxml/15-Percussion.itexi
deleted file mode 100644 (file)
index a1af182..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Percussion
-
diff --git a/input/regression/musicxml/15a-Percussion-Finale.xml b/input/regression/musicxml/15a-Percussion-Finale.xml
deleted file mode 100644 (file)
index e108cf5..0000000
+++ /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/16-TransposingInstruments.itexi b/input/regression/musicxml/16-TransposingInstruments.itexi
deleted file mode 100644 (file)
index 1bdbb55..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Transposing instruments
-
diff --git a/input/regression/musicxml/16a-TransposingInstruments.xml b/input/regression/musicxml/16a-TransposingInstruments.xml
deleted file mode 100644 (file)
index bbd3ef8..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Transposing instruments: Trumpet 
-          in Bb, Horn in Eb, Piano; All of them show the C major scale (the 
-          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Trumpet in Bb</part-name>
-      <part-abbreviation>Bb Tpt.</part-abbreviation>
-    </score-part>
-    <score-part id="P2">
-      <part-name>Horn in Eb</part-name>
-      <part-abbreviation>Hn.</part-abbreviation>
-    </score-part>
-    <score-part id="P3">
-      <part-name>Piano</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>2</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</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>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <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>
-      </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>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</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>
-  <!--=========================================================-->
-  <part id="P2">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>3</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>
-        <transpose>
-          <diatonic>-5</diatonic>
-          <chromatic>-9</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>C</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <note>
-        <pitch>
-          <step>E</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>G</step>
-          <alter>1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>A</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>
-  <!--=========================================================-->
-  <part id="P3">
-    <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>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>4</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>
-      </note>
-      <note>
-        <pitch>
-          <step>F</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </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>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-      <note>
-        <pitch>
-          <step>B</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>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/16b-TransposingInstruments-Full.xml b/input/regression/musicxml/16b-TransposingInstruments-Full.xml
deleted file mode 100644 (file)
index 6a090be..0000000
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">Various transposition. Each
-          part plays a c'', just displayed in different display pitches.
-          The second-to-last staff uses a transposition where the displayed c'
-          is an actual f''' concert pitch. The final staff is an untransposed
-          instrument.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Clarinet in Eb</part-name>
-      <part-abbreviation>Eb Cl.</part-abbreviation>
-    </score-part>
-    <score-part id="P2">
-      <part-name>Clarinet in Bb</part-name>
-      <part-abbreviation>Bb Cl.</part-abbreviation>
-    </score-part>
-    <score-part id="P3">
-      <part-name>Clarinet in A</part-name>
-      <part-abbreviation>A Cl.</part-abbreviation>
-    </score-part>
-    <score-part id="P4">
-      <part-name>Horn in F</part-name>
-      <part-abbreviation>Hn.</part-abbreviation>
-    </score-part>
-    <score-part id="P5">
-      <part-name>Horn in Eb</part-name>
-      <part-abbreviation>Hn.</part-abbreviation>
-    </score-part>
-    <score-part id="P6">
-      <part-name>Piccolo Trumpet in A</part-name>
-      <part-abbreviation>Picc.Tpt.</part-abbreviation>
-    </score-part>
-    <score-part id="P7">
-      <part-name>Trumpet in Bb</part-name>
-      <part-abbreviation>Bb Tpt.</part-abbreviation>
-    </score-part>
-    <score-part id="P8">
-      <part-name>Trumpet in C</part-name>
-      <part-abbreviation>C Tpt.</part-abbreviation>
-    </score-part>
-    <score-part id="P9">
-      <part-name>Trumpet in D</part-name>
-      <part-abbreviation>D Tpt.</part-abbreviation>
-    </score-part>
-    <score-part id="P10">
-      <part-name>displayed c'=fis'''</part-name>
-    </score-part>
-    <score-part id="P11">
-      <part-name print-object="no">MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>4</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>
-        <transpose>
-          <diatonic>2</diatonic>
-          <chromatic>3</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</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>3</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <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>
-        <key>
-          <fifths>-2</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>
-        <transpose>
-          <diatonic>-2</diatonic>
-          <chromatic>-3</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P4">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>2</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>
-        <transpose>
-          <diatonic>-4</diatonic>
-          <chromatic>-7</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>G</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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>4</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>
-        <transpose>
-          <diatonic>-5</diatonic>
-          <chromatic>-9</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>A</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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>-2</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>
-        <transpose>
-          <diatonic>5</diatonic>
-          <chromatic>9</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>E</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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>3</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>
-        <transpose>
-          <diatonic>-1</diatonic>
-          <chromatic>-2</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>D</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </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>1</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>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P9">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>-1</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>
-        <transpose>
-          <diatonic>1</diatonic>
-          <chromatic>2</chromatic>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>B</step>
-          <alter>-1</alter>
-          <octave>4</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P10">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>7</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>F</sign>
-          <line>4</line>
-          <clef-octave-change>-1</clef-octave-change>
-        </clef>
-        <transpose>
-          <diatonic>3</diatonic>
-          <chromatic>6</chromatic>
-          <octave-change>3</octave-change>
-        </transpose>
-      </attributes>
-      <note>
-        <pitch>
-          <step>F</step>
-          <alter>1</alter>
-          <octave>1</octave>
-        </pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>whole</type>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-  <part id="P11">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>1</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>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/17-Guitar.itexi b/input/regression/musicxml/17-Guitar.itexi
deleted file mode 100644 (file)
index 8fd3f3e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Guitar notation
-
diff --git a/input/regression/musicxml/17a-Chords-Finale.xml b/input/regression/musicxml/17a-Chords-Finale.xml
deleted file mode 100644 (file)
index 55a1d32..0000000
+++ /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/17b-Fretboards-Finale.xml b/input/regression/musicxml/17b-Fretboards-Finale.xml
deleted file mode 100644 (file)
index 4238e3d..0000000
+++ /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/17c-ChordsFrets-Finale.xml b/input/regression/musicxml/17c-ChordsFrets-Finale.xml
deleted file mode 100644 (file)
index 281eebb..0000000
+++ /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/17d-ChordsFretsOnMultistaff-Finale.xml b/input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml
deleted file mode 100644 (file)
index fba900b..0000000
+++ /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/17e-TabStaves-Finale.xml b/input/regression/musicxml/17e-TabStaves-Finale.xml
deleted file mode 100644 (file)
index fab6517..0000000
+++ /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/17f-AllChordTypes.xml b/input/regression/musicxml/17f-AllChordTypes.xml
deleted file mode 100644 (file)
index facab34..0000000
+++ /dev/null
@@ -1,599 +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>
-  <movement-title>All MusicXML chord names/types with &lt;root&gt;</movement-title>
-  <identification>
-    <miscellaneous>
-      <miscellaneous-field name="description">All chord types defined in 
-          MusicXML. The staff will only contain one c' note (NO chord) for 
-          all of them, but the chord names should be properly 
-          printed.</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>
-    </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>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>augmented</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>augmented</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>diminished</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>diminished</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>dominant</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-seventh</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-seventh</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-seventh</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor-seventh</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>diminished-seventh</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>diminished-seventh</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>augmented-seventh</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>augmented-seventh</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>half-diminished</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>half-diminished</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-minor</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-minor</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-sixth</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-sixth</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-sixth</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor-sixth</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant-ninth</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>dominant-ninth</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-ninth</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-ninth</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-ninth</kind>
-        <lyric number="1"><text>minor-ninth</text></lyric>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor-ninth</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="5">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant-11th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>dominant-11th</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-11th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-11th</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-11th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor-11th</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>dominant-13th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>dominant-13th</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major-13th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>major-13th</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>minor-13th</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>minor-13th</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>suspended-second</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>suspended-second</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>suspended-fourth</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>suspended-fourth</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="7">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>Neapolitan</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Neapolitan</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>Italian</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Italians</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>French</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>French</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>German</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-         <lyric number="1"><text>German</text></lyric>
-     </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="8">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>pedal</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>pedal</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>power</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>power</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>Tristan</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>Tristan</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>other</kind>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>other</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="9">
-      <harmony>
-        <root>
-          <root-step>F</root-step>
-          <root-alter>1</root-alter>
-        </root>
-        <kind>major</kind>
-        <inversion>2</inversion>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <lyric number="1"><text>Inversion</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>F</root-step>
-          <root-alter>-2</root-alter>
-        </root>
-        <kind>major</kind>
-        <bass>
-          <bass-step>C</bass-step>
-        </bass>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1"><text>Fbb/C</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>G</root-step>
-          <root-alter>1</root-alter>
-        </root>
-        <kind>major</kind>
-        <bass>
-          <bass-step>D</bass-step>
-          <bass-alter>1</bass-alter>
-        </bass>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <lyric number="1"><text>G#/D#</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-      </harmony>
-      <note>
-        <rest/>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>C</text></lyric>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="10">
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-        <degree>
-          <degree-value>3</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>subtract</degree-type>
-        </degree>
-        <degree>
-          <degree-value>5</degree-value>
-          <degree-alter>-1</degree-alter>
-          <degree-type>alter</degree-type>
-        </degree>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>C-3+5b</text></lyric>
-      </note>
-      <harmony>
-        <root>
-          <root-step>C</root-step>
-        </root>
-        <kind>major</kind>
-        <degree>
-          <degree-value>1</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>subtract</degree-type>
-        </degree>
-        <degree>
-          <degree-value>6</degree-value>
-          <degree-alter>-1</degree-alter>
-          <degree-type>add</degree-type>
-        </degree>
-      </harmony>
-      <note>
-        <pitch><step>C</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-        <lyric number="1"><text>C-1+6b</text></lyric>
-      </note>
-      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-    </measure>
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/18-Figured-Bass.itexi b/input/regression/musicxml/18-Figured-Bass.itexi
deleted file mode 100644 (file)
index a6c87c7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Figured bass
-
diff --git a/input/regression/musicxml/18a-FiguredBass.xml b/input/regression/musicxml/18a-FiguredBass.xml
deleted file mode 100644 (file)
index 7837c8c..0000000
+++ /dev/null
@@ -1,112 +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">Some figured bass containing 
-          alterated figures, bracketed figures and slashed figures. The last 
-          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>
-  <!--=========================================================-->
-  <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"/>
-      <figured-bass>
-        <figure><figure-number>3</figure-number></figure>
-        <duration>4</duration>
-      </figured-bass>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>4</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-      </note>
-      <figured-bass>
-        <figure><prefix>sharp</prefix><figure-number>1</figure-number></figure>
-        <figure><prefix>flat</prefix><figure-number>3</figure-number></figure>
-        <figure><prefix>natural</prefix><figure-number>5</figure-number></figure>
-        <duration>6</duration>
-      </figured-bass>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>6</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <dot/>
-      </note>
-      <figured-bass parentheses="yes">
-        <figure><figure-number>6</figure-number></figure>
-      </figured-bass>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>16th</type>
-      </note>
-      <figured-bass>
-        <figure><figure-number>5</figure-number><suffix>slash</suffix></figure>
-        <figure><prefix>flat</prefix><figure-number>127</figure-number><suffix>slash</suffix></figure>
-        <duration>8</duration>
-      </figured-bass>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>8</duration>
-        <voice>1</voice>
-        <type>eighth</type>
-        <dot/>
-      </note>
-      <!-- Check how well the application handles an empty element (invalid MusicXML!) -->
-      <figured-bass>
-      </figured-bass>
-      <note>
-        <pitch><step>G</step><octave>4</octave></pitch>
-        <duration>8</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/19-Page-Layout.itexi b/input/regression/musicxml/19-Page-Layout.itexi
deleted file mode 100644 (file)
index 5284d16..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Page layout
-
diff --git a/input/regression/musicxml/19a-PageLayout-PrintMusic.xml b/input/regression/musicxml/19a-PageLayout-PrintMusic.xml
deleted file mode 100644 (file)
index 4846212..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise version="1.1">
-  <movement-title>Layout options</movement-title>
-  <identification>
-    <encoding>
-      <software>PrintMusic 2008 for Windows</software>
-      <software>Dolet Light for PrintMusic 2008</software>
-      <encoding-date>2007-11-04</encoding-date>
-    </encoding>
-    <miscellaneous>
-      <miscellaneous-field name="description">Several page layout settings: 
-          paper size, margins, system margins and distances, different fonts, 
-          etc.</miscellaneous-field>
-    </miscellaneous>
-  </identification>
-  <defaults>
-    <scaling>
-      <millimeters>3.7703</millimeters>
-      <tenths>40</tenths>
-    </scaling>
-    <page-layout>
-      <page-height>954</page-height>
-      <page-width>1804</page-width>
-      <page-margins type="both">
-        <left-margin>318</left-margin>
-        <right-margin>212</right-margin>
-        <top-margin>53</top-margin>
-        <bottom-margin>74</bottom-margin>
-      </page-margins>
-    </page-layout>
-    <system-layout>
-      <system-margins>
-        <left-margin>248</left-margin>
-        <right-margin>206</right-margin>
-      </system-margins>
-      <system-distance>561</system-distance>
-      <top-system-distance>436</top-system-distance>
-    </system-layout>
-    <music-font font-family="Maestro" font-size="10.7"/>
-    <word-font font-family="Times New Roman" font-size="5.3"/>
-  </defaults>
-  <credit>
-    <credit-words default-x="955" default-y="876" font-size="18" font-weight="bold" justify="center" valign="top">Layout options</credit-words>
-  </credit>
-  <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>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1" width="441">
-      <print page-number="8"/>
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>4</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2" width="378">
-      <note>
-        <rest/>
-        <duration>4</duration>
-        <voice>1</voice>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3" width="819">
-      <print new-page="yes" page-number="9"/>
-      <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/20-Compressed-MusicXML.itexi b/input/regression/musicxml/20-Compressed-MusicXML.itexi
deleted file mode 100644 (file)
index 0374f0d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Compressed MusicXML files
-
diff --git a/input/regression/musicxml/20a-Compressed-MusicXML.mxl b/input/regression/musicxml/20a-Compressed-MusicXML.mxl
deleted file mode 100644 (file)
index d709094..0000000
Binary files a/input/regression/musicxml/20a-Compressed-MusicXML.mxl and /dev/null differ
diff --git a/input/regression/musicxml/21-Chords.itexi b/input/regression/musicxml/21-Chords.itexi
new file mode 100644 (file)
index 0000000..75e68bf
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 21 ... Chorded notes
diff --git a/input/regression/musicxml/21-KeySignatures.itexi b/input/regression/musicxml/21-KeySignatures.itexi
deleted file mode 100644 (file)
index 32cf2a4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@section Key signatures
-
diff --git a/input/regression/musicxml/21a-Chord-Basic.xml b/input/regression/musicxml/21a-Chord-Basic.xml
new file mode 100644 (file)
index 0000000..ef2db31
--- /dev/null
@@ -0,0 +1,68 @@
+<?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">One simple chord 
+                            consisting of two notes.</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">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <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>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>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>960</duration>
+                               <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
new file mode 100644 (file)
index 0000000..6dce4ee
--- /dev/null
@@ -0,0 +1,192 @@
+<?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">Some subsequent 
+                            (identical) two-note chords.</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">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <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>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>
+                       </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>
+                       </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>
+                       </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>
+                       </note>
+               </measure>
+
+               <measure number="2">
+                       <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>
+                       </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>
+                       </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>
+                       </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>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/21b-KeySignatures-NonTraditional.xml b/input/regression/musicxml/21b-KeySignatures-NonTraditional.xml
deleted file mode 100644 (file)
index bb3cc6e..0000000
+++ /dev/null
@@ -1,86 +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">Non-traditional key signatures,
-          where each alteration is separately given. Here we have (f sharp, 
-          a flat, b flat) and (c flatflat, g sharp sharp, d flat, b sharp, f 
-          natural), where in the second case an explicit octave is given for 
-          each alteration.</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>
-          <key-step>3</key-step>
-          <key-alter>1</key-alter>
-          <key-step>5</key-step>
-          <key-alter>-1</key-alter>
-          <key-step>6</key-step>
-          <key-alter>-1</key-alter>
-        </key>
-        <time>
-          <beats>2</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>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-    </measure>
-    <measure number="2">
-      <attributes>
-        <key>
-          <key-step>0</key-step>
-          <key-alter>-2</key-alter>
-          <key-step>4</key-step>
-          <key-alter>2</key-alter>
-          <key-step>1</key-step>
-          <key-alter>-1</key-alter>
-          <key-step>6</key-step>
-          <key-alter>1</key-alter>
-          <key-step>5</key-step>
-          <key-alter>0</key-alter>
-          <key-octave number="1">2</key-octave>
-          <key-octave number="2">3</key-octave>
-          <key-octave number="3">4</key-octave>
-          <key-octave number="4">5</key-octave>
-          <key-octave number="5">6</key-octave>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</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/21c-Chords-ThreeNotesDuration.xml b/input/regression/musicxml/21c-Chords-ThreeNotesDuration.xml
new file mode 100644 (file)
index 0000000..d18ba71
--- /dev/null
@@ -0,0 +1,265 @@
+<?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">Some three-note 
+                            chords, with various durations.</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">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <pitch>
+                                       <step>F</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>1440</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <dot/>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>A</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>1440</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <dot/>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>C</step>
+                                       <octave>5</octave>
+                               </pitch>
+                               <duration>1440</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                               <dot/>
+                       </note>
+                       <note>
+                               <pitch>
+                                       <step>A</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>480</duration>
+                               <voice>1</voice>
+                               <type>eighth</type>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>G</step>
+                                       <octave>5</octave>
+                               </pitch>
+                               <duration>480</duration>
+                               <voice>1</voice>
+                               <type>eighth</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>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>C</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>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>C</step>
+                                       <octave>5</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+               </measure>
+
+               <measure number="2">
+                       <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>
+                       </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>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>F</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>
+                       </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>
+                       </note>
+                       <note>
+                               <chord/>
+                               <pitch>
+                                       <step>D</step>
+                                       <octave>5</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/21c-KeySignatures-Microtones.xml b/input/regression/musicxml/21c-KeySignatures-Microtones.xml
deleted file mode 100644 (file)
index 0819bcf..0000000
+++ /dev/null
@@ -1,63 +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">Non-traditional key signatures
-          with microtone alterations: (g flat-and-a-half,
-          a flat, b half-flat, c natural, d half-sharp, e sharp, f 
-          sharp-and-a-half).</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>
-          <key-step>4</key-step>
-          <key-alter>-1.5</key-alter>
-          <key-step>5</key-step>
-          <key-alter>-1</key-alter>
-          <key-step>6</key-step>
-          <key-alter>-0.5</key-alter>
-          <key-step>0</key-step>
-          <key-alter>0</key-alter>
-          <key-step>1</key-step>
-          <key-alter>0.5</key-alter>
-          <key-step>2</key-step>
-          <key-alter>1</key-alter>
-          <key-step>3</key-step>
-          <key-alter>1.5</key-alter>
-        </key>
-        <time>
-          <beats>2</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>2</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/21d-Chords-SchubertStabatMater.xml b/input/regression/musicxml/21d-Chords-SchubertStabatMater.xml
new file mode 100644 (file)
index 0000000..c809ded
--- /dev/null
@@ -0,0 +1,174 @@
+<?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 
+                            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">
+          <measure number="1">
+            <attributes>
+              <divisions>8</divisions>
+              <key>
+                <fifths>-4</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="above">
+              <direction-type>
+                <words default-y="15" font-family="Times New Roman" font-size="8,5" font-weight="bold">Largo</words>
+              </direction-type>
+            </direction>
+            <direction placement="below">
+              <direction-type>
+                <dynamics default-y="-80">
+                  <fp/>
+                </dynamics>
+              </direction-type>
+              <offset>3</offset>
+            </direction>
+            <note>
+              <pitch>
+                <step>F</step>
+                <octave>4</octave>
+              </pitch>
+              <duration>32</duration>
+              <voice>1</voice>
+              <type>whole</type>
+              <notations>
+                <articulations>
+                  <accent placement="below"/>
+                </articulations>
+                <fermata type="upright"/>
+              </notations>
+            </note>
+          </measure>
+          <!--=======================================================-->
+          <measure number="2">
+            <direction placement="below">
+              <direction-type>
+                <dynamics default-y="-80">
+                  <p/>
+                </dynamics>
+              </direction-type>
+              <offset>1</offset>
+              <sound dynamics="54"/>
+            </direction>
+            <note>
+              <pitch>
+                <step>F</step>
+                <octave>4</octave>
+              </pitch>
+              <duration>12</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <dot/>
+              <stem>up</stem>
+            </note>
+            <note>
+              <chord/>
+              <pitch>
+                <step>A</step>
+                <alter>-1</alter>
+                <octave>4</octave>
+              </pitch>
+              <duration>12</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <dot/>
+              <stem>up</stem>
+            </note>
+            <note>
+              <pitch>
+                <step>F</step>
+                <octave>4</octave>
+              </pitch>
+              <duration>4</duration>
+              <voice>1</voice>
+              <type>eighth</type>
+              <stem>up</stem>
+            </note>
+            <note>
+              <chord/>
+              <pitch>
+                <step>A</step>
+                <alter>-1</alter>
+                <octave>4</octave>
+              </pitch>
+              <duration>4</duration>
+              <voice>1</voice>
+              <type>eighth</type>
+              <stem>up</stem>
+            </note>
+            <note>
+              <pitch>
+                <step>G</step>
+                <octave>4</octave>
+              </pitch>
+              <duration>8</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <stem>up</stem>
+            </note>
+            <note>
+              <chord/>
+              <pitch>
+                <step>B</step>
+                <alter>-1</alter>
+                <octave>4</octave>
+              </pitch>
+              <duration>8</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <stem>up</stem>
+            </note>
+            <note>
+              <pitch>
+                <step>G</step>
+                <octave>4</octave>
+              </pitch>
+              <duration>8</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <stem>up</stem>
+            </note>
+            <note>
+              <chord/>
+              <pitch>
+                <step>B</step>
+                <alter>-1</alter>
+                <octave>4</octave>
+              </pitch>
+              <duration>8</duration>
+              <voice>1</voice>
+              <type>quarter</type>
+              <stem>up</stem>
+            </note>
+          </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/21e-Chords-PickupMeasures.xml b/input/regression/musicxml/21e-Chords-PickupMeasures.xml
new file mode 100644 (file)
index 0000000..abdf5b2
--- /dev/null
@@ -0,0 +1,94 @@
+<?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">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>
+    </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">
+            <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">
+            <note>
+                <pitch>
+                    <step>C</step>
+                    <octave>5</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <chord/>
+                <pitch>
+                    <step>A</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <chord/>
+                <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>
+            <note>
+                <chord/>
+                <pitch>
+                    <step>A</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>1</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+        </measure>
+        <!--=======================================================-->
+    </part>
+    <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/21f-Chord-ElementInBetween.xml b/input/regression/musicxml/21f-Chord-ElementInBetween.xml
new file mode 100644 (file)
index 0000000..95536e6
--- /dev/null
@@ -0,0 +1,91 @@
+<?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">Between the individual notes of 
+            a chord there can be direction or harmony elements, which should be 
+            properly assigned to the chord (or the position of the 
+            chord).</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">
+        <measure number="1">
+            <attributes>
+                <divisions>960</divisions>
+                <time>
+                    <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>960</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <direction>
+              <direction-type>
+                <segno/>
+              </direction-type>
+            </direction>
+            <note>
+                <chord/>
+                <pitch>
+                    <step>F</step>
+                    <octave>4</octave>
+                    <alter>1</alter>
+                </pitch>
+                <duration>960</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <direction>
+                <direction-type>
+                    <dynamics><p/></dynamics>
+                </direction-type>
+            </direction>
+            <note>
+                <chord/>
+                <pitch>
+                    <step>D</step>
+                    <octave>4</octave>
+                </pitch>
+                <duration>960</duration>
+                <voice>1</voice>
+                <type>quarter</type>
+            </note>
+            <note>
+                <rest/>
+                <duration>960</duration>
+                <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/22-NoteSettings.itexi b/input/regression/musicxml/22-NoteSettings.itexi
new file mode 100644 (file)
index 0000000..735b7c0
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 22 ... Note settings, heads, etc.
diff --git a/input/regression/musicxml/22a-Noteheads.xml b/input/regression/musicxml/22a-Noteheads.xml
new file mode 100644 (file)
index 0000000..2874887
--- /dev/null
@@ -0,0 +1,1387 @@
+<?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 note styles, using the 
+          &lt;notehead&gt; element. First, each note head style is printed 
+          with four quarter notes, two with filled heads, two with unfilled 
+          heads, where first the stem is up and then the stem is down. After 
+          that, each note head style is printed with a half note (should have 
+          an unfilled head by default). Finally, the Aiken note head styles are 
+          tested, once with stem up and once with stem down.</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>
+        <notehead>slash</notehead>
+        <lyric number="1"><text>slash</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>slash</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">slash</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">slash</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>triangle</notehead>
+        <lyric number="1"><text>triangle</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>triangle</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">triangle</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">triangle</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>diamond</notehead>
+        <lyric number="1"><text>diamond</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>diamond</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">diamond</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">diamond</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>square</notehead>
+        <lyric number="1"><text>square</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>square</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">square</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">square</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>cross</notehead>
+        <lyric number="1"><text>cross</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>cross</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">cross</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">cross</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>x</notehead>
+        <lyric number="1"><text>x</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>x</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">x</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">x</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>circle-x</notehead>
+        <lyric number="1"><text>circle-x</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>circle-x</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">circle-x</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">circle-x</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>inverted triangle</notehead>
+        <lyric number="1"><text>inverted triangle</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>inverted triangle</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">inverted triangle</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">inverted triangle</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow down</notehead>
+        <lyric number="1"><text>arrow down</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow down</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">arrow down</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">arrow down</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow up</notehead>
+        <lyric number="1"><text>arrow up</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow up</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">arrow up</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">arrow up</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>slashed</notehead>
+        <lyric number="1"><text>slashed</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>slashed</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">slashed</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">slashed</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>back slashed</notehead>
+        <lyric number="1"><text>back slashed</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>back slashed</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">back slashed</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">back slashed</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>normal</notehead>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>normal</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">normal</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">normal</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="14">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>cluster</notehead>
+        <lyric number="1"><text>cluster</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>cluster</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">cluster</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">cluster</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>none</notehead>
+        <lyric number="1"><text>none</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>none</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">none</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">none</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="16">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>slash</notehead>
+        <lyric number="1"><text>slash</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>triangle</notehead>
+        <lyric number="1"><text>triangle</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>diamond</notehead>
+        <lyric number="1"><text>diamond</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>square</notehead>
+        <lyric number="1"><text>square</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="18">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>cross</notehead>
+        <lyric number="1"><text>cross</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>x</notehead>
+        <lyric number="1"><text>x</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="19">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>circle-x</notehead>
+        <lyric number="1"><text>circle-x</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>inverted triangle</notehead>
+        <lyric number="1"><text>inverted triangle</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>arrow down</notehead>
+        <lyric number="1"><text>arrow down</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>arrow up</notehead>
+        <lyric number="1"><text>arrow up</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="21">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>slashed</notehead>
+        <lyric number="1"><text>slashed</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>back slashed</notehead>
+        <lyric number="1"><text>back slashed</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="22">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>normal</notehead>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <notehead>cluster</notehead>
+        <lyric number="1"><text>cluster</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="23">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+        <lyric number="1"><text>do</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">do</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">do</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="24">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>re</notehead>
+        <lyric number="1"><text>re</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>re</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">re</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">re</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="25">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>mi</notehead>
+        <lyric number="1"><text>mi</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>mi</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">mi</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">mi</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="26">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>fa</notehead>
+        <lyric number="1"><text>fa</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>fa</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">fa</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">fa</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="27">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>so</notehead>
+        <lyric number="1"><text>so</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>so</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">so</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">so</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="28">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>la</notehead>
+        <lyric number="1"><text>la</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>la</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">la</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">la</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="29">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>ti</notehead>
+        <lyric number="1"><text>ti</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>ti</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">ti</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead filled="no">ti</notehead>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="30">
+      <attributes>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+        <lyric number="1"><text>do</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>re</notehead>
+        <lyric number="1"><text>re</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>mi</notehead>
+        <lyric number="1"><text>mi</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>fa</notehead>
+        <lyric number="1"><text>fa</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="31">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>so</notehead>
+        <lyric number="1"><text>so</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>la</notehead>
+        <lyric number="1"><text>la</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>ti</notehead>
+        <lyric number="1"><text>ti</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+        <lyric number="1"><text>do</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="32">
+      <attributes>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+        <lyric number="1"><text>do</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>re</notehead>
+        <lyric number="1"><text>re</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>mi</notehead>
+        <lyric number="1"><text>mi</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>fa</notehead>
+        <lyric number="1"><text>fa</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="33">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>so</notehead>
+        <lyric number="1"><text>so</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>la</notehead>
+        <lyric number="1"><text>la</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>ti</notehead>
+        <lyric number="1"><text>ti</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>6</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>do</notehead>
+        <lyric number="1"><text>do</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/22b-Staff-Notestyles.xml b/input/regression/musicxml/22b-Staff-Notestyles.xml
new file mode 100644 (file)
index 0000000..8a6c750
--- /dev/null
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Staff-connected note styles: 
+        slash notation, hidden notes (with and without hidden staff
+        lines)</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">
+      <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>
+          <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>
+        <stem>down</stem>
+      </note>
+      <attributes>
+        <measure-style>
+          <slash type="start" use-stems="no"/>
+        </measure-style>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1"><text>slash, no stem</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <attributes>
+        <measure-style>
+          <slash type="stop"/>
+        </measure-style>
+        <measure-style>
+          <slash type="start" use-stems="yes"/>
+        </measure-style>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1"><text>slash, with stem</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <attributes>
+        <measure-style>
+          <slash type="stop"/>
+        </measure-style>
+      </attributes>
+      <note print-object="no">
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <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">
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <attributes>
+        <staff-details>
+          <staff-lines>0</staff-lines>
+        </staff-details>
+      </attributes>
+      <note print-object="no">
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1"><text>hidden notes, staff lines</text></lyric>
+      </note>
+    </measure>
+    <measure number="3">
+      <note print-object="no">
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <stem>up</stem>
+      </note>
+      <attributes>
+        <staff-details>
+          <staff-lines>5</staff-lines>
+        </staff-details>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <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">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/22c-Noteheads-Chords.xml b/input/regression/musicxml/22c-Noteheads-Chords.xml
new file mode 100644 (file)
index 0000000..5196040
--- /dev/null
@@ -0,0 +1,179 @@
+<?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 note styles for 
+          individual notes inside a chord, using the 
+          &lt;notehead&gt; element.</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>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>triangle</notehead>
+        <lyric number="2"><text>triangle</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>slash</notehead>
+        <lyric number="3"><text>slash</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>cross</notehead>
+        <lyric number="1"><text>cross</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>square</notehead>
+        <lyric number="2"><text>square</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>diamond</notehead>
+        <lyric number="3"><text>diamond</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>inverted triangle</notehead>
+        <lyric number="1"><text>inverted triangle</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>circle-x</notehead>
+        <lyric number="2"><text>circle-x</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>x</notehead>
+        <lyric number="3"><text>x</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>slashed</notehead>
+        <lyric number="1"><text>slashed</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow up</notehead>
+        <lyric number="2"><text>arrow up</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead>arrow down</notehead>
+        <lyric number="3"><text>arrow down</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/22d-Parenthesized-Noteheads.xml b/input/regression/musicxml/22d-Parenthesized-Noteheads.xml
new file mode 100644 (file)
index 0000000..4e4fefa
--- /dev/null
@@ -0,0 +1,140 @@
+<?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">Parenthesized note heads. First,
+          a single parenthesized note is tested, once with a normal and then 
+          with a non-standard notehead, then two chords with some/all
+          parenthesized noteheads and finally a parenthesized rest.</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>6</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>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes">x</notehead>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</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>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes"/>
+      </note>
+      <note>
+        <rest>
+          <display-step>E</display-step>
+          <display-octave>4</display-octave>
+        </rest>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notehead parentheses="yes"/>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/23-Tuplets.itexi b/input/regression/musicxml/23-Tuplets.itexi
new file mode 100644 (file)
index 0000000..edc5032
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 23 ... Triplets, Tuplets
diff --git a/input/regression/musicxml/23a-Tuplets-Finale.xml b/input/regression/musicxml/23a-Tuplets-Finale.xml
new file mode 100644 (file)
index 0000000..47f36b1
--- /dev/null
@@ -0,0 +1,512 @@
+<?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/23b-Tuplets-Styles.xml b/input/regression/musicxml/23b-Tuplets-Styles.xml
new file mode 100644 (file)
index 0000000..6b55d4d
--- /dev/null
@@ -0,0 +1,1033 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Different tuplet styles:
+          default, none, x:y, x:y-note; Each with bracket, slur and none.
+          Finally, non-standard 4:3 and 17:2 tuplets are given.</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">
+    <measure number="1">
+      <attributes>
+        <divisions>408</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>5</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>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes">
+        <system-layout>
+          <system-distance>114</system-distance>
+        </system-layout>
+      </print>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</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>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/23c-Tuplet-Display-NonStandard.xml
new file mode 100644 (file)
index 0000000..a0810b4
--- /dev/null
@@ -0,0 +1,615 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Displaying tuplet note types,
+          that might not coincide with the displayed note. The first two tuplets 
+          take the type from the note, the second two from the 
+          &lt;time-modification> element, the remaining pair of tuplets from the 
+          &lt;tuplet> notation element. The tuplets in measure 3 specify both 
+          a number of notes and a type inside the &lt;tuplet-actual> and 
+          &lt;tuplet-normal> elements, the ones in measure 4 specify only a 
+          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>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>408</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>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</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>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</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/23d-Tuplets-Nested.xml b/input/regression/musicxml/23d-Tuplets-Nested.xml
new file mode 100644 (file)
index 0000000..b85c029
--- /dev/null
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tuplets can be nested. Here 
+          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written
+          eighth notes).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <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>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>30</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="2" placement="below" type="start">
+            <tuplet-actual>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>2</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="2" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+        <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/23e-Tuplets-Tremolo.xml b/input/regression/musicxml/23e-Tuplets-Tremolo.xml
new file mode 100644 (file)
index 0000000..eee4d0f
--- /dev/null
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tremolo tuplets are tuplets on 
+          single notes with a tremolo ornament. The application shall correctly
+          import these notes with 2/3 or their time...</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">
+    <measure number="1">
+      <attributes>
+        <divisions>36</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <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>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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 number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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 number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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 number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</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 number="1" type="stop"/>
+        </notations>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <dynamics>
+            <fp/>
+          </dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml b/input/regression/musicxml/23f-Tuplets-DurationButNoBracket-PJB.xml
new file mode 100644 (file)
index 0000000..23c2aa2
--- /dev/null
@@ -0,0 +1,205 @@
+<?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/24-Grace-Notes.itexi b/input/regression/musicxml/24-Grace-Notes.itexi
new file mode 100644 (file)
index 0000000..68b171e
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 24 ... Grace notes
diff --git a/input/regression/musicxml/24a-GraceNotes-Finale.xml b/input/regression/musicxml/24a-GraceNotes-Finale.xml
new file mode 100644 (file)
index 0000000..f54a26e
--- /dev/null
@@ -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">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/24b-ChordAsGraceNote-Finale.xml b/input/regression/musicxml/24b-ChordAsGraceNote-Finale.xml
new file mode 100644 (file)
index 0000000..688f43c
--- /dev/null
@@ -0,0 +1,130 @@
+<?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/24c-GraceNote-MeasureEnd-Finale.xml b/input/regression/musicxml/24c-GraceNote-MeasureEnd-Finale.xml
new file mode 100644 (file)
index 0000000..4138aa0
--- /dev/null
@@ -0,0 +1,93 @@
+<?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/24d-AfterGrace.xml b/input/regression/musicxml/24d-AfterGrace.xml
new file mode 100644 (file)
index 0000000..60f568d
--- /dev/null
@@ -0,0 +1,124 @@
+<?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 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>
+  <!--=========================================================-->
+  <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>
+        <grace steal-time-previous="20"/>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <grace steal-time-next="20"/>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <grace/>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <voice>1</voice>
+        <type>16th</type>
+        <stem>up</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/31-Directions.itexi b/input/regression/musicxml/31-Directions.itexi
new file mode 100644 (file)
index 0000000..527c924
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 31 ... Dynamics and other single symbols
diff --git a/input/regression/musicxml/31a-Directions-MusicXML.xml b/input/regression/musicxml/31a-Directions-MusicXML.xml
new file mode 100644 (file)
index 0000000..ca086df
--- /dev/null
@@ -0,0 +1,787 @@
+<?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/31b-Directions-MultimeasureRests.xml.broken b/input/regression/musicxml/31b-Directions-MultimeasureRests.xml.broken
new file mode 100644 (file)
index 0000000..7b3285d
--- /dev/null
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <movement-title>MusicXML directions (attached to staff)</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Directions between some 
+        multi-measure rests should still be converted to the correct 
+        position.</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">
+    <!--=======================================================-->
+    <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>
+        <rest/>
+        <duration>32</duration>
+        <voice>1</voice>
+      </note>
+      <direction placement="above">
+        <direction-type>
+          <words font-family="Times New Roman" font-size="9.6" font-weight="bold">TEST</words>
+        </direction-type>
+        <offset>-4</offset>
+      </direction>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>32</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>32</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/31c-MetronomeMarks.xml b/input/regression/musicxml/31c-MetronomeMarks.xml
new file mode 100644 (file)
index 0000000..769b993
--- /dev/null
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tempo Markings: note=bpm, 
+          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">
+      <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>
+        <direction-type>
+          <metronome>
+            <beat-unit>quarter</beat-unit>
+            <beat-unit-dot/>
+            <per-minute>100</per-minute>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+      <direction>
+        <direction-type>
+          <words>Adagio</words>
+        </direction-type>
+        <direction-type>
+          <metronome>
+            <beat-unit>long</beat-unit>
+            <per-minute>100</per-minute>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <direction>
+        <direction-type>
+          <metronome>
+            <beat-unit>quarter</beat-unit>
+            <beat-unit-dot/>
+            <beat-unit>half</beat-unit>
+            <beat-unit-dot/>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+      <direction>
+        <direction-type>
+          <metronome>
+            <beat-unit>long</beat-unit>
+            <beat-unit>32nd</beat-unit>
+            <beat-unit-dot/>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <direction>
+        <direction-type>
+          <metronome parentheses="yes">
+            <beat-unit>quarter</beat-unit>
+            <beat-unit-dot/>
+            <beat-unit>half</beat-unit>
+            <beat-unit-dot/>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+      <direction>
+        <direction-type>
+          <metronome parentheses="yes">
+            <beat-unit>quarter</beat-unit>
+            <beat-unit-dot/>
+            <per-minute>77</per-minute>
+          </metronome>
+        </direction-type>
+      </direction>
+      <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>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/32-Notations-Articulations.itexi b/input/regression/musicxml/32-Notations-Articulations.itexi
new file mode 100644 (file)
index 0000000..c76b329
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 32 ... Notations and Articulations
diff --git a/input/regression/musicxml/32a-Notations.xml b/input/regression/musicxml/32a-Notations.xml
new file mode 100644 (file)
index 0000000..4b350a7
--- /dev/null
@@ -0,0 +1,1238 @@
+<?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 notations (attached to note)</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All &lt;notation&gt; elements 
+          defined in MusicXML. The lyrics show the notation assigned to each 
+          note.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name></part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <!-- General Notation elements (no spanners, which are tested separately):
+         fermata | arpeggiate | non-arpeggiate | accidental-mark -->
+    <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>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata type="upright"/>
+        </notations>
+        <lyric number="1"><text>ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>normal</fermata>
+        </notations>
+        <lyric number="1"><text>normal ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>angled</fermata>
+        </notations>
+        <lyric number="1"><text>angled ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>square</fermata>
+        </notations>
+        <lyric number="1"><text>square ferm.</text></lyric>
+      </note>
+    </measure>
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata type="inverted"/>
+        </notations>
+        <lyric number="1"><text>inv.ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>arp.</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="bottom"/></notations>
+        <lyric number="1"><text>non-arp.</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="top"/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <accidental-mark placement="above">double-sharp</accidental-mark>
+        </notations>
+        <lyric number="1"><text>acc.mark</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+
+    <!-- Articulations: 
+            accent | strong-accent | staccato | tenuto |
+            detached-legato | staccatissimo | spiccato |
+            scoop | plop | doit | falloff | breath-mark |
+            caesura | stress | unstress | other-articulation -->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><accent/></articulations>
+        </notations>
+        <lyric number="1"><text>acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><strong-accent/></articulations>
+        </notations>
+        <lyric number="1"><text>str.-acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><staccato/></articulations>
+        </notations>
+        <lyric number="1"><text>stacc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><tenuto/></articulations>
+        </notations>
+        <lyric number="1"><text>ten.</text></lyric>
+      </note>
+    </measure>
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><detached-legato/></articulations>
+        </notations>
+        <lyric number="1"><text>det.-leg.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><staccatissimo/></articulations>
+        </notations>
+        <lyric number="1"><text>stacc.ss</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><spiccato/></articulations>
+        </notations>
+        <lyric number="1"><text>spicc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><scoop/></articulations>
+        </notations>
+        <lyric number="1"><text>scoop</text></lyric>
+      </note>
+    </measure>
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><plop/></articulations>
+        </notations>
+        <lyric number="1"><text>plop</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><doit/></articulations>
+        </notations>
+        <lyric number="1"><text>doit</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><falloff/></articulations>
+        </notations>
+        <lyric number="1"><text>falloff</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><breath-mark/></articulations>
+        </notations>
+        <lyric number="1"><text>breath</text></lyric>
+      </note>
+    </measure>
+    <measure number="6">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><caesura/></articulations>
+        </notations>
+        <lyric number="1"><text>caes.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><stress/></articulations>
+        </notations>
+        <lyric number="1"><text>stress</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><unstress/></articulations>
+        </notations>
+        <lyric number="1"><text>unstr.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+
+    <!-- Ornaments:
+         trill-mark | turn | delayed-turn | inverted-turn |
+         shake | wavy-line | mordent | inverted-mordent | 
+         schleifer | tremolo | other-ornament), 
+         accidental-mark 
+         
+         Test cases for various tremolo options are in a separate 
+         unit test file
+         -->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><trill-mark/></ornaments>
+        </notations>
+        <lyric number="1"><text>tr.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>turn</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><delayed-turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>del.turn</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><inverted-turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>inv.turn</text></lyric>
+      </note>
+    </measure>
+    <measure number="8">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><shake/></ornaments>
+        </notations>
+        <lyric number="1"><text>shake</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" type="start"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" type="stop"/>
+            <wavy-line placement="below" type="start"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>continue</syllabic><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" relative-x="16" type="stop"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>line</text></lyric>
+      </note>
+    </measure>
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><mordent/></ornaments>
+        </notations>
+        <lyric number="1"><text>mord.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><inverted-mordent/></ornaments>
+        </notations>
+        <lyric number="1"><text>inv.mord.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><schleifer/></ornaments>
+        </notations>
+        <lyric number="1"><text>schl.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><tremolo/></ornaments>
+        </notations>
+        <lyric number="1"><text>trem.</text></lyric>
+      </note>
+    </measure>
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <turn/>
+            <accidental-mark>natural</accidental-mark>
+          </ornaments>
+        </notations>
+        <lyric number="1"><text>turn+acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <turn/>
+            <accidental-mark placement="above">sharp</accidental-mark>
+            <accidental-mark placement="above">three-quarters-flat</accidental-mark>
+          </ornaments>
+        </notations>
+        <lyric number="1"><text>turn+acc.(ab.+bel./rel to turn)</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>
+
+    <!-- Technical:
+         up-bow | down-bow | harmonic | open-string |
+         thumb-position | fingering | pluck | double-tongue |
+         triple-tongue | stopped | snap-pizzicato | fret |
+         string | hammer-on | pull-off | bend | tap | heel |
+         toe | fingernails | other-technical -->
+    <measure number="11">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><up-bow/></technical>
+        </notations>
+        <lyric number="1"><text>up-b.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><down-bow/></technical>
+        </notations>
+        <lyric number="1"><text>down-b.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic/></technical>
+        </notations>
+        <lyric number="1"><text>harm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.harm.</text></lyric>
+      </note>
+    </measure>
+    <measure number="12">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><artificial/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>art.harm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><base-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./base</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><touching-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./touching</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><sounding-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./sounding</text></lyric>
+      </note>
+    </measure>
+    <measure number="13">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><open-string/></technical>
+        </notations>
+        <lyric number="1"><text>open-str.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><thumb-position/></technical>
+        </notations>
+        <lyric number="1"><text>thumb-pos.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering/></technical>
+        </notations>
+        <lyric number="1"><text>empty fing.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>1</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.1</text></lyric>
+      </note>
+    </measure>
+    <measure number="14">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>2</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.2</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>3</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.3</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>4</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.4</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>5</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.5</text></lyric>
+      </note>
+    </measure>
+    <measure number="15">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>something</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.sth.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>5</fingering><fingering substitution="yes">3</fingering><fingering alternate="yes">2</fingering></technical>
+        </notations>
+        <lyric number="1"><text>mult.fing.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><pluck/></technical>
+        </notations>
+        <lyric number="1"><text>empty pluck</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><pluck>a</pluck></technical>
+        </notations>
+        <lyric number="1"><text>pluck a</text></lyric>
+      </note>
+    </measure>
+    <measure number="16">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><double-tongue/></technical>
+        </notations>
+        <lyric number="1"><text>dbl.tng.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><triple-tongue/></technical>
+        </notations>
+        <lyric number="1"><text>trpl.tng.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><stopped/></technical>
+        </notations>
+        <lyric number="1"><text>stopped</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><snap-pizzicato/></technical>
+        </notations>
+        <lyric number="1"><text>snp.pizz.</text></lyric>
+      </note>
+    </measure>
+    <measure number="17">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fret/></technical>
+        </notations>
+        <lyric number="1"><text>empty fret</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fret>0</fret></technical>
+        </notations>
+        <lyric number="1"><text>fret0</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><string/></technical>
+        </notations>
+        <lyric number="1"><text>empty str.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <string>5</string>
+          </technical>
+        </notations>
+        <lyric number="1"><text>str. 5</text></lyric>
+      </note>
+    </measure>
+    <measure number="18">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="start"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>hammer</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="stop"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>on</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="start"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>pull</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="stop"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>off</text></lyric>
+      </note>
+    </measure>
+    <measure number="19">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>4</bend-alter></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>bend</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>3</bend-alter><release/><with-bar/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>b.3 with-bar</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>-0.5</bend-alter><pre-bend/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>pre-b. -0.5</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>3.5</bend-alter><release/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>b. release 3.5</text></lyric>
+      </note>
+    </measure>
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><tap/></technical>
+        </notations>
+        <lyric number="1"><text>tap</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><tap>T</tap></technical>
+        </notations>
+        <lyric number="1"><text>tap T</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><heel/></technical>
+        </notations>
+        <lyric number="1"><text>heel</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><toe substitution="yes"/></technical>
+        </notations>
+        <lyric number="1"><text>toe</text></lyric>
+      </note>
+    </measure>
+    <measure number="21">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingernails/></technical>
+        </notations>
+        <lyric number="1"><text>fingern.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+    
+    <!-- Dynamics, attached to notes by putting them inside <notations> tags -->
+    <measure number="22">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <dynamics><f/></dynamics>
+        </notations>
+        <lyric number="1"><text>f</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <dynamics><ppp/></dynamics>
+        </notations>
+        <lyric number="1"><text>ppp</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <dynamics><sfp/></dynamics>
+        </notations>
+        <lyric number="1"><text>sfp</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <dynamics><other-dynamics>sfffz</other-dynamics></dynamics>
+        </notations>
+        <lyric number="1"><text>Oth.dyn.</text></lyric>
+      </note>
+    </measure>
+    
+    <!-- General tests: multiple notations, directions, etc. -->
+    <measure number="23">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations>
+            <strong-accent placement="above" type="up"/>
+            <staccato placement="above"/>
+          </articulations>
+        </notations>
+        <lyric number="1"><text>both above</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations>
+            <accent placement="below"/>
+            <tenuto placement="below"/>
+            <staccato placement="above"/>
+          </articulations>
+        </notations>
+        <lyric number="1"><text>ab./bel./bel.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</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/32b-Articulations-Texts.xml b/input/regression/musicxml/32b-Articulations-Texts.xml
new file mode 100644 (file)
index 0000000..bc54908
--- /dev/null
@@ -0,0 +1,110 @@
+<?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-01</encoding-date>
+               </encoding>
+               <miscellaneous>
+                       <miscellaneous-field name="description">Text markup: 
+                            different font sizes, weights and colors.</miscellaneous-field>
+               </miscellaneous>
+       </identification>
+       <part-list>
+               <score-part id="P1"><part-name></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>1</staves>
+                               <clef number="1"><sign>G</sign><line>2</line></clef>
+                       </attributes>
+                       <direction placement="above">
+                               <direction-type>
+                                       <words default-x="-1" default-y="15" font-size="medium" font-weight="normal"> 
+                                               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>
+                                       <words default-x="1" default-y="15" justify="left" font-size="medium" font-weight="bold"> 
+                                               Bold, Medium
+                                       </words>
+                               </direction-type>
+                               <staff>1</staff>
+                       </direction>
+               </measure>
+               <measure number="2">
+                       <direction placement="above">
+                               <direction-type>
+                                       <words default-x="1" default-y="15" font-size="large" font-weight="normal"> 
+                                               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>
+                                       <words default-x="1" default-y="15" font-size="large" font-weight="bold"> 
+                                               Bold, Large
+                                       </words>
+                               </direction-type>
+                               <staff>1</staff>
+                       </direction>
+               </measure>
+               <measure number="3">
+                       <direction placement="above">
+                               <direction-type>
+                                       <words default-x="1" default-y="15" font-size="small" font-weight="normal"> 
+                                               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>
+                                <words default-x="1" default-y="15" font-size="small" font-weight="bold"> 
+                                    Bold, Small
+                                </words>
+                            </direction-type>
+                            <staff>1</staff>
+                        </direction>
+                        <direction placement="below">
+                            <direction-type>
+                                <words default-x="1" default-y="-15" font-size="small" color="#FF8000"> 
+                                    Normal, Small, Colored, Below
+                                </words>
+                            </direction-type>
+                            <staff>1</staff>
+                        </direction>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/32c-MultipleNotationChildren.xml b/input/regression/musicxml/32c-MultipleNotationChildren.xml
new file mode 100644 (file)
index 0000000..303f7b1
--- /dev/null
@@ -0,0 +1,96 @@
+<?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">
+          It should not make any difference whether two articulations are given
+          inside two different notation elements, inside two different articulations 
+          children of the same notation element or inside the same articulations
+          element. Thus, all three notes should have a staccato and an accent.
+      </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>
+        </key>
+        <time>
+          <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>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+        <notations>
+          <articulations>
+            <staccato placement="above"/>
+          </articulations>
+        </notations>
+        <notations>
+          <articulations>
+            <accent placement="above"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+        <notations>
+          <articulations>
+            <staccato placement="above"/>
+          </articulations>
+          <articulations>
+            <accent placement="above"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <accidental>sharp</accidental>
+        <stem>down</stem>
+        <notations>
+          <articulations>
+            <staccato placement="above"/>
+            <accent placement="above"/>
+          </articulations>
+        </notations>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/32d-Arpeggio.xml b/input/regression/musicxml/32d-Arpeggio.xml
new file mode 100644 (file)
index 0000000..003ab52
--- /dev/null
@@ -0,0 +1,246 @@
+<?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">Different Arpeggio directions 
+          (normal, up, down, non-arpeggiate)</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <defaults/>
+  <part-list>
+    <score-part id="P1">
+      <part-name></part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <!-- Different Arpeggiate styles: neutral, up, down and non-arpeggiate (bracket) -->
+    <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>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="up"/></notations>
+        <lyric number="1"><text>up</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="up"/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="up"/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="down"/></notations>
+        <lyric number="1"><text>down</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="down"/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate direction="down"/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="bottom"/></notations>
+        <lyric number="1"><text>non-arp.</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="top"/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>normal</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/33-Spanners.itexi b/input/regression/musicxml/33-Spanners.itexi
new file mode 100644 (file)
index 0000000..b4d4f7a
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 33 ... Spanners
diff --git a/input/regression/musicxml/33a-Spanners.xml b/input/regression/musicxml/33a-Spanners.xml
new file mode 100644 (file)
index 0000000..803fec8
--- /dev/null
@@ -0,0 +1,685 @@
+<?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">Several spanners defined in MusicXML</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>
+        <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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>16</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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>16</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>
+        <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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slur line-type="dashed" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <direction placement="above">
+        <direction-type>
+          <wedge default-y="10" spread="0" type="crescendo"/>
+        </direction-type>
+        <offset>1</offset>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <direction placement="above">
+        <direction-type>
+          <wedge default-y="13" spread="15" type="diminuendo"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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"/>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <ornaments>
+            <wavy-line default-y="10" number="1" type="stop"/>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <ornaments>
+            <wavy-line number="1" type="start"/>
+            <wavy-line number="1" type="stop"/>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <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>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        </pitch>
+        <duration>24</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"/>
+      <direction placement="above">
+        <direction-type>
+          <bracket default-y="20" 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>
+        <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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <direction placement="above">
+        <direction-type>
+          <bracket default-y="4" 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>
+        <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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <direction placement="above">
+        <direction-type>
+          <bracket default-y="16" 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>
+        <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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <direction placement="above">
+        <direction-type>
+          <bracket default-y="16" line-end="none" line-type="dashed" number="1" type="start"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>2</offset>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <direction placement="above">
+        <direction-type>
+          <bracket default-y="15" 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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+      <direction placement="above">
+        <direction-type>
+          <dashes default-y="10" number="1" type="start"/>
+        </direction-type>
+        <offset>6</offset>
+      </direction>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</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>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <glissando line-type="wavy" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <glissando line-type="wavy" number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <technical>
+            <bend>
+              <bend-alter>6</bend-alter>
+            </bend>
+          </technical>
+        </notations>
+      </note>
+      <note print-object="no">
+        <pitch>
+          <step>F</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <technical>
+            <bend>
+              <bend-alter>0</bend-alter>
+            </bend>
+          </technical>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slide line-type="solid" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>24</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <notations>
+          <slide line-type="solid" 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/33b-Spanners-Tie.xml b/input/regression/musicxml/33b-Spanners-Tie.xml
new file mode 100644 (file)
index 0000000..90ee9e2
--- /dev/null
@@ -0,0 +1,44 @@
+<?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>
+               <miscellaneous>
+                       <miscellaneous-field name="description">Two simple tied whole notes</miscellaneous-field>
+               </miscellaneous>
+       </identification>
+       <part-list>
+               <score-part id="P1"><part-name></part-name></score-part>
+       </part-list>
+       <part id="P1">
+               <measure number="1">
+                       <attributes>
+                               <divisions>1</divisions>
+                               <key><fifths>0</fifths></key>
+                               <time><beats>4</beats><beat-type>4</beat-type></time>
+                               <staves>1</staves>
+                               <clef number="1"><sign>G</sign><line>2</line></clef>
+                       </attributes>
+                       <note>
+                               <pitch><step>F</step><octave>4</octave></pitch>
+                               <duration>4</duration>
+                               <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">
+                               <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>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/33c-Spanners-Slurs.xml b/input/regression/musicxml/33c-Spanners-Slurs.xml
new file mode 100644 (file)
index 0000000..dd2eb5e
--- /dev/null
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A note can be the end of one 
+          slur and the start of a new slur. Also, in MusicXML, nested slurs 
+          are possible like in the second measure where one slur goes over all
+          four notes, and another slur goes from the second to the third 
+          note.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <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>
+  <!--=========================================================-->
+  <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>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </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="stop"/>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="stop"/>
+          <slur number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <slur number="2" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <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">
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem default-y="5.5">up</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/33d-Spanners-OctaveShifts-Finale.xml b/input/regression/musicxml/33d-Spanners-OctaveShifts-Finale.xml
new file mode 100644 (file)
index 0000000..ed1a344
--- /dev/null
@@ -0,0 +1,193 @@
+<?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/33e-Spanners-Glissando.xml b/input/regression/musicxml/33e-Spanners-Glissando.xml
new file mode 100644 (file)
index 0000000..8afe656
--- /dev/null
@@ -0,0 +1,320 @@
+<?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/33f-Trill-EndingOnGraceNote-Finale.xml b/input/regression/musicxml/33f-Trill-EndingOnGraceNote-Finale.xml
new file mode 100644 (file)
index 0000000..a793d21
--- /dev/null
@@ -0,0 +1,152 @@
+<?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/33g-Slur-ChordedNotes.xml b/input/regression/musicxml/33g-Slur-ChordedNotes.xml
new file mode 100644 (file)
index 0000000..ff7b377
--- /dev/null
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1" width="916">
+      <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>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </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>
+        <chord/>
+        <pitch>
+          <step>G</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>
+        <chord/>
+        <pitch>
+          <step>D</step>
+          <octave>5</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>
+        <notations>
+          <slur number="1" type="stop"/>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>D</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>
+      <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
new file mode 100644 (file)
index 0000000..74b0864
--- /dev/null
@@ -0,0 +1,400 @@
+<?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
new file mode 100644 (file)
index 0000000..4edf6b3
--- /dev/null
@@ -0,0 +1,281 @@
+<?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/41-Multiple-Parts.itexi b/input/regression/musicxml/41-Multiple-Parts.itexi
new file mode 100644 (file)
index 0000000..2f06573
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 41 ... Multiple parts (staves)
diff --git a/input/regression/musicxml/41a-MultiParts-Partorder.xml b/input/regression/musicxml/41a-MultiParts-Partorder.xml
new file mode 100644 (file)
index 0000000..23b9927
--- /dev/null
@@ -0,0 +1,209 @@
+<?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">A piece with 
+                            four parts. 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">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <key>
+                               <fifths>1</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>C</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>1920</duration>
+                               <voice>1</voice>
+                               <type>half</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P1">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <key>
+                               <fifths>1</fifths>
+                               <mode>major</mode>
+                               </key>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <pitch>
+                                       <step>E</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>1920</duration>
+                               <voice>1</voice>
+                               <type>half</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P2">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <key>
+                               <fifths>1</fifths>
+                               <mode>major</mode>
+                               </key>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <pitch>
+                                       <step>G</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>1920</duration>
+                               <voice>1</voice>
+                               <type>half</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P3">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <key>
+                               <fifths>1</fifths>
+                               <mode>major</mode>
+                               </key>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <pitch>
+                                       <step>B</step>
+                                       <octave>4</octave>
+                               </pitch>
+                               <duration>960</duration>
+                               <voice>1</voice>
+                               <type>quarter</type>
+                       </note>
+                       <note>
+                               <rest/>
+                               <duration>960</duration>
+                               <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/41b-MultiParts-MoreThan10.xml b/input/regression/musicxml/41b-MultiParts-MoreThan10.xml
new file mode 100644 (file)
index 0000000..f1e3c24
--- /dev/null
@@ -0,0 +1,590 @@
+<?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">A piece with 
+                            more than 10 parts to check whether the parts 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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </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>
+               </score-part>
+               <score-part id="P16">
+                       <part-name></part-name>
+               </score-part>
+               <score-part id="P17">
+                       <part-name></part-name>
+               </score-part>
+               <score-part id="P18">
+                       <part-name></part-name>
+               </score-part>
+               <score-part id="P19">
+                       <part-name></part-name>
+               </score-part>
+       </part-list>
+       <part id="P0">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P1">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P2">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P3">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P4">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P5">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P6">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P7">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P8">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P9">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P10">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P11">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P12">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P13">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P14">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P15">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P16">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P17">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P18">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+       <part id="P19">
+               <measure number="1">
+                       <attributes>
+                               <divisions>960</divisions>
+                               <time>
+                               <beats>4</beats>
+                               <beat-type>4</beat-type>
+                               </time>
+                               <clef>
+                               <sign>G</sign>
+                               <line>2</line>
+                               </clef>
+                       </attributes>
+                       <note>
+                               <rest/>
+                               <duration>3840</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/41c-StaffGroups.xml b/input/regression/musicxml/41c-StaffGroups.xml
new file mode 100644 (file)
index 0000000..77937d2
--- /dev/null
@@ -0,0 +1,1790 @@
+<?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 huge orchestra score with 28 
+          parts and different kinds of nested bracketed groups. Each part/group 
+          is assigned a name and an abbreviation to be shown before the staff. 
+          Also, most of the groups show unbroken barlines, while the barlines 
+          are broken between the groups.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <part-group number="2" type="start">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P1">
+      <part-name>Piccolo</part-name>
+      <part-abbreviation>Picc.</part-abbreviation>
+      <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>
+      <group-barline>no</group-barline>
+    </part-group>
+    <score-part id="P2">
+      <part-name>Flute 1</part-name>
+      <part-abbreviation>Fl. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>Fl. 2</part-abbreviation>
+      <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">
+      <group-name>Oboe through Clarinet</group-name>
+      <group-abbreviation>O to Cl</group-abbreviation>
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <part-group number="4" type="start">
+      <group-symbol>line</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P4">
+      <part-name>Oboe</part-name>
+      <part-abbreviation>Ob.</part-abbreviation>
+      <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>
+      <part-abbreviation>E. Hn.</part-abbreviation>
+      <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">
+      <part-name>Clarinet in Eb</part-name>
+      <part-abbreviation>Eb Cl.</part-abbreviation>
+      <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">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>no</group-barline>
+    </part-group>
+    <score-part id="P7">
+      <part-name>Clarinet in Bb 1</part-name>
+      <part-abbreviation>Bb Cl. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>Bb Cl. 2</part-abbreviation>
+      <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">
+      <part-name>Bass Clarinet</part-name>
+      <part-abbreviation>B. Cl.</part-abbreviation>
+      <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>
+      <group-barline>no</group-barline>
+    </part-group>
+    <score-part id="P10">
+      <part-name>Bassoon 1</part-name>
+      <part-abbreviation>Bsn. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>Bsn. 2</part-abbreviation>
+      <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">
+      <part-name>Contrabassoon</part-name>
+      <part-abbreviation>C. Bn.</part-abbreviation>
+      <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">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>no</group-barline>
+    </part-group>
+    <part-group number="2" type="start">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P13">
+      <part-name>Horn in F 1</part-name>
+      <part-abbreviation>Hn. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>Hn. 2</part-abbreviation>
+      <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">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>no</group-barline>
+    </part-group>
+    <score-part id="P15">
+      <part-name>Trumpet in C 1</part-name>
+      <part-abbreviation>C Tpt. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>C Tpt. 2</part-abbreviation>
+      <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">
+      <group-symbol>bracket</group-symbol>
+      <group-barline>no</group-barline>
+    </part-group>
+    <score-part id="P17">
+      <part-name>Trombone 1</part-name>
+      <part-abbreviation>Tbn. 1</part-abbreviation>
+      <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>
+      <part-abbreviation>Tbn. 2</part-abbreviation>
+      <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">
+      <part-name>Tuba</part-name>
+      <part-abbreviation>Tuba</part-abbreviation>
+      <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">
+      <part-name>Timpani</part-name>
+      <part-abbreviation>Timp.</part-abbreviation>
+      <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>
+      <part-abbreviation>Perc.</part-abbreviation>
+      <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>
+      <part-abbreviation>Hp.</part-abbreviation>
+      <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>
+      <part-abbreviation>Pno.</part-abbreviation>
+      <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>
+      <group-barline>yes</group-barline>
+    </part-group>
+    <score-part id="P24">
+      <part-name>Violin I</part-name>
+      <part-abbreviation>Vln. I</part-abbreviation>
+      <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>
+      <part-abbreviation>Vln. II</part-abbreviation>
+      <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>
+      <part-abbreviation>Vla.</part-abbreviation>
+      <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>
+      <part-abbreviation>Vc.</part-abbreviation>
+      <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>
+      <part-abbreviation>Cb.</part-abbreviation>
+      <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>
+  <!--=========================================================-->
+  <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>
+        <transpose>
+          <diatonic>0</diatonic>
+          <chromatic>0</chromatic>
+          <octave-change>1</octave-change>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <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 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>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <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>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <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>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </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>1</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>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </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>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </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>3</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>
+        <transpose>
+          <diatonic>2</diatonic>
+          <chromatic>3</chromatic>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </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>2</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </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>2</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P9">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+          <octave-change>-1</octave-change>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P10">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P11">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P12">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+        <transpose>
+          <diatonic>0</diatonic>
+          <chromatic>0</chromatic>
+          <octave-change>-1</octave-change>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P13">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</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>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P14">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</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>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </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>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P15">
+    <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>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P16">
+    <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>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P17">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P18">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P19">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P20">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P21">
+    <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>
+        <instruments>2</instruments>
+        <clef>
+          <sign>percussion</sign>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <unpitched>
+          <display-step>E</display-step>
+          <display-octave>5</display-octave>
+        </unpitched>
+        <duration>1</duration>
+        <instrument id="P21-M76"/>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P22">
+    <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>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>2</voice>
+        <type>half</type>
+        <staff>2</staff>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P23">
+    <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>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <staff>1</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>4</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>2</voice>
+        <type>half</type>
+        <staff>2</staff>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P24">
+    <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>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P25">
+    <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>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P26">
+    <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>C</sign>
+          <line>3</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P27">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P28">
+    <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>F</sign>
+          <line>4</line>
+        </clef>
+        <transpose>
+          <diatonic>0</diatonic>
+          <chromatic>0</chromatic>
+          <octave-change>-1</octave-change>
+        </transpose>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</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/41d-StaffGroups-Nested.xml b/input/regression/musicxml/41d-StaffGroups-Nested.xml
new file mode 100644 (file)
index 0000000..28ffdb6
--- /dev/null
@@ -0,0 +1,340 @@
+<?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">Two properly nested part groups: 
+          One group  (with a square bracket) goes from staff 2 to 4) and another 
+          group (with a curly bracket) goes from staff 3 to 4.</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-group number="1" type="start">
+      <group-symbol>line</group-symbol>
+      <group-barline>yes</group-barline>
+    </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>
+      <group-barline>yes</group-barline>
+    </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>
+  <!--=========================================================-->
+  <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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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="P2">
+    <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>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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>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>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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="P4">
+    <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>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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="P5">
+    <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>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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/41e-StaffGroups-InstrumentNames-Linebroken.xml b/input/regression/musicxml/41e-StaffGroups-InstrumentNames-Linebroken.xml
new file mode 100644 (file)
index 0000000..6050067
--- /dev/null
@@ -0,0 +1,323 @@
+<?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">Part names and abbreviations can 
+          contain line breaks.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Long&#xd;
+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>
+  <!--=========================================================-->
+  <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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <print new-system="yes"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="14">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="15">
+      <print new-system="yes"/>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="16">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="17">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="18">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="19">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="21">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="22">
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="23">
+      <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/41f-StaffGroups-Overlapping.xml b/input/regression/musicxml/41f-StaffGroups-Overlapping.xml
new file mode 100644 (file)
index 0000000..c02d14f
--- /dev/null
@@ -0,0 +1,226 @@
+<?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">MusicXML allows for overlapping 
+          part-groups, while many applications do not allow overlapping groups, 
+          but require them to be properly nested. In this case, one group 
+          (with a square bracket) goes from staff 2 to 4) and another group 
+          (with a curly bracket) goes from staff 3 to 5.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <part-group number="1" type="start">
+      <group-name>Group 1</group-name>
+      <group-abbreviation>Gr1</group-abbreviation>
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </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>
+      <group-abbreviation>Grp2</group-abbreviation>
+      <group-symbol>bracket</group-symbol>
+      <group-barline>yes</group-barline>
+    </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>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </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 symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </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>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/42-MultiVoice-Parts.itexi b/input/regression/musicxml/42-MultiVoice-Parts.itexi
new file mode 100644 (file)
index 0000000..c8d15fd
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 42 ... Multiple voices per staff
diff --git a/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml b/input/regression/musicxml/42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml
new file mode 100644 (file)
index 0000000..00922bc
--- /dev/null
@@ -0,0 +1,286 @@
+<?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">Two voices share one staff. Each 
+        voice is assigned some lyrics.</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>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>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>16</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <stem>up</stem>
+        <notations>
+          <articulations>
+            <accent placement="below"/>
+          </articulations>
+          <fermata type="upright"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>This</text>
+        </lyric>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <dynamics default-y="-80">
+            <mf/>
+          </dynamics>
+        </direction-type>
+        <offset>-3</offset>
+        <sound dynamics="83"/>
+      </direction>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>is</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>the</text>
+        </lyric>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>16</duration>
+        <voice>2</voice>
+        <type>half</type>
+        <stem>down</stem>
+        <notations>
+          <articulations>
+            <accent placement="below"/>
+          </articulations>
+          <fermata type="upright"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>This</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>is</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>the</text>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest>
+          <display-step>A</display-step>
+          <display-octave>5</display-octave>
+        </rest>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>lyrics</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <stem>up</stem>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>of</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>Voice1</text>
+        </lyric>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </backup>
+      <note>
+        <rest>
+          <display-step>C</display-step>
+          <display-octave>4</display-octave>
+        </rest>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>lyrics</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <dot/>
+        <stem>down</stem>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>of</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>single</syllabic>
+          <text>Voice1</text>
+        </lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>32</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/42b-MultiVoice-MidMeasureClefChange.xml b/input/regression/musicxml/42b-MultiVoice-MidMeasureClefChange.xml
new file mode 100644 (file)
index 0000000..65279c4
--- /dev/null
@@ -0,0 +1,426 @@
+<?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 multi-voice / multi-staff part 
+          with a clef change in the middle of a measure and a &lt;backward&gt; 
+          for voice 2 jumping back beyond that clef change.</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="84">
+      <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>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <beam number="1">begin</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <attributes>
+        <clef number="1">
+          <sign>F</sign>
+          <line>4</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <backup>
+        <duration>1008</duration>
+      </backup>
+      <note>
+        <rest/>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">begin</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">end</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">begin</beam>
+        <notations>
+          <slur number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</octave>
+        </pitch>
+        <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>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <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>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>2</octave>
+        </pitch>
+        <duration>84</duration>
+        <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>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>2</octave>
+        </pitch>
+        <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>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="85">
+      <attributes>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <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">
+            <fp/>
+          </dynamics>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <notations>
+          <slur number="1" placement="above" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <backup>
+        <duration>1008</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>336</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>336</duration>
+        <voice>3</voice>
+        <type>quarter</type>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>168</duration>
+        <voice>3</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/43-MultiStaff-Parts.itexi b/input/regression/musicxml/43-MultiStaff-Parts.itexi
new file mode 100644 (file)
index 0000000..9adbe48
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 43 ... One voice on multiple staves
diff --git a/input/regression/musicxml/43a-PianoStaff.xml b/input/regression/musicxml/43a-PianoStaff.xml
new file mode 100644 (file)
index 0000000..d68add6
--- /dev/null
@@ -0,0 +1,42 @@
+<?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>
+               <miscellaneous>
+                       <miscellaneous-field name="description">A simple piano staff</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>384</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                               <staff>1</staff>
+                       </note>
+                       <backup><duration>384</duration></backup>
+                       <note>
+                               <pitch><step>B</step><octave>2</octave></pitch>
+                               <duration>384</duration>
+                               <voice>2</voice>
+                               <type>whole</type>
+                               <staff>2</staff>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/43b-MultiStaff-DifferentKeys.xml b/input/regression/musicxml/43b-MultiStaff-DifferentKeys.xml
new file mode 100644 (file)
index 0000000..03a84a9
--- /dev/null
@@ -0,0 +1,46 @@
+<?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>
+               <miscellaneous>
+                       <miscellaneous-field name="description">A piano staff 
+                            with different keys and clefs for each of its 
+                            staves. The keys and clefs for both staves are given 
+                            at the very beginning 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="1">
+                       <attributes>
+                               <divisions>96</divisions>
+                               <key number="1"><fifths>0</fifths></key>
+                               <key number="2"><fifths>2</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>384</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                               <staff>1</staff>
+                       </note>
+                       <backup><duration>384</duration></backup>
+                       <note>
+                               <pitch><step>B</step><octave>2</octave></pitch>
+                               <duration>384</duration>
+                               <voice>2</voice>
+                               <type>whole</type>
+                               <staff>2</staff>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/43c-MultiStaff-DifferentKeysAfterBackup.xml b/input/regression/musicxml/43c-MultiStaff-DifferentKeysAfterBackup.xml
new file mode 100644 (file)
index 0000000..7a20cad
--- /dev/null
@@ -0,0 +1,50 @@
+<?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>
+               <miscellaneous>
+                       <miscellaneous-field name="description">A piano staff 
+                            with different keys and clefs for each of its 
+                            staves. The key and clef for the second staff is 
+                            given only after a backward, just before the first
+                            note of the second staff is given, but after the 
+                            whole measure for staff 1 has been 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 number="1"><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>
+                       </attributes>
+                       <note>
+                               <pitch><step>F</step><octave>4</octave></pitch>
+                               <duration>384</duration>
+                               <voice>1</voice>
+                               <type>whole</type>
+                               <staff>1</staff>
+                       </note>
+                       <backup><duration>384</duration></backup>
+                       <attributes>
+                               <key number="2"><fifths>2</fifths></key>
+                               <clef number="2"><sign>F</sign><line>4</line></clef>
+                       </attributes>
+                       <note>
+                               <pitch><step>B</step><octave>2</octave></pitch>
+                               <duration>384</duration>
+                               <voice>2</voice>
+                               <type>whole</type>
+                               <staff>2</staff>
+                       </note>
+               </measure>
+       </part>
+</score-partwise>
diff --git a/input/regression/musicxml/43d-MultiStaff-StaffChange.xml b/input/regression/musicxml/43d-MultiStaff-StaffChange.xml
new file mode 100644 (file)
index 0000000..dab5d7e
--- /dev/null
@@ -0,0 +1,359 @@
+<?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">Staff changes in a piano staff. 
+          The voice from the second staff has some notes/chords on the first 
+          staff. The final two chords have some notes on the first, some on 
+          the second staff.</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>2</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>
+        <rest/>
+        <duration>8</duration>
+        <voice>1</voice>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>8</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        <beam number="1">end</beam>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>8</duration>
+        <voice>1</voice>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>8</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>2</voice>
+        <type>eighth</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>2</voice>
+        <type>half</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/43e-Multistaff-ClefDynamics.xml b/input/regression/musicxml/43e-Multistaff-ClefDynamics.xml
new file mode 100644 (file)
index 0000000..e6c3f1a
--- /dev/null
@@ -0,0 +1,413 @@
+<?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 piano staff with dynamics and 
+          clef changes, that apply 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>
+  <!--=========================================================-->
+  <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>
+        <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"/>
+      <direction placement="below">
+        <direction-type>
+          <dynamics default-y="-62" relative-x="-6">
+            <ffff/>
+          </dynamics>
+        </direction-type>
+        <staff>1</staff>
+        <sound dynamics="141"/>
+      </direction>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <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">
+            <p/>
+          </dynamics>
+        </direction-type>
+        <offset>1</offset>
+        <staff>1</staff>
+        <sound dynamics="54"/>
+      </direction>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </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"/>
+        </direction-type>
+        <offset>1</offset>
+        <staff>2</staff>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</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>
+        </pitch>
+        <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>
+        <pitch>
+          <step>C</step>
+          <octave>3</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>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <attributes>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+        <clef number="2">
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>3</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>
+        </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>
+        </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>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <attributes>
+        <clef number="1">
+          <sign>C</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </backup>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>2</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>
+        </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>
+        </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>
+        </pitch>
+        <duration>8</duration>
+        <voice>2</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <rest/>
+        <duration>32</duration>
+        <voice>1</voice>
+        <staff>1</staff>
+      </note>
+      <backup>
+        <duration>32</duration>
+      </backup>
+      <note>
+        <rest/>
+        <duration>32</duration>
+        <voice>2</voice>
+        <staff>2</staff>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/45-Repeats.itexi b/input/regression/musicxml/45-Repeats.itexi
new file mode 100644 (file)
index 0000000..89516fb
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 45 ... Repeats
diff --git a/input/regression/musicxml/45a-SimpleRepeat.xml b/input/regression/musicxml/45a-SimpleRepeat.xml
new file mode 100644 (file)
index 0000000..074ba1f
--- /dev/null
@@ -0,0 +1,65 @@
+<?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 simple, repeated measure 
+          (repeated 5 times)</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <repeat direction="backward" times="5"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <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/45b-RepeatWithAlternatives.xml b/input/regression/musicxml/45b-RepeatWithAlternatives.xml
new file mode 100644 (file)
index 0000000..a29f1c0
--- /dev/null
@@ -0,0 +1,107 @@
+<?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 simple repeat with two 
+          alternative endings (volta brackets).</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>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <ending number="1" type="start"/>
+      </barline>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="1" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <barline location="left">
+        <ending number="2" type="start"/>
+      </barline>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <ending number="2" type="discontinue"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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/45c-RepeatMultipleTimes.xml b/input/regression/musicxml/45c-RepeatMultipleTimes.xml
new file mode 100644 (file)
index 0000000..8ed24f7
--- /dev/null
@@ -0,0 +1,122 @@
+<?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">Repeats can also be nested.</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <bar-style>heavy-light</bar-style>
+        <repeat direction="forward"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <repeat direction="backward" times="5"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <repeat direction="backward" times="3"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <print new-system="yes"/>
+      <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/45d-Repeats-Nested-Alternatives.xml b/input/regression/musicxml/45d-Repeats-Nested-Alternatives.xml
new file mode 100644 (file)
index 0000000..2d34453
--- /dev/null
@@ -0,0 +1,178 @@
+<?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">Nested repeats, each with 
+          alternative endings.</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <ending number="1" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="1" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <barline location="left">
+        <ending number="2" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="2" type="stop"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <barline location="left">
+        <ending number="3" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="3" type="discontinue"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <barline location="left">
+        <ending number="1" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="1" type="stop"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <barline location="left">
+        <ending number="5" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="5" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <print new-system="yes"/>
+      <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/45e-Repeats-Nested-Alternatives.xml b/input/regression/musicxml/45e-Repeats-Nested-Alternatives.xml
new file mode 100644 (file)
index 0000000..6b58074
--- /dev/null
@@ -0,0 +1,167 @@
+<?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 more nested repeats with 
+          alternatives. The barline between measure 7 and 8 will probably be 
+          messed up! (Should be a repeat on both sides!)</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <ending number="1" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="1" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <barline location="left">
+        <ending number="2" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="2" type="discontinue"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <barline location="left">
+        <bar-style>heavy-light</bar-style>
+        <repeat direction="forward"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <print new-system="yes"/>
+      <barline location="left">
+        <ending number="1" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="1" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <barline location="left">
+        <bar-style>heavy-light</bar-style>
+        <repeat direction="forward"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <print new-system="yes"/>
+      <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/45f-Repeats-InvalidEndings.xml b/input/regression/musicxml/45f-Repeats-InvalidEndings.xml
new file mode 100644 (file)
index 0000000..9ce37f4
--- /dev/null
@@ -0,0 +1,105 @@
+<?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 more nested repeats with 
+          alternatives, where the MusicXML file does not make sense in the 
+          first place. How well are applications able to cope with improper 
+          repeats and alternatives?</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <ending number="1, 2, 3" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="1, 2, 3" type="stop"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <barline location="left">
+        <ending number="2" type="start"/>
+      </barline>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <ending number="2" type="discontinue"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        <ending number="2" type="stop"/>
+        <repeat direction="backward"/>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <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/45g-Repeats-NotEnded.xml b/input/regression/musicxml/45g-Repeats-NotEnded.xml
new file mode 100644 (file)
index 0000000..db3cac5
--- /dev/null
@@ -0,0 +1,73 @@
+<?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 forward-repeating bar line 
+          without an ending repeat bar.</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>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <barline location="left">
+        <bar-style>heavy-light</bar-style>
+        <repeat direction="forward"/>
+      </barline>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <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/46-Measures.itexi b/input/regression/musicxml/46-Measures.itexi
new file mode 100644 (file)
index 0000000..92ebde3
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 46 ... Barlines, Measures
diff --git a/input/regression/musicxml/46a-Barlines.xml b/input/regression/musicxml/46a-Barlines.xml
new file mode 100644 (file)
index 0000000..86c9700
--- /dev/null
@@ -0,0 +1,170 @@
+<?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 types of (non-repeat) 
+          barlines.</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>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>heavy</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>dashed</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>dotted</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+      <barline location="right">
+        <bar-style>none</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="11">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="12">
+      <print new-system="yes"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="13">
+      <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/46b-MidmeasureBarline.xml b/input/regression/musicxml/46b-MidmeasureBarline.xml
new file mode 100644 (file)
index 0000000..9323ae4
--- /dev/null
@@ -0,0 +1,73 @@
+<?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">Barlines can appear at 
+            mid-measure positions, without using an implicit 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 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>
+            <barline location="middle">
+                <bar-style>dotted</bar-style>
+            </barline>
+            <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>
+        </measure>
+        <!--=======================================================-->
+    </part>
+    <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/46c-Midmeasure-Clef.xml b/input/regression/musicxml/46c-Midmeasure-Clef.xml
new file mode 100644 (file)
index 0000000..bd8cea4
--- /dev/null
@@ -0,0 +1,107 @@
+<?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 clef change in the middle of a 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>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <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>
+      </note>
+      <barline location="right">
+        <bar-style>none</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure implicit="yes" number="X1">
+      <attributes>
+        <clef>
+          <sign>C</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <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>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml b/input/regression/musicxml/46d-PickupMeasure-ImplicitMeasures.xml
new file mode 100644 (file)
index 0000000..5fbd00a
--- /dev/null
@@ -0,0 +1,147 @@
+<?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 3/8 pickup measure, a measure 
+          that is split into one (incomplete, only 2/4) measure and an implicit 
+          measure, and an incomplete measure (containg 3/4).</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 implicit="yes" number="0">
+      <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>E</step>
+              <octave>4</octave>
+          </pitch>
+          <duration>2</duration>
+          <voice>1</voice>
+          <type>quarter</type>
+          <stem>up</stem>
+      </note>
+      <note>
+          <pitch>
+              <step>E</step>
+              <octave>4</octave>
+          </pitch>
+          <duration>1</duration>
+          <voice>1</voice>
+          <type>eighth</type>
+          <stem>up</stem>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="1">
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <barline location="right">
+        <bar-style>none</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+    <measure implicit="yes" number="X1">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</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>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+      </note>
+      <note>
+        <rest/>
+        <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/46e-PickupMeasure-SecondVoiceMessup.xml b/input/regression/musicxml/46e-PickupMeasure-SecondVoiceMessup.xml
new file mode 100644 (file)
index 0000000..8f2bdbc
--- /dev/null
@@ -0,0 +1,96 @@
+<?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/51-Header.itexi b/input/regression/musicxml/51-Header.itexi
new file mode 100644 (file)
index 0000000..34c21cb
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 51 ... Header information
diff --git a/input/regression/musicxml/51b-HeaderQuotes-Finale.xml b/input/regression/musicxml/51b-HeaderQuotes-Finale.xml
new file mode 100644 (file)
index 0000000..544bb5a
--- /dev/null
@@ -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/51c-MultipleRights.xml b/input/regression/musicxml/51c-MultipleRights.xml
new file mode 100644 (file)
index 0000000..40102cd
--- /dev/null
@@ -0,0 +1,32 @@
+<?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>
+    <rights>Copyright © XXXX by Y. ZZZZ.</rights>
+    <rights>Released To The Public Domain.</rights>
+    <miscellaneous>
+      <miscellaneous-field name="description">There can be multiple 
+        &lt;rights&gt; tags in the identification element of the score. The 
+        conversion shall still work, ideally using both of 
+        them.</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">
+      <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/52-PageLayout.itexi b/input/regression/musicxml/52-PageLayout.itexi
new file mode 100644 (file)
index 0000000..478b06b
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 52 ... Page layout
diff --git a/input/regression/musicxml/52a-PageLayout.xml b/input/regression/musicxml/52a-PageLayout.xml
new file mode 100644 (file)
index 0000000..5e254b4
--- /dev/null
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <movement-title>Layout options</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Several page layout settings: 
+          paper size, margins, system margins and distances, different fonts, 
+          etc.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <defaults>
+    <scaling>
+      <millimeters>3.7703</millimeters>
+      <tenths>40</tenths>
+    </scaling>
+    <page-layout>
+      <page-height>954</page-height>
+      <page-width>1804</page-width>
+      <page-margins type="both">
+        <left-margin>318</left-margin>
+        <right-margin>212</right-margin>
+        <top-margin>53</top-margin>
+        <bottom-margin>74</bottom-margin>
+      </page-margins>
+    </page-layout>
+    <system-layout>
+      <system-margins>
+        <left-margin>248</left-margin>
+        <right-margin>206</right-margin>
+      </system-margins>
+      <system-distance>561</system-distance>
+      <top-system-distance>436</top-system-distance>
+    </system-layout>
+    <music-font font-family="Maestro" font-size="10.7"/>
+    <word-font font-family="Times New Roman" font-size="5.3"/>
+  </defaults>
+  <credit>
+    <credit-words default-x="955" default-y="876" font-size="18" font-weight="bold" justify="center" valign="top">Layout options</credit-words>
+  </credit>
+  <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>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1" width="441">
+      <print page-number="8"/>
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <sound tempo="120"/>
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2" width="378">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3" width="819">
+      <print new-page="yes" page-number="9"/>
+      <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/61-Lyrics.itexi b/input/regression/musicxml/61-Lyrics.itexi
new file mode 100644 (file)
index 0000000..e533f66
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 61 ... Lyrics
diff --git a/input/regression/musicxml/61a-Lyrics-Finale.xml b/input/regression/musicxml/61a-Lyrics-Finale.xml
new file mode 100644 (file)
index 0000000..c680a4b
--- /dev/null
@@ -0,0 +1,155 @@
+<?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/61b-MultipleLyrics-Finale.xml b/input/regression/musicxml/61b-MultipleLyrics-Finale.xml
new file mode 100644 (file)
index 0000000..c3f8034
--- /dev/null
@@ -0,0 +1,207 @@
+<?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/61c-Lyrics-Pianostaff-Finale.xml b/input/regression/musicxml/61c-Lyrics-Pianostaff-Finale.xml
new file mode 100644 (file)
index 0000000..bfb1d58
--- /dev/null
@@ -0,0 +1,289 @@
+<?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/61d-Lyrics-Melisma-Finale.xml b/input/regression/musicxml/61d-Lyrics-Melisma-Finale.xml
new file mode 100644 (file)
index 0000000..c2c4f69
--- /dev/null
@@ -0,0 +1,187 @@
+<?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/61e-Lyrics-Chords-Finale.xml b/input/regression/musicxml/61e-Lyrics-Chords-Finale.xml
new file mode 100644 (file)
index 0000000..506e0bc
--- /dev/null
@@ -0,0 +1,147 @@
+<?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/61f-Lyrics-GracedNotes-Finale.xml b/input/regression/musicxml/61f-Lyrics-GracedNotes-Finale.xml
new file mode 100644 (file)
index 0000000..5567bd7
--- /dev/null
@@ -0,0 +1,230 @@
+<?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/61g-Lyrics-NameNumber.xml b/input/regression/musicxml/61g-Lyrics-NameNumber.xml
new file mode 100644 (file)
index 0000000..fdab72d
--- /dev/null
@@ -0,0 +1,120 @@
+<?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 lyrics syllable can have both 
+          a number and a name attribute. The question is: What should be used 
+          to put syllables of the same voice together. This example uses 
+          different number/name combinations to check how different 
+          applications handle this unspecified case (The advice on the 
+          MusicXML mailing list was "there is no correct way, each 
+          application can do what it thinks is best").</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><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>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1" name="Verse">
+          <syllabic>begin</syllabic>
+          <text>Verse1A</text>
+        </lyric>
+        <lyric number="1" name="Chorus">
+          <syllabic>begin</syllabic>
+          <text>Chorus1A</text>
+        </lyric>
+        <lyric number="1" name="Chorus">
+          <syllabic>begin</syllabic>
+          <text>AnotherChorus1A</text>
+        </lyric>
+        <lyric number="2" name="Chorus">
+          <syllabic>begin</syllabic>
+          <text>Chorus1A</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>begin</syllabic>
+          <text>1B</text>
+        </lyric>
+        <lyric number="2">
+          <syllabic>begin</syllabic>
+          <text>2B</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1" name="Verse">
+          <syllabic>begin</syllabic>
+          <text>Verse1C</text>
+        </lyric>
+        <lyric number="2" name="Chorus">
+          <syllabic>begin</syllabic>
+          <text>Chorus2C</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1" name="Chorus">
+          <syllabic>begin</syllabic>
+          <text>Chorus1D</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric name="Verse">
+          <syllabic>begin</syllabic>
+          <text>VerseE</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric>
+          <syllabic>begin</syllabic>
+          <text>NoneF</text>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml b/input/regression/musicxml/61h-Lyrics-BeamsMelismata.xml
new file mode 100644 (file)
index 0000000..64ac98b
--- /dev/null
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Beaming or slurs can indicate 
+          melismata for lyrics. Also make sure that notes without an explicit
+          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>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>2</divisions>
+      </attributes>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+        <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>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch><step>A</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>lis</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">begin</beam>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ma</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <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>eighth</type>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>A</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>lis</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ma</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</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>eighth</type>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch><step>A</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>lis</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <notations>
+          <slur number="1" type="start"/>
+        </notations>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ma</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</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>eighth</type>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>A</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>middle</syllabic>
+          <text>lis</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>C</step><octave>5</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1">
+          <syllabic>end</syllabic>
+          <text>ma</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>B</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <notations>
+          <slur number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/61i-Lyrics-Chords.xml b/input/regression/musicxml/61i-Lyrics-Chords.xml
new file mode 100644 (file)
index 0000000..8f3db1e
--- /dev/null
@@ -0,0 +1,72 @@
+<?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">Each note of a chord can have
+          some lyrics attached. In this case, each note of the chord has lyrics 
+          of the form "Lyrics [123]" attached, where each lyrics has a different 
+          number attribute to distinguish them. These syllables should be 
+          imported into three different stanzas and the timing should be 
+          correct.</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>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Lyrics 1</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="2"><text>Lyrics 2</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="3"><text>Lyrics 3</text></lyric>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/61j-Lyrics-Elisions.xml b/input/regression/musicxml/61j-Lyrics-Elisions.xml
new file mode 100644 (file)
index 0000000..960b711
--- /dev/null
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Multiple lyrics syllables 
+          assigned to a single note are implemented either using a space in 
+          the lyrics or by using the &lt;elision&gt; lyrics element. This 
+          testcase checks both of them. First, a note with on syllable is
+          given, then a note with two syllables separated by a spcae and finally
+          a note with two and one with three syllables implemented using 
+          &lt;elision&gt; 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>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>
+        <stem>down</stem>
+        <lyric number="1">
+          <text>a</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <text>b c</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <text>d</text>
+          <elision/>
+          <text>e</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <lyric number="1">
+          <text>f</text>
+          <elision/>
+          <text>g</text>
+          <elision/>
+          <text>h</text>
+        </lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/71-Guitar.itexi b/input/regression/musicxml/71-Guitar.itexi
new file mode 100644 (file)
index 0000000..6d9bb50
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 71 ... Guitar notation
diff --git a/input/regression/musicxml/71a-Chords-Finale.xml b/input/regression/musicxml/71a-Chords-Finale.xml
new file mode 100644 (file)
index 0000000..55a1d32
--- /dev/null
@@ -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>
+  <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
new file mode 100644 (file)
index 0000000..4238e3d
--- /dev/null
@@ -0,0 +1,227 @@
+<?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
new file mode 100644 (file)
index 0000000..281eebb
--- /dev/null
@@ -0,0 +1,441 @@
+<?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/71d-ChordsFretsOnMultistaff-Finale.xml b/input/regression/musicxml/71d-ChordsFretsOnMultistaff-Finale.xml
new file mode 100644 (file)
index 0000000..fba900b
--- /dev/null
@@ -0,0 +1,618 @@
+<?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
new file mode 100644 (file)
index 0000000..fab6517
--- /dev/null
@@ -0,0 +1,1643 @@
+<?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/71f-AllChordTypes.xml b/input/regression/musicxml/71f-AllChordTypes.xml
new file mode 100644 (file)
index 0000000..facab34
--- /dev/null
@@ -0,0 +1,599 @@
+<?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>All MusicXML chord names/types with &lt;root&gt;</movement-title>
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">All chord types defined in 
+          MusicXML. The staff will only contain one c' note (NO chord) for 
+          all of them, but the chord names should be properly 
+          printed.</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>
+    </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>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>augmented</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>augmented</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>diminished</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>diminished</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>dominant</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>dominant</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-seventh</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-seventh</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-seventh</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor-seventh</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>diminished-seventh</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>diminished-seventh</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>augmented-seventh</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>augmented-seventh</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>half-diminished</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>half-diminished</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-minor</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-minor</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-sixth</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-sixth</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-sixth</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor-sixth</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>dominant-ninth</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>dominant-ninth</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-ninth</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-ninth</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-ninth</kind>
+        <lyric number="1"><text>minor-ninth</text></lyric>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor-ninth</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>dominant-11th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>dominant-11th</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-11th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-11th</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-11th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor-11th</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>dominant-13th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>dominant-13th</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major-13th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>major-13th</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>minor-13th</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>minor-13th</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>suspended-second</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>suspended-second</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>suspended-fourth</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>suspended-fourth</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>Neapolitan</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Neapolitan</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>Italian</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Italians</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>French</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>French</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>German</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+         <lyric number="1"><text>German</text></lyric>
+     </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="8">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>pedal</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>pedal</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>power</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>power</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>Tristan</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>Tristan</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>other</kind>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>other</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="9">
+      <harmony>
+        <root>
+          <root-step>F</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major</kind>
+        <inversion>2</inversion>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <lyric number="1"><text>Inversion</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>F</root-step>
+          <root-alter>-2</root-alter>
+        </root>
+        <kind>major</kind>
+        <bass>
+          <bass-step>C</bass-step>
+        </bass>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1"><text>Fbb/C</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>G</root-step>
+          <root-alter>1</root-alter>
+        </root>
+        <kind>major</kind>
+        <bass>
+          <bass-step>D</bass-step>
+          <bass-alter>1</bass-alter>
+        </bass>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <lyric number="1"><text>G#/D#</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+      </harmony>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>C</text></lyric>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="10">
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>3</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>subtract</degree-type>
+        </degree>
+        <degree>
+          <degree-value>5</degree-value>
+          <degree-alter>-1</degree-alter>
+          <degree-type>alter</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>C-3+5b</text></lyric>
+      </note>
+      <harmony>
+        <root>
+          <root-step>C</root-step>
+        </root>
+        <kind>major</kind>
+        <degree>
+          <degree-value>1</degree-value>
+          <degree-alter>0</degree-alter>
+          <degree-type>subtract</degree-type>
+        </degree>
+        <degree>
+          <degree-value>6</degree-value>
+          <degree-alter>-1</degree-alter>
+          <degree-type>add</degree-type>
+        </degree>
+      </harmony>
+      <note>
+        <pitch><step>C</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1"><text>C-1+6b</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/72-TransposingInstruments.itexi b/input/regression/musicxml/72-TransposingInstruments.itexi
new file mode 100644 (file)
index 0000000..8c1e192
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 72 ... Transposing instruments
diff --git a/input/regression/musicxml/72a-TransposingInstruments.xml b/input/regression/musicxml/72a-TransposingInstruments.xml
new file mode 100644 (file)
index 0000000..bbd3ef8
--- /dev/null
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Transposing instruments: Trumpet 
+          in Bb, Horn in Eb, Piano; All of them show the C major scale (the 
+          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Piano</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</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>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <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>
+      </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>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</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>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</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>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</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>
+  <!--=========================================================-->
+  <part id="P3">
+    <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>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</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>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </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>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</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>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/72b-TransposingInstruments-Full.xml b/input/regression/musicxml/72b-TransposingInstruments-Full.xml
new file mode 100644 (file)
index 0000000..6a090be
--- /dev/null
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Various transposition. Each
+          part plays a c'', just displayed in different display pitches.
+          The second-to-last staff uses a transposition where the displayed c'
+          is an actual f''' concert pitch. The final staff is an untransposed
+          instrument.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Clarinet in Eb</part-name>
+      <part-abbreviation>Eb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Clarinet in Bb</part-name>
+      <part-abbreviation>Bb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Clarinet in A</part-name>
+      <part-abbreviation>A Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P4">
+      <part-name>Horn in F</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P5">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P6">
+      <part-name>Piccolo Trumpet in A</part-name>
+      <part-abbreviation>Picc.Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P7">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P8">
+      <part-name>Trumpet in C</part-name>
+      <part-abbreviation>C Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P9">
+      <part-name>Trumpet in D</part-name>
+      <part-abbreviation>D Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P10">
+      <part-name>displayed c'=fis'''</part-name>
+    </score-part>
+    <score-part id="P11">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>4</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>
+        <transpose>
+          <diatonic>2</diatonic>
+          <chromatic>3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</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>3</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <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>
+        <key>
+          <fifths>-2</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>
+        <transpose>
+          <diatonic>-2</diatonic>
+          <chromatic>-3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</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>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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>4</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>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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>-2</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>
+        <transpose>
+          <diatonic>5</diatonic>
+          <chromatic>9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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>3</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>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </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>1</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>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P9">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-1</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>
+        <transpose>
+          <diatonic>1</diatonic>
+          <chromatic>2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P10">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>7</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          <clef-octave-change>-1</clef-octave-change>
+        </clef>
+        <transpose>
+          <diatonic>3</diatonic>
+          <chromatic>6</chromatic>
+          <octave-change>3</octave-change>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>1</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P11">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</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>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/73-Percussion.itexi b/input/regression/musicxml/73-Percussion.itexi
new file mode 100644 (file)
index 0000000..ed74f26
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 73 ... Percussion
diff --git a/input/regression/musicxml/73a-Percussion-Finale.xml b/input/regression/musicxml/73a-Percussion-Finale.xml
new file mode 100644 (file)
index 0000000..e108cf5
--- /dev/null
@@ -0,0 +1,192 @@
+<?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/74-Figured-Bass.itexi b/input/regression/musicxml/74-Figured-Bass.itexi
new file mode 100644 (file)
index 0000000..73e8be1
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 74 ... Figured bass
diff --git a/input/regression/musicxml/74a-FiguredBass.xml b/input/regression/musicxml/74a-FiguredBass.xml
new file mode 100644 (file)
index 0000000..7837c8c
--- /dev/null
@@ -0,0 +1,112 @@
+<?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">Some figured bass containing 
+          alterated figures, bracketed figures and slashed figures. The last 
+          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>
+  <!--=========================================================-->
+  <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"/>
+      <figured-bass>
+        <figure><figure-number>3</figure-number></figure>
+        <duration>4</duration>
+      </figured-bass>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <figured-bass>
+        <figure><prefix>sharp</prefix><figure-number>1</figure-number></figure>
+        <figure><prefix>flat</prefix><figure-number>3</figure-number></figure>
+        <figure><prefix>natural</prefix><figure-number>5</figure-number></figure>
+        <duration>6</duration>
+      </figured-bass>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>6</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+      </note>
+      <figured-bass parentheses="yes">
+        <figure><figure-number>6</figure-number></figure>
+      </figured-bass>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>16th</type>
+      </note>
+      <figured-bass>
+        <figure><figure-number>5</figure-number><suffix>slash</suffix></figure>
+        <figure><prefix>flat</prefix><figure-number>127</figure-number><suffix>slash</suffix></figure>
+        <duration>8</duration>
+      </figured-bass>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>8</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+      </note>
+      <!-- Check how well the application handles an empty element (invalid MusicXML!) -->
+      <figured-bass>
+      </figured-bass>
+      <note>
+        <pitch><step>G</step><octave>4</octave></pitch>
+        <duration>8</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/75-OtherInstruments.itexi b/input/regression/musicxml/75-OtherInstruments.itexi
new file mode 100644 (file)
index 0000000..60b095d
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 75 ... Other instrumental notation
diff --git a/input/regression/musicxml/75a-AccordionRegistrations.xml b/input/regression/musicxml/75a-AccordionRegistrations.xml
new file mode 100644 (file)
index 0000000..1a98a65
--- /dev/null
@@ -0,0 +1,360 @@
+<?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 possible accordion 
+          registrations.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <defaults/>
+  <part-list>
+    <score-part id="P1">
+      <part-name></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>
+        <direction-type>
+          <accordion-registration>
+              <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>0/0/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-middle>1</accordion-middle>
+          </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>0/1/0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-middle>1</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>0/1/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-middle>2</accordion-middle>
+          </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>0/2/0</text></lyric>
+      </note>
+    </measure>
+    <measure number="2">
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <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>0/2/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-middle>3</accordion-middle>
+          </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>0/3/0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-middle>3</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>0/3/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <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>1/0/1</text></lyric>
+      </note>
+    </measure>
+    <measure number="3">
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+          </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>1/0/0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>1</accordion-middle>
+          </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>1/1/0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>1</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>1/1/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>2</accordion-middle>
+          </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>1/2/0</text></lyric>
+      </note>
+    </measure>
+    <measure number="4">
+      <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>1/2/1</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>3</accordion-middle>
+          </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>1/3/0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>3</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>1/3/1</text></lyric>
+      </note>
+      <!-- Special cases: No accordion-(high|middle|low) given, empty middle, 
+           middle with invalid value, middle with 0 -->
+      <direction>
+        <direction-type>
+          <accordion-registration>
+          </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>empty</text></lyric>
+      </note>
+    </measure>
+    <measure number="5">
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <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>empty M</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>test</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>inval.M</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>0</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>M=0</text></lyric>
+      </note>
+      <direction>
+        <direction-type>
+          <accordion-registration>
+              <accordion-high/>
+              <accordion-middle>5</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>M=5</text></lyric>
+      </note>
+      
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+    <!--=======================================================-->
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/90-Compressed-MusicXML.itexi b/input/regression/musicxml/90-Compressed-MusicXML.itexi
new file mode 100644 (file)
index 0000000..5f2cfc4
--- /dev/null
@@ -0,0 +1 @@
+@unnumberedsec 90 ... Compressed MusicXML files
diff --git a/input/regression/musicxml/90a-Compressed-MusicXML.mxl b/input/regression/musicxml/90a-Compressed-MusicXML.mxl
new file mode 100644 (file)
index 0000000..d709094
Binary files /dev/null and b/input/regression/musicxml/90a-Compressed-MusicXML.mxl differ
index 745e487a3566a9a974929d7aa38da772da5fe71c..86f59171521a8a366290564a0de2b73d294f14bf 100644 (file)
@@ -1,2 +1 @@
-@section Compatibility with broken MusicXML
-
+@unnumberedsec 99 ... Compatibility with broken MusicXML
index 7f4c32a1750f29eb6b083c8c9bdc256f481eeee2..1f3bffb75b0ec9f55019fb8db17b7dbe478706a8 100644 (file)
@@ -539,46 +539,50 @@ my @default_toc = [];
 # recursively generate the TOC entries for the element and its children (which
 # are only shown up to maxlevel. All ancestors of the current element are also
 # shown with their immediate children, irrespective of their level.
-# Unnumbered entries are only printed out if they are at top-level or their
-# parent element is an ancestor of the currently viewed node.
-sub generate_ly_toc_entries($$$$)
+# Unnumbered entries are only printed out if they are at top-level or 2nd level 
+# or their parent element is an ancestor of the currently viewed node.
+# The conditions to call this method to print the entry for a child node is:
+# -) the parent is an ancestor of the current page node
+# -) the parent is a numbered element at top-level toplevel (i.e. show numbered 
+#    and unnumbered 2nd-level children of numbered nodes)
+# -) the child element is a numbered node below level maxlevel
+sub generate_ly_toc_entries($$$)
 {
   my $element = shift;
   my $element_path = shift;
   my $maxlevel = shift;
-  my $always_show_unnumbered_children = shift;
   # Skip undefined sections, plus all sections generated by index splitting
   return() if (not defined($element) or exists($element->{'index_page'}));
   my @result = ();
   my $level = $element->{'toc_level'};
   my $is_parent_of_current = $element->{'id'} && $element_path->{$element->{'id'}};
-  my $print_children = ( ($level < $maxlevel) or $is_parent_of_current );
   my $ind = '  ' x $level;
   my $this_css_class = $is_parent_of_current ? " class=\"toc_current\"" : "";
 
   my $entry = "$ind<li$this_css_class>" . &$anchor ($element->{'tocid'}, "$element->{'file'}#$element->{'target'}",$element->{'text'});
 
+  push (@result, $entry);
   my $children = $element->{'section_childs'};
-  # Don't add unnumbered entries, unless they are at top-level or a parent of the current!
-  if (not ($element->{'number'} or $always_show_unnumbered_children)) {
-    return @result;
-  }
-  if ( $print_children and defined($children) and (ref($children) eq "ARRAY") ) {
-    push (@result, $entry);
+  if (defined($children) and (ref($children) eq "ARRAY")) {
+    my $force_children = $is_parent_of_current or ($level == 1 and $element->{'number'});
     my @child_result = ();
-    foreach (@$children) {
-      push (@child_result, generate_ly_toc_entries($_, $element_path, $maxlevel, $is_parent_of_current));
+    foreach my $c (@$children) {
+      my $is_numbered_child = defined ($c->{'number'});
+      my $below_maxlevel = $c->{'toc_level'} le $maxlevel;
+      if ($force_children or ($is_numbered_child and $below_maxlevel)) {
+        my @child_res = generate_ly_toc_entries($c, $element_path, $maxlevel);
+        push (@child_result, @child_res);
+      }
     }
     # if no child nodes were generated, e.g. for the index, where expanded pages
     # are ignored, don't generate a list at all...
     if (@child_result) {
       push (@result, "\n$ind<ul$NO_BULLET_LIST_ATTRIBUTE>\n");
       push (@result, @child_result);
-      push (@result, "$ind</ul></li>\n");
+      push (@result, "$ind</ul>\n");
     }
-  } else {
-    push (@result, $entry . "</li>\n");
   }
+  push (@result, "$ind</li>\n");
   return @result;
 }
 
@@ -604,7 +608,7 @@ sub lilypond_generate_page_toc_body($)
     my @toc_entries = ("<div class=\"contents\">\n", "<ul$NO_BULLET_LIST_ATTRIBUTE>\n");
     my $children = $current_element->{'section_childs'};
     foreach ( @$children ) {
-      push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth, False));
+      push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth));
     }
     push (@toc_entries, "</ul>\n");
     push (@toc_entries, "</div>\n");
index 5c845f841a99238be14b71790f60e1a9f485649a..9a918ba6b3756bfd7a5c2dff77bae9fcb806d36d 100644 (file)
@@ -430,8 +430,6 @@ class Attributes (Measure_element):
                     else:
                         i.message (_ ("Key alteration octave given for a "
                             "non-existing alteration nr. %s, available numbers: %s!") % (nr, len(alterations)))
-                    i.message ( "Non-standard key signature (after octave %s for alter nr %s): %s" % (i.get_text (), nr, alterations))
-            i.message ( "Non-standard key signature with alterations %s found!" % alterations)
             return alterations
 
     def get_transposition (self):
index 261a9429c8163d3a3b68238b35b125367aea8670..56f86e00d6c459cd5b138d6e7cde0a966032a490 100644 (file)
@@ -117,9 +117,16 @@ For LilyPond version @version{}
     (string-append  "@end ifnottex
 
 @ifhtml
+@ifclear bigpage
 This document is also available as a
 @uref{source/Documentation/user/lilypond-internals.pdf,PDF} and as
 @uref{source/Documentation/user/lilypond-internals-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond-internals.pdf,PDF} and as a
+@uref{source/Documentation/user/lilypond-internals/index.html,HTML indexed multiple pages}.
+@end ifset
 @end ifhtml
 
 This is the Internals Reference (IR) for version "