Skip to content

Commit 4b54945

Browse files
trevorbacatrevorbaca
committed
Cleaned up music.py files.
1 parent e8b671e commit 4b54945

File tree

11 files changed

+79
-71
lines changed

11 files changed

+79
-71
lines changed

‎faberge/sections/02/music.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,11 +934,11 @@ def vc(m):
934934
"sub. vib. mod. -> non vib. -> poco vib.",
935935
staff_padding=5.5,
936936
)
937-
with baca.scope(m.get(71, 92)) as o:
937+
with baca.scope(m.get(71, 89)) as o:
938938
baca.hairpinlib.hairpin(
939-
baca.select.omgroups(o, [9, 9]),
939+
baca.select.mgroups(o, [9, 10]),
940940
"ff > pp < p",
941-
do_not_bookend=True,
941+
glue=True,
942942
)
943943

944944

‎faberge/sections/03/music.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ def fl(m):
325325
baca.dynamic(o.phead(0), "p")
326326
with baca.scope(m.get(9, 10)) as o:
327327
baca.hairpinlib.hairpin(
328-
baca.select.lparts(o, [1, 1, 1]),
328+
baca.select.lparts(o, [1, 2]),
329329
"o< mp >o !",
330-
do_not_bookend=True,
330+
glue=True,
331331
)
332332
with baca.scope(m.get(11, 12)) as o:
333333
library.swells(o, "mf")
@@ -359,9 +359,9 @@ def fl(m):
359359
baca.dynamic(o.phead(0), "p")
360360
with baca.scope(m.get(53, 54)) as o:
361361
baca.hairpinlib.hairpin(
362-
baca.select.lparts(o, [1, 1, 1]),
362+
baca.select.lparts(o, [1, 2]),
363363
"o< pp >o !",
364-
do_not_bookend=True,
364+
glue=True,
365365
)
366366
with baca.scope(m.get(55, 60)) as o:
367367
library.swells(o, "ppp")
@@ -709,9 +709,9 @@ def perc(cache):
709709
)
710710
with baca.scope(m.get(53, 61)) as o:
711711
baca.hairpinlib.hairpin(
712-
baca.select.mgroups(o, [2, 6, 1]),
712+
baca.select.mgroups(o, [2, 7]),
713713
"ppp < pp >o !",
714-
do_not_bookend=True,
714+
glue=True,
715715
)
716716
with baca.scope(m.get(69, 72)) as o:
717717
baca.staff_lines(o.leaf(0), 1)
@@ -782,9 +782,9 @@ def vn(m):
782782
baca.override.dls_staff_padding(o, 5)
783783
with baca.scope(m.get(37, 52)) as o:
784784
baca.hairpinlib.hairpin(
785-
baca.select.mgroups(o, [8, 7, 1]),
785+
baca.select.mgroups(o, [8, 8]),
786786
"(ppp) < f > ppp",
787-
do_not_bookend=True,
787+
glue=True,
788788
)
789789
with baca.scope(m.get(53, 68)) as o:
790790
baca.staff_lines(o.leaf(0), 1)
@@ -880,9 +880,9 @@ def va(m):
880880
baca.override.dls_staff_padding(o, 7)
881881
with baca.scope(m.get(37, 52)) as o:
882882
baca.hairpinlib.hairpin(
883-
baca.select.mgroups(o, [8, 7, 1]),
883+
baca.select.mgroups(o, [8, 8]),
884884
"(pp) < f > pp",
885-
do_not_bookend=True,
885+
glue=True,
886886
)
887887
with baca.scope(m.get(23, 52)) as o:
888888
baca.mspanners.scp(

‎faberge/sections/04/music.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,22 +438,18 @@ def vc(m, metadata):
438438
baca.hairpinlib.hairpin(
439439
baca.select.clparts(runs[0], [1]),
440440
"o< p >o ! o< p >o !",
441-
do_not_bookend=True,
442441
)
443442
baca.hairpinlib.hairpin(
444443
baca.select.clparts(baca.select.rleak(runs[1]), [1]),
445444
"o< mp >o ! o< mp >o ! o< mp >o ! o< mp >o !",
446-
do_not_bookend=True,
447445
)
448446
baca.hairpinlib.hairpin(
449447
baca.select.clparts(baca.select.rleak(runs[2]), [1]),
450448
"o< mf >o ! o< mf >o ! o< mf >o !",
451-
do_not_bookend=True,
452449
)
453450
baca.hairpinlib.hairpin(
454451
baca.select.clparts(baca.select.rleak(runs[3]), [1]),
455452
"o< f >o ! o< f >o ! o< f >o !",
456-
do_not_bookend=True,
457453
)
458454

459455

‎faberge/sections/05/music.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ def fl_cl(cache):
247247
baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75)
248248
baca.glissando(o.pleaves()[2:], allow_repeats=True)
249249
baca.hairpinlib.hairpin(
250-
baca.select.lparts(o, [1, 1, 1, 1]),
250+
baca.select.lparts(o, [1, 1, 2]),
251251
"o< mp >o p > pp",
252-
do_not_bookend=True,
252+
glue=True,
253253
)
254254
baca.rspanners.trill(
255255
o.leaves()[:2],
@@ -376,34 +376,40 @@ def vc(m, metadata):
376376
baca.glissando(o.tleaves())
377377
runs = abjad.select.runs(o)
378378
baca.hairpinlib.hairpin(
379-
baca.select.clparts(baca.select.rleak(runs[0]), [1]),
379+
baca.select.clparts(runs[0], [1]),
380380
"o< mf >o !",
381-
do_not_bookend=True,
381+
glue=True,
382+
rleak=True,
382383
)
383384
baca.hairpinlib.hairpin(
384-
baca.select.clparts(baca.select.rleak(runs[1]), [1]),
385+
baca.select.clparts(runs[1], [1]),
385386
"o< mp >o ! o< mp >o !",
386-
do_not_bookend=True,
387+
glue=True,
388+
rleak=True,
387389
)
388390
baca.hairpinlib.hairpin(
389-
baca.select.clparts(baca.select.rleak(runs[2]), [1]),
391+
baca.select.clparts(runs[2], [1]),
390392
"o< p >o !",
391-
do_not_bookend=True,
393+
glue=True,
394+
rleak=True,
392395
)
393396
baca.hairpinlib.hairpin(
394-
baca.select.clparts(baca.select.rleak(runs[3]), [1]),
397+
baca.select.clparts(runs[3], [1]),
395398
"o< p >o ! o< p >o !",
396-
do_not_bookend=True,
399+
glue=True,
400+
rleak=True,
397401
)
398402
baca.hairpinlib.hairpin(
399-
baca.select.clparts(baca.select.rleak(runs[4]), [1]),
403+
baca.select.clparts(runs[4], [1]),
400404
"o< pp >o !",
401-
do_not_bookend=True,
405+
glue=True,
406+
rleak=True,
402407
)
403408
baca.hairpinlib.hairpin(
404-
baca.select.clparts(baca.select.rleak(runs[5]), [1]),
409+
baca.select.clparts(runs[5], [1]),
405410
"o< pp >o ! o< pp >o !",
406-
do_not_bookend=True,
411+
glue=True,
412+
rleak=True,
407413
)
408414
with baca.scope(m.leaves()) as o:
409415
baca.override.dls_staff_padding(o.leaves(), 8)

‎faberge/sections/06/music.ily

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,9 @@ number.6.Flute.Music = {
471471
- \tweak color #blue
472472
%! EXPLICIT_DYNAMIC
473473
%! SPANNER_START
474+
- \tweak to-barline ##t
475+
%! EXPLICIT_DYNAMIC
476+
%! SPANNER_START
474477
\>
475478

476479
}
@@ -730,16 +733,16 @@ number.6.Flute.Music = {
730733
\>
731734
\glissando
732735

736+
g'4
737+
\glissando
738+
739+
\once \override DynamicText.self-alignment-X = -0.75
733740
g'4
734741
%! EXPLICIT_DYNAMIC_COLOR
735742
%! EXPLICIT_DYNAMIC
736743
- \tweak color #blue
737744
%! EXPLICIT_DYNAMIC
738745
\pp
739-
\glissando
740-
741-
\once \override DynamicText.self-alignment-X = -0.75
742-
g'4
743746

744747
}
745748

@@ -1440,16 +1443,16 @@ number.6.Clarinet.Music = {
14401443
\>
14411444
\glissando
14421445

1446+
fs'!4
1447+
\glissando
1448+
1449+
\once \override DynamicText.self-alignment-X = -0.75
14431450
fs'!4
14441451
%! EXPLICIT_DYNAMIC_COLOR
14451452
%! EXPLICIT_DYNAMIC
14461453
- \tweak color #blue
14471454
%! EXPLICIT_DYNAMIC
14481455
\pp
1449-
\glissando
1450-
1451-
\once \override DynamicText.self-alignment-X = -0.75
1452-
fs'!4
14531456

14541457
}
14551458

@@ -2614,11 +2617,6 @@ number.6.Violin.Music = {
26142617

26152618
ef'!4
26162619
:32
2617-
%! EXPLICIT_DYNAMIC_COLOR
2618-
%! EXPLICIT_DYNAMIC
2619-
- \tweak color #blue
2620-
%! EXPLICIT_DYNAMIC
2621-
\pp
26222620
%! SPANNER_STOP
26232621
\bacaStopTextSpanSCP
26242622
\revert DynamicLineSpanner.staff-padding
@@ -2645,6 +2643,11 @@ number.6.Violin.Music = {
26452643
%! HIDDEN
26462644
%! NOTE
26472645
b'1 * 1/4
2646+
%! EXPLICIT_DYNAMIC_COLOR
2647+
%! EXPLICIT_DYNAMIC
2648+
- \tweak color #blue
2649+
%! EXPLICIT_DYNAMIC
2650+
\pp
26482651
%! DURATION_MULTIPLIER
26492652
%! HIDDEN
26502653
%! NOTE
@@ -3041,11 +3044,6 @@ number.6.Viola.Music = {
30413044

30423045
ef'!2
30433046
- \baca-staccati #4
3044-
%! EXPLICIT_DYNAMIC_COLOR
3045-
%! EXPLICIT_DYNAMIC
3046-
- \tweak color #blue
3047-
%! EXPLICIT_DYNAMIC
3048-
\p
30493047
\revert DynamicLineSpanner.staff-padding
30503048

30513049
}
@@ -3070,6 +3068,11 @@ number.6.Viola.Music = {
30703068
%! HIDDEN
30713069
%! NOTE
30723070
c'1 * 1/4
3071+
%! EXPLICIT_DYNAMIC_COLOR
3072+
%! EXPLICIT_DYNAMIC
3073+
- \tweak color #blue
3074+
%! EXPLICIT_DYNAMIC
3075+
\p
30733076
%! DURATION_MULTIPLIER
30743077
%! HIDDEN
30753078
%! NOTE

‎faberge/sections/06/music.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,11 @@ def VC(voice, time_signatures):
223223
def fl(m):
224224
with baca.scope(m.get(1, 2)) as o:
225225
baca.hairpinlib.hairpin(
226-
baca.select.clparts(baca.select.rleak(o), [1]),
226+
baca.select.clparts(o, [1]),
227227
"o< mf >o ! o< mf >o !",
228-
do_not_bookend=True,
228+
(abjad.Tweak(r"- \tweak to-barline ##t"), -1),
229+
glue=True,
230+
rleak=True,
229231
)
230232
baca.pitch(o, "F5")
231233
baca.stem_tremolo(o.pleaves())
@@ -296,9 +298,9 @@ def fl_cl(cache):
296298
baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75)
297299
baca.glissando(o.pleaves()[2:], allow_repeats=True)
298300
baca.hairpinlib.hairpin(
299-
baca.select.lparts(o, [1, 1, 1, 1]),
301+
baca.select.lparts(o, [1, 1, len(o) - 2]),
300302
"o< mp >o p > pp",
301-
do_not_bookend=True,
303+
glue=True,
302304
)
303305
baca.rspanners.trill(
304306
o.leaves()[:2],
@@ -426,9 +428,10 @@ def perc(m):
426428
def vn(m):
427429
with baca.scope(m[2]) as o:
428430
baca.hairpinlib.hairpin(
429-
baca.select.lparts(o, [1, 1, 1, 1]),
431+
baca.select.lparts(o, [1, 1, 2]),
430432
"p - o< p > pp",
431-
do_not_bookend=True,
433+
glue=True,
434+
rleak=True,
432435
)
433436
baca.pitches(
434437
o,
@@ -462,9 +465,10 @@ def vn(m):
462465
def va(m):
463466
with baca.scope(m[2]) as o:
464467
baca.hairpinlib.hairpin(
465-
baca.select.lparts(o, [1, 1, 1, 1]),
468+
baca.select.lparts(o, [1, 1, 2]),
466469
"o< p > pp p",
467-
do_not_bookend=True,
470+
glue=True,
471+
rleak=True,
468472
)
469473
baca.pitches(
470474
o,

‎faberge/sections/08/music.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ def va(m):
473473
baca.hairpinlib.hairpin(
474474
baca.select.lparts(o, [1, 1, 1, 1]),
475475
"o< p > pp p",
476-
do_not_bookend=True,
477476
)
478477
baca.mspanners.scp(
479478
baca.select.lparts(o[:3], [1, 2]),

‎faberge/sections/09/music.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@ def va(m):
450450
baca.hairpinlib.hairpin(
451451
baca.select.clparts(o, [1]),
452452
"p - o< p > pp - o< p > pp",
453-
do_not_bookend=True,
454453
)
455454
baca.mspanners.scp(
456455
baca.select.clparts(o, [1]),
@@ -472,7 +471,6 @@ def va(m):
472471
baca.hairpinlib.hairpin(
473472
baca.select.clparts(o, [1]),
474473
"o< mp > pp mp - o< mp > pp mp",
475-
do_not_bookend=True,
476474
)
477475
baca.mspanners.scp(
478476
baca.select.clparts(o, [1]),
@@ -492,7 +490,6 @@ def va(m):
492490
baca.hairpinlib.hairpin(
493491
baca.select.clparts(o, [1]),
494492
"mp - o< mf > pp - o< mf > pp mf",
495-
do_not_bookend=True,
496493
)
497494
baca.mspanners.scp(
498495
baca.select.clparts(o, [1]),
@@ -512,7 +509,6 @@ def va(m):
512509
baca.hairpinlib.hairpin(
513510
baca.select.clparts(o, [1]),
514511
"- o< f > pp f f - o< f > pp",
515-
do_not_bookend=True,
516512
)
517513
baca.mspanners.scp(
518514
baca.select.clparts(o, [1]),
@@ -598,6 +594,7 @@ def vc(m):
598594
baca.hairpinlib.hairpin(
599595
baca.select.clparts(o, [1]),
600596
"p f >o",
597+
cyclic=True,
601598
do_not_bookend=True,
602599
)
603600
for n in [5, 6, 7, 9]:

‎faberge/sections/10/music.ily

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,6 +2888,8 @@ number.10.Violin.Music = {
28882888
- \tweak color #(x11-color 'DeepPink1)
28892889
%! REDUNDANT_DYNAMIC
28902890
\p
2891+
%! SPANNER_STOP
2892+
\!
28912893

28922894
\times 2/3
28932895
{
@@ -3472,6 +3474,8 @@ number.10.Viola.Music = {
34723474
- \tweak color #(x11-color 'DeepPink1)
34733475
%! REDUNDANT_DYNAMIC
34743476
\p
3477+
%! SPANNER_STOP
3478+
\!
34753479

34763480
\times 2/3
34773481
{

0 commit comments

Comments
 (0)