From 7fdc4714403efef8b1b12bc55359bb384b87f81c Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Mon, 8 Dec 2008 21:32:33 +0100 Subject: [PATCH] MusicXML: Clean up test suite -) Remove all references to Finale -) Proper test case for all spanners -) Remove (score|midi)-instrument, stem, sound, position information, etc. from test cases. Those will be tested in separate cases --- buildscripts/musicxml_generate_keys.py | 28 +- .../musicxml_generate_timesignatures.py | 97 ++- ...troduction.itexi => 00-Introduction.itexi} | 5 + .../musicxml/01a-Pitches-Pitches.xml | 115 ---- .../musicxml/01b-Pitches-Intervals.xml | 1 - .../musicxml/01d-Pitches-Microtones.xml | 7 - .../musicxml/02a-Rests-Durations.xml | 14 - .../musicxml/02c-Rests-MultiMeasureRests.xml | 8 - .../02d-Rests-Multimeasure-TimeSignatures.xml | 7 - .../musicxml/03a-Rhythm-Durations.xml | 67 --- .../regression/musicxml/03b-Rhythm-Backup.xml | 1 - .../musicxml/03c-Rhythm-DivisionChange.xml | 106 ++++ .../musicxml/11a-TimeSignatures.xml | 19 +- input/regression/musicxml/12a-Clefs.xml | 10 - .../musicxml/12b-Clefs-NoKeyOrClef.xml | 4 +- .../regression/musicxml/13a-KeySignatures.xml | 6 +- .../13b-KeySignatures-ChurchModes.xml | 1 - .../13c-KeySignatures-NonTraditional.xml | 1 - .../musicxml/13d-KeySignatures-Microtones.xml | 1 - input/regression/musicxml/21a-Chord-Basic.xml | 13 - .../musicxml/21b-Chords-TwoNotes.xml | 7 - .../21c-Chords-ThreeNotesDuration.xml | 48 +- .../21d-Chords-SchubertStabatMater.xml | 48 +- .../musicxml/21e-Chords-PickupMeasures.xml | 11 +- .../musicxml/21f-Chord-ElementInBetween.xml | 19 +- .../musicxml/22b-Staff-Notestyles.xml | 19 - ...23a-Tuplets-Finale.xml => 23a-Tuplets.xml} | 54 +- .../musicxml/23b-Tuplets-Styles.xml | 5 - .../23c-Tuplet-Display-NonStandard.xml | 3 +- .../musicxml/23d-Tuplets-Nested.xml | 11 +- ...l => 23f-Tuplets-DurationButNoBracket.xml} | 1 - ...aceNotes-Finale.xml => 24a-GraceNotes.xml} | 50 +- ...te-Finale.xml => 24b-ChordAsGraceNote.xml} | 16 - ...inale.xml => 24c-GraceNote-MeasureEnd.xml} | 11 - input/regression/musicxml/24d-AfterGrace.xml | 17 +- .../musicxml/24e-GraceNote-StaffChange.xml | 81 +++ .../musicxml/24f-GraceNote-Slur.xml | 71 +++ ...ctions-MusicXML.xml => 31a-Directions.xml} | 2 - .../musicxml/31c-MetronomeMarks.xml | 10 +- input/regression/musicxml/32a-Notations.xml | 3 +- .../musicxml/32b-Articulations-Texts.xml | 14 - .../musicxml/32c-MultipleNotationChildren.xml | 3 - input/regression/musicxml/32d-Arpeggio.xml | 1 - input/regression/musicxml/33a-Spanners.xml | 568 +++++++++++++----- .../regression/musicxml/33b-Spanners-Tie.xml | 4 +- .../musicxml/33c-Spanners-Slurs.xml | 11 +- ...nale.xml => 33d-Spanners-OctaveShifts.xml} | 28 +- .../33e-Spanners-OctaveShifts-InvalidSize.xml | 87 +++ ...le.xml => 33f-Trill-EndingOnGraceNote.xml} | 19 +- .../musicxml/33g-Slur-ChordedNotes.xml | 12 +- ...issando.xml => 33h-Spanners-Glissando.xml} | 22 - .../musicxml/33y-Spanners-JScore.xml | 400 ------------ .../musicxml/33z-Spanners-Noteedit.xml | 281 --------- .../musicxml/41a-MultiParts-Partorder.xml | 29 +- .../musicxml/41b-MultiParts-MoreThan10.xml | 140 +---- input/regression/musicxml/41c-StaffGroups.xml | 171 ------ .../musicxml/41d-StaffGroups-Nested.xml | 40 -- ...StaffGroups-InstrumentNames-Linebroken.xml | 8 - .../musicxml/41f-StaffGroups-Overlapping.xml | 40 -- ...42a-MultiVoice-TwoVoicesOnStaff-Lyrics.xml | 12 +- .../42b-MultiVoice-MidMeasureClefChange.xml | 31 +- .../musicxml/43-MultiStaff-Parts.itexi | 2 +- .../musicxml/43d-MultiStaff-StaffChange.xml | 40 -- .../musicxml/43e-Multistaff-ClefDynamics.xml | 71 +-- .../regression/musicxml/45a-SimpleRepeat.xml | 8 - .../musicxml/45b-RepeatWithAlternatives.xml | 8 - .../musicxml/45c-RepeatMultipleTimes.xml | 10 - .../45d-Repeats-Nested-Alternatives.xml | 11 - .../45e-Repeats-Nested-Alternatives.xml | 11 - .../musicxml/45f-Repeats-InvalidEndings.xml | 9 - .../musicxml/45g-Repeats-NotEnded.xml | 8 - input/regression/musicxml/46a-Barlines.xml | 47 +- .../musicxml/46b-MidmeasureBarline.xml | 7 - .../musicxml/46c-Midmeasure-Clef.xml | 61 +- .../46d-PickupMeasure-ImplicitMeasures.xml | 16 - ...-PickupMeasure-SecondVoiceStartsLater.xml} | 9 +- ...uotes-Finale.xml => 51b-Header-Quotes.xml} | 0 input/regression/musicxml/52a-PageLayout.xml | 1 - .../{61a-Lyrics-Finale.xml => 61a-Lyrics.xml} | 62 +- ...rics-Finale.xml => 61b-MultipleLyrics.xml} | 16 - ...f-Finale.xml => 61c-Lyrics-Pianostaff.xml} | 126 ---- ...isma-Finale.xml => 61d-Lyrics-Melisma.xml} | 18 - ...hords-Finale.xml => 61e-Lyrics-Chords.xml} | 19 +- ...-Finale.xml => 61f-Lyrics-GracedNotes.xml} | 21 - .../musicxml/61g-Lyrics-NameNumber.xml | 1 - .../musicxml/61h-Lyrics-BeamsMelismata.xml | 1 - .../musicxml/61j-Lyrics-Elisions.xml | 4 - ...a-Chords-Finale.xml => 71a-Chordnames.xml} | 32 +- .../musicxml/71b-Fretboards-Finale.xml | 227 ------- ...dsFrets-Finale.xml => 71c-ChordsFrets.xml} | 32 +- ...ale.xml => 71d-ChordsFrets-Multistaff.xml} | 272 +-------- ...TabStaves-Finale.xml => 71e-TabStaves.xml} | 128 ---- .../regression/musicxml/71f-AllChordTypes.xml | 3 - ...rcussion-Finale.xml => 73a-Percussion.xml} | 15 +- input/regression/musicxml/74a-FiguredBass.xml | 10 +- .../musicxml/75a-AccordionRegistrations.xml | 1 - .../musicxml/99a-Sibelius5-IgnoreBeaming.xml | 1 - .../99b-Lyrics-BeamsMelismata-IgnoreBeams.xml | 1 - 98 files changed, 1123 insertions(+), 3105 deletions(-) rename input/regression/musicxml/{0-Introduction.itexi => 00-Introduction.itexi} (92%) create mode 100644 input/regression/musicxml/03c-Rhythm-DivisionChange.xml rename input/regression/musicxml/{23a-Tuplets-Finale.xml => 23a-Tuplets.xml} (89%) rename input/regression/musicxml/{23f-Tuplets-DurationButNoBracket-PJB.xml => 23f-Tuplets-DurationButNoBracket.xml} (99%) rename input/regression/musicxml/{24a-GraceNotes-Finale.xml => 24a-GraceNotes.xml} (86%) rename input/regression/musicxml/{24b-ChordAsGraceNote-Finale.xml => 24b-ChordAsGraceNote.xml} (85%) rename input/regression/musicxml/{24c-GraceNote-MeasureEnd-Finale.xml => 24c-GraceNote-MeasureEnd.xml} (85%) create mode 100644 input/regression/musicxml/24e-GraceNote-StaffChange.xml create mode 100644 input/regression/musicxml/24f-GraceNote-Slur.xml rename input/regression/musicxml/{31a-Directions-MusicXML.xml => 31a-Directions.xml} (99%) rename input/regression/musicxml/{33d-Spanners-OctaveShifts-Finale.xml => 33d-Spanners-OctaveShifts.xml} (84%) create mode 100644 input/regression/musicxml/33e-Spanners-OctaveShifts-InvalidSize.xml rename input/regression/musicxml/{33f-Trill-EndingOnGraceNote-Finale.xml => 33f-Trill-EndingOnGraceNote.xml} (87%) rename input/regression/musicxml/{33e-Spanners-Glissando.xml => 33h-Spanners-Glissando.xml} (93%) delete mode 100644 input/regression/musicxml/33y-Spanners-JScore.xml delete mode 100644 input/regression/musicxml/33z-Spanners-Noteedit.xml rename input/regression/musicxml/{46e-PickupMeasure-SecondVoiceMessup.xml => 46e-PickupMeasure-SecondVoiceStartsLater.xml} (88%) rename input/regression/musicxml/{51b-HeaderQuotes-Finale.xml => 51b-Header-Quotes.xml} (100%) rename input/regression/musicxml/{61a-Lyrics-Finale.xml => 61a-Lyrics.xml} (76%) rename input/regression/musicxml/{61b-MultipleLyrics-Finale.xml => 61b-MultipleLyrics.xml} (91%) rename input/regression/musicxml/{61c-Lyrics-Pianostaff-Finale.xml => 61c-Lyrics-Pianostaff.xml} (57%) rename input/regression/musicxml/{61d-Lyrics-Melisma-Finale.xml => 61d-Lyrics-Melisma.xml} (88%) rename input/regression/musicxml/{61e-Lyrics-Chords-Finale.xml => 61e-Lyrics-Chords.xml} (86%) rename input/regression/musicxml/{61f-Lyrics-GracedNotes-Finale.xml => 61f-Lyrics-GracedNotes.xml} (89%) rename input/regression/musicxml/{71a-Chords-Finale.xml => 71a-Chordnames.xml} (86%) delete mode 100644 input/regression/musicxml/71b-Fretboards-Finale.xml rename input/regression/musicxml/{71c-ChordsFrets-Finale.xml => 71c-ChordsFrets.xml} (93%) rename input/regression/musicxml/{71d-ChordsFretsOnMultistaff-Finale.xml => 71d-ChordsFrets-Multistaff.xml} (57%) rename input/regression/musicxml/{71e-TabStaves-Finale.xml => 71e-TabStaves.xml} (90%) rename input/regression/musicxml/{73a-Percussion-Finale.xml => 73a-Percussion.xml} (94%) diff --git a/buildscripts/musicxml_generate_keys.py b/buildscripts/musicxml_generate_keys.py index d82b168fa9..7a16ac987f 100644 --- a/buildscripts/musicxml_generate_keys.py +++ b/buildscripts/musicxml_generate_keys.py @@ -3,10 +3,10 @@ notes = "CDEFGAB" alterations = [-1, 0, 1] -def print_measure (nr, fifth, mode, atts = "", final = ""): +def print_measure (nr, fifth, mode, atts1 = "", atts = "", final = ""): print """ - +%s %s %s @@ -20,10 +20,11 @@ def print_measure (nr, fifth, mode, atts = "", final = ""): 1 half -%s """ % (nr, fifth, mode, atts, final) +%s """ % (nr, atts1, fifth, mode, atts, final) -first_atts = """ 1 -