diff --git a/lilypond/seed_20200525/cicc_score.pdf b/lilypond/seed_20200525/cicc_score.pdf index 47be8ea..9e2b07d 100644 Binary files a/lilypond/seed_20200525/cicc_score.pdf and b/lilypond/seed_20200525/cicc_score.pdf differ diff --git a/lilypond/seed_20200525/includes/cicc_guitar.ly b/lilypond/seed_20200525/includes/cicc_guitar.ly index 0fbe2c5..43c4894 100644 --- a/lilypond/seed_20200525/includes/cicc_guitar.ly +++ b/lilypond/seed_20200525/includes/cicc_guitar.ly @@ -421,7 +421,7 @@ } { -\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 90"}} \override Staff.TimeSignature #'stencil = ##f \numericTimeSignature \time 2/2 +\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 80 (preferably faster towards 90 and no less than 70)"}} \override Staff.TimeSignature #'stencil = ##f \numericTimeSignature \time 2/2 \clef "treble_(8)" \bar "||" \mark \markup { \bold \box 1.1 } \time 2/2 diff --git a/lilypond/seed_20200525/includes/cicc_high.ly b/lilypond/seed_20200525/includes/cicc_high.ly index 66ca5da..ade05fa 100644 --- a/lilypond/seed_20200525/includes/cicc_high.ly +++ b/lilypond/seed_20200525/includes/cicc_high.ly @@ -421,7 +421,7 @@ } { -\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 90"}} \numericTimeSignature \time 2/2 +\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 80 (preferably faster towards 90 and no less than 70)"}} \numericTimeSignature \time 2/2 \clef "treble^(8)" \bar "||" \mark \markup { \bold \box 1.1 } \time 2/2 diff --git a/lilypond/seed_20200525/includes/cicc_low.ly b/lilypond/seed_20200525/includes/cicc_low.ly index fc57513..84df95b 100644 --- a/lilypond/seed_20200525/includes/cicc_low.ly +++ b/lilypond/seed_20200525/includes/cicc_low.ly @@ -421,7 +421,7 @@ } { -\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 90"}} \override Staff.TimeSignature #'stencil = ##f \numericTimeSignature \time 2/2 +\set Score.markFormatter = #format-mark-box-numbers \tempo \markup {\concat {\smaller \general-align #Y #DOWN \note #"2" #1 \normal-text " = approx. 80 (preferably faster towards 90 and no less than 70)"}} \override Staff.TimeSignature #'stencil = ##f \numericTimeSignature \time 2/2 \clef "bass_(8)" \bar "||" \mark \markup { \bold \box 1.1 } \time 2/2 diff --git a/supercollider/cicc_gui.scd b/supercollider/cicc_gui.scd index 748875c..11a08a1 100644 --- a/supercollider/cicc_gui.scd +++ b/supercollider/cicc_gui.scd @@ -24,9 +24,11 @@ leadSpace = (3 - measureString.size).collect({" "}).join; leadSpace ++ measureString ++ "." ++ beatString }; - // [-30, -105, -104].asAscii and [-30, -105, -113].asAscii are unicode inverse bullet and normal bullet, respectively - metronomeStringFunc = { arg beat; if(beat == 1, {[-30, -105, -104].asAscii}, {[-30, -105, -113].asAscii}) }; - metronomeColorFunc = { arg beat; if(beat == 1, {Color.red},{Color.black}) }; + // [-30, -105, -104] and [-30, -105, -113] are unicode inverse bullet and normal bullet, respectively + metronomeStringFunc = { arg beat; if(beat == 1, + {[-30, -105, -104].collect({arg int; int.asAscii}).as(String)}, + {[-30, -105, -113].collect({arg int; int.asAscii}).as(String)})}; + metronomeColorFunc = { arg beat; if(beat == 1, {Color.red},{Color.black})}; win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 575), false).front; masterView = { @@ -195,7 +197,7 @@ [VLayout( HLayout(clock = StaticText(win).string_(" 1.1").font_(Font("Monaco", 200)), StaticText(win).string_("|").font_(Font("Monaco", 200)), - metronome = StaticText(win).string_([-30, -105, -104].asAscii).font_(Font("Monaco", 300)).stringColor_(Color.red)), + metronome = StaticText(win).string_([-30, -105, -104].collect({arg int; int.asAscii}).as(String)).font_(Font("Monaco", 300)).stringColor_(Color.red)), nil, transport, nil, HLayout( tempo = TextField(view).string_("90"), @@ -299,4 +301,4 @@ ), tabs = StackLayout(masterView.value, faderView.value, helpView.value)); }; -) \ No newline at end of file +) diff --git a/supercollider/cicc_transcriber.scd b/supercollider/cicc_transcriber.scd index 2cb72a7..8734f13 100644 --- a/supercollider/cicc_transcriber.scd +++ b/supercollider/cicc_transcriber.scd @@ -129,7 +129,8 @@ lilyString = lilyString ++ "\n{ "; lilyString = lilyString ++ "\n\\set Score.markFormatter = #format-mark-box-numbers "; - lilyString = lilyString + "\\tempo \\markup {\\concat {\\smaller \\general-align #Y #DOWN \\note #\"2\" #1 \\normal-text \" = approx. 90\"}}"; + lilyString = lilyString + "\\tempo \\markup {\\concat {\\smaller \\general-align #Y #DOWN \\note #\"2\" #1 \\normal-text \""; + lilyString = lilyString + "= approx. 80 (preferably faster towards 90 and no less than 70)\"}}"; if(p != 1, {lilyString = lilyString + "\\override Staff.TimeSignature #'stencil = ##f"}); lilyString = lilyString + "\\numericTimeSignature \\time 2/2\n";