diff --git a/README.md b/README.md index e92443f..ce7bf63 100644 --- a/README.md +++ b/README.md @@ -217,7 +217,7 @@ This example uses a guitar picking pattern with several chords. It produces the // Define the picking pattern (Travis picking) // The numbers inside the pattern aren't channel numbers but note indices PATTERN travis - : 0,3:4 1:8 2 0 3 1 2 + : 0/3:4 1:8 2 0 3 1 2 END // play the chords using this pattern @@ -266,7 +266,7 @@ It produces the first beats of "Another one bites the Dust": // p = 9 = percussion channel // hhc = hi-hat-closed, bd1 = base-drum-1, sd1 = snare-drum-1 FUNCTION drums - p: (v=127) hhc,bd1:8 (v=80) hhc (v=127) hhc,bd1,sd1 (v=80) hhc + p: (v=127) hhc/bd1:8 (v=80) hhc (v=127) hhc/bd1/sd1 (v=80) hhc END The resulting sequence looks like this: diff --git a/examples/london_bridge-lowlevel.midica b/examples/london_bridge-lowlevel.midica index 3638d5a..7323640 100644 --- a/examples/london_bridge-lowlevel.midica +++ b/examples/london_bridge-lowlevel.midica @@ -88,8 +88,8 @@ END /////////////////////////// // define some guitar chords -CHORD amaj a-, e, a, c#+ -CHORD dmaj d, a, d+, f#+ +CHORD amaj a- / e / a / c#+ +CHORD dmaj d / a / d+ / f#+ // define a picking pattern for both chords PATTERN picking_pattern diff --git a/examples/london_bridge.midica b/examples/london_bridge.midica index 3618896..8da8b0c 100644 --- a/examples/london_bridge.midica +++ b/examples/london_bridge.midica @@ -82,8 +82,8 @@ END /////////////////////////// // define some guitar chords -CHORD amaj a-2, e-, a-, c# -CHORD dmaj d-, a-, d, f# +CHORD amaj a-2 / e- / a- / c# +CHORD dmaj d- / a- / d / f# // define a picking pattern for both chords PATTERN pick diff --git a/examples/rossini_william_tell_overture_finale-lowlevel.midica b/examples/rossini_william_tell_overture_finale-lowlevel.midica index a666223..ac912f4 100644 --- a/examples/rossini_william_tell_overture_finale-lowlevel.midica +++ b/examples/rossini_william_tell_overture_finale-lowlevel.midica @@ -86,47 +86,47 @@ CALL m3_4 * CALL m3_4 { q=2 - 6 e,g# /4. - 6 e,g# /16 q=2 + 6 e/g# /4. + 6 e/g# /16 q=2 } // m. 7-8 * -6 e,g# /8 -6 b-,f# /8 -6 g#-,e /8 -6 b-,f# /8 -6 e,g# /8 -6 g#,b /8 -6 f#,a /8 -6 e,g# /8 +6 e/g# /8 +6 b-/f# /8 +6 g#-/e /8 +6 b-/f# /8 +6 e/g# /8 +6 g#/b /8 +6 f#/a /8 +6 e/g# /8 CALL m1 q=2 // m. 9-10 * CALL m1 q=2 { q=2 - 5 b-,b /4. - 5 b-,b /16 q=2 + 5 b-/b /4. + 5 b-/b /16 q=2 } -6 b-,f# /8 -6 e,g# /8 -6 b-,f# /8 -6 f#,a /8 -6 e,g# /8 -6 b-,f# /8 -6 g#-,e /8 -6 e,g# /8 +6 b-/f# /8 +6 e/g# /8 +6 b-/f# /8 +6 f#/a /8 +6 e/g# /8 +6 b-/f# /8 +6 g#-/e /8 +6 e/g# /8 * // m. 11-14 { q=4 - 5 b-,b /8 - 5 b-,b /16 q=2 - 5 b-,b /8 q=2 - 6 b-,f# /8 - 6 b-,f# /16 q=2 - 6 b-,f# /8 q=2 + 5 b-/b /8 + 5 b-/b /16 q=2 + 5 b-/b /8 q=2 + 6 b-/f# /8 + 6 b-/f# /16 q=2 + 6 b-/f# /8 q=2 7 b /8 7 b /16 q=2 7 b /8 q=2 @@ -139,11 +139,11 @@ CALL m1 q=2 * CALL v_all_sf CALL d_all_legato -4 b-2,d# /1+/8 -5 b-,b /1+/8 -6 d#,f# /1+/8 +4 b-2/d# /1+/8 +5 b-/b /1+/8 +6 d#/f# /1+/8 7 b /1+/8 -8 b-,d#,f# /1+/8 +8 b-/d#/f# /1+/8 10 b-2 /2 q=2, tr=/32 10 b-2 /8 10 - /4. @@ -157,7 +157,7 @@ CALL v_all_pp { q=2 3 b- /16 4 e- /16 - 6 b-,g#- /16 + 6 b-/g#- /16 11 b- /16 12 g#- /16 13 e- /16 @@ -179,8 +179,8 @@ END FUNCTION m19_half_low 4 e- /8 4 e- /16 q=2 - 6 b-,g#- /8 - 6 b-,g#- /16 q=2 + 6 b-/g#- /8 + 6 b-/g#- /16 q=2 10 e- /8 10 - /8 14 e- /8 @@ -199,18 +199,18 @@ FUNCTION m20_1 3 f# /8 3 g# /8 4 e- /8 q=3 - 6 b-,g#- /8 q=3 + 6 b-/g#- /8 q=3 10 e- /8 q=3 11 e /8 11 f# /8 11 g# /8 12 b- /8 q=3 - 13 g#-,e- /8 q=3 + 13 g#-/e- /8 q=3 14 e- /8 q=3 END FUNCTION m20_2_low 4 e- /16 q=2 - 6 b-,g#- /16 q=2 + 6 b-/g#- /16 q=2 10 - /8 14 e- /16 q=2 END @@ -238,8 +238,8 @@ FUNCTION m21 11 g# /16 q=2 12 b- /8 12 b- /16 q=2 - 13 e-,g#- /8 - 13 e-,g#- /16 q=2 + 13 e-/g#- /8 + 13 e-/g#- /16 q=2 } END CALL m21 @@ -251,11 +251,11 @@ FUNCTION m22 3 d# /8 3 b- /8 3 b- /16 q=2 - 4 b-2,b- /8 - 4 b-2,f#- /8 q=2 + 4 b-2/b- /8 + 4 b-2/f#- /8 q=2 4 e- /16 q=2 - 6 b-2,d# /8 q=3 - 6 b-,g#- /16 q=2 + 6 b-2/d# /8 q=3 + 6 b-/g#- /16 q=2 10 b-2 /8 q=3 10 - /8 11 f# /8 @@ -264,7 +264,7 @@ FUNCTION m22 11 b- /16 q=2 12 b- /8 q=3 12 g#- /16 q=2 - 13 d#-,f#- /8 q=3 + 13 d#-/f#- /8 q=3 13 e- /16 q=2 14 b- /8 q=3 14 e- /16 q=2 @@ -287,7 +287,7 @@ FUNCTION m24 11 e /16 11 g# /16 12 e /16 q=2 - 13 g#-,b- /16 q=2 + 13 g#-/b- /16 q=2 } END CALL m24 @@ -304,16 +304,16 @@ FUNCTION m25 11 g# /16 11 f# /16 { q=2 - 4 f#-,a- /8 - 4 f#-,a- /16 q=2 - 6 b-2,d# /8 - 6 b-2,d# /16 q=2 + 4 f#-/a- /8 + 4 f#-/a- /16 q=2 + 6 b-2/d# /8 + 6 b-2/d# /16 q=2 10 b-2 /8 10 - /8 12 d# /8 12 d# /16 q=2 - 13 a-,f#- /8 - 13 a-,f#- /16 q=2 + 13 a-/f#- /8 + 13 a-/f#- /16 q=2 14 b-2 /8 14 b-2 /16 q=2 15 b-3 /8 @@ -328,27 +328,27 @@ FUNCTION m26_1 3 e /8 3 g# /8 3 e /8 - 4 e-,g#- /8 - 4 e-,b- /8 q=2 - 6 g#-,e- /8 q=3 + 4 e-/g#- /8 + 4 e-/b- /8 q=2 + 6 g#-/e- /8 q=3 10 e- /8 q=3 11 e /8 11 g# /8 11 e /8 12 e /8 q=3 - 13 b-,g#- /8 q=3 + 13 b-/g#- /8 q=3 14 e- /8 q=3 15 e-2 /8 q=3 END FUNCTION m26_2 0 b+ /16 q=2 1 b+ /16 q=2 - 2 g#,b /16 q=2 - 3 b-,b /16 q=2 - 4 e-,b- /16 q=2 + 2 g#/b /16 q=2 + 3 b-/b /16 q=2 + 4 e-/b- /16 q=2 5 b- /16 q=2 - 6 g#-,e /16 q=2 - 7 e,g# /16 q=2 + 6 g#-/e /16 q=2 + 7 e/g# /16 q=2 11 b- /16 q=2 12 g#- /16 q=2 13 e- /16 q=2 @@ -370,10 +370,10 @@ FUNCTION m27_half_high 0 b+ /16 q=2 1 b+ /8 1 b+ /16 q=2 - 2 g#,b /8 - 2 g#,b /16 q=2 - 3 b-,b /8 - 3 b-,b /16 q=2 + 2 g#/b /8 + 2 g#/b /16 q=2 + 3 b-/b /8 + 3 b-/b /16 q=2 11 b- /8 11 b- /16 q=2 12 g#- /8 @@ -382,14 +382,14 @@ FUNCTION m27_half_high 13 e- /16 q=2 END FUNCTION m27_half_low - 4 e-,b- /8 - 4 e-,b- /16 q=2 + 4 e-/b- /8 + 4 e-/b- /16 q=2 5 b- /8 5 b- /16 q=2 - 6 g#-,e /8 - 6 g#-,e /16 q=2 - 7 e,g# /8 - 7 e,g# /16 q=2 + 6 g#-/e /8 + 6 g#-/e /16 q=2 + 7 e/g# /8 + 7 e/g# /16 q=2 8 e- /8 8 - /8 10 e- /8 tr=/32 @@ -415,20 +415,20 @@ FUNCTION m28_1 2 e+ /8 2 f#+ /8 2 g#+ /8 - 3 e,e+ /8 - 3 f#,f#+ /8 - 3 g#,g#+ /8 - 4 e-,b- /8 q=3 + 3 e/e+ /8 + 3 f#/f#+ /8 + 3 g#/g#+ /8 + 4 e-/b- /8 q=3 5 b- /8 q=3 - 6 g#-,e /8 q=3 - 7 e,g# /8 q=3 + 6 g#-/e /8 q=3 + 7 e/g# /8 q=3 8 e- /8 q=3 10 e- /8 q=3 11 e /8 11 f# /8 11 g# /8 12 b- /8 q=3 - 13 e-,g#- /8 q=3 + 13 e-/g#- /8 q=3 14 e- /8 q=3 15 e-2 /8 q=3 END @@ -446,16 +446,16 @@ FUNCTION m29 0 g#+2 /16 q=2 1 e+2 /8 1 g#+2 /16 q=2 - 2 g#,e+ /8 - 2 e+,g#+ /16 q=2 - 3 b-,b /8 - 3 g#,g#+ /16 q=2 + 2 g#/e+ /8 + 2 e+/g#+ /16 q=2 + 3 b-/b /8 + 3 g#/g#+ /16 q=2 11 e /8 11 g# /16 q=2 12 b- /8 12 b- /16 q=2 - 13 e-,g#- /8 - 13 e-,g#- /16 q=2 + 13 e-/g#- /8 + 13 e-/g#- /16 q=2 } END CALL m29 @@ -469,23 +469,23 @@ FUNCTION m30 1 f#+2 /8 1 d#+2 /8 1 b+ /8 - 2 d#+,f#+ /8 - 2 b,d#+ /8 + 2 d#+/f#+ /8 + 2 b/d#+ /8 2 b /8 - 3 f#,f#+ /8 - 3 d#,d#+ /8 - 3 b-,b /8 - 4 b-2,f#- /8 q=3 + 3 f#/f#+ /8 + 3 d#/d#+ /8 + 3 b-/b /8 + 4 b-2/f#- /8 q=3 5 b- /8 q=3 - 6 b-2,d# /8 q=3 - 7 b-,b /8 q=3 + 6 b-2/d# /8 q=3 + 7 b-/b /8 q=3 8 b-2 /8 q=3 10 b-2 /8 q=3 11 f# /8 11 d# /8 11 b- /8 12 b- /8 q=3 - 13 d#-,f#- /8 q=3 + 13 d#-/f#- /8 q=3 14 b-2 /8 q=3 15 b-3 /8 q=3 * @@ -512,14 +512,14 @@ FUNCTION m32_2 2 g#+ /16 3 e /16 3 g# /16 - 4 e-,b- /16 q=2 + 4 e-/b- /16 q=2 5 b- /16 q=2 - 6 g#-,e /16 q=2 - 7 e,g# /16 q=2 + 6 g#-/e /16 q=2 + 7 e/g# /16 q=2 11 e /16 11 g# /16 12 e /16 q=2 - 13 b-,g#- /16 q=2 + 13 b-/g#- /16 q=2 14 e- /16 q=2 15 e-2 /16 q=2 END @@ -550,22 +550,22 @@ FUNCTION m33 11 g# /16 11 f# /16 { q=2 - 4 b-2,d# /8 - 4 b-2,d# /16 q=2 + 4 b-2/d# /8 + 4 b-2/d# /16 q=2 5 b- /8 5 b- /16 q=2 - 6 b-2,d# /8 - 6 b-2,d# /16 q=2 - 7 b-,b /8 - 7 b-,b /16 q=2 + 6 b-2/d# /8 + 6 b-2/d# /16 q=2 + 7 b-/b /8 + 7 b-/b /16 q=2 8 b-2 /8 8 - /8 10 b-2 /8 10 - /8 12 d# /8 12 d# /16 q=2 - 13 f#-,a- /8 - 13 f#-,a- /16 q=2 + 13 f#-/a- /8 + 13 f#-/a- /16 q=2 14 b-2 /8 14 b-2 /16 q=2 15 b-3 /8 @@ -589,11 +589,11 @@ FUNCTION m34_1 3 e /8 3 g# /8 3 e /8 - 4 e-,e /8 - 4 e-,b- /8 q=2 + 4 e-/e /8 + 4 e-/b- /8 q=2 5 b- /8 q=3 - 6 g#-,e /8 q=3 - 7 e,g# /8 q=3 + 6 g#-/e /8 q=3 + 7 e/g# /8 q=3 8 e- /8 q=3 10 e- /8 q=3 @@ -601,7 +601,7 @@ FUNCTION m34_1 11 g# /8 11 e /8 12 e /8 q=3 - 13 g#-,b /8 q=3 + 13 g#-/b /8 q=3 14 e- /8 q=3 15 e-2 /8 q=3 END @@ -610,16 +610,16 @@ CALL m34_1 FUNCTION m34_2 0 g#+2 /16 q=2 1 e+2 /16 q=2 - 2 e+,g#+ /16 q=2 - 3 e+,g#+ /16 q=2 - 4 c#-,c# /16 q=2 + 2 e+/g#+ /16 q=2 + 3 e+/g#+ /16 q=2 + 4 c#-/c# /16 q=2 5 g# /16 q=2 - 6 e,g# /16 q=2 - 7 g#,e+ /16 q=2 + 6 e/g# /16 q=2 + 7 g#/e+ /16 q=2 10 e- /16 q=2 11 g#+ /16 q=2 12 e+ /16 q=2 - 13 e,g# /16 q=2 + 13 e/g# /16 q=2 END @@ -631,21 +631,21 @@ FUNCTION m35_half 0 g#+2 /16 q=2 1 e+2 /8 1 e+2 /16 q=2 - 2 e+,g#+ /8 - 2 e+,g#+ /16 q=2 - 3 e+,g#+ /8 - 3 e+,g#+ /16 q=2 - 4 c#-,c# /8 - 4 c#-,c# /16 q=2 + 2 e+/g#+ /8 + 2 e+/g#+ /16 q=2 + 3 e+/g#+ /8 + 3 e+/g#+ /16 q=2 + 4 c#-/c# /8 + 4 c#-/c# /16 q=2 5 g# /8 5 g# /16 q=2 - 6 e,g# /8 - 6 e,g# /16 q=2 - 7 g#,e+ /8 - 7 g#,e+ /16 q=2 - 8 c#-,c# /8 + 6 e/g# /8 + 6 e/g# /16 q=2 + 7 g#/e+ /8 + 7 g#/e+ /16 q=2 + 8 c#-/c# /8 8 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 e- /8 10 e- /16 q=2 @@ -653,8 +653,8 @@ FUNCTION m35_half 11 g#+ /16 q=2 12 e+ /8 12 e+ /16 q=2 - 13 e,g# /8 - 13 e,g# /16 q=2 + 13 e/g# /8 + 13 e/g# /16 q=2 14 c#- /8 14 - /8 15 c#-2 /8 @@ -667,29 +667,29 @@ END FUNCTION m36_1st8th_high 0 g#+2 /8 1 e+2 /8 - 2 e+,g#+ /8 - 3 e+,g#+ /8 - 4 c#-,c# /8 + 2 e+/g#+ /8 + 3 e+/g#+ /8 + 4 c#-/c# /8 5 g# /8 - 6 e,g# /8 - 7 g#,e+ /8 - 8 c#-,c# /8 + 6 e/g# /8 + 7 g#/e+ /8 + 8 c#-/c# /8 11 g#+ /8 12 e+ /8 - 13 e,g# /8 + 13 e/g# /8 END FUNCTION m36_2nd8th_high 0 c#+3 /8 1 c#+2 /8 - 2 c#+,c#+2 /8 + 2 c#+/c#+2 /8 3 c#+ /8 11 c#+2 /8 12 c#+ /8 - 13 c#,c#+ /8 + 13 c#/c#+ /8 * 3-8 END FUNCTION m36_1st8th_low - p bd2,cc2,to /8 + p bd2/cc2/to /8 10 e- /8 14 c#- /8 15 c#-2 /8 @@ -717,17 +717,17 @@ FUNCTION m36_37 * 0 f#+2 /8 1 d#+2 /8 - 2 d#+,f#+ /8 + 2 d#+/f#+ /8 3 c+ /8 - 4 g#-2,g#- /8 + 4 g#-2/g#- /8 5 f# /8 - 6 g#-,g# /8 - 7 g#,f#+ /8 - 8 g#-2,g#- /8 + 6 g#-/g# /8 + 7 g#/f#+ /8 + 8 g#-2/g#- /8 10 e- /8 11 f#+ /8 12 d#+ /8 - 13 d#,f# /8 + 13 d#/f# /8 14 g#-2 /8 15 g#-3 /8 END @@ -741,22 +741,22 @@ FUNCTION m38 1 c#+2 /8 1 c+2 /8 1 c#+2 /8 - 2 c#+,e+ /8 - 2 c+,d#+ /8 + 2 c#+/e+ /8 + 2 c+/d#+ /8 2 c#+ /8 3 c#+ /8 - 3 c+,d#+ /8 + 3 c+/d#+ /8 3 c#+ /8 - 4 c#-,c# /8 q=3 + 4 c#-/c# /8 q=3 5 g# /8 5 f# /8 5 e /8 - 6 g#-,g# /8 - 6 g#-,f# /8 - 6 g#-,e /8 - 7 g#,e+ /8 q=3 - 8 c#-,c# /8 q=3 - p bd2,cc2,to /8 q=3 + 6 g#-/g# /8 + 6 g#-/f# /8 + 6 g#-/e /8 + 7 g#/e+ /8 q=3 + 8 c#-/c# /8 q=3 + p bd2/cc2/to /8 q=3 10 e- /8 q=3 11 e+ /8 11 d#+ /8 @@ -764,7 +764,7 @@ FUNCTION m38 12 c#+ /8 12 f# /8 12 e /8 - 13 c#,e /8 + 13 c#/e /8 13 a /8 13 g# /8 14 c#- /8 q=3 @@ -781,18 +781,18 @@ FUNCTION m41_2 0 a#+2 /8 1 d#+2 /8 1 c#+2 /8 - 2 d#+,b+ /8 - 2 c#+,a#+ /8 - 3 d#+,f#+ /8 - 3 c#+,e+ /8 - 4 f#-2,f# /8 q=2 + 2 d#+/b+ /8 + 2 c#+/a#+ /8 + 3 d#+/f#+ /8 + 3 c#+/e+ /8 + 4 f#-2/f# /8 q=2 5 f# /8 q=2 - 6 b-,f# /8 - 6 e,f# /8 + 6 b-/f# /8 + 6 e/f# /8 7 b /8 7 e /8 - 8 f#-2,f#- /8 q=2 - p bd2,cc2,to /8 + 8 f#-2/f#- /8 q=2 + p bd2/cc2/to /8 10 b-2 /8 10 e- /8 11 e+ /8 @@ -817,24 +817,24 @@ FUNCTION m42_1 1 b+ /8 1 a#+ /8 1 b+ /8 - 2 d#+,b+ /8 - 2 e+,a#+ /8 - 2 d#+,b+ /8 - 3 b,d#+ /8 - 3 a#,c#+ /8 + 2 d#+/b+ /8 + 2 e+/a#+ /8 + 2 d#+/b+ /8 + 3 b/d#+ /8 + 3 a#/c#+ /8 3 b /8 - 4 b-2,b /8 q=3 + 4 b-2/b /8 q=3 5 b /8 5 g /8 5 f# /8 - 6 b-,f# /8 - 6 e,g /8 - 6 b-,f# /8 + 6 b-/f# /8 + 6 e/g /8 + 6 b-/f# /8 7 b /8 7 e /8 7 b /8 - 8 b-2,b /8 q=3 - p bd2,cc2,to /8 q=3 + 8 b-2/b /8 q=3 + p bd2/cc2/to /8 q=3 10 b-2 /8 q=3 11 b+ /8 11 a#+ /8 @@ -886,13 +886,13 @@ FUNCTION m50 CALL m50_violin1 0 b+2 /8 1 b+ /8 - 2 d#+,b+ /8 - 3 b,d#+ /8 - 4 b-2,b- /8 + 2 d#+/b+ /8 + 3 b/d#+ /8 + 4 b-2/b- /8 5 b /8 - 6 b-,f# /8 - 8 b-2,b- /8 - p bd2,cc2,to /8 + 6 b-/f# /8 + 8 b-2/b- /8 + p bd2/cc2/to /8 10 b-2 /8 12 d#+ /8 13 f# /8 @@ -900,22 +900,22 @@ FUNCTION m50 15 b-3 /8 CALL v_all_p 3 - /4 - 3 b-,f# /16 q=2 + 3 b-/f# /16 q=2 6 - /4 - 6 b-,f# /16 q=2 + 6 b-/f# /16 q=2 END CALL m50 // m. 51 FUNCTION m51 - 3 b-,f# /8 - 3 b-,f# /16 q=2 - 3 b-,f# /8 - 3 e,g# /8 - 6 b-,f# /8 - 6 b-,f# /16 q=2 - 6 b-,f# /8 - 6 e,g# /8 + 3 b-/f# /8 + 3 b-/f# /16 q=2 + 3 b-/f# /8 + 3 e/g# /8 + 6 b-/f# /8 + 6 b-/f# /16 q=2 + 6 b-/f# /8 + 6 e/g# /8 CALL m50_trumpet CALL m50_violin1 END @@ -925,16 +925,16 @@ CALL m51 * FUNCTION m52 CALL i_pizzicato_14 // switch violoncello 14 to pizzicato mode - 3 f#,a /8 - 3 b-,f# /4 $p_marcato - 3 f#,a /8 $p + 3 f#/a /8 + 3 b-/f# /4 $p_marcato + 3 f#/a /8 $p 4 - /8 4 b-2 /8 4 c#- /8 4 d#- /8 - 6 f#,a /8 - 6 b-,f# /4 $p_marcato - 6 f#,a /8 $p + 6 f#/a /8 + 6 b-/f# /4 $p_marcato + 6 f#/a /8 $p CALL m50_trumpet CALL m50_violin1 14 - /8 $pp @@ -947,16 +947,16 @@ CALL m52 // m. 53 * FUNCTION m53_without_trumpet - 3 e,g# /8 - 3 g#-,e /4 $p_marcato - 3 e,g# /8 $p + 3 e/g# /8 + 3 g#-/e /4 $p_marcato + 3 e/g# /8 $p 4 e- /8 4 f#- /8 4 g#- /8 4 a- /8 - 6 e,g# /8 - 6 f#-,g#- /4 $p_marcato - 6 e,g# /8 $p + 6 e/g# /8 + 6 f#-/g#- /4 $p_marcato + 6 e/g# /8 $p CALL m50_violin1 14 e- /8 14 f#- /8 @@ -978,17 +978,17 @@ FUNCTION m54_violin2 END FUNCTION m54 2 - /4. - 2 b,f#+ /16 q=2 - 3 d#,f# /8 q=3 - 3 b-,f# /16 q=2 + 2 b/f#+ /16 q=2 + 3 d#/f# /8 q=3 + 3 b-/f# /16 q=2 4 b- /8 4 b-2 /8 4 b- /8 5 - /4. $pp - 5 b-,b /16 q=2 - 6 b-,f# /8 - 6 b-2,b- /8 q=2 - 6 b-,f# /16 q=2 + 5 b-/b /16 q=2 + 6 b-/f# /8 + 6 b-2/b- /8 q=2 + 6 b-/f# /16 q=2 7 b /8 CALL m50_violin1 CALL m54_violin2 @@ -1001,24 +1001,24 @@ CALL m54 // m. 55 * FUNCTION m55_horn_g - 5 b-,b /8 + 5 b-/b /8 5 - /4 - 5 b-,b /16 q=2 + 5 b-/b /16 q=2 END FUNCTION m55 - 2 b,f#+ /8 - 2 b,f#+ /16 q=2 - 2 b,f#+ /8 - 2 e+,g#+ /8 - 3 b-,f# /8 - 3 b-,f# /16 q=2 - 3 b-,f# /8 - 3 e,g# /8 + 2 b/f#+ /8 + 2 b/f#+ /16 q=2 + 2 b/f#+ /8 + 2 e+/g#+ /8 + 3 b-/f# /8 + 3 b-/f# /16 q=2 + 3 b-/f# /8 + 3 e/g# /8 CALL m55_horn_g - 6 b-,f# /8 - 6 b-,f# /16 q=2 - 6 b-,f# /8 - 6 e,g# /8 + 6 b-/f# /8 + 6 b-/f# /16 q=2 + 6 b-/f# /8 + 6 e/g# /8 CALL m50_violin1 CALL m54_violin2 END @@ -1027,15 +1027,15 @@ CALL m55 // m. 56 * FUNCTION m56 - 2 f#+,a+ /8 - 2 b,f#+ /4 $p_marcato - 2 f#+,a+ /8 $p - 3 f#,a /8 - 3 b-,f# /4 $p_marcato - 3 f#,a /8 $p - 6 f#,a /8 - 6 b-,f# /4 $p_marcato - 6 f#,a /8 $p + 2 f#+/a+ /8 + 2 b/f#+ /4 $p_marcato + 2 f#+/a+ /8 $p + 3 f#/a /8 + 3 b-/f# /4 $p_marcato + 3 f#/a /8 $p + 6 f#/a /8 + 6 b-/f# /4 $p_marcato + 6 f#/a /8 $p 4 - /8 4 b-2 /8 4 c#- /8 @@ -1053,9 +1053,9 @@ CALL m56 // m. 57 * FUNCTION m57 - 2 e+,g#+ /8 - 2 g#,e+ /4 $p_marcato - 2 e+,g#+ /8 $p + 2 e+/g#+ /8 + 2 g#/e+ /4 $p_marcato + 2 e+/g#+ /8 $p CALL m53_without_trumpet CALL m55_horn_g CALL m54_violin2 @@ -1065,11 +1065,11 @@ CALL m57 // m. 58 * FUNCTION m58 - 2 d#+,f#+ /8 - 3 d#,f# /8 + 2 d#+/f#+ /8 + 3 d#/f# /8 4 b- /8 - 5 b-,b /8 - 6 d#,f# /8 + 5 b-/b /8 + 6 d#/f# /8 11 b+ /8 11 b /16 q=2 11 b /8 @@ -1082,7 +1082,7 @@ FUNCTION m58 4 - /4 4 e- /16 q=2 6 - /4 - 6 g#-,b- /16 q=2 + 6 g#-/b- /16 q=2 11 b- /16 q=2 12 - /4 12 g#- /16 q=2 @@ -1246,41 +1246,41 @@ FUNCTION m75_77_without_viola_in_77 1 d#+2 /8 1 e+2 /8 1 c#+2 /8 - 2 b,e+ /2 $legato + 2 b/e+ /2 $legato 2 c+ /2 m 2 g#+ /4. 2 f#+ /8 - 2 c#+,e+ /8 - 2 c+,d#+ /8 - 2 c#+,e+ /8 - 2 a,c#+ /8 - 3 b,e+ /2 $legato + 2 c#+/e+ /8 + 2 c+/d#+ /8 + 2 c#+/e+ /8 + 2 a/c#+ /8 + 3 b/e+ /2 $legato 3 c+ /2 m 3 g#+ /4. 3 f#+ /8 - 3 c#+,e+ /8 - 3 c+,d#+ /8 - 3 c#+,e+ /8 - 3 a,c#+ /8 + 3 c#+/e+ /8 + 3 c+/d#+ /8 + 3 c#+/e+ /8 + 3 a/c#+ /8 4 b- /2 $legato 4 c /2 4 c# /8 4 c /8 4 c# /8 4 a- /8 - 5 b-,b /2 $legato + 5 b-/b /2 $legato 5 g# /2 5 a /2 - 6 e-,g# /2 q=2, $legato - 6 e-,e /2 - 7 e,e+ /8 - 7 e,e+ /16 q=2 - 7 e,e+ /8 q=2 - 7 e,e+ /2 - 7 e,e+ /8 q=4 - 8 e-,e *1. $legato + 6 e-/g# /2 q=2, $legato + 6 e-/e /2 + 7 e/e+ /8 + 7 e/e+ /16 q=2 + 7 e/e+ /8 q=2 + 7 e/e+ /2 + 7 e/e+ /8 q=4 + 8 e-/e *1. $legato p to /2 q=3, m, tr=/32 - p bd2,cc2 /4 q=6 + p bd2/cc2 /4 q=6 10 e- /2 q=3, tr=/32 10 - /4 m 11 e+2 /8 @@ -1301,17 +1301,17 @@ FUNCTION m75_77_without_viola_in_77 12 d#+ /16 q=2 12 e+ /16 q=2 12 c#+ /16 q=2 - 13 b-,b /2 tr=/16 - 13 c,c+ /2 tr=/16 + 13 b-/b /2 tr=/16 + 13 c/c+ /2 tr=/16 14 e- /2 q=3, tr=/16 15 e-2 /8 q=12 CALL d_all_staccato END FUNCTION m77_viola - 13 c#,c#+ /16 q=2, $legato - 13 c,c+ /16 q=2 - 13 c#,c#+ /16 q=2 - 13 a-,a /16 q=2 + 13 c#/c#+ /16 q=2, $legato + 13 c/c+ /16 q=2 + 13 c#/c#+ /16 q=2 + 13 a-/a /16 q=2 END CALL m75_77_without_viola_in_77 CALL m77_viola @@ -1326,15 +1326,15 @@ FUNCTION m78 0 - /8 5 b /8 5 - /8 - 7 e,e+ /8 + 7 e/e+ /8 7 - /8 - 8 e-,e /8 + 8 e-/e /8 8 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 e- /8 10 - /8 - 13 g#-,g# /8 + 13 g#-/g# /8 13 - /8 14 e- /8 14 - /8 @@ -1344,18 +1344,18 @@ FUNCTION m78 1 b+ /8 1 - /8 1 g#+2 /8 - 2 g#,e+ /8 + 2 g#/e+ /8 2 - /8 - 2 e+,g#+ /8 - 3 g#,b /8 + 2 e+/g#+ /8 + 3 g#/b /8 3 - /8 - 3 g#,e+ /8 - 4 g#-,b- /8 + 3 g#/e+ /8 + 4 g#-/b- /8 4 - /8 - 4 e-2,e- /8 - 6 e-,g# /8 + 4 e-2/e- /8 + 6 e-/g# /8 6 - /8 - 6 g#-,e /8 + 6 g#-/e /8 { q=3 11 b+ /16 11 c#+2 /16 @@ -1377,25 +1377,25 @@ FUNCTION m79 0 - /8 1 f#+2 /8 1 - /8 - 2 f#+,a+ /8 + 2 f#+/a+ /8 2 - /8 - 3 a,f#+ /8 + 3 a/f#+ /8 3 - /8 - 4 d#-2,d# /8 + 4 d#-2/d# /8 4 - /8 5 a /8 5 - /8 - 6 b-,f# /8 + 6 b-/f# /8 6 - /8 - 7 b-,b /8 + 7 b-/b /8 7 - /8 - 8 d#-,d# /8 + 8 d#-/d# /8 8 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 b-2 /8 10 - /8 - 13 f#,a /8 + 13 f#/a /8 13 - /8 14 d#- /8 14 - /8 @@ -1423,25 +1423,25 @@ FUNCTION m80 0 - /8 1 e+2 /8 1 - /8 - 2 e+,g#+ /8 + 2 e+/g#+ /8 2 - /8 - 3 g#,e+ /8 + 3 g#/e+ /8 3 - /8 - 4 e-2,e- /8 + 4 e-2/e- /8 4 - /8 5 b /8 5 - /8 - 6 g#-,e /8 + 6 g#-/e /8 6 - /8 - 7 e,b /8 + 7 e/b /8 7 - /8 - 8 e-,e /8 + 8 e-/e /8 8 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 e- /8 10 - /8 - 13 b-,g# /8 + 13 b-/g# /8 13 - /8 14 e- /8 14 - /8 @@ -1467,23 +1467,23 @@ FUNCTION m81 { q=2 0 f#+2 /8 0 - /8 - 3 f#,e+ /8 + 3 f#/e+ /8 3 - /8 - 4 a-2,a- /8 + 4 a-2/a- /8 4 - /8 5 f# /8 5 - /8 - 6 e,f# /8 + 6 e/f# /8 6 - /8 - 7 e,e+ /8 + 7 e/e+ /8 7 - /8 - 8 a-2,a- /8 + 8 a-2/a- /8 8 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 e- /8 10 - /8 - 13 c#,e /8 + 13 c#/e /8 13 - /8 14 e- /8 14 - /8 @@ -1493,9 +1493,9 @@ FUNCTION m81 1 f#+2 /8 1 - /8 1 e+2 /8 - 2 c#+,f#+ /8 + 2 c#+/f#+ /8 2 - /8 - 2 c#+,e+ /8 + 2 c#+/e+ /8 { q=4 11 f#+ /16 11 g#+ /16 @@ -1521,12 +1521,12 @@ FUNCTION m82 1 d#+2 /16 2 d#+ /8 3 d#+ /8 - 4 b-2,b- /8 - 5 b-,b /8 - 6 b-,f# /8 - 7 b-,b /8 - 8 b-2,b- /8 - p bd2,cc2,to /8 + 4 b-2/b- /8 + 5 b-/b /8 + 6 b-/f# /8 + 7 b-/b /8 + 8 b-2/b- /8 + p bd2/cc2/to /8 10 b-2 /8 11 f#+ /16 11 g#+ /16 @@ -1544,9 +1544,9 @@ FUNCTION m82 12 b /16 12 c#+ /16 12 d#+ /16 - 13 b-,d# /8 + 13 b-/d# /8 13 - /8 - 13 b-,d# /8 + 13 b-/d# /8 14 b-2 /8 15 b-3 /8 END @@ -1555,10 +1555,10 @@ CALL m82 // m. 83-85 * FUNCTION m85_viola - 13 c#,c#+ /8 tr=/8 - 13 c,c+ /8 tr=/8 - 13 c#,c#+ /8 tr=/8 - 13 a-,a /8 tr=/8 + 13 c#/c#+ /8 tr=/8 + 13 c/c+ /8 tr=/8 + 13 c#/c#+ /8 tr=/8 + 13 a-/a /8 tr=/8 END CALL m75_77_without_viola_in_77 CALL m85_viola @@ -1578,14 +1578,14 @@ CALL m80 FUNCTION m89_1 0 f#+2 /8 1 c#+2 /8 - 2 c#+,f#+ /8 - 3 f#,e+ /8 - 4 a-2,a- /8 + 2 c#+/f#+ /8 + 3 f#/e+ /8 + 4 a-2/a- /8 5 f# /8 - 6 e,f# /8 + 6 e/f# /8 7 e /8 - 8 a-2,a- /8 - p bd2,cc2,to /8 + 8 a-2/a- /8 + p bd2/cc2/to /8 10 e- /8 { q=2 11 f#+ /16 @@ -1593,21 +1593,21 @@ FUNCTION m89_1 12 f# /16 12 g# /16 } - 13 c#,e /8 + 13 c#/e /8 14 e- /8 15 e-2 /8 END FUNCTION m89_2 0 b+2 /8 1 d#+2 /8 - 2 d#+,f#+ /8 - 3 f#,d#+ /8 - 4 b-2,b- /8 + 2 d#+/f#+ /8 + 3 f#/d#+ /8 + 4 b-2/b- /8 5 b- /8 - 6 b-,f# /8 + 6 b-/f# /8 7 b /8 - 8 b-2,b- /8 - p bd2,cc2,to /8 + 8 b-2/b- /8 + p bd2/cc2/to /8 10 b-2 /8 11 f#+ /16 11 a+ /16 @@ -1617,7 +1617,7 @@ FUNCTION m89_2 12 a /16 12 g# /16 12 f# /16 - 13 f#-,d# /8 + 13 f#-/d# /8 14 b-2 /8 15 b-3 /8 END @@ -1631,20 +1631,20 @@ CALL m89_2 0 e+2 /8 1 e+2 /8 2 e+ /8 - 3 g#,e+ /8 + 3 g#/e+ /8 4 e- /8 5 g# /8 - 6 g#-,e /8 - 7 e,b /8 + 6 g#-/e /8 + 7 e/b /8 8 e- /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 10 e- /8 11 e+ /8 11 - /8 11 c#+ /4+/16 m, $legato, $sf_accent 11 - /4 $staccato 12 e /8 - 13 g#-,e /8 + 13 g#-/e /8 14 e- /8 15 e-2 /8 } @@ -1666,13 +1666,13 @@ CALL v_all_pp } FUNCTION m91_without_violin1 12 g# /8 - 13 c#,e /8 + 13 c#/e /8 14 c# /8 15 c#- /8 15 - /8 * 1-10,12-15 12 a /8 - 13 c#,f# /8 + 13 c#/f# /8 14 f#- /8 15 f#-2 /8 15 - /8 @@ -1684,13 +1684,13 @@ CALL m91_without_violin1 FUNCTION m92 { 4 c# /1+/8 m, $legato - 6 c+,e+ /2 m, $legato + 6 c+/e+ /2 m, $legato 11 a /16 11 g# /16 11 e /16 11 c# /16 q=3 12 g# /8 - 13 c#,e /8 + 13 c#/e /8 14 c#- /8 15 c#-2 /8 } @@ -1698,7 +1698,7 @@ FUNCTION m92 { 11 c# /16 q=2 12 e /8 - 13 g#-,c# /8 + 13 g#-/c# /8 14 c#- /8 15 c#-2 /8 } @@ -1709,14 +1709,14 @@ CALL m92 * FUNCTION m93 { - 4 g#-,c /2 m - 6 b,d /2 m + 4 g#-/c /2 m + 6 b/d /2 m 11 e /16 11 d# /16 11 c /16 11 g#- /16 q=3 12 f# /8 - 13 g#-,c# /8 + 13 g#-/c# /8 14 g#- /8 15 g#-2 /8 } @@ -1724,7 +1724,7 @@ FUNCTION m93 { 11 g#- /16 q=2 12 d# /8 - 13 g#-,d# /8 + 13 g#-/d# /8 14 g#-2 /8 15 g#-3 /8 } @@ -1743,7 +1743,7 @@ CALL m93 FUNCTION m94_without_violin1 6 c+ /8 12 e /8 - 13 g#-,c# /8 + 13 g#-/c# /8 14 c#- /8 15 c#-2 /8 15 - /4. @@ -1792,8 +1792,8 @@ CALL m94_without_violin1 3 g#+ /1+/4 m, $legato } FUNCTION m99_without_clarinet - 2 c+,d#+ /4. $legato - 2 c#+,e+ /8 + 2 c+/d#+ /4. $legato + 2 c#+/e+ /8 11 d#+ /16 11 c+ /16 11 g# /16 q=3 @@ -1803,9 +1803,9 @@ FUNCTION m99_without_clarinet 12 d# /8 12 - /4 12 e /8 - 13 g#-,c /8 + 13 g#-/c /8 13 - /4 - 13 g#-,c# /8 + 13 g#-/c# /8 14 g#- /8 14 - /4 14 g#- /8 @@ -1822,8 +1822,8 @@ CALL m99_without_clarinet // m. 101 * { - 2 b,d#+ /4 - 2 a#,c#+ /4 + 2 b/d#+ /4 + 2 a#/c#+ /4 3 - /4 3 g /4 4 d# /4 @@ -1837,9 +1837,9 @@ CALL m99_without_clarinet 12 d# /8 12 - /8 12 c# /8 - 13 g#-,b- /8 + 13 g#-/b- /8 13 - /8 - 13 f##-,a#- /8 + 13 f##-/a#- /8 { q=2 14 d#- /8 14 - /8 @@ -1851,7 +1851,7 @@ CALL m99_without_clarinet // m. 102 * { - 2 g#,b /8 + 2 g#/b /8 3 g# /8 4 g#- /8 11 g# /16 @@ -1863,7 +1863,7 @@ CALL m99_without_clarinet 11 g# /16 11 f# /16 12 b- /8 - 13 d#-,g#- /8 + 13 d#-/g#- /8 14 g#- /8 15 g#-2 /8 } @@ -1871,8 +1871,8 @@ CALL m99_without_clarinet // m. 103 * FUNCTION m103 - 3 g#-,e /4. - 3 b-,f# /8 + 3 g#-/e /4. + 3 b-/f# /8 11 e /16 11 b- /16 11 a#- /16 @@ -1885,7 +1885,7 @@ FUNCTION m103 12 - /8 12 g#- /8 12 b- /8 - 13 e-,g#- /8 + 13 e-/g#- /8 14 e- /8 15 e-2 /8 END @@ -1894,11 +1894,11 @@ CALL m103 // m. 104 * { - 13 g#-,b- /8 + 13 g#-/b- /8 } FUNCTION m104_without_viola - 3 e,g# /4. - 3 f#,a /8 + 3 e/g# /4. + 3 f#/a /8 11 g# /16 11 e /16 11 d# /16 @@ -1932,13 +1932,13 @@ CALL m104_without_viola 11 f#+ /16 11 e+ /16 11 c#+ /16 - 13 g#-,b- /8 + 13 g#-/b- /8 13 - /8 - 13 g-,c# /8 + 13 g-/c# /8 } FUNCTION m105_low // without E-horn, voilin1 and voila (without channels 6, 11, 13) - 3 g#,b /4 - 3 g,a# /4 + 3 g#/b /4 + 3 g/a# /4 12 g# /8 12 - /8 12 a# /8 @@ -1954,7 +1954,7 @@ CALL m105_low // m. 106 * FUNCTION m106 - 3 g#,b /2 + 3 g#/b /2 11 b /16 11 c#+ /16 11 b /16 @@ -1966,9 +1966,9 @@ FUNCTION m106 12 b /8 12 - /8 12 g# /8 - 13 g#-,e /8 + 13 g#-/e /8 13 - /8 - 13 b-,e /8 + 13 b-/e /8 { q=2 14 e- /8 14 - /8 @@ -1981,7 +1981,7 @@ CALL m106 // m. 107 * FUNCTION m107 - 3 f#,a /2 + 3 f#/a /2 4 d# /2 6 g /2 11 a /16 @@ -1995,7 +1995,7 @@ FUNCTION m107 { q=2 12 a /8 12 - /8 - 13 b-,f# /8 + 13 b-/f# /8 13 - /8 14 b-2 /8 14 - /8 @@ -2025,7 +2025,7 @@ FUNCTION m108_without_clarinet_and_g_horn { q=2 12 g# /8 12 - /8 - 13 b-,e /8 + 13 b-/e /8 13 - /8 14 e- /8 14 - /8 @@ -2039,7 +2039,7 @@ CALL m108_without_clarinet_and_g_horn * { 3 f# /2 - 4 a-,c# /2 + 4 a-/c# /2 { q=4 11 f# /16 11 g# /16 @@ -2047,7 +2047,7 @@ CALL m108_without_clarinet_and_g_horn { q=2 12 f# /8 12 - /8 - 13 e-,c# /8 + 13 e-/c# /8 13 - /8 14 a-2 /8 14 - /8 @@ -2059,7 +2059,7 @@ CALL m108_without_clarinet_and_g_horn // m. 110 * { - 3 d#,f# /8 + 3 d#/f# /8 4 b- /8 6 b- /8 11 f# /16 @@ -2071,7 +2071,7 @@ CALL m108_without_clarinet_and_g_horn 11 c# /16 11 d# /16 12 f# /8 - 13 f#-,d# /8 + 13 f#-/d# /8 14 b-2 /8 15 b-3 /8 } @@ -2083,7 +2083,7 @@ CALL m103 // m. 112 * { - 13 e-,g#- /8 + 13 e-/g#- /8 } CALL m104_without_viola @@ -2099,9 +2099,9 @@ CALL m104_without_viola 11 f#+ /16 11 e+ /16 11 d#+ /16 - 13 e-,g#- /8 + 13 e-/g#- /8 13 - /8 - 13 g-,c# /8 + 13 g-/c# /8 } CALL m105_low @@ -2122,7 +2122,7 @@ CALL m108_without_clarinet_and_g_horn * { 3 f# /2 - 4 a-,c# /4 + 4 a-/c# /4 4 b- /4 6 - /4 6 b- /4 @@ -2137,9 +2137,9 @@ CALL m108_without_clarinet_and_g_horn 12 f# /8 12 - /8 12 d# /8 - 13 c#,e /8 + 13 c#/e /8 13 - /8 - 13 f#-,a- /8 + 13 f#-/a- /8 14 a-2 /8 14 - /8 14 b-2 /8 @@ -2153,12 +2153,12 @@ CALL m108_without_clarinet_and_g_horn { 0 - /16 1 - /16 - 3 e,g# /8 + 3 e/g# /8 4 e /8 6 e /8 11 e /16 12 e /16 - 13 e-,g#- /8 + 13 e-/g#- /8 14 e- /8 15 e-2 /8 } @@ -2243,15 +2243,15 @@ CALL m89_2 1 b+ /8 1 e+2 /8 2 e+ /8 q=3 - 3 g#,e+ /8 - 3 g#,b /8 - 3 g#,e+ /8 - 4 e-,b- /8 q=3 - 5 b-,g# /8 q=3 - 6 g#-,e /8 q=3 - 7 e,b /8 q=3 + 3 g#/e+ /8 + 3 g#/b /8 + 3 g#/e+ /8 + 4 e-/b- /8 q=3 + 5 b-/g# /8 q=3 + 6 g#-/e /8 q=3 + 7 e/b /8 q=3 8 e- /8 q=3 - p bd2,cc2,to /8 q=3 + p bd2/cc2/to /8 q=3 10 e- /8 q=3 11 e+ /8 11 b /8 @@ -2259,7 +2259,7 @@ CALL m89_2 12 e /8 12 b- /8 12 e /8 - 13 g#-,e /8 q=3 + 13 g#-/e /8 q=3 14 e- /8 q=3 15 e-2 /8 q=3 } @@ -2336,8 +2336,8 @@ FUNCTION m166_2 1 b+ /16 2 b /16 3 b /16 - 4 g#-,e /16 - 6 e,g# /16 + 4 g#-/e /16 + 6 e/g# /16 10 e- /16 11 b /16 } @@ -2348,18 +2348,18 @@ CALL m166_2 * FUNCTION m167_drum p to /2 m, tr=/32 - p bd2,cc2 /4 q=2 + p bd2/cc2 /4 q=2 END FUNCTION m167_low CALL m167_drum - 12 b-,g# /2 tr=/16 - 13 e-,e /2 tr=/16 + 12 b-/g# /2 tr=/16 + 13 e-/e /2 tr=/16 { q=2 5 - /8 - 5 b-,g# /8 + 5 b-/g# /8 7 - /8 - 7 e,b /8 - 8 e-,e /8 + 7 e/b /8 + 8 e-/e /8 8 - /8 14 e- /8 14 - /8 @@ -2376,10 +2376,10 @@ FUNCTION m167_high_half 2 b /16 q=2 3 b /8 3 b /16 q=2 - 4 g#-,e /8 - 4 g#-,e /16 q=2 - 6 e,g# /8 - 6 e,g# /16 q=2 + 4 g#-/e /8 + 4 g#-/e /16 q=2 + 6 e/g# /8 + 6 e/g# /16 q=2 10 e- /8 10 e- /16 q=2 11 b /8 @@ -2407,8 +2407,8 @@ FUNCTION m168_1_high 3 e+ /8 3 f#+ /8 3 g#+ /8 - 4 g#-,e /8 q=3 - 6 e,g# /8 q=3 + 4 g#-/e /8 q=3 + 6 e/g# /8 q=3 10 e- /8 q=3 11 e+ /8 11 f#+ /8 @@ -2432,10 +2432,10 @@ CALL m167_high_half 2 g#+ /16 q=2 3 e+ /8 3 g#+ /16 q=2 - 4 g#-,e /8 - 4 g#-,e /16 q=2 - 6 e,g# /8 - 6 e,g# /16 q=2 + 4 g#-/e /8 + 4 g#-/e /16 q=2 + 6 e/g# /8 + 6 e/g# /16 q=2 10 e- /8 10 e- /16 q=2 11 b /8 @@ -2461,24 +2461,24 @@ CALL m167_high_half 3 d#+ /8 3 b /8 3 b /16 q=2 - 4 b-2,f# /8 q=3 + 4 b-2/f# /8 q=3 4 b- /16 q=2 - 6 b-,f# /8 q=3 - 6 e,g# /16 q=2 + 6 b-/f# /8 q=3 + 6 e/g# /16 q=2 CALL m167_drum 10 b-2 /8 q=3 10 e- /16 q=2 11 f#+ /8 11 d#+ /8 11 b /8 q=2 - 12 b-,f# /2 tr=/16 - 13 b-,d# /2 tr=/16 + 12 b-/f# /2 tr=/16 + 13 b-/d# /2 tr=/16 { q=2 5 - /8 - 5 b-,g# /8 + 5 b-/g# /8 7 - /8 - 7 b-,b /8 - 8 b-2,b- /8 + 7 b-/b /8 + 8 b-2/b- /8 8 - /8 14 b-2 /8 14 - /8 @@ -2503,12 +2503,12 @@ CALL m168_1_high 1 g#+ /16 2 e+ /16 2 g#+ /16 - 3 e,e+ /16 - 3 g#,g#+ /16 - 4 g#-,e /16 q=2 - 6 e,g# /16 q=2 + 3 e/e+ /16 + 3 g#/g#+ /16 + 4 g#-/e /16 q=2 + 6 e/g# /16 q=2 10 e- /16 q=2 - 11 e+,g#+ /16 q=2 + 11 e+/g#+ /16 q=2 } // m. 173 @@ -2526,16 +2526,16 @@ CALL m168_1_high 2 a+ /16 $staccato 2 g#+ /16 2 f#+ /16 - 3 b,b+ /4+/16 $legato - 3 a,a+ /16 $staccato - 3 g#,g#+ /16 - 3 f#,f#+ /16 - 4 f#-,d# /8 - 4 f#-,d# /16 q=2 - 4 f#-,d# /8 q=2 - 6 b-,f# /8 - 6 b-,f# /16 q=2 - 6 b-,f# /8 q=2 + 3 b/b+ /4+/16 $legato + 3 a/a+ /16 $staccato + 3 g#/g#+ /16 + 3 f#/f#+ /16 + 4 f#-/d# /8 + 4 f#-/d# /16 q=2 + 4 f#-/d# /8 q=2 + 6 b-/f# /8 + 6 b-/f# /16 q=2 + 6 b-/f# /8 q=2 CALL m167_drum 10 b-2 /8 10 b-2 /16 q=2 @@ -2544,14 +2544,14 @@ CALL m168_1_high 11 a+ /16 $staccato 11 g#+ /16 11 f#+ /16 - 12 d#,b /2 tr=/16 - 13 b-,f# /2 tr=/16 + 12 d#/b /2 tr=/16 + 13 b-/f# /2 tr=/16 { q=2 5 - /8 - 5 b-,g# /8 + 5 b-/g# /8 7 - /8 - 7 b-,b /8 - 8 b-,b-2 /8 + 7 b-/b /8 + 8 b-/b-2 /8 8 - /8 14 b-2 /8 14 - /8 @@ -2563,7 +2563,7 @@ CALL m168_1_high // m. 174 * { m - 8 e-,e /2 $legato + 8 e-/e /2 $legato } FUNCTION m174_without_trombone CALL d_all_legato @@ -2575,20 +2575,20 @@ FUNCTION m174_without_trombone 1 a+ /16 1 g#+ /8. 1 c#+2 /16 - 2 e+,g#+ /1 m - 3 g#,e+ /1 m + 2 e+/g#+ /1 m + 3 g#/e+ /1 m 4 e- /8. 4 e /16 4 e /4+8 m - 5 b-,g# /8. - 5 b-,g# /16 - 5 b-,g# /4+8 m - 6 e,g# /8. - 6 e,g# /16 - 6 e,g# /4+8 m - 7 e,b /8. - 7 e,b /16 - 7 e,b /4+8 m + 5 b-/g# /8. + 5 b-/g# /16 + 5 b-/g# /4+8 m + 6 e/g# /8. + 6 e/g# /16 + 6 e/g# /4+8 m + 7 e/b /8. + 7 e/b /16 + 7 e/b /4+8 m CALL m167_drum 10 e- /2 tr=/32 10 - /4 m @@ -2608,7 +2608,7 @@ FUNCTION m174_without_trombone 12 a /16 12 b /16 12 c#+ /16 - 13 e,g# /2 tr=/16, $staccato + 13 e/g# /2 tr=/16, $staccato 14 e- /8. 14 e /16 14 e /4+8 m @@ -2646,11 +2646,11 @@ FUNCTION m175 4 g#- /8 4 e- /8 5 - /8 - 5 b-,g# /8 q=3 + 5 b-/g# /8 q=3 6 - /8 - 6 e,g# /8 q=3 + 6 e/g# /8 q=3 7 - /8 - 7 e,b /8 q=3 + 7 e/b /8 q=3 8 - /8 8 b- /8 8 g#- /8 @@ -2674,7 +2674,7 @@ FUNCTION m175 12 e+ /16 12 f#+ /16 12 g#+ /16 - 13 e,g# /2 tr=/16 + 13 e/g# /2 tr=/16 14 - /8 14 b- /8 14 g#- /8 @@ -2692,14 +2692,14 @@ CALL m175 FUNCTION m176_to_177 0 a+3 /1 $legato 1 a+2 /1 $legato - 2 f#+,a+ /8 - 2 f#+,a+ /4 q=2 - 2 f#+,a+ /8 - 2 f#+,a+ /4 - 3 a,f#+ /8 - 3 a,f#+ /4 q=2 - 3 a,f#+ /8 - 3 a,f#+ /4 + 2 f#+/a+ /8 + 2 f#+/a+ /4 q=2 + 2 f#+/a+ /8 + 2 f#+/a+ /4 + 3 a/f#+ /8 + 3 a/f#+ /4 q=2 + 3 a/f#+ /8 + 3 a/f#+ /4 4 b-2 /8 4 c- /8 4 c#- /8 @@ -2709,23 +2709,23 @@ FUNCTION m176_to_177 4 b- /8 4 b-2 /8 5 a /4 q=4 - 6 f#,a /4 q=4 + 6 f#/a /4 q=4 7 - /8 7 f#+ /4 q=3 7 f#+ /8 - 8 b-2,b- /8 - 8 c-,c /8 - 8 c#-,c# /8 - 8 d-,d /8 - 8 d#-,d# /8 - 8 f#-,f# /8 - 8 b-2,b- /8 q=2 + 8 b-2/b- /8 + 8 c-/c /8 + 8 c#-/c# /8 + 8 d-/d /8 + 8 d#-/d# /8 + 8 f#-/f# /8 + 8 b-2/b- /8 q=2 p to /8 - p bd2,cc2,to /8 q=7 + p bd2/cc2/to /8 q=7 10 b-2 /8 q=8 11 a+2 /2 q=2, tr=/16 12 a+ /2 q=2, tr=/16 - 13 f#,f#+ /2 q=2, tr=/16 + 13 f#/f#+ /2 q=2, tr=/16 14 b-2 /8 14 c- /8 14 c#- /8 @@ -2749,7 +2749,7 @@ CALL m176_to_177 // m. 178-179 * { m - 8 e-,e /8. $legato + 8 e-/e /8. $legato 8 e /16 8 e /4. } @@ -2770,33 +2770,33 @@ FUNCTION m182 1 g#+2 /8 1 - /8 1 d#+2 /8 - 2 e+,g#+ /8 + 2 e+/g#+ /8 2 - /8 - 2 c+,g#+ /8 - 3 g#,e+ /8 + 2 c+/g#+ /8 + 3 g#/e+ /8 3 - /8 - 3 c#,d#+ /8 - 4 e-,e /8 + 3 c#/d#+ /8 + 4 e-/e /8 4 - /8 - 4 g#-2,g#- /8 - 6 e,g# /8 + 4 g#-2/g#- /8 + 6 e/g# /8 6 - /8 - 6 f#,g# /8 + 6 f#/g# /8 7 e+ /8 7 - /8 7 g# /8 - 8 e-,e /8 + 8 e-/e /8 8 - /8 - 8 g#-2,g#- /8 + 8 g#-2/g#- /8 11 g#+2 /16 q=4 11 g#+2 /16 $legato 11 d#+2 /16 q=3, $staccato 12 g#+ /16 q=4 12 g#+ /16 $legato 12 d#+ /16 q=3, $staccato - 13 e,e+ /8 + 13 e/e+ /8 13 - /8 - 13 g#,c+ /4 tr=/16 + 13 g#/c+ /4 tr=/16 14 e- /8 14 - /8 14 g#-2 /8 @@ -2806,7 +2806,7 @@ FUNCTION m182 { q=2 5 g# /8 5 - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 p - /8 10 e- /8 10 - /8 @@ -2824,30 +2824,30 @@ FUNCTION m183 1 e+2 /8 1 - /8 1 f#+2 /8 - 2 c#+,e+ /8 + 2 c#+/e+ /8 2 - /8 - 2 d#+,b+ /8 - 3 c#+,e+ /8 + 2 d#+/b+ /8 + 3 c#+/e+ /8 3 - /8 - 3 d#+,f#+ /8 - 4 c#-,c# /8 + 3 d#+/f#+ /8 + 4 c#-/c# /8 4 - /8 - 4 b-2,b- /8 + 4 b-2/b- /8 5 g# /8 5 - /8 5 b /8 - 6 e,g# /8 + 6 e/g# /8 6 - /8 - 6 b-,f# /8 + 6 b-/f# /8 7 e+ /8 7 - /8 7 b /8 - 8 c#-,c# /8 + 8 c#-/c# /8 8 - /8 - 8 b-2,b- /8 - p bd2,cc2,to /8 + 8 b-2/b- /8 + p bd2/cc2/to /8 p - /8 - p bd2,cc2,to /8 + p bd2/cc2/to /8 10 e- /8 10 - /8 10 b-2 /8 @@ -2859,9 +2859,9 @@ FUNCTION m183 12 e+ /16 q=3, $staccato 12 e+ /16 $legato 12 f#+ /16 q=3, $staccato - 13 e,c#+ /8 + 13 e/c#+ /8 13 - /8 - 13 d#,b /4 tr=/16 + 13 d#/b /4 tr=/16 14 c#- /8 14 - /8 14 b-2 /8 @@ -2887,10 +2887,10 @@ CALL m183 FUNCTION m186_187_drums CALL v_all_sf p to /2 m, tr=/32 - p bd2,cc2 /4 + p bd2/cc2 /4 CALL v_all_f p - /4 - p to,bd2,cc2 /8 + p to/bd2/cc2 /8 END FUNCTION m186_to_187 CALL m186_187_drums @@ -2898,17 +2898,17 @@ FUNCTION m186_to_187 CALL v_all_sf 0 g+3 /2+/8 1 g+2 /2+/8 - 2 c+,c+2 /2+/8 - 3 c+,g+ /2+/8 - 4 e-2,e- /2+/8 - 5 g-,g /2+/8 - 6 e-,e /2+/8 - 7 e,e+ /2+/8 - 8 e-,e /2+/8 + 2 c+/c+2 /2+/8 + 3 c+/g+ /2+/8 + 4 e-2/e- /2+/8 + 5 g-/g /2+/8 + 6 e-/e /2+/8 + 7 e/e+ /2+/8 + 8 e-/e /2+/8 10 e- /2 tr=/32 11 g+2 /2 tr=/16 12 g+ /2 tr=/16 - 13 e,c+ /2 tr=/16 + 13 e/c+ /2 tr=/16 14 c /2 tr=/16 15 e-2 /8 CALL d_all_staccato @@ -2931,7 +2931,7 @@ FUNCTION m186_to_187 12 e+ /16 q=2 12 c+ /16 q=2 12 e+ /16 q=2 - 13 e,c+ /8 + 13 e/c+ /8 14 c /8 15 e-2 /8 q=4 END @@ -2945,17 +2945,17 @@ FUNCTION m188_to_189 CALL v_all_sf 0 g#+3 /2+/8 1 g#+2 /2+/8 - 2 e+,b+ /2+/8 + 2 e+/b+ /2+/8 3 g#+ /2+/8 - 4 e-2,e- /2+/8 - 5 b-,b /2+/8 - 6 e-,g# /2+/8 - 7 g#,e+ /2+/8 - 8 e-,e /2+/8 + 4 e-2/e- /2+/8 + 5 b-/b /2+/8 + 6 e-/g# /2+/8 + 7 g#/e+ /2+/8 + 8 e-/e /2+/8 10 e- /2 tr=/32 11 g#+2 /2 tr=/16 12 g#+ /2 tr=/16 - 13 e,b /2 tr=/16 + 13 e/b /2 tr=/16 14 b- /2 tr=/16 15 e-2 /8 CALL d_all_staccato @@ -2978,7 +2978,7 @@ FUNCTION m188_to_189 12 e+ /16 q=2 12 b /16 q=2 12 e+ /16 q=2 - 13 e,b /8 + 13 e/b /8 14 b- /8 15 e-2 /8 q=4 END @@ -2992,17 +2992,17 @@ FUNCTION m190_to_191 CALL v_all_sf 0 g#+3 /2+/8 1 g#+2 /2+/8 - 2 f+,g#+ /2+/8 + 2 f+/g#+ /2+/8 3 g#+ /2+/8 - 4 c#-,c# /2+/8 + 4 c#-/c# /2+/8 5 g# /2+/8 - 6 f,g# /2+/8 + 6 f/g# /2+/8 7 b /2+/8 - 8 c#-,c# /2+/8 + 8 c#-/c# /2+/8 10 e- /2 tr=/32 11 g#+2 /2 tr=/16 12 g#+ /2 tr=/16 - 13 f,b /2 tr=/16 + 13 f/b /2 tr=/16 14 c# /2 tr=/16 15 c#-2 /8 CALL d_all_staccato @@ -3025,7 +3025,7 @@ FUNCTION m190_to_191 12 f+ /16 q=2 12 c#+ /16 q=2 12 f+ /16 q=2 - 13 f,b /8 + 13 f/b /8 14 c# /8 15 c#-2 /8 q=4 END @@ -3053,15 +3053,15 @@ FUNCTION m192_to_193_without_violins CALL v_all_sf 0 a#+3 /2+/8 1 a#+2 /2+/8 - 2 g+,bb+ /2+/8 - 3 a#,a#+ /2+/8 - 4 c-,c /2+/8 + 2 g+/bb+ /2+/8 + 3 a#/a#+ /2+/8 + 4 c-/c /2+/8 5 g /2+/8 - 6 e-,e /2+/8 - 7 e,e+ /2+/8 - 8 c-,c /2+/8 + 6 e-/e /2+/8 + 7 e/e+ /2+/8 + 8 c-/c /2+/8 10 e- /2 tr=/32 - 13 g,e+ /2 tr=/16 + 13 g/e+ /2 tr=/16 14 c /2 tr=/16 15 c-2 /8 CALL d_all_staccato @@ -3072,11 +3072,11 @@ FUNCTION m192_to_193_without_violins 1 g+2 /16 q=2 1 e+2 /8 1 g+2 /8 - 3 g,g+ /16 q=2 - 3 e,e+ /8 - 3 g,g+ /8 + 3 g/g+ /16 q=2 + 3 e/e+ /8 + 3 g/g+ /8 10 e- /8 - 13 g,e+ /8 + 13 g/e+ /8 14 c /8 15 c-2 /8 q=4 END @@ -3086,7 +3086,7 @@ CALL m192_to_193_without_violins * FUNCTION m194_drums p to /2 m, tr=/32 - p bd2,cc2 /4 q=2 + p bd2/cc2 /4 q=2 END { 11 b+2 /8 tr=/8 @@ -3124,18 +3124,18 @@ FUNCTION m194_to_195_without_violins 1 e+2 /8 1 d#+2 /8 1 c#+2 /8 - 2 g#+,b+ /2 - 2 e+,g#+ /2 - 3 b,e+ /1 - 4 b-2,b /8 q=8, $staccato - 5 b-,b /1 - 6 e,g# /1 - 7 g#,e+ /1 - 8 b-2,b- /1 + 2 g#+/b+ /2 + 2 e+/g#+ /2 + 3 b/e+ /1 + 4 b-2/b /8 q=8, $staccato + 5 b-/b /1 + 6 e/g# /1 + 7 g#/e+ /1 + 8 b-2/b- /1 CALL m194_drums q=2 10 b-2 /2 q=2, tr=/32, $staccato 10 - /4 m - 13 g#,e+ /2 q=2, tr=/16, $staccato + 13 g#/e+ /2 q=2, tr=/16, $staccato 14 b- /2 q=2, tr=/16, $staccato 15 b-3 /8 q=8, $staccato CALL d_all_staccato @@ -3180,18 +3180,18 @@ FUNCTION m196_to_197_without_violins 1 e+2 /8 1 d#+2 /8 1 f#+2 /8 - 2 f#+,a+ /2 - 2 d#+,f#+ /2 - 3 a,d#+ /1 - 4 b-2,b /8 q=8, $staccato - 5 b-,a /1 - 6 b-,f# /1 - 7 b-,b /1 - 8 b-2,b- /1 + 2 f#+/a+ /2 + 2 d#+/f#+ /2 + 3 a/d#+ /1 + 4 b-2/b /8 q=8, $staccato + 5 b-/a /1 + 6 b-/f# /1 + 7 b-/b /1 + 8 b-2/b- /1 CALL m194_drums q=2 10 b-2 /2 q=2, tr=/32, $staccato 10 - /4 m - 13 d#,b /2 q=2, tr=/16, $staccato + 13 d#/b /2 q=2, tr=/16, $staccato 14 b-2 /2 q=2, tr=/16, $staccato 15 b-3 /8 q=8, $staccato CALL d_all_staccato @@ -3201,7 +3201,7 @@ CALL m196_to_197_without_violins // m. 198-199 * { m - 8 e-,e /2 $legato + 8 e-/e /2 $legato 8 e /8 $staccato } CALL m174_without_trombone @@ -3215,7 +3215,7 @@ CALL m176_to_177 // m. 202-203 * { m - 8 e-,e /8. $legato + 8 e-/e /8. $legato 8 e /16 8 e /4. } @@ -3334,20 +3334,20 @@ CALL m196_to_197_without_violins } 0 e+3 /8 1 e+2 /8 - 2 e+,g#+ /4. - 3 g#,e+ /4. + 2 e+/g#+ /4. + 3 g#/e+ /4. 4 e- /4. - 5 b-,g# /4. - 6 g#-,e /4. - 7 e,b /4. + 5 b-/g# /4. + 6 g#-/e /4. + 7 e/b /4. 8 e- /4. - p to,bd2,cc2 /4 + p to/bd2/cc2 /4 10 e- /4 tr=/32 10 e- /8 11 e+ /8 12 e /8 - 13 e,g# /4 tr=/16 - 13 e,g# /8 + 13 e/g# /4 tr=/16 + 13 e/g# /8 14 e- /8 15 e-2 /8 CALL d_all_staccato @@ -3525,17 +3525,17 @@ END CALL v_all_sf 0 d#+3 /1 1 d#+2 /1 - 2 d#+,b+ /1 - 3 d#+,f#+ /1 - 4 b-2,d# /1 - 5 b-,b /1 - 6 b-,f# /1 + 2 d#+/b+ /1 + 3 d#+/f#+ /1 + 4 b-2/d# /1 + 5 b-/b /1 + 6 b-/f# /1 7 b /1 - 8 b-2,b- /1 + 8 b-2/b- /1 10 b-2 /2 tr=/32 11 b /16 $staccato 12 b- /16 $staccato - 13 f#,a /2 tr=/16, $staccato + 13 f#/a /2 tr=/16, $staccato 14 b- /2 tr=/16, $staccato 15 b-3 /8 $staccato CALL m167_drum @@ -3572,7 +3572,7 @@ END 12 c+ /16 12 c#+ /16 12 d#+ /16 - 13 f#,a /2 tr=/16 + 13 f#/a /2 tr=/16 14 b- /2 tr=/16 15 b-3 /8 q=7, $staccato } @@ -3586,19 +3586,19 @@ CALL d_all_staccato 0 d#+3 /8 1 e+3 /8 1 d#+3 /8 - 2 e+,g#+ /8 - 2 d#+,b+ /8 - 3 e+,g#+ /8 - 3 d#+,a+ /8 - 4 e-,e /8 - 4 b-2,b- /8 - 5 b-,b /8 q=2 - 6 e,g# /8 - 6 b-,f# /8 + 2 e+/g#+ /8 + 2 d#+/b+ /8 + 3 e+/g#+ /8 + 3 d#+/a+ /8 + 4 e-/e /8 + 4 b-2/b- /8 + 5 b-/b /8 q=2 + 6 e/g# /8 + 6 b-/f# /8 7 e /8 7 b /8 - 8 e-,e /8 - 8 b-2,b- /8 + 8 e-/e /8 + 8 b-2/b- /8 10 e- /8 10 b-2 /8 11 e+2 /16 @@ -3609,34 +3609,34 @@ CALL d_all_staccato 12 d#+ /16 12 f#+ /16 12 d#+ /16 - 13 e,g# /8 - 13 f#,a /8 + 13 e/g# /8 + 13 f#/a /8 14 e- /8 14 b-2 /8 15 e-2 /8 15 b-3 /8 } p to /2 m, tr=/32 - p bd2,cc2 /8 q=4 + p bd2/cc2 /8 q=4 } // m. 236 * FUNCTION m236_low_ch5_10 5 - /8 $staccato - 5 b-,b /4. + 5 b-/b /4. 6 - /8 $staccato - 6 e-,g# /4. + 6 e-/g# /4. 7 - /8 $staccato - 7 g#,e+ /4. + 7 g#/e+ /4. p to /2 m, tr=/32 - p bd2,cc2 /4 + p bd2/cc2 /4 10 e- /2 tr=/32 10 - /4 m END FUNCTION m236_low_ch12_15 - 12 g#,e+ /2 tr=/16 - 13 e,b /2 tr=/16 + 12 g#/e+ /2 tr=/16 + 13 e/b /2 tr=/16 14 e- /2 tr=/16 15 e-2 /8 q=4, $staccato END @@ -3647,10 +3647,10 @@ END 1 e+2 /8 1 e+2 /16 q=2 1 e+2 /8 q=2 - 2 e+,g#+ *4+/8 m, $legato - 3 b,g#+ *4+/8 m, $legato - 4 e-2,e- *2 m, $legato - 8 e-,e *2 m, $legato + 2 e+/g#+ *4+/8 m, $legato + 3 b/g#+ *4+/8 m, $legato + 4 e-2/e- *2 m, $legato + 8 e-/e *2 m, $legato 11 e+2 /8 11 e+2 /16 q=2 11 e+2 /4 tr=/16 @@ -3715,16 +3715,16 @@ END 1 e+ /8 1 e+2 /16 q=2 1 e+2 /8 q=2 - 4 e-2,e- /8 - 4 e-,e /2 m + 4 e-2/e- /8 + 4 e-/e /2 m CALL m236_low_ch5_10 8 - /8 - 8 e-,e /4. + 8 e-/e /4. 11 e+ /8 11 e+ /16 q=2 11 e+ /4 tr=/16 - 12 b-,g# /2 tr=/16 - 13 e-,e /2 tr=/16 + 12 b-/g# /2 tr=/16 + 13 e-/e /2 tr=/16 14 e- /8 $staccato 14 e /8 q=3 15 e-2 /8 $staccato @@ -3741,15 +3741,15 @@ END 1 b+ /16 q=2 1 b+ /8 q=2 4 - /8 - 4 b-2,b- /2 m + 4 b-2/b- /2 m CALL m236_low_ch5_10 8 - /8 - 8 b-2,b- /4. + 8 b-2/b- /4. 11 e+ /8 11 b /16 q=2 11 b /4 tr=/16 - 12 b-,g# /2 tr=/16 - 13 e-,e /2 tr=/16 + 12 b-/g# /2 tr=/16 + 13 e-/e /2 tr=/16 14 e /8 14 b- /8 q=3 15 e- /8 @@ -3766,15 +3766,15 @@ END 1 g#+ /16 q=2 1 g#+ /8 q=2 4 - /8 - 4 g#-2,g#- /2 m + 4 g#-2/g#- /2 m CALL m236_low_ch5_10 8 - /8 - 8 g#-2,g#- /4. + 8 g#-2/g#- /4. 11 b /8 11 g# /16 q=2 11 g# /4 tr=/16 - 12 b-,g# /2 tr=/16 - 13 e-,e /2 tr=/16 + 12 b-/g# /2 tr=/16 + 13 e-/e /2 tr=/16 14 b- /8 14 g#- /8 q=3 15 b-2 /8 @@ -3791,15 +3791,15 @@ END 1 e+ /16 q=2 1 e+ /8 q=2 4 - /8 - 4 e-2,e- /2 m + 4 e-2/e- /2 m CALL m236_low_ch5_10 8 - /8 8 e- /2 m 11 g# /8 11 e /16 q=2 11 e /4 tr=/16 - 12 b-,g# /2 tr=/16 - 13 e-,e /2 tr=/16 + 12 b-/g# /2 tr=/16 + 13 e-/e /2 tr=/16 14 g#- /8 14 e- /8 q=3 15 g#-2 /8 @@ -3828,17 +3828,17 @@ END 7 b- /8 7 e /8 7 b- /8 - p to,bd2,cc2 /8 + p to/bd2/cc2 /8 10 e- /8 11 e /8 11 b- /16 q=2 11 e /16 q=2 11 b- /16 q=2 - 12 b-,g# /8 + 12 b-/g# /8 12 b- /16 q=2 12 e /16 q=2 12 b- /16 q=2 - 13 e-,e /8 + 13 e-/e /8 13 b- /16 q=2 13 e /16 q=2 13 b- /16 q=2 @@ -4017,12 +4017,12 @@ END { 0 e+3 /16 q=2 1 e+2 /16 q=2 - 2 g#+,b+ /16 q=2 - 3 b,g#+ /16 q=2 + 2 g#+/b+ /16 q=2 + 3 b/g#+ /16 q=2 10 e- /16 q=2 11 e+2 /16 q=2 - 12 b,g#+ /16 q=2 - 13 g#,e+ /16 q=2 + 12 b/g#+ /16 q=2 + 13 g#/e+ /16 q=2 14 e /16 q=2 15 e- /16 q=2 } @@ -4032,15 +4032,15 @@ END { 0 e+3 /8 q=4 1 e+2 /8 q=4 - 2 g#+,b+ /8 q=4 - 3 b,g#+ /8 q=4 + 2 g#+/b+ /8 q=4 + 3 b/g#+ /8 q=4 4 e /8 4 b- /8 4 g#- /8 4 b- /8 - 5 b-,b /8 q=4 - 6 e,g# /8 q=4 - 7 g#,e+ /8 q=4 + 5 b-/b /8 q=4 + 6 e/g# /8 q=4 + 7 g#/e+ /8 q=4 8 e /8 8 b- /8 8 g#- /8 @@ -4048,8 +4048,8 @@ END CALL m167_drum 10 e- /8 q=4 11 e+2 /8 q=4 - 12 b,g#+ /8 q=4 - 13 g#,e+ /8 q=4 + 12 b/g#+ /8 q=4 + 13 g#/e+ /8 q=4 14 e /8 14 b- /8 14 g#- /8 @@ -4065,18 +4065,18 @@ END { 0 e+3 /4 1 e+2 /4 - 2 g#+,b+ /4 - 3 b,g#+ /4 + 2 g#+/b+ /4 + 3 b/g#+ /4 4 e- /4 - 5 b-,b /4 - 6 e,g# /4 - 7 g#,e+ /4 + 5 b-/b /4 + 6 e/g# /4 + 7 g#/e+ /4 8 e- /4 - p to,bd2,cc2 /4 + p to/bd2/cc2 /4 10 e- /4 11 e+2 /4 - 12 b,g#+ /4 - 13 g#,e+ /4 + 12 b/g#+ /4 + 13 g#/e+ /4 14 e- /4 15 e-2 /4 15 - /8. @@ -4085,17 +4085,17 @@ END { 0 e+3 /16 1 e+2 /16 - 2 e+,g#+ /16 - 3 g#+,e+ /16 - 4 e-2,e- /16 - 5 b-,b /16 - 6 e,g# /16 - 7 g#,e+ /16 - 8 e-,e /16 + 2 e+/g#+ /16 + 3 g#+/e+ /16 + 4 e-2/e- /16 + 5 b-/b /16 + 6 e/g# /16 + 7 g#/e+ /16 + 8 e-/e /16 10 e- /16 11 e+2 /16 - 12 b,g#+ /16 - 13 e,b /16 + 12 b/g#+ /16 + 13 e/b /16 14 e- /16 15 e-2 /16 } @@ -4105,18 +4105,18 @@ END { 0 e+3 /4 1 e+2 /4 - 2 e+,g#+ /4 - 3 g#,e+ /4 - 4 e-2,e- /4 - 5 b-,b /4 - 6 e,g# /4 - 7 g#,e+ /4 - 8 e-,e /4 - p to,bd2,cc2 /4 + 2 e+/g#+ /4 + 3 g#/e+ /4 + 4 e-2/e- /4 + 5 b-/b /4 + 6 e/g# /4 + 7 g#/e+ /4 + 8 e-/e /4 + p to/bd2/cc2 /4 10 e- /4 11 e+2 /4 - 12 b,g#+ /4 - 13 e,b /4 + 12 b/g#+ /4 + 13 e/b /4 14 e- /4 15 e-2 /4 15 - /8. @@ -4125,17 +4125,17 @@ END { 0 e+2 /16 1 e+ /16 - 2 g#,e+ /16 - 3 g#,e+ /16 - 4 e-2,e- /16 + 2 g#/e+ /16 + 3 g#/e+ /16 + 4 e-2/e- /16 5 b- /16 - 6 g#-,e /16 - 7 e,b /16 + 6 g#-/e /16 + 7 e/b /16 8 e- /16 10 e- /16 - 11 g#-,e /16 + 11 g#-/e /16 12 b- /16 - 13 g#-,e /16 + 13 g#-/e /16 14 e- /16 15 e-2 /16 } @@ -4146,18 +4146,18 @@ END CALL d_all_legato 0 e+2 /2 1 e+ /2 - 2 g#,e+ /2 - 3 g#,e+ /2 - 4 e-2,e- /2 + 2 g#/e+ /2 + 3 g#/e+ /2 + 4 e-2/e- /2 5 b- /2 - 6 g#-,e /2 - 7 e,b /2 + 6 g#-/e /2 + 7 e/b /2 8 e- /2 - p to,bd2,cc2 /2 + p to/bd2/cc2 /2 10 e- /2 tr=/32 - 11 g#-,e /2 + 11 g#-/e /2 12 b- /2 - 13 g#-,e /2 + 13 g#-/e /2 14 e- /2 15 e-2 /2 } diff --git a/examples/rossini_william_tell_overture_finale.midica b/examples/rossini_william_tell_overture_finale.midica index 66233b6..a836fdf 100644 --- a/examples/rossini_william_tell_overture_finale.midica +++ b/examples/rossini_william_tell_overture_finale.midica @@ -76,7 +76,7 @@ END // define chord for percussion /////////////////////////////////////// -CHORD perc_all = to, bd2, cc2 +CHORD perc_all = to / bd2 / cc2 ///////////////////////////////// // start the actual sequence @@ -96,20 +96,20 @@ CALL v_all_ff // m. 5-8 * -6: | e,g#:p_intro | e,g#:8 b-,f# g#-,e b-,f# | e,g# g#,b f#,a e,g# | +6: | e/g#:p_intro | e/g#:8 b-/f# g#-/e b-/f# | e/g# g#/b f#/a e/g# | 7: | b:8 g# e g# | b g# b e+ | b:p_intro | // m. 9-10 * -5: | b-,b:p_intro | -6: | b-,f#:8 e,g# b-,f# f#,a | e,g# b-,f# g#-,e e,g# | +5: | b-/b:p_intro | +6: | b-/f#:8 e/g# b-/f# f#/a | e/g# b-/f# g#-/e e/g# | 7: | b:p_intro | // m. 11-14 * { q=4 - 5: | b-,b:p8ss88 | - 6: | b-,f#:p8ss88 | + 5: | b-/b:p8ss88 | + 6: | b-/f#:p8ss88 | 7: | b:p8ss88 | 10: | b-2:p8ss88 | } @@ -118,11 +118,11 @@ CALL v_all_ff * CALL v_all_sf CALL d_all_legato -4: | b-2,d#:1+8 -5: | b-,b:1+8 -6: | d#,f#:1+8 +4: | b-2/d#:1+8 +5: | b-/b:1+8 +6: | d#/f#:1+8 7: | b:1+8 -8: | b-,d#,f#:1+8 +8: | b-/d#/f#:1+8 10: | b-2:p2tr32 | b-2:p2tr32 | b-2:8 -:4. | // m. 18 @@ -133,7 +133,7 @@ CALL d_all_staccato CALL v_all_pp 3: b-:pss | 4: e-:pss | -6: b-,g#-:pss | +6: b-/g#-:pss | 11: b-:pss | 12: g#-:pss | 13: e-:pss | @@ -145,12 +145,12 @@ CALL m19_to_26_1(contrabass=0) FUNCTION m19_to_26_1 // 19 20 21 22 3: | b-:p8ss8ss | e:8 f# g# b-:pss | b-:p8ss e:8 g#:pss | f#:8 d# b-:p8ss | - 4: | e-:p8ss8ss | e-:p888ss | e-:p8ss8ss | b-2,b-:8 b-2,f#- b-2,f#- e-:pss | - 6: | b-,g#-:p8ss8ss | b-,g#-:p888ss | b-,g#-:p8ss8ss | b-2,d#:p888 b-,g#-:pss | + 4: | e-:p8ss8ss | e-:p888ss | e-:p8ss8ss | b-2/b-:8 b-2/f#- b-2/f#- e-:pss | + 6: | b-/g#-:p8ss8ss | b-/g#-:p888ss | b-/g#-:p8ss8ss | b-2/d#:p888 b-/g#-:pss | 10: | e-:p8r8r | e-:p888r | e-:p8r8r | b-2:p888r | 11: | b-:p8ss8ss | e:8 f# g# b-:pss | b-:p8ss e:8 g#:pss | f#:8 d# b-:p8ss | 12: | g#-:p8ss8ss | b-:p888 g#-:pss | g#-:p8ss b-:p8ss | b-:p888 g#-:pss | - 13: | e-:p8ss8ss | g#-,e-:p888 e-:pss | e-:p8ss g#-,e-:p8ss | d#-,f#-:p888 e-:pss | + 13: | e-:p8ss8ss | g#-/e-:p888 e-:pss | e-:p8ss g#-/e-:p8ss | d#-/f#-:p888 e-:pss | 14: | e-:p8ss8ss | e-:p888ss | e-:p8ss8ss | b-:p888 e-:pss | { if ${contrabass} == 1 // 59 60 61 62 @@ -160,12 +160,12 @@ FUNCTION m19_to_26_1 // 23 24 25 26/1 3: | b-:p8ss8ss | e:8 f# g# $ff e:16 g# | $leg b:4+16 $stac a:16 g# f# | e:8 g# e - 4: | e-:p8ss8ss | e-:p888 $ff e-:16 e- | f#-,a-:p8ss8ss | e-,g#-:8 e-,b-:p88 - 6: | b-,g#-:p8ss8ss | b-,g#-:p888 $ff b-,g#-:pss | b-2,d#:p8ss8ss | e-,g#-:p888 + 4: | e-:p8ss8ss | e-:p888 $ff e-:16 e- | f#-/a-:p8ss8ss | e-/g#-:8 e-/b-:p88 + 6: | b-/g#-:p8ss8ss | b-/g#-:p888 $ff b-/g#-:pss | b-2/d#:p8ss8ss | e-/g#-:p888 10: | e-:p8r8r | e-:p888r $ff | b-2:p8r8r | e-:8 e- e- 11: | b-:p8ss8ss | e:8 f# g# $ff e:16 g# | $leg b:4+16 $stac a:16 g# f# | e:8 g# e 12: | g#-:p8ss8ss | b-:p888 $ff e:16 e | d#:p8ss8ss | e:8 e e - 13: | e-:p8ss8ss | g#-,e-:p888 $ff g#-,b-:pss | a-,f#-:p8ss8ss | g#-,b-:p888 + 13: | e-:p8ss8ss | g#-/e-:p888 $ff g#-/b-:pss | a-/f#-:p8ss8ss | g#-/b-:p888 14: | e-:p8ss8ss | e-:p888 $ff e-:16 e- | b-2:p8ss8ss | e-:8 e- e- { if ${contrabass} == 1 // 63 64 @@ -193,17 +193,17 @@ FUNCTION m26_2_to_34_1 // 26/2 27 28 29 30 0: b+:16 b+ | b+:p8ss8ss | e+2:8 f#+2 g#+2 b+:16 b+ | b+:p8ss e+2:8 g#+2:pss | f#+2:8 d#+2 b+:p8ss | 1: b+:16 b+ | b+:p8ss8ss | e+2:8 f#+2 g#+2 b+:16 b+ | b+:p8ss e+2:8 g#+2:pss | f#+2:8 d#+2 b+:p8ss | - 2: g#,b:pss | g#,b:p8ss8ss | g#,e+:8 g#,f#+ g#,g#+ g#,b:pss | g#,b:p8ss g#,e+:8 e+,g#+:pss | d#+,f#+:8 b,d#+ b g#,b:pss | - 3: b-,b:pss | b-,b:p8ss8ss | e,e+:8 f#,f#+ g#,g#+ b-,b:pss | b-,b:p8ss b-,b:8 g#,g#+:pss | f#,f#+:8 d#,d#+ b-,b:p8ss | - 4: e-,b-:pss | e-,b-:p8ss8ss | e-,b-:p888ss | e-,b-:p8ss8ss | b-2,f#-:p888 e-,b-:pss | + 2: g#/b:pss | g#/b:p8ss8ss | g#/e+:8 g#/f#+ g#/g#+ g#/b:pss | g#/b:p8ss g#/e+:8 e+/g#+:pss | d#+/f#+:8 b/d#+ b g#/b:pss | + 3: b-/b:pss | b-/b:p8ss8ss | e/e+:8 f#/f#+ g#/g#+ b-/b:pss | b-/b:p8ss b-/b:8 g#/g#+:pss | f#/f#+:8 d#/d#+ b-/b:p8ss | + 4: e-/b-:pss | e-/b-:p8ss8ss | e-/b-:p888ss | e-/b-:p8ss8ss | b-2/f#-:p888 e-/b-:pss | 5: b-:pss | b-:p8ss8ss | b-:p888ss | b-:p8ss8ss | b-:p888ss | - 6: g#-,e:pss | g#-,e:p8ss8ss | g#-,e:p888ss | g#-,e:p8ss8ss | b-2,d#:p888 g#-,e:pss | - 7: e,g#:pss | e,g#:p8ss8ss | e,g#:p888ss | e,g#:p8ss8ss | b-,b:p888 e,g#:pss | + 6: g#-/e:pss | g#-/e:p8ss8ss | g#-/e:p888ss | g#-/e:p8ss8ss | b-2/d#:p888 g#-/e:pss | + 7: e/g#:pss | e/g#:p8ss8ss | e/g#:p888ss | e/g#:p8ss8ss | b-/b:p888 e/g#:pss | 8: -:8 | e-:p8r8r | e-:p888r | e-:p8r8r | b-2:p888r | 10: -:8 | e-:p8r8r_tr | e-:p888r | e-:p8r8r_tr | b-2:p888r | 11: b-:pss | b-:p8ss8ss | e:8 f# g# b-:pss | b-:p8ss e:8 g#:pss | f#:8 d# b-:p8ss | 12: g#-:pss | g#-:p8ss8ss | b-:8 b- b- g#-:pss | g#-:p8ss b-:p8ss | b-:p888 g#-:pss | - 13: e-:pss | e-:p8ss8ss | e-,g#-:p888 e-:pss | e-:p8ss e-,g#-:p8ss | d#-,f#-:p888 e-:pss | + 13: e-:pss | e-:p8ss8ss | e-/g#-:p888 e-:pss | e-:p8ss e-/g#-:p8ss | d#-/f#-:p888 e-:pss | 14: e-:pss | e-:p8ss8ss | e-:p888ss | e-:p8ss8ss | b-2:p888 e-:pss | 15: e-2:pss | e-2:p8ss8ss | e-2:p888ss | e-2:p8ss8ss | b-3:p888 e-2:pss | @@ -211,17 +211,17 @@ FUNCTION m26_2_to_34_1 // 31 32 33 34/1 0: | b+:p8ss8ss | e+2:8 f#+2 g#+2 $ff e+2:16 g#+2 | $leg b+2:4+16 $stac a+2:16 g#+2 f#+2 | e+2:8 g#+2 e+2 1: | b+:p8ss8ss | e+2:8 f#+2 g#+2 $ff e+:16 g#+ | $leg b+:4+16 $stac a+:16 g#+ f#+ | e+:8 g#+ e+ - 2: | g#,b:p8ss8ss | g#,e+:8 g#,f#+ g#,g#+ $ff e+:16 g#+ | $leg b+:4+16 $stac a+:16 g#+ f#+ | e+:8 g#+ e+ - 3: | b-,b:p8ss8ss | e,e+:8 f#,f#+ g#,g#+ $ff e:16 g# | $leg b:4+16 $stac a:16 g# f# | e:8 g# e - 4: | e-,b-:p8ss8ss | e-,b-:p888 $ff e-,b-:pss | b-2,d#:p8ss8ss | e-,e:8 e-,b-:p88 + 2: | g#/b:p8ss8ss | g#/e+:8 g#/f#+ g#/g#+ $ff e+:16 g#+ | $leg b+:4+16 $stac a+:16 g#+ f#+ | e+:8 g#+ e+ + 3: | b-/b:p8ss8ss | e/e+:8 f#/f#+ g#/g#+ $ff e:16 g# | $leg b:4+16 $stac a:16 g# f# | e:8 g# e + 4: | e-/b-:p8ss8ss | e-/b-:p888 $ff e-/b-:pss | b-2/d#:p8ss8ss | e-/e:8 e-/b-:p88 5: | b-:p8ss8ss | b-:p888 $ff b-:pss | b-:p8ss8ss | b-:p888 - 6: | g#-,e:p8ss8ss | g#-,e:p888 $ff g#-,e:pss | b-2,d#:p8ss8ss | g#-,e:p888 - 7: | e,g#:p8ss8ss | e,g#:p888 $ff e,g#:pss | b-,b:p8ss8ss | g#,e:p888 + 6: | g#-/e:p8ss8ss | g#-/e:p888 $ff g#-/e:pss | b-2/d#:p8ss8ss | g#-/e:p888 + 7: | e/g#:p8ss8ss | e/g#:p888 $ff e/g#:pss | b-/b:p8ss8ss | g#/e:p888 8: | e-:p8r8r | e-:p888r $trombone_dyn | b-2:p8r8r | e-:p888 10: | e-:p8r8r_tr | e-:p888r $ff | b-2:p8r8r | e-:p888 11: | b-:p8ss8ss | e:8 f# g# $ff e:16 g# | $leg b:4+16 $stac a:16 g# f# | e:8 g# e 12: | g#-:p8ss8ss | b-:p888 $ff e:pss | d#:p8ss8ss | e:p888 - 13: | e-:p8ss8ss | e-,g#-:p888 $ff b-,g#-:pss | f#-,a-:p8ss8ss | g#-,b:p888 + 13: | e-:p8ss8ss | e-/g#-:p888 $ff b-/g#-:pss | f#-/a-:p8ss8ss | g#-/b:p888 14: | e-:p8ss8ss | e-:p888 $ff e-:pss | b-2:p8ss8ss | e-:p888 15: | e-2:p8ss8ss | e-2:p888 $ff e-2:pss | b-3:p8ss8ss | e-2:p888 END @@ -234,36 +234,36 @@ FUNCTION m34_2_to_41 // 34/2 35 36 37 38 0: g#+2:pss | g#+2:p8ss8ss | g#+2:8 c#+3 g#+2 c#+3 | g#+2 c#+3 g#+2 f#+2 | e+2 d#+2 c#+2 g#+2:pss | 1: e+2:pss | e+2:p8ss8ss | e+2:8 c#+2 e+2 c#+2 | e+2 c#+2 e+2 d#+2 | c#+2 c+2 c#+2 e+2:pss | - 2: e+,g#+:pss | e+,g#+:p8ss8ss | e+,g#+:8 c#+,c#+2 e+,g#+ c#+,c#+2 | e+,g#+ c#+,c#+2 e+,g#+ d#+,f#+ | c#+,e+ c+,d#+ c#+ e+,g#+:pss | - 3: e+,g#+:pss | e+,g#+:p8ss8ss | e+,g#+:8 c#+ e+,g#+ c#+ | e+,g#+ c#+ e+,g#+ c+ | c#+ c+,d#+ c#+ e+,g#+:pss | - 4: c#-,c#:pss | c#-,c#:p8ss8ss | c#-,c#:p8r8r | c#-,c#:8 - c#-,c# g#-2,g#- | c#-,c#:p888ss | + 2: e+/g#+:pss | e+/g#+:p8ss8ss | e+/g#+:8 c#+/c#+2 e+/g#+ c#+/c#+2 | e+/g#+ c#+/c#+2 e+/g#+ d#+/f#+ | c#+/e+ c+/d#+ c#+ e+/g#+:pss | + 3: e+/g#+:pss | e+/g#+:p8ss8ss | e+/g#+:8 c#+ e+/g#+ c#+ | e+/g#+ c#+ e+/g#+ c+ | c#+ c+/d#+ c#+ e+/g#+:pss | + 4: c#-/c#:pss | c#-/c#:p8ss8ss | c#-/c#:p8r8r | c#-/c#:8 - c#-/c# g#-2/g#- | c#-/c#:p888ss | 5: g#:pss | g#:p8ss8ss | g#:p8r8r | g#:8 - g# f# | g# f# e g#:pss | - 6: e,g#:pss | e,g#:p8ss8ss | e,g#:p8r8r | e,g#:8 - e,g# g#-,g# | g#-,g# g#-,f# g#-,e e,g#:pss | - 7: g#,e+:pss | g#,e+:p8ss8ss | g#,e+:p8r8r | g#,e+:8 - g#,e+ g#,f#+ | g#,e+:p888ss | - 8: -:8 | c#-,c#:p8r8r | c#-,c#:p8r8r | c#-,c#:8 - c#-,c# g#-2,g#- | c#-,c#:p888r | + 6: e/g#:pss | e/g#:p8ss8ss | e/g#:p8r8r | e/g#:8 - e/g# g#-/g# | g#-/g# g#-/f# g#-/e e/g#:pss | + 7: g#/e+:pss | g#/e+:p8ss8ss | g#/e+:p8r8r | g#/e+:8 - g#/e+ g#/f#+ | g#/e+:p888ss | + 8: -:8 | c#-/c#:p8r8r | c#-/c#:p8r8r | c#-/c#:8 - c#-/c# g#-2/g#- | c#-/c#:p888r | p: -:8 | perc_all:p8r8r | perc_all:p8r8r | perc_all:p8r8r | perc_all:p888r | 10: e-:pss | e-:p8ss8ss | e-:p8888 | e-:p8888 | e-:p888ss | 11: g#+:pss | g#+:p8ss8ss | g#+:8 c#+2 g#+ c#+2 | g#+ c#+2 g#+ f#+ | e+ d#+ c#+ g#+:pss | 12: e+:pss | e+:p8ss8ss | e+:8 c#+ e+ c#+ | e+ c#+ e+ d#+ | c#+ f# e e+:pss | - 13: e,g#:pss | e,g#:p8ss8ss | e,g#:8 c#,c#+ e,g# c#,c#+ | e,g# c#,c#+ e,g# d#,f# | c#,e a g# e,g#:pss | + 13: e/g#:pss | e/g#:p8ss8ss | e/g#:8 c#/c#+ e/g# c#/c#+ | e/g# c#/c#+ e/g# d#/f# | c#/e a g# e/g#:pss | 14: -:8 | c#-:p8r8r | c#-:p8r8r | c#-:8 - c#- g#-2 | c#-:p888r | 15: -:8 | c#-2:p8r8r | c#-2:p8r8r | c#-2:8 - c#-2 g#-3 | c#-2:p888r | // 39 40 41 0: | g#+2:p8ss8ss | g#+2:8 c#+3 g#+2 c#+3 | g#+2 c#+3 b+2 a#+2 | 1: | e+2:p8ss8ss | e+2:8 c#+2 e+2 c#+2 | e+2 c#+2 d#+2 c#+2 | - 2: | e+,g#+:p8ss8ss | e+,g#+:8 c#+,c#+2 e+,g#+ c#+,c#+2 | e+,g#+ c#+,c#+2 d#+,b+ c#+,a#+ | - 3: | e+,g#+:p8ss8ss | e+,g#+:8 c#+ e+,g#+ c#+ | e+,g#+ c#+ d#+,f#+ c#+,e+ | - 4: | c#-,c#:p8ss8ss | c#-,c#:p8r8r | c#-,c#:8 - f#-2,f# f#-2,f# | + 2: | e+/g#+:p8ss8ss | e+/g#+:8 c#+/c#+2 e+/g#+ c#+/c#+2 | e+/g#+ c#+/c#+2 d#+/b+ c#+/a#+ | + 3: | e+/g#+:p8ss8ss | e+/g#+:8 c#+ e+/g#+ c#+ | e+/g#+ c#+ d#+/f#+ c#+/e+ | + 4: | c#-/c#:p8ss8ss | c#-/c#:p8r8r | c#-/c#:8 - f#-2/f# f#-2/f# | 5: | g#:p8ss8ss | g#:p8r8r | g#:8 - f# f# | - 6: | e,g#:p8ss8ss | e,g#:p8r8r | e,g#:8 - b-,f# e,f# | - 7: | g#,e+:p8ss8ss | g#,e+:p8r8r | g#,e+:8 - b e | - 8: | c#-,c#:p8r8r | c#-,c#:p8r8r | c#-,c#:8 - f#-2,f#- f#-2,f#- | + 6: | e/g#:p8ss8ss | e/g#:p8r8r | e/g#:8 - b-/f# e/f# | + 7: | g#/e+:p8ss8ss | g#/e+:p8r8r | g#/e+:8 - b e | + 8: | c#-/c#:p8r8r | c#-/c#:p8r8r | c#-/c#:8 - f#-2/f#- f#-2/f#- | p: | perc_all:p8r8r | perc_all:p8r8r | perc_all:p8r8r | 10: | e-:p8ss8ss | e-:p8888 | e-:8 e- b-2 e- | 11: | g#+:p8ss8ss | g#+:8 c#+2 g#+ c#+2 | g#+ c#+2 e+ a#+ | 12: | e+:p8ss8ss | e+:8 c#+ e+ c#+ | e+ c#+ f#+ e+ | - 13: | e,g#:p8ss8ss | e,g#:8 c#,c#+ e,g# c#,c#+ | e,g# c#,c#+ f# c#+ | + 13: | e/g#:p8ss8ss | e/g#:8 c#/c#+ e/g# c#/c#+ | e/g# c#/c#+ f# c#+ | 14: | c#-:p8r8r | c#-:p8r8r | c#-:8 - f#- f#-2 | 15: | c#-2:p8r8r | c#-2:p8r8r | c#-2:8 - f#-2 f#-3 | END @@ -273,13 +273,13 @@ CALL m42_1 FUNCTION m42_1 0: | b+2:8 a#+2 b+2 1: | b+:8 a#+ b+ - 2: | d#+,b+:8 e+,a#+ d#+,b+ - 3: | b,d#+:8 a#,c#+ b - 4: | b-2,b:p888 + 2: | d#+/b+:8 e+/a#+ d#+/b+ + 3: | b/d#+:8 a#/c#+ b + 4: | b-2/b:p888 5: | b:8 g f# - 6: | b-,f#:8 e,g b-,f# + 6: | b-/f#:8 e/g b-/f# 7: | b:8 e b - 8: | b-2,b:p888 + 8: | b-2/b:p888 p: | perc_all:p888 10: | b-2:p888 11: | b+:8 a#+ b+ @@ -298,14 +298,14 @@ FUNCTION m50_to_58 // | 50 0: | b+2:8 1: | b+:8 - 2: | d#+,b+:8 - 3: | b,d#+:8 -:4 $p b-,f#:pss | - 4: | b-2,b-:8 + 2: | d#+/b+:8 + 3: | b/d#+:8 -:4 $p b-/f#:pss | + 4: | b-2/b-:8 5: | b:8 - 6: | b-,f#:8 -:4 $p b-,f#:pss | + 6: | b-/f#:8 -:4 $p b-/f#:pss | 7: | b:8 -:4 $p b:pss - 8: | b-2,b-:8 - p: | bd2,cc2,to:8 + 8: | b-2/b-:8 + p: | bd2/cc2/to:8 10: | b-2:8 11: | b+:16 $p a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | 12: | d#+:8 @@ -317,20 +317,20 @@ FUNCTION m50_to_58 * // 51 52 53 - 3: | b-,f#:p8ss b-,f#:8 e,g# | f#,a:8 $p_marcato b-,f#:4 $p f#,a:8 | e,g# $p_marcato g#-,e:4 $p e,g#:8 | + 3: | b-/f#:p8ss b-/f#:8 e/g# | f#/a:8 $p_marcato b-/f#:4 $p f#/a:8 | e/g# $p_marcato g#-/e:4 $p e/g#:8 | 4: | -:2 | -:8 b-2 c#- d#- | e- f#- g#- a- | - 6: | b-,f#:p8ss b-,f#:8 e,g# | f#,a:8 $p_marcato b-,f#:4 $p f#,a:8 | e,g# $p_marcato f#-,g#-:4 $p e,g#:8 | + 6: | b-/f#:p8ss b-/f#:8 e/g# | f#/a:8 $p_marcato b-/f#:4 $p f#/a:8 | e/g# $p_marcato f#-/g#-:4 $p e/g#:8 | 7: | b:8 -:4 b:pss | b:8 -:4 b:pss | b:8 -:4 b:pss | 11: | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | 14: | -:2 $pp | -:8 b-2 c#- d#- | e- f#- g#- a- | * // 54 55 56 - 2: | -:4. b,f#+:pss | b,f#+:p8ss b,f#+:8 e+,g#+ | f#+,a+ $p_marcato b,f#+:4 $p f#+,a+:8 | - 3: | d#,f#:p888 b-,f#:pss | b-,f#:p8ss b-,f#:8 e,g# | f#,a $p_marcato b-,f#:4 $p f#,a:8 | + 2: | -:4. b/f#+:pss | b/f#+:p8ss b/f#+:8 e+/g#+ | f#+/a+ $p_marcato b/f#+:4 $p f#+/a+:8 | + 3: | d#/f#:p888 b-/f#:pss | b-/f#:p8ss b-/f#:8 e/g# | f#/a $p_marcato b-/f#:4 $p f#/a:8 | 4: | b- b-2 b- - | - - - - | - b-2 c#- d#- | - 5: | $pp -:4. b-,b:pss | b-,b:8 - - b-,b:pss | b-,b:8 - - b-,b:pss | - 6: | b-,f# b-2,b-:p88 b-,f#:pss | b-,f#:p8ss b-,f#:8 e,g# | f#,a $p_marcato b-,f#:4 $p f#,a:8 | + 5: | $pp -:4. b-/b:pss | b-/b:8 - - b-/b:pss | b-/b:8 - - b-/b:pss | + 6: | b-/f# b-2/b-:p88 b-/f#:pss | b-/f#:p8ss b-/f#:8 e/g# | f#/a $p_marcato b-/f#:4 $p f#/a:8 | 7: | b:8 11: | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | 12: | $pp b:16 a# c#+ a# b a# c#+ a# | b a# c#+ a# b a# c#+ a# | b a# c#+ a# b a# c#+ a# | @@ -338,11 +338,11 @@ FUNCTION m50_to_58 * // 57 58/1 - 2: | e+,g#+ $p_marcato g#,e+:4 $p e+,g#+:8 | d#+,f#+ - 3: | e,g# $p_marcato g#-,e:4 $p e,g#:8 | d#,f# + 2: | e+/g#+ $p_marcato g#/e+:4 $p e+/g#+:8 | d#+/f#+ + 3: | e/g# $p_marcato g#-/e:4 $p e/g#:8 | d#/f# 4: | e- f#- g#- a- | b- -:4 - 5: | b-,b:8 - - b-,b:pss | b-,b:8 - 6: | e,g# $p_marcato f#-,g#-:4 $p e,g#:8 | d#,f# + 5: | b-/b:8 - - b-/b:pss | b-/b:8 + 6: | e/g# $p_marcato f#-/g#-:4 $p e/g#:8 | d#/f# 11: | b+ a#+ c#+2 a#+ b+ a#+ c#+2 a#+ | b+:8 b:pss b:8 12: | b a# c#+ a# b a# c#+ a# | b:8 14: | e- f#- g#- a- | b- @@ -353,7 +353,7 @@ FUNCTION m50_to_58 // 58/2 3: b-:pss | 4: e-:pss | - 6: g#-,b-:pss | + 6: g#-/b-:pss | 11: b-:pss | 12: g#-:pss | 13: e-:pss | @@ -390,23 +390,23 @@ FUNCTION m75_to_80 // 75 76 77 0: | e+3:p8ss88 | g#+3:4 f#+3 | e+3:8 d#+3 e+3 c#+3 | 1: | e+2:p8ss88 | g#+2:4 f#+2 | e+2:8 d#+2 e+2 c#+2 | - 2: | $leg b,e+:2 | (m) c+:2 g#+:4. f#+:8 | c#+,e+ c+,d#+ c#+,e+ a,c#+ | - 3: | $leg b,e+:2 | (m) c+:2 g#+:4. f#+:8 | c#+,e+ c+,d#+ c#+,e+ a,c#+ | + 2: | $leg b/e+:2 | (m) c+:2 g#+:4. f#+:8 | c#+/e+ c+/d#+ c#+/e+ a/c#+ | + 3: | $leg b/e+:2 | (m) c+:2 g#+:4. f#+:8 | c#+/e+ c+/d#+ c#+/e+ a/c#+ | 4: | $leg b-:2 | c | c#:8 c c# a- | - 5: | $leg b-,b:2 | g# | a | - 6: | $leg e-,g#:2 | e-,g# | e-,e | - 7: | e,e+:p8ss88 | e,e+:2 | e,e+:p8888 | - 8: | $leg e-,e:1. | - p: | (q=3,m,tr=/32) to:2 (q=6) bd2,cc2:4 | + 5: | $leg b-/b:2 | g# | a | + 6: | $leg e-/g#:2 | e-/g# | e-/e | + 7: | e/e+:p8ss88 | e/e+:2 | e/e+:p8888 | + 8: | $leg e-/e:1. | + p: | (q=3,m,tr=/32) to:2 (q=6) bd2/cc2:4 | 10: | e-:p2tr32 | e-:p2tr32 | e-:p2tr32 | 11: | e+2:p8ss88 | (tr=/16) g#+2:4. f#+2:pss | e+2:pss d#+2:pss e+2:pss c#+2:pss | 12: | e+:p8ss88 | (tr=/16) g#+:4. f#+:pss | e+:pss d#+:pss e+:pss c#+:pss | - 13: | b-,b:p2tr16 | c,c+:p2tr16 | + 13: | b-/b:p2tr16 | c/c+:p2tr16 | { if ${start} == 75 - 13: $leg | c#,c#+:pss c,c+:pss c#,c#+:pss a-,a:pss | + 13: $leg | c#/c#+:pss c/c+:pss c#/c#+:pss a-/a:pss | } { elsif ${start} in 83;119;127 - 13: | c#,c#+:8 c,c+:8 c#,c#+:8 a-,a:8 | + 13: | c#/c#+:8 c/c+:8 c#/c#+:8 a-/a:8 | } 14: | e-:p2tr16 | e-:p2tr16 | e-:p2tr16 | 15: | e-2:p8888 | e-2:p8888 | e-2:p8888 | @@ -417,18 +417,18 @@ FUNCTION m75_to_80 // 78 79 80 0: | b+2:p8r8r | a+2:p8r8r | g#+2:p8r8r | 1: | b+:8 - g#+2 - | f#+2:p8r8r | e+2:p8r8r | - 2: | g#,e+:8 - e+,g#+ - | f#+,a+:p8r8r | e+,g#+:p8r8r | - 3: | g#,b:8 - g#,e+ - | a,f#+:p8r8r | g#,e+:p8r8r | - 4: | g#-,b-:8 - e-2,e- - | d#-2,d#:p8r8r | e-2,e-:p8r8r | + 2: | g#/e+:8 - e+/g#+ - | f#+/a+:p8r8r | e+/g#+:p8r8r | + 3: | g#/b:8 - g#/e+ - | a/f#+:p8r8r | g#/e+:p8r8r | + 4: | g#-/b-:8 - e-2/e- - | d#-2/d#:p8r8r | e-2/e-:p8r8r | 5: | b:p8r8r | a:p8r8r | b:p8r8r | - 6: | e-,g#:8 - g#-,e - | b-,f#:p8r8r | g#-,e:p8r8r | - 7: | e,e+:p8r8r | b-,b:p8r8r | e,b:p8r8r | - 8: | e-,e:p8r8r | d#-,d#:p8r8r | e-,e:p8r8r | + 6: | e-/g#:8 - g#-/e - | b-/f#:p8r8r | g#-/e:p8r8r | + 7: | e/e+:p8r8r | b-/b:p8r8r | e/b:p8r8r | + 8: | e-/e:p8r8r | d#-/d#:p8r8r | e-/e:p8r8r | p: | perc_all:p8r8r | perc_all:p8r8r | perc_all:p8r8r | 10: | e-:p8r8r | b-2:p8r8r | e-:p8r8r | 11: | b+:16 c#+2 b+ c#+2 b+ c#+2 d#+2 e+2 | a+ b+ a+ b+ a+ b+ c#+2 d#+2 | g#+ a+ g#+ a+ g#+ a+ b+ c#+2 | 12: | b:16 c#+ b c#+ b c#+ d#+ e+ | a b a b a b c#+ d#+ | g# a g# a g# a b c#+ | - 13: | g#-,g#:p8r8r | f#,a:p8r8r | b-,g#:p8r8r | + 13: | g#-/g#:p8r8r | f#/a:p8r8r | b-/g#:p8r8r | 14: | e-:p8r8r | d#-:p8r8r | e-:p8r8r | 15: | e-2:p8r8r | d#-2:p8r8r | e-2:p8r8r | END @@ -439,18 +439,18 @@ FUNCTION m81_to_82 // 81 82 0: | f#+2:p8r8r | f#+2:8 -:8. b+2:16 c#+3 d#+3 | 1: | f#+2:8 - e+2 - | d#+2:8 -:8. b+:16 c#+2 d#+2 | - 2: | c#+,f#+:8 - c#+,e+ - | d#+:8 - 3: | f#,e+:p8r8r | d#+:8 - 4: | a-2,a-:p8r8r | b-2,b-:8 - 5: | f#:p8r8r | b-,b:8 - 6: | e,f#:p8r8r | b-,f#:8 - 7: | e,e+:p8r8r | b-,b:8 - 8: | a-2,a-:p8r8r | b-2,b-:8 + 2: | c#+/f#+:8 - c#+/e+ - | d#+:8 + 3: | f#/e+:p8r8r | d#+:8 + 4: | a-2/a-:p8r8r | b-2/b-:8 + 5: | f#:p8r8r | b-/b:8 + 6: | e/f#:p8r8r | b-/f#:8 + 7: | e/e+:p8r8r | b-/b:8 + 8: | a-2/a-:p8r8r | b-2/b-:8 p: | perc_all:p8r8r | perc_all:8 10: | e-:p8r8r | b-2:8 11: | f#+:16 g#+ f#+ g#+ f#+ g#+ f#+ g#+ | f#+ g#+ f#+ d#+ b b+ c#+2 d#+2 | 12: | f#:16 g# f# g# f# g# f# g# | f# g# f# d# b- b c#+ d#+ | - 13: | c#,e:p8r8r | b-,d#:p8r8r | + 13: | c#/e:p8r8r | b-/d#:p8r8r | 14: | e-:p8r8r | b-2:8 15: | e-2:p8r8r | b-3:8 * @@ -464,18 +464,18 @@ CALL m89 FUNCTION m89 0: | f#+2:8 - b+2 - | 1: | c#+2:8 - d#+2 - | - 2: | c#+,f#+:8 - d#+,f#+ - | - 3: | f#,e+:8 - f#,d#+ - | - 4: | a-2,a-:8 - b-2,b- - | + 2: | c#+/f#+:8 - d#+/f#+ - | + 3: | f#/e+:8 - f#/d#+ - | + 4: | a-2/a-:8 - b-2/b- - | 5: | f#:8 - b- - | - 6: | e,f#:8 - b-,f# - | + 6: | e/f#:8 - b-/f# - | 7: | e:8 - b - | - 8: | a-2,a-:8 - b-2,b- - | + 8: | a-2/a-:8 - b-2/b- - | p: | perc_all:p8r8r | 10: | e-:8 - b-2 - | 11: | f#+:16 g#+ f#+ g#+ f#+ a+ g#+ f#+ | 12: | f#:16 g# f# g# f# a g# f# | - 13: | c#,e:8 - f#-,d# - | + 13: | c#/e:8 - f#-/d# - | 14: | e-:8 - b-2 - | 15: | e-2:8 - b-3 - | END @@ -484,17 +484,17 @@ END 0: | e+2 1: | e+2 2: | e+ -3: | g#,e+ +3: | g#/e+ 4: | e- 5: | g# -6: | g#-,e -7: | e,b +6: | g#-/e +7: | e/b 8: | e- p: | perc_all:8 10: | e- 11: | e+:8 - $leg $sf_accent (m) c#+:4+16 12: | e:8 -13: | g#-,e +13: | g#-/e 14: | e- 15: | e-2 CALL i_pizzicato_14 @@ -508,8 +508,8 @@ CALL d_all_staccato CALL m91_to_94(start=91) FUNCTION m91_to_94 // 91 92 93 94 - 4: | -:2 $leg | (m) c#:2+2+8 -:2 | g#-,c | - 6: | -:2 $leg | c+,e+:2 | b,d | c+:8 + 4: | -:2 $leg | (m) c#:2+2+8 -:2 | g#-/c | + 6: | -:2 $leg | c+/e+:2 | b/d | c+:8 { if ${start} == 91 11: | -:16 c+ c#+ c+ d#+ c#+ b a | } @@ -524,7 +524,7 @@ FUNCTION m91_to_94 11: | g#- c# e g# c#+ e+ d#+ c#+ | } 12: | g#:8 - a - | g# - - e | f# - - d# | e - 13: | c#,e:8 - c#,f# - | c#,e - - g#-,c# | g#-,c# - - g#-,d# | g#-,c# + 13: | c#/e:8 - c#/f# - | c#/e - - g#-/c# | g#-/c# - - g#-/d# | g#-/c# 14: | c#:8 - f#- - | c#- - - c#- | g#- - - g#-2 | c#- 15: | c#-:8 - f#-2 - | c#-2 - - c#-2 | g#-2 - - g#-3 | c#-2 * @@ -537,13 +537,13 @@ CALL m91_to_94(start=95) CALL m99(start=99) CALL m99(start=100) FUNCTION m99 - 2: | $leg c+,d#+:4. c#+,e+:8 | + 2: | $leg c+/d#+:4. c#+/e+:8 | { if ${start} == 99 3: | $leg (m) g#+:1+4 } 11: | d#+:16 c+ g# g# g# g#+ e+ c#+ | 12: | d#:8 - - e | - 13: | g#-,c:8 - - g#-,c# | + 13: | g#-/c:8 - - g#-/c# | 14: | g#-:8 - - g#- | 15: | g#-2:8 - - g#-2 | * @@ -551,12 +551,12 @@ END // m. 101-102 // 101 102 -2: | b,d#+:4 a#,c#+ | g#,b:8 +2: | b/d#+:4 a#/c#+ | g#/b:8 3: | -:4 g | g#:8 4: | d#:4 d#- | g#-:8 11: | d#+ b g# g# a# f## d# d# | g# f## g# g g# a g# f# | 12: | d#:8 - c# - | b- -13: | g#-,b-:8 - f##-,a#- - | d#-,g#- +13: | g#-/b-:8 - f##-/a#- - | d#-/g#- 14: | d#-:8 - d#- - | g#- 15: | d#-2:8 - d#-2 - | g#-2 * @@ -565,15 +565,15 @@ END CALL m103_to_104(start=103) FUNCTION m103_to_104 // 103 104 - 3: | g#-,e:4. b-,f#:8 | e,g#:4. f#,a:8 | + 3: | g#-/e:4. b-/f#:8 | e/g#:4. f#/a:8 | 11: | e:16 b- a#- b- e b- f# b- | g# e d# e g# e a f# | 12: | b-:8 - g#- b- | e - e f# | - 13: | e-,g#-:8 - - - | + 13: | e-/g#-:8 - - - | { if ${start} == 103 - 13: | g#-,b- + 13: | g#-/b- } { else - 13: | e-,g#- + 13: | e-/g#- } 14: e-:8 - - - | e-:p8r8r | 15: e-2:8 - - - | e-2:p8r8r | @@ -581,11 +581,11 @@ FUNCTION m103_to_104 END // m. 105 -3: | g#,b:4 g,a# | +3: | g#/b:4 g/a# | 6: | (m) c+:*2+2+8 11: | b g#+ f#+ e+ d#+ f#+ e+ c#+ | 12: | g# - a# - | -13: | g#-,b- - g-,c# - | +13: | g#-/b- - g-/c# - | 14: | e- - e- - | 15: | e-2 - e-2 - | * @@ -594,12 +594,12 @@ END CALL m106_to_108(start=106) FUNCTION m106_to_108 // 106 107 108 - 3: | g#,b:2 | f#,a | | + 3: | g#/b:2 | f#/a | | 4: | -:2 | d# | e | 6: | -:2 | g | | 11: | b c#+ b c#+ d#+ e+ f#+ g#+ | a b a b c#+ d#+ e+ f#+ | g# a g# a b c#+ d#+ e+ | 12: | b - g# - | a:p8r8r | g#:p8r8r | - 13: | g#-,e - b-,e - | b-,f#:p8r8r | b-,e:p8r8r | + 13: | g#-/e - b-/e - | b-/f#:p8r8r | b-/e:p8r8r | 14: | e-:p8r8r | b-2:p8r8r | e-:p8r8r | 15: | e-2:p8r8r | b-3:p8r8r | e-2:p8r8r | { if ${start} == 106 @@ -615,12 +615,12 @@ END // m. 109-110 // 109 110 -3: | f# | d#,f#:8 -4: | a-,c# | b-:8 +3: | f# | d#/f#:8 +4: | a-/c# | b-:8 6: | -:2 | b-:8 11: | f# g# f# g# f# g# f# g# | f# g# f# d# b- c c# d# | 12: | f#:p8r8r | f# -13: | e-,c#:p8r8r | f#-,d#:8 +13: | e-/c#:p8r8r | f#-/d#:8 14: | a-2:p8r8r | b-2 15: | a-3:p8r8r | b-3 * @@ -629,11 +629,11 @@ END CALL m103_to_104(start=111) // m. 113 -3: | g#,b:4 g,a# | +3: | g#/b:4 g/a# | 6: | (m) c+:*2+4 11: | b g#+ f#+ e+ d#+ f#+ e+ d#+ | 12: | g# - a# - | -13: | e-,g#- - g-,c# - | +13: | e-/g#- - g-/c# - | 14: | e- - e- - | 15: | e-2 - e-2 - | * @@ -645,12 +645,12 @@ CALL m106_to_108(start=114) // 117 118 0: | -:2 | -:16 $stac $ff e+2 f#+2 g#+2 a+2 b+2 c#+3 d#+3 | 1: | -:2 | -:16 $stac $ff e+ f#+ g#+ a+ b+ c#+2 d#+2 | -3: | f#:2 | e,g#:8 -4: | a-,c#:4 b- | e:8 +3: | f#:2 | e/g#:8 +4: | a-/c#:4 b- | e:8 6: | -:4 b- | e:8 11: | f# c#+ c+ c#+ d#+ c#+ a f# | e $stac $ff e+ f#+ g#+ a+ b+ c#+2 d#+2 | 12: | f#:8 - d# - | e:16 $stac $ff e f# g# a b c#+ d#+ | -13: | c#,e:8 - f#-,a- - | e-,g#- +13: | c#/e:8 - f#-/a- - | e-/g#- 14: | a-2:8 - b-2 - | e- 15: | a-3:8 - b-3 - | e-2 CALL d_all_staccato @@ -667,17 +667,17 @@ CALL m89 // 133 0: | e+2:8 b+2 e+2 1: | e+2:8 b+ e+2 2: | e+:p888 -3: | g#,e+:8 g#,b g#,e+ -4: | e-,b-:p888 -5: | b-,g#:p888 -6: | g#-,e:p888 -7: | e,b:p888 +3: | g#/e+:8 g#/b g#/e+ +4: | e-/b-:p888 +5: | b-/g#:p888 +6: | g#-/e:p888 +7: | e/b:p888 8: | e-:p888 p: | perc_all:p888 10: | e-:p888 11: | e+:8 b e+ 12: | e:8 b- e -13: | g#-,e:p888 +13: | g#-/e:p888 14: | e-:p888 15: | e-2:p888 @@ -697,16 +697,16 @@ CALL v_all_f 1: b+:pss | b+:p8ss8ss | e+2:8 f#+2 g#+2 b+:pss | b+:p8ss e+2 g#+2:pss | f#+2 d#+2 b+ b+:pss | b+:p8ss8ss | 2: b:pss | b:p8ss8ss | e+:8 f#+ g#+ b:pss | b:p8ss e+ g#+:pss | f#+ d#+ b b:pss | b:p8ss8ss | 3: b:pss | b:p8ss8ss | e+:8 f#+ g#+ b:pss | b:p8ss e+ g#+:pss | f#+ d#+ b b:pss | b:p8ss8ss | -4: g#-,e:pss | g#-,e:p8ss8ss | g#-,e:p888ss | g#-,e:p8ss8ss | b-2,f#:p888 b-:pss | g#-,e:p8ss8ss | -5: -:8 | b-,g#:pr8r8 | b-,g#:pr8r8 | b-,g#:pr8r8 | b-,g#:pr8r8 | b-,g#:pr8r8 | -6: e,g#:pss | e,g#:p8ss8ss | e,g#:p888ss | e,g#:p8ss8ss | b-,f#:p888 e,g#:pss | e,g#:p8ss8ss | -7: -:8 | e,b:pr8r8 | e,b:pr8r8 | e,b:pr8r8 | b-,b:pr8r8 | e,b:pr8r8 | -8: -:8 | e-,e:p8r8r | e-,e:p8r8r | e-,e:p8r8r | b-2,b-:p8r8r | e-,e:p8r8r | +4: g#-/e:pss | g#-/e:p8ss8ss | g#-/e:p888ss | g#-/e:p8ss8ss | b-2/f#:p888 b-:pss | g#-/e:p8ss8ss | +5: -:8 | b-/g#:pr8r8 | b-/g#:pr8r8 | b-/g#:pr8r8 | b-/g#:pr8r8 | b-/g#:pr8r8 | +6: e/g#:pss | e/g#:p8ss8ss | e/g#:p888ss | e/g#:p8ss8ss | b-/f#:p888 e/g#:pss | e/g#:p8ss8ss | +7: -:8 | e/b:pr8r8 | e/b:pr8r8 | e/b:pr8r8 | b-/b:pr8r8 | e/b:pr8r8 | +8: -:8 | e-/e:p8r8r | e-/e:p8r8r | e-/e:p8r8r | b-2/b-:p8r8r | e-/e:p8r8r | p: -:8 | perc_all:perc167 | perc_all:perc167 | perc_all:perc167 | perc_all:perc167 | perc_all:perc167 | 10: e-:pss | e-:p8ss8ss | e-:p888ss | e-:p8ss8ss | b-2:p888 e-:pss | e-:p8ss8ss | 11: b:pss | b:p8ss8ss | e+:8 f#+ g#+ b:pss | b:p8ss8ss | f#+ d#+ b b | b:p8ss8ss | -12: -:8 | b-,g#:p2tr16 | b-,g#:p2tr16 | b-,g#:p2tr16 | b-,f#:p2tr16 | b-,g#:p2tr16 | -13: -:8 | e-,e:p2tr16 | e-,e:p2tr16 | e-,e:p2tr16 | b-,d#:p2tr16 | e-,e:p2tr16 | +12: -:8 | b-/g#:p2tr16 | b-/g#:p2tr16 | b-/g#:p2tr16 | b-/f#:p2tr16 | b-/g#:p2tr16 | +13: -:8 | e-/e:p2tr16 | e-/e:p2tr16 | e-/e:p2tr16 | b-/d#:p2tr16 | e-/e:p2tr16 | 14: -:8 | e-:p8r8r | e-:p8r8r | e-:p8r8r | b-2:p8r8r | e-:p8r8r | 15: -:8 | e-2:p8r8r | e-2:p8r8r | e-2:p8r8r | b-3:p8r8r | e-2:p8r8r | @@ -715,17 +715,17 @@ p: -:8 | perc_all:perc167 | perc_all:perc167 | perc_all:perc167 0: | e+3 f#+3 g#+3 e+2:16 g#+2 | $leg b+2:4+16 $stac a+2:16 g#+2 f#+2 | 1: | e+2 f#+2 g#+2 e+:16 g#+ | $leg b+:4+16 $stac a+:16 g#+ f#+ | 2: | e+ f#+ g#+ e+:16 g#+ | $leg b+:4+16 $stac a+:16 g#+ f#+ | -3: | e+ f#+ g#+ e,e+:16 g#,g#+ | $leg b,b+:4+16 $stac a,a+:16 g#,g#+ f#,f#+ | -4: | g#-,e:p888 g#-,e:pss | f#-,d#:p8ss88 | -5: | b-,g#:pr8r8 | b-,g#:pr8r8 | -6: | e,g#:p888ss | b-,f#:p8ss88 | -7: | e,b:pr8r8 | b-,b:pr8r8 | -8: | e-,e:p8r8r | b-,b-2:p8r8r | +3: | e+ f#+ g#+ e/e+:16 g#/g#+ | $leg b/b+:4+16 $stac a/a+:16 g#/g#+ f#/f#+ | +4: | g#-/e:p888 g#-/e:pss | f#-/d#:p8ss88 | +5: | b-/g#:pr8r8 | b-/g#:pr8r8 | +6: | e/g#:p888ss | b-/f#:p8ss88 | +7: | e/b:pr8r8 | b-/b:pr8r8 | +8: | e-/e:p8r8r | b-/b-2:p8r8r | p: | perc_all:perc167 | perc_all:perc167 | 10: | e-:p888ss | b-2:p8ss88 | -11: | e+ f#+ g#+ e+,g#+:pss | $leg b+:4+16 $stac a+:16 g#+ f#+ | -12: | b-,g#:p2tr16 | d#,b:p2tr16 | -13: | e-,e:p2tr16 | b-,f#:p2tr16 | +11: | e+ f#+ g#+ e+/g#+:pss | $leg b+:4+16 $stac a+:16 g#+ f#+ | +12: | b-/g#:p2tr16 | d#/b:p2tr16 | +13: | e-/e:p2tr16 | b-/f#:p2tr16 | 14: | e-:p8r8r | b-2:p8r8r | 15: | e-2:p8r8r | b-3:p8r8r | @@ -736,24 +736,24 @@ FUNCTION m174_to_177 // 174 175 176 177 0: | e+2:8. a+2:16 g#+2:8. c#+3:16 | b+2 c#+3 d#+3 e+3 d#+3 e+3 f#+3 g#+3 | a+3:1 | 1: | e+:8. a+:16 g#+:8. c#+2:16 | b+ c#+2 d#+2 e+2 d#+2 e+2 f#+2 g#+2 | a+2:1 | - 2: | e+,g#+:1 | $stac | f#+,a+:8 f#+,a+:4 f#+,a+:8+8 f#+,a+:8 f#+,a+:4 | - 3: | g#,e+:1 | $stac | a,f#+:8 a,f#+:4 a,f#+:8+8 a,f#+:8 a,f#+:4 | + 2: | e+/g#+:1 | $stac | f#+/a+:8 f#+/a+:4 f#+/a+:8+8 f#+/a+:8 f#+/a+:4 | + 3: | g#/e+:1 | $stac | a/f#+:8 a/f#+:4 a/f#+:8+8 a/f#+:8 a/f#+:4 | 4: | e-:8. e:16 e:4+8 $stac b-:8 g#- e- | b-2 c- c#- d- | d#- f#- b- b-2 | - 5: | b-,g#:8. b-,g#:16 b-,g#:4+8 $stac b-,g#:p888 | a:4 a | a a | - 6: | e,g#:8. e,g#:16 e,g#:4+8 $stac e,g#:p888 | f#,a:4 f#,a | f#,a f#,a | - 7: | e,b:8. e,b:16 e,b:4+8 $stac e,b:p888 | -:8 f#+:4 f#+:8+8 f#+:4 f#+:8 | + 5: | b-/g#:8. b-/g#:16 b-/g#:4+8 $stac b-/g#:p888 | a:4 a | a a | + 6: | e/g#:8. e/g#:16 e/g#:4+8 $stac e/g#:p888 | f#/a:4 f#/a | f#/a f#/a | + 7: | e/b:8. e/b:16 e/b:4+8 $stac e/b:p888 | -:8 f#+:4 f#+:8+8 f#+:4 f#+:8 | { if ${start} in 174;198 - 8: | e-,e:2 | $stac e:8 + 8: | e-/e:2 | $stac e:8 } { else - 8: | e-,e:8. e:16 e:4+8 + 8: | e-/e:8. e:16 e:4+8 } - 8: $stac b-:8 g#- e- | b-2,b- c-,c c#-,c# d-,d | d#-,d# f#-,f# b-2,b- b-2,b- | + 8: $stac b-:8 g#- e- | b-2/b- c-/c c#-/c# d-/d | d#-/d# f#-/f# b-2/b- b-2/b- | p: | perc_all:perc167 | perc_all:perc167 | to:8 perc_all:p888 | perc_all:p8888 | 10: | e-:p2tr32 | $stac e-:p2tr32 | b-2:p8888 | b-2:p8888 | 11: | e+:16 f#+ g#+ a+ g#+ a+ b+ c#+2 | b+ c#+2 d#+2 e+2 d#+2 e+2 f#+2 g#+2 | $stac a+2:p2tr16 | a+2:p2tr16 | 12: | e:16 f# g# a g# a b c#+ | b c#+ d#+ e+ d#+ e+ f#+ g#+ | $stac a+:p2tr16 | a+:p2tr16 | - 13: | $stac e,g#:p2tr16 | e,g#:p2tr16 | f#,f#+:p2tr16 | f#,f#+:p2tr16 | + 13: | $stac e/g#:p2tr16 | e/g#:p2tr16 | f#/f#+:p2tr16 | f#/f#+:p2tr16 | 14: | e-:8. e:16 e:4+8 $stac b-:8 g#- e- | b-2 c- c#- d- | d#- f#- b- b-2 | 15: | e-2:8. e-:16 e-:4+8 $stac b-2:8 g#-2 e-2 | b-3 c-2 c#-2 d-2 | d#-2 f#-2 b-2 b-3 | END @@ -769,24 +769,24 @@ FUNCTION m182_to_183 // 182 183 0: | g#+3:8 - d#+3 - | e+3 - f#+3 - | 1: | g#+2:8 - d#+2 - | e+2 - f#+2 - | - 2: | e+,g#+:8 - c+,g#+ - | c#+,e+ - d#+,b+ - | - 3: | g#,e+:8 - c#,d#+ - | c#+,e+ - d#+,f#+ - | - 4: | e-,e:8 - g#-2,g#- - | c#-,c# - b-2,b- - | + 2: | e+/g#+:8 - c+/g#+ - | c#+/e+ - d#+/b+ - | + 3: | g#/e+:8 - c#/d#+ - | c#+/e+ - d#+/f#+ - | + 4: | e-/e:8 - g#-2/g#- - | c#-/c# - b-2/b- - | 5: | g#:p8r8r | g#:8 - b - | - 6: | e,g#:8 - f#,g# - | e,g# - b-,f# - | + 6: | e/g#:8 - f#/g# - | e/g# - b-/f# - | { if ${start} in 184;208 - 7: | e+,g#:8 + 7: | e+/g#:8 } { else 7: | e+:8 } 7: - g# - | e+ - b - | - 8: | e-,e:8 - g#-2,g#- - | c#-,c# - b-2,b- - | + 8: | e-/e:8 - g#-2/g#- - | c#-/c# - b-2/b- - | p: | perc_all:p8r8r | perc_all:p8r8r | 10: | e-:p8r8r | e-:8 - b-2 - | 11: | g#+2:pssss $leg g#+2:16 $stac d#+2:psss | $leg d#+2 $stac e+2:psss $leg e+2 $stac f#+2:psss | 12: | g#+:pssss $leg g#+:16 $stac d#+:psss | $leg d#+ $stac e+:psss $leg e+ $stac f#+:psss | - 13: | e,e+:8 - g#,c+:p4tr16 | e,c#+ - d#,b:p4tr16 | + 13: | e/e+:8 - g#/c+:p4tr16 | e/c#+ - d#/b:p4tr16 | 14: | e-:8 - g#-2 - | c#- - b-2 - | 15: | e-2:8 - g#-3 - | c#-2 - b-3 - | END @@ -799,16 +799,16 @@ FUNCTION m186_to_197 // 186 - 187 188 - 189 190 - 191 0: | g+3:2+8 $stac $f e+3:16 e+3 c+3:8 e+3 | $sf $leg g#+3:2+8 $stac $f e+3:16 e+3 b+2:8 e+3 | $sf $leg g#+3:2+8 $stac $f f+3:16 f+3 c#+3:8 f+3 | 1: | g+2:2+8 $stac $f e+2:16 e+2 c+2:8 e+2 | $sf $leg g#+2:2+8 $stac $f e+2:16 e+2 b+:8 e+2 | $sf $leg g#+2:2+8 $stac $f f+2:16 f+2 c#+2:8 f+2 | - 2: | c+,c+2:2+8 -:4+8 | $sf $leg e+,b+:2+8 -:4+8 | $sf $leg f+,g#+:2+8 -:4+8 | - 3: | c+,g+:2+8 $stac $f e+:16 e+ c+:8 e+ | $sf $leg g#+:2+8 $stac $f e+:16 e+ b:8 e+ | $sf $leg g#+:2+8 $stac $f f+:16 f+ c#+:8 f+ | - 4: | e-2,e-:2+8 -:4+8 | $sf $leg e-2,e-:2+8 -:4+8 | $sf $leg c#-,c#:2+8 -:4+8 | - 5: | g-,g:2+8 -:4+8 | $sf $leg b-,b:2+8 -:4+8 | $sf $leg g#:2+8 -:4+8 | - 6: | e-,e:2+8 -:4+8 | $sf $leg e-,g#:2+8 -:4+8 | $sf $leg f,g#:2+8 -:4+8 | - 7: | e,e+:2+8 -:4+8 | $sf $leg g#,e+:2+8 -:4+8 | $sf $leg b:2+8 -:4+8 | - 8: | e-,e:2+8 -:4+8 | $sf $leg e-,e:2+8 -:4+8 | $sf $leg c#-,c#:2+8 -:4+8 | + 2: | c+/c+2:2+8 -:4+8 | $sf $leg e+/b+:2+8 -:4+8 | $sf $leg f+/g#+:2+8 -:4+8 | + 3: | c+/g+:2+8 $stac $f e+:16 e+ c+:8 e+ | $sf $leg g#+:2+8 $stac $f e+:16 e+ b:8 e+ | $sf $leg g#+:2+8 $stac $f f+:16 f+ c#+:8 f+ | + 4: | e-2/e-:2+8 -:4+8 | $sf $leg e-2/e-:2+8 -:4+8 | $sf $leg c#-/c#:2+8 -:4+8 | + 5: | g-/g:2+8 -:4+8 | $sf $leg b-/b:2+8 -:4+8 | $sf $leg g#:2+8 -:4+8 | + 6: | e-/e:2+8 -:4+8 | $sf $leg e-/g#:2+8 -:4+8 | $sf $leg f/g#:2+8 -:4+8 | + 7: | e/e+:2+8 -:4+8 | $sf $leg g#/e+:2+8 -:4+8 | $sf $leg b:2+8 -:4+8 | + 8: | e-/e:2+8 -:4+8 | $sf $leg e-/e:2+8 -:4+8 | $sf $leg c#-/c#:2+8 -:4+8 | p: | perc_all:perc186_to_187 | perc_all:perc186_to_187 | perc_all:perc186_to_187 | 10: | e-:p2tr32 $stac $f e-:8 -:4+8 | $sf $leg e-:p2tr32 $stac $f e-:8 -:4+8 | $sf $leg e-:p2tr32 $stac $f e-:8 -:4+8 | - 13: | e,c+:p2tr16 $stac $f e,c+:8 -:4+8 | $sf $leg e,b:p2tr16 $stac $f e,b:8 -:4+8 | $sf $leg f,b:p2tr16 $stac $f f,b:8 -:4+8 | + 13: | e/c+:p2tr16 $stac $f e/c+:8 -:4+8 | $sf $leg e/b:p2tr16 $stac $f e/b:8 -:4+8 | $sf $leg f/b:p2tr16 $stac $f f/b:8 -:4+8 | 14: | c:p2tr16 $stac $f c:8 -:4+8 | $sf $leg b-:p2tr16 $stac $f b-:8 -:4+8 | $sf $leg c#:p2tr16 $stac $f c#:8 -:4+8 | 15: | e-2:8 $stac $f e-2:p8888 -:4+8 | $sf $leg e-2:8 $stac $f e-2:p8888 -:4+8 | $sf $leg c#-2:8 $stac $f c#-2:p8888 -:4+8 | CALL d_all_legato @@ -816,16 +816,16 @@ FUNCTION m186_to_197 // 192 - 193 194 - 195 196 - 197 0: | a#+3:2+8 $stac $f g+3:16 g+3 e+3:8 g+3 | b+3 a#+3 a+3 g#+3 f#+3 e+3 d#+3 c#+3 | b+3 a#+3 a+3 g#+3 f#+3 e+3 d#+3 f#+3 | 1: | a#+2:2+8 $stac $f g+2:16 g+2 e+2:8 g+2 | b+2 a#+2 a+2 g#+2 f#+2 e+2 d#+2 c#+2 | b+2 a#+2 a+2 g#+2 f#+2 e+2 d#+2 f#+2 | - 2: | g+,bb+:2+8 $f -:4+8 | $leg g#+,b+:2 e+,g#+ | $leg f#+,a+ d#+,f#+ - 3: | a#,a#+:2+8 $stac $f g,g+:pss e,e+:8 g,g+ | $leg b,e+:2+2 | $leg a,d#+ - 4: | c-,c:2+8 $f -:4+8 | $stac b-2,b:p8888 b-2,b:p8888 | b-2,b:p8888 | b-2,b:p8888 | - 5: | g:2+8 $f -:4+8 | b-,b:2+2 | b-,a - 6: | e-,e:2+8 $f -:4+8 | e,g#:2+2 | b-,f# - 7: | e,e+:2+8 $f -:4+8 | g#,e+:2+2 | b-,b - 8: | c-,c:2+8 $f -:4+8 | b-2,b-:2+2 | b-2,b- + 2: | g+/bb+:2+8 $f -:4+8 | $leg g#+/b+:2 e+/g#+ | $leg f#+/a+ d#+/f#+ + 3: | a#/a#+:2+8 $stac $f g/g+:pss e/e+:8 g/g+ | $leg b/e+:2+2 | $leg a/d#+ + 4: | c-/c:2+8 $f -:4+8 | $stac b-2/b:p8888 b-2/b:p8888 | b-2/b:p8888 | b-2/b:p8888 | + 5: | g:2+8 $f -:4+8 | b-/b:2+2 | b-/a + 6: | e-/e:2+8 $f -:4+8 | e/g#:2+2 | b-/f# + 7: | e/e+:2+8 $f -:4+8 | g#/e+:2+2 | b-/b + 8: | c-/c:2+8 $f -:4+8 | b-2/b-:2+2 | b-2/b- p: | perc_all:perc186_to_187 $f | perc_all:perc194 perc_all:perc194 | perc_all:perc194 | perc_all:perc194 | 10: | e-:p2tr32 $stac $f e-:8 -:4+8 | b-2:p2tr32 b-2:p2tr32 | b-2:p2tr32 | b-2:p2tr32 | - 13: | g,e+:p2tr16 $stac $f g,e+:8 -:4+8 | g#,e+:p2tr16 g#,e+:p2tr16 | d#,b:p2tr16 | d#,b:p2tr16 | + 13: | g/e+:p2tr16 $stac $f g/e+:8 -:4+8 | g#/e+:p2tr16 g#/e+:p2tr16 | d#/b:p2tr16 | d#/b:p2tr16 | 14: | c:p2tr16 $stac $f c:8 -:4+8 | b-:p2tr16 b-:p2tr16 | b-2:p2tr16 | b-2:p2tr16 | 15: | c-2:8 $stac $f c-2:p8888 -:4+8 | b-3:p8888 b-3:p8888 | b-3:p8888 | b-3:p8888 | @@ -869,18 +869,18 @@ CALL d_all_legato // 222 223 224 225 0: | e+3:16 d#+3 e+3 d#+3 e+3:8 $stac b+2:pss | b+2:p8ss8ss | e+3:8 f#+3 g#+3 $ff b+2:pss | b+2:p8ss8ss | 1: | e+2:16 d#+2 e+2 d#+2 e+2:8 $stac b+:pss | b+:p8ss8ss | e+3:8 f#+3 g#+3 $ff b+:pss | b+:p8ss8ss | -2: | e+,g#+:4+8 $stac b:pss | b:p8ss8ss | e+:8 f#+ g#+ $ff b:pss | b:p8ss8ss | -3: | g#,e+:4+8 $stac b:pss | b:p8ss8ss | e+:8 f#+ g#+ $ff b:pss | b:p8ss8ss | +2: | e+/g#+:4+8 $stac b:pss | b:p8ss8ss | e+:8 f#+ g#+ $ff b:pss | b:p8ss8ss | +3: | g#/e+:4+8 $stac b:pss | b:p8ss8ss | e+:8 f#+ g#+ $ff b:pss | b:p8ss8ss | 4: | e-:4+8 $stac b-:pss | b-:p8ss8ss | e:8 f# g# $ff b-:pss | b-:p8ss8ss | -5: | b-,g#:4+8 -:8 | | | | -6: | g#-,e:4+8 $stac b-:pss | b-:p8ss8ss | e:8 f# g# $ff b-:pss | b-:p8ss8ss | -7: | e,b:4+8 -:8 | | | | +5: | b-/g#:4+8 -:8 | | | | +6: | g#-/e:4+8 $stac b-:pss | b-:p8ss8ss | e:8 f# g# $ff b-:pss | b-:p8ss8ss | +7: | e/b:4+8 -:8 | | | | 8: | e-:4+8 -:8 | | | | p: | perc_all:4 10: | e-:p4tr32 e-:8 11: | e+:16 d#+ e+ d#+ e+:8 -:8 | -:2 | -:4 -:8 $stac $ff b:pss | b:p8ss8ss | 12: | e:16 d# e d# e:8 -:8 | -:2 | -:4 -:8 $stac $ff b:pss | b:p8ss8ss | -13: | e,g#:p4tr16 e,g#:8 -:8 | -:2 | -:4 -:8 $stac $ff b-:pss | b-:p8ss8ss | +13: | e/g#:p4tr16 e/g#:8 -:8 | -:2 | -:4 -:8 $stac $ff b-:pss | b-:p8ss8ss | 14: | e-:16 d#- e- d#- e-:8 -:8 | -:2 | -:4 -:8 $stac $ff b-:pss | b-:p8ss8ss | 15: | e-2:8 $stac @@ -903,18 +903,18 @@ CALL v_all_sf // 230 231 0: | $leg d#+3:2+2 | 1: | $leg d#+2:2+2 | -2: | $leg d#+,b+:2+2 | -3: | $leg d#+,f#+:2+2 | -4: | $leg b-2,d#:2+2 | -5: | $leg b-,b:2+2 | -6: | $leg b-,f#:2+2 | +2: | $leg d#+/b+:2+2 | +3: | $leg d#+/f#+:2+2 | +4: | $leg b-2/d#:2+2 | +5: | $leg b-/b:2+2 | +6: | $leg b-/f#:2+2 | 7: | $leg b:2+2 | -8: | $leg b-2,b-:2+2 | +8: | $leg b-2/b-:2+2 | p: | perc_all:perc167 | $ff perc_all:perc167 | 10: | $leg b-2:p2tr32 | $ff b-2:p2tr32 | 11: | b:16 $ff c+ c#+ d+ d#+ e+ f+ f#+ | g+ g#+ a+ a#+ b+ c+2 c#+2 d#+2 | 12: | b-:16 $ff c c# d d# e f f# | g g# a a# b c+ c#+ d#+ | -13: | f#,a:p2tr16 | $ff f#,a:p2tr16 | +13: | f#/a:p2tr16 | $ff f#/a:p2tr16 | 14: | b-:p2tr16 | $ff b-:p2tr16 | 15: | b-3:8 $ff b-3:p888 | b-3:p8888 | CALL v_all_ff @@ -926,17 +926,17 @@ CALL d_all_staccato { q=2 0: e+3:8 d#+3 1: e+3:8 d#+3 - 2: e+,g#+:8 d#+,b+ - 3: e+,g#+:8 d#+,a+ - 4: e-,e:8 b-2,b- - 5: b-,b:8 b-,b - 6: e,g#:8 b-,f# + 2: e+/g#+:8 d#+/b+ + 3: e+/g#+:8 d#+/a+ + 4: e-/e:8 b-2/b- + 5: b-/b:8 b-/b + 6: e/g#:8 b-/f# 7: e:8 b - 8: e-,e:8 b-2,b- + 8: e-/e:8 b-2/b- 10: e-:8 b-2 11: e+2:16 d#+2 f#+2 d#+2 12: e+:16 d#+ f#+ d#+ - 13: e,g#:8 f#,a + 13: e/g#:8 f#/a 14: e-:8 b-2 15: e-2:8 b-3 } @@ -951,29 +951,29 @@ CALL d_all_staccato 11: | e+2:8 e+2:pss4tr16 | e+2:8 b+:pss4tr16 | b+ g#+:pss4tr16 | g#+ e+:pss4tr16 | { m // 236-244/1 - 2: | $leg e+,g#+:*4+8 - 3: | $leg b,g#+:*4+8 + 2: | $leg e+/g#+:*4+8 + 3: | $leg b/g#+:*4+8 // 236-239 240-241/1 241/2-242/1 242/2-243/1 243/2-244/1 - 4: | $leg e-2,e-:*2 | e-2,e-:8 e-,e:4.+8 b-2,b- g#-2,g#- e-2,e- - 8: | $leg e-,e:*2 | -:8 e-,e:4. -:8 b-2,b-:4. -:8 g#-2,g#-:4. -:8 e-:4.+8 + 4: | $leg e-2/e-:*2 | e-2/e-:8 e-/e:4.+8 b-2/b- g#-2/g#- e-2/e- + 8: | $leg e-/e:*2 | -:8 e-/e:4. -:8 b-2/b-:4. -:8 g#-2/g#-:4. -:8 e-:4.+8 } { q=8 // 236-243 - 5: | -:8 b-,b:4. | - 6: | -:8 e-,g#:4. | - 7: | -:8 g#,e+:4. | + 5: | -:8 b-/b:4. | + 6: | -:8 e-/g#:4. | + 7: | -:8 g#/e+:4. | p: | perc_all:perc236 | 10: | e-:p2tr32 | } { q=4 // 236-239 - 12: | g#,e+:p2tr16 | - 13: | e,b:p2tr16 | + 12: | g#/e+:p2tr16 | + 13: | e/b:p2tr16 | 14: | e-:p2tr16 | 15: | e-2:p8888 | } { q=4 // 240-243 - 12: | b-,g#:p2tr16 | - 13: | e-,e:p2tr16 | + 12: | b-/g#:p2tr16 | + 13: | e-/e:p2tr16 | } // 240 241 242 243 @@ -990,8 +990,8 @@ CALL d_all_staccato // 244 245 246 247 248 0: | e+2:8 -:8+4 | -:2 | -:8 b+ e+2 b+ | g#+2 e+2 b+2 g#+2 | e+3:4 -:8 e+3:pss | 1: | e+:8 -:8+4 | -:2 | -:8 b e+ b | g#+ e+ b+ g#+ | e+2:4 -:8 e+2:pss | -2: | -:2 | -:2 | -:8 b e+ b | g#+ e+ b+ g#+ | e+:4 -:8 g#+,b+:pss | -3: | -:8 b- e b- | g# e b g# | e+ b e+ b | g#+ e+ b+ g#+ | e+:4 -:8 b,g#+:pss | +2: | -:2 | -:2 | -:8 b e+ b | g#+ e+ b+ g#+ | e+:4 -:8 g#+/b+:pss | +3: | -:8 b- e b- | g# e b g# | e+ b e+ b | g#+ e+ b+ g#+ | e+:4 -:8 b/g#+:pss | 4: | -:8 b-2 e- b-2 | g#- e- b- g#- | e b-2 e- b-2 | g#- e- b- g#- | e:4 6: | -:8 b- e b- | g# e b g# | e b- e b- | g# e b g# | e:4 7: | -:8 b- e b- | g# e b g# | e b e+ b | g#+ e+ b g# | e:4 @@ -999,8 +999,8 @@ CALL d_all_staccato p: | perc_all:8 -:8+4 10: | e-:8 -:8+4 | -:2 | -:8 b-2:p888 | b-2:p8888 | e-:4 -:8 e-:pss | 11: | e:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:8 b:16 b e+ e+ b b | g#+ g#+ e+ e+ b+ b+ g#+ g#+ | e+2:4 -:8 e+2:pss | -12: | b-,g#:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:8 b:16 b e+ e+ b b | g#+ g#+ e+ e+ b+ b+ g#+ g#+ | e+2:4 -:8 b,g#+:pss | -13: | e-,e:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:4 -:8 g#,e+:pss | +12: | b-/g#:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:8 b:16 b e+ e+ b b | g#+ g#+ e+ e+ b+ b+ g#+ g#+ | e+2:4 -:8 b/g#+:pss | +13: | e-/e:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:8 b-:16 b- e e b- b- | g# g# e e b b g# g# | e+:4 -:8 g#/e+:pss | 14: | e-:8 -:8+4 | -:2 | -:8 b-2 e- b-2 | g#- e- b- g#- | e:4 -:8 e:pss | 15: | e-2:8 -:8+4 | -:2 | -:8 b-3 e-2 b-3 | g#-2 e-2 b-2 g#-2 | e-:4 -:8 e-:pss | * @@ -1009,18 +1009,18 @@ p: | perc_all:8 -:8+4 // 249 250 251 252 0: | e+3:p8888 | e+3:4 -:8. e+3:16 | e+3:4 -:8. e+2:16 | $leg e+2:2 | 1: | e+2:p8888 | e+2:4 -:8. e+2:16 | e+2:4 -:8. e+:16 | $leg e+:2 | -2: | g#+,b+:p8888 | g#+,b+:4 -:8. e+,g#+:16 | e+,g#+:4 -:8. g#,e+:16 | $leg g#,e+:2 | -3: | b,g#+:p8888 | b,g#+:4 -:8. g#+,e+:16 | g#,e+:4 -:8. g#,e+:16 | $leg g#,e+:2 | -4: | e:8 b- g#- b- | e-:4 -:8. e-2,e-:16 | e-2,e-:4 -:8. e-2,e-:16 | $leg e-2,e-:2 | -5: | b-,b:p8888 | b-,b:4 -:8. b-,b:16 | b-,b:4 -:8. b-:16 | $leg b-:2 | -6: | e,g#:p8888 | e,g#:4 -:8. e,g#:16 | e,g#:4 -:8. g#-,e:16 | $leg g#-,e:2 | -7: | g#,e+:p8888 | g#,e+:4 -:8. g#,e+:16 | g#,e+:4 -:8. e,b:16 | $leg e,b:2 | -8: | e:8 b- g#- b- | e-:4 -:8. e-,e:16 | e-,e:4 -:8. e-:16 | $leg e-:2 | +2: | g#+/b+:p8888 | g#+/b+:4 -:8. e+/g#+:16 | e+/g#+:4 -:8. g#/e+:16 | $leg g#/e+:2 | +3: | b/g#+:p8888 | b/g#+:4 -:8. g#+/e+:16 | g#/e+:4 -:8. g#/e+:16 | $leg g#/e+:2 | +4: | e:8 b- g#- b- | e-:4 -:8. e-2/e-:16 | e-2/e-:4 -:8. e-2/e-:16 | $leg e-2/e-:2 | +5: | b-/b:p8888 | b-/b:4 -:8. b-/b:16 | b-/b:4 -:8. b-:16 | $leg b-:2 | +6: | e/g#:p8888 | e/g#:4 -:8. e/g#:16 | e/g#:4 -:8. g#-/e:16 | $leg g#-/e:2 | +7: | g#/e+:p8888 | g#/e+:4 -:8. g#/e+:16 | g#/e+:4 -:8. e/b:16 | $leg e/b:2 | +8: | e:8 b- g#- b- | e-:4 -:8. e-/e:16 | e-/e:4 -:8. e-:16 | $leg e-:2 | p: | perc_all:perc167 | perc_all:4 -:4 | perc_all:4 -:4 | perc_all:2 | 10: | e-:p8888 | e-:4 -:8. e-:16 | e-:4 -:8. e-:16 | $leg e-:p2tr32 | -11: | e+2:p8888 | e+2:4 -:8. e+2:16 | e+2:4 -:8. g#-,e:16 | $leg g#-,e:2 | -12: | b,g#+:p8888 | b,g#+:4 -:8. b,g#+:16 | b,g#+:4 -:8. b-:16 | $leg b-:2 | -13: | g#,e+:p8888 | g#,e+:4 -:8. e,b:16 | e,b:4 -:8. g#-,e:16 | $leg g#-,e:2 | +11: | e+2:p8888 | e+2:4 -:8. e+2:16 | e+2:4 -:8. g#-/e:16 | $leg g#-/e:2 | +12: | b/g#+:p8888 | b/g#+:4 -:8. b/g#+:16 | b/g#+:4 -:8. b-:16 | $leg b-:2 | +13: | g#/e+:p8888 | g#/e+:4 -:8. e/b:16 | e/b:4 -:8. g#-/e:16 | $leg g#-/e:2 | 14: | e:8 b- g#- b- | e-:4 -:8. e-:16 | e-:4 -:8. e-:16 | $leg e-:2 | 15: | e-:8 b-2 g#-2 b-2 | e-2:4 -:8. e-2:16 | e-2:4 -:8. e-2:16 | $leg e-2:2 | @@ -1310,22 +1310,22 @@ END // define percussion patterns //////////////////////////////////////////////////////////////////////////// -PATTERN perc167 // 2=to, 0,1=bd2,cc2 - : | (m,tr=32) 2:2 (q=2) 0,1:4 | +PATTERN perc167 // 2=to, 0/1=bd2/cc2 + : | (m,tr=32) 2:2 (q=2) 0/1:4 | END PATTERN perc186_to_187 - : | (m,tr=/32) 2:2 0,1:4 - $f | 0,1,2:8 -:4+8 | + : | (m,tr=/32) 2:2 0/1:4 - $f | 0/1/2:8 -:4+8 | END PATTERN perc194 - : | (m,tr=/32) 2:2 0,1:4 0,1 | + : | (m,tr=/32) 2:2 0/1:4 0/1 | END PATTERN perc232 - : | (m,tr=/32) 2:2 (q=4) 0,1:8 | + : | (m,tr=/32) 2:2 (q=4) 0/1:8 | END PATTERN perc236 - : | (m,tr=/32) 2:2 0,1:4 - | + : | (m,tr=/32) 2:2 0/1:4 - | END diff --git a/examples/vivaldi_4_seasons_summer_3-lowlevel.midica b/examples/vivaldi_4_seasons_summer_3-lowlevel.midica index 91a03d4..91fee73 100644 --- a/examples/vivaldi_4_seasons_summer_3-lowlevel.midica +++ b/examples/vivaldi_4_seasons_summer_3-lowlevel.midica @@ -360,7 +360,7 @@ $c f+2 /16 CALL c0m41part // m. 44 -$c d,a+,e+2 /4 +$c d/a+/e+2 /4 $c - /16 $c d+ /16 q=2 $c f+ /16 q=2 @@ -397,7 +397,7 @@ $c bb+ /16 CALL c0m45part // m. 48-50 -$c d,d+,a+ /4 +$c d/d+/a+ /4 $c - /16 $c a+2 /16 q=2 $c g+2 /16 q=2 @@ -869,7 +869,7 @@ CALL c0m109part CALL c0m110 // m. 113-114 -$c g,d+ /16 m // second voice (m. 113) +$c g/d+ /16 m // second voice (m. 113) FUNCTION c0m113_114 // m. 113 $c g- /16 @@ -2125,33 +2125,33 @@ CALL c0m6_9 CALL rest_full_measure // m. 11-20 -$c g-,d /4 q=6 // m. 11-12 -$c g-,eb /4 q=6 // m. 13-14 -$c g-,c,g /4 q=6 // m. 14-16 -$c bb-,d /4 q=3 // m. 17 -$c bb-,d,g /4 q=3 // m. 18 -$c d,g,bb /4 q=3 // m. 19 +$c g-/d /4 q=6 // m. 11-12 +$c g-/eb /4 q=6 // m. 13-14 +$c g-/c/g /4 q=6 // m. 14-16 +$c bb-/d /4 q=3 // m. 17 +$c bb-/d/g /4 q=3 // m. 18 +$c d/g/bb /4 q=3 // m. 19 CALL c2m20 // m. 21-28 { q=2 - $c f#,a,d+ /4 q=6 // m. 21-22 == 25-26 - $c d,g,bb /4 q=3 // m. 23 == 27 - $c d,f#,a /4 q=3 // m. 24 == 28 + $c f#/a/d+ /4 q=6 // m. 21-22 == 25-26 + $c d/g/bb /4 q=3 // m. 23 == 27 + $c d/f#/a /4 q=3 // m. 24 == 28 } // m. 29-37 -$c bb-,d,g /2. q=3 // m. 29-31 -$c d,g,b /2. // m. 32 -$c eb,g,c+ /2. // m. 33 -$c e,a,c#+ /2. // m. 34 -$c f,a,d+ /2. // m. 35 -$c e,a,d+ /2. // m. 36 -$c e,a,c#+ /2. // m. 37 +$c bb-/d/g /2. q=3 // m. 29-31 +$c d/g/b /2. // m. 32 +$c eb/g/c+ /2. // m. 33 +$c e/a/c#+ /2. // m. 34 +$c f/a/d+ /2. // m. 35 +$c e/a/d+ /2. // m. 36 +$c e/a/c#+ /2. // m. 37 // m. 38-41 { q=2 - $c f,a,d+ /4 + $c f/a/d+ /4 $c - /2 CALL rest_full_measure } @@ -2169,109 +2169,109 @@ CALL rest_full_measure q=11 } // m. 55-66 -$c f,a /2+/8 m // m. 55 +$c f/a /2+/8 m // m. 55 $c - /2 $c d+ /8 $c - /8 -$c d,g,bb /2+/8 // m. 56 +$c d/g/bb /2+/8 // m. 56 $c - /8 -$c e,g,c+ /2+/8 // m. 57 +$c e/g/c+ /2+/8 // m. 57 $c - /8 -$c c,f,a /2+/8 // m. 58 +$c c/f/a /2+/8 // m. 58 $c - /8 -$c d,f,a /2+/8 // m. 59 +$c d/f/a /2+/8 // m. 59 $c - /8 -$c bb-,eb,g /2+/8 // m. 60 +$c bb-/eb/g /2+/8 // m. 60 $c - /8 -$c c,f,ab /2+/8 // m. 61 +$c c/f/ab /2+/8 // m. 61 $c - /8 -$c d,g,d+ /2+/8 // m. 62 +$c d/g/d+ /2+/8 // m. 62 $c - /8 -$c d,f,b /2+/8 // m. 63 +$c d/f/b /2+/8 // m. 63 $c - /8 { q=3 // m. 64-66 - $c eb,g,c+ /2+/8 + $c eb/g/c+ /2+/8 $c - /8 } // m. 67-70/1 -$c g,c+ /2. // m. 67 -$c d,ab,c+ /2. // m. 68 -$c d,g,c+ /2 // m. 69/1 -$c d,g,b /4 // m. 69/2 -$c eb,g,c+ /16 // m. 70/1 +$c g/c+ /2. // m. 67 +$c d/ab/c+ /2. // m. 68 +$c d/g/c+ /2 // m. 69/1 +$c d/g/b /4 // m. 69/2 +$c eb/g/c+ /16 // m. 70/1 // m. 70/2-73 CALL c0m70second_73 // m. 74-96 -$c g,c+,eb+ /4 q=3 // m. 74 -$c g,b,d+ /4 // m. 75 +$c g/c+/eb+ /4 q=3 // m. 74 +$c g/b/d+ /4 // m. 75 $c - /2 -$c g,c+,eb+ /4 q=3 // m. 76 -$c bb,d+,f+ /4 // m. 77 +$c g/c+/eb+ /4 q=3 // m. 76 +$c bb/d+/f+ /4 // m. 77 $c - /2 -$c bb,eb+,g+ /4 q=3 // m. 78 -$c bb,eb+,bb+ /4 // m. 79 +$c bb/eb+/g+ /4 q=3 // m. 78 +$c bb/eb+/bb+ /4 // m. 79 $c - /2 -$c eb,bb /2. // m. 80 -$c c,eb,ab /4 // m. 81 +$c eb/bb /2. // m. 80 +$c c/eb/ab /4 // m. 81 $c - /2 -$c f,c+ /2. // m. 82 -$c d,bb /4 // m. 83 +$c f/c+ /2. // m. 82 +$c d/bb /4 // m. 83 $c - /2 -$c g,d+ /2. // m. 84 -$c eb,g,c+ /2. // m. 85 -$c eb,ab /2. // m. 86 -$c d,f,ab /2. // m. 87 -$c d,g /2. // m. 88 -$c c,eb,g /2. // m. 89 -$c c,f /2. // m. 90 -$c b-,d,f /2. // m. 91 +$c g/d+ /2. // m. 84 +$c eb/g/c+ /2. // m. 85 +$c eb/ab /2. // m. 86 +$c d/f/ab /2. // m. 87 +$c d/g /2. // m. 88 +$c c/eb/g /2. // m. 89 +$c c/f /2. // m. 90 +$c b-/d/f /2. // m. 91 $c c /4 // m. 92 $c g /4 $c c+ /4 -$c a,c+,eb+ /2. // m. 93 -$c a,d+ /2. // m. 94 -$c g,bb,d+ /2. // m. 95 -$c g,c+ /2. // m. 96 +$c a/c+/eb+ /2. // m. 93 +$c a/d+ /2. // m. 94 +$c g/bb/d+ /2. // m. 95 +$c g/c+ /2. // m. 96 // m. 97-101 CALL rest_full_measure q=5 // m. 102-130 $c g- /2. q=2 // m. 102-103 -$c g-,eb /2. // m. 104 +$c g-/eb /2. // m. 104 $c c /2. // m. 105 -$c bb-,g /2. // m. 106 -$c c,a /2. // m. 107 -$c d,bb /2. // m. 108 +$c bb-/g /2. // m. 106 +$c c/a /2. // m. 107 +$c d/bb /2. // m. 108 { q=2 // m. 109-112 - $c bb-,d /4 // m. 109 == 111 - $c c,eb /4 $p - $c d,f# /4 - $c eb,g /4 // m. 110 == 112 - $c d,f /4 - $c c,eb /4 + $c bb-/d /4 // m. 109 == 111 + $c c/eb /4 $p + $c d/f# /4 + $c eb/g /4 // m. 110 == 112 + $c d/f /4 + $c c/eb /4 } -$c bb-,d /4 // m. 113 +$c bb-/d /4 // m. 113 $c - /2 CALL rest_full_measure // m. 114 -$c d,g,d+ /2. $f // m. 115 -$c d,f#,a /4 // m. 116 +$c d/g/d+ /2. $f // m. 115 +$c d/f#/a /4 // m. 116 $c - /2 CALL rest_full_measure q=4 // m. 117-120 -$c d,g /2. // m. 121 -$c eb,g,a /2. // m. 122 -$c d,f#,a /2. // m. 123 -$c d,g,bb /4 // m. 124 -$c d,g /2 -$c d,g,a /2. // m. 125 -$c d,f#,a /2. // m. 126 -$c d,g,bb /2. // m. 127 -$c d,bb,d+ /2. // m. 128 -$c d,g,bb /4 // m. 129 +$c d/g /2. // m. 121 +$c eb/g/a /2. // m. 122 +$c d/f#/a /2. // m. 123 +$c d/g/bb /4 // m. 124 +$c d/g /2 +$c d/g/a /2. // m. 125 +$c d/f#/a /2. // m. 126 +$c d/g/bb /2. // m. 127 +$c d/bb/d+ /2. // m. 128 +$c d/g/bb /4 // m. 129 $c g /4 $c d /4 $c g- /2. // m. 130 diff --git a/examples/vivaldi_4_seasons_summer_3.midica b/examples/vivaldi_4_seasons_summer_3.midica index 5ab02e4..875f8a7 100644 --- a/examples/vivaldi_4_seasons_summer_3.midica +++ b/examples/vivaldi_4_seasons_summer_3.midica @@ -165,14 +165,14 @@ CONST $c0m41part = a+ d a+ $c: | a+2:16 $c0m41part g+2 $c0m41part f+2 $c0m41part | // m. 41 $c: | e+2 $c0m41part f+2 $c0m41part g+2 $c0m41part | // m. 42 $c: | a+2 $c0m41part g+2 $c0m41part f+2 $c0m41part | // m. 43 -$c: | d,a+,e+2:4 -:16 d+ d+ f+ f+ a+ a+ d+2 | // m. 44 +$c: | d/a+/e+2:4 -:16 d+ d+ f+ f+ a+ a+ d+2 | // m. 44 // m. 45-50 CONST $c0m45part = d+ d d+ $c: | d+2:16 $c0m45part c+2 $c0m45part bb+ $c0m45part | // m. 45 $c: | a+ $c0m45part bb+ $c0m45part c#+2 $c0m45part | // m. 46 $c: | d+2 $c0m45part c+2 $c0m45part bb+ $c0m45part | // m. 47 -$c: | d,d+,a+:4 -:16 a+2 a+2 g+2 g+2 f+2 f+2 eb+2 | // m. 48 +$c: | d/d+/a+:4 -:16 a+2 a+2 g+2 g+2 f+2 f+2 eb+2 | // m. 48 $c: | eb+2 d+2 d+2 c+2 c+2 bb+ bb+ a+ a+ g+ g+ f+ | // m. 49 $c: | f+ e+ e+ d+ d+ c+ c+ bb bb a a g# | // m. 50 @@ -325,7 +325,7 @@ $c: | d+ $c0m109part eb+ $c0m109part f#+ $c0m109part | // m. 111 $c: | g+ $c0m109part f+ $c0m109part eb+ $c0m109part | // m. 112 // m. 113-115 -CHORD crd0m113 = g-,g,d+ +CHORD crd0m113 = g-/g/d+ CALL c0m113_115(crd0m113) FUNCTION c0m113_115 $c: | (length=/16) $[0] g a bb c+ d+ e+ f#+ g+ a+ bb+ a+ | // m. 113 @@ -918,22 +918,22 @@ CALL c0m6_9 CALL rest_measure // m. 11-20 -$c: | (q=6) g-,d:4 | (q=6) g-,eb | (q=6) g-,c,g | // m. 11-16 -$c: | (q=3) bb-,d | (q=3) bb-,d,g | (q=3) d,g,bb | // m. 17-19 +$c: | (q=6) g-/d:4 | (q=6) g-/eb | (q=6) g-/c/g | // m. 11-16 +$c: | (q=3) bb-/d | (q=3) bb-/d/g | (q=3) d/g/bb | // m. 17-19 CALL c2m20 // m. 21-31 { q=2 // 21-22 == 25-26 23 == 27 24 == 28 - $c: | (q=6) f#,a,d+:4 | (q=3) d,g,bb | (q=3) d,f#,a | + $c: | (q=6) f#/a/d+:4 | (q=3) d/g/bb | (q=3) d/f#/a | } -$c: | (q=3) bb-,d,g:2. | // m. 29-31 +$c: | (q=3) bb-/d/g:2. | // m. 29-31 // m. 32-37 -$c: | d,g,b | eb,g,c+ | e,a,c#+ | f,a,d+ | e,a,d+ | e,a,c#+ | +$c: | d/g/b | eb/g/c+ | e/a/c#+ | f/a/d+ | e/a/d+ | e/a/c#+ | // m. 38-52 { q=2 - $c: | f,a,d+:4 -:2 | // m. 38 == 40 + $c: | f/a/d+:4 -:2 | // m. 38 == 40 CALL rest_measure // m. 39 == 41 } CALL rest_measure q=11 // m. 42-52 @@ -947,50 +947,50 @@ CALL rest_measure q=11 // m. 42-52 } // m. 55 -$c: | (m) f,a:2+8 // 1st voice +$c: | (m) f/a:2+8 // 1st voice $c: | -:2 d+:8 - | // 2nd voice // m. 56-66 -$c: | d,g,bb:2+8 -:8 | e,g,c+:2+8 -:8 | c,f,a:2+8 -:8 | d,f,a:2+8 -:8 | // m. 56-59 -$c: | bb-,eb,g:2+8 -:8 | c,f,ab:2+8 -:8 | d,g,d+:2+8 -:8 | d,f,b:2+8 -:8 | // m. 60-63 +$c: | d/g/bb:2+8 -:8 | e/g/c+:2+8 -:8 | c/f/a:2+8 -:8 | d/f/a:2+8 -:8 | // m. 56-59 +$c: | bb-/eb/g:2+8 -:8 | c/f/ab:2+8 -:8 | d/g/d+:2+8 -:8 | d/f/b:2+8 -:8 | // m. 60-63 { q=3 - $c: | eb,g,c+:2+8 -:8 | // m. 64-66 + $c: | eb/g/c+:2+8 -:8 | // m. 64-66 } // m. 67-69 -$c: | g,c+:2. | d,ab,c+ | d,g,c+:2 d,g,b:4 | +$c: | g/c+:2. | d/ab/c+ | d/g/c+:2 d/g/b:4 | // m. 70/2-73 -CHORD crd6m70 = eb,g,c+ +CHORD crd6m70 = eb/g/c+ CALL c0m70_73(crd6m70) // m. 74-79 -$c: | (q=3) g,c+,eb+:4 | // m. 74 -$c: | g,b,d+:4 -:2 | // m. 75 -$c: | (q=3) g,c+,eb+:4 | // m. 76 -$c: | bb,d+,f+:4 -:2 | // m. 77 -$c: | (q=3) bb,eb+,g+:4 | // m. 78 -$c: | bb,eb+,bb+:4 -:2 | // m. 79 +$c: | (q=3) g/c+/eb+:4 | // m. 74 +$c: | g/b/d+:4 -:2 | // m. 75 +$c: | (q=3) g/c+/eb+:4 | // m. 76 +$c: | bb/d+/f+:4 -:2 | // m. 77 +$c: | (q=3) bb/eb+/g+:4 | // m. 78 +$c: | bb/eb+/bb+:4 -:2 | // m. 79 // m. 80-96 -$c: | eb,bb:2. | c,eb,ab:4 -:2 | f,c+:2. | d,bb:4 -:2 | g,d+:2. | // m. 80-84 -$c: | eb,g,c+ | eb,ab | d,f,ab | d,g | c,eb,g | // m. 85-89 -$c: | c,f | b-,d,f | c:4 g c+ | a,c+,eb+:2. | a,d+ | // m. 90-94 -$c: | g,bb,d+ | g,c+ | // m. 95-96 +$c: | eb/bb:2. | c/eb/ab:4 -:2 | f/c+:2. | d/bb:4 -:2 | g/d+:2. | // m. 80-84 +$c: | eb/g/c+ | eb/ab | d/f/ab | d/g | c/eb/g | // m. 85-89 +$c: | c/f | b-/d/f | c:4 g c+ | a/c+/eb+:2. | a/d+ | // m. 90-94 +$c: | g/bb/d+ | g/c+ | // m. 95-96 // m. 97-101 CALL rest_measure q=5 // m. 102-130 -$c: | g-:2. | g- | g-,eb | c | bb-,g | c,a | d,bb | // m. 102-108 +$c: | g-:2. | g- | g-/eb | c | bb-/g | c/a | d/bb | // m. 102-108 { q=2 - $c: | bb-,d:4 $piano c,eb d,f# | eb,g d,f c,eb | // m. 109-112 + $c: | bb-/d:4 $piano c/eb d/f# | eb/g d/f c/eb | // m. 109-112 } -$c: | bb-,d -:2 | -:2. | $forte d,g,d+ | d,f#,a:4 -:2 | // m. 113-116 +$c: | bb-/d -:2 | -:2. | $forte d/g/d+ | d/f#/a:4 -:2 | // m. 113-116 CALL rest_measure q=4 // m. 117-120 -$c: | d,g:2. | eb,g,a | d,f#,a | d,g,bb:4 d,g:2 | // m. 121-124 -$c: | d,g,a:2. | d,f#,a | d,g,bb | d,bb,d+ | // m. 125-128 -$c: | d,g,bb:4 g d | g-:2. | // m. 129-130 +$c: | d/g:2. | eb/g/a | d/f#/a | d/g/bb:4 d/g:2 | // m. 121-124 +$c: | d/g/a:2. | d/f#/a | d/g/bb | d/bb/d+ | // m. 125-128 +$c: | d/g/bb:4 g d | g-:2. | // m. 129-130 //////////////////////////////////// // channel 7: Organ or Harpsichord (Left Hand) diff --git a/midica.jar b/midica.jar index 951aff0..add2fdc 100644 Binary files a/midica.jar and b/midica.jar differ diff --git a/src/org/midica/Midica.java b/src/org/midica/Midica.java index 7f553bc..e2635f1 100644 --- a/src/org/midica/Midica.java +++ b/src/org/midica/Midica.java @@ -36,7 +36,7 @@ public class Midica { private static final int VERSION_MINOR = 11; /** UNIX timestamp of the last commit */ - public static final int COMMIT_TIME = 1701289098; + public static final int COMMIT_TIME = 1702127489; /** Branch name. Automatically changed by precommit.pl */ public static final String BRANCH = "sound-effects"; diff --git a/src/org/midica/config/Dict.java b/src/org/midica/config/Dict.java index 60c9e55..c106b06 100644 --- a/src/org/midica/config/Dict.java +++ b/src/org/midica/config/Dict.java @@ -106,7 +106,7 @@ public class Dict { public static final String SYNTAX_BLOCK_CLOSE = "BLOCK_CLOSE"; public static final String SYNTAX_FUNCTION = "FUNCTION"; public static final String SYNTAX_PATTERN = "PATTERN"; - public static final String SYNTAX_PATTERN_INDEX_SEP = "SYNTAX_PATTERN_INDEX_SEP"; + public static final String SYNTAX_PATTERN_INDEX_SEP = "PATTERN_INDEX_SEP"; public static final String SYNTAX_PARAM_OPEN = "PARAM_OPEN"; public static final String SYNTAX_PARAM_CLOSE = "PARAM_CLOSE"; public static final String SYNTAX_PARAM_SEPARATOR = "PARAM_SEPARATOR"; @@ -2917,24 +2917,25 @@ private static void initLanguageEnglish() { set( SYNTAX_SOUNDBANK, "including a soundbank file or URL (SF2 or DLS)" ); set( SYNTAX_SOUNDFONT, "Deprecated. Will be removed in a future Version" ); - set( SYNTAX_ZEROLENGTH, "Zero-Length" ); - set( SYNTAX_32, "32nd" ); - set( SYNTAX_16, "16th" ); - set( SYNTAX_8, "8th" ); - set( SYNTAX_4, "quarter" ); - set( SYNTAX_2, "half" ); - set( SYNTAX_1, "full" ); - set( SYNTAX_M1, "full" ); - set( SYNTAX_M2, "2 full notes" ); - set( SYNTAX_M4, "4 full notes" ); - set( SYNTAX_M8, "8 full notes" ); - set( SYNTAX_M16, "16 full notes" ); - set( SYNTAX_M32, "32 full notes" ); - set( SYNTAX_DOT, "dot (note length multiplied by 1.5)" ); - set( SYNTAX_TRIPLET, "triplet (note length devided by 1.5)" ); - set( SYNTAX_TUPLET_INTRO, "tuplet opener" ); - set( SYNTAX_TUPLET_FOR, "tuplet definition separator" ); - set( SYNTAX_LENGTH_PLUS, "note length addition symbol" ); + set( SYNTAX_ZEROLENGTH, "Zero-Length" ); + set( SYNTAX_32, "32nd" ); + set( SYNTAX_16, "16th" ); + set( SYNTAX_8, "8th" ); + set( SYNTAX_4, "quarter" ); + set( SYNTAX_2, "half" ); + set( SYNTAX_1, "full" ); + set( SYNTAX_M1, "full" ); + set( SYNTAX_M2, "2 full notes" ); + set( SYNTAX_M4, "4 full notes" ); + set( SYNTAX_M8, "8 full notes" ); + set( SYNTAX_M16, "16 full notes" ); + set( SYNTAX_M32, "32 full notes" ); + set( SYNTAX_DOT, "dot (note length multiplied by 1.5)" ); + set( SYNTAX_TRIPLET, "triplet (note length devided by 1.5)" ); + set( SYNTAX_TUPLET_INTRO, "tuplet opener" ); + set( SYNTAX_TUPLET_FOR, "tuplet definition separator" ); + set( SYNTAX_LENGTH_PLUS, "note length addition symbol" ); + set( SYNTAX_PL_DOT, "separator between pipeline elements (controller, function name, etc.)" ); set( SYNTAX_PL_KEEP, "keep function value after function ends (pipeline element)" ); set( SYNTAX_PL_DOUBLE, "use double precision (pipeline element)" ); @@ -4200,7 +4201,7 @@ public static void initSyntax() { setSyntax( SYNTAX_BLOCK_CLOSE, "}" ); setSyntax( SYNTAX_FUNCTION, "FUNCTION" ); setSyntax( SYNTAX_PATTERN, "PATTERN" ); - setSyntax( SYNTAX_PATTERN_INDEX_SEP, "," ); + setSyntax( SYNTAX_PATTERN_INDEX_SEP, "/" ); setSyntax( SYNTAX_PARAM_OPEN, "(" ); setSyntax( SYNTAX_PARAM_CLOSE, ")" ); setSyntax( SYNTAX_PARAM_SEPARATOR, "," ); @@ -4271,7 +4272,7 @@ public static void initSyntax() { setSyntax( SYNTAX_REST, "-" ); setSyntax( SYNTAX_CHORD, "CHORD" ); setSyntax( SYNTAX_CHORD_ASSIGNER, "=" ); - setSyntax( SYNTAX_CHORD_SEPARATOR, "," ); + setSyntax( SYNTAX_CHORD_SEPARATOR, "/" ); setSyntax( SYNTAX_INCLUDE, "INCLUDE" ); setSyntax( SYNTAX_SOUNDBANK, "SOUNDBANK" ); setSyntax( SYNTAX_SOUNDFONT, "SOUNDFONT" ); diff --git a/test/org/midica/file/read/MidicaPLParserTest.java b/test/org/midica/file/read/MidicaPLParserTest.java index b633160..637f579 100644 --- a/test/org/midica/file/read/MidicaPLParserTest.java +++ b/test/org/midica/file/read/MidicaPLParserTest.java @@ -133,10 +133,10 @@ void testParseFilesWorking() throws ParseException { { int i = 0; // plain - assertEquals( "0/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "0/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "0/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "0/0/90/a / 64", messages.get(i++).toString() ); - assertEquals( "480/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "480/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "480/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "480/0/90/a / 64", messages.get(i++).toString() ); assertEquals( "960/0/90/a+2 / 64", messages.get(i++).toString() ); // bbb+2 = a+2 @@ -147,10 +147,10 @@ void testParseFilesWorking() throws ParseException { assertEquals( "3360/0/90/a#+4 / 64", messages.get(i++).toString() ); // cbb+5 = a#+4 assertEquals( "3840/0/90/c#+4 / 64", messages.get(i++).toString() ); // b##+3 = c#+4 // function + block - assertEquals( "4320/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "4320/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "4320/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "4320/0/90/a / 64", messages.get(i++).toString() ); - assertEquals( "4800/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "4800/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "4800/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "4800/0/90/a / 64", messages.get(i++).toString() ); assertEquals( "5280/0/90/a+2 / 64", messages.get(i++).toString() ); // bbb+2 = a+2 @@ -161,10 +161,10 @@ void testParseFilesWorking() throws ParseException { assertEquals( "7680/0/90/a#+4 / 64", messages.get(i++).toString() ); // cbb+5 = a#+4 assertEquals( "8160/0/90/c#+4 / 64", messages.get(i++).toString() ); // b##+3 = c#+4 // function - assertEquals( "8640/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "8640/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "8640/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "8640/0/90/a / 64", messages.get(i++).toString() ); - assertEquals( "9120/0/90/c / 64", messages.get(i++).toString() ); // bbb,c##,dbb = a,d,c ==> c,d,a + assertEquals( "9120/0/90/c / 64", messages.get(i++).toString() ); // bbb/c##/dbb = a/d/c ==> c/d/a assertEquals( "9120/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "9120/0/90/a / 64", messages.get(i++).toString() ); assertEquals( "9600/0/90/a+2 / 64", messages.get(i++).toString() ); // bbb+2 = a+2 @@ -387,10 +387,15 @@ void testParseFilesWorking() throws ParseException { assertEquals( 14400, instruments.get(0).getCurrentTicks() ); // channel 0 assertEquals( 2880, instruments.get(1).getCurrentTicks() ); // channel 1 assertEquals( // channel 0 - "abc... abc... abc... abc... abc... abc... xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd abc... abc... abc... abc... abc... abc... bbb?? bbb?? bbb?? bbb?? bbb?? bbb?? ", + "abc... abc... abc... abc... abc... abc... " // CALL test1(/2) + + "xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd " // CALL test2(dur=/4, l1=xyz, 3rd, 4th) q=3, m + + "xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd " + + "xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd xyz3rd " + + "abc... abc... abc... abc... abc... abc... " // test3() + + "bbb?? bbb?? bbb?? bbb?? bbb?? bbb?? ", getLyrics() ); - messages = getMessagesByStatus("91"); // channel 1 + messages = getMessagesByStatus("91"); // channel 1 assertEquals( 6, messages.size() ); { int i = 0; @@ -439,20 +444,20 @@ void testParseFilesWorking() throws ParseException { assertEquals( 14, messages.size() ); { int i = 0; - assertEquals( "0/1/91/c / 102", messages.get(i++).toString() ); // c,d,e : c ON - assertEquals( "0/1/91/d / 102", messages.get(i++).toString() ); // c,d,e : d ON - assertEquals( "0/1/91/e / 102", messages.get(i++).toString() ); // c,d,e : e ON + assertEquals( "0/1/91/c / 102", messages.get(i++).toString() ); // c/d/e : c ON + assertEquals( "0/1/91/d / 102", messages.get(i++).toString() ); // c/d/e : d ON + assertEquals( "0/1/91/e / 102", messages.get(i++).toString() ); // c/d/e : e ON assertEquals( "480/1/91/f / 102", messages.get(i++).toString() ); // f : f ON - assertEquals( "959/1/81/d / 0", messages.get(i++).toString() ); // c,d,e : d OFF (correction) - assertEquals( "960/1/91/d / 102", messages.get(i++).toString() ); // g,d,a : d ON - assertEquals( "960/1/91/g / 102", messages.get(i++).toString() ); // g,d,a : g ON - assertEquals( "960/1/91/a / 102", messages.get(i++).toString() ); // g,d,a : a ON - assertEquals( "2400/1/81/c / 0", messages.get(i++).toString() ); // c,d,e : c OFF - assertEquals( "2400/1/81/e / 0", messages.get(i++).toString() ); // c,d,e : e OFF + assertEquals( "959/1/81/d / 0", messages.get(i++).toString() ); // c/d/e : d OFF (correction) + assertEquals( "960/1/91/d / 102", messages.get(i++).toString() ); // g/d/a : d ON + assertEquals( "960/1/91/g / 102", messages.get(i++).toString() ); // g/d/a : g ON + assertEquals( "960/1/91/a / 102", messages.get(i++).toString() ); // g/d/a : a ON + assertEquals( "2400/1/81/c / 0", messages.get(i++).toString() ); // c/d/e : c OFF + assertEquals( "2400/1/81/e / 0", messages.get(i++).toString() ); // c/d/e : e OFF assertEquals( "2880/1/81/f / 0", messages.get(i++).toString() ); // f : f OFF - assertEquals( "3360/1/81/d / 0", messages.get(i++).toString() ); // g,d,a : d OFF - assertEquals( "3360/1/81/g / 0", messages.get(i++).toString() ); // g,d,a : g OFF - assertEquals( "3360/1/81/a / 0", messages.get(i++).toString() ); // g,d,a : a OFF + assertEquals( "3360/1/81/d / 0", messages.get(i++).toString() ); // g/d/a : d OFF + assertEquals( "3360/1/81/g / 0", messages.get(i++).toString() ); // g/d/a : g OFF + assertEquals( "3360/1/81/a / 0", messages.get(i++).toString() ); // g/d/a : a OFF } // channel 2: messages = getNoteOnOffMessagesByChannel(2); @@ -799,14 +804,14 @@ void testParseFilesWorking() throws ParseException { assertEquals( "0/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "480/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "720/0/90/c / 64", messages.get(i++).toString() ); - // 0: crd2:pat_488 (crd2 = c+,d+) + // 0: crd2:pat_488 (crd2 = c+/d+) assertEquals( "960/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "960/0/90/d+ / 64", messages.get(i++).toString() ); assertEquals( "1440/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "1440/0/90/d+ / 64", messages.get(i++).toString() ); assertEquals( "1680/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "1680/0/90/d+ / 64", messages.get(i++).toString() ); - // 0 crd3 pat_488 (crd3 = c+2,d+2,e+2) + // 0 crd3 pat_488 (crd3 = c+2/d+2/e+2) assertEquals( "1920/0/90/c+2 / 64", messages.get(i++).toString() ); assertEquals( "1920/0/90/d+2 / 64", messages.get(i++).toString() ); assertEquals( "1920/0/90/e+2 / 64", messages.get(i++).toString() ); @@ -820,14 +825,14 @@ void testParseFilesWorking() throws ParseException { assertEquals( "2880/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "3360/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "3600/0/90/c / 64", messages.get(i++).toString() ); - // 0: c+,d+:pat_488 + // 0: c+/d+:pat_488 assertEquals( "3840/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "3840/0/90/d+ / 64", messages.get(i++).toString() ); assertEquals( "4320/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "4320/0/90/d+ / 64", messages.get(i++).toString() ); assertEquals( "4560/0/90/c+ / 64", messages.get(i++).toString() ); assertEquals( "4560/0/90/d+ / 64", messages.get(i++).toString() ); - // 0: c+2,d+2,e+2:pat_488 + // 0: c+2/d+2/e+2:pat_488 assertEquals( "4800/0/90/c+2 / 64", messages.get(i++).toString() ); assertEquals( "4800/0/90/d+2 / 64", messages.get(i++).toString() ); assertEquals( "4800/0/90/e+2 / 64", messages.get(i++).toString() ); @@ -855,24 +860,24 @@ void testParseFilesWorking() throws ParseException { assertEquals( 20, messages.size() ); { int i = 0; - // 2: c+,d+:pat_order_x2_up + // 2: c+/d+:pat_order_x2_up assertEquals( "0/2/92/c+ / 64", messages.get(i++).toString() ); assertEquals( "480/2/92/d+ / 64", messages.get(i++).toString() ); assertEquals( "960/2/92/c+ / 64", messages.get(i++).toString() ); assertEquals( "1440/2/92/d+ / 64", messages.get(i++).toString() ); - // 2: c+,d+:pat_order_x2_down + // 2: c+/d+:pat_order_x2_down assertEquals( "1920/2/92/d+ / 64", messages.get(i++).toString() ); assertEquals( "2400/2/92/c+ / 64", messages.get(i++).toString() ); assertEquals( "2880/2/92/d+ / 64", messages.get(i++).toString() ); assertEquals( "3360/2/92/c+ / 64", messages.get(i++).toString() ); - // 2 c+2,d+2,e+2 pat_order_x2_up + // 2 c+2/d+2/e+2 pat_order_x2_up assertEquals( "3840/2/92/c+2 / 64", messages.get(i++).toString() ); assertEquals( "4320/2/92/d+2 / 64", messages.get(i++).toString() ); assertEquals( "4800/2/92/e+2 / 64", messages.get(i++).toString() ); assertEquals( "5280/2/92/c+2 / 64", messages.get(i++).toString() ); assertEquals( "5760/2/92/d+2 / 64", messages.get(i++).toString() ); assertEquals( "6240/2/92/e+2 / 64", messages.get(i++).toString() ); - // 2 c+2,d+2,e+2 pat_order_x2_down + // 2 c+2/d+2/e+2 pat_order_x2_down assertEquals( "6720/2/92/e+2 / 64", messages.get(i++).toString() ); assertEquals( "7200/2/92/d+2 / 64", messages.get(i++).toString() ); assertEquals( "7680/2/92/c+2 / 64", messages.get(i++).toString() ); @@ -885,7 +890,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( 14, messages.size() ); { int i = 0; - // 3: c,d,e:pat_outer + // 3: c/d/e:pat_outer assertEquals( "0/3/93/e / 64", messages.get(i++).toString() ); // outer assertEquals( "480/3/93/c / 64", messages.get(i++).toString() ); // inner assertEquals( "480/3/93/e / 64", messages.get(i++).toString() ); // inner @@ -893,7 +898,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( "1440/3/93/c / 64", messages.get(i++).toString() ); // outer assertEquals( "1440/3/93/d / 64", messages.get(i++).toString() ); // outer assertEquals( "1440/3/93/e / 64", messages.get(i++).toString() ); // outer - // 3 c+,d+,e+ pat_outer + // 3 c+/d+/e+ pat_outer assertEquals( "1920/3/93/e+ / 64", messages.get(i++).toString() ); // outer assertEquals( "2400/3/93/c+ / 64", messages.get(i++).toString() ); // inner assertEquals( "2400/3/93/e+ / 64", messages.get(i++).toString() ); // inner @@ -920,7 +925,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( "0/9/99/slap (sl) / 64", messages.get(i++).toString() ); assertEquals( "480/9/99/slap (sl) / 64", messages.get(i++).toString() ); assertEquals( "720/9/99/slap (sl) / 64", messages.get(i++).toString() ); - // p slap,cla pat_488 + // p slap/cla pat_488 assertEquals( "960/9/99/slap (sl) / 64", messages.get(i++).toString() ); assertEquals( "960/9/99/clave (cla) / 64", messages.get(i++).toString() ); assertEquals( "1440/9/99/slap (sl) / 64", messages.get(i++).toString() ); @@ -986,12 +991,12 @@ void testParseFilesWorking() throws ParseException { assertEquals( "0/0/90/c / 10", messages.get(i++).toString() ); // 0 c /1 assertEquals( "1920/0/90/c+ / 20", messages.get(i++).toString() ); // CALL func - // 0 d,e,f pat + // 0 d/e/f pat assertEquals( "3840/0/90/d / 20", messages.get(i++).toString() ); assertEquals( "4320/0/90/e / 30", messages.get(i++).toString() ); assertEquals( "4800/0/90/f / 40", messages.get(i++).toString() ); - // 0 d,e,f pat v=110 + // 0 d/e/f pat v=110 assertEquals( "5280/0/90/d / 110", messages.get(i++).toString() ); assertEquals( "5760/0/90/e / 30", messages.get(i++).toString() ); assertEquals( "6240/0/90/f / 40", messages.get(i++).toString() ); @@ -1036,7 +1041,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( "1440/0/90/g / 64", messages.get(i++).toString() ); assertEquals( "1680/0/90/g / 64", messages.get(i++).toString() ); - // root level: 0: a b,c+,d+,e+:/1 - f+:/8 g+:4 + // root level: 0: a b/c+/d+/e+:/1 - f+:/8 g+:4 assertEquals( "2160/0/90/a / 64", messages.get(i++).toString() ); assertEquals( "2640/0/90/b / 64", messages.get(i++).toString() ); assertEquals( "2640/0/90/c+ / 64", messages.get(i++).toString() ); @@ -1050,7 +1055,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( "7200/0/90/c- / 64", messages.get(i++).toString() ); assertEquals( "7520/0/90/d- / 64", messages.get(i++).toString() ); - // 0: c d,e - f + // 0: c d/e - f assertEquals( "7680/0/90/c- / 64", messages.get(i++).toString() ); assertEquals( "7840/0/90/d- / 64", messages.get(i++).toString() ); assertEquals( "7840/0/90/e- / 64", messages.get(i++).toString() ); @@ -1066,7 +1071,7 @@ void testParseFilesWorking() throws ParseException { assertEquals( "9280/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "9600/0/90/d / 64", messages.get(i++).toString() ); - // 0: c d,e - f + // 0: c d/e - f assertEquals( "9680/0/90/c / 64", messages.get(i++).toString() ); assertEquals( "9760/0/90/d / 64", messages.get(i++).toString() ); assertEquals( "9760/0/90/e / 64", messages.get(i++).toString() ); @@ -1169,7 +1174,7 @@ void testParseFilesWorking() throws ParseException { int i = 0; { - // c,d,e:pat_outer(70) + // c/d/e:pat_outer(70) assertEquals( "0/5/95/c / 70", messages.get(i++).toString() ); assertEquals( "480/5/95/c / 70", messages.get(i++).toString() ); assertEquals( "960/5/95/d / 70", messages.get(i++).toString() ); @@ -1186,7 +1191,7 @@ void testParseFilesWorking() throws ParseException { } assertEquals( "7680/5/95/c+ / 64", messages.get(i++).toString() ); { - // e,d,c:pat_outer(60) + // e/d/c:pat_outer(60) assertEquals( "8160/5/95/e / 60", messages.get(i++).toString() ); assertEquals( "8640/5/95/e / 60", messages.get(i++).toString() ); assertEquals( "9120/5/95/d / 60", messages.get(i++).toString() ); @@ -1415,7 +1420,7 @@ void testParseFilesWorking() throws ParseException { // } // { q=2 (second run) // (q=2) d:4 - assertEquals( "3840/1/91/d / 64", messages.get(i++).toString() ); + assertEquals( "3840/1/91/d / 64", messages.get(i++).toString() ); assertEquals( "4320/1/91/d / 64", messages.get(i++).toString() ); // { m // e (m) f @@ -1435,7 +1440,7 @@ void testParseFilesWorking() throws ParseException { // c assertEquals( "0/2/92/c / 64", messages.get(i++).toString() ); - // (m,q=2) d,e:pat (first run) f:*2 + // (m,q=2) d/e:pat (first run) f:*2 // : (q=2) 0:4 assertEquals( "480/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "480/2/92/f / 64", messages.get(i++).toString() ); @@ -1443,19 +1448,19 @@ void testParseFilesWorking() throws ParseException { // : (m) 0 1 assertEquals( "1440/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "1440/2/92/e / 64", messages.get(i++).toString() ); - // : (tr=32) 0,1:16 + // : (tr=32) 0/1:16 assertEquals( "1920/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "1920/2/92/e / 64", messages.get(i++).toString() ); assertEquals( "1980/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "1980/2/92/e / 64", messages.get(i++).toString() ); - // (m,q=2) d,e:pat (second run) + // (m,q=2) d/e:pat (second run) // : (q=2) 0:4 assertEquals( "2040/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "2520/2/92/d / 64", messages.get(i++).toString() ); // : (m) 0 1 assertEquals( "3000/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "3000/2/92/e / 64", messages.get(i++).toString() ); - // : (tr=32) 0,1:16 + // : (tr=32) 0/1:16 assertEquals( "3480/2/92/d / 64", messages.get(i++).toString() ); assertEquals( "3480/2/92/e / 64", messages.get(i++).toString() ); assertEquals( "3540/2/92/d / 64", messages.get(i++).toString() ); @@ -1481,8 +1486,15 @@ void testExampleFiles() throws ParseException { for (File file : dir.listFiles()) { if (!file.isFile()) continue; - if (file.getName().endsWith(".midica") || file.getName().endsWith(".mpl")) - parse(file); + if (file.getName().endsWith(".midica") || file.getName().endsWith(".mpl")) { + try { + parse(file); + } + catch (Exception e) { + System.err.println(file.getAbsolutePath() + " failed."); + throw e; + } + } } } @@ -1662,37 +1674,37 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-redefined")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "CHORD test c,d,e", e.getLineContent() ); + assertEquals( "CHORD test c/d/e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_ALREADY_DEFINED)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-name-like-note")) ); assertEquals( 2, e.getLineNumber() ); - assertEquals( "CHORD c# c,d,c", e.getLineContent() ); + assertEquals( "CHORD c# c/d/c", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_EQUALS_NOTE)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-name-like-percussion")) ); assertEquals( 2, e.getLineNumber() ); - assertEquals( "CHORD hhc c,d,e", e.getLineContent() ); + assertEquals( "CHORD hhc c/d/e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_EQUALS_PERCUSSION)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-with-duplicate-note")) ); assertEquals( 2, e.getLineNumber() ); - assertEquals( "CHORD test c,d,c", e.getLineContent() ); + assertEquals( "CHORD test c/d/c", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_CONTAINS_ALREADY)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-separator-double")) ); - assertEquals( 5, e.getLineNumber() ); + assertEquals( 9, e.getLineNumber() ); assertEquals( "CHORD crd=c,d,,e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_REDUNDANT_SEP)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-separator-leading")) ); assertEquals( 5, e.getLineNumber() ); - assertEquals( "CHORD crd = ,c,d,e", e.getLineContent() ); + assertEquals( "CHORD crd = /c/d/e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_REDUNDANT_SEP)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-separator-trailing")) ); assertEquals( 5, e.getLineNumber() ); - assertEquals( "CHORD crd = c,d,e,", e.getLineContent() ); + assertEquals( "CHORD crd = c/d/e/", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHORD_REDUNDANT_SEP)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("call-with-invalid-option")) ); @@ -1842,7 +1854,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-assigner-double")) ); assertEquals( 5, e.getLineNumber() ); - assertEquals( "CHORD crd==c,d,e", e.getLineContent() ); + assertEquals( "CHORD crd==c/d/e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_UNKNOWN_CHORD_ELEMENT) + "=c") ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("chord-with-note-percussion-mix")) ); @@ -2315,7 +2327,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("define-assigner-double-2")) ); assertEquals( 8, e.getLineNumber() ); - assertEquals( "CRD crd c,d,e", e.getLineContent() ); + assertEquals( "CRD crd c/d/e", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_UNKNOWN_CMD) + "CRD") ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("const-without-args")) ); @@ -2330,7 +2342,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("const-already-defined")) ); assertEquals( 4, e.getLineNumber() ); - assertEquals( "CONST $crd c+,d+,e+", e.getLineContent() ); + assertEquals( "CONST $crd c+/d+/e+", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CONST_ALREADY_DEFINED)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("const-name-eq-value")) ); @@ -2455,12 +2467,12 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-magic-cond-idx-too-high-3")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0: 60,62,[2]", e.getLineContent() ); + assertEquals( "0: 60/62/[2]", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_PATTERN_INDEX_TOO_HIGH_2)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-magic-cond-idx-too-high-4")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0 60,62,[2] /4", e.getLineContent() ); + assertEquals( "0 60/62/[2] /4", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_PATTERN_INDEX_TOO_HIGH_2)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-inside-block")) ); @@ -2505,7 +2517,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-call-without-param-close")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0 c,d,e simple(foo, bar q=2, m", e.getLineContent() ); + assertEquals( "0 c/d/e simple(foo, bar q=2, m", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_UNKNOWN_OPTION) + "(foo") ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-undefined")) ); @@ -2530,12 +2542,12 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-recursion")) ); assertEquals( 13, e.getLineNumber() ); - assertTrue( "1,0 first".equals(e.getLineContent()) || "0,1 second".equals(e.getLineContent()) ); + assertTrue( "1/0 first".equals(e.getLineContent()) || "0/1 second".equals(e.getLineContent()) ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_PATTERN_RECURSION_DEPTH)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("pattern-before-instruments")) ); assertEquals( 6, e.getLineNumber() ); - assertEquals( "0,1 /4", e.getLineContent() ); + assertEquals( "0/1 /4", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_CHANNEL_UNDEFINED).replaceFirst("%s", "0")) ); // stacktraces @@ -2586,7 +2598,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("stacktrace-function")) ); assertEquals( 13, e.getLineNumber() ); - assertEquals( "0 f,e -", e.getLineContent() ); + assertEquals( "0 f/e -", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_ZEROLENGTH_NOT_ALLOWED)) ); stackTrace = e.getStackTraceElements(); assertEquals( 11, stackTrace.size() ); @@ -2604,7 +2616,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("stacktrace-pattern")) ); assertEquals( 13, e.getLineNumber() ); - assertEquals( "0,1,2 -", e.getLineContent() ); + assertEquals( "0/1/2 -", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_ZEROLENGTH_NOT_ALLOWED)) ); stackTrace = e.getStackTraceElements(); assertEquals( 11, stackTrace.size() ); @@ -2622,11 +2634,11 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("stacktrace-compact-pattern")) ); assertEquals( 13, e.getLineNumber() ); - assertEquals( "0: 65,64,62:-", e.getLineContent() ); + assertEquals( "0: 65/64/62:-", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_ZEROLENGTH_NOT_ALLOWED)) ); stackTrace = e.getStackTraceElements(); assertEquals( 11, stackTrace.size() ); - assertEquals( "stacktrace-compact-pattern.midica/66", stackTrace.pop().toString() ); // : f,e,d:- + assertEquals( "stacktrace-compact-pattern.midica/66", stackTrace.pop().toString() ); // : f/e/d:- assertEquals( "stacktrace-compact-pattern.midica/58", stackTrace.pop().toString() ); // CALL pat3(-) from pat2() assertEquals( "stacktrace-compact-pattern.midica/56-59", stackTrace.pop().toString() ); // else-block assertEquals( "stacktrace-compact-pattern.midica/48-60", stackTrace.pop().toString() ); // block @@ -2650,7 +2662,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("zero-for-chord")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0 c,d -", e.getLineContent() ); + assertEquals( "0 c/d -", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_ZEROLENGTH_NOT_ALLOWED)) ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("zero-in-summand")) ); @@ -2705,7 +2717,7 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("compact-unknown-pattern")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0: c c c,d,e:pat_none c c", e.getLineContent() ); + assertEquals( "0: c c c/d/e:pat_none c c", e.getLineContent() ); assertTrue( e.getMessage().startsWith(Dict.get(Dict.ERROR_NOTE_LENGTH_INVALID) + "pat_none") ); e = assertThrows( ParseException.class, () -> parse(getFailingFile("compact-invalid-option")) ); @@ -2720,13 +2732,13 @@ void testParseFilesFailing() { e = assertThrows( ParseException.class, () -> parse(getFailingFile("compact-pattern-call-with-options")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0: c d e:8 f,e,d,c:pat(foo,bar)q=2,m a b c", e.getLineContent() ); - assertTrue( e.getMessage().startsWith(String.format(Dict.get(Dict.ERROR_COMPACT_PAT_CALL_WITH_OPT), "q=2,m", "f,e,d,c:pat(foo,bar)q=2,m"))); + assertEquals( "0: c d e:8 f/e/d/c:pat(foo,bar)q=2,m a b c", e.getLineContent() ); + assertTrue( e.getMessage().startsWith(String.format(Dict.get(Dict.ERROR_COMPACT_PAT_CALL_WITH_OPT), "q=2,m", "f/e/d/c:pat(foo,bar)q=2,m"))); e = assertThrows( ParseException.class, () -> parse(getFailingFile("compact-pattern-call-with-whitespace")) ); assertEquals( 3, e.getLineNumber() ); - assertEquals( "0: c d e:8 f,e,d,c:pat(foo, bar) a b c", e.getLineContent() ); - assertTrue( e.getMessage().startsWith(String.format(Dict.get(Dict.ERROR_COMPACT_PAT_CALL_WITH_OPT), "(foo,", "f,e,d,c:pat(foo,"))); + assertEquals( "0: c d e:8 f/e/d/c:pat(foo, bar) a b c", e.getLineContent() ); + assertTrue( e.getMessage().startsWith(String.format(Dict.get(Dict.ERROR_COMPACT_PAT_CALL_WITH_OPT), "(foo,", "f/e/d/c:pat(foo,"))); e = assertThrows( ParseException.class, () -> parse(getFailingFile("compact-pattern-with-wrong-index")) ); assertEquals( 3, e.getLineNumber() ); diff --git a/test/org/midica/testfiles/exporter/note_off_move_conflict_1.midica b/test/org/midica/testfiles/exporter/note_off_move_conflict_1.midica index c7f0707..499166c 100755 --- a/test/org/midica/testfiles/exporter/note_off_move_conflict_1.midica +++ b/test/org/midica/testfiles/exporter/note_off_move_conflict_1.midica @@ -3,7 +3,7 @@ INSTRUMENTS END 0 c /4 d=100% -0 d,b /4 +0 d/b /4 0 b /4 * tempo 95 diff --git a/test/org/midica/testfiles/exporter/note_off_move_conflict_2.midica b/test/org/midica/testfiles/exporter/note_off_move_conflict_2.midica index d4e3b32..fee89d0 100755 --- a/test/org/midica/testfiles/exporter/note_off_move_conflict_2.midica +++ b/test/org/midica/testfiles/exporter/note_off_move_conflict_2.midica @@ -4,7 +4,7 @@ END 0 - /4 0 c /4 d=100% -0 d,b /4 +0 d/b /4 0 b /4 * tempo 95 diff --git a/test/org/midica/testfiles/exporter/note_off_move_conflict_3.midica b/test/org/midica/testfiles/exporter/note_off_move_conflict_3.midica index f75054d..dca0d61 100755 --- a/test/org/midica/testfiles/exporter/note_off_move_conflict_3.midica +++ b/test/org/midica/testfiles/exporter/note_off_move_conflict_3.midica @@ -3,7 +3,7 @@ INSTRUMENTS END 0 c /4 d=100% -0 d,b /4 +0 d/b /4 0 b /4 * tempo 95 diff --git a/test/org/midica/testfiles/failing/chord-assigner-double.midica b/test/org/midica/testfiles/failing/chord-assigner-double.midica index 157406b..0a0bf81 100755 --- a/test/org/midica/testfiles/failing/chord-assigner-double.midica +++ b/test/org/midica/testfiles/failing/chord-assigner-double.midica @@ -2,6 +2,6 @@ INSTRUMENTS 0 PERCUSSIVE_ORGAN PERCUSSIVE_ORGAN END -CHORD crd==c,d,e +CHORD crd==c/d/e 0 crd /4 v=101 diff --git a/test/org/midica/testfiles/failing/chord-name-like-note.midica b/test/org/midica/testfiles/failing/chord-name-like-note.midica index 4811a62..4b1ab8a 100644 --- a/test/org/midica/testfiles/failing/chord-name-like-note.midica +++ b/test/org/midica/testfiles/failing/chord-name-like-note.midica @@ -1,2 +1,2 @@ INCLUDE inc/instruments.midica -CHORD c# c,d,c +CHORD c# c/d/c diff --git a/test/org/midica/testfiles/failing/chord-name-like-percussion.midica b/test/org/midica/testfiles/failing/chord-name-like-percussion.midica index 8b2140f..cc8b05a 100644 --- a/test/org/midica/testfiles/failing/chord-name-like-percussion.midica +++ b/test/org/midica/testfiles/failing/chord-name-like-percussion.midica @@ -1,2 +1,2 @@ INCLUDE inc/instruments.midica -CHORD hhc c,d,e +CHORD hhc c/d/e diff --git a/test/org/midica/testfiles/failing/chord-redefined.midica b/test/org/midica/testfiles/failing/chord-redefined.midica index 1f39bcb..52c2177 100644 --- a/test/org/midica/testfiles/failing/chord-redefined.midica +++ b/test/org/midica/testfiles/failing/chord-redefined.midica @@ -1,3 +1,3 @@ INCLUDE inc/instruments.midica -CHORD test c,d,e -CHORD test c,d,e +CHORD test c/d/e +CHORD test c/d/e diff --git a/test/org/midica/testfiles/failing/chord-separator-double.midica b/test/org/midica/testfiles/failing/chord-separator-double.midica index c43a63c..cb0f9bc 100755 --- a/test/org/midica/testfiles/failing/chord-separator-double.midica +++ b/test/org/midica/testfiles/failing/chord-separator-double.midica @@ -2,6 +2,10 @@ INSTRUMENTS 0 PERCUSSIVE_ORGAN PERCUSSIVE_ORGAN END +// a double chord separator looks like a comment symbol. So we must redefine the chord separator +// in order to test this. +DEFINE CHORD_SEPARATOR , + CHORD crd=c,d,,e 0 crd /4 v=101 diff --git a/test/org/midica/testfiles/failing/chord-separator-leading.midica b/test/org/midica/testfiles/failing/chord-separator-leading.midica index 12edf8c..3cb33df 100755 --- a/test/org/midica/testfiles/failing/chord-separator-leading.midica +++ b/test/org/midica/testfiles/failing/chord-separator-leading.midica @@ -2,6 +2,6 @@ INSTRUMENTS 0 PERCUSSIVE_ORGAN PERCUSSIVE_ORGAN END -CHORD crd = ,c,d,e +CHORD crd = /c/d/e 0 crd /4 v=101 diff --git a/test/org/midica/testfiles/failing/chord-separator-trailing.midica b/test/org/midica/testfiles/failing/chord-separator-trailing.midica index e19622c..04d8126 100755 --- a/test/org/midica/testfiles/failing/chord-separator-trailing.midica +++ b/test/org/midica/testfiles/failing/chord-separator-trailing.midica @@ -2,6 +2,6 @@ INSTRUMENTS 0 PERCUSSIVE_ORGAN PERCUSSIVE_ORGAN END -CHORD crd = c,d,e, +CHORD crd = c/d/e/ 0 crd /4 v=101 diff --git a/test/org/midica/testfiles/failing/chord-with-duplicate-note.midica b/test/org/midica/testfiles/failing/chord-with-duplicate-note.midica index aca06cf..7bd742f 100644 --- a/test/org/midica/testfiles/failing/chord-with-duplicate-note.midica +++ b/test/org/midica/testfiles/failing/chord-with-duplicate-note.midica @@ -1,2 +1,2 @@ INCLUDE inc/instruments.midica -CHORD test c,d,c +CHORD test c/d/c diff --git a/test/org/midica/testfiles/failing/compact-pattern-call-with-options.midica b/test/org/midica/testfiles/failing/compact-pattern-call-with-options.midica index 9afb39f..ff32554 100644 --- a/test/org/midica/testfiles/failing/compact-pattern-call-with-options.midica +++ b/test/org/midica/testfiles/failing/compact-pattern-call-with-options.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0: c d e:8 f,e,d,c:pat(foo,bar)q=2,m a b c +0: c d e:8 f/e/d/c:pat(foo,bar)q=2,m a b c PATTERN pat 0 /8 diff --git a/test/org/midica/testfiles/failing/compact-pattern-call-with-whitespace.midica b/test/org/midica/testfiles/failing/compact-pattern-call-with-whitespace.midica index b6e71f2..bdd4d0a 100644 --- a/test/org/midica/testfiles/failing/compact-pattern-call-with-whitespace.midica +++ b/test/org/midica/testfiles/failing/compact-pattern-call-with-whitespace.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0: c d e:8 f,e,d,c:pat(foo, bar) a b c +0: c d e:8 f/e/d/c:pat(foo, bar) a b c PATTERN pat 0 /8 diff --git a/test/org/midica/testfiles/failing/compact-pattern-with-wrong-index.midica b/test/org/midica/testfiles/failing/compact-pattern-with-wrong-index.midica index 4cda4fe..562bc56 100644 --- a/test/org/midica/testfiles/failing/compact-pattern-with-wrong-index.midica +++ b/test/org/midica/testfiles/failing/compact-pattern-with-wrong-index.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0: c d e:8 f,e,d,c:pat(foo,bar) a b c +0: c d e:8 f/e/d/c:pat(foo,bar) a b c PATTERN pat : 0 1 diff --git a/test/org/midica/testfiles/failing/compact-unknown-pattern.midica b/test/org/midica/testfiles/failing/compact-unknown-pattern.midica index 3d951a4..b561079 100644 --- a/test/org/midica/testfiles/failing/compact-unknown-pattern.midica +++ b/test/org/midica/testfiles/failing/compact-unknown-pattern.midica @@ -1,3 +1,3 @@ INCLUDE inc/instruments.midica -0: c c c,d,e:pat_none c c +0: c c c/d/e:pat_none c c diff --git a/test/org/midica/testfiles/failing/const-already-defined.midica b/test/org/midica/testfiles/failing/const-already-defined.midica index 7026064..ff8429f 100644 --- a/test/org/midica/testfiles/failing/const-already-defined.midica +++ b/test/org/midica/testfiles/failing/const-already-defined.midica @@ -1,7 +1,7 @@ INCLUDE inc/instruments.midica -CONST $crd c,d,e -CONST $crd c+,d+,e+ +CONST $crd c/d/e +CONST $crd c+/d+/e+ CHORD test $crd diff --git a/test/org/midica/testfiles/failing/define-assigner-double-2.midica b/test/org/midica/testfiles/failing/define-assigner-double-2.midica index c10c15a..b3f31d6 100755 --- a/test/org/midica/testfiles/failing/define-assigner-double-2.midica +++ b/test/org/midica/testfiles/failing/define-assigner-double-2.midica @@ -5,6 +5,6 @@ END DEFINE CHORD==CRD -CRD crd c,d,e +CRD crd c/d/e 0 crd /4 v=99 diff --git a/test/org/midica/testfiles/failing/define-assigner-double.midica b/test/org/midica/testfiles/failing/define-assigner-double.midica index a0f90e0..fe7bd91 100755 --- a/test/org/midica/testfiles/failing/define-assigner-double.midica +++ b/test/org/midica/testfiles/failing/define-assigner-double.midica @@ -5,6 +5,6 @@ END DEFINE CHORD == CRD -CRD crd c,d,e +CRD crd c/d/e 0 crd /4 v=99 diff --git a/test/org/midica/testfiles/failing/define-not-enough-args.midica b/test/org/midica/testfiles/failing/define-not-enough-args.midica index dac5339..5145741 100644 --- a/test/org/midica/testfiles/failing/define-not-enough-args.midica +++ b/test/org/midica/testfiles/failing/define-not-enough-args.midica @@ -2,6 +2,6 @@ INCLUDE inc/instruments.midica DEFINE CHORD -crd test c,d,e +crd test c/d/e 0 test /4 diff --git a/test/org/midica/testfiles/failing/define-too-many-args.midica b/test/org/midica/testfiles/failing/define-too-many-args.midica index 30f8ba9..62fd01a 100644 --- a/test/org/midica/testfiles/failing/define-too-many-args.midica +++ b/test/org/midica/testfiles/failing/define-too-many-args.midica @@ -2,6 +2,6 @@ INCLUDE inc/instruments.midica DEFINE CHORD crd crd -crd test c,d,e +crd test c/d/e 0 test /4 diff --git a/test/org/midica/testfiles/failing/define-unknown-id.midica b/test/org/midica/testfiles/failing/define-unknown-id.midica index f1f1587..3745e71 100644 --- a/test/org/midica/testfiles/failing/define-unknown-id.midica +++ b/test/org/midica/testfiles/failing/define-unknown-id.midica @@ -2,6 +2,6 @@ INCLUDE inc/instruments.midica DEFINE UNKNOWN_ID something -crd test c,d,e +crd test c/d/e 0 test /4 diff --git a/test/org/midica/testfiles/failing/pattern-before-instruments.midica b/test/org/midica/testfiles/failing/pattern-before-instruments.midica index e9f4beb..da1c782 100644 --- a/test/org/midica/testfiles/failing/pattern-before-instruments.midica +++ b/test/org/midica/testfiles/failing/pattern-before-instruments.midica @@ -1,6 +1,6 @@ PATTERN pat - 0,1 /4 + 0/1 /4 END -0 c,d pat +0 c/d pat diff --git a/test/org/midica/testfiles/failing/pattern-call-index-too-high.midica b/test/org/midica/testfiles/failing/pattern-call-index-too-high.midica index 665366e..21ce0d5 100644 --- a/test/org/midica/testfiles/failing/pattern-call-index-too-high.midica +++ b/test/org/midica/testfiles/failing/pattern-call-index-too-high.midica @@ -5,6 +5,6 @@ PATTERN pat 1 /4 END -0 c,d pat -0 e,f pat +0 c/d pat +0 e/f pat 0 c pat diff --git a/test/org/midica/testfiles/failing/pattern-call-index-wrong.midica b/test/org/midica/testfiles/failing/pattern-call-index-wrong.midica index f74daba..d84dc9e 100644 --- a/test/org/midica/testfiles/failing/pattern-call-index-wrong.midica +++ b/test/org/midica/testfiles/failing/pattern-call-index-wrong.midica @@ -5,6 +5,6 @@ PATTERN pat 1.2 /4 END -0 c,d pat -0 e,f pat -0 c,d pat +0 c/d pat +0 e/f pat +0 c/d pat diff --git a/test/org/midica/testfiles/failing/pattern-call-without-param-close.midica b/test/org/midica/testfiles/failing/pattern-call-without-param-close.midica index f328101..3837c89 100644 --- a/test/org/midica/testfiles/failing/pattern-call-without-param-close.midica +++ b/test/org/midica/testfiles/failing/pattern-call-without-param-close.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d,e simple(foo, bar q=2, m +0 c/d/e simple(foo, bar q=2, m PATTERN simple 0 /4 diff --git a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-2.midica b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-2.midica index f0c1f9c..c05c51b 100644 --- a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-2.midica +++ b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-2.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0: c,d:pat_a +0: c/d:pat_a PATTERN pat_a { if $NC == 2 diff --git a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-3.midica b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-3.midica index b19275f..d8d3859 100644 --- a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-3.midica +++ b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-3.midica @@ -1,10 +1,10 @@ INCLUDE inc/instruments.midica -0: c,d:pat_a +0: c/d:pat_a PATTERN pat_a { if $NC == 2 - : 0,1,2 + : 0/1/2 } END diff --git a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-4.midica b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-4.midica index dc09bda..ca1edda 100644 --- a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-4.midica +++ b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high-4.midica @@ -1,10 +1,10 @@ INCLUDE inc/instruments.midica -0: c,d:pat_a +0: c/d:pat_a PATTERN pat_a { if $NC == 2 - 0,1,2 /4 + 0/1/2 /4 } END diff --git a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high.midica b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high.midica index 00b4ee4..cfc60c2 100644 --- a/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high.midica +++ b/test/org/midica/testfiles/failing/pattern-magic-cond-idx-too-high.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0: c,d:pat_a +0: c/d:pat_a PATTERN pat_a { if $NC == 2 diff --git a/test/org/midica/testfiles/failing/pattern-recursion.midica b/test/org/midica/testfiles/failing/pattern-recursion.midica index ce34bad..55af48f 100644 --- a/test/org/midica/testfiles/failing/pattern-recursion.midica +++ b/test/org/midica/testfiles/failing/pattern-recursion.midica @@ -1,13 +1,13 @@ INCLUDE inc/instruments.midica PATTERN first - 0,1 /4 - 0,1 second + 0/1 /4 + 0/1 second END PATTERN second 1 /8 - 1,0 first + 1/0 first END -0 c,d first +0 c/d first diff --git a/test/org/midica/testfiles/failing/pattern-stacktrace-2.midica b/test/org/midica/testfiles/failing/pattern-stacktrace-2.midica index 441ac9f..9ad51cc 100644 --- a/test/org/midica/testfiles/failing/pattern-stacktrace-2.midica +++ b/test/org/midica/testfiles/failing/pattern-stacktrace-2.midica @@ -2,5 +2,5 @@ INCLUDE inc/instruments.midica INCLUDE inc/pat-st-incl.midica { - 0 c,d pat_out q=2, m + 0 c/d pat_out q=2, m } diff --git a/test/org/midica/testfiles/failing/pattern-stacktrace.midica b/test/org/midica/testfiles/failing/pattern-stacktrace.midica index 65573c7..7579272 100644 --- a/test/org/midica/testfiles/failing/pattern-stacktrace.midica +++ b/test/org/midica/testfiles/failing/pattern-stacktrace.midica @@ -16,7 +16,7 @@ END FUNCTION test - 0 c,d pat q=2, m + 0 c/d pat q=2, m END diff --git a/test/org/midica/testfiles/failing/pattern-undefined-2.midica b/test/org/midica/testfiles/failing/pattern-undefined-2.midica index 72a203c..651bbd3 100644 --- a/test/org/midica/testfiles/failing/pattern-undefined-2.midica +++ b/test/org/midica/testfiles/failing/pattern-undefined-2.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d,e pat_a( y ) +0 c/d/e pat_a( y ) PATTERN pat_a 0 /42 diff --git a/test/org/midica/testfiles/failing/pattern-undefined.midica b/test/org/midica/testfiles/failing/pattern-undefined.midica index 0e6f46a..6751937 100644 --- a/test/org/midica/testfiles/failing/pattern-undefined.midica +++ b/test/org/midica/testfiles/failing/pattern-undefined.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d,e pat_a( y ) +0 c/d/e pat_a( y ) PATTERN pat_a 0 not_existing_pattern( x, y, z ) v = 120 , d = 80% diff --git a/test/org/midica/testfiles/failing/pattern-with-if-2.midica b/test/org/midica/testfiles/failing/pattern-with-if-2.midica index f1ab0e9..063265c 100644 --- a/test/org/midica/testfiles/failing/pattern-with-if-2.midica +++ b/test/org/midica/testfiles/failing/pattern-with-if-2.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d,e pat_a( y ) +0 c/d/e pat_a( y ) PATTERN pat_a 0 pat_b( x, y, z ) if $[0] == x diff --git a/test/org/midica/testfiles/failing/pattern-with-if.midica b/test/org/midica/testfiles/failing/pattern-with-if.midica index 9a9df55..839f896 100644 --- a/test/org/midica/testfiles/failing/pattern-with-if.midica +++ b/test/org/midica/testfiles/failing/pattern-with-if.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d,e pat_a( y ) +0 c/d/e pat_a( y ) PATTERN pat_a 0 /1 if $[0] == x diff --git a/test/org/midica/testfiles/failing/stacktrace-compact-pattern.midica b/test/org/midica/testfiles/failing/stacktrace-compact-pattern.midica index 7a350b3..14712dd 100644 --- a/test/org/midica/testfiles/failing/stacktrace-compact-pattern.midica +++ b/test/org/midica/testfiles/failing/stacktrace-compact-pattern.midica @@ -19,7 +19,7 @@ FUNCTION func 0: c d e 0: c d e 0: c d e - 0: c d e f,e,d,c:pat1($[0],$[1]) a b c // pat1(foo, bar) + 0: c d e f/e/d/c:pat1($[0],$[1]) a b c // pat1(foo, bar) 0: c d e 0: c d e 0: c d e @@ -34,9 +34,9 @@ PATTERN pat1 { - : 0 1 0,1 - : 0 1 0,1,2:pat2(f=$[0],b=$[1]) // pat2(f=foo, b=bar) - : 0 1 0,1,2:pat2(f=baz,b=$[1]) // pat2(f=baz, b=bar) + : 0 1 0/1 + : 0 1 0/1/2:pat2(f=$[0],b=$[1]) // pat2(f=foo, b=bar) + : 0 1 0/1/2:pat2(f=baz,b=$[1]) // pat2(f=baz, b=bar) : 0 1 2 } @@ -46,24 +46,24 @@ END PATTERN pat2 { - : 0,1:8 0:4 1 0,1 + : 0/1:8 0:4 1 0/1 : 0 0 1 1 0 0 1 { if ${f} == foo : 0 0 1 1 - : 0 0,1 0,1,2:pat3(/4) 1 1,0 + : 0 0/1 0/1/2:pat3(/4) 1 1/0 : 1 1 } { else : 0 1 2 - : 0,1,2:pat3(-) + : 0/1/2:pat3(-) } } END PATTERN pat3 - : 0 1 2 0,1,2 + : 0 1 2 0/1/2 : 1 2 2 - : 0,1,2:$[0] + : 0/1/2:$[0] : 0 1 2 END diff --git a/test/org/midica/testfiles/failing/stacktrace-function.midica b/test/org/midica/testfiles/failing/stacktrace-function.midica index c5d5d6b..801451d 100644 --- a/test/org/midica/testfiles/failing/stacktrace-function.midica +++ b/test/org/midica/testfiles/failing/stacktrace-function.midica @@ -22,7 +22,7 @@ FUNCTION fun1 { - $[0] $[1],$[2] /4 + $[0] $[1]/$[2] /4 CALL fun2($[0],$[1],$[2],f=foo) CALL fun2($[0],$[1],$[2],f=bar) } @@ -33,7 +33,7 @@ END FUNCTION fun2 { - $[0] $[1],$[2] /4 + $[0] $[1]/$[2] /4 { if ${f} == foo CALL fun3($[0],$[1],$[2],/4) } @@ -44,6 +44,6 @@ FUNCTION fun2 END FUNCTION fun3 - $[0] $[1],$[2] $[3] + $[0] $[1]/$[2] $[3] END diff --git a/test/org/midica/testfiles/failing/stacktrace-pattern.midica b/test/org/midica/testfiles/failing/stacktrace-pattern.midica index 3f79a8e..e6de4f8 100644 --- a/test/org/midica/testfiles/failing/stacktrace-pattern.midica +++ b/test/org/midica/testfiles/failing/stacktrace-pattern.midica @@ -13,7 +13,7 @@ INCLUDE inc/instruments.midica CALL func(foo, bar) FUNCTION func - 0 f,e,d,c pat1($[0], $[1]) // pat1(foo, bar) + 0 f/e/d/c pat1($[0], $[1]) // pat1(foo, bar) END PATTERN pat1 @@ -22,9 +22,9 @@ PATTERN pat1 { - 0,1 /4 - 0,1,2 pat2( f = $[0], b = $[1] ) // pat2(f=foo, b=baz) - 0,1,2 pat2( f = bar, b = $[1] ) // pat2(f=bar, b=baz) + 0/1 /4 + 0/1/2 pat2( f = $[0], b = $[1] ) // pat2(f=foo, b=baz) + 0/1/2 pat2( f = bar, b = $[1] ) // pat2(f=bar, b=baz) } } @@ -33,17 +33,17 @@ END PATTERN pat2 { - 0,1 /4 + 0/1 /4 { if ${f} == foo - 0,1,2 pat3(/4) + 0/1/2 pat3(/4) } { else - 0,1,2 pat3(-) + 0/1/2 pat3(-) } } END PATTERN pat3 - 0,1,2 $[0] + 0/1/2 $[0] END diff --git a/test/org/midica/testfiles/failing/zero-for-chord.midica b/test/org/midica/testfiles/failing/zero-for-chord.midica index 218b237..7aea0cc 100644 --- a/test/org/midica/testfiles/failing/zero-for-chord.midica +++ b/test/org/midica/testfiles/failing/zero-for-chord.midica @@ -1,3 +1,3 @@ INCLUDE inc/instruments.midica -0 c,d - +0 c/d - diff --git a/test/org/midica/testfiles/failing/zero-for-note-2.midica b/test/org/midica/testfiles/failing/zero-for-note-2.midica index dacdf1e..e87986d 100644 --- a/test/org/midica/testfiles/failing/zero-for-note-2.midica +++ b/test/org/midica/testfiles/failing/zero-for-note-2.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d pat +0 c/d pat PATTERN pat { diff --git a/test/org/midica/testfiles/failing/zero-with-m-2.midica b/test/org/midica/testfiles/failing/zero-with-m-2.midica index 700ed5c..4a38848 100644 --- a/test/org/midica/testfiles/failing/zero-with-m-2.midica +++ b/test/org/midica/testfiles/failing/zero-with-m-2.midica @@ -1,6 +1,6 @@ INCLUDE inc/instruments.midica -0 c,d pat +0 c/d pat PATTERN pat - - m diff --git a/test/org/midica/testfiles/failing/zero-with-m-3.midica b/test/org/midica/testfiles/failing/zero-with-m-3.midica index 0dc6feb..ca52e5c 100644 --- a/test/org/midica/testfiles/failing/zero-with-m-3.midica +++ b/test/org/midica/testfiles/failing/zero-with-m-3.midica @@ -5,7 +5,7 @@ CALL f FUNCTION f { { - 0 c,d pat + 0 c/d pat } } END diff --git a/test/org/midica/testfiles/working/alternative-note-names.midica b/test/org/midica/testfiles/working/alternative-note-names.midica index d6fb081..a852f53 100644 --- a/test/org/midica/testfiles/working/alternative-note-names.midica +++ b/test/org/midica/testfiles/working/alternative-note-names.midica @@ -1,7 +1,7 @@ INCLUDE inc/instruments.midica -CHORD crd1 = bbb, c##, dbb // a, d, c -CHORD crd2 = a, d, c +CHORD crd1 = bbb/ c##/ dbb // a/ d/ c +CHORD crd2 = a/ d/ c 0 crd1 /4 0 crd2 /4 diff --git a/test/org/midica/testfiles/working/chords.midica b/test/org/midica/testfiles/working/chords.midica index db7cdc5..2d5d320 100644 --- a/test/org/midica/testfiles/working/chords.midica +++ b/test/org/midica/testfiles/working/chords.midica @@ -1,9 +1,9 @@ INCLUDE inc/instruments.midica 1 ch3 /4 -1 bbb,c##,dbb /4 +1 bbb/c##/dbb /4 -CHORD ch1=c,d,e +CHORD ch1=c/d/e CHORD ch2 f g 99 FUNCTION test @@ -11,22 +11,22 @@ FUNCTION test 0 ch1 /4 0 ch2 /4 0 ch3 /4 - 0 c,e,g /4 + 0 c/e/g /4 } 0 c /4 - 1 bbb,c##,dbb /8 + 1 bbb/c##/dbb /8 1 ch3 /8 END CALL test q=3 -0 c,e,g /4 +0 c/e/g /4 { - 0 c,e,g /4 + 0 c/e/g /4 } -CHORD ch3 bbb, c##, dbb +CHORD ch3 bbb/ c##/ dbb -CHORD perc = to, bd1, sd1 +CHORD perc = to/ bd1/ sd1 p: perc:4 { 9: perc:4 @@ -35,5 +35,5 @@ p: perc:4 } } -2: (m,d=100%) c+,e+:2 -:*1 -2 c+,e+ /2 m, d=100% +2: (m,d=100%) c+/e+:2 -:*1 +2 c+/e+ /2 m, d=100% diff --git a/test/org/midica/testfiles/working/compact-drum-only.midica b/test/org/midica/testfiles/working/compact-drum-only.midica index 27b5e96..7fc2a4a 100644 --- a/test/org/midica/testfiles/working/compact-drum-only.midica +++ b/test/org/midica/testfiles/working/compact-drum-only.midica @@ -1,2 +1,2 @@ -p: sd1 bd1,hhc:8 -9: sd1 bd1,hhc:/4 \ No newline at end of file +p: sd1 bd1/hhc:8 +9: sd1 bd1/hhc:/4 \ No newline at end of file diff --git a/test/org/midica/testfiles/working/compact-oto.midica b/test/org/midica/testfiles/working/compact-oto.midica index f1dd968..7a2f0b0 100644 --- a/test/org/midica/testfiles/working/compact-oto.midica +++ b/test/org/midica/testfiles/working/compact-oto.midica @@ -20,7 +20,7 @@ PATTERN pat { : (m) 0 1 } - : (tr=32) 0,1:16 + : (tr=32) 0/1:16 END -2: c (m,q=2) d,e:pat f:*2 g +2: c (m,q=2) d/e:pat f:*2 g diff --git a/test/org/midica/testfiles/working/compact-syntax.midica b/test/org/midica/testfiles/working/compact-syntax.midica index c421009..920a95d 100644 --- a/test/org/midica/testfiles/working/compact-syntax.midica +++ b/test/org/midica/testfiles/working/compact-syntax.midica @@ -3,14 +3,14 @@ INCLUDE inc/instruments.midica // channel 0 0: c // c:/4 (0) 0: d e:/8 f g g:/4 // d:/4 (480) e:/8 (960) f:/8 (1200) g:/8 (1440) g:/4 (1680) -0: a b,c+,d+,e+:/1 - f+:/8 g+:4 // a:/4 (2160) b,c+,d+,e+:/1 (2640) -:/1 (4560) f+:/8 (6480) g+:/4 (6720) +0: a b/c+/d+/e+:/1 - f+:/8 g+:4 // a:/4 (2160) b/c+/d+/e+:/1 (2640) -:/1 (4560) f+:/8 (6480) g+:/4 (6720) { t, s=-12 0: c d:8 // c-:/4t (7200) d-:/8t (7520) - 0: c d,e - f // c-:/8t (7680) d-,e-:/8t (7840) -:/8t (8000) f-:/8t (8160) + 0: c d/e - f // c-:/8t (7680) d-/e-:/8t (7840) -:/8t (8000) f-:/8t (8160) 0: c d e:/2 // c-:/8t (8320) d-:/8t (8480) e-:/2t (8640) { t=2:1, s=+12 0: c d:8 // c-:/2tt2:1 (9280) d-:/8tt2:1 (9600) - 0: c d,e - f // c-:/8tt2:1 (9680) d-,e-:/8tt2:1 (9760) -:/8tt2:1 (9840) f-:/8tt2:1 (9920) + 0: c d/e - f // c-:/8tt2:1 (9680) d-/e-:/8tt2:1 (9760) -:/8tt2:1 (9840) f-:/8tt2:1 (9920) 0: c d e:/2 // c-:/8tt2:1 (10000) d-:/8tt2:1 (10080) e-:/2tt2:1 (10160) } 0: c d:8 // c-:/2t (10480) d-:/8t (11120) @@ -47,8 +47,8 @@ END // channel 3: patterns -CHORD crd = c+,d+,e+ -3: c c,d,e:pat_complex(/2,x=30) c crd:pat_complex(/4,x=40) c +CHORD crd = c+/d+/e+ +3: c c/d/e:pat_complex(/2,x=30) c crd:pat_complex(/4,x=40) c PATTERN pat_complex 0 /4 1 /8 v=${x} @@ -73,19 +73,19 @@ END FUNCTION f4b { { - $[0]: c c,d,e:pat_complex($[1],x=$[2]) c crd:pat_complex($[3],x=$[4]) $[5] + $[0]: c c/d/e:pat_complex($[1],x=$[2]) c crd:pat_complex($[3],x=$[4]) $[5] } } END // channel 5: compact patterns -CHORD cmaj = c,d,e -CHORD cmaj_reverse = e,d,c -5: c,d,e:pat_outer(70) c+ e,d,c:pat_outer(60) c+ cmaj:pat_outer(50) c+ cmaj_reverse:pat_outer(40) c+ +CHORD cmaj = c/d/e +CHORD cmaj_reverse = e/d/c +5: c/d/e:pat_outer(70) c+ e/d/c:pat_outer(60) c+ cmaj:pat_outer(50) c+ cmaj_reverse:pat_outer(40) c+ PATTERN pat_outer : (v=$[0]) 0 - : 0 1 2 2,1,0:pat_inner(/2,v1=20,v2=30) + : 0 1 2 2/1/0:pat_inner(/2,v1=20,v2=30) : 0 -:8 0 END PATTERN pat_inner @@ -141,7 +141,7 @@ FUNCTION f8 $c: c d // c(11640) d(12600) } { t - $c: f c,d,e:pat7 f g // f(13560) + $c: f c/d/e:pat7 f g // f(13560) // c(14200) d(14440) e(14680) // f(14920) g(15560) $c: // no-op command diff --git a/test/org/midica/testfiles/working/define.midica b/test/org/midica/testfiles/working/define.midica index 9420354..29a1482 100644 --- a/test/org/midica/testfiles/working/define.midica +++ b/test/org/midica/testfiles/working/define.midica @@ -8,7 +8,7 @@ instruments[ % comment perc 0 standard percussion % comment ] % comment -0 / /8 // ch0: 240, ch9: 0 +0 ^ /8 // ch0: 240, ch9: 0 glob % ch0: 240, ch9: 240 procedure[ test % comment @@ -19,7 +19,7 @@ procedure[ test % comment ] def COMMENT % // changing the comment symbol -DEFINE REST / % using the new comment symbol +DEFINE REST ^ % using the new comment symbol def CHORD crd // using the old comment symbol @@ -28,5 +28,5 @@ incl_f inc/channel-cmds.midica % ch0: 2640, ch9: 2160 INCLUDE inc/channel-cmds.midica // ch0: 3120, ch9: 2160 load_sb java-emergency-soundfont.sf2 % comment -0 / _ // zero-length +0 ^ _ // zero-length diff --git a/test/org/midica/testfiles/working/drum-only-with-channel-options.midica b/test/org/midica/testfiles/working/drum-only-with-channel-options.midica index af50e08..691c5f0 100644 --- a/test/org/midica/testfiles/working/drum-only-with-channel-options.midica +++ b/test/org/midica/testfiles/working/drum-only-with-channel-options.midica @@ -1 +1 @@ -p bd1,to /1 tr=/32, v=120, d=30% \ No newline at end of file +p bd1/to /1 tr=/32, v=120, d=30% \ No newline at end of file diff --git a/test/org/midica/testfiles/working/functions.midica b/test/org/midica/testfiles/working/functions.midica index 21d6247..27c1cf0 100644 --- a/test/org/midica/testfiles/working/functions.midica +++ b/test/org/midica/testfiles/working/functions.midica @@ -29,8 +29,8 @@ FUNCTION test4 0 c /4 END -FUNCTION test3 // 4800 - CALL test1(/4) // 2880 +FUNCTION test3 // 4800 + CALL test1(/4) // 2880 CALL test2(dur=/2,l1=bbb,??) // 1920 END diff --git a/test/org/midica/testfiles/working/legato-correction.midica b/test/org/midica/testfiles/working/legato-correction.midica index 1fc0c55..a64d04b 100644 --- a/test/org/midica/testfiles/working/legato-correction.midica +++ b/test/org/midica/testfiles/working/legato-correction.midica @@ -12,9 +12,9 @@ END 0 e /4 // with chord -1 c,d,e /4 d=500%, v=102 +1 c/d/e /4 d=500%, v=102 1 f /4 -1 g,d,a /4 +1 g/d/a /4 // with shift 2 c /4 d=300%, v=35 diff --git a/test/org/midica/testfiles/working/pattern-magic-vars.midica b/test/org/midica/testfiles/working/pattern-magic-vars.midica index 10735a0..6c11d99 100644 --- a/test/org/midica/testfiles/working/pattern-magic-vars.midica +++ b/test/org/midica/testfiles/working/pattern-magic-vars.midica @@ -11,10 +11,10 @@ PATTERN pat_488 : 0:4 0:8 0 } { elsif $NC == 2 - : 0,1:4 0,1:8 0,1 + : 0/1:4 0/1:8 0/1 } { elsif $NC == 3 - : 0,1,2:4 0,1,2:8 0,1,2 + : 0/1/2:4 0/1/2:8 0/1/2 } END @@ -23,8 +23,8 @@ END 0 crd3 pat_488 0 c pat_488 -0: c+,d+:pat_488 -0: c+2,d+2,e+2:pat_488 +0: c+/d+:pat_488 +0: c+2/d+2/e+2:pat_488 // channel 1 @@ -34,17 +34,17 @@ PATTERN pat_4 0 /4 } { elsif $NC == 2 - 0,1 /4 + 0/1 /4 } { elsif $NC == 3 - 0,1,2 /4 + 0/1/2 /4 } } END 1: c:pat_4 -1 c+,d+ pat_4 -1 c+2,d+2,e+2 pat_4 +1 c+/d+ pat_4 +1 c+2/d+2/e+2 pat_4 // channel 2 @@ -66,16 +66,16 @@ PATTERN pat_order_x2_down $REV pat_order_up END -2: c+,d+:pat_order_x2_up -2: c+,d+:pat_order_x2_down -2 c+2,d+2,e+2 pat_order_x2_up -2 c+2,d+2,e+2 pat_order_x2_down +2: c+/d+:pat_order_x2_up +2: c+/d+:pat_order_x2_down +2 c+2/d+2/e+2 pat_order_x2_up +2 c+2/d+2/e+2 pat_order_x2_down // channel 3 PATTERN pat_outer : 2 - : 0,2:pat_inner + : 0/2:pat_inner 2 /4 : $ALL END @@ -84,8 +84,8 @@ PATTERN pat_inner $REV /4 END -3: c,d,e:pat_outer -3 c+,d+,e+ pat_outer +3: c/d/e:pat_outer +3 c+/d+/e+ pat_outer // channel 4 @@ -103,11 +103,11 @@ PATTERN pat_4b END 4: c:pat_4b(/4) -4 c+,d+ pat_4b(/4) -4 c+2,d+2,e+2 pat_4b(/4) +4 c+/d+ pat_4b(/4) +4 c+2/d+2/e+2 pat_4b(/4) // channel 9 p: sl:pat_488 -p slap,cla pat_488 +p slap/cla pat_488 diff --git a/test/org/midica/testfiles/working/patterns.midica b/test/org/midica/testfiles/working/patterns.midica index b39c4fe..64c6674 100644 --- a/test/org/midica/testfiles/working/patterns.midica +++ b/test/org/midica/testfiles/working/patterns.midica @@ -13,7 +13,7 @@ PATTERN pat_qvd 0 /4 1 /8 2 /16 q=2, v=127, d=10% - 0,1,2 /4 + 0/1/2 /4 END PATTERN pat_mtr @@ -27,7 +27,7 @@ END // PART 1: // q+m as outer options, m+v+d as inner options -0 c,e,g pat_qvd q=2, m +0 c/e/g pat_qvd q=2, m 0 c+3 /8 0 - *2 @@ -36,11 +36,11 @@ END // 0 c /4 // 0 e /8 // 0 g /4 v=127, d=10% -// 0 c,e,g /16 +// 0 c/e/g /16 // 0 c /4 v=90, d=80% // 0 e /8 // 0 g /16 v=127, d=10% -// 0 c,e,g /4 +// 0 c/e/g /4 // PART 2: // v+d as outer options, no inner options @@ -94,8 +94,8 @@ END 1 c_maj pat_ch129 1 c_maj_rev pat_ch129 -1 c,d pat_ch129 -1 d,c pat_ch129 +1 c/d pat_ch129 +1 d/c pat_ch129 // same as: // 0 c /4 @@ -115,8 +115,8 @@ END // channel 9: //////////////////////////////////////////////////////////// -p bd1,hhc pat_ch129 -p hhc,bd1 pat_ch129 +p bd1/hhc pat_ch129 +p hhc/bd1 pat_ch129 // same as: // 0 bd1 /4 @@ -140,7 +140,7 @@ END FUNCTION func2 { { - 2 e,c pat_ch129 q=2, m + 2 e/c pat_ch129 q=2, m } } END @@ -163,7 +163,7 @@ PATTERN pat_with_blocks 1 /4 } END -3 e,c pat_with_blocks v=120 +3 e/c pat_with_blocks v=120 //////////////////////////////////////////////////////////// // channel 4: @@ -171,15 +171,15 @@ END PATTERN pat_out 0 /4 - 3,2 pat_in + 3/2 pat_in END PATTERN pat_in - /8 - 0,1 /8 + 0/1 /8 END -4 c,d,e,f pat_out +4 c/d/e/f pat_out //////////////////////////////////////////////////////////// // channel 5: @@ -211,21 +211,21 @@ PATTERN upstroke_name } m - ${length} END -5 f,e,d,c upstroke_number ( /32 , /1 ) +5 f/e/d/c upstroke_number ( /32 , /1 ) 5 - /1 -5 f,e,d,c upstroke_number ( /32 , /1 ) q=2 +5 f/e/d/c upstroke_number ( /32 , /1 ) q=2 5 - /1 -5 f,e,d,c upstroke_name(distance=/32,length=/1) q=2 +5 f/e/d/c upstroke_name(distance=/32,length=/1) q=2 5 - /1 -5 f,e,d,c cond_pattern(foo) // if ==> f -5 f,e,d,c cond_pattern(bar=123) // elsif ==> e -5 f,e,d,c cond_pattern(bar) // else ==> d +5 f/e/d/c cond_pattern(foo) // if ==> f +5 f/e/d/c cond_pattern(bar=123) // elsif ==> e +5 f/e/d/c cond_pattern(bar) // else ==> d CALL try_cond(foo) // if ==> f FUNCTION try_cond { { - 5 f,e,d,c cond_pattern ( $[0] ) + 5 f/e/d/c cond_pattern ( $[0] ) } } END diff --git a/test/org/midica/testfiles/working/shift.midica b/test/org/midica/testfiles/working/shift.midica index 340dbb1..c00b468 100644 --- a/test/org/midica/testfiles/working/shift.midica +++ b/test/org/midica/testfiles/working/shift.midica @@ -22,7 +22,7 @@ END FUNCTION test2 0 c /4 // c / a#- / c+ / a# - 0 c,d /4 // c,d / a#-,c / c+,d+ / a#,c+ + 0 c/d /4 // c/d / a#-/c / c+/d+ / a#/c+ END // EXPECTED NOTE-ON MESSAGES: @@ -31,8 +31,8 @@ END // d e c a#- c // // CALL test1: -// c c c,d a#- a#-,c +// c c c/d a#- a#-/c // // CALL test1 s=12 -// c+ c+ c+,d+ a# a#,c+ +// c+ c+ c+/d+ a# a#/c+ // diff --git a/test/org/midica/testfiles/working/var.midica b/test/org/midica/testfiles/working/var.midica index 268185e..d14c45c 100644 --- a/test/org/midica/testfiles/working/var.midica +++ b/test/org/midica/testfiles/working/var.midica @@ -20,7 +20,7 @@ FUNCTION test1 $c $n /4 d = $staccato { q=$q $c $n $l d $staccato , v=$mezzoforte - $c $n,$n2 $l d $medium_duration + $c $n/$n2 $l d $medium_duration } VAR $c = 0 $c $n /4 d= $legato%,v=$forte diff --git a/test/org/midica/testfiles/working/zerolength.midica b/test/org/midica/testfiles/working/zerolength.midica index 558cbad..052d652 100644 --- a/test/org/midica/testfiles/working/zerolength.midica +++ b/test/org/midica/testfiles/working/zerolength.midica @@ -5,8 +5,8 @@ INCLUDE inc/instruments.midica CALL func -0 d,e,f pat -0 d,e,f pat v=110 +0 d/e/f pat +0 d/e/f pat v=110 0 c /1 0 - - l=xyz