2020.06.15.02

main
Michael Winter 4 years ago
parent 2f5841a363
commit 03cae5225c

@ -29,8 +29,8 @@
ragged-bottom = ##t
top-system-spacing =
#'((basic-distance . 15 )
(minimum-distance . 15 )
#'((basic-distance . 20 )
(minimum-distance . 20 )
(padding . 0 )
(stretchability . 0))
@ -115,6 +115,7 @@
\override TimeSignature.self-alignment-X = #LEFT
\override TimeSignature.Y-offset = #9
\override TimeSignature.extra-offset = #'(2 . 0)
\override TimeSignature.break-visibility = #end-of-line-invisible
}
\context {
\StaffGroup

File diff suppressed because one or more lines are too long

@ -161,6 +161,7 @@ r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | f''''1 ~ | f''''1 ~ | f''''2. ~
\time 3/2
R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 }
\pageBreak
\time 2/2
\time 2/2
r4 f''''2. ~ | f''''8 [ r8 ] f''''2. ~ | f''''8 [ r8 ] r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 r2. | f''''1 | r2. r8 [ f''''8 ] ~ | f''''2 r2 | r2. r8 [ f''''8 ] ~ | f''''2. r4 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | f''''2 ~ f''''8 [ r8 ] r4 | r2. f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 | R1 | r2. f''''4 ~ | f''''1 ~ |
@ -175,6 +176,7 @@ r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''8 [ r8 ] d''''2 ~ d''''8 [ r8 ] | R1 |
\time 3/2
d''''8 [ r8 ] r1 r4 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 }
\pageBreak
\time 2/2
\time 2/2
r8 [ f''''8 ] ~ f''''2. | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 r2. | r2 f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r4 f''''2. | r8 [ f''''8 ] ~ f''''2. | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r4 f''''2. ~ | f''''2 r2 | R1 | r4 f''''2. ~ | f''''2 r2 | r2. f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | \bar "||" \mark \markup { \bold \box 3.2 }d''''1 ~ | d''''8 [ r8 ] r2. | r4 d''''2. | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''2 ~ d''''8 [ r8 ] d''''4 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''1 ~ | d''''1 ~ | d''''8 [ r8 ] d''''2 ~ d''''8 [ r8 ] | R1 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''2. r8 [ d''''8 ] ~ | d''''1 ~ | d''''8 [ r8 ] r2. | d''''2. ~ d''''8 [ r8 ] | R1 | R1 | \bar "||" \mark \markup { \bold \box 3.3 }r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''2 r2 | R1 | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r2. | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''2. r4 | R1 | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''2. r4 |
@ -183,12 +185,14 @@ R1*3/2 | \bar ".|" \mark \markup { \bold \box 3.4 }
\time 2/2
r8 [ d''''8 ] ~ d''''2. ~ | d''''4 r2. | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''8 [ r8 ] r2. | r2. d''''4 ~ | d''''2. ~ d''''8 [ r8 ] | R1 | r2. d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''2. ~ d''''8 [ r8 ] | R1 | r8 [ d''''8 ] ~ d''''2 ~ d''''8 [ r8 ] | R1 | r8 [ d''''8 ] ~ d''''2 ~ d''''8 [ r8 ] | d''''1 ~ | d''''4 r2. | R1 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 }
\pageBreak
\time 2/2
r2 f''''2 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 | r2. f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''2 r2 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 r2 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ |
\time 3/2
f''''2 r8 [ f''''8 ] ~ f''''4 ~ f''''8 [ r8 ] r4 | \bar "||" \mark \markup { \bold \box 4.2 }
\time 2/2
r4 d''''2. ~ | d''''4 ~ d''''8 [ r8 ] r2 | r2. d''''4 ~ | d''''2 ~ d''''8 [ r8 ] r4 | R1 | d''''1 ~ | d''''1 ~ | d''''1 ~ | d''''2 r2 | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''2. r4 | \bar "||" \mark \markup { \bold \box 4.3 }r8 [ f''''8 ] ~ f''''2. ~ | f''''4 r2. | R1 | r8 [ f''''8 ] ~ f''''2 ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | r2. f''''4 ~ | f''''1 | R1 | r2 f''''2 ~ | f''''2 r2 | r4 f''''2. ~ | f''''1 ~ | f''''4 r2. | r2. f''''4 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2 r2 | r2. f''''4 ~ | f''''2 ~ f''''8 [ r8 ] r4 | \bar ".|" \mark \markup { \bold \box 4.4 }r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''8 [ r8 ] d''''2. ~ | d''''4 ~ d''''8 [ r8 ] r2 | R1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''4 r2. | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''1 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] r2 | r2. r8 [ d''''8 ] ~ | d''''1 | R1 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 5.1 }
\pageBreak
\time 2/2
r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''4 r2. | r2. f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r2 f''''2 ~ | f''''4 r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 | r8 [ f''''8 ] ~ f''''2 r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''8 [ r8 ] r2. | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''2. r4 | r2. r8 [ f''''8 ] ~ | f''''2. ~ f''''8 [ r8 ] | R1 |
\time 3/2
r8 [ f''''8 ] ~ f''''2. r2 | \bar "||" \mark \markup { \bold \box 5.2 }
@ -199,6 +203,7 @@ f''''4 ~ f''''8 [ r8 ] r1 | \bar ".|" \mark \markup { \bold \box 5.4 }
\time 2/2
r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''8 [ r8 ] d''''2. ~ | d''''4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''2. r8 [ d''''8 ] ~ | d''''1 | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''2 r2 | r2. r8 [ d''''8 ] ~ | d''''1 | r8 [ d''''8 ] ~ d''''2. ~ | d''''1 ~ | d''''1 ~ | d''''2. r4 | r2 r8 [ d''''8 ] ~ d''''4 ~ | d''''4 ~ d''''8 [ r8 ] r2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 6.1 }
\pageBreak
\time 2/2
r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r2. f''''4 ~ | f''''2. r8 [ f''''8 ] ~ | f''''2. r4 | R1 | r2 f''''2 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 | r8 [ f''''8 ] ~ f''''2 r4 | R1 | r2 f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''4 r2. |
\time 3/2
r2 r8 [ f''''8 ] ~ f''''2 r4 | \bar "||" \mark \markup { \bold \box 6.2 }

@ -161,6 +161,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 1.3 }
\time 3/2
R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 }
\pageBreak
\time 2/2
\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 |
@ -175,6 +176,7 @@ R1*3/2 | \bar ".|" \mark \markup { \bold \box 2.4 }
\time 3/2
R1*3/2 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 }
\pageBreak
\time 2/2
\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 | \bar "||" \mark \markup { \bold \box 3.2 } <<{ a,,4 \laissezVibrer ^ \markup{ 5.0 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 4.4 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 3.9 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 3.3 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 2.8 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | r2. <<{ a,,4 \laissezVibrer ^ \markup{ 2.2 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 1.7 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r2. <<{ a,,4 \laissezVibrer ^ \markup{ 1.1 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 0.6 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | \bar "||" \mark \markup { \bold \box 3.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 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r2. | R1 |
@ -183,12 +185,14 @@ R1*3/2 | \bar ".|" \mark \markup { \bold \box 3.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 "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 }
\pageBreak
\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 |
\time 3/2
R1*3/2 | \bar "||" \mark \markup { \bold \box 4.2 }
\time 2/2
<<{ a,,4 \laissezVibrer ^ \markup{ 5.0 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 4.2 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 3.3 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 2.5 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 1.7 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 0.8 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | R1 | \bar "||" \mark \markup { \bold \box 4.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 | r4 <<{ 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 r4 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 4.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 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 5.1 }
\pageBreak
\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 |
\time 3/2
R1*3/2 | \bar "||" \mark \markup { \bold \box 5.2 }
@ -199,6 +203,7 @@ R1*3/2 | \bar ".|" \mark \markup { \bold \box 5.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 | \bar "|." \set Score.currentBarNumber = #1 \mark \markup { \bold \box 6.1 }
\pageBreak
\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 |
\time 3/2
R1*3/2 | \bar "||" \mark \markup { \bold \box 6.2 }

@ -29,8 +29,8 @@
ragged-bottom = ##t
top-system-spacing =
#'((basic-distance . 15 )
(minimum-distance . 15 )
#'((basic-distance . 20 )
(minimum-distance . 20 )
(padding . 0 )
(stretchability . 0))
@ -115,6 +115,7 @@
\override TimeSignature.self-alignment-X = #LEFT
\override TimeSignature.Y-offset = #9
\override TimeSignature.extra-offset = #'(2 . 0)
\override TimeSignature.break-visibility = #end-of-line-invisible
}
\context {
\StaffGroup

@ -31,7 +31,7 @@
win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 575), false).front;
masterView = {
var updateTransport, updateSection,
view, generator, transport, ranSeed, order, tempo, sectionDisplay, clock, metronome, address;
view, generator, transport, countOff, ranSeed, order, tempo, sectionDisplay, clock, metronome, address;
// this func updates the whole transport panel
updateTransport = {arg measure, beat;
@ -122,6 +122,7 @@
{arg pState;
if(pState.value == 0, {
var measure, beat;
countOff.stop;
~isPlaying = false;
~patterns[~sectionOrder[~currentSection]].stop;
~interludeTremelo.set(\gate, 0);
@ -131,7 +132,7 @@
~interludeTremelo.set(\gate, 0);
~interludeTremelo.set(\amp, 0);
},{
{
countOff = {
[1, 2, 1, 2].do({arg beat;
{
metronome.stringColor = metronomeColorFunc.value(beat);

@ -134,7 +134,6 @@
lilyString = lilyString + "\\tempo 2 = 90\n";
if(p != 1, {lilyString = lilyString + "\\override Staff.TimeSignature #'stencil = ##f"});
//lilyString = lilyString + "\\numericTimeSignature \\time 4/4\n \\mark \\default \n";
lilyString = lilyString + "\\numericTimeSignature \\time 2/2\n";
lilyString = switch(p,
@ -170,7 +169,7 @@
0, {"\"||\""},
1, {"\".|\""},
-1, {"\"|.\" \\set Score.currentBarNumber = #1 "});
pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n"});
pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n \\time 2/2\n"});
isHarmonic = switch(sectionData[sectionCount][1], 0, {false}, 1, {true}, -1, {false});
lilyString = lilyString + " \\bar " ++ barType ++
" \\mark \\markup { \\bold \\box " ++ sectionIndex ++ "." ++ subSectionIndex ++ " }" ++ pageBreak;

Loading…
Cancel
Save