updating score and tweak code to alleviate wslib dependency

main
Michael Winter 4 years ago
parent 0d59308043
commit 61a3ba752c

@ -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)" \clef "treble_(8)"
\bar "||" \mark \markup { \bold \box 1.1 } \bar "||" \mark \markup { \bold \box 1.1 }
\time 2/2 \time 2/2

@ -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)" \clef "treble^(8)"
\bar "||" \mark \markup { \bold \box 1.1 } \bar "||" \mark \markup { \bold \box 1.1 }
\time 2/2 \time 2/2

@ -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)" \clef "bass_(8)"
\bar "||" \mark \markup { \bold \box 1.1 } \bar "||" \mark \markup { \bold \box 1.1 }
\time 2/2 \time 2/2

@ -24,9 +24,11 @@
leadSpace = (3 - measureString.size).collect({" "}).join; leadSpace = (3 - measureString.size).collect({" "}).join;
leadSpace ++ measureString ++ "." ++ beatString leadSpace ++ measureString ++ "." ++ beatString
}; };
// [-30, -105, -104].asAscii and [-30, -105, -113].asAscii are unicode inverse bullet and normal bullet, respectively // [-30, -105, -104] and [-30, -105, -113] are unicode inverse bullet and normal bullet, respectively
metronomeStringFunc = { arg beat; if(beat == 1, {[-30, -105, -104].asAscii}, {[-30, -105, -113].asAscii}) }; metronomeStringFunc = { arg beat; if(beat == 1,
metronomeColorFunc = { arg beat; if(beat == 1, {Color.red},{Color.black}) }; {[-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; win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 575), false).front;
masterView = { masterView = {
@ -195,7 +197,7 @@
[VLayout( [VLayout(
HLayout(clock = StaticText(win).string_(" 1.1").font_(Font("Monaco", 200)), HLayout(clock = StaticText(win).string_(" 1.1").font_(Font("Monaco", 200)),
StaticText(win).string_("|").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, nil, transport, nil,
HLayout( HLayout(
tempo = TextField(view).string_("90"), tempo = TextField(view).string_("90"),
@ -299,4 +301,4 @@
), ),
tabs = StackLayout(masterView.value, faderView.value, helpView.value)); tabs = StackLayout(masterView.value, faderView.value, helpView.value));
}; };
) )

@ -129,7 +129,8 @@
lilyString = lilyString ++ "\n{ "; lilyString = lilyString ++ "\n{ ";
lilyString = lilyString ++ "\n\\set Score.markFormatter = #format-mark-box-numbers "; 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"}); if(p != 1, {lilyString = lilyString + "\\override Staff.TimeSignature #'stencil = ##f"});
lilyString = lilyString + "\\numericTimeSignature \\time 2/2\n"; lilyString = lilyString + "\\numericTimeSignature \\time 2/2\n";

Loading…
Cancel
Save