diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py index acaf39121b..07ae776035 100644 --- a/faberge/sections/02/music.py +++ b/faberge/sections/02/music.py @@ -935,10 +935,9 @@ def vc(m): staff_padding=5.5, ) with baca.scope(m.get(71, 89)) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.mgroups(o, [9, 10]), - "ff > pp < p", - glue=True, + "ff> pp
o !", - glue=True, + "o< mp>o!", ) with baca.scope(m.get(11, 12)) as o: library.swells(o, "mf") @@ -358,10 +357,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 2]), - "o< pp >o !", - glue=True, + "o< pp>o!", ) with baca.scope(m.get(55, 60)) as o: library.swells(o, "ppp") @@ -707,10 +705,9 @@ def perc(cache): abjad.select.get(baca.select.pheads(o), [0, -1]), ) with baca.scope(m.get(53, 61)) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.mgroups(o, [2, 7]), - "ppp < pp >o !", - glue=True, + "ppp< pp>o!", ) with baca.scope(m.get(69, 72)) as o: baca.staff_lines(o.leaf(0), 1) @@ -780,10 +777,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.mgroups(o, [8, 8]), - "(ppp) < f > ppp", - glue=True, + "(ppp)< f>ppp", ) with baca.scope(m.get(53, 68)) as o: baca.staff_lines(o.leaf(0), 1) @@ -878,10 +874,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.mgroups(o, [8, 8]), - "(pp) < f > pp", - glue=True, + "(pp)< f>pp", ) with baca.scope(m.get(23, 52)) as o: baca.mspanners.scp( @@ -960,10 +955,9 @@ def vc(m): hide_middle_note_heads=True, ) baca.interpolate_pitches(o, "Eb2", "C2") - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.mgroups(o, [12, 12]), - "(p) < ff >o !", - glue=True, + "(p)< ff>o!", rleak=True, ) baca.markup( diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index 9e6ab97c4a..efbd948c94 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -435,21 +435,21 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) runs = abjad.select.runs(o) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[0], [1]), - "o< p >o ! o< p >o !", + "o< p>o !o< p>o !", ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(baca.select.rleak(runs[1]), [1]), - "o< mp >o ! o< mp >o ! o< mp >o ! o< mp >o !", + "o< mp>o !o< mp>o !o< mp>o !o< mp>o !", ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(baca.select.rleak(runs[2]), [1]), - "o< mf >o ! o< mf >o ! o< mf >o !", + "o< mf>o !o< mf>o !o< mf>o !", ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(baca.select.rleak(runs[3]), [1]), - "o< f >o ! o< f >o ! o< f >o !", + "o< f>o !o< f>o !o< f>o !", ) diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index d321417b07..45335a2c0c 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -246,10 +246,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< mp >o p > pp", - glue=True, + "o< mp>o p>pp", ) baca.rspanners.trill( o.leaves()[:2], @@ -375,40 +374,34 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) runs = abjad.select.runs(o) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[0], [1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[1], [1]), - "o< mp >o ! o< mp >o !", - glue=True, + "o< mp>o !o< mp>o!", rleak=True, ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[2], [1]), - "o< p >o !", - glue=True, + "o< p>o!", rleak=True, ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[3], [1]), - "o< p >o ! o< p >o !", - glue=True, + "o< p>o !o< p>o!", rleak=True, ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[4], [1]), - "o< pp >o !", - glue=True, + "o< pp>o!", rleak=True, ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(runs[5], [1]), - "o< pp >o ! o< pp >o !", - glue=True, + "o< pp>o !o< pp>o!", rleak=True, ) with baca.scope(m.leaves()) as o: diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index bbad8f35dd..f2710bd9d3 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -222,11 +222,10 @@ def VC(voice, time_signatures): def fl(m): with baca.scope(m.get(1, 2)) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1]), - "o< mf >o ! o< mf >o !", + "o< mf>o !o< mf>o!", (abjad.Tweak(r"- \tweak to-barline ##t"), -1), - glue=True, rleak=True, ) baca.pitch(o, "F5") @@ -297,10 +296,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, len(o) - 2]), - "o< mp >o p > pp", - glue=True, + "o< mp>o p>pp", ) baca.rspanners.trill( o.leaves()[:2], @@ -427,10 +425,9 @@ def perc(m): def vn(m): with baca.scope(m[2]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "p - o< p > pp", - glue=True, + "p o< p>pp", rleak=True, ) baca.pitches( @@ -464,10 +461,9 @@ def vn(m): def va(m): with baca.scope(m[2]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< p > pp p", - glue=True, + "o< p> pp+p", rleak=True, ) baca.pitches( diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index ee6f1af37e..dc144061d9 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -311,10 +311,9 @@ def fl_cl(cache): for name in ["fl", "cl"]: m = cache[name] with baca.scope(m[2]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< p >o pp > ppp", - glue=True, + "o< p>o pp>ppp", ) for n in [2, 4]: with baca.scope(m[n]) as o: @@ -326,22 +325,20 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) with baca.scope(m[4]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< pp >o ppp > pppp", - glue=True, + "o< pp>o ppp>pppp", ) with baca.scope(m[5]) as o: baca.espressivo( o.pheads(), abjad.Tweak(r"- \tweak X-extent #'(0 . 0)", tag=baca.tags.NOT_PARTS), ) - baca.hairpins.hairpin( + baca.hairpins.exact( abjad.select.partition_by_counts( abjad.select.leaves(o.rleaves()), [2], overhang=True ), - "o< mp >o !", - glue=True, + "o< mp>o!", ) diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index ea0014d851..c272ee8731 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -427,10 +427,9 @@ def vn(m): ) for n in [6, 8, 9, 10]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "p - o< p > pp", - glue=True, + "p o< p>pp", ) baca.mspanners.scp( baca.select.lparts(o[-3:], [1, 2]), @@ -470,9 +469,9 @@ def va(m): ) for n in [8, 9, 10]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 1, 1]), - "o< p > pp p", + "o< p> pp p", ) baca.mspanners.scp( baca.select.lparts(o[:3], [1, 2]), diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index fc2cc53132..b2f4aa99ba 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -195,10 +195,9 @@ def fl(m): baca.override.dls_staff_padding(o, 6) baca.pitch(o, "G3") with baca.scope(m[5]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< f >o !", - glue=True, + "o< f>o!", rleak=True, ) with baca.scope(m.get(5, 7)) as o: @@ -212,17 +211,15 @@ def fl(m): abjad.Tweak(r"- \tweak staff-padding 5.5"), ) with baca.scope(m[6]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o.rleaves(), [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mp >o !", - glue=True, + "o< mp>o!", rleak=True, ) @@ -234,10 +231,9 @@ def eh(m): baca.select.pleaves(o), [2], overhang=True ): leaves = baca.select.rleaves(leaves) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(leaves, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) baca.rspanners.material_annotation( @@ -288,12 +284,11 @@ def fl_cl(cache): baca.espressivo(o.pheads()) for cmgroup in baca.select.cmgroups(o): cmgroup = baca.select.rleaves(cmgroup) - baca.hairpins.hairpin( + baca.hairpins.exact( abjad.select.partition_by_counts( abjad.select.leaves(cmgroup), [2], overhang=True ), - "o< mp >o !", - glue=True, + "o< mp>o!", ) baca.rspanners.material_annotation( o, @@ -378,10 +373,9 @@ def perc(m): def vn(m): with baca.scope(m[1]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - "p - o< p > pp", - glue=True, + "p o< p>pp", ) for n in [1, 2, 3, 4, 5, 6, 7, 9]: with baca.scope(m.get(n)) as o: @@ -401,24 +395,21 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - "mp - o< mp > pp", - glue=True, + "mp o< mp>pp", ) with baca.scope(m[3]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - "mf - o< mf > pp", - glue=True, + "mf o< mf>pp", ) with baca.scope(m[4]) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - "f - o< f > pp", - glue=True, + "f o< f>pp", ) with baca.scope(m.get(5, 8)) as o: baca.pitch(o, "B4") @@ -447,9 +438,9 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((1, 3)): baca.stem_tremolo(plt) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1]), - "p - o< p > pp - o< p > pp p", + "p o< p> pp o< p> pp p", ) baca.mspanners.scp( baca.select.clparts(o, [1]), @@ -468,9 +459,9 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((5, 18)): baca.stem_tremolo(plt) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1]), - "o< mp > pp mp - o< mp > pp mp", + "o< mp> pp mp o< mp> pp mp", ) baca.mspanners.scp( baca.select.clparts(o, [1]), @@ -487,9 +478,9 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((1, 3)): baca.stem_tremolo(plt) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1]), - "mp - o< mf > pp - o< mf > pp mf", + "mp o< mf> pp o< mf> pp mf", ) baca.mspanners.scp( baca.select.clparts(o, [1]), @@ -506,9 +497,9 @@ def va(m): baca.quadruple_staccato(plt) elif duration == abjad.Duration((5, 18)): baca.stem_tremolo(plt) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1]), - "- o< f > pp f f - o< f > pp", + "o< f> pp f f o< f> pp", ) baca.mspanners.scp( baca.select.clparts(o, [1]), @@ -559,17 +550,15 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - '"ff" - o< ff > pp', - glue=True, + '"ff" o< ff>pp', ) with baca.scope(m.get(9)) as o: for clpart in baca.select.clparts(o, [4]): - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(clpart, [1, 1, 2]), - "mp - o< mp > pp", - glue=True, + "mp o< mp>pp", ) @@ -631,10 +620,9 @@ def vc(m): baca.hairpins.exact(o[:1], "!") with baca.scope(m[9]) as o: baca.override.dls_staff_padding(o, 6) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(o, [1, 1]), - "pp p >o !", - glue=True, + "pp p>o!", rleak=True, ) baca.pitch(o, "Eb2") diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index 78e9ac9fa1..86782314fb 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -261,36 +261,31 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak staff-padding 8"), ) with baca.scope(m[1]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< mp >o p > pp", - glue=True, + "o< mp>o p>pp", ) with baca.scope(m[2]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< mf >o mp > p", - glue=True, + "o< mf>o mp>p", ) with baca.scope(m[3]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< f >o mf > mp", - glue=True, + "o< f>o mf>mp", ) for n in [4, 5]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< mp >o p > pp", - glue=True, + "o< mp>o p>pp", ) for n in [6, 7, 8]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< p >o pp > ppp", - glue=True, + "o< p>o pp>ppp", ) @@ -388,10 +383,9 @@ def perc(m): def vn(m): for n in [1, 2, 3]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "mp - o< mp > p", - glue=True, + "mp o< mp>p", ) baca.mspanners.scp( baca.select.lparts(o[-3:], [1, 2]), @@ -462,10 +456,9 @@ def va(m): ) for n in [1, 2, 3]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "mp - o< mp > p", - glue=True, + "mp o< mp>p", ) baca.mspanners.scp( baca.select.lparts(o[-3:], [1, 2]), @@ -527,21 +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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 3]), - "mp p >o !", - glue=True, + "mp p>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 3]), - "p pp >o !", - glue=True, + "p pp>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), "pp ppp", ) @@ -625,17 +616,17 @@ def vc(m, metadata): name="CELLO_GLISSANDI", ), baca.glissando(o.tleaves()) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(baca.select.rleak(abjad.select.run(o, 0)), [1, 1, 1]), - "o< p >o !", + "o< p>o !", ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(baca.select.rleak(abjad.select.run(o, 1)), [1]), - "o< p >o ! o< p >o !", + "o< p>o !o< p>o !", ) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.clparts(abjad.select.run(o, 2), [1]), - "o< p >o ! o< p >o !", + "o< p>o !o< p>o !", ) with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 4) diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 0392730732..9d81bfa373 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -252,17 +252,15 @@ def fl_cl(cache): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) with baca.scope(m[1]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< p >o pp > ppp", - glue=True, + "o< p>o pp>ppp", ) for n in [2, 3, 4]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "o< pp >o ppp > pppp", - glue=True, + "o< pp>o ppp>pppp", ) with baca.scope(m.get(1, 4)) as o: baca.rspanners.material_annotation( @@ -274,12 +272,11 @@ def fl_cl(cache): baca.espressivo(o.pheads()) for cmgroup in baca.select.cmgroups(o): cmgroup = baca.select.rleak(cmgroup) - baca.hairpins.hairpin( + baca.hairpins.exact( abjad.select.partition_by_counts( abjad.select.leaves(cmgroup), [2], overhang=True ), - "o< mp >o !", - glue=True, + "o< mp>o!", ) baca.rspanners.material_annotation( o, @@ -428,10 +425,9 @@ def vn(m): staff_padding=3, ) with baca.scope(m[3]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 2]), - "p - o< p > pp", - glue=True, + "p o< p>pp", ) baca.rspanners.material_annotation( o, @@ -533,10 +529,9 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1, 1, 2]), - "o< p >o ! o< p >o !", - glue=True, + "o< p>o !o< p>o!", ) with baca.scope(m[3]) as o: baca.accent(o.phead(0)) diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py index c470262f2a..b839846776 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -221,19 +221,17 @@ 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.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(o.rleaves()), (2, 3)), - "o< mp >o !", - glue=True, + "o< mp>o!", ) for n in [1, 3]: with baca.scope(m[n]) as o: baca.espressivo(o.pheads()) with baca.scope(m[3]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(o.rleaves()), (2, 3)), - "o< p >o !", - glue=True, + "o< p>o!", ) diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index 5d13dab668..c6adf9dce0 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -262,10 +262,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1, 3]), - "o< mp >o p > pp", - glue=True, + "o< mp>o p>pp", ) baca.rspanners.material_annotation( o, @@ -291,10 +290,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) baca.rspanners.trill( @@ -317,10 +315,9 @@ 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.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), - "pp < p > pp", - glue=True, + "pp< p>pp", ) with baca.scope(m.get(3, 8)) as o: baca.rspanners.material_annotation( @@ -330,10 +327,9 @@ def cl(m): ) with baca.scope(m.get(7, 8)) as o: for run in baca.select.runs(o): - baca.hairpins.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), - "p < mp > p", - glue=True, + "p< mp>p", ) baca.pitch(o, "Ab2") with baca.scope(m.leaves()) as o: @@ -525,10 +521,9 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1, 1, 1, 1, 1]), - "o< pp >o ! o< pp >o ! o< pp >o !", - glue=True, + "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 6e7927d0f1..8092d80667 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -190,19 +190,17 @@ def fl(m): baca.staff_position(o, 0) with baca.scope(m[5]) as o: baca.staff_lines(o.leaf(0), 5) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< p >o !", - glue=True, + "o< p>o!", rleak=True, ) 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mp >o !", - glue=True, + "o< mp>o!", rleak=True, ) with baca.scope(m.get(5, 8)) as o: @@ -214,17 +212,15 @@ def fl(m): baca.pitch(o, "C#5") baca.stem_tremolo(o.pleaves()) with baca.scope(m[7]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< f >o !", - glue=True, + "o< f>o!", rleak=True, ) @@ -234,10 +230,9 @@ 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.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), - "p < mp > p", - glue=True, + "p< mp>p", ) with baca.scope(m.get(3, 4)) as o: baca.pitch(o, "Gb2") @@ -245,10 +240,9 @@ 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.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(run), (1, 1)), - "pp < p > pp", - glue=True, + "pp< p>pp", ) with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 10) @@ -271,10 +265,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) baca.rspanners.trill( @@ -409,24 +402,21 @@ def vc(m, metadata): ) baca.glissando(o.tleaves()) run = abjad.select.run(o, 0) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1]), - "o< mp >o !", - glue=True, + "o< mp>o!", rleak=True, ) run = abjad.select.run(o, 1) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1, 1, 1]), - "o< mf >o ! o< mf >o !", - glue=True, + "o< mf>o !o< mf>o!", rleak=True, ) run = abjad.select.run(o, 2) - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(run, [1, 1]), - "o< f >o !", - glue=True, + "o< f>o!", rleak=True, ) with baca.scope(m[5]) as o: @@ -435,10 +425,9 @@ 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.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< p >o !", - glue=True, + "o< p>o!", rleak=True, ) baca.pitch(o, "F2") diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py index ea81582146..b2f3eb3d92 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -162,31 +162,27 @@ def fl(m): do_not_bookend=True, ) with baca.scope(m[5]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) with baca.scope(m[6]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mp >o !", - glue=True, + "o< mp>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< p >o !", - glue=True, + "o< p>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< pp >o !", - glue=True, + "o< pp>o!", rleak=True, ) @@ -195,10 +191,9 @@ 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.hairpin( + baca.hairpins.exact( abjad.select.partition_by_ratio(baca.select.plts(run), (2, 3)), - "pp < p > pp", - glue=True, + "pp< p>pp", ) baca.rspanners.material_annotation( o, @@ -343,10 +338,9 @@ def vc(m): baca.stem_tremolo(o.pleaves()) for n in [1, 2, 3, 4]: with baca.scope(m[n]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< p >o !", - glue=True, + "o< p>o!", rleak=True, ) baca.pitch(o, "F2") @@ -365,31 +359,27 @@ def vn_va_vc(cache): for name in ["vn", "va", "vc"]: m = cache[name] with baca.scope(m[5]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mp >o !", - glue=True, + "o< mp>o!", rleak=True, ) with baca.scope(m[6]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< mf >o !", - glue=True, + "o< mf>o!", rleak=True, ) with baca.scope(m[7]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< f >o !", - glue=True, + "o< f>o!", rleak=True, ) with baca.scope(m[8]) as o: - baca.hairpins.hairpin( + baca.hairpins.exact( baca.select.lparts(o, [1, 1]), - "o< ff >o !", - glue=True, + "o< ff>o!", rleak=True, )