From: Trevor Daniels Date: Mon, 17 Nov 2008 15:38:52 +0000 (+0000) Subject: Fix Mac line terminations X-Git-Tag: release/2.11.65-1~51^2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b6e8e029644eafe0db1f6ce86bb566379f40a41;p=lilypond.git Fix Mac line terminations --- diff --git a/input/regression/musicxml/00d-Basics-RestDurations.xml b/input/regression/musicxml/00d-Basics-RestDurations.xml index d23d2c385a..c5f3f55d01 100644 --- a/input/regression/musicxml/00d-Basics-RestDurations.xml +++ b/input/regression/musicxml/00d-Basics-RestDurations.xml @@ -1,193 +1,193 @@ - - - - Rest unit test - - Public Domain - - Finale 2007 for Windows - Dolet Light for Finale 2007 - 2007-10-26 - - - 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. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 32 - - 0 - major - - - - G - 2 - - - 2 - - - - - - 128 - 1 - - - - - - - 128 - 1 - - - - - - - 128 - 1 - whole - - - - - - - 64 - 1 - half - - - - 32 - 1 - quarter - - - - 16 - 1 - eighth - - - - 8 - 1 - 16th - - - - 4 - 1 - 32nd - - - - 2 - 1 - 64th - - - - 1 - 1 - 128th - - - - 1 - 1 - 128th - - - - - - - 96 - 1 - half - - - - - 32 - 1 - quarter - - - - - - - 48 - 1 - quarter - - - - - 24 - 1 - eighth - - - - - 12 - 1 - 16th - - - - - 6 - 1 - 32nd - - - - - 3 - 1 - 64th - - - - - 2 - 1 - 128th - - - - light-heavy - - - - - + + + + Rest unit test + + Public Domain + + Finale 2007 for Windows + Dolet Light for Finale 2007 + 2007-10-26 + + + 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. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 32 + + 0 + major + + + + G + 2 + + + 2 + + + + + + 128 + 1 + + + + + + + 128 + 1 + + + + + + + 128 + 1 + whole + + + + + + + 64 + 1 + half + + + + 32 + 1 + quarter + + + + 16 + 1 + eighth + + + + 8 + 1 + 16th + + + + 4 + 1 + 32nd + + + + 2 + 1 + 64th + + + + 1 + 1 + 128th + + + + 1 + 1 + 128th + + + + + + + 96 + 1 + half + + + + + 32 + 1 + quarter + + + + + + + 48 + 1 + quarter + + + + + 24 + 1 + eighth + + + + + 12 + 1 + 16th + + + + + 6 + 1 + 32nd + + + + + 3 + 1 + 64th + + + + + 2 + 1 + 128th + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/00f-Basics-Clefs.xml b/input/regression/musicxml/00f-Basics-Clefs.xml index ea7e88ac7b..34cd960f6d 100644 --- a/input/regression/musicxml/00f-Basics-Clefs.xml +++ b/input/regression/musicxml/00f-Basics-Clefs.xml @@ -1,371 +1,371 @@ - - - - Clefs - - - 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. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - 4 - - 4 - 1 - whole - - - - - - - C - 3 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - C - 4 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - F - 4 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - percussion - - - - - C - 4 - - 4 - 1 - whole - - - - - - - G - 2 - -1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - F - 4 - -1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - F - 3 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - - G - 1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - C - 5 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - C - 2 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - C - 1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - percussion - - - - - C - 4 - - 4 - 1 - whole - - - - - - - G - 2 - 1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - F - 4 - 1 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - TAB - 5 - - - - - C - 4 - - 4 - 1 - whole - - - - - - - - none - - - - - C - 4 - - 4 - 1 - whole - - - - - - - G - 2 - - - - - C - 4 - - 4 - 1 - whole - - - light-heavy - - - - - + + + + Clefs + + + 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. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + 4 + + 4 + 1 + whole + + + + + + + C + 3 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + C + 4 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + F + 4 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + percussion + + + + + C + 4 + + 4 + 1 + whole + + + + + + + G + 2 + -1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + F + 4 + -1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + F + 3 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + + G + 1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + C + 5 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + C + 2 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + C + 1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + percussion + + + + + C + 4 + + 4 + 1 + whole + + + + + + + G + 2 + 1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + F + 4 + 1 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + TAB + 5 + + + + + C + 4 + + 4 + 1 + whole + + + + + + + + none + + + + + C + 4 + + 4 + 1 + whole + + + + + + + G + 2 + + + + + C + 4 + + 4 + 1 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml b/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml index 8eb0fb249c..42d4a74e39 100644 --- a/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml +++ b/input/regression/musicxml/00l-Basics-MultiMeasureRests.xml @@ -1,306 +1,306 @@ - - - - - - Four multi-measure rests: 3 - measures, 15 measures, 1 measure, and 12 measures. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - 3 - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 15 - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 12 - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + Four multi-measure rests: 3 + measures, 15 measures, 1 measure, and 12 measures. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + 3 + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 15 + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 12 + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml b/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml index 1ef5eed12b..8594bd2931 100644 --- a/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml +++ b/input/regression/musicxml/00m-MultimeasureRests-TimeSignatures.xml @@ -1,159 +1,159 @@ - - - - - - Multi-Measure rests should always - be converted into durations that are a multiple of the time - signature. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - 2 - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - - 3 - - - - - 3 - 1 - - - - - - - 3 - 1 - - - - - - - 3 - 1 - - - - - - - - 2 - - - - - 2 - 1 - - - - - - - 2 - 1 - - - - - - - - 2 - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - C - 5 - - 4 - 1 - whole - - - light-heavy - - - - - + + + + + + Multi-Measure rests should always + be converted into durations that are a multiple of the time + signature. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + 2 + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + + 3 + + + + + 3 + 1 + + + + + + + 3 + 1 + + + + + + + 3 + 1 + + + + + + + + 2 + + + + + 2 + 1 + + + + + + + 2 + 1 + + + + + + + + 2 + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + C + 5 + + 4 + 1 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/00n-NoVoiceElement.xml b/input/regression/musicxml/00n-NoVoiceElement.xml index f7dee8ec14..2f782c13f4 100644 --- a/input/regression/musicxml/00n-NoVoiceElement.xml +++ b/input/regression/musicxml/00n-NoVoiceElement.xml @@ -1,44 +1,44 @@ - - - - - - The <voice> 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. - - - - - MusicXML Part - - - - - - - 4 - - G - 2 - - - - - G - 4 - - 16 - whole - - single - A - - - - light-heavy - - - - + + + + + + The <voice> 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. + + + + + MusicXML Part + + + + + + + 4 + + G + 2 + + + + + G + 4 + + 16 + whole + + single + A + + + + light-heavy + + + + diff --git a/input/regression/musicxml/00p-Rest-NoType.xml b/input/regression/musicxml/00p-Rest-NoType.xml index 700ffadc38..0b72a4d4ef 100644 --- a/input/regression/musicxml/00p-Rest-NoType.xml +++ b/input/regression/musicxml/00p-Rest-NoType.xml @@ -1,91 +1,91 @@ - - - - - - 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). - - - - - MusicXML Part - - - - - - - 1 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - C - 5 - - 1 - 1 - quarter - 1 - - - 1 - - - - 1 - 2 - 2 - - - - - - - A - 4 - - 4 - 1 - whole - 1 - - - 4 - - - - E - 3 - - 4 - 2 - whole - - - light-heavy - - - - - + + + + + + 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). + + + + + MusicXML Part + + + + + + + 1 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + C + 5 + + 1 + 1 + quarter + 1 + + + 1 + + + + 1 + 2 + 2 + + + + + + + A + 4 + + 4 + 1 + whole + 1 + + + 4 + + + + E + 3 + + 4 + 2 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/03a-Directions-MusicXML.xml b/input/regression/musicxml/03a-Directions-MusicXML.xml index f0994fa0ab..ca086df535 100644 --- a/input/regression/musicxml/03a-Directions-MusicXML.xml +++ b/input/regression/musicxml/03a-Directions-MusicXML.xml @@ -1,787 +1,787 @@ - - - - MusicXML directions (attached to staff) - - - All <direction> elements - defined in MusicXML. The lyrics for each note describes the direction - element assigned to that note. - - - - - - MusicXML Part - - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - A - - - - C4 - 1 - 1 - quarter - reh.A (def=sq.) - - - - B - - - - C4 - 1 - 1 - quarter - reh.B (none) - - - - Test - - - - C4 - 1 - 1 - quarter - reh.Test (sq.) - - - - Crc - - - - C4 - 1 - 1 - quarter - reh.Crc (crc.) - - - - - - - - - - - C4 - 1 - 1 - quarter - Segno - - - - - - - - C4 - 1 - 1 - quarter - Coda - - - - words - - - - C4 - 1 - 1 - quarter - Words - - - - - - - - C4 - 1 - 1 - quarter - Eyegl. - - - - - - -

- - - - C4 - 1 - 1 - quarter - p - - - - - - - - C4 - 1 - 1 - quarter - pp - - - - - - - - C4 - 1 - 1 - quarter - ppp - - - - - - - - C4 - 1 - 1 - quarter - pppp - - - - - - - - - - C4 - 1 - 1 - quarter - ppppp - - - - - - - - C4 - 1 - 1 - quarter - pppppp - - - - - - - - C4 - 1 - 1 - quarter - f - - - - - - - - C4 - 1 - 1 - quarter - ff - - - - - - - - - - C4 - 1 - 1 - quarter - fff - - - - - - - - C4 - 1 - 1 - quarter - ffff - - - - - - - - C4 - 1 - 1 - quarter - fffff - - - - - - - - C4 - 1 - 1 - quarter - ffffff - - - - - - - - - - C4 - 1 - 1 - quarter - mp - - - - - - - - C4 - 1 - 1 - quarter - mf - - - - - - - - C4 - 1 - 1 - quarter - sf - - - - - - - - C4 - 1 - 1 - quarter - sfp - - - - - - - - - - C4 - 1 - 1 - quarter - sfpp - - - - - - - - C4 - 1 - 1 - quarter - fp - - - - - - - - C4 - 1 - 1 - quarter - rf - - - - - - - - C4 - 1 - 1 - quarter - rfz - - - - - - - - - - C4 - 1 - 1 - quarter - sfz - - - - - - - - C4 - 1 - 1 - quarter - sffz - - - - - - - - C4 - 1 - 1 - quarter - fz - - - - abc-ffz - - - - C4 - 1 - 1 - quarter - abc-ffz (oth.) - - - - - - - - - - - C4 - 1 - 1 - quarter - beginhairpin - - - - - - - - C4 - 1 - 1 - quarter - endcresc - - - - - - - - C4 - 1 - 1 - quarter - begindash - - - - - - - - C4 - 1 - 1 - quarter - endes - - - - - - - - - - C4 - 1 - 1 - quarter - beginbra - - - - - - - - C4 - 1 - 1 - quarter - endcket - - - - - - - - C4 - 1 - 1 - quarter - beginoct. - - - - - - - - C4 - 1 - 1 - quarter - endshift - - - - - - - - - - C4 - 1 - 1 - quarter - beginpedal - - - - - - - - C4 - 1 - 1 - quarter - continuechange - - - C4 - 1 - 1 - quarter - - - - - - - - C4 - 1 - 1 - quarter - endmark - - - - - - - quarter60 - - - - C4 - 1 - 1 - quarter - Metr. - - - - - - D - 0 - - - C - -1 - - - B - -1 - - - E - 0 - - - F - 0 - - - G - 1 - - - A - -1 - - - - - - C4 - 1 - 1 - quarter - Harp ped. - - - - - - - - C4 - 1 - 1 - quarter - Damp - - - - - - - - C4 - 1 - 1 - quarter - Damp all - - - - - - - C3 - G5 - E5 - - - - - C4 - 1 - 1 - quarter - Scord. - - - - - - 2 - - - - - - C4 - 1 - 1 - quarter - Accordion reg. - - - - 2 - 1 - half - - - light-light - - - - - - - subito - - -   - - - -

- - - 2 - - - C4 - 1 - 1 - quarter - subp - - - - - - - - - 2 - - - C4 - 1 - 1 - quarter - beginppp cresc - - - - - - - - - 2 - - - C4 - 1 - 1 - quarter - endto fff - - - - 1 - 1 - quarter - subp - - - light-heavy - - - - - - + + + + MusicXML directions (attached to staff) + + + All <direction> elements + defined in MusicXML. The lyrics for each note describes the direction + element assigned to that note. + + + + + + MusicXML Part + + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + A + + + + C4 + 1 + 1 + quarter + reh.A (def=sq.) + + + + B + + + + C4 + 1 + 1 + quarter + reh.B (none) + + + + Test + + + + C4 + 1 + 1 + quarter + reh.Test (sq.) + + + + Crc + + + + C4 + 1 + 1 + quarter + reh.Crc (crc.) + + + + + + + + + + + C4 + 1 + 1 + quarter + Segno + + + + + + + + C4 + 1 + 1 + quarter + Coda + + + + words + + + + C4 + 1 + 1 + quarter + Words + + + + + + + + C4 + 1 + 1 + quarter + Eyegl. + + + + + + +

+ + + + C4 + 1 + 1 + quarter + p + + + + + + + + C4 + 1 + 1 + quarter + pp + + + + + + + + C4 + 1 + 1 + quarter + ppp + + + + + + + + C4 + 1 + 1 + quarter + pppp + + + + + + + + + + C4 + 1 + 1 + quarter + ppppp + + + + + + + + C4 + 1 + 1 + quarter + pppppp + + + + + + + + C4 + 1 + 1 + quarter + f + + + + + + + + C4 + 1 + 1 + quarter + ff + + + + + + + + + + C4 + 1 + 1 + quarter + fff + + + + + + + + C4 + 1 + 1 + quarter + ffff + + + + + + + + C4 + 1 + 1 + quarter + fffff + + + + + + + + C4 + 1 + 1 + quarter + ffffff + + + + + + + + + + C4 + 1 + 1 + quarter + mp + + + + + + + + C4 + 1 + 1 + quarter + mf + + + + + + + + C4 + 1 + 1 + quarter + sf + + + + + + + + C4 + 1 + 1 + quarter + sfp + + + + + + + + + + C4 + 1 + 1 + quarter + sfpp + + + + + + + + C4 + 1 + 1 + quarter + fp + + + + + + + + C4 + 1 + 1 + quarter + rf + + + + + + + + C4 + 1 + 1 + quarter + rfz + + + + + + + + + + C4 + 1 + 1 + quarter + sfz + + + + + + + + C4 + 1 + 1 + quarter + sffz + + + + + + + + C4 + 1 + 1 + quarter + fz + + + + abc-ffz + + + + C4 + 1 + 1 + quarter + abc-ffz (oth.) + + + + + + + + + + + C4 + 1 + 1 + quarter + beginhairpin + + + + + + + + C4 + 1 + 1 + quarter + endcresc + + + + + + + + C4 + 1 + 1 + quarter + begindash + + + + + + + + C4 + 1 + 1 + quarter + endes + + + + + + + + + + C4 + 1 + 1 + quarter + beginbra + + + + + + + + C4 + 1 + 1 + quarter + endcket + + + + + + + + C4 + 1 + 1 + quarter + beginoct. + + + + + + + + C4 + 1 + 1 + quarter + endshift + + + + + + + + + + C4 + 1 + 1 + quarter + beginpedal + + + + + + + + C4 + 1 + 1 + quarter + continuechange + + + C4 + 1 + 1 + quarter + + + + + + + + C4 + 1 + 1 + quarter + endmark + + + + + + + quarter60 + + + + C4 + 1 + 1 + quarter + Metr. + + + + + + D + 0 + + + C + -1 + + + B + -1 + + + E + 0 + + + F + 0 + + + G + 1 + + + A + -1 + + + + + + C4 + 1 + 1 + quarter + Harp ped. + + + + + + + + C4 + 1 + 1 + quarter + Damp + + + + + + + + C4 + 1 + 1 + quarter + Damp all + + + + + + + C3 + G5 + E5 + + + + + C4 + 1 + 1 + quarter + Scord. + + + + + + 2 + + + + + + C4 + 1 + 1 + quarter + Accordion reg. + + + + 2 + 1 + half + + + light-light + + + + + + + subito + + +   + + + +

+ + + 2 + + + C4 + 1 + 1 + quarter + subp + + + + + + + + + 2 + + + C4 + 1 + 1 + quarter + beginppp cresc + + + + + + + + + 2 + + + C4 + 1 + 1 + quarter + endto fff + + + + 1 + 1 + quarter + subp + + + light-heavy + + + + + + diff --git a/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml b/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml index 6a084db8d3..1a98a65b49 100644 --- a/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml +++ b/input/regression/musicxml/03b-AccordionRegistrations-MusicXML.xml @@ -1,360 +1,360 @@ - - - - - - All possible accordion - registrations. - - - - - - - - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - - - - - - C4 - 1 - 1 - quarter - 0/0/1 - - - - - 1 - - - - - C4 - 1 - 1 - quarter - 0/1/0 - - - - - 1 - - - - - - C4 - 1 - 1 - quarter - 0/1/1 - - - - - 2 - - - - - C4 - 1 - 1 - quarter - 0/2/0 - - - - - - - 2 - - - - - - C4 - 1 - 1 - quarter - 0/2/1 - - - - - 3 - - - - - C4 - 1 - 1 - quarter - 0/3/0 - - - - - 3 - - - - - - C4 - 1 - 1 - quarter - 0/3/1 - - - - - - - - - - - C4 - 1 - 1 - quarter - 1/0/1 - - - - - - - - - - - - C4 - 1 - 1 - quarter - 1/0/0 - - - - - - 1 - - - - - C4 - 1 - 1 - quarter - 1/1/0 - - - - - - 1 - - - - - - C4 - 1 - 1 - quarter - 1/1/1 - - - - - - 2 - - - - - C4 - 1 - 1 - quarter - 1/2/0 - - - - - - - - 2 - - - - - - C4 - 1 - 1 - quarter - 1/2/1 - - - - - - 3 - - - - - C4 - 1 - 1 - quarter - 1/3/0 - - - - - - 3 - - - - - - C4 - 1 - 1 - quarter - 1/3/1 - - - - - - - - - - C4 - 1 - 1 - quarter - empty - - - - - - - - - - - - - - C4 - 1 - 1 - quarter - empty M - - - - - - test - - - - - - C4 - 1 - 1 - quarter - inval.M - - - - - - 0 - - - - - - C4 - 1 - 1 - quarter - M=0 - - - - - - 5 - - - - - - C4 - 1 - 1 - quarter - M=5 - - - - light-heavy - - - - - - + + + + + + All possible accordion + registrations. + + + + + + + + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + + + + + + C4 + 1 + 1 + quarter + 0/0/1 + + + + + 1 + + + + + C4 + 1 + 1 + quarter + 0/1/0 + + + + + 1 + + + + + + C4 + 1 + 1 + quarter + 0/1/1 + + + + + 2 + + + + + C4 + 1 + 1 + quarter + 0/2/0 + + + + + + + 2 + + + + + + C4 + 1 + 1 + quarter + 0/2/1 + + + + + 3 + + + + + C4 + 1 + 1 + quarter + 0/3/0 + + + + + 3 + + + + + + C4 + 1 + 1 + quarter + 0/3/1 + + + + + + + + + + + C4 + 1 + 1 + quarter + 1/0/1 + + + + + + + + + + + + C4 + 1 + 1 + quarter + 1/0/0 + + + + + + 1 + + + + + C4 + 1 + 1 + quarter + 1/1/0 + + + + + + 1 + + + + + + C4 + 1 + 1 + quarter + 1/1/1 + + + + + + 2 + + + + + C4 + 1 + 1 + quarter + 1/2/0 + + + + + + + + 2 + + + + + + C4 + 1 + 1 + quarter + 1/2/1 + + + + + + 3 + + + + + C4 + 1 + 1 + quarter + 1/3/0 + + + + + + 3 + + + + + + C4 + 1 + 1 + quarter + 1/3/1 + + + + + + + + + + C4 + 1 + 1 + quarter + empty + + + + + + + + + + + + + + C4 + 1 + 1 + quarter + empty M + + + + + + test + + + + + + C4 + 1 + 1 + quarter + inval.M + + + + + + 0 + + + + + + C4 + 1 + 1 + quarter + M=0 + + + + + + 5 + + + + + + C4 + 1 + 1 + quarter + M=5 + + + + light-heavy + + + + + + diff --git a/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken b/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken index 376039102b..7b3285d82a 100644 --- a/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken +++ b/input/regression/musicxml/03d-Directions-MultimeasureRests.xml.broken @@ -1,72 +1,72 @@ - - - - MusicXML directions (attached to staff) - - - Directions between some - multi-measure rests should still be converted to the correct - position. - - - - - - MusicXML Part - - - - - - - - 8 - - 0 - major - - - - G - 2 - - - - - 32 - 1 - - - - TEST - - -4 - - - - - - - 32 - 1 - - - - - - - 32 - 1 - - - light-heavy - - - - - - + + + + MusicXML directions (attached to staff) + + + Directions between some + multi-measure rests should still be converted to the correct + position. + + + + + + MusicXML Part + + + + + + + + 8 + + 0 + major + + + + G + 2 + + + + + 32 + 1 + + + + TEST + + -4 + + + + + + + 32 + 1 + + + + + + + 32 + 1 + + + light-heavy + + + + + + diff --git a/input/regression/musicxml/04a-Spanners-Finale.xml b/input/regression/musicxml/04a-Spanners-Finale.xml index aaf2b80bc0..803fec86eb 100644 --- a/input/regression/musicxml/04a-Spanners-Finale.xml +++ b/input/regression/musicxml/04a-Spanners-Finale.xml @@ -1,685 +1,685 @@ - - - - - - Several spanners defined in MusicXML - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - - 24 - - 0 - major - - - - G - 2 - - - - - - B - 4 - - 16 - 1 - quarter - - 3 - 2 - - down - - - - - - - B - 4 - - 16 - 1 - quarter - - 3 - 2 - - down - - - - B - 4 - - 16 - 1 - quarter - - 3 - 2 - - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - - - - 1 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 6 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 8 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - -22 - - - - B - 5 - - 24 - 1 - quarter - down - - - - - - -22 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - -20 - - - - B - 6 - - 24 - 1 - quarter - down - - - - - - -15 - - - - - - - - - - 2 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 8 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 3 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 9 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - 4 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 7 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 2 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - - - 5 - - - - B - 4 - - 24 - 1 - quarter - down - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - -11 - - - - - - 6 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - 11 - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - F - 5 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - 6 - - - - - - - F - 5 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - 0 - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - - B - 4 - - 24 - 1 - quarter - down - - - - - - light-heavy - - - - - + + + + + + Several spanners defined in MusicXML + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + + 24 + + 0 + major + + + + G + 2 + + + + + + B + 4 + + 16 + 1 + quarter + + 3 + 2 + + down + + + + + + + B + 4 + + 16 + 1 + quarter + + 3 + 2 + + down + + + + B + 4 + + 16 + 1 + quarter + + 3 + 2 + + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + + + + 1 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 6 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 8 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + -22 + + + + B + 5 + + 24 + 1 + quarter + down + + + + + + -22 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + -20 + + + + B + 6 + + 24 + 1 + quarter + down + + + + + + -15 + + + + + + + + + + 2 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 8 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 3 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 9 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + 4 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 7 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 2 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + + + 5 + + + + B + 4 + + 24 + 1 + quarter + down + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + -11 + + + + + + 6 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + 11 + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + F + 5 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + 6 + + + + + + + F + 5 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + 0 + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + + B + 4 + + 24 + 1 + quarter + down + + + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/04f-Slurs.xml b/input/regression/musicxml/04f-Slurs.xml index 027624587e..dd2eb5e1be 100644 --- a/input/regression/musicxml/04f-Slurs.xml +++ b/input/regression/musicxml/04f-Slurs.xml @@ -1,153 +1,153 @@ - - - - - - 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. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - G - 4 - - 1 - 1 - quarter - - - - - - - C - 5 - - 1 - 1 - quarter - - - - - - - - A - 4 - - 1 - 1 - quarter - - - - - - - - G - 4 - - 1 - 1 - quarter - - - - - - - - - - G - 4 - - 1 - 1 - quarter - - - - - - - C - 5 - - 1 - 1 - quarter - - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - - - - G - 4 - - 1 - 1 - quarter - up - - - - - - light-heavy - - - - - + + + + + + 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. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + G + 4 + + 1 + 1 + quarter + + + + + + + C + 5 + + 1 + 1 + quarter + + + + + + + + A + 4 + + 1 + 1 + quarter + + + + + + + + G + 4 + + 1 + 1 + quarter + + + + + + + + + + G + 4 + + 1 + 1 + quarter + + + + + + + C + 5 + + 1 + 1 + quarter + + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + + + + G + 4 + + 1 + 1 + quarter + up + + + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml b/input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml index dc23e0a1f6..a793d21f2c 100644 --- a/input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml +++ b/input/regression/musicxml/04g-Trill-EndingOnGraceNote-Finale.xml @@ -1,152 +1,152 @@ - - - - - - A trill spanner that ends on an - after-grace note. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 336 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - E - 5 - - 336 - 1 - quarter - down - 1 - - - - - - - F - 1 - 5 - - 84 - 1 - 16th - sharp - down - 1 - begin - begin - - - - G - 5 - - 84 - 1 - 16th - down - 1 - end - end - - - - - - - - - - - - B - 5 - - 1 - 16th - up - 1 - - - - A - 5 - - 504 - 1 - quarter - - down - 1 - - - - - G - 5 - - 1 - 16th - up - 1 - begin - begin - - - - - A - 5 - - 1 - 16th - up - 1 - end - end - - - - - - - - - - + + + + + + A trill spanner that ends on an + after-grace note. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 336 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + E + 5 + + 336 + 1 + quarter + down + 1 + + + + + + + F + 1 + 5 + + 84 + 1 + 16th + sharp + down + 1 + begin + begin + + + + G + 5 + + 84 + 1 + 16th + down + 1 + end + end + + + + + + + + + + + + B + 5 + + 1 + 16th + up + 1 + + + + A + 5 + + 504 + 1 + quarter + + down + 1 + + + + + G + 5 + + 1 + 16th + up + 1 + begin + begin + + + + + A + 5 + + 1 + 16th + up + 1 + end + end + + + + + + + + + + diff --git a/input/regression/musicxml/04h-Slur-ChordedNotes.xml b/input/regression/musicxml/04h-Slur-ChordedNotes.xml index 0d1c629d92..ff7b37717d 100644 --- a/input/regression/musicxml/04h-Slur-ChordedNotes.xml +++ b/input/regression/musicxml/04h-Slur-ChordedNotes.xml @@ -1,123 +1,123 @@ - - - - - - - - MusicXML Part - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - G - 4 - - 1 - 1 - quarter - - - - - - - - C - 5 - - 1 - 1 - quarter - down - - - - - G - 5 - - 1 - 1 - quarter - - - - A - 4 - - 1 - 1 - quarter - - - - - D - 5 - - 1 - 1 - quarter - - - - G - 4 - - 1 - 1 - quarter - - - - - - - - - D - 5 - - 1 - 1 - quarter - - - - C - 5 - - 1 - 1 - quarter - - - - - - light-heavy - - - - - + + + + + + + + MusicXML Part + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + G + 4 + + 1 + 1 + quarter + + + + + + + + C + 5 + + 1 + 1 + quarter + down + + + + + G + 5 + + 1 + 1 + quarter + + + + A + 4 + + 1 + 1 + quarter + + + + + D + 5 + + 1 + 1 + quarter + + + + G + 4 + + 1 + 1 + quarter + + + + + + + + + D + 5 + + 1 + 1 + quarter + + + + C + 5 + + 1 + 1 + quarter + + + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml index 903cd2a3b9..544bb5af1b 100644 --- a/input/regression/musicxml/05a-HeaderQuotes-Finale.xml +++ b/input/regression/musicxml/05a-HeaderQuotes-Finale.xml @@ -1,40 +1,40 @@ - - - - "Quotes" in header fields - - Some "Tester" Name - Free for anyone ("Public Domain") - - "Hand-crafted" MusicXML file - 2008-02-06 - - - 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). - - - - - Staff "Test" - - - - - - - - 4 - 1 - whole - - - light-heavy - - - - - + + + + "Quotes" in header fields + + Some "Tester" Name + Free for anyone ("Public Domain") + + "Hand-crafted" MusicXML file + 2008-02-06 + + + 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). + + + + + Staff "Test" + + + + + + + + 4 + 1 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/06a-Lyrics-Finale.xml b/input/regression/musicxml/06a-Lyrics-Finale.xml index 7d55e017ae..c680a4b22c 100644 --- a/input/regression/musicxml/06a-Lyrics-Finale.xml +++ b/input/regression/musicxml/06a-Lyrics-Finale.xml @@ -1,155 +1,155 @@ - - - - - - Some notes with simple lyrics: Syllables, notes without a syllable, syllable spanners. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - A - 4 - - 1 - 1 - quarter - up - - begin - Tra - - - - - A - 4 - - 1 - 1 - quarter - up - - middle - la - - - - - A - 4 - - 1 - 1 - quarter - up - - end - li - - - - - A - 4 - - 1 - 1 - quarter - up - - single - Ja! - - - - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - A - 4 - - 1 - 1 - quarter - up - - begin - Tra - - - - - A - 4 - - 1 - 1 - quarter - up - - - - A - 4 - - 1 - 1 - quarter - up - - end - ra! - - - - light-heavy - - - - - + + + + + + Some notes with simple lyrics: Syllables, notes without a syllable, syllable spanners. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + A + 4 + + 1 + 1 + quarter + up + + begin + Tra + + + + + A + 4 + + 1 + 1 + quarter + up + + middle + la + + + + + A + 4 + + 1 + 1 + quarter + up + + end + li + + + + + A + 4 + + 1 + 1 + quarter + up + + single + Ja! + + + + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + A + 4 + + 1 + 1 + quarter + up + + begin + Tra + + + + + A + 4 + + 1 + 1 + quarter + up + + + + A + 4 + + 1 + 1 + quarter + up + + end + ra! + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml b/input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml index d2e60db502..bfb1d58c3f 100644 --- a/input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml +++ b/input/regression/musicxml/06c-Lyrics-Pianostaff-Finale.xml @@ -1,289 +1,289 @@ - - - - - - Lyrics assigned to the voices of - a piano staff containing two simple staves. Each staff is assigned - exactly one lyrics line. - - - - - MusicXML Part - - Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - begin - tra - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - middle - la - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - end - li - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - single - ja! - - - - - 4 - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - begin - TRA - - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - middle - LA - - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - end - LI - - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - single - JA! - - - - - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - begin - tra - - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - - - A - 4 - - 1 - 1 - quarter - up - 1 - - end - ra! - - - - 4 - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - begin - TRA - - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - - - F - 3 - - 1 - 2 - quarter - down - 2 - - end - RA! - - - - light-heavy - - - - - + + + + + + Lyrics assigned to the voices of + a piano staff containing two simple staves. Each staff is assigned + exactly one lyrics line. + + + + + MusicXML Part + + Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + begin + tra + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + middle + la + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + end + li + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + single + ja! + + + + + 4 + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + begin + TRA + + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + middle + LA + + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + end + LI + + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + single + JA! + + + + + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + begin + tra + + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + + + A + 4 + + 1 + 1 + quarter + up + 1 + + end + ra! + + + + 4 + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + begin + TRA + + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + + + F + 3 + + 1 + 2 + quarter + down + 2 + + end + RA! + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml b/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml index c06b73d454..c2c4f695f9 100644 --- a/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml +++ b/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml @@ -1,187 +1,187 @@ - - - - - - How to treat lyrics and slurred - notes. Normally, a slurred group of notes is assigned only one lyrics - syllable. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - 5 - - 1 - 1 - quarter - down - - - - - begin - Me - - - - - A - 4 - - 1 - 1 - quarter - down - - - - - E - 5 - - 1 - 1 - quarter - down - - - - C - 5 - - 1 - 1 - quarter - down - - - - C - 5 - - 1 - 1 - quarter - down - - - - - - - - E - 5 - - 1 - 1 - quarter - down - - - - - - - C - 5 - - 1 - - 1 - quarter - down - - - - - middle - lis - - - - - C - 5 - - 1 - - 1 - quarter - down - - - - - - - C - 5 - - 1 - 1 - quarter - down - - - - - end - ma. - - - - - - E - 5 - - 1 - 1 - quarter - down - - - - - - light-heavy - - - - - + + + + + + How to treat lyrics and slurred + notes. Normally, a slurred group of notes is assigned only one lyrics + syllable. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + 5 + + 1 + 1 + quarter + down + + + + + begin + Me + + + + + A + 4 + + 1 + 1 + quarter + down + + + + + E + 5 + + 1 + 1 + quarter + down + + + + C + 5 + + 1 + 1 + quarter + down + + + + C + 5 + + 1 + 1 + quarter + down + + + + + + + + E + 5 + + 1 + 1 + quarter + down + + + + + + + C + 5 + + 1 + + 1 + quarter + down + + + + + middle + lis + + + + + C + 5 + + 1 + + 1 + quarter + down + + + + + + + C + 5 + + 1 + 1 + quarter + down + + + + + end + ma. + + + + + + E + 5 + + 1 + 1 + quarter + down + + + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/06e-Lyrics-Chords-Finale.xml b/input/regression/musicxml/06e-Lyrics-Chords-Finale.xml index b2363e9230..506e0bce0f 100644 --- a/input/regression/musicxml/06e-Lyrics-Chords-Finale.xml +++ b/input/regression/musicxml/06e-Lyrics-Chords-Finale.xml @@ -1,147 +1,147 @@ - - - - - - Assigning lyrics to chorded notes. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - E - 4 - - 1 - 1 - quarter - up - - begin - Ly - - - - - - C - 5 - - 1 - 1 - quarter - up - - - - A - 4 - - 1 - 1 - quarter - down - - end - rics - - - - - - C - 5 - - 1 - 1 - quarter - down - - - - E - 4 - - 1 - 1 - quarter - up - - single - on - - - - - - C - 5 - - 1 - 1 - quarter - up - - - - A - 4 - - 1 - 1 - quarter - down - - single - chords - - - - - - C - 5 - - 1 - 1 - quarter - down - - - light-heavy - - - - - + + + + + + Assigning lyrics to chorded notes. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + E + 4 + + 1 + 1 + quarter + up + + begin + Ly + + + + + + C + 5 + + 1 + 1 + quarter + up + + + + A + 4 + + 1 + 1 + quarter + down + + end + rics + + + + + + C + 5 + + 1 + 1 + quarter + down + + + + E + 4 + + 1 + 1 + quarter + up + + single + on + + + + + + C + 5 + + 1 + 1 + quarter + up + + + + A + 4 + + 1 + 1 + quarter + down + + single + chords + + + + + + C + 5 + + 1 + 1 + quarter + down + + + light-heavy + + + + + diff --git a/input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml b/input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml index ffac4b3e0c..5567bd7bef 100644 --- a/input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml +++ b/input/regression/musicxml/06f-Lyrics-GracedNotes-Finale.xml @@ -1,230 +1,230 @@ - - - - - - Grace notes shall not mess up the - lyrics, and they shall not be assigned a syllable. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 2 - - 0 - major - - - - G - 2 - - - - - - G - 4 - - 2 - 1 - quarter - up - - - - - begin - Ly - - - - - - D - 5 - - 1 - eighth - up - - - - C - 5 - - 2 - 1 - quarter - down - - - - - - - C - 5 - - 2 - 1 - quarter - down - - end - rics - - - - - - D - 5 - - - 1 - eighth - up - - - - - - - C - 5 - - 2 - 1 - quarter - down - - single - on - - - - - - - - C - 5 - - 2 - - 1 - quarter - down - - - - - single - notes - - - - - - - E - 5 - - - 1 - eighth - up - begin - - - - - - - - D - 5 - - 1 - eighth - up - end - - - - C - 5 - - 2 - - 1 - quarter - down - - - - - - - - D - 5 - - 1 - eighth - up - - - - C - 5 - - 2 - 1 - quarter - down - - single - with - - - - - C - 5 - - 2 - 1 - quarter - down - - single - graces - - - - light-heavy - - - - - + + + + + + Grace notes shall not mess up the + lyrics, and they shall not be assigned a syllable. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 2 + + 0 + major + + + + G + 2 + + + + + + G + 4 + + 2 + 1 + quarter + up + + + + + begin + Ly + + + + + + D + 5 + + 1 + eighth + up + + + + C + 5 + + 2 + 1 + quarter + down + + + + + + + C + 5 + + 2 + 1 + quarter + down + + end + rics + + + + + + D + 5 + + + 1 + eighth + up + + + + + + + C + 5 + + 2 + 1 + quarter + down + + single + on + + + + + + + + C + 5 + + 2 + + 1 + quarter + down + + + + + single + notes + + + + + + + E + 5 + + + 1 + eighth + up + begin + + + + + + + + D + 5 + + 1 + eighth + up + end + + + + C + 5 + + 2 + + 1 + quarter + down + + + + + + + + D + 5 + + 1 + eighth + up + + + + C + 5 + + 2 + 1 + quarter + down + + single + with + + + + + C + 5 + + 2 + 1 + quarter + down + + single + graces + + + + light-heavy + + + + + diff --git a/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml b/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml index 1e8748f52e..c02d14f47f 100644 --- a/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml +++ b/input/regression/musicxml/08g-OverlappingPartGroups-Finale.xml @@ -1,226 +1,226 @@ - - - - - - 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. - - - - - Group 1 - Gr1 - bracket - yes - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - Group 2 - Grp2 - bracket - yes - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + 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. + + + + + Group 1 + Gr1 + bracket + yes + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + Group 2 + Grp2 + bracket + yes + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09a-SimpleRepeat-Finale.xml b/input/regression/musicxml/09a-SimpleRepeat-Finale.xml index 0a59788305..074ba1fd5a 100644 --- a/input/regression/musicxml/09a-SimpleRepeat-Finale.xml +++ b/input/regression/musicxml/09a-SimpleRepeat-Finale.xml @@ -1,65 +1,65 @@ - - - - - - A simple, repeated measure - (repeated 5 times) - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + A simple, repeated measure + (repeated 5 times) + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml b/input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml index 8afc79480b..a29f1c0a13 100644 --- a/input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml +++ b/input/regression/musicxml/09b-RepeatWithAlternatives-Finale.xml @@ -1,107 +1,107 @@ - - - - - - A simple repeat with two - alternative endings (volta brackets). - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - 5 - - 4 - 1 - whole - - - - - - - - - - C - 5 - - 4 - 1 - whole - - - light-heavy - - - - - - - - - - - - C - 5 - - 4 - 1 - whole - - - - - - - - - - C - 5 - - 4 - 1 - whole - - - light-heavy - - - - - + + + + + + A simple repeat with two + alternative endings (volta brackets). + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + + + + + C + 5 + + 4 + 1 + whole + + + light-heavy + + + + + + + + + + + + C + 5 + + 4 + 1 + whole + + + + + + + + + + C + 5 + + 4 + 1 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09c-Barlines-Finale.xml b/input/regression/musicxml/09c-Barlines-Finale.xml index 24d024f455..86c9700eef 100644 --- a/input/regression/musicxml/09c-Barlines-Finale.xml +++ b/input/regression/musicxml/09c-Barlines-Finale.xml @@ -1,170 +1,170 @@ - - - - - - Different types of (non-repeat) - barlines. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - light-light - - - - - - - 4 - 1 - - - light-heavy - - - - - - - 4 - 1 - - - heavy - - - - - - - - 4 - 1 - - - dashed - - - - - - - 4 - 1 - - - dotted - - - - - - - 4 - 1 - - - none - - - - - - - 4 - 1 - - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + Different types of (non-repeat) + barlines. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + light-light + + + + + + + 4 + 1 + + + light-heavy + + + + + + + 4 + 1 + + + heavy + + + + + + + + 4 + 1 + + + dashed + + + + + + + 4 + 1 + + + dotted + + + + + + + 4 + 1 + + + none + + + + + + + 4 + 1 + + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml b/input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml index 1966fa02dd..8ed24f703c 100644 --- a/input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml +++ b/input/regression/musicxml/09d-RepeatMultipleTimes-Finale.xml @@ -1,122 +1,122 @@ - - - - - - Repeats can also be nested. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - - - - heavy-light - - - - - 4 - 1 - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + Repeats can also be nested. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + + + + heavy-light + + + + + 4 + 1 + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09e-Alternatives-Finale.xml b/input/regression/musicxml/09e-Alternatives-Finale.xml index 2b87a07282..2d34453ee4 100644 --- a/input/regression/musicxml/09e-Alternatives-Finale.xml +++ b/input/regression/musicxml/09e-Alternatives-Finale.xml @@ -1,178 +1,178 @@ - - - - - - Nested repeats, each with - alternative endings. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - - - - 4 - 1 - - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - - - - - - - 4 - 1 - - - - - - - - - - 4 - 1 - - - - - - - - 4 - 1 - - - - - - - 4 - 1 - - - - - - - - - - 4 - 1 - - - - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + Nested repeats, each with + alternative endings. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + + + + 4 + 1 + + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + + + + + + + 4 + 1 + + + + + + + + + + 4 + 1 + + + + + + + + 4 + 1 + + + + + + + 4 + 1 + + + + + + + + + + 4 + 1 + + + + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09f-Repeats-Finale.xml b/input/regression/musicxml/09f-Repeats-Finale.xml index e0b0c2a60f..6b58074814 100644 --- a/input/regression/musicxml/09f-Repeats-Finale.xml +++ b/input/regression/musicxml/09f-Repeats-Finale.xml @@ -1,167 +1,167 @@ - - - - - - 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!) - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - - - - 4 - 1 - - - - - - - - - - - 4 - 1 - - - - - - heavy-light - - - - - 4 - 1 - - - light-heavy - - - - - - - - 4 - 1 - - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - heavy-light - - - - - 4 - 1 - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + 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!) + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + + + + 4 + 1 + + + + + + + + + + + 4 + 1 + + + + + + heavy-light + + + + + 4 + 1 + + + light-heavy + + + + + + + + 4 + 1 + + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + heavy-light + + + + + 4 + 1 + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09g-Endings-Finale.xml b/input/regression/musicxml/09g-Endings-Finale.xml index 050032f576..9ce37f4176 100644 --- a/input/regression/musicxml/09g-Endings-Finale.xml +++ b/input/regression/musicxml/09g-Endings-Finale.xml @@ -1,105 +1,105 @@ - - - - - - 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? - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - 4 - 1 - - - - - - - - - - 4 - 1 - - - - - - - - - - - - - 4 - 1 - - - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + 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? + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + 4 + 1 + + + + + + + + + + 4 + 1 + + + + + + + + + + + + + 4 + 1 + + + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml b/input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml index dc24a7848b..db3cac58a4 100644 --- a/input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml +++ b/input/regression/musicxml/09h-RepeatsNoEndBar-Finale.xml @@ -1,73 +1,73 @@ - - - - - - A forward-repeating bar line - without an ending repeat bar. - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - 5 - - 4 - 1 - whole - - - - - - heavy-light - - - - - C - 5 - - 4 - 1 - whole - - - light-heavy - - - - - + + + + + + A forward-repeating bar line + without an ending repeat bar. + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + heavy-light + + + + + C + 5 + + 4 + 1 + whole + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml b/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml index 97bb0953c3..5fbd00ac87 100644 --- a/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml +++ b/input/regression/musicxml/09k-Upbeats-ImplicitMeasures-Finale.xml @@ -1,147 +1,147 @@ - - - - - - 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). - - - - - MusicXML Part - - Grand Piano - - - 1 - 1 - - - - - - - - 2 - - 0 - major - - - - G - 2 - - - - - - E - 4 - - 2 - 1 - quarter - up - - - - E - 4 - - 1 - 1 - eighth - up - - - - - - - F - 4 - - 2 - 1 - quarter - up - - - - G - 4 - - 2 - 1 - quarter - up - - - none - - - - - - - A - 4 - - 2 - 1 - quarter - up - - - - B - 4 - - 2 - 1 - quarter - down - - - - - - - C - 5 - - 2 - 1 - quarter - down - - - - D - 5 - - 2 - 1 - quarter - down - - - - 2 - 1 - quarter - - - light-heavy - - - - - + + + + + + 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). + + + + + MusicXML Part + + Grand Piano + + + 1 + 1 + + + + + + + + 2 + + 0 + major + + + + G + 2 + + + + + + E + 4 + + 2 + 1 + quarter + up + + + + E + 4 + + 1 + 1 + eighth + up + + + + + + + F + 4 + + 2 + 1 + quarter + up + + + + G + 4 + + 2 + 1 + quarter + up + + + none + + + + + + + A + 4 + + 2 + 1 + quarter + up + + + + B + 4 + + 2 + 1 + quarter + down + + + + + + + C + 5 + + 2 + 1 + quarter + down + + + + D + 5 + + 2 + 1 + quarter + down + + + + 2 + 1 + quarter + + + light-heavy + + + + + diff --git a/input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml b/input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml index 0ce65ac41d..65279c4ca3 100644 --- a/input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml +++ b/input/regression/musicxml/09m-MultiVoice-MidMeasureClefChange-Finale.xml @@ -1,426 +1,426 @@ - - - - - - A multi-voice / multi-staff part - with a clef change in the middle of a measure and a <backward> - for voice 2 jumping back beyond that clef change. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 336 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - F - 4 - - 168 - 1 - eighth - up - 1 - begin - - - - - - - - - D - 4 - - 168 - 1 - eighth - up - 1 - continue - - - - - - - - - B - 3 - - 168 - 1 - eighth - up - 1 - end - - - - - - - - - F - 4 - - - - - G - 3 - - 168 - 1 - eighth - down - 1 - - - - - - - F - 3 - - 336 - 1 - quarter - down - 1 - - - - - - 1008 - - - - 168 - 3 - eighth - 2 - - - - G - 2 - - 168 - 3 - eighth - up - 2 - begin - - - - - - - - - G - 2 - - 168 - 3 - eighth - up - 2 - end - - - - - - - - - G - 2 - - 168 - 3 - eighth - up - 2 - begin - - - - - - - A - 2 - - 84 - 3 - 16th - up - 2 - continue - begin - - - - G - 2 - - 84 - 3 - 16th - up - 2 - continue - continue - - - - F - 1 - 2 - - 84 - 3 - 16th - sharp - up - 2 - continue - continue - - - - G - 2 - - 84 - 3 - 16th - up - 2 - end - end - - - - - - light-light - - - - - - - G - 2 - - - - - E - 5 - - 168 - 1 - eighth - down - 1 - begin - - - - - - - - - - - - C - 5 - - 168 - 1 - eighth - down - 1 - continue - - - - - - - - - G - 4 - - 168 - 1 - eighth - down - 1 - end - - - - - - - - - G - 4 - - 168 - 1 - eighth - up - 1 - - - - - - - F - 4 - - 336 - 1 - quarter - up - 1 - - - - - - 1008 - - - - C - 3 - - 336 - 3 - quarter - down - 2 - - - - - E - 3 - - 336 - 3 - quarter - down - 2 - - - - - G - 3 - - 336 - 3 - quarter - down - 2 - - - - - C - 4 - - 336 - 3 - quarter - down - 2 - - - - 168 - 3 - eighth - 2 - - - - 336 - 3 - quarter - 2 - - - - G - 3 - - 168 - 3 - eighth - down - 2 - - - - - - - - - - - + + + + + + A multi-voice / multi-staff part + with a clef change in the middle of a measure and a <backward> + for voice 2 jumping back beyond that clef change. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 336 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + F + 4 + + 168 + 1 + eighth + up + 1 + begin + + + + + + + + + D + 4 + + 168 + 1 + eighth + up + 1 + continue + + + + + + + + + B + 3 + + 168 + 1 + eighth + up + 1 + end + + + + + + + + + F + 4 + + + + + G + 3 + + 168 + 1 + eighth + down + 1 + + + + + + + F + 3 + + 336 + 1 + quarter + down + 1 + + + + + + 1008 + + + + 168 + 3 + eighth + 2 + + + + G + 2 + + 168 + 3 + eighth + up + 2 + begin + + + + + + + + + G + 2 + + 168 + 3 + eighth + up + 2 + end + + + + + + + + + G + 2 + + 168 + 3 + eighth + up + 2 + begin + + + + + + + A + 2 + + 84 + 3 + 16th + up + 2 + continue + begin + + + + G + 2 + + 84 + 3 + 16th + up + 2 + continue + continue + + + + F + 1 + 2 + + 84 + 3 + 16th + sharp + up + 2 + continue + continue + + + + G + 2 + + 84 + 3 + 16th + up + 2 + end + end + + + + + + light-light + + + + + + + G + 2 + + + + + E + 5 + + 168 + 1 + eighth + down + 1 + begin + + + + + + + + + + + + C + 5 + + 168 + 1 + eighth + down + 1 + continue + + + + + + + + + G + 4 + + 168 + 1 + eighth + down + 1 + end + + + + + + + + + G + 4 + + 168 + 1 + eighth + up + 1 + + + + + + + F + 4 + + 336 + 1 + quarter + up + 1 + + + + + + 1008 + + + + C + 3 + + 336 + 3 + quarter + down + 2 + + + + + E + 3 + + 336 + 3 + quarter + down + 2 + + + + + G + 3 + + 336 + 3 + quarter + down + 2 + + + + + C + 4 + + 336 + 3 + quarter + down + 2 + + + + 168 + 3 + eighth + 2 + + + + 336 + 3 + quarter + 2 + + + + G + 3 + + 168 + 3 + eighth + down + 2 + + + + + + + + + + + diff --git a/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml b/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml index 6e3b7eddef..00922bc734 100644 --- a/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml +++ b/input/regression/musicxml/10a-TwoVoicesOnStaff-Finale.xml @@ -1,286 +1,286 @@ - - - - - - Two voices share one staff. Each - voice is assigned some lyrics. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 8 - - 0 - major - - - - G - 2 - - - - - - E - 5 - - 16 - 1 - half - up - - - - - - - - single - This - - - - - - - - - -3 - - - - - D - 5 - - 8 - 1 - quarter - up - - single - is - - - - - B - 4 - - 8 - 1 - quarter - up - - single - the - - - - 32 - - - - C - 5 - - 16 - 2 - half - down - - - - - - - - single - This - - - - - B - 4 - - 8 - 2 - quarter - down - - single - is - - - - - G - 4 - - 8 - 2 - quarter - down - - single - the - - - - - - - - A - 5 - - 8 - 1 - quarter - - - - D - 5 - - 8 - 1 - quarter - up - - single - lyrics - - - - - B - 3 - - 12 - 1 - quarter - - up - - - - - single - of - - - - - C - 5 - - 4 - 1 - eighth - up - - - - - single - Voice1 - - - - 32 - - - - C - 4 - - 8 - 2 - quarter - - - - B - 4 - - 8 - 2 - quarter - down - - single - lyrics - - - - - G - 3 - - 12 - 2 - quarter - - down - - - - - single - of - - - - - A - 4 - - 4 - 2 - eighth - down - - - - - single - Voice1 - - - - - - - - 32 - 1 - - - light-heavy - - - - - + + + + + + Two voices share one staff. Each + voice is assigned some lyrics. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 8 + + 0 + major + + + + G + 2 + + + + + + E + 5 + + 16 + 1 + half + up + + + + + + + + single + This + + + + + + + + + -3 + + + + + D + 5 + + 8 + 1 + quarter + up + + single + is + + + + + B + 4 + + 8 + 1 + quarter + up + + single + the + + + + 32 + + + + C + 5 + + 16 + 2 + half + down + + + + + + + + single + This + + + + + B + 4 + + 8 + 2 + quarter + down + + single + is + + + + + G + 4 + + 8 + 2 + quarter + down + + single + the + + + + + + + + A + 5 + + 8 + 1 + quarter + + + + D + 5 + + 8 + 1 + quarter + up + + single + lyrics + + + + + B + 3 + + 12 + 1 + quarter + + up + + + + + single + of + + + + + C + 5 + + 4 + 1 + eighth + up + + + + + single + Voice1 + + + + 32 + + + + C + 4 + + 8 + 2 + quarter + + + + B + 4 + + 8 + 2 + quarter + down + + single + lyrics + + + + + G + 3 + + 12 + 2 + quarter + + down + + + + + single + of + + + + + A + 4 + + 4 + 2 + eighth + down + + + + + single + Voice1 + + + + + + + + 32 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml b/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml index 215e2aa785..4138aa09b3 100644 --- a/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml +++ b/input/regression/musicxml/13c-GraceNote-MeasureEnd-Finale.xml @@ -1,93 +1,93 @@ - - - - - - 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. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 32 - - 0 - major - - - - G - 2 - - - - - E - 5 - - 64 - 1 - half - down - 1 - - - - E - 5 - - 64 - 1 - half - down - 1 - - - - - G - 5 - - 1 - 16th - up - 1 - begin - begin - - - - - A - 5 - - 1 - 16th - up - 1 - end - end - - - - - + + + + + + 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. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 32 + + 0 + major + + + + G + 2 + + + + + E + 5 + + 64 + 1 + half + down + 1 + + + + E + 5 + + 64 + 1 + half + down + 1 + + + + + G + 5 + + 1 + 16th + up + 1 + begin + begin + + + + + A + 5 + + 1 + 16th + up + 1 + end + end + + + + + diff --git a/input/regression/musicxml/13d-AfterGrace.xml b/input/regression/musicxml/13d-AfterGrace.xml index b14be20f5b..60f568d5f9 100644 --- a/input/regression/musicxml/13d-AfterGrace.xml +++ b/input/regression/musicxml/13d-AfterGrace.xml @@ -1,124 +1,124 @@ - - - - - - Some grace notes and after-graces (indicated by steal-time-previous and steal-time-next). - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 32 - - 0 - major - - - - G - 2 - - - - - E - 5 - - 64 - 1 - half - down - 1 - - - - - G - 5 - - 1 - 16th - up - 1 - - - - - A - 5 - - 1 - 16th - up - 1 - - - - - A - 5 - - 1 - 16th - up - 1 - - - - E - 5 - - 64 - 1 - half - down - 1 - - - - - G - 5 - - 1 - 16th - up - 1 - begin - begin - - - - - A - 5 - - 1 - 16th - up - 1 - end - end - - - - - + + + + + + Some grace notes and after-graces (indicated by steal-time-previous and steal-time-next). + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 32 + + 0 + major + + + + G + 2 + + + + + E + 5 + + 64 + 1 + half + down + 1 + + + + + G + 5 + + 1 + 16th + up + 1 + + + + + A + 5 + + 1 + 16th + up + 1 + + + + + A + 5 + + 1 + 16th + up + 1 + + + + E + 5 + + 64 + 1 + half + down + 1 + + + + + G + 5 + + 1 + 16th + up + 1 + begin + begin + + + + + A + 5 + + 1 + 16th + up + 1 + end + end + + + + + diff --git a/input/regression/musicxml/14c-StaffChange-Finale.xml b/input/regression/musicxml/14c-StaffChange-Finale.xml index e1e9485bff..dab5d7eb63 100644 --- a/input/regression/musicxml/14c-StaffChange-Finale.xml +++ b/input/regression/musicxml/14c-StaffChange-Finale.xml @@ -1,359 +1,359 @@ - - - - - - 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. - - - - - MusicXML Part - - Piano - - - 1 - 1 - - - - - - - - 2 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - - 8 - 1 - 1 - - - 8 - - - - A - 3 - - 1 - 2 - eighth - down - 2 - begin - - - - E - 4 - - 1 - 2 - eighth - down - 1 - continue - - - - A - 3 - - 1 - 2 - eighth - down - 2 - continue - - - - E - 4 - - 1 - 2 - eighth - down - 1 - end - - - - C - 5 - - 1 - 2 - eighth - down - 1 - begin - - - - E - 4 - - 1 - 2 - eighth - down - 1 - continue - - - - A - 3 - - 1 - 2 - eighth - down - 2 - continue - - - - B - 4 - - 1 - 2 - eighth - down - 2 - end - - - - - - - 8 - 1 - 1 - - - 8 - - - - C - 3 - - 1 - 2 - eighth - up - 2 - begin - - - - - E - 3 - - 1 - 2 - eighth - up - 2 - - - - - G - 3 - - 1 - 2 - eighth - up - 2 - - - - - C - 4 - - 1 - 2 - eighth - up - 2 - - - - C - 4 - - 1 - 2 - eighth - up - 1 - continue - - - - - E - 4 - - 1 - 2 - eighth - up - 1 - - - - - G - 4 - - 1 - 2 - eighth - up - 1 - - - - C - 3 - - 1 - 2 - eighth - up - 2 - continue - - - - - E - 3 - - 1 - 2 - eighth - up - 2 - - - - - G - 3 - - 1 - 2 - eighth - up - 2 - - - - - C - 4 - - 1 - 2 - eighth - up - 1 - - - - G - 3 - - 1 - 2 - eighth - up - 2 - end - - - - - C - 4 - - 1 - 2 - eighth - up - 1 - - - - - E - 4 - - 1 - 2 - eighth - up - 1 - - - - - G - 4 - - 1 - 2 - eighth - up - 1 - - - - 4 - 2 - half - 2 - - - light-heavy - - - - - + + + + + + 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. + + + + + MusicXML Part + + Piano + + + 1 + 1 + + + + + + + + 2 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + + 8 + 1 + 1 + + + 8 + + + + A + 3 + + 1 + 2 + eighth + down + 2 + begin + + + + E + 4 + + 1 + 2 + eighth + down + 1 + continue + + + + A + 3 + + 1 + 2 + eighth + down + 2 + continue + + + + E + 4 + + 1 + 2 + eighth + down + 1 + end + + + + C + 5 + + 1 + 2 + eighth + down + 1 + begin + + + + E + 4 + + 1 + 2 + eighth + down + 1 + continue + + + + A + 3 + + 1 + 2 + eighth + down + 2 + continue + + + + B + 4 + + 1 + 2 + eighth + down + 2 + end + + + + + + + 8 + 1 + 1 + + + 8 + + + + C + 3 + + 1 + 2 + eighth + up + 2 + begin + + + + + E + 3 + + 1 + 2 + eighth + up + 2 + + + + + G + 3 + + 1 + 2 + eighth + up + 2 + + + + + C + 4 + + 1 + 2 + eighth + up + 2 + + + + C + 4 + + 1 + 2 + eighth + up + 1 + continue + + + + + E + 4 + + 1 + 2 + eighth + up + 1 + + + + + G + 4 + + 1 + 2 + eighth + up + 1 + + + + C + 3 + + 1 + 2 + eighth + up + 2 + continue + + + + + E + 3 + + 1 + 2 + eighth + up + 2 + + + + + G + 3 + + 1 + 2 + eighth + up + 2 + + + + + C + 4 + + 1 + 2 + eighth + up + 1 + + + + G + 3 + + 1 + 2 + eighth + up + 2 + end + + + + + C + 4 + + 1 + 2 + eighth + up + 1 + + + + + E + 4 + + 1 + 2 + eighth + up + 1 + + + + + G + 4 + + 1 + 2 + eighth + up + 1 + + + + 4 + 2 + half + 2 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17a-Chords-Finale.xml b/input/regression/musicxml/17a-Chords-Finale.xml index c99ad39ebc..55a1d329fc 100644 --- a/input/regression/musicxml/17a-Chords-Finale.xml +++ b/input/regression/musicxml/17a-Chords-Finale.xml @@ -1,201 +1,201 @@ - - - - - - A normal staff with several - (complex) chord names displayed. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - - major - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - major-seventh - - 11 - 1 - add - - - - - A - 4 - - 1 - 1 - quarter - up - - - - B - - dominant - - 5 - 1 - alter - - - 9 - 1 - add - - - - - A - 4 - - 1 - 1 - quarter - up - - - - E - -1 - - major - - 2 - 0 - add - - - - - A - 4 - - 1 - 1 - quarter - up - - - - - - - G - - minor - - - - A - 4 - - 1 - 1 - quarter - up - - - - D - 1 - - major-seventh - - - - A - 4 - - 1 - 1 - quarter - up - - - - A - - diminished-seventh - - - - A - 4 - - 1 - 1 - quarter - up - - - - A - - augmented - - - - A - 4 - - 1 - 1 - quarter - up - - - light-heavy - - - - - + + + + + + A normal staff with several + (complex) chord names displayed. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + + major + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + major-seventh + + 11 + 1 + add + + + + + A + 4 + + 1 + 1 + quarter + up + + + + B + + dominant + + 5 + 1 + alter + + + 9 + 1 + add + + + + + A + 4 + + 1 + 1 + quarter + up + + + + E + -1 + + major + + 2 + 0 + add + + + + + A + 4 + + 1 + 1 + quarter + up + + + + + + + G + + minor + + + + A + 4 + + 1 + 1 + quarter + up + + + + D + 1 + + major-seventh + + + + A + 4 + + 1 + 1 + quarter + up + + + + A + + diminished-seventh + + + + A + 4 + + 1 + 1 + quarter + up + + + + A + + augmented + + + + A + 4 + + 1 + 1 + quarter + up + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17b-Fretboards-Finale.xml b/input/regression/musicxml/17b-Fretboards-Finale.xml index 1d2723bef6..4238e3d052 100644 --- a/input/regression/musicxml/17b-Fretboards-Finale.xml +++ b/input/regression/musicxml/17b-Fretboards-Finale.xml @@ -1,227 +1,227 @@ - - - - - - A staff with chord names and some - fretboards shown. (In Finaly, only the fretboards were shown!!!) - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - D - - major - - 6 - 4 - - 6 - 0 - - - 5 - 0 - - - 4 - 0 - - - 3 - 2 - - - 2 - 3 - - - 1 - 2 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - dominant - - 6 - 4 - - 6 - 0 - - - 5 - 3 - - - 4 - 2 - - - 3 - 3 - - - 2 - 1 - - - 1 - 0 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - minor-seventh - - 6 - 4 - 3 - - 6 - 0 - - - 5 - 3 - - - 4 - 5 - - - 3 - 3 - - - 2 - 4 - - - 1 - 3 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - dominant - - 13 - -1 - add - - - 6 - 4 - 8 - - 6 - 8 - - - 4 - 8 - - - 3 - 9 - - - 2 - 9 - - - 1 - 0 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - light-heavy - - - - - + + + + + + A staff with chord names and some + fretboards shown. (In Finaly, only the fretboards were shown!!!) + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + D + + major + + 6 + 4 + + 6 + 0 + + + 5 + 0 + + + 4 + 0 + + + 3 + 2 + + + 2 + 3 + + + 1 + 2 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + dominant + + 6 + 4 + + 6 + 0 + + + 5 + 3 + + + 4 + 2 + + + 3 + 3 + + + 2 + 1 + + + 1 + 0 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + minor-seventh + + 6 + 4 + 3 + + 6 + 0 + + + 5 + 3 + + + 4 + 5 + + + 3 + 3 + + + 2 + 4 + + + 1 + 3 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + dominant + + 13 + -1 + add + + + 6 + 4 + 8 + + 6 + 8 + + + 4 + 8 + + + 3 + 9 + + + 2 + 9 + + + 1 + 0 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17c-ChordsFrets-Finale.xml b/input/regression/musicxml/17c-ChordsFrets-Finale.xml index c10d995a80..281eebb65d 100644 --- a/input/regression/musicxml/17c-ChordsFrets-Finale.xml +++ b/input/regression/musicxml/17c-ChordsFrets-Finale.xml @@ -1,441 +1,441 @@ - - - - - - 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. - - - - - MusicXML Part - - Acoustic Grand Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - - G - 2 - - - - - - C - - major - - 6 - 4 - - 6 - 0 - - - 5 - 3 - - - 4 - 2 - - - 3 - 0 - - - 2 - 1 - - - 1 - 0 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - major-seventh - - 11 - 1 - add - - - 6 - 4 - 2 - - 6 - 0 - - - 5 - 3 - - - 4 - 5 - - - 3 - 4 - - - 2 - 5 - - - 1 - 2 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - B - - dominant - - 5 - 1 - alter - - - 9 - 1 - add - - - 6 - 4 - - 6 - 0 - - - 5 - 2 - - - 4 - 1 - - - 3 - 2 - - - 2 - 3 - - - 1 - 3 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - E - -1 - - major - - 2 - 0 - add - - - 6 - 5 - 11 - - 6 - 11 - - - 5 - 13 - - - 4 - 15 - - - 3 - 12 - - - 2 - 11 - - - 1 - 11 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - - - - G - - minor - - 6 - 4 - 3 - - 6 - 3 - - - 5 - 5 - - - 4 - 5 - - - 3 - 3 - - - 2 - 3 - - - 1 - 3 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - D - 1 - - major-seventh - - 6 - 4 - - 6 - 0 - - - 5 - 0 - - - 4 - 1 - - - 3 - 3 - - - 2 - 3 - - - 1 - 3 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - A - - diminished-seventh - - 6 - 4 - - 6 - 0 - - - 5 - 0 - - - 4 - 1 - - - 3 - 2 - - - 2 - 1 - - - 1 - 2 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - - C - - major - - 10 - 3 - - 10 - 1 - 2 - - - 9 - 3 - - - 7 - 1 - 4 - - - 5 - 3 - - - 4 - 2 - - - 3 - 1 - 5 - - - 2 - 0 - - - 1 - 0 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - light-heavy - - - - - + + + + + + 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. + + + + + MusicXML Part + + Acoustic Grand Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + + G + 2 + + + + + + C + + major + + 6 + 4 + + 6 + 0 + + + 5 + 3 + + + 4 + 2 + + + 3 + 0 + + + 2 + 1 + + + 1 + 0 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + major-seventh + + 11 + 1 + add + + + 6 + 4 + 2 + + 6 + 0 + + + 5 + 3 + + + 4 + 5 + + + 3 + 4 + + + 2 + 5 + + + 1 + 2 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + B + + dominant + + 5 + 1 + alter + + + 9 + 1 + add + + + 6 + 4 + + 6 + 0 + + + 5 + 2 + + + 4 + 1 + + + 3 + 2 + + + 2 + 3 + + + 1 + 3 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + E + -1 + + major + + 2 + 0 + add + + + 6 + 5 + 11 + + 6 + 11 + + + 5 + 13 + + + 4 + 15 + + + 3 + 12 + + + 2 + 11 + + + 1 + 11 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + + + + G + + minor + + 6 + 4 + 3 + + 6 + 3 + + + 5 + 5 + + + 4 + 5 + + + 3 + 3 + + + 2 + 3 + + + 1 + 3 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + D + 1 + + major-seventh + + 6 + 4 + + 6 + 0 + + + 5 + 0 + + + 4 + 1 + + + 3 + 3 + + + 2 + 3 + + + 1 + 3 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + A + + diminished-seventh + + 6 + 4 + + 6 + 0 + + + 5 + 0 + + + 4 + 1 + + + 3 + 2 + + + 2 + 1 + + + 1 + 2 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + + C + + major + + 10 + 3 + + 10 + 1 + 2 + + + 9 + 3 + + + 7 + 1 + 4 + + + 5 + 3 + + + 4 + 2 + + + 3 + 1 + 5 + + + 2 + 0 + + + 1 + 0 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml b/input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml index 451a6d8ffa..fba900bb17 100644 --- a/input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml +++ b/input/regression/musicxml/17d-ChordsFretsOnMultistaff-Finale.xml @@ -1,618 +1,618 @@ - - - - - - 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. - - - - - MusicXML Part - - Piano - - - 1 - 1 - - - - - - - - 1 - - 0 - major - - - 2 - - G - 2 - - - F - 4 - - - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - E - -1 - - minor-ninth - - 6 - 4 - 4 - - 6 - 0 - - - 5 - 6 - - - 4 - 4 - - - 3 - 6 - - - 2 - 6 - - - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - 4 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - 4 - - - - C - - major - - 6 - 4 - - 6 - 0 - - - 5 - 3 - - - 4 - 2 - - - 3 - 0 - - - 2 - 1 - - - 1 - 0 - - - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - D - - dominant - - 6 - 4 - - 6 - 0 - - - 5 - 0 - - - 4 - 0 - - - 3 - 2 - - - 2 - 1 - - - 1 - 2 - - - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - C - - minor-seventh - - 11 - 0 - add - - - 6 - 4 - - 6 - 0 - - - 5 - 3 - - - 4 - 1 - - - 3 - 3 - - - 2 - 1 - - - 1 - 1 - - - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - 4 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - - D - 5 - - 1 - 1 - quarter - up - 1 - - - 4 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - - F - 4 - - 1 - 2 - quarter - down - 1 - - - 4 - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - G - 1 - - suspended-fourth - - 7 - 0 - add - - - 9 - -1 - add - - - 11 - 0 - add - - - 13 - 0 - add - - - 6 - 4 - 4 - - 6 - 4 - - - 4 - 4 - - - 3 - 6 - - - 2 - 6 - - - 1 - 5 - - - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - - D - 3 - - 1 - 3 - quarter - up - 2 - - - 4 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - - B - 2 - - 1 - 4 - quarter - down - 2 - - - light-heavy - - - - - + + + + + + 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. + + + + + MusicXML Part + + Piano + + + 1 + 1 + + + + + + + + 1 + + 0 + major + + + 2 + + G + 2 + + + F + 4 + + + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + E + -1 + + minor-ninth + + 6 + 4 + 4 + + 6 + 0 + + + 5 + 6 + + + 4 + 4 + + + 3 + 6 + + + 2 + 6 + + + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + 4 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + 4 + + + + C + + major + + 6 + 4 + + 6 + 0 + + + 5 + 3 + + + 4 + 2 + + + 3 + 0 + + + 2 + 1 + + + 1 + 0 + + + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + D + + dominant + + 6 + 4 + + 6 + 0 + + + 5 + 0 + + + 4 + 0 + + + 3 + 2 + + + 2 + 1 + + + 1 + 2 + + + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + C + + minor-seventh + + 11 + 0 + add + + + 6 + 4 + + 6 + 0 + + + 5 + 3 + + + 4 + 1 + + + 3 + 3 + + + 2 + 1 + + + 1 + 1 + + + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + 4 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + + D + 5 + + 1 + 1 + quarter + up + 1 + + + 4 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + + F + 4 + + 1 + 2 + quarter + down + 1 + + + 4 + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + G + 1 + + suspended-fourth + + 7 + 0 + add + + + 9 + -1 + add + + + 11 + 0 + add + + + 13 + 0 + add + + + 6 + 4 + 4 + + 6 + 4 + + + 4 + 4 + + + 3 + 6 + + + 2 + 6 + + + 1 + 5 + + + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + + D + 3 + + 1 + 3 + quarter + up + 2 + + + 4 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + + B + 2 + + 1 + 4 + quarter + down + 2 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17e-TabStaves-Finale.xml b/input/regression/musicxml/17e-TabStaves-Finale.xml index a3cd659ece..fab65176e4 100644 --- a/input/regression/musicxml/17e-TabStaves-Finale.xml +++ b/input/regression/musicxml/17e-TabStaves-Finale.xml @@ -1,1643 +1,1643 @@ - - - - - - Some tablature staves, with - explicit fingering information and different string tunings given - in the MusicXML file. - - - - - bracket - yes - - - Guitar - Gtr. - - Guitar - - - 1 - 26 - - - - Guitar - Gtr. - - Guitar - - - 2 - 26 - - - - Guitar - Gtr. - - Guitar - - - 3 - 26 - - - - Guitar - Gtr. - - Guitar - - - 4 - 26 - - - - Bass Guitar - Bass - - Bass Guitar - - - 5 - 35 - - - - Banjo - Bjo. - - Banjo - - - 6 - 106 - - - - Lute - L. - - Lute - - - 7 - 25 - - - - Ukulele - Uk. - - Ukulele - - - 8 - 25 - - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 6 - - E - 2 - - - A - 2 - - - D - 3 - - - G - 3 - - - B - 3 - - - E - 4 - - - - - - - G - 3 - - 1 - 1 - quarter - none - - - 4 - 5 - - - - - - E - 5 - - 1 - 1 - quarter - none - - - 2 - 17 - - - - - - C - 4 - - 1 - 1 - quarter - none - - - 2 - 1 - - - - - - E - 3 - - 1 - 1 - quarter - none - - - 4 - 2 - - - - - - - - - G - 1 - 2 - - 1 - 1 - quarter - none - - - 6 - 4 - - - - - - - F - 1 - 3 - - 1 - 1 - quarter - none - - - 4 - 4 - - - - - - - G - 3 - - 1 - 1 - quarter - none - - - 3 - 0 - - - - - - D - 3 - - 1 - 1 - quarter - none - - - 5 - 5 - - - - - - G - 1 - 3 - - 1 - 1 - quarter - none - - - 3 - 1 - - - - - - E - 4 - - 1 - 1 - quarter - none - - - 1 - 0 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 6 - - E - 2 - - - A - 2 - - - D - 3 - - - G - 3 - - - B - 3 - - - E - 4 - - - - - - - D - 1 - 4 - - 1 - 1 - quarter - up - - - 2 - 4 - - - - - - G - 1 - 3 - - 1 - 1 - quarter - up - - - 3 - 1 - - - - - - C - 3 - - 1 - 1 - quarter - up - - - 5 - 3 - - - - - - 1 - 1 - quarter - - - - - - - F - 1 - 4 - - 1 - 1 - quarter - up - - - 1 - 2 - - - - - - G - 3 - - 1 - 1 - quarter - up - - - 3 - 0 - - - - - - G - 3 - - 1 - 1 - quarter - up - - - 4 - 5 - - - - - - F - 1 - 2 - - 1 - 1 - quarter - up - - - 6 - 2 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 2 - - 0 - major - - - TAB - 5 - - - 6 - - D - 2 - - - A - 2 - - - D - 3 - - - F - 1 - 3 - - - A - 3 - - - E - 4 - - - - - - - A - 1 - 3 - - 2 - 1 - quarter - none - - - 2 - 1 - - - - - - B - 2 - - 1 - 1 - eighth - none - - - 5 - 2 - - - - - - A - 3 - - 1 - 1 - eighth - none - - - 3 - 3 - - - - - - 4 - 1 - half - - - - - - - G - 1 - 4 - - 2 - 1 - quarter - none - - - 1 - 4 - - - - - - D - 4 - - 2 - 1 - quarter - none - - - 2 - 5 - - - - - - G - 1 - 2 - - 2 - 1 - quarter - none - - - 6 - 6 - - - - - - D - 3 - - 2 - 1 - quarter - none - - - 4 - 0 - - - - - - - - - 8 - 1 - - - light-heavy - - - - - - - - 2 - - 0 - major - - - TAB - 5 - - - 6 - - D - 2 - - - A - 2 - - - D - 3 - - - G - 3 - - - B - 3 - - - D - 4 - - - - - - - B - 3 - - 1 - 1 - eighth - none - - - 3 - 4 - - - - - - D - 2 - - 1 - 1 - eighth - none - - - 5 - -7 - - - - - - - D - 2 - - 1 - 1 - eighth - none - - - 6 - 0 - - - - - - - G - 2 - - 1 - 1 - eighth - none - - - 6 - 5 - - - - - - - A - 2 - - 1 - 1 - eighth - none - - - 5 - 0 - - - - - - - A - 2 - - 1 - 1 - eighth - none - - - 5 - 0 - - - - - - 2 - 1 - quarter - - - - 4 - 1 - half - - - - - - - D - 4 - - 2 - 1 - quarter - none - - - 1 - 0 - - - - - - D - 3 - - 2 - 1 - quarter - none - - - 4 - 0 - - - - - - A - 2 - - 2 - 1 - quarter - none - - - 5 - 0 - - - - - - D - 2 - - 2 - 1 - quarter - none - - - 6 - 0 - - - - - - - - - 8 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 4 - - E - 1 - - - A - 1 - - - D - 2 - - - G - 2 - - - - - - - G - 2 - - 1 - 1 - quarter - none - - - 1 - 0 - - - - - - E - 1 - - 1 - 1 - quarter - none - - - 4 - 0 - - - - - - D - 2 - - 1 - 1 - quarter - none - - - 2 - 0 - - - - - - A - 1 - 2 - - 1 - 1 - quarter - none - - - 2 - 8 - - - - - - - - - A - 1 - - 1 - 1 - quarter - none - - - 3 - 0 - - - - - - A - 1 - - 1 - 1 - quarter - none - - - 3 - 0 - - - - - - A - 1 - - 1 - 1 - quarter - none - - - 3 - 0 - - - - - - A - 1 - - 1 - 1 - quarter - none - - - 3 - 0 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 5 - - G - 4 - - - D - 3 - - - G - 3 - - - C - 4 - - - D - 4 - - - - - - - D - 1 - 4 - - 1 - 1 - quarter - up - - - 2 - 3 - - - - - - D - 3 - - 1 - 1 - quarter - up - - - 4 - 0 - - - - - - D - 4 - - 1 - 1 - quarter - up - - - 1 - 0 - - - - - - 1 - 1 - quarter - - - - - - - G - 3 - - 1 - 1 - quarter - up - - - 3 - 0 - - - - - - G - 4 - - 1 - 1 - quarter - up - - - 5 - 0 - - - - - - G - 4 - - 1 - 1 - quarter - up - - - 5 - 0 - - - - - - G - 4 - - 1 - 1 - quarter - up - - - 5 - 0 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 6 - - G - 2 - - - C - 3 - - - F - 3 - - - A - 3 - - - D - 4 - - - G - 4 - - - - - - - C - 1 - 4 - - 1 - 1 - quarter - up - - - 3 - 4 - - - - - - C - 1 - 3 - - 1 - 1 - quarter - up - - - 5 - 1 - - - - - - A - 4 - - 1 - 1 - quarter - up - - - 1 - 2 - - - - - - E - 4 - - 1 - 1 - quarter - up - - - 3 - 7 - - - - - - - - - D - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - F - 3 - - 1 - 1 - quarter - up - - - 4 - 0 - - - - - - G - 2 - - 1 - 1 - quarter - up - - - 6 - 0 - - - - - - C - 3 - - 1 - 1 - quarter - up - - - 5 - 0 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - - - - 1 - - 0 - major - - - TAB - 5 - - - 4 - - A - 4 - - - E - 4 - - - C - 4 - - - G - 4 - - - - - - - E - 6 - - 1 - 1 - quarter - up - - - 3 - 24 - - - - - - B - 4 - - 1 - 1 - quarter - up - - - 1 - 4 - - - - - - C - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - E - 4 - - 1 - 1 - quarter - up - - - 3 - 0 - - - - - - - - - C - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - C - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - C - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - C - 4 - - 1 - 1 - quarter - up - - - 2 - 0 - - - - - - - - - 4 - 1 - - - light-heavy - - - - - + + + + + + Some tablature staves, with + explicit fingering information and different string tunings given + in the MusicXML file. + + + + + bracket + yes + + + Guitar + Gtr. + + Guitar + + + 1 + 26 + + + + Guitar + Gtr. + + Guitar + + + 2 + 26 + + + + Guitar + Gtr. + + Guitar + + + 3 + 26 + + + + Guitar + Gtr. + + Guitar + + + 4 + 26 + + + + Bass Guitar + Bass + + Bass Guitar + + + 5 + 35 + + + + Banjo + Bjo. + + Banjo + + + 6 + 106 + + + + Lute + L. + + Lute + + + 7 + 25 + + + + Ukulele + Uk. + + Ukulele + + + 8 + 25 + + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 6 + + E + 2 + + + A + 2 + + + D + 3 + + + G + 3 + + + B + 3 + + + E + 4 + + + + + + + G + 3 + + 1 + 1 + quarter + none + + + 4 + 5 + + + + + + E + 5 + + 1 + 1 + quarter + none + + + 2 + 17 + + + + + + C + 4 + + 1 + 1 + quarter + none + + + 2 + 1 + + + + + + E + 3 + + 1 + 1 + quarter + none + + + 4 + 2 + + + + + + + + + G + 1 + 2 + + 1 + 1 + quarter + none + + + 6 + 4 + + + + + + + F + 1 + 3 + + 1 + 1 + quarter + none + + + 4 + 4 + + + + + + + G + 3 + + 1 + 1 + quarter + none + + + 3 + 0 + + + + + + D + 3 + + 1 + 1 + quarter + none + + + 5 + 5 + + + + + + G + 1 + 3 + + 1 + 1 + quarter + none + + + 3 + 1 + + + + + + E + 4 + + 1 + 1 + quarter + none + + + 1 + 0 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 6 + + E + 2 + + + A + 2 + + + D + 3 + + + G + 3 + + + B + 3 + + + E + 4 + + + + + + + D + 1 + 4 + + 1 + 1 + quarter + up + + + 2 + 4 + + + + + + G + 1 + 3 + + 1 + 1 + quarter + up + + + 3 + 1 + + + + + + C + 3 + + 1 + 1 + quarter + up + + + 5 + 3 + + + + + + 1 + 1 + quarter + + + + + + + F + 1 + 4 + + 1 + 1 + quarter + up + + + 1 + 2 + + + + + + G + 3 + + 1 + 1 + quarter + up + + + 3 + 0 + + + + + + G + 3 + + 1 + 1 + quarter + up + + + 4 + 5 + + + + + + F + 1 + 2 + + 1 + 1 + quarter + up + + + 6 + 2 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 2 + + 0 + major + + + TAB + 5 + + + 6 + + D + 2 + + + A + 2 + + + D + 3 + + + F + 1 + 3 + + + A + 3 + + + E + 4 + + + + + + + A + 1 + 3 + + 2 + 1 + quarter + none + + + 2 + 1 + + + + + + B + 2 + + 1 + 1 + eighth + none + + + 5 + 2 + + + + + + A + 3 + + 1 + 1 + eighth + none + + + 3 + 3 + + + + + + 4 + 1 + half + + + + + + + G + 1 + 4 + + 2 + 1 + quarter + none + + + 1 + 4 + + + + + + D + 4 + + 2 + 1 + quarter + none + + + 2 + 5 + + + + + + G + 1 + 2 + + 2 + 1 + quarter + none + + + 6 + 6 + + + + + + D + 3 + + 2 + 1 + quarter + none + + + 4 + 0 + + + + + + + + + 8 + 1 + + + light-heavy + + + + + + + + 2 + + 0 + major + + + TAB + 5 + + + 6 + + D + 2 + + + A + 2 + + + D + 3 + + + G + 3 + + + B + 3 + + + D + 4 + + + + + + + B + 3 + + 1 + 1 + eighth + none + + + 3 + 4 + + + + + + D + 2 + + 1 + 1 + eighth + none + + + 5 + -7 + + + + + + + D + 2 + + 1 + 1 + eighth + none + + + 6 + 0 + + + + + + + G + 2 + + 1 + 1 + eighth + none + + + 6 + 5 + + + + + + + A + 2 + + 1 + 1 + eighth + none + + + 5 + 0 + + + + + + + A + 2 + + 1 + 1 + eighth + none + + + 5 + 0 + + + + + + 2 + 1 + quarter + + + + 4 + 1 + half + + + + + + + D + 4 + + 2 + 1 + quarter + none + + + 1 + 0 + + + + + + D + 3 + + 2 + 1 + quarter + none + + + 4 + 0 + + + + + + A + 2 + + 2 + 1 + quarter + none + + + 5 + 0 + + + + + + D + 2 + + 2 + 1 + quarter + none + + + 6 + 0 + + + + + + + + + 8 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 4 + + E + 1 + + + A + 1 + + + D + 2 + + + G + 2 + + + + + + + G + 2 + + 1 + 1 + quarter + none + + + 1 + 0 + + + + + + E + 1 + + 1 + 1 + quarter + none + + + 4 + 0 + + + + + + D + 2 + + 1 + 1 + quarter + none + + + 2 + 0 + + + + + + A + 1 + 2 + + 1 + 1 + quarter + none + + + 2 + 8 + + + + + + + + + A + 1 + + 1 + 1 + quarter + none + + + 3 + 0 + + + + + + A + 1 + + 1 + 1 + quarter + none + + + 3 + 0 + + + + + + A + 1 + + 1 + 1 + quarter + none + + + 3 + 0 + + + + + + A + 1 + + 1 + 1 + quarter + none + + + 3 + 0 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 5 + + G + 4 + + + D + 3 + + + G + 3 + + + C + 4 + + + D + 4 + + + + + + + D + 1 + 4 + + 1 + 1 + quarter + up + + + 2 + 3 + + + + + + D + 3 + + 1 + 1 + quarter + up + + + 4 + 0 + + + + + + D + 4 + + 1 + 1 + quarter + up + + + 1 + 0 + + + + + + 1 + 1 + quarter + + + + + + + G + 3 + + 1 + 1 + quarter + up + + + 3 + 0 + + + + + + G + 4 + + 1 + 1 + quarter + up + + + 5 + 0 + + + + + + G + 4 + + 1 + 1 + quarter + up + + + 5 + 0 + + + + + + G + 4 + + 1 + 1 + quarter + up + + + 5 + 0 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 6 + + G + 2 + + + C + 3 + + + F + 3 + + + A + 3 + + + D + 4 + + + G + 4 + + + + + + + C + 1 + 4 + + 1 + 1 + quarter + up + + + 3 + 4 + + + + + + C + 1 + 3 + + 1 + 1 + quarter + up + + + 5 + 1 + + + + + + A + 4 + + 1 + 1 + quarter + up + + + 1 + 2 + + + + + + E + 4 + + 1 + 1 + quarter + up + + + 3 + 7 + + + + + + + + + D + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + F + 3 + + 1 + 1 + quarter + up + + + 4 + 0 + + + + + + G + 2 + + 1 + 1 + quarter + up + + + 6 + 0 + + + + + + C + 3 + + 1 + 1 + quarter + up + + + 5 + 0 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + + + + 1 + + 0 + major + + + TAB + 5 + + + 4 + + A + 4 + + + E + 4 + + + C + 4 + + + G + 4 + + + + + + + E + 6 + + 1 + 1 + quarter + up + + + 3 + 24 + + + + + + B + 4 + + 1 + 1 + quarter + up + + + 1 + 4 + + + + + + C + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + E + 4 + + 1 + 1 + quarter + up + + + 3 + 0 + + + + + + + + + C + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + C + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + C + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + C + 4 + + 1 + 1 + quarter + up + + + 2 + 0 + + + + + + + + + 4 + 1 + + + light-heavy + + + + + diff --git a/input/regression/musicxml/17f-AllChordTypes.xml b/input/regression/musicxml/17f-AllChordTypes.xml index c7a1634bef..facab3489f 100644 --- a/input/regression/musicxml/17f-AllChordTypes.xml +++ b/input/regression/musicxml/17f-AllChordTypes.xml @@ -1,599 +1,599 @@ - - - - All MusicXML chord names/types with <root> - - - 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. - - - - - MusicXML Part - - Acoustic Grand Piano - - - - - - - - 2 - - 0 - major - - - - G - 2 - - - - - C - - major - - - C4 - 2 - 1 - quarter - major - - - - C - - minor - - - C4 - 2 - 1 - quarter - minor - - - - C - - augmented - - - C4 - 2 - 1 - quarter - augmented - - - - C - - diminished - - - C4 - 2 - 1 - quarter - diminished - - - - - - - C - - dominant - - - C4 - 2 - 1 - quarter - dominant - - - - C - - major-seventh - - - C4 - 2 - 1 - quarter - major-seventh - - - - C - - minor-seventh - - - C4 - 2 - 1 - quarter - minor-seventh - - - - C - - diminished-seventh - - - C4 - 2 - 1 - quarter - diminished-seventh - - - - - - - C - - augmented-seventh - - - C4 - 2 - 1 - quarter - augmented-seventh - - - - C - - half-diminished - - - C4 - 2 - 1 - quarter - half-diminished - - - - C - - major-minor - - - C4 - 2 - 1 - quarter - major-minor - - - - C - - major-sixth - - - C4 - 2 - 1 - quarter - major-sixth - - - - - - - C - - minor-sixth - - - C4 - 2 - 1 - quarter - minor-sixth - - - - C - - dominant-ninth - - - C4 - 2 - 1 - quarter - dominant-ninth - - - - C - - major-ninth - - - C4 - 2 - 1 - quarter - major-ninth - - - - C - - minor-ninth - minor-ninth - - - C4 - 2 - 1 - quarter - minor-ninth - - - - - - - C - - dominant-11th - - - C4 - 2 - 1 - quarter - dominant-11th - - - - C - - major-11th - - - C4 - 2 - 1 - quarter - major-11th - - - - C - - minor-11th - - - C4 - 2 - 1 - quarter - minor-11th - - - - C - - dominant-13th - - - C4 - 2 - 1 - quarter - dominant-13th - - - - - - - C - - major-13th - - - C4 - 2 - 1 - quarter - major-13th - - - - C - - minor-13th - - - C4 - 2 - 1 - quarter - minor-13th - - - - C - - suspended-second - - - C4 - 2 - 1 - quarter - suspended-second - - - - C - - suspended-fourth - - - C4 - 2 - 1 - quarter - suspended-fourth - - - - - - - C - - Neapolitan - - - C4 - 2 - 1 - quarter - Neapolitan - - - - C - - Italian - - - C4 - 2 - 1 - quarter - Italians - - - - C - - French - - - C4 - 2 - 1 - quarter - French - - - - C - - German - - - C4 - 2 - 1 - quarter - German - - - - - - - C - - pedal - - - C4 - 2 - 1 - quarter - pedal - - - - C - - power - - - C4 - 2 - 1 - quarter - power - - - - C - - Tristan - - - C4 - 2 - 1 - quarter - Tristan - - - - C - - other - - - C4 - 2 - 1 - quarter - other - - - - - - - F - 1 - - major - 2 - - - C4 - 4 - 1 - half - Inversion - - - - F - -2 - - major - - C - - - - C4 - 1 - 1 - eighth - Fbb/C - - - - G - 1 - - major - - D - 1 - - - - C4 - 1 - 1 - eighth - G#/D# - - - - C - - major - - - - 2 - 1 - quarter - C - - - - - - - C - - major - - 3 - 0 - subtract - - - 5 - -1 - alter - - - - C4 - 2 - 1 - quarter - C-3+5b - - - - C - - major - - 1 - 0 - subtract - - - 6 - -1 - add - - - - C4 - 2 - 1 - quarter - C-1+6b - - - light-heavy - - - - - + + + + All MusicXML chord names/types with <root> + + + 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. + + + + + MusicXML Part + + Acoustic Grand Piano + + + + + + + + 2 + + 0 + major + + + + G + 2 + + + + + C + + major + + + C4 + 2 + 1 + quarter + major + + + + C + + minor + + + C4 + 2 + 1 + quarter + minor + + + + C + + augmented + + + C4 + 2 + 1 + quarter + augmented + + + + C + + diminished + + + C4 + 2 + 1 + quarter + diminished + + + + + + + C + + dominant + + + C4 + 2 + 1 + quarter + dominant + + + + C + + major-seventh + + + C4 + 2 + 1 + quarter + major-seventh + + + + C + + minor-seventh + + + C4 + 2 + 1 + quarter + minor-seventh + + + + C + + diminished-seventh + + + C4 + 2 + 1 + quarter + diminished-seventh + + + + + + + C + + augmented-seventh + + + C4 + 2 + 1 + quarter + augmented-seventh + + + + C + + half-diminished + + + C4 + 2 + 1 + quarter + half-diminished + + + + C + + major-minor + + + C4 + 2 + 1 + quarter + major-minor + + + + C + + major-sixth + + + C4 + 2 + 1 + quarter + major-sixth + + + + + + + C + + minor-sixth + + + C4 + 2 + 1 + quarter + minor-sixth + + + + C + + dominant-ninth + + + C4 + 2 + 1 + quarter + dominant-ninth + + + + C + + major-ninth + + + C4 + 2 + 1 + quarter + major-ninth + + + + C + + minor-ninth + minor-ninth + + + C4 + 2 + 1 + quarter + minor-ninth + + + + + + + C + + dominant-11th + + + C4 + 2 + 1 + quarter + dominant-11th + + + + C + + major-11th + + + C4 + 2 + 1 + quarter + major-11th + + + + C + + minor-11th + + + C4 + 2 + 1 + quarter + minor-11th + + + + C + + dominant-13th + + + C4 + 2 + 1 + quarter + dominant-13th + + + + + + + C + + major-13th + + + C4 + 2 + 1 + quarter + major-13th + + + + C + + minor-13th + + + C4 + 2 + 1 + quarter + minor-13th + + + + C + + suspended-second + + + C4 + 2 + 1 + quarter + suspended-second + + + + C + + suspended-fourth + + + C4 + 2 + 1 + quarter + suspended-fourth + + + + + + + C + + Neapolitan + + + C4 + 2 + 1 + quarter + Neapolitan + + + + C + + Italian + + + C4 + 2 + 1 + quarter + Italians + + + + C + + French + + + C4 + 2 + 1 + quarter + French + + + + C + + German + + + C4 + 2 + 1 + quarter + German + + + + + + + C + + pedal + + + C4 + 2 + 1 + quarter + pedal + + + + C + + power + + + C4 + 2 + 1 + quarter + power + + + + C + + Tristan + + + C4 + 2 + 1 + quarter + Tristan + + + + C + + other + + + C4 + 2 + 1 + quarter + other + + + + + + + F + 1 + + major + 2 + + + C4 + 4 + 1 + half + Inversion + + + + F + -2 + + major + + C + + + + C4 + 1 + 1 + eighth + Fbb/C + + + + G + 1 + + major + + D + 1 + + + + C4 + 1 + 1 + eighth + G#/D# + + + + C + + major + + + + 2 + 1 + quarter + C + + + + + + + C + + major + + 3 + 0 + subtract + + + 5 + -1 + alter + + + + C4 + 2 + 1 + quarter + C-3+5b + + + + C + + major + + 1 + 0 + subtract + + + 6 + -1 + add + + + + C4 + 2 + 1 + quarter + C-1+6b + + + light-heavy + + + + +