diff --git a/faberge/library.py b/faberge/library.py index 125b4e90f..4a54954b1 100644 --- a/faberge/library.py +++ b/faberge/library.py @@ -768,7 +768,7 @@ def clb_staff_positions(argument, *, rotation=None): def dal_niente_hairpins(argument, stop): for run in baca.select.runs(argument): - baca.hairpins.exact( + baca.hairpin( run, f"o<{stop}", rleak=True, @@ -785,7 +785,7 @@ def increasing_dal_niente_hairpins(argument): } for i, run in enumerate(runs): peak = i_to_peak.get(i, "f") - baca.hairpins.exact( + baca.hairpin( run, f"o<{peak}", rleak=True, @@ -805,12 +805,12 @@ def replace_with_piano_clusters(argument): def single_swell(argument, peak): - baca.hairpins.exact( + baca.hairpin( argument.tleaves()[:1], f"o<{peak}", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( argument.tleaves()[-1:], f"({peak})>o!", rleak=True, @@ -822,12 +822,12 @@ def swells(argument, dynamic): for run in baca.select.ntruns(argument): if len(run) <= 2: continue - baca.hairpins.exact( + baca.hairpin( run[:1], f"o<{dynamic}", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( run[-1:], f"({dynamic})>o!", rleak=True, diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py index 07ae77603..b2f8b5bfa 100644 --- a/faberge/sections/02/music.py +++ b/faberge/sections/02/music.py @@ -368,12 +368,12 @@ def fl(m): with baca.scope(m.get(81, 88)) as o: baca.breathe(o.pleaf(-1)) baca.flat_glissando(o, "F#4") - baca.hairpins.exact( + baca.hairpin( o.tleaves()[:1], "oo!", rleak=True, @@ -385,12 +385,12 @@ def fl(m): abjad.Tweak(r"- \tweak parent-alignment-X -0.5"), abjad.Tweak(r"- \tweak staff-padding 3.5"), ) - baca.hairpins.exact( + baca.hairpin( o.tleaves()[:1], "oo!", rleak=True, @@ -763,7 +763,7 @@ def va(m): with baca.scope(m.get(13, 16)) as o: baca.dynamic(o.pleaf(0), "pp") with baca.scope(m.get(17, 22)) as o: - baca.hairpins.exact( + baca.hairpin( o, "ppp", rleak=True, @@ -899,7 +899,7 @@ def vc(m): staff_padding=3, ) with baca.scope(m.get(47, 54)) as o: - baca.hairpins.exact( + baca.hairpin( o, "p ppo!", ) @@ -357,7 +357,7 @@ def fl(m): with baca.scope(m[52]) as o: baca.dynamic(o.phead(0), "p") with baca.scope(m.get(53, 54)) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 2]), "o< pp>o!", ) @@ -448,7 +448,7 @@ def eh(m): baca.override.tuplet_bracket_staff_padding(o, 1) with baca.scope(m.get(53, 60)) as o: baca.override.dls_staff_padding(o, 8) - baca.hairpins.exact( + baca.hairpin( o.tleaves(), '"ff">o!', ) @@ -490,11 +490,11 @@ def cl(m): with baca.scope(m.get(1, 3)) as o: baca.breathe(o.pleaf(-1)) baca.flat_glissando(o, "Eb2") - baca.hairpins.exact( + baca.hairpin( o.tleaves()[:2], "oo!", rleak=True, @@ -503,11 +503,11 @@ def cl(m): for plt in baca.select.plts(o): if len(plt) <= 2: continue - baca.hairpins.exact( + baca.hairpin( plt[:2], "oo!", rleak=True, @@ -546,11 +546,11 @@ def cl(m): for plt in baca.select.plts(o): if len(plt) <= 2: continue - baca.hairpins.exact( + baca.hairpin( plt[:2], "oo!", rleak=True, @@ -560,11 +560,11 @@ def cl(m): for plt in baca.select.plts(o): if len(plt) <= 2: continue - baca.hairpins.exact( + baca.hairpin( plt[:2], "oo!", rleak=True, @@ -578,11 +578,11 @@ def cl(m): for plt in baca.select.plts(o): if len(plt) <= 2: continue - baca.hairpins.exact( + baca.hairpin( plt[:2], "oo!", rleak=True, @@ -705,7 +705,7 @@ def perc(cache): abjad.select.get(baca.select.pheads(o), [0, -1]), ) with baca.scope(m.get(53, 61)) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.mgroups(o, [2, 7]), "ppp< pp>o!", ) @@ -758,7 +758,7 @@ def vn(m): baca.dynamic(o.phead(0), '"ff"') baca.pitch(o, "F4") with baca.scope(m.get(13, 22)) as o: - baca.hairpins.exact( + baca.hairpin( o, '("ff")>o!', ) @@ -777,7 +777,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.hairpins.exact( + baca.hairpin( baca.select.mgroups(o, [8, 8]), "(ppp)< f>ppp", ) @@ -793,7 +793,7 @@ def vn(m): staff_padding=3, ) with baca.scope(m.get(53, 56)) as o: - baca.hairpins.exact( + baca.hairpin( o, '"p"<"mf"', rleak=True, @@ -855,7 +855,7 @@ def va(m): staff_padding=5.5, ) with baca.scope(m.get(13, 22)) as o: - baca.hairpins.exact( + baca.hairpin( o.tleaves(), '("ff")>o!', ) @@ -874,7 +874,7 @@ 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.hairpins.exact( + baca.hairpin( baca.select.mgroups(o, [8, 8]), "(pp)< f>pp", ) @@ -885,7 +885,7 @@ def va(m): staff_padding=3, ) with baca.scope(m.get(53, 56)) as o: - baca.hairpins.exact( + baca.hairpin( o, '"p"<"mf"', rleak=True, @@ -915,7 +915,7 @@ def vc(m): hide_middle_stems=True, ) with baca.scope(m.get(9, 12)) as o: - baca.hairpins.exact( + baca.hairpin( o, "(p)p", rleak=True, @@ -955,7 +955,7 @@ def vc(m): hide_middle_note_heads=True, ) baca.interpolate_pitches(o, "Eb2", "C2") - baca.hairpins.exact( + baca.hairpin( baca.select.mgroups(o, [12, 12]), "(p)< ff>o!", rleak=True, diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index efbd948c9..c111d8b03 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -270,12 +270,12 @@ def fl_eh_cl(cache): for i, plt in enumerate(plts): plt = baca.select.rleaves(plt) if i == 0: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mp"', ) elif i == 1: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mf"', ) @@ -375,22 +375,22 @@ def va(m): for i, plt in enumerate(plts): plt = baca.select.rleaves(plt) if i == 0: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mp"', ) elif i in (1, 2): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mf"', ) elif i in (3, 4): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"f"', ) elif i in (5, 6): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"ff"', ) @@ -435,19 +435,19 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) runs = abjad.select.runs(o) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[0], [1]), "o< p>o !o< p>o !", ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(baca.select.rleak(runs[1]), [1]), "o< mp>o !o< mp>o !o< mp>o !o< mp>o !", ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(baca.select.rleak(runs[2]), [1]), "o< mf>o !o< mf>o !o< mf>o !", ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(baca.select.rleak(runs[3]), [1]), "o< f>o !o< f>o !o< f>o !", ) diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index 45335a2c0..eceb96cd4 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -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.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< mp>o p>pp", ) @@ -286,22 +286,22 @@ def vn(m): for i, plt in enumerate(plts): plt = baca.select.rleaves(plt) if i == 0: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"f"', ) elif i == 1: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mf"', ) elif i in (2, 3): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mp"', ) elif i in (4, 5): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"p"', ) @@ -320,22 +320,22 @@ def va(m): for i, plt in enumerate(plts): plt = baca.select.rleaves(plt) if i == 0: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"f"', ) elif i == 1: - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mf"', ) elif i in (2, 3): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"mp"', ) elif i in (4, 5): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"p"', ) @@ -374,32 +374,32 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) runs = abjad.select.runs(o) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[0], [1]), "o< mf>o!", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[1], [1]), "o< mp>o !o< mp>o!", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[2], [1]), "o< p>o!", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[3], [1]), "o< p>o !o< p>o!", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[4], [1]), "o< pp>o!", rleak=True, ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(runs[5], [1]), "o< pp>o !o< pp>o!", rleak=True, diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index f2710bd9d..f5c4c92d1 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -222,7 +222,7 @@ def VC(voice, time_signatures): def fl(m): with baca.scope(m.get(1, 2)) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(o, [1]), "o< mf>o !o< mf>o!", (abjad.Tweak(r"- \tweak to-barline ##t"), -1), @@ -296,7 +296,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.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, len(o) - 2]), "o< mp>o p>pp", ) @@ -425,7 +425,7 @@ def perc(m): def vn(m): with baca.scope(m[2]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "p o< p>pp", rleak=True, @@ -461,7 +461,7 @@ def vn(m): def va(m): with baca.scope(m[2]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< p> pp+p", rleak=True, diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index dc144061d..0eecbbb26 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -311,7 +311,7 @@ def fl_cl(cache): for name in ["fl", "cl"]: m = cache[name] with baca.scope(m[2]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< p>o pp>ppp", ) @@ -325,7 +325,7 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) with baca.scope(m[4]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< pp>o ppp>pppp", ) @@ -334,7 +334,7 @@ def fl_cl(cache): o.pheads(), abjad.Tweak(r"- \tweak X-extent #'(0 . 0)", tag=baca.tags.NOT_PARTS), ) - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_counts( abjad.select.leaves(o.rleaves()), [2], overhang=True ), @@ -435,7 +435,7 @@ def perc(m): ) baca.staff_position(o, -1) baca.override.stem_down(o.pleaves()) - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|mf", rleak=True, @@ -596,7 +596,7 @@ def vn_va(cache): baca.override.tuplet_bracket_staff_padding(o, 3.5) for name in ["vn", "va"]: with baca.scope(cache[name][7]) as o: - baca.hairpins.exact( + baca.hairpin( o, '("mf")>o!', rleak=True, diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index c272ee873..9860ba98c 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -427,7 +427,7 @@ def vn(m): ) for n in [6, 8, 9, 10]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "p o< p>pp", ) @@ -469,7 +469,7 @@ def va(m): ) for n in [8, 9, 10]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 1, 1]), "o< p> pp p", ) @@ -558,7 +558,7 @@ def perc_vn_vc(cache): m = cache[name] with baca.scope(m.get(4, 5)) as o: for plt in baca.select.plts(o): - baca.hairpins.exact( + baca.hairpin( plt, 'o<"f"', rleak=True, diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index b2f4aa99b..d58b4b078 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -195,7 +195,7 @@ def fl(m): baca.override.dls_staff_padding(o, 6) baca.pitch(o, "G3") with baca.scope(m[5]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< f>o!", rleak=True, @@ -211,13 +211,13 @@ def fl(m): abjad.Tweak(r"- \tweak staff-padding 5.5"), ) with baca.scope(m[6]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o.rleaves(), [1, 1]), "o< mf>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mp>o!", rleak=True, @@ -231,7 +231,7 @@ def eh(m): baca.select.pleaves(o), [2], overhang=True ): leaves = baca.select.rleaves(leaves) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(leaves, [1, 1]), "o< mf>o!", rleak=True, @@ -254,7 +254,7 @@ def eh(m): baca.pitch(o, "B4") with baca.scope(m.get(4, 5)) as o: baca.override.dls_staff_padding(o, 6) - baca.hairpins.exact( + baca.hairpin( o.tleaves(), "f>o!", rleak=True, @@ -284,7 +284,7 @@ def fl_cl(cache): baca.espressivo(o.pheads()) for cmgroup in baca.select.cmgroups(o): cmgroup = baca.select.rleaves(cmgroup) - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_counts( abjad.select.leaves(cmgroup), [2], overhang=True ), @@ -331,7 +331,7 @@ def perc(m): with baca.scope(m[5]) as o: baca.staff_lines(o.leaf(0), 5) baca.clef(o.leaf(0), "treble") - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|f", rleak=True, @@ -373,7 +373,7 @@ def perc(m): def vn(m): with baca.scope(m[1]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), "p o< p>pp", ) @@ -395,19 +395,19 @@ def vn(m): baca.stem_tremolo(abjad.select.get(baca.select.plts(o), [1, 2, 3], 4)) with baca.scope(m[2]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), "mp o< mp>pp", ) with baca.scope(m[3]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), "mf o< mf>pp", ) with baca.scope(m[4]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), "f o< f>pp", ) @@ -438,7 +438,7 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((1, 3)): baca.stem_tremolo(plt) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(o, [1]), "p o< p> pp o< p> pp p", ) @@ -459,7 +459,7 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((5, 18)): baca.stem_tremolo(plt) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(o, [1]), "o< mp> pp mp o< mp> pp mp", ) @@ -478,7 +478,7 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((1, 3)): baca.stem_tremolo(plt) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(o, [1]), "mp o< mf> pp o< mf> pp mf", ) @@ -497,7 +497,7 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((5, 18)): baca.stem_tremolo(plt) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(o, [1]), "o< f> pp f f o< f> pp", ) @@ -550,13 +550,13 @@ def vn_va(cache): for n in [5, 6, 7]: with baca.scope(m[n]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), '"ff" o< ff>pp', ) with baca.scope(m.get(9)) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(clpart, [1, 1, 2]), "mp o< mp>pp", ) @@ -573,7 +573,7 @@ def vc(m): ) with baca.scope(m.get(1, 3)) as o: baca.clef(o.leaf(0), "bass") - baca.hairpins.exact( + baca.hairpin( o, "po!", rleak=True, diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index 86782314f..52ac4d2cc 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -261,29 +261,29 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak staff-padding 8"), ) with baca.scope(m[1]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< mp>o p>pp", ) with baca.scope(m[2]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< mf>o mp>p", ) with baca.scope(m[3]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< f>o mf>mp", ) for n in [4, 5]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< mp>o p>pp", ) for n in [6, 7, 8]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< p>o pp>ppp", ) @@ -383,7 +383,7 @@ def perc(m): def vn(m): for n in [1, 2, 3]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "mp o< mp>p", ) @@ -456,7 +456,7 @@ def va(m): ) for n in [1, 2, 3]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "mp o< mp>p", ) @@ -520,19 +520,19 @@ def vn_va(cache): elif duration == abjad.Duration((1, 3)): baca.stem_tremolo(plt) with baca.scope(m[6]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 3]), "mp p>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 3]), "p pp>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "pp ppp", ) @@ -616,15 +616,15 @@ def vc(m, metadata): name="CELLO_GLISSANDI", ), baca.glissando(o.tleaves()) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(baca.select.rleak(abjad.select.run(o, 0)), [1, 1, 1]), "o< p>o !", ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(baca.select.rleak(abjad.select.run(o, 1)), [1]), "o< p>o !o< p>o !", ) - baca.hairpins.exact( + baca.hairpin( baca.select.clparts(abjad.select.run(o, 2), [1]), "o< p>o !o< p>o !", ) diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 9d81bfa37..69d78c5c0 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -252,13 +252,13 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) with baca.scope(m[1]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< p>o pp>ppp", ) for n in [2, 3, 4]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< pp>o ppp>pppp", ) @@ -272,7 +272,7 @@ def fl_cl(cache): baca.espressivo(o.pheads()) for cmgroup in baca.select.cmgroups(o): cmgroup = baca.select.rleak(cmgroup) - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_counts( abjad.select.leaves(cmgroup), [2], overhang=True ), @@ -387,7 +387,7 @@ def perc(m): baca.override.stem_up(o.pleaves()) for n in [5, 6, 7, 8]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|mf", rleak=True, @@ -425,7 +425,7 @@ def vn(m): staff_padding=3, ) with baca.scope(m[3]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "p o< p>pp", ) @@ -450,7 +450,7 @@ def vn(m): ) with baca.scope(m.get(5, 7)) as o: baca.flat_glissando(o, "F4", hide_middle_stems=True) - baca.hairpins.exact( + baca.hairpin( o, "mp>o!", rleak=True, @@ -529,7 +529,7 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1, 1, 2]), "o< p>o !o< p>o!", ) @@ -559,7 +559,7 @@ def vc(m, metadata): "Eb2", hide_middle_stems=True, ), - baca.hairpins.exact( + baca.hairpin( o, "mp>o!", rleak=True, diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py index b83984677..97c64a3d2 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -221,7 +221,7 @@ def fl_cl(cache): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 7) with baca.scope(m[1]) as o: - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(o.rleaves()), (2, 3)), "o< mp>o!", ) @@ -229,7 +229,7 @@ def fl_cl(cache): with baca.scope(m[n]) as o: baca.espressivo(o.pheads()) with baca.scope(m[3]) as o: - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(o.rleaves()), (2, 3)), "o< p>o!", ) @@ -300,7 +300,7 @@ def pf(cache): def perc(m): with baca.scope(m[1]) as o: - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|mp", rleak=True, @@ -315,7 +315,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 5.5"), ) with baca.scope(m[3]) as o: - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|p", rleak=True, @@ -342,7 +342,7 @@ def perc(m): "B3", hide_middle_stems=True, ), - baca.hairpins.exact( + baca.hairpin( o, "mp>o!", rleak=True, @@ -512,7 +512,7 @@ def vn_vc(cache): for name in ["vn", "vc"]: m = cache[name] with baca.scope(m[1]) as o: - baca.hairpins.exact( + baca.hairpin( o, '"pp"<"mf"', rleak=True, diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index c6adf9dce..fc6306e6e 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -262,7 +262,7 @@ def fl(m): 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.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1, 3]), "o< mp>o p>pp", ) @@ -290,7 +290,7 @@ def eh(m): baca.pitch(o, "A#4") with baca.scope(m.get(5, 8)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1]), "o< mf>o!", rleak=True, @@ -315,7 +315,7 @@ def cl(m): baca.pitch(o, "A2") with baca.scope(m.get(3, 6)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), "pp< p>pp", ) @@ -327,7 +327,7 @@ def cl(m): ) with baca.scope(m.get(7, 8)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), "p< mp>p", ) @@ -521,7 +521,7 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1, 1, 1, 1, 1]), "o< pp>o !o< pp>o !o< pp>o!", rleak=True, diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index 8092d8066..2065a9aad 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -190,7 +190,7 @@ def fl(m): baca.staff_position(o, 0) with baca.scope(m[5]) as o: baca.staff_lines(o.leaf(0), 5) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< p>o!", rleak=True, @@ -198,7 +198,7 @@ def fl(m): with baca.scope(m.get(5, 8)) as o: baca.override.dls_staff_padding(o, 4) with baca.scope(m[6]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mp>o!", rleak=True, @@ -212,13 +212,13 @@ def fl(m): baca.pitch(o, "C#5") baca.stem_tremolo(o.pleaves()) with baca.scope(m[7]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mf>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< f>o!", rleak=True, @@ -230,7 +230,7 @@ def cl(m): baca.pitch(o, "Ab2") with baca.scope(m.get(2, 5)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), "p< mp>p", ) @@ -240,7 +240,7 @@ def cl(m): baca.pitch(o, "F2") with baca.scope(m.get(6, 8)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), "pp< p>pp", ) @@ -265,7 +265,7 @@ def eh(m): baca.pitch(o, "B4") with baca.scope(m.get(1, 6)) as o: for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1]), "o< mf>o!", rleak=True, @@ -402,19 +402,19 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1]), "o< mp>o!", rleak=True, ) run = abjad.select.run(o, 1) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1, 1, 1]), "o< mf>o !o< mf>o!", rleak=True, ) run = abjad.select.run(o, 2) - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(run, [1, 1]), "o< f>o!", rleak=True, @@ -425,7 +425,7 @@ def vc(m, metadata): baca.override.dls_staff_padding(o, 6) for n in [5, 6, 7, 8]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< p>o!", rleak=True, @@ -439,17 +439,17 @@ def fl_vn(cache): m = cache[name] with baca.scope(m.get(1, 3)) as o: plts = baca.select.plts(o) - baca.hairpins.exact( + baca.hairpin( plts[0], 'o<"mf"', rleak=True, ) - baca.hairpins.exact( + baca.hairpin( plts[1], 'o<"f"', rleak=True, ) - baca.hairpins.exact( + baca.hairpin( plts[2], 'o<"ff"', rleak=True, diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py index b2f3eb3d9..7c9b2ea12 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -162,25 +162,25 @@ def fl(m): do_not_bookend=True, ) with baca.scope(m[5]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mf>o!", rleak=True, ) with baca.scope(m[6]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mp>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< p>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< pp>o!", rleak=True, @@ -191,7 +191,7 @@ def cl(m): with baca.scope(m.get(1, 4)) as o: baca.override.dls_staff_padding(o, 8) for run in baca.select.runs(o): - baca.hairpins.exact( + baca.hairpin( abjad.select.partition_by_ratio(baca.select.plts(run), (2, 3)), "pp< p>pp", ) @@ -241,7 +241,7 @@ def perc(m): baca.staff_lines(o.leaf(0), 5) baca.clef(o.leaf(0), "treble") baca.override.dls_staff_padding(o, 6) - baca.hairpins.exact( + baca.hairpin( o[:1], "o<|f", rleak=True, @@ -338,7 +338,7 @@ def vc(m): baca.stem_tremolo(o.pleaves()) for n in [1, 2, 3, 4]: with baca.scope(m[n]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< p>o!", rleak=True, @@ -359,25 +359,25 @@ def vn_va_vc(cache): for name in ["vn", "va", "vc"]: m = cache[name] with baca.scope(m[5]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mp>o!", rleak=True, ) with baca.scope(m[6]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< mf>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< f>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.exact( + baca.hairpin( baca.select.lparts(o, [1, 1]), "o< ff>o!", rleak=True,