diff --git a/README.md b/README.md index 12b0ee9..0be1b1c 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ Screenshot of a score converted with a specialized stylesheet file. ![Screenshot of a score converted with a specialized stylesheet file.](https://github.com/infojunkie/musicxml-mscx/blob/main/9-20-special.png?raw=true) -Screenshot of a score with accidentals, including microtonal accidentals. +Screenshot of a Lilypond test snippet with microtonal accidentals. -![Screenshot of a score with accidentals, including microtonal accidentals.](https://github.com/infojunkie/musicxml-mscx/blob/main/01f-Pitches-ParenthesizedMicrotoneAccidentals.png?raw=true) +![Screenshot of a Lilypond test snippet with microtonal accidentals.](https://github.com/infojunkie/musicxml-mscx/blob/main/01f-Pitches-ParenthesizedMicrotoneAccidentals.png?raw=true) # Theory of operation Why write a new converter between MusicXML and MuseScore, when MuseScore itself already does 2-way conversion? diff --git a/src/mscx.xsl b/src/mscx.xsl index d462f02..dc86356 100644 --- a/src/mscx.xsl +++ b/src/mscx.xsl @@ -136,24 +136,30 @@ --> - + + + - - stdNormal - + + + + + + + 0 - + 0 - + 1 - + 0 @@ -163,28 +169,67 @@ - + 1 - + + + + + + + + + + + + + + 1 + + + + + PERC + + + + + + + + + + Fluid + + - - - - - - - - - + + + + + + + NOTE + + + + + normal + + + 0 + + + + + + + + + - + + + cross + + + + + + half + auto + + + + + + + - + @@ -1105,42 +1187,55 @@ --> - + - 14 - 16 - 18 - 13 - 15 - 17 - 19 + 14 + 16 + 18 + 13 + 15 + 17 + 19 + + + + + + + + + + + - 0 - 2 - 4 - 5 - 7 - 9 - 11 + 0 + 2 + 4 + 5 + 7 + 9 + 11 - + + + + + + + + + + 0 + -12 + [mscx:noteToLine] Unhandled clef '' + + + + + 3 + 2 + 1 + 0 + -1 + -2 + -3 + [mscx:noteToLine] Unhandled step '' + + + + + + + + + + + + diff --git a/test/data/tutorial-percussion.musicxml b/test/data/tutorial-percussion.musicxml new file mode 100644 index 0000000..ba5afe7 --- /dev/null +++ b/test/data/tutorial-percussion.musicxml @@ -0,0 +1,685 @@ + + + + + + Finale v27.0 for Mac + 2021-04-16 + + + + + + + + + + 7.2319 + 40 + + + 1545 + 1194 + + 70 + 70 + 88 + 88 + + + + + 0 + 0 + + 121 + 70 + + + 42 + + + 0.957 + 5 + 0.9375 + 1.875 + 5 + 1.875 + 1.4583 + 0.9375 + 0.9375 + 0.9375 + 60 + 60 + 60 + 7.5 + unpitchedPercussionClef1 + + + + + + + Drums + + Snare Drum + + + Kick Drum + + + Crash Cymbal + + + Hi-Hat%g Closed + + + 10 + 1 + 39 + 80 + 0 + + + 10 + 1 + 37 + 80 + 0 + + + 10 + 1 + 50 + 80 + 0 + + + 10 + 1 + 43 + 80 + 0 + + + + Cowbell + + Cowbell + metal.bells.cowbell + + + 10 + 1 + 57 + 80 + 0 + + + + + + + + 1545 + 1194 + + 70 + 461 + 88 + 88 + + + + + 60 + 0 + + 211 + + system + + + 2 + + 0 + major + + + 4 + + F + 4 + + + + + + B + 3 + + 1 + + 1 + eighth + up + diamond + begin + + + + B + 3 + + 1 + + 1 + eighth + up + x + continue + + + + E + 3 + + 1 + + 1 + eighth + up + continue + + + + + B + 3 + + 1 + + 1 + eighth + up + x + + + + B + 3 + + 1 + + 1 + eighth + up + x + end + + + + B + 3 + + 1 + + 1 + eighth + up + x + begin + + + + B + 3 + + 1 + + 1 + eighth + up + x + continue + + + + E + 3 + + 1 + + 1 + eighth + up + continue + + + + + B + 3 + + 1 + + 1 + eighth + up + x + + + + B + 3 + + 1 + + 1 + eighth + up + x + end + + + 8 + + + + A + 2 + + 2 + + 2 + quarter + down + + + + G + 2 + + 2 + 2 + quarter + + + + A + 2 + + 1 + + 2 + eighth + down + begin + + + + A + 2 + + 1 + + 2 + eighth + down + end + + + + G + 2 + + 1 + 2 + eighth + + + + A + 2 + + 1 + + 2 + eighth + down + + + + + + B + 3 + + 1 + + 1 + eighth + up + x + begin + + + + B + 3 + + 1 + + 1 + eighth + up + x + continue + + + + E + 3 + + 1 + + 1 + eighth + up + continue + + + + + B + 3 + + 1 + + 1 + eighth + up + x + + + + B + 3 + + 1 + + 1 + eighth + up + x + end + + + + B + 3 + + 1 + + 1 + eighth + up + x + begin + + + + B + 3 + + 1 + + 1 + eighth + up + x + continue + + + + E + 3 + + 1 + + 1 + eighth + up + continue + + + + + B + 3 + + 1 + + 1 + eighth + up + x + + + + B + 3 + + 1 + + 1 + eighth + up + x + end + + + 8 + + + + A + 2 + + 2 + + 2 + quarter + down + + + + G + 2 + + 2 + 2 + quarter + + + + A + 2 + + 1 + + 2 + eighth + down + begin + + + + A + 2 + + 1 + + 2 + eighth + down + end + + + + G + 2 + + 1 + 2 + eighth + + + + A + 2 + + 1 + + 2 + eighth + down + + + + + + + + 62 + + + + 2 + + 0 + major + + + + percussion + + + 1 + + + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + + + 1 + + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + E + 4 + + 2 + + 1 + quarter + down + x + + + + \ No newline at end of file