Skip to content

Commit

Permalink
Cleaned up music.py files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@trevorbaca
trevorbaca committed Jan 27, 2024
1 parent e9d7ef6 commit ad4523f
Show file tree
Hide file tree
Showing 15 changed files with 134 additions and 134 deletions.
20 changes: 10 additions & 10 deletions faberge/library.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ def clb_staff_positions(argument, *, rotation=None):
def dal_niente_hairpins(argument, stop):
for run in baca.select.runs(argument):
run = baca.select.rleaves(run)
baca.hairpin(
baca.piecewise.hairpin(
[run],
f"niente o< {stop}",
)
Expand All @@ -780,22 +780,22 @@ def increasing_dal_niente_hairpins(argument):
for i, run in enumerate(runs):
run = baca.select.rleaves(run)
if i == 0:
baca.hairpin(
baca.piecewise.hairpin(
[run],
"niente o< p",
)
elif i == 1:
baca.hairpin(
baca.piecewise.hairpin(
[run],
"niente o< mp",
)
elif i in (2, 3):
baca.hairpin(
baca.piecewise.hairpin(
[run],
"niente o< mf",
)
else:
baca.hairpin(
baca.piecewise.hairpin(
[run],
"niente o< f",
)
Expand All @@ -812,18 +812,18 @@ def keynoise_pitches(argument, *, rotation=None):
def niente_swells(argument, dynamic):
assert isinstance(dynamic, str), repr(dynamic)
# TODO: allow:
# baca.hairpin(
# baca.piecewise.hairpin(
# abjad.select.leaves(_).partition([2, 'most', 2])
# 'niente o< {dynamic} {dynamic} >o niente',
# )
for run in baca.select.ntruns(argument):
if len(run) <= 2:
continue
baca.hairpin(
baca.piecewise.hairpin(
[baca.select.tleaves(run)[:2]],
f"niente o< {dynamic}",
)
baca.hairpin(
baca.piecewise.hairpin(
[baca.select.rleaves(run)[-2:]],
f"({dynamic}) >o niente",
)
Expand All @@ -834,11 +834,11 @@ def replace_with_piano_clusters(argument):


def single_swell(argument, dynamic):
baca.hairpin(
baca.piecewise.hairpin(
[argument.tleaves()[:2]],
f"niente o< {dynamic}",
)
baca.hairpin(
baca.piecewise.hairpin(
[argument.tleaves()[-1:]],
f"({dynamic}) >o",
)
Expand Down
24 changes: 12 additions & 12 deletions faberge/sections/02/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def fl(m):
"niente o< p",
)
# TODO: change to baca.spanners.hairpin()
baca.hairpin(
baca.piecewise.hairpin(
[baca.select.rleak(baca.select.tleaves(o))[-2:]],
"(p) >o",
)
Expand Down Expand Up @@ -561,7 +561,7 @@ def pf(cache):
baca.override.dots_transparent(o)
baca.override.rest_transparent(o.rests())
with baca.scope(m.get(1, 88)) as o:
baca.text_spanner(
baca.piecewise.text(
(),
r"\faberge-rf-one-markup =|",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
Expand Down Expand Up @@ -758,7 +758,7 @@ def va(m):
"D3",
hide_middle_stems=True,
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"tasto -> pont. ->",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down Expand Up @@ -808,7 +808,7 @@ def va(m):
"D3",
hide_middle_stems=True,
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"tasto -> pont.",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down Expand Up @@ -841,7 +841,7 @@ def va(m):
"D3",
hide_middle_stems=True,
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"pont. -> tasto",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down Expand Up @@ -885,7 +885,7 @@ def vc(m):
o.rleaves(),
"p < f",
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"tasto -> PO",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand All @@ -897,7 +897,7 @@ def vc(m):
o.rleaves(),
"f > p",
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"(PO) -> tasto",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand All @@ -909,14 +909,14 @@ def vc(m):
o.rleaves(),
"p < ff",
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"(tasto) -> poco pont.",
abjad.Tweak(r"- \tweak staff-padding 3"),
bookend=-1,
pieces=[baca.select.rleak(baca.select.ltleaves(o))],
)
baca.vibrato_spanner(
baca.piecewise.vibrato(
(),
"(poco vib.) -> vib. mod.",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
Expand All @@ -931,23 +931,23 @@ def vc(m):
abjad.Tweak(r"- \tweak padding 1.5"),
)
with baca.scope(m.get(71, 80)) as o:
baca.scp_spanner(
baca.piecewise.scp(
(),
"(poco pont.) -> tasto",
abjad.Tweak(r"- \tweak staff-padding 3"),
bookend=-1,
pieces=[o],
)
with baca.scope(m.get(71, 89)) as o:
baca.vibrato_spanner(
baca.piecewise.vibrato(
(),
"sub. vib. mod. -> non vib. -> poco vib.",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
bookend=-1,
pieces=baca.select.mgroups(o, [9, 10]),
)
with baca.scope(m.get(71, 92)) as o:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.omgroups(o, [9, 9]),
"ff > pp < p",
bookend=False,
Expand Down
30 changes: 15 additions & 15 deletions faberge/sections/03/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def fl(m):
baca.dynamic(o.phead(0), "p")
with baca.scope(m.get(9, 10)) as o:
leaves = baca.select.tleaves(o, rleak=True)
baca.hairpin(
baca.piecewise.hairpin(
baca.select.lparts(leaves, [1, 1 + 1]),
"niente o< mp >o niente",
)
Expand Down Expand Up @@ -359,7 +359,7 @@ def fl(m):
baca.dynamic(o.phead(0), "p")
with baca.scope(m.get(53, 54)) as o:
leaves = baca.select.tleaves(o, rleak=True)
baca.hairpin(
baca.piecewise.hairpin(
baca.select.lparts(leaves, [1, 1 + 1]),
"niente o< pp >o niente",
)
Expand Down Expand Up @@ -603,7 +603,7 @@ def pf(cache):
baca.override.dots_transparent(o)
baca.override.rest_transparent(o.rests())
with baca.scope(m.get(1, 44)) as o:
baca.text_spanner(
baca.piecewise.text(
(),
r"\faberge-rf-two-markup =|",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
Expand Down Expand Up @@ -686,7 +686,7 @@ def perc(cache):
)
baca.stem_tremolo(abjad.select.get(baca.select.pheads(o), [0, -1]))
with baca.scope(m.get(23, 52)) as o:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.mgroups(o, [2, 2, 2, 2, 3, 3, 4, 4, 2, 2, 2, 2]),
"ppp < pp >",
bookend=False,
Expand All @@ -706,7 +706,7 @@ def perc(cache):
abjad.select.get(baca.select.pheads(o), [0, -1]),
)
with baca.scope(m.get(53, 60)) as o:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.mgroups(o.rleaves(), [2, 6 + 1]),
"ppp < pp >o niente",
)
Expand Down Expand Up @@ -778,7 +778,7 @@ def vn(m):
with baca.scope(m.get(1, 52)) as o:
baca.override.dls_staff_padding(o, 5)
with baca.scope(m.get(37, 52)) as o:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.cmgroups(o, [8]),
"(ppp) < f > ppp",
)
Expand All @@ -788,7 +788,7 @@ def vn(m):
baca.override.stem_down(o.pleaves())
library.clb_staff_positions(o, rotation=-3)
with baca.scope(m.get(23, 52)) as o:
baca.scp_spanner(
baca.piecewise.scp(
(),
r"\baca-tasto-plus-pochiss-scratch-markup =|",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down Expand Up @@ -875,12 +875,12 @@ def va(m):
with baca.scope(m.get(1, 52)) as o:
baca.override.dls_staff_padding(o, 7)
with baca.scope(m.get(37, 52)) as o:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.cmgroups(o, [8]),
"(pp) < f > pp",
)
with baca.scope(m.get(23, 52)) as o:
baca.scp_spanner(
baca.piecewise.scp(
(),
r"\baca-tasto-plus-pochiss-scratch-markup =|",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down Expand Up @@ -920,14 +920,14 @@ def vc(m):
o.rleaves(),
"(p) < ff",
)
baca.scp_spanner(
baca.piecewise.scp(
(),
"(tasto) -> molto pont.",
abjad.Tweak(r"- \tweak staff-padding 3"),
bookend=-1,
pieces=[o.rleaves()],
)
baca.vibrato_spanner(
baca.piecewise.vibrato(
(),
"(poco vib.) -> vib. molto",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
Expand All @@ -940,14 +940,14 @@ def vc(m):
"(ff) > p",
)
with baca.scope(m.get(23, 30)) as o:
baca.scp_spanner(
baca.piecewise.scp(
(),
"(molto pont.) -> tasto",
abjad.Tweak(r"- \tweak staff-padding 3"),
bookend=-1,
pieces=[o.rleaves()],
)
baca.vibrato_spanner(
baca.piecewise.vibrato(
(),
"(vib. molto) -> poco vib.",
abjad.Tweak(r"- \tweak staff-padding 5.5"),
Expand All @@ -962,7 +962,7 @@ def vc(m):
hide_middle_note_heads=True,
)
baca.interpolate_pitches(o, "Eb2", "C2")
baca.hairpin(
baca.piecewise.hairpin(
baca.select.mgroups(o, [12, 12]),
"(p) < ff >o",
)
Expand All @@ -972,7 +972,7 @@ def vc(m):
abjad.Tweak(r"- \tweak staff-padding 5.5"),
)
leaves = baca.select.rleak(baca.select.ltleaves(o))
baca.scp_spanner(
baca.piecewise.scp(
(),
"(tasto) -> PO -> tasto poss.",
abjad.Tweak(r"- \tweak staff-padding 3"),
Expand Down
8 changes: 4 additions & 4 deletions faberge/sections/04/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,25 +437,25 @@ def vc(m, metadata):
runs = baca.select.rleak_runs(o)
for i, run in enumerate(runs):
if i == 0:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< p >o",
do_not_start_spanner_on_final_piece=True,
)
elif i == 1:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< mp >o",
do_not_start_spanner_on_final_piece=True,
)
elif i == 2:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< mf >o",
do_not_start_spanner_on_final_piece=True,
)
elif i == 3:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< f >o",
do_not_start_spanner_on_final_piece=True,
Expand Down
10 changes: 5 additions & 5 deletions faberge/sections/05/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def fl_cl(cache):
baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1)
baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75)
baca.glissando(o.pleaves()[2:], allow_repeats=True)
baca.hairpin(
baca.piecewise.hairpin(
baca.select.lparts(o, [1, 1, 2]),
"o< mp >o p > pp",
)
Expand Down Expand Up @@ -376,25 +376,25 @@ def vc(m, metadata):
runs = baca.select.rleak_runs(o)
for i, run in enumerate(runs):
if i == 0:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< mf >o",
do_not_start_spanner_on_final_piece=True,
)
elif i == 1:
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< mp >o",
do_not_start_spanner_on_final_piece=True,
)
elif i in (2, 3):
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< p >o",
do_not_start_spanner_on_final_piece=True,
)
elif i in (4, 5):
baca.hairpin(
baca.piecewise.hairpin(
baca.select.clparts(run, [1]),
"niente o< pp >o",
do_not_start_spanner_on_final_piece=True,
Expand Down
Loading

0 comments on commit ad4523f

Please sign in to comment.