diff --git a/lilypond/cicc_score.midi b/lilypond/cicc_score.midi index f7cf00d..6d1a61b 100644 Binary files a/lilypond/cicc_score.midi and b/lilypond/cicc_score.midi differ diff --git a/lilypond/cicc_score.pdf b/lilypond/cicc_score.pdf index 43900c4..f2b6b7f 100644 Binary files a/lilypond/cicc_score.pdf and b/lilypond/cicc_score.pdf differ diff --git a/lilypond/includes/cicc_guitar.ly b/lilypond/includes/cicc_guitar.ly index 01bc488..79b574f 100644 --- a/lilypond/includes/cicc_guitar.ly +++ b/lilypond/includes/cicc_guitar.ly @@ -106,6 +106,7 @@ \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break +\pseudoIndents 0 126 \repeat unfold 2 {s2 \noBreak} \break } { @@ -156,4 +157,4 @@ a''8. _\markup{\concat{ III \super 3}} [ c'''16 _\markup{\concat{ I \super 0} \time 3/2 a'8. _\markup{\concat{ V \super 0}} [ a''16 _\markup{\concat{ II \super 0}} ] ~ a''8 [ fis''8 _\markup{\concat{ III \super 0}} ] ~ fis''16 [ a''8. _\markup{\concat{ II \super 0}} ] a'8. _\markup{\concat{ V \super 0}} [ d''16 _\markup{\concat{ IV \super 0}} ] ~ d''8 [ d'8 _\markup{\concat{ VI \super 0}} ] ~ d'16 [ g''8. _\markup{\concat{ III \super 1}} ] | \bar ".|" \mark \markup { \bold \box 4.4 } \time 2/2 -a'8. _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} [ d''16 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'16 [ fis''8. _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} | a'4 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} d''4 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} d'4 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} d''4 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} | c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ a''16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''8 [ c'''8 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 a'4 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ~ a'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ 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{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ a''8 [ a'8 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'4 ~ | a'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ d''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ | d'16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ a''16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ d'8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''4 d''2 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d'2 a''2 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ | a''8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''2 ~ d''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d'2 a''2 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ | a''4 d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} | d'2. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ d'16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ | a''2 ~ a''8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''2 d'2 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ | d'4 ~ d'8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''4 ~ a''8 [ fis''8 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''2 ~ | fis''4 ~ fis''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''4 ~ a''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''2 ~ | c'''2 ~ c'''8 [ a'8 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'4 ~ | a'2. ~ a'8. [ d''16 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''1 ~ | d''1 ] \bar "|." } +a'8. _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} [ d''16 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'16 [ fis''8. _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} | a'4 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} d''4 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} d'4 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} d''4 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} | c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} a''4 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ a''16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''8 [ c'''8 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 a'4 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ~ a'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''4 ~ 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{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 c'''4 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ~ | c'''8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ a''8 [ a'8 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'4 ~ | a'16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ d''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ | d'16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ a''16 [ d''8. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ d'4 ~ d'8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''4 ~ | a''4 d''2 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ~ d''8 [ d'8 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d'2 a''2 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ | a''8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''2 ~ d''16 [ d'8. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d'2 a''2 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ~ | a''4 d''2. _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} | d'2. _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ d'16 [ a''8. _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ | a''2 ~ a''8 [ d''8 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ d''4 ~ | d''2 d'2 _\markup{\concat{ VI \super \musicglyph "noteheads.s0harmonic"}} ~ | d'4 ~ d'8. [ a''16 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''4 ~ a''8 [ fis''8 _\markup{\concat{ III \super \musicglyph "noteheads.s0harmonic"}} ] ~ fis''2 ~ | fis''4 ~ fis''8 [ a''8 _\markup{\concat{ II \super \musicglyph "noteheads.s0harmonic"}} ] ~ a''2 ~ | a''4 ~ a''8. [ c'''16 _\markup{\concat{ I \super \musicglyph "noteheads.s0harmonic"}} ] ~ c'''2 ~ | c'''2 ~ c'''8 [ a'8 _\markup{\concat{ V \super \musicglyph "noteheads.s0harmonic"}} ] ~ a'4 ~ | a'2. ~ a'8. [ d''16 _\markup{\concat{ IV \super \musicglyph "noteheads.s0harmonic"}} ] ~ | d''1 ~ | d''1 ~ | d''1 ] \bar "|." } diff --git a/lilypond/includes/cicc_high.ly b/lilypond/includes/cicc_high.ly index fbff20a..fbe1d77 100644 --- a/lilypond/includes/cicc_high.ly +++ b/lilypond/includes/cicc_high.ly @@ -106,6 +106,7 @@ \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break +\pseudoIndents 0 126 \repeat unfold 2 {s2 \noBreak} \break } { @@ -114,46 +115,46 @@ \clef "treble^(8)" \bar "||" \mark \markup { \bold \box 1.1 } \time 2/2 -f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''4 r2. | R1 | +f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''2 r2 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r2 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 | R1 | r2 f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r2 f''''2 ~ | f''''8 [ r8 ] r2 r8 [ f''''8 ] ~ | f''''2. ~ f''''8 [ r8 ] | R1 | \time 3/2 -R1*3/2 | \bar "||" \mark \markup { \bold \box 1.2 } +r2 r8 [ f''''8 ] ~ f''''2 r4 | \bar "||" \mark \markup { \bold \box 1.2 } \time 2/2 -r1 | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] r2 | R1 | r2 d''''2 ~ | d''''1 ~ | d''''2. ~ d''''8 [ r8 ] | d''''1 ~ | d''''1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''8 [ r8 ] r2. | r2. d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''4 r2. | R1 | R1 | R1 | R1 | R1 | +r2 d''''2 ~ | d''''2. r4 | R1 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''2. r4 | R1 | r8 [ d''''8 ] ~ d''''2. | r2. d''''4 ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] d''''4 ~ | d''''2. ~ d''''8 [ r8 ] | d''''1 ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] r4 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 r2 | r2. d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''4 r2. | r4 d''''2 ~ d''''8 [ r8 ] | R1 | r2 d''''2 ~ | \time 3/2 -R1*3/2 | \bar "||" \mark \markup { \bold \box 1.3 } +d''''2 ~ d''''8 [ r8 ] d''''2 r4 | \bar "||" \mark \markup { \bold \box 1.3 } \time 2/2 -r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''4 r2. | R1 | r2 f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''2. ~ f''''8 [ r8 ] | R1 | R1 | +r4 f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. r4 | r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''8 [ r8 ] f''''2 ~ f''''8 [ r8 ] | f''''1 ~ | \time 3/2 -R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } +f''''2. ~ f''''8 [ r8 ] r2 | \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 "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 } +r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''8 [ r8 ] d''''2. ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] r2 | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] d''''2. ~ | d''''1 ~ | d''''1 ~ | d''''2. ~ d''''8 [ r8 ] | r2. d''''4 ~ | d''''2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''8 [ r8 ] d''''2. | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 ~ d''''8 [ r8 ] r4 | \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 | +f''''2. ~ f''''8 [ r8 ] | f''''2. ~ f''''8 [ r8 ] | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r4 f''''2. ~ | f''''2 r2 | \time 3/2 -R1*3/2 | \bar "||" \mark \markup { \bold \box 2.2 } +r4 f''''2. r2 | \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 | +r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''4 r2. | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''2 ~ d''''8 [ r8 ] r4 | r2 d''''2 ~ | d''''2 r2 | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''1 | R1 | r8 [ d''''8 ] ~ d''''2 r4 | \bar "||" \mark \markup { \bold \box 2.3 }r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''4 r2 r8 [ f''''8 ] ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r8 [ f''''8 ] ~ f''''2. | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | f''''1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. r4 | R1 | r8 [ f''''8 ] ~ f''''2. | R1 | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2 r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''4 r2. | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r2 f''''2 ~ | f''''2 r2 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''8 [ r8 ] r2 r8 [ f''''8 ] ~ | f''''2. r4 | \bar ".|" \mark \markup { \bold \box 2.4 }r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2. ~ d''''8 [ r8 ] | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''1 ~ | d''''1 | R1 | r2. d''''4 ~ | d''''2. ~ d''''8 [ r8 ] | r2 r8 [ d''''8 ] ~ d''''4 ~ | \time 3/2 -R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } +d''''4 ~ d''''8 [ r8 ] r1 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } \pageBreak \time 2/2 -r1 | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 | R1 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''2. r4 | R1 | R1 | R1 | \bar "||" \mark \markup { \bold \box 3.2 }r1 | r2. d''''4 ~ | d''''1 ~ | d''''2 r2 | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] r4 | R1 | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''1 | R1 | R1 | r2 d''''2 ~ | d''''1 ~ | d''''4 r8 [ d''''8 ] ~ d''''2 ~ | d''''2 ~ d''''8 [ r8 ] r4 | +r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''4 r2. | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 r2. | f''''1 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 r2. | R1 | r8 [ f''''8 ] ~ f''''2 r4 | \bar "||" \mark \markup { \bold \box 3.2 }r4 d''''2. | r8 [ d''''8 ] ~ d''''2 ~ d''''8 [ r8 ] | R1 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2. ~ d''''8 [ r8 ] | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''1 ~ | d''''2. r8 [ d''''8 ] ~ | d''''1 | R1 | r2 d''''2 ~ | d''''8 [ r8 ] r2. | r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] r2. | r4 d''''2. ~ | d''''1 ~ | d''''2 r2 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 ~ d''''8 [ r8 ] r4 | r4 d''''2. ~ | d''''4 ~ d''''8 [ r8 ] r2 | r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] r2. | \time 3/2 -R1*3/2 | \bar "||" \mark \markup { \bold \box 3.3 } +r4 r8 [ d''''8 ] ~ d''''2 ~ d''''8 [ r8 ] r4 | \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 | +r2 f''''2 ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r2 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''8 [ r8 ] r2. | f''''1 ~ | f''''1 ~ | f''''2 r2 | r4 f''''2. ~ | f''''2 r2 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r2 | r2. r8 [ f''''8 ] ~ | f''''2. r4 | R1 | r4 f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2 r4 | R1 | r4 f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r2. f''''4 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''2 r2 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r8 [ f''''8 ] ~ f''''2. | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | r8 [ f''''8 ] ~ f''''2. | R1 | f''''1 ~ | f''''1 ~ | f''''4 r2. | r4 r8 [ f''''8 ] ~ f''''2 | R1 | f''''1 ~ | f''''2. r4 | \bar ".|" \mark \markup { \bold \box 3.4 }r2 d''''2 ~ | d''''2 ~ d''''8 [ r8 ] r4 | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''1 ~ | d''''1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''4 r8 [ d''''8 ] ~ d''''2 ~ | d''''4 r8 [ d''''8 ] ~ d''''2 ~ | d''''2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] r4 | R1 | d''''2. ~ d''''8 [ r8 ] | r2 r8 [ d''''8 ] ~ d''''4 ~ | \time 3/2 -R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } +d''''4 r8 [ d''''8 ] ~ d''''2 r2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } \pageBreak \time 2/2 -r2 f''''2 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | f''''1 ~ | f''''1 | R1 | r4 f''''2. ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | R1 | R1 | \bar "||" \mark \markup { \bold \box 4.2 }r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''2. r4 | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] r2 | R1 | r2. d''''4 ~ | d''''1 ~ | d''''1 | R1 | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''1 | +r8 [ f''''8 ] ~ f''''2. | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r2. r8 [ f''''8 ] ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r4 f''''2. ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r4 f''''2 ~ f''''8 [ r8 ] | r2 f''''2 ~ | f''''2 r2 | R1 | r4 f''''2. ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r4 f''''2 ~ f''''8 [ r8 ] | r2 f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''8 [ r8 ] r2. | R1 | f''''2 r2 | \bar "||" \mark \markup { \bold \box 4.2 }r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''4 r2. | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''1 ~ | d''''1 ~ | d''''8 [ r8 ] d''''2 ~ d''''8 [ r8 ] | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 r8 [ d''''8 ] ~ d''''4 ~ | d''''4 ~ d''''8 [ r8 ] r2 | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''4 ~ d''''8 [ r8 ] r2 | r2. r8 [ d''''8 ] ~ | \time 3/2 -R1*3/2 | \bar "||" \mark \markup { \bold \box 4.3 } +d''''2. r2. | \bar "||" \mark \markup { \bold \box 4.3 } \time 2/2 -r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2 r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 f''''2. ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r2 f''''2 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 | R1 | R1 | r4 f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 | +r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r2 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. r8 [ f''''8 ] ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''4 r2. | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''2. r4 | r2. f''''4 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''8 [ r8 ] r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''2 r2 | r2 f''''2 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''2. r8 [ f''''8 ] ~ | \time 3/2 -R1*3/2 | \bar ".|" \mark \markup { \bold \box 4.4 } +f''''2 ~ f''''8 [ r8 ] f''''2 r4 | \bar ".|" \mark \markup { \bold \box 4.4 } \time 2/2 -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 ] \bar "|." } +r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] r2. | r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] d''''2. ~ | d''''2 r2 | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''8 [ r8 ] d''''2. | r2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''4 r2. | r8 [ d''''8 ] ~ d''''2. ~ | d''''8 [ r8 ] r2. | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''4 r2. | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2 ~ d''''8 [ r8 ] d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''2. ~ d''''8 [ r8 ] | R1 ] \bar "|." } diff --git a/lilypond/includes/cicc_low.ly b/lilypond/includes/cicc_low.ly index 5f39622..10791c4 100644 --- a/lilypond/includes/cicc_low.ly +++ b/lilypond/includes/cicc_low.ly @@ -106,6 +106,7 @@ \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break \repeat unfold 8 {s2 \noBreak} \break +\pseudoIndents 0 126 \repeat unfold 2 {s2 \noBreak} \break } { @@ -122,7 +123,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 1.2 } \time 3/2 R1*3/2 | \bar "||" \mark \markup { \bold \box 1.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 | <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | r2. <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | + <<{ 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 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | r2 <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | \time 3/2 R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } \time 2/2 @@ -132,7 +133,7 @@ R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } \time 3/2 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 | + <<{ 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 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | 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 "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 } \pageBreak @@ -142,7 +143,7 @@ R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \bo \time 3/2 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 | + <<{ 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 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | R1 | r4 <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r2 | 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 "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 } \pageBreak @@ -152,8 +153,8 @@ R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \bo \time 3/2 R1*3/2 | \bar "||" \mark \markup { \bold \box 4.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 | 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 | R1 | R1 | R1 | R1 | + <<{ 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 | 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 | \time 3/2 R1*3/2 | \bar ".|" \mark \markup { \bold \box 4.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 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 ] \bar "|." } + <<{ 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 ] \bar "|." } diff --git a/supercollider/cicc_musical_data_generator.scd b/supercollider/cicc_musical_data_generator.scd index 5ebe1cc..5ffba50 100644 --- a/supercollider/cicc_musical_data_generator.scd +++ b/supercollider/cicc_musical_data_generator.scd @@ -11,7 +11,6 @@ genInitSeq = {arg seed = 1004; setDur = {[0, 2, 3, 4, 5.rand + 3].wchoose([0, 5, 5, 5, 1].normalizeSum)}; strings = (0..5); - //stringIndex = 0; state = 6.collect({[0, 1].wchoose([2, 1].normalizeSum)}); //fretted or not lastStrings = [nil, nil]; position = 6.collect({10 + 3.rand}); //which frets @@ -32,7 +31,6 @@ genInitSeq = {arg seed = 1004; strings = (0..5).scramble[..(4.rand + 1)]; //rotate if a note gets repeated if(lastStrings.last == strings.first, {strings = strings.rotate}); - //stringIndex = 0; lastStrings = strings; }); @@ -126,7 +124,6 @@ finalizeSeqs = {arg initSeq; // this makes sure it is some multiple of a beat timeStampTotal = seq.slice(nil, 2).sum; altEndDur = timeStampTotal.round(round) - timeStampTotal; - //if(altEndDur < 0, {altEndDur = altEndDur + round}); seq.last[2] = seq.last[2] + altEndDur; if(altEndDur < 0, {seq.last[2]}); [seq, altEndDur]; @@ -139,7 +136,7 @@ finalizeSeqs = {arg initSeq; noMeasures = ((timeStampTotal - timeStampSectionStart) / 16); if(noMeasures.frac > 0, { timeSigInsSeq = timeSigInsSeq.add( - // make 5/4 instrad of 1/4 + // make 3/2 instrad of 1/2 if((noMeasures.frac / 0.25).asInteger != 2, { [timeStampTotal - (4 * (noMeasures.frac / 0.25).asInteger),(noMeasures.frac / 0.25).asInteger] }, { @@ -204,7 +201,6 @@ finalizeSeqs = {arg initSeq; timeStampTotal = guitarSeq.slice(nil, 2).sum; insertTS.value(guitarSeq, timeStampSectionStart, 0, true); timeStampSectionStart = timeStampTotal; - //sectionSeq = sectionSeq.add([timeStampTotal, 0, true]); rec = guitarSeq[(guitarSeq.size - (10.rand + 5))..guitarSeq.size].deepCopy; reps = 5.rand + 5; reps.do({arg index; @@ -216,21 +212,17 @@ finalizeSeqs = {arg initSeq; rec[rIndex] = [item[0], item[1], dur]; if([true, false].wchoose([5, 1].normalizeSum), { guitarSeq = guitarSeq.add(rec[rIndex].add((1 / reps) * index)); - //timeStampTotal = timeStampTotal + dur; }); // if chord randomly choose one of the notes if(guitarSeq.last[2] == 0, { arg toAdd = []; - //guitarSeq[(guitarSeq.size - 3)..].postln; toAdd = toAdd.add(guitarSeq.pop); toAdd = toAdd.add(guitarSeq.pop); toAdd[0][2] = toAdd[1][2]; toAdd[1][3] = toAdd[0][3]; - //toAdd.postln; toAdd = toAdd.choose; guitarSeq = guitarSeq.add(toAdd); - //guitarSeq[(guitarSeq.size - 2)..].postln }); }); @@ -261,33 +253,35 @@ finalizeAccompHigh = {arg sectionSeq; timeStamp = 0; secType = 0; - sectionSeq.do({arg secData; + sectionSeq.do({arg secData, secIndex; var secEnd, freq, noRestCount, shortCount; - secEnd = secData[0]; - freq = if(secType == 0, {62.midicps * 8}, {62.midicps * 8 * 6/5}); + secEnd = secData.postln[0]; + //freq = if(secType == 0, {62.midicps * 8}, {62.midicps * 8 * 6/5}); + freq = if(secIndex.even, {62.midicps * 8}, {62.midicps * 8 * 6/5}); if(secData.last, {secType = ((secType + 1) % 2)}); noRestCount = 0; shortCount = 0; + secIndex.postln; while({timeStamp < secEnd}, { var dur, sus, isShort, insertRest; isShort = case {shortCount == 0} {true} - {shortCount < 3} {[true, false].wchoose([2, 1].normalizeSum)} + {shortCount < 3} {[true, false].wchoose([3, 1].normalizeSum)} {true} {false}; - insertRest = [true, noRestCount > 3].wchoose([1, 1].normalizeSum); + insertRest = [true, noRestCount > 3].wchoose([2, 1].normalizeSum); if(isShort, { - sus = (20.rand + 20).round(2); + sus = (10.rand + 10).round(2); shortCount = shortCount + 1; }, { - sus = (62.rand + 50).round(2); + sus = (30.rand + 30).round(2); shortCount = 0; }); if(insertRest, { - dur = sus + (20.rand + 20).round(2); + dur = sus + (20.rand + 10).round(2); noRestCount = 0; }, { dur = sus + 2; @@ -297,8 +291,13 @@ finalizeAccompHigh = {arg sectionSeq; if((timeStamp + dur) < secEnd, { accompHighSeq = accompHighSeq.add([freq, dur, sus.clip(0, dur)]); }, { - dur = ((secEnd - timeStamp) + 38.rand).clip(2, 1000).round(2); - accompHighSeq = accompHighSeq.add([freq, dur, 0]); + //dur = ((secEnd - timeStamp) + 38.rand).clip(2, 1000).round(2); + //accompHighSeq = accompHighSeq.add([freq, dur, 0]); + var remainder; + remainder = (secEnd - timeStamp); + sus = if(remainder > 10, {((remainder - 10).rand + 8).round(2)}, {0}); + dur = (remainder + 10.rand).clip(2, 1000).round(2); + accompHighSeq = accompHighSeq.add([freq, dur, sus]); }); timeStamp = timeStamp + dur; }); @@ -348,8 +347,6 @@ finalizeAccompLow = {arg guitarSeq, sectionSeq; accompLowSeq = [accompLowSeq.slice(nil, 0), accompLowSeq.slice(nil, 1), accompLowSeq.slice(nil, 2).differentiate.drop(1).add(1)].flop; - //accompLowSeq = [accompLowSeq.slice(nil, 0), accompLowSeq.slice(nil, 1),accompLowSeq.slice(nil, 2).drop(1).add(1)].flop; - accompLowSeq }; @@ -359,8 +356,8 @@ finalizeAccompLow = {arg guitarSeq, sectionSeq; initSeq = genInitSeq.value; finalSeqs = finalizeSeqs.value(initSeq); - guitarSeq = finalSeqs[0]; - accompHighSeq = finalizeAccompHigh.value(finalSeqs[1]); + guitarSeq = finalSeqs[0].postln; + accompHighSeq = finalizeAccompHigh.value(finalSeqs[1].postln.add([finalSeqs[0].slice(nil, 2).sum, -1, false])); accompLowSeq = finalizeAccompLow.value(finalSeqs[0], finalSeqs[1]); sectionSeq = finalSeqs[1]; timeSigSeq = finalSeqs[2];