diff --git a/lilypond/counterfeit_in_colonial_connecticut_score.pdf b/lilypond/counterfeit_in_colonial_connecticut_score.pdf index 00059cb..c74764b 100644 Binary files a/lilypond/counterfeit_in_colonial_connecticut_score.pdf and b/lilypond/counterfeit_in_colonial_connecticut_score.pdf differ diff --git a/lilypond/includes/cicc_guitar.ly b/lilypond/includes/cicc_guitar.ly index 4967fdd..1155045 100644 --- a/lilypond/includes/cicc_guitar.ly +++ b/lilypond/includes/cicc_guitar.ly @@ -17,7 +17,7 @@ a''8 _\markup{\concat{ II \super 0}} [ fis'''8 _\markup{\concat{ I \super 6}} \time 3/2 c'''8 _\markup{\concat{ I \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] d'4 _\markup{\concat{ VI \super 0}} e''4 _\markup{\concat{ IV \super 2}} d''8 _\markup{\concat{ IV \super 0}} [ dis'8 _\markup{\concat{ VI \super 1}} ] ~ dis'8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''4 | \bar ".|" \mark \markup { \bold \box 1.4 } \time 2/2 -c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''4 c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ~ c'''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ d'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ c'''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''4 d'2 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ d'8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''2 ~ d''16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''4 ~ c'''16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. | d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ d''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''2. ~ c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ | a''1 ~ | a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. ~ | d'4 d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ | d''2 ~ d''8 [ c'''8 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''1 ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2. ~ | a''1 ~ | a''1 | \bar "|.|" \mark \markup { \bold \box 2.1 } +c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''4 c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ~ c'''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ d'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ c'''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''4 d'2 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ d'8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''2 ~ d''16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''4 ~ c'''16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. | d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ d''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''2. ~ c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ | a''1 ~ | a''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. ~ | d'4 d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ | d''2 ~ d''8 [ c'''8 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''1 ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2. ~ | a''1 ~ | a''1 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 } \pageBreak d'4 _\markup{\concat{ VI \super 0}} b''8 _\markup{\concat{ IV \super 9}} [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ fis'''8. _\markup{\concat{ II \super 9}} ] d'8 _\markup{\concat{ VI \super 0}} [ d''8 _\markup{\concat{ IV \super 0}} ] ~ | d''16 [ a'''8 _\markup{\concat{ I \super 9}} fis'''16 _\markup{\concat{ II \super 9}} ] ~ fis'''8. [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ a'''8 _\markup{\concat{ I \super 9}} ] | a''8. _\markup{\concat{ II \super 0}} [ b''16 _\markup{\concat{ IV \super 9}} ] ~ b''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ a'''8. _\markup{\concat{ I \super 9}} ] d''8 _\markup{\concat{ IV \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] ~ | a''16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ c'''16 [ c''8 _\markup{\concat{ VI \super 10}} a'''16 _\markup{\concat{ I \super 9}} ] ~ a'''16 [ gis'''8. _\markup{\concat{ I \super 8}} ] ~ gis'''16 [ d''8 _\markup{\concat{ IV \super 0}} ais'16 _\markup{\concat{ VI \super 8}} ] ~ | ais'16 [ d''8 _\markup{\concat{ IV \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ gis'''8 _\markup{\concat{ I \super 8}} dis'''16 _\markup{\concat{ III \super 9}} ] ~ dis'''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ a'8. _\markup{\concat{ V \super 0}} ] | f'''4 _\markup{\concat{ II \super 8}} c'''8. _\markup{\concat{ I \super 0}} [ d'''16 _\markup{\concat{ III \super 8}} ] ~ d'''8 [ ais'8 _\markup{\concat{ VI \super 8}} ] ~ ais'16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'16 [ f'''8. _\markup{\concat{ II \super 8}} ] a'4 _\markup{\concat{ V \super 0}} a''8. _\markup{\concat{ II \super 0}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ d''8 _\markup{\concat{ IV \super 0}} ] | f'''8 _\markup{\concat{ II \super 8}} [ d'8 _\markup{\concat{ VI \super 0}} ] fis''8. _\markup{\concat{ III \super 0}} [ b''16 _\markup{\concat{ IV \super 9}} ] ~ b''8 [ ais''8 _\markup{\concat{ IV \super 8}} ] a''8 _\markup{\concat{ II \super 0}} [ ais'8 _\markup{\concat{ VI \super 8}} ] ~ | ais'16 [ fis''8. _\markup{\concat{ III \super 0}} ] ~ fis''16 [ ais''8. _\markup{\concat{ IV \super 8}} ] ~ ais''16 [ f'''8. _\markup{\concat{ II \super 8}} ] ~ f'''16 [ ais'8. _\markup{\concat{ VI \super 8}} ] ~ | ais'16 [ fis''8. _\markup{\concat{ III \super 0}} ] ais''8 _\markup{\concat{ IV \super 8}} [ a''8 _\markup{\concat{ II \super 0}} ] g''8 _\markup{\concat{ V \super 10}} [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ a''8. _\markup{\concat{ II \super 0}} ] | fis''8. _\markup{\concat{ V \super 9}} [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ f''8. _\markup{\concat{ V \super 8}} ] fis''8 _\markup{\concat{ III \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] ~ | a''8 [ f''8 _\markup{\concat{ V \super 8}} ] ~ f''16 [ fis''8. _\markup{\concat{ III \super 0}} ] a''8 _\markup{\concat{ II \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ c'''8 _\markup{\concat{ III \super 6}} ] | a''8 _\markup{\concat{ II \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ fis''8 _\markup{\concat{ III \super 0}} ] dis''4 _\markup{\concat{ V \super 6}} c'''8 _\markup{\concat{ I \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] | a''8. _\markup{\concat{ IV \super 7}} [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a''8 _\markup{\concat{ II \super 0}} d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ dis''8 _\markup{\concat{ V \super 6}} gis'''16 _\markup{\concat{ I \super 8}} ] ~ | gis'''16 [ g'''8. _\markup{\concat{ I \super 7}} ] a''8. _\markup{\concat{ II \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ dis''8 _\markup{\concat{ V \super 6}} ] c'''4 _\markup{\concat{ I \super 0}} | \time 3/2 @@ -25,7 +25,7 @@ a''8. _\markup{\concat{ II \super 0}} [ a''16 _\markup{\concat{ IV \super 7}} \time 2/2 dis''4 _\markup{\concat{ V \super 6}} ~ dis''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''8 [ gis''8 _\markup{\concat{ IV \super 6}} ] ~ gis''4 ~ | gis''4 dis''4 _\markup{\concat{ V \super 6}} ~ dis''16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ a''4 ~ | a''16 [ gis''8. _\markup{\concat{ IV \super 6}} ] ~ gis''2 g''4 _\markup{\concat{ IV \super 5}} | dis''8. _\markup{\concat{ V \super 6}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''4 ~ c'''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''4 ~ | a''4 gis''2. _\markup{\concat{ IV \super 6}} | g''4 _\markup{\concat{ IV \super 5}} dis''4 _\markup{\concat{ V \super 6}} a''2 _\markup{\concat{ II \super 0}} ~ | a''16 [ gis''8. _\markup{\concat{ IV \super 6}} ] ~ gis''2 ~ gis''8. [ g''16 _\markup{\concat{ IV \super 5}} ] ~ | g''4 dis''4 _\markup{\concat{ V \super 6}} ~ dis''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''4 ~ | a''4 ~ a''16 [ gis''8. _\markup{\concat{ IV \super 6}} ] ~ gis''2 ~ | gis''8. [ g''16 _\markup{\concat{ IV \super 5}} ] ~ g''4 a''2 _\markup{\concat{ II \super 0}} ~ | a''8 [ gis''8 _\markup{\concat{ IV \super 6}} ] ~ gis''2 ~ gis''8 [ g''8 _\markup{\concat{ IV \super 5}} ] | \bar "||" \mark \markup { \bold \box 2.3 }a'4 _\markup{\concat{ V \super 0}} f'''4 _\markup{\concat{ I \super 5}} ~ f'''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ | d''8 [ b''8 _\markup{\concat{ III \super 5}} ] ~ b''4 ~ b''16 [ gis'8. _\markup{\concat{ VI \super 6}} ] ~ gis'16 [ d''8 _\markup{\concat{ IV \super 0}} f'''16 _\markup{\concat{ I \super 5}} ] ~ | f'''16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ a''16 [ fis''8. _\markup{\concat{ III \super 0}} ] ~ fis''16 [ g'8. _\markup{\concat{ VI \super 5}} ] ~ g'16 [ d''8. _\markup{\concat{ IV \super 0}} ] ~ | d''16 [ c'''8. _\markup{\concat{ I \super 0}} ] a''8. _\markup{\concat{ II \super 0}} [ b''16 _\markup{\concat{ III \super 5}} ] ~ b''8. [ d''16 _\markup{\concat{ V \super 5}} ] ~ d''16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ | a''16 [ fis''8. _\markup{\concat{ III \super 0}} ] d'8. _\markup{\concat{ VI \super 0}} [ f'''16 _\markup{\concat{ II \super 8}} ] ~ f'''8 [ e'''8 _\markup{\concat{ II \super 7}} ] ~ e'''8 [ e'''8 _\markup{\concat{ I \super 4}} ] ~ | e'''4 fis''4 _\markup{\concat{ III \super 0}} d'4 _\markup{\concat{ VI \super 0}} ~ d'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8. [ e'''16 _\markup{\concat{ I \super 4}} ] ~ e'''8. [ fis'16 _\markup{\concat{ VI \super 4}} ] ~ fis'16 [ c'''8 _\markup{\concat{ I \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'4 ~ | d'8 [ c'''8 _\markup{\concat{ I \super 0}} ] fis'4 _\markup{\concat{ VI \super 4}} c'''4 _\markup{\concat{ I \super 0}} fis'4 _\markup{\concat{ VI \super 4}} | e'''4 _\markup{\concat{ I \super 4}} d'4 _\markup{\concat{ VI \super 0}} e'''8. _\markup{\concat{ I \super 4}} [ fis'16 _\markup{\concat{ VI \super 4}} ] ~ fis'8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''8 [ fis'8 _\markup{\concat{ VI \super 4}} ] ~ fis'8 [ e'''8 _\markup{\concat{ I \super 4}} ] ~ e'''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ | fis''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ d''8. _\markup{\concat{ IV \super 0}} ] fis''8. _\markup{\concat{ III \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ | d''16 [ fis''8. _\markup{\concat{ III \super 0}} ] a''4 _\markup{\concat{ II \super 0}} d''8. _\markup{\concat{ IV \super 0}} [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''4 ~ | fis''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ c'''8. _\markup{\concat{ I \super 0}} ] d'8. _\markup{\concat{ VI \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ ais''8 _\markup{\concat{ III \super 4}} ] | e'''8 _\markup{\concat{ II \super 7}} [ d'''8 _\markup{\concat{ II \super 5}} ] ~ d'''16 [ d''8. _\markup{\concat{ IV \super 0}} ] c'''8. _\markup{\concat{ I \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''16 [ d''8. _\markup{\concat{ IV \super 0}} ] c'''8. _\markup{\concat{ I \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ c'''8 _\markup{\concat{ I \super 0}} d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ c'''8 _\markup{\concat{ I \super 0}} d''16 _\markup{\concat{ IV \super 0}} ] ~ | d''8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ d''8 _\markup{\concat{ IV \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ d''8 _\markup{\concat{ V \super 5}} c''16 _\markup{\concat{ V \super 3}} ] ~ c''16 [ d'8 _\markup{\concat{ VI \super 0}} fis''16 _\markup{\concat{ III \super 0}} ] ~ | fis''16 [ d'''8. _\markup{\concat{ I \super 2}} ] d'8. _\markup{\concat{ VI \super 0}} [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ b'8. _\markup{\concat{ V \super 2}} ] ~ | b'16 [ d'''8. _\markup{\concat{ I \super 2}} ] ~ d'''16 [ fis'8. _\markup{\concat{ VI \super 4}} ] ~ fis'16 [ e'8. _\markup{\concat{ VI \super 2}} ] ~ e'16 [ fis''8. _\markup{\concat{ III \super 0}} ] ~ | fis''16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ a''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ | d''16 [ d'''8. _\markup{\concat{ II \super 5}} ] cis'''8. _\markup{\concat{ II \super 4}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ b''8 _\markup{\concat{ II \super 2}} ] ~ b''8 [ d''8 _\markup{\concat{ IV \super 0}} ] | b''8 _\markup{\concat{ II \super 2}} [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''4 fis''8. _\markup{\concat{ III \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''16 [ a'8. _\markup{\concat{ V \super 0}} ] | d'''8. _\markup{\concat{ I \super 2}} [ b''16 _\markup{\concat{ II \super 2}} ] ~ b''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'16 [ a''8. _\markup{\concat{ II \super 0}} ] a'4 _\markup{\concat{ V \super 0}} b''4 _\markup{\concat{ II \super 2}} a'8. _\markup{\concat{ V \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'16 [ a''8. _\markup{\concat{ II \super 0}} ] a'8 _\markup{\concat{ V \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] e'4 _\markup{\concat{ VI \super 2}} ~ | e'8. [ ais''16 _\markup{\concat{ III \super 4}} ] ~ ais''4 ~ ais''8 [ gis''8 _\markup{\concat{ III \super 2}} ] ~ gis''8 [ d'8 _\markup{\concat{ VI \super 0}} ] | a'8 _\markup{\concat{ V \super 0}} [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ e'8 _\markup{\concat{ VI \super 2}} d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8. [ b'16 _\markup{\concat{ V \super 2}} ] ~ b'8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ | c'''8. [ e'16 _\markup{\concat{ VI \super 2}} ] ~ e'8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8. [ b'16 _\markup{\concat{ V \super 2}} ] ~ b'8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ | c'''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ fis''8. _\markup{\concat{ III \super 0}} ] d'8. _\markup{\concat{ VI \super 0}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8. [ fis''16 _\markup{\concat{ IV \super 4}} ] ~ | fis''8. [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8. [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ d'''16 _\markup{\concat{ I \super 2}} ] ~ d'''8. [ cis'''16 _\markup{\concat{ I \super 1}} ] ~ | cis'''16 [ d''8. _\markup{\concat{ IV \super 0}} ] fis''8. _\markup{\concat{ III \super 0}} [ dis'16 _\markup{\concat{ VI \super 1}} ] ~ dis'8. [ cis'''16 _\markup{\concat{ I \super 1}} ] ~ cis'''8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ | d''8 [ fis''8 _\markup{\concat{ III \super 0}} ] dis'4 _\markup{\concat{ VI \super 1}} a''4 _\markup{\concat{ II \super 0}} d'4 _\markup{\concat{ VI \super 0}} | c'''8. _\markup{\concat{ I \super 0}} [ e''16 _\markup{\concat{ IV \super 2}} ] ~ e''8 [ ais''8 _\markup{\concat{ II \super 1}} ] ~ ais''4 d'8 _\markup{\concat{ VI \super 0}} [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''8 [ e''8 _\markup{\concat{ IV \super 2}} ] ~ e''16 [ a''8. _\markup{\concat{ II \super 0}} ] d''8 _\markup{\concat{ IV \super 0}} [ d'8 _\markup{\concat{ VI \super 0}} ] d''8. _\markup{\concat{ IV \super 0}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ b'8 _\markup{\concat{ V \super 2}} ] ~ b'8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ a'8 _\markup{\concat{ V \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ a''8 _\markup{\concat{ II \super 0}} ] | d''8 _\markup{\concat{ IV \super 0}} [ fis''8 _\markup{\concat{ III \super 0}} ] d''8. _\markup{\concat{ IV \super 0}} [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ c'''8 _\markup{\concat{ I \super 0}} ] d'8 _\markup{\concat{ VI \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ c'''16 [ d'8. _\markup{\concat{ VI \super 0}} ] | fis''8. _\markup{\concat{ III \super 0}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8. [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'8. [ gis''16 _\markup{\concat{ III \super 2}} ] ~ gis''16 [ d''8 _\markup{\concat{ IV \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ c'''8 _\markup{\concat{ I \super 0}} a'16 _\markup{\concat{ V \super 0}} ] ~ a'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ | fis''16 [ a''8. _\markup{\concat{ II \super 0}} ] cis'''8. _\markup{\concat{ I \super 1}} [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8. [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a''8 _\markup{\concat{ II \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8. [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] a'4 _\markup{\concat{ V \super 0}} | d''8. _\markup{\concat{ IV \super 0}} [ g''16 _\markup{\concat{ III \super 1}} ] ~ g''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ d''8. _\markup{\concat{ IV \super 0}} ] ~ d''16 [ a'8 _\markup{\concat{ V \super 0}} a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8. [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ d''8. _\markup{\concat{ IV \super 0}} ] c'''4 _\markup{\concat{ I \super 0}} ~ c'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'8 [ fis''8 _\markup{\concat{ III \super 0}} ] d'4 _\markup{\concat{ VI \super 0}} a''8 _\markup{\concat{ II \super 0}} [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ a'8. _\markup{\concat{ V \super 0}} ] | fis''8. _\markup{\concat{ III \super 0}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ a'8. _\markup{\concat{ V \super 0}} ] | fis''8 _\markup{\concat{ III \super 0}} [ d'8 _\markup{\concat{ VI \super 0}} ] a''8 _\markup{\concat{ II \super 0}} [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ a'8 _\markup{\concat{ V \super 0}} fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ | d'16 [ a''8. _\markup{\concat{ II \super 0}} ] d''8. _\markup{\concat{ IV \super 0}} [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'16 [ d''8 _\markup{\concat{ IV \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a'8 _\markup{\concat{ V \super 0}} d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ | d'16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ c'''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ d'8. _\markup{\concat{ VI \super 0}} ] | fis''8 _\markup{\concat{ III \super 0}} [ d'8 _\markup{\concat{ VI \super 0}} ] a'8. _\markup{\concat{ V \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''16 [ cis'''8. _\markup{\concat{ I \super 1}} ] ~ cis'''16 [ fis''8. _\markup{\concat{ III \super 0}} ] | \bar ".|" \mark \markup { \bold \box 2.4 }d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''8. [ fis''16 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''8. [ d'16 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''4 fis''4 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ~ fis''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''4 ~ c'''16 [ fis''8. _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''4 d'4 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ | d'4 c'''2 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} fis''4 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ~ | fis''4 ~ fis''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ d'8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''2 ~ c'''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ | d'4 ~ d'8 [ fis''8 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''2 ~ | fis''8. [ d''16 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''2. ~ | d''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. ~ | d'16 [ a'8. _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'2. ~ | a'8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''2. ~ | \time 3/2 -c'''1. | \bar "|.|" \mark \markup { \bold \box 3.1 } +c'''1. | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } \pageBreak \time 2/2 @@ -35,7 +35,7 @@ f'''8. [ g''16 _\markup{\concat{ V \super 10}} ] ~ g''4 ~ g''8. [ a''16 _\ma \time 2/2 a'4 _\markup{\concat{ V \super 0}} ~ a'8 [ a''8 _\markup{\concat{ II \super 0}} ] c'''8 _\markup{\concat{ I \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ a''8 _\markup{\concat{ II \super 0}} ] | fis''8. _\markup{\concat{ III \super 0}} [ a''16 _\markup{\concat{ IV \super 7}} ] ~ a''8 [ ais'8 _\markup{\concat{ VI \super 8}} ] ~ ais'16 [ a'8. _\markup{\concat{ VI \super 7}} ] a'8. _\markup{\concat{ V \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8 [ d'''8 _\markup{\concat{ III \super 8}} ] ~ d'''16 [ cis'''8 _\markup{\concat{ III \super 7}} d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ d'16 [ c'''8. _\markup{\concat{ I \super 0}} ] ~ | c'''16 [ a''8. _\markup{\concat{ IV \super 7}} ] ~ a''16 [ c'''8. _\markup{\concat{ I \super 0}} ] d''8 _\markup{\concat{ IV \super 0}} [ c'''8 _\markup{\concat{ I \super 0}} ] a''8 _\markup{\concat{ IV \super 7}} [ fis''8 _\markup{\concat{ III \super 0}} ] ~ | fis''8 [ a''8 _\markup{\concat{ IV \super 7}} ] ~ a''8 [ d'8 _\markup{\concat{ VI \super 0}} ] fis''8 _\markup{\concat{ V \super 9}} [ g'''8 _\markup{\concat{ I \super 7}} ] fis'''4 _\markup{\concat{ I \super 6}} | c'''4 _\markup{\concat{ III \super 6}} a''4 _\markup{\concat{ IV \super 7}} gis''8. _\markup{\concat{ IV \super 6}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ fis''8 _\markup{\concat{ V \super 9}} ] ~ | fis''16 [ c'''8. _\markup{\concat{ I \super 0}} ] fis''8 _\markup{\concat{ III \super 0}} [ d''8 _\markup{\concat{ IV \super 0}} ] d'8. _\markup{\concat{ VI \super 0}} [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'4 ~ | a'8 [ fis'''8 _\markup{\concat{ I \super 6}} ] ~ fis'''16 [ d''8. _\markup{\concat{ IV \super 0}} ] a'8. _\markup{\concat{ VI \super 7}} [ gis'16 _\markup{\concat{ VI \super 6}} ] ~ gis'8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'16 [ c'''8. _\markup{\concat{ I \super 0}} ] f'''8. _\markup{\concat{ II \super 8}} [ dis'''16 _\markup{\concat{ II \super 6}} ] ~ dis'''8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8. [ fis''16 _\markup{\concat{ III \super 0}} ] ~ | fis''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ a''16 [ c'''8. _\markup{\concat{ III \super 6}} ] a''8 _\markup{\concat{ II \super 0}} [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''16 [ c'''8. _\markup{\concat{ III \super 6}} ] dis'''4 _\markup{\concat{ II \super 6}} fis'''8. _\markup{\concat{ I \super 6}} [ fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ a''8. _\markup{\concat{ II \super 0}} ] | c'''8. _\markup{\concat{ I \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ c'''8. _\markup{\concat{ III \super 6}} ] fis'''8 _\markup{\concat{ I \super 6}} [ dis'''8 _\markup{\concat{ II \super 6}} ] ~ | dis'''8 [ gis'8 _\markup{\concat{ VI \super 6}} ] ~ gis'16 [ fis''8 _\markup{\concat{ III \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8. [ gis''16 _\markup{\concat{ IV \super 6}} ] ~ gis''16 [ fis'''8 _\markup{\concat{ I \super 6}} fis''16 _\markup{\concat{ III \super 0}} ] ~ | fis''16 [ dis'''8. _\markup{\concat{ II \super 6}} ] d''8. _\markup{\concat{ IV \super 0}} [ fis'''16 _\markup{\concat{ I \super 6}} ] ~ fis'''8 [ c'''8 _\markup{\concat{ III \super 6}} ] ~ c'''16 [ a''8. _\markup{\concat{ II \super 0}} ] | gis''8. _\markup{\concat{ IV \super 6}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ fis''8 _\markup{\concat{ III \super 0}} dis'''16 _\markup{\concat{ II \super 6}} ] ~ dis'''8. [ fis'''16 _\markup{\concat{ I \super 6}} ] ~ fis'''16 [ dis'''8 _\markup{\concat{ II \super 6}} gis''16 _\markup{\concat{ IV \super 6}} ] ~ | gis''8. [ c'''16 _\markup{\concat{ III \super 6}} ] ~ c'''16 [ d''8. _\markup{\concat{ IV \super 0}} ] c'''8. _\markup{\concat{ III \super 6}} [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ gis''8. _\markup{\concat{ IV \super 6}} ] | c'''8 _\markup{\concat{ III \super 6}} [ e''8 _\markup{\concat{ V \super 7}} ] ~ e''8 [ d'8 _\markup{\concat{ VI \super 0}} ] fis''8 _\markup{\concat{ III \super 0}} [ a''8 _\markup{\concat{ II \super 0}} ] d'8 _\markup{\concat{ VI \super 0}} [ c'''8 _\markup{\concat{ III \super 6}} ] ~ | c'''8 [ dis'''8 _\markup{\concat{ II \super 6}} ] ~ dis'''8 [ d'''8 _\markup{\concat{ II \super 5}} ] ~ d'''16 [ d'8. _\markup{\concat{ VI \super 0}} ] b''8 _\markup{\concat{ III \super 5}} [ a''8 _\markup{\concat{ II \super 0}} ] ~ | a''16 [ e''8 _\markup{\concat{ V \super 7}} d'16 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ d''8. _\markup{\concat{ IV \super 0}} ] ~ d''16 [ fis''8. _\markup{\concat{ III \super 0}} ] ~ fis''16 [ d'8. _\markup{\concat{ VI \super 0}} ] | gis''8. _\markup{\concat{ IV \super 6}} [ g''16 _\markup{\concat{ IV \super 5}} ] ~ g''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'4 ~ a'8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ fis''8 _\markup{\concat{ IV \super 4}} ] ~ fis''16 [ a'8 _\markup{\concat{ V \super 0}} ais''16 _\markup{\concat{ III \super 4}} ] ~ ais''16 [ d''8. _\markup{\concat{ IV \super 0}} ] a'4 _\markup{\concat{ V \super 0}} | fis''4 _\markup{\concat{ III \super 0}} fis''8 _\markup{\concat{ IV \super 4}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ fis''8 _\markup{\concat{ IV \super 4}} ] ~ | fis''8 [ d''8 _\markup{\concat{ V \super 5}} ] ~ d''8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ cis''8 _\markup{\concat{ V \super 4}} ] ~ | cis''8 [ a''8 _\markup{\concat{ III \super 3}} ] ~ a''8 [ f''8 _\markup{\concat{ IV \super 3}} ] cis''8 _\markup{\concat{ V \super 4}} [ c''8 _\markup{\concat{ V \super 3}} ] fis''8. _\markup{\concat{ III \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ | d''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'16 [ fis''8. _\markup{\concat{ III \super 0}} ] ~ fis''16 [ d'''8. _\markup{\concat{ II \super 5}} ] ~ d'''16 [ c'''8. _\markup{\concat{ II \super 3}} ] | c'''8 _\markup{\concat{ I \super 0}} [ c''8 _\markup{\concat{ V \super 3}} ] ~ c''8 [ a''8 _\markup{\concat{ III \super 3}} ] ~ a''8 [ c'''8 _\markup{\concat{ II \super 3}} ] ~ c'''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ | c'''8 [ c''8 _\markup{\concat{ V \super 3}} ] fis''8. _\markup{\concat{ III \super 0}} [ c'''16 _\markup{\concat{ II \super 3}} ] ~ c'''8. [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8. [ c''16 _\markup{\concat{ V \super 3}} ] ~ | c''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ c'''8. _\markup{\concat{ II \super 3}} ] gis'8. _\markup{\concat{ VI \super 6}} [ g'16 _\markup{\concat{ VI \super 5}} ] ~ g'8 [ c'''8 _\markup{\concat{ II \super 3}} ] ~ | c'''16 [ d'8 _\markup{\concat{ VI \super 0}} a''16 _\markup{\concat{ II \super 0}} ] ~ a''16 [ d'8 _\markup{\concat{ VI \super 0}} a''16 _\markup{\concat{ II \super 0}} ] ~ a''8 [ fis'8 _\markup{\concat{ VI \super 4}} ] ~ fis'16 [ c'''8. _\markup{\concat{ II \super 3}} ] ~ | c'''16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ d'16 [ c'''8. _\markup{\concat{ II \super 3}} ] f'4 _\markup{\concat{ VI \super 3}} c'''8. _\markup{\concat{ II \super 3}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ | d'16 [ a''8. _\markup{\concat{ III \super 3}} ] c''8. _\markup{\concat{ V \super 3}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ | d'4 a'8. _\markup{\concat{ V \super 0}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8 [ f''8 _\markup{\concat{ IV \super 3}} ] fis''8 _\markup{\concat{ III \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] | fis'''8 _\markup{\concat{ I \super 6}} [ f'''8 _\markup{\concat{ I \super 5}} ] d''8. _\markup{\concat{ IV \super 0}} [ a''16 _\markup{\concat{ III \super 3}} ] ~ a''8 [ gis''8 _\markup{\concat{ III \super 2}} ] d'8 _\markup{\concat{ VI \super 0}} [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ f''8. _\markup{\concat{ IV \super 3}} ] e''4 _\markup{\concat{ IV \super 2}} fis''8. _\markup{\concat{ III \super 0}} [ e'16 _\markup{\concat{ VI \super 2}} ] ~ | e'16 [ a'8 _\markup{\concat{ V \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ e''8 _\markup{\concat{ IV \super 2}} gis''16 _\markup{\concat{ III \super 2}} ] ~ gis''8 [ e'8 _\markup{\concat{ VI \super 2}} ] ~ e'16 [ a'8. _\markup{\concat{ V \super 0}} ] | c'''8. _\markup{\concat{ I \super 0}} [ e''16 _\markup{\concat{ IV \super 2}} ] ~ e''8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'8 [ f'''8 _\markup{\concat{ I \super 5}} ] ~ f'''8 [ e'''8 _\markup{\concat{ I \super 4}} ] ~ e'''8 [ d''8 _\markup{\concat{ IV \super 0}} ] g''8 _\markup{\concat{ III \super 1}} [ d'8 _\markup{\concat{ VI \super 0}} ] ~ | d'16 [ a'8 _\markup{\concat{ V \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ d''8 _\markup{\concat{ IV \super 0}} g''16 _\markup{\concat{ III \super 1}} ] ~ g''8. [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ a'8 _\markup{\concat{ V \super 0}} ] | c'''4 _\markup{\concat{ I \super 0}} d''8 _\markup{\concat{ IV \super 0}} [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ e'8 _\markup{\concat{ VI \super 2}} ] ~ e'8 [ dis'8 _\markup{\concat{ VI \super 1}} ] ~ | dis'16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'16 [ b''8 _\markup{\concat{ II \super 2}} b'16 _\markup{\concat{ V \super 2}} ] ~ b'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ | a'16 [ a''8 _\markup{\concat{ II \super 0}} a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ a''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ | a''8 [ c'''8 _\markup{\concat{ I \super 0}} ] dis''4 _\markup{\concat{ IV \super 1}} fis''8. _\markup{\concat{ III \super 0}} [ d'16 _\markup{\concat{ VI \super 0}} ] ~ d'8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'16 [ d''8 _\markup{\concat{ IV \super 0}} a'16 _\markup{\concat{ V \super 0}} ] ~ a'8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8. [ dis''16 _\markup{\concat{ IV \super 1}} ] ~ | dis''8. [ ais'16 _\markup{\concat{ V \super 1}} ] ~ ais'8 [ b''8 _\markup{\concat{ II \super 2}} ] ~ b''16 [ ais''8. _\markup{\concat{ II \super 1}} ] ~ ais''4 | dis''8 _\markup{\concat{ IV \super 1}} [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ a''8. _\markup{\concat{ II \super 0}} ] ~ a''16 [ d''8. _\markup{\concat{ IV \super 0}} ] d'4 _\markup{\concat{ VI \super 0}} | dis''4 _\markup{\concat{ IV \super 1}} ais''4 _\markup{\concat{ II \super 1}} c'''8. _\markup{\concat{ I \super 0}} [ dis'16 _\markup{\concat{ VI \super 1}} ] ~ dis'16 [ ais'8. _\markup{\concat{ V \super 1}} ] ~ | ais'8. [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''4 ~ a''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'16 [ ais''8. _\markup{\concat{ II \super 1}} ] ~ | ais''16 [ ais'8. _\markup{\concat{ V \super 1}} ] c'''8 _\markup{\concat{ I \super 0}} [ dis''8 _\markup{\concat{ IV \super 1}} ] ~ dis''16 [ ais''8 _\markup{\concat{ II \super 1}} dis'16 _\markup{\concat{ VI \super 1}} ] ~ dis'16 [ g''8. _\markup{\concat{ III \super 1}} ] ~ | g''16 [ dis'''8. _\markup{\concat{ I \super 3}} ] ~ dis'''8 [ d''8 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ ais''8 _\markup{\concat{ II \super 1}} ] ~ ais''8 [ a''8 _\markup{\concat{ II \super 0}} ] ~ | a''8 [ d'8 _\markup{\concat{ VI \super 0}} ] fis''8. _\markup{\concat{ III \super 0}} [ c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8. [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''16 [ a''8 _\markup{\concat{ II \super 0}} d'16 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ d'8. _\markup{\concat{ VI \super 0}} ] fis''8. _\markup{\concat{ III \super 0}} [ d'''16 _\markup{\concat{ I \super 2}} ] ~ d'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ d'16 [ fis''8 _\markup{\concat{ III \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ | d'16 [ fis''8 _\markup{\concat{ III \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ c'''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ fis''8 _\markup{\concat{ III \super 0}} cis'''16 _\markup{\concat{ I \super 1}} ] ~ | cis'''8. [ a'16 _\markup{\concat{ V \super 0}} ] ~ a'8 [ d'8 _\markup{\concat{ VI \super 0}} ] fis''4 _\markup{\concat{ III \super 0}} c'''4 _\markup{\concat{ I \super 0}} | a'8 _\markup{\concat{ V \super 0}} [ d'8 _\markup{\concat{ VI \super 0}} ] fis''8 _\markup{\concat{ III \super 0}} [ cis'''8 _\markup{\concat{ I \super 1}} ] ~ cis'''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ a'8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''4 ~ c'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ | a'16 [ d'8 _\markup{\concat{ VI \super 0}} fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ c'''8 _\markup{\concat{ I \super 0}} a'16 _\markup{\concat{ V \super 0}} ] ~ a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] ~ d'16 [ fis''8 _\markup{\concat{ III \super 0}} c'''16 _\markup{\concat{ I \super 0}} ] ~ | c'''16 [ a'8. _\markup{\concat{ V \super 0}} ] ~ a'16 [ d'8. _\markup{\concat{ VI \super 0}} ] fis''8 _\markup{\concat{ III \super 0}} [ c'''8 _\markup{\concat{ I \super 0}} ] a'8 _\markup{\concat{ V \super 0}} [ d'8 _\markup{\concat{ VI \super 0}} ] ~ | d'8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ c'''8 _\markup{\concat{ I \super 0}} ] ~ c'''16 [ a'8 _\markup{\concat{ V \super 0}} fis''16 _\markup{\concat{ III \super 0}} ] ~ fis''8 [ a'8 _\markup{\concat{ V \super 0}} ] ~ | a'16 [ fis''8. _\markup{\concat{ III \super 0}} ] a'8 _\markup{\concat{ V \super 0}} [ fis''8 _\markup{\concat{ III \super 0}} ] a'8 _\markup{\concat{ V \super 0}} [ dis''8 _\markup{\concat{ IV \super 1}} ] ~ dis''16 [ c'''8. _\markup{\concat{ I \super 0}} ] | \bar ".|" \mark \markup { \bold \box 3.4 }d''4 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ~ c'''16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''8. [ a'16 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ | a'4 ~ a'16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 fis''4 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ~ | fis''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ a''8. [ a'16 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'4 ~ | a'4 d'2 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ d'16 [ fis''8. _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ | fis''4 ~ fis''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''8 [ a'8 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'2 ~ a'8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d'2 ~ d'8. [ fis''16 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''4 ~ | fis''2 ~ fis''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ | d'2 ~ d'16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''2 ~ c'''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ | d'2. ~ d'16 [ c'''8. _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''1 ~ | c'''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'2. ~ | d'2 ~ d'8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ | c'''1 ~ | \time 3/2 -c'''1. | \bar "|.|" \mark \markup { \bold \box 4.1 } +c'''1. | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } \pageBreak \time 2/2 diff --git a/lilypond/includes/cicc_high.ly b/lilypond/includes/cicc_high.ly index 1be369d..fc7369c 100644 --- a/lilypond/includes/cicc_high.ly +++ b/lilypond/includes/cicc_high.ly @@ -17,7 +17,7 @@ r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''4 r2. | R1 | r2 f''''2 ~ | f''''1 ~ | f' \time 3/2 R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } \time 2/2 -r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 | \bar "|.|" \mark \markup { \bold \box 2.1 } +r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 } \pageBreak r1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | R1 | R1 | R1 | R1 | R1 | \time 3/2 @@ -25,7 +25,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 2.2 } \time 2/2 r1 | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''1 ~ | d''''4 r2. | R1 | R1 | R1 | R1 | \bar "||" \mark \markup { \bold \box 2.3 }r1 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | R1 | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 r2. | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 }r1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | \time 3/2 -R1*3/2 | \bar "|.|" \mark \markup { \bold \box 3.1 } +R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } \pageBreak \time 2/2 @@ -35,7 +35,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 3.3 } \time 2/2 r1 | r2 f''''2 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 }r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 ~ | f''''2 r2 | \time 3/2 -R1*3/2 | \bar "|.|" \mark \markup { \bold \box 4.1 } +R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } \pageBreak \time 2/2 diff --git a/lilypond/includes/cicc_low.ly b/lilypond/includes/cicc_low.ly index 87d6227..647883f 100644 --- a/lilypond/includes/cicc_low.ly +++ b/lilypond/includes/cicc_low.ly @@ -17,7 +17,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 1.3 } \time 3/2 R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } \time 2/2 - <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \bar "|.|" \mark \markup { \bold \box 2.1 } + <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 } \pageBreak <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \time 3/2 @@ -25,7 +25,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 2.2 } \time 2/2 <<{ a,,4 \laissezVibrer ^ \markup{ 5.0 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 4.2 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 3.3 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 2.5 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 1.7 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 0.8 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | \bar "||" \mark \markup { \bold \box 2.3 } <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \time 3/2 -R1*3/2 | \bar "|.|" \mark \markup { \bold \box 3.1 } +R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } \pageBreak \time 2/2 @@ -35,7 +35,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 3.3 } \time 2/2 <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | r2 <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \time 3/2 -R1*3/2 | \bar "|.|" \mark \markup { \bold \box 4.1 } +R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } \pageBreak \time 2/2 diff --git a/supercollider/cicc_gui.scd b/supercollider/cicc_gui.scd index 54c4cfc..bf762dc 100644 --- a/supercollider/cicc_gui.scd +++ b/supercollider/cicc_gui.scd @@ -41,7 +41,7 @@ win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 500), false).front; masterView = { - var view, masterIndicators, master, generator, transport, ranSeed, startPosText, + var view, masterIndicators, master, generator, transport, ranSeed, order, startPosText, prevSectionButton, prevSubsectionButton, playStopButton, nextSubsectionButton, nextSectionButton, sectionDisplay, clock, metronome; @@ -52,10 +52,14 @@ }; ~updateSection = {arg shift, stop = true, manualCall = true; - if((manualCall || (manualCall.not && ~autoAdvance.not)).postln && ((~currentSection + shift) < ~patterns.size), { + var runThis; + runThis = (manualCall || (manualCall.not && ~autoAdvance.postln)); + runThis = runThis && ((~currentSection + shift) < ~sectionOrder.size); + runThis = runThis && (((~currentSection % 4) == 3) && ~interludes && manualCall.not).not; + if(runThis, { var truncOnly, section, subSection; if(~isPlaying, { - if(stop, {~patterns[~currentSection].stop}); + if(stop, {~patterns[~sectionOrder[~currentSection]].stop}); }); truncOnly = case @@ -70,18 +74,26 @@ ~currentSection = ~currentSection.trunc(shift.abs); }); - section = ((~currentSection / 4) + 1).asInteger; - subSection = ((~currentSection % 4) + 1).asInteger; + section = ((~sectionOrder[~currentSection] / 4) + 1).asInteger; + subSection = ((~sectionOrder[~currentSection] % 4) + 1).asInteger; sectionDisplay.string = "section: " ++ section.asString ++ "." ++ subSection.asString; if(~isPlaying, { ~play.set(\sel, ~currentSection % 2); - ~patterns[~currentSection].play(quant: 0); + ~patterns[~sectionOrder[~currentSection]].play(quant: 0); + if(~interludes && ((~currentSection % 4) == 3) && (~currentSection != (~sectionOrder.size - 1)), { + ~droneFade.set(\gate, 1); + ~dronePattern.play(quant: 0) + }); if((~currentSection % 4) == 0, { ~droneFade.set(\gate, 0); }); + if(((~currentSection % 4)) != 0 && ((~currentSection % 4) != 3), { + ~droneFade.set(\gate, 0); + ~dronePattern.stop + }); }, { var measure, beat; - measure = ~sectionStartMeasure[~currentSection]; + measure = ~sectionStartMeasure[~sectionOrder[~currentSection]]; beat = 1; ~updateTransport.value(measure, beat); }); @@ -126,18 +138,19 @@ if(pState.value == 0, { var measure, beat; ~isPlaying = false; - ~patterns[~currentSection].stop; + ~patterns[~sectionOrder[~currentSection]].stop; ~droneFade.set(\gate, 0); measure = ~sectionStartMeasure[~currentSection]; beat = 1; - ~updateTransport.value(measure, beat) + ~updateTransport.value(measure, beat); + ~droneFade.set(\gate, 0); + ~dronePattern.stop },{ ~isPlaying = true; ~play.set(\sel, ~currentSection % 2); - ~patterns[~currentSection].play(quant: 0); - if(~interludes && ((~currentSection % 4) == 3), { + ~patterns[~sectionOrder[~currentSection]].play(quant: 0); + if(~interludes && ((~currentSection % 4) == 3) && (~currentSection != (~sectionOrder.size - 1)), { ~droneFade.set(\gate, 1); - ~play = Synth.new(\droneOut); ~dronePattern.play(quant: 0) }); }) @@ -159,12 +172,29 @@ metronome = StaticText(win).string_([-30, -105, -104].asAscii).font_(Font("Monaco", 300)).stringColor_(Color.red)), nil, transport, nil, HLayout(Button(view).states_([["auto advance", Color.black], ["auto advance", Color.black, Color.grey]]).action_({ - |v| ~autoAdvance = if(v == 0, {false}, {true}) + |v| ~autoAdvance = if(v.value == 0, {false}, {true});~autoAdvance.postln; }).value_(1), Button(view).states_([["interludes", Color.black], ["interludes", Color.black, Color.grey]]).action_({ - |v| ~interludes = if(v == 0, {false}, {true}) + |v| ~interludes = if(v.value == 0, {false}, {true}) }), [StaticText(view).string_(" "), stretch: 1]), + [StaticText(view).string_(" "), stretch: 1], + HLayout( + order = TextField(view).string_("1-4"), + Button(view).states_([["set order"]]).action_({ + ~patterns[~sectionOrder[~currentSection]].stop; + ~sectionOrder = order.string.postln.split($,).collect({arg secEntry; + var bounds; + bounds = secEntry.split($-).collect({arg item; item.asInteger - 1}); + ((bounds.minItem)..(bounds.maxItem)).collect({arg sec; + (sec.asInteger * 4) + [0, 1, 2, 3] + }); + }).flat; + ~sectionOrder.postln; + ~currentSection = 0; + ~updateSection.value(0); + }), + [StaticText(view).string_(" "), stretch: 1]), [StaticText(view).string_(" "), stretch: 1], generator ), alignment: \top])) }; faderView = { diff --git a/supercollider/cicc_main.scd b/supercollider/cicc_main.scd index 8a1e2ae..f2a6f20 100644 --- a/supercollider/cicc_main.scd +++ b/supercollider/cicc_main.scd @@ -1,7 +1,7 @@ ( // MAIN LAUNCH (loads necessary files and definitions) -var appEnvironment, cond; +var appEnvironment; appEnvironment = Environment.make; appEnvironment.push; @@ -30,6 +30,7 @@ s.waitForBoot({ ~droneFade = Synth.new(\droneFade); ~autoAdvance = true; ~interludes = false; + ~sectionOrder = ~patterns.size.collect({arg sec; sec}); ~generateGUI.value; appEnvironment.pop; @@ -54,6 +55,8 @@ s.waitForBoot({ ~launchGui.value; */ ) + +~dir ~fader = Synth(\crossFade, [\sel, 0, \busA, ~busA.index, \busB, ~busB.index]); ~currentSection = 0 ~play.set(\sel, ~currentSection % 2); @@ -75,7 +78,8 @@ s.waitForBoot({ ~dronePattern.play ) -~droneFade.set(\gate, 0) +~droneFade.set(\gate, 1) +~dronePattern.stop t = Synth.new(\droneOut); t.free diff --git a/supercollider/cicc_sonifier.scd b/supercollider/cicc_sonifier.scd index a0f97c2..b93a3e6 100644 --- a/supercollider/cicc_sonifier.scd +++ b/supercollider/cicc_sonifier.scd @@ -65,8 +65,6 @@ SynthDef(\masterPlayerControl, { SynthDef(\transport, {arg measure = 0, beat = 0, gate = 1, dur = 1; - measure.poll; - beat.poll; SendReply.kr(Impulse.kr(0) * (measure > 0) * (beat > 0),'/measureClock', values: [measure, beat]); SendReply.kr(TDelay.kr(Impulse.kr(0) * (measure > 0) * (beat > 0), 0.25),'/measureClockReset'); SendReply.kr(Impulse.kr(0) * (measure < 1) * (beat < 1),'/playNextSubsection'); @@ -117,12 +115,13 @@ SynthDef(\drone, { arg out=0, freq=440, amp=0.1, pan=0, gate=1, bus; SynthDef(\droneFade, {arg gate = 0; - Out.ar([0, 1], Clip.ar(In.ar(~droneBus, 1), -1, 1) * 0.1 * EnvGen.ar(Env.asr(20, 1, 20), gate.poll)) + Out.ar([0, 1], Clip.ar(In.ar(~droneBus, 1), -1, 1) * 0.1 * EnvGen.ar(Env.asr(20, 1, 20), gate)) } ).add; -~dronePattern = Pbind( +~dronePattern = EventPatternProxy.new; +~dronePattern.source = Pbind( \instrument, \drone, \amp, 0.5, \dur, 0.02, diff --git a/supercollider/cicc_transcriber.scd b/supercollider/cicc_transcriber.scd index 0462ca1..09c5bc0 100644 --- a/supercollider/cicc_transcriber.scd +++ b/supercollider/cicc_transcriber.scd @@ -122,7 +122,10 @@ if((i == (sectionData[sectionCount][0] / 4)) && (g == 0),{ var barType, pageBreak; - barType = switch(sectionData[sectionCount][1], 0, {"\"||\""}, 1, {"\".|\""}, -1, {"\"|.|\""}); + barType = switch(sectionData[sectionCount][1], + 0, {"\"||\""}, + 1, {"\".|\""}, + -1, {"\"||\" \\set Score.currentBarNumber = #1 "}); pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n"}); isHarmonic = switch(sectionData[sectionCount][1], 0, {false}, 1, {true}, -1, {false}); lilyString = lilyString + " \\bar " ++ barType ++ " \\mark \\markup { \\bold \\box " ++ sectionIndex ++ "." ++ subSectionIndex ++ " }" ++ pageBreak;