From a26a12361bf4c3bd3f31b0cfb65c1e9c02960e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trevor=20Ba=C4=8Da?= Date: Sun, 4 Feb 2024 18:21:26 -0500 Subject: [PATCH] Cleaned up music.py files. --- faberge/sections/03/music.py | 2 +- faberge/sections/04/music.py | 20 ++++++++++---------- faberge/sections/05/music.py | 14 +++++++------- faberge/sections/06/music.py | 16 ++++++++-------- faberge/sections/07/music.py | 20 +++++--------------- faberge/sections/08/music.py | 25 ++++++++++--------------- faberge/sections/09/music.py | 17 ++++++++--------- faberge/sections/10/music.py | 26 ++++++++++++-------------- faberge/sections/11/music.py | 25 ++++++++++++------------- faberge/sections/12/music.py | 27 +++++++++++++-------------- faberge/sections/13/music.py | 12 +++++------- faberge/sections/14/music.py | 17 +++++++---------- faberge/sections/15/music.py | 13 +++++-------- 13 files changed, 103 insertions(+), 131 deletions(-) diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py index 604cffd4c1..f5470459f0 100644 --- a/faberge/sections/03/music.py +++ b/faberge/sections/03/music.py @@ -734,7 +734,7 @@ def perc(cache): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), right_broken=True, diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index 578f48233d..48fd340d36 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -210,7 +210,7 @@ def fl(m): baca.staff_lines(o.leaf(0), 5) with baca.scope(m.leaves()) as o: baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -233,7 +233,7 @@ def eh(m): baca.staff_position(o, 0) with baca.scope(m.leaves()) as o: baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -257,7 +257,7 @@ def cl(m): baca.pitch(o, "C2") with baca.scope(m.leaves()) as o: baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -289,7 +289,7 @@ def pf(cache): baca.dynamic(o.phead(0), "mp") with baca.scope(m.get(3, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "2-1 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -320,7 +320,7 @@ def pf(cache): def perc(m): with baca.scope(m[1]) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -328,14 +328,14 @@ def perc(m): baca.dynamic(o.phead(0), "f") with baca.scope(m.get(4, 5)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) with baca.scope(m[8]) as o: baca.dynamic(o.phead(0), "f") baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), right_broken=True, @@ -363,7 +363,7 @@ def vn(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -403,7 +403,7 @@ def va(m): abjad.Tweak(r"- \tweak parent-alignment-X 0"), ) baca.spanners.material_annotation( - baca.select.rleak(baca.select.ltleaves(o)), + baca.select.ltleaves(o), "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ), @@ -416,7 +416,7 @@ def vc(m, metadata): baca.clef(o.leaf(0), "treble") baca.override.dls_staff_padding(o, 8) baca.spanners.material_annotation( - o.rleaves(), + o, "1-1 / 1-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index 28aec4d4d9..4c5bf414bd 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -192,7 +192,7 @@ def fl(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 4) baca.spanners.material_annotation( - baca.select.rleak(o.tleaves()), + o.tleaves(), "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -201,7 +201,7 @@ def fl(m): def eh(m): with baca.scope(m.leaves()) as o: baca.spanners.material_annotation( - baca.select.rleak(o.tleaves()), + o.tleaves(), "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -233,7 +233,7 @@ def cl(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 7) baca.spanners.material_annotation( - baca.select.rleak(o.tleaves()), + o.tleaves(), "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -260,7 +260,7 @@ def perc(m): with baca.scope(m.get(1, 2)) as o: baca.staff_position(o, 0) baca.spanners.material_annotation( - baca.select.rleak(o.tleaves()), + o.tleaves(), "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -308,7 +308,7 @@ def vn(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 6) baca.spanners.material_annotation( - o.rleaves(), + o, "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -342,7 +342,7 @@ def va(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 6) baca.spanners.material_annotation( - o.rleaves(), + o, "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -403,7 +403,7 @@ def vc(m, metadata): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 8) baca.spanners.material_annotation( - o.rleaves(), + o, "1-3 / 1-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index 1f71dd2b56..7475a7d994 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -236,7 +236,7 @@ def fl(m): baca.dynamic(o[0], "niente") with baca.scope(m.get(1, 2)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "5-2 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -250,7 +250,7 @@ def fl(m): ) with baca.scope(m.get(4, 8)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "1-5 / 2-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -283,7 +283,7 @@ def cl(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( - o.rleaves(), + o, "1-5 / 2-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -351,7 +351,7 @@ def pf(cache): baca.spanners.beam(o.tleaves()) baca.markup(o.pheads(), r"\baca-sharp-markup") baca.spanners.material_annotation( - o.rleaves(), + o, "2-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -385,7 +385,7 @@ def perc(m): baca.override.dls_staff_padding(o, 6) with baca.scope(m[2]) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "A.2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 10.5"), @@ -419,7 +419,7 @@ def perc(m): with baca.scope(m.get(4, 7)) as o: baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "4-3 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), @@ -528,7 +528,7 @@ def composites(cache): with baca.scope(m[2]) as o: if name in ("vn", "va"): baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -549,7 +549,7 @@ def composites(cache): abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-3 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index e91b02c5c5..30bf24e85f 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -237,7 +237,7 @@ def fl(m): baca.override.dls_staff_padding(o, 6) with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "2-2 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -254,7 +254,6 @@ def fl(m): "3-7 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) baca.pitch(o, "F#3") @@ -293,7 +292,7 @@ def cl(m): with baca.scope(m.get(1, 4)) as o: baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "2-2 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -305,7 +304,6 @@ def cl(m): "3-7 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) @@ -370,7 +368,7 @@ def pf(cache): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "2-2 / 2-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -427,7 +425,6 @@ def perc(m): "4-3 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) with baca.scope(m[5]) as o: baca.markup( @@ -443,7 +440,7 @@ def perc(m): "o<| mf", ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-7 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), @@ -466,7 +463,6 @@ def vn(m): "A.3 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) with baca.scope(m[3]) as o: baca.staff_lines(o.leaf(0), 1) @@ -484,7 +480,6 @@ def vn(m): "4-3 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(rf"- \tweak staff-padding {2.5 + 3 * 2.5}"), - with_next_leaf=True, ) with baca.scope(m.get(3, 7)) as o: baca.staccato(o.pheads()) @@ -500,7 +495,6 @@ def vn(m): "4-2 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) with baca.scope(m.get(3, 8)) as o: baca.override.dls_staff_padding(o.leaves(), 8) @@ -521,7 +515,6 @@ def va(m): "A.3 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) with baca.scope(m[3]) as o: baca.staff_lines(o.leaf(0), 1) @@ -546,7 +539,6 @@ def va(m): "4-3 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(rf"- \tweak staff-padding {2.5 + 3 * 2.5}"), - with_next_leaf=True, ) with baca.scope(m[5]) as o: baca.staff_lines(o.leaf(0), 5) @@ -564,7 +556,6 @@ def va(m): "3-7 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) with baca.scope(m.get(6, 7)) as o: baca.staff_lines(o.leaf(0), 1) @@ -586,7 +577,6 @@ def va(m): "4-2 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) with baca.scope(m.get(6, 8)) as o: baca.override.dls_staff_padding(o.leaves(), 8) @@ -637,7 +627,7 @@ def vc(m): with baca.scope(m.get(5, 8)) as o: baca.pitch(o, "F#5") baca.spanners.material_annotation( - o.rleaves(), + o, "2-3 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index eb30f40193..a8be9d2e21 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -263,7 +263,6 @@ def fl_eh_cl(cache): "1-2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) @@ -280,13 +279,13 @@ def pf(cache): baca.dynamic(o.phead(0), "pp") with baca.scope(m.get(1, 5)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) with baca.scope(m.get(6, 10)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) @@ -304,13 +303,13 @@ def pf(cache): baca.spanners.beam(o.tleaves()) with baca.scope(m.get(1, 5)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) with baca.scope(m.get(6, 10)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) @@ -363,7 +362,6 @@ def perc(m): "A.2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) with baca.scope(m.get(4, 5)) as o: baca.staff_position(o, -1) @@ -378,7 +376,6 @@ def perc(m): "1-2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) with baca.scope(m.get(1, 5)) as o: baca.override.dls_staff_padding(o, 6) @@ -409,7 +406,7 @@ def vn(m): baca.pitch(o, "A6") baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -427,7 +424,6 @@ def vn(m): "1-2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) for n in [6, 8, 9, 10]: with baca.scope(m[n]) as o: @@ -447,7 +443,7 @@ def vn(m): baca.pitch(o, "A#4") baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -469,7 +465,7 @@ def va(m): with_next_leaf=True, ) baca.spanners.material_annotation( - o.rleaves(), + o, "A.4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -492,7 +488,7 @@ def va(m): baca.pitch(o, "A#4") baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -525,7 +521,7 @@ def vc(m): with baca.scope(m.get(1, 3)) as o: baca.pitch(o, "F#5") baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -544,7 +540,6 @@ def vc(m): "1-2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) with baca.scope(m[6]) as o: baca.dynamic(o.phead(0), "f") @@ -557,7 +552,7 @@ def vc(m): baca.pitch(o, "F#5") baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index f5f3bc7ee5..f2489794b2 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -204,7 +204,7 @@ def fl(m): baca.stem_tremolo(o.pleaves()) baca.override.dls_staff_padding(o, 4) baca.spanners.material_annotation( - o.rleaves(), + o, "5-2 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -233,7 +233,7 @@ def eh(m): "o< mf >o niente", ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -259,7 +259,6 @@ def eh(m): baca.select.tleaves(o), "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) for plt in baca.select.plts(o): baca.spanners.trill( @@ -288,7 +287,7 @@ def fl_cl(cache): "o< mp >o niente", ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-7 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -313,7 +312,7 @@ def perc(m): baca.staff_lines(o.leaf(0), 1) baca.dynamic(o.phead(0), "f") baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -334,7 +333,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 6"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "A.1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -417,7 +416,7 @@ def vn(m): baca.pitch(o, "Dtqf5") with baca.scope(m.leaves()) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-2 / 3-3 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) @@ -529,7 +528,7 @@ def va(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 9) baca.spanners.material_annotation( - o.rleaves(), + o, "3-2 / 3-3 =|", abjad.Tweak(r"- \tweak staff-padding 10.5"), ) @@ -600,7 +599,7 @@ def vc(m): baca.pitch(o, "E2") with baca.scope(m.get(5, 9)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index 2883f9c472..75e9f2e94a 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -208,7 +208,6 @@ def eh(m): baca.select.tleaves(o), "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) for plt in baca.select.plts(o): baca.spanners.trill( @@ -257,7 +256,7 @@ def fl_cl(cache): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( - o.rleaves(), + o, "3-4 / 3-5 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -310,7 +309,7 @@ def pf(cache): with baca.scope(m.get(5, 6)) as o: baca.spanners.beam(o.tleaves()) baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -357,7 +356,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "A.2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -374,7 +373,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -403,7 +402,7 @@ def vn(m): baca.override.dls_staff_padding(o, 6) with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -423,7 +422,7 @@ def vn(m): abjad.Tweak(r"- \tweak extra-offset #'(-0.75 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -442,7 +441,7 @@ def vn(m): ) with baca.scope(m.get(6, 8)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-5 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -455,7 +454,7 @@ def va(m): baca.pitch(o, "Bqs4") with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -487,7 +486,7 @@ def va(m): ) baca.flat_glissando(o, "D3") baca.spanners.material_annotation( - o.rleaves(), + o, "A.4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -510,7 +509,7 @@ def va(m): ) with baca.scope(m.get(6, 8)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-5 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -576,7 +575,7 @@ def vc(m, metadata): baca.pitch(o, "Eb2") with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -595,7 +594,7 @@ def vc(m, metadata): abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -609,7 +608,6 @@ def vc(m, metadata): "1-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) baca.override.note_head_style_harmonic(o.pleaves()) baca.spanners.string_number( diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 5a1d4723ff..10eb2e6648 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -211,7 +211,7 @@ def eh(m): ) with baca.scope(m.get(3, 4)) as o: baca.spanners.material_annotation( - baca.select.rleak(o.pleaves()), + o.pleaves(), "4-5 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -264,7 +264,7 @@ def fl_cl(cache): ) with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "3-6 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -279,7 +279,7 @@ def fl_cl(cache): "o< mp >o niente", ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-7 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -304,7 +304,7 @@ def pf(cache): abjad.Tweak(r"- \tweak parent-alignment-X 0"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -328,7 +328,6 @@ def pf(cache): baca.select.tleaves(o), "3-7 =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) baca.pitch(o, "A3") with baca.scope(m.leaves()) as o: @@ -353,7 +352,7 @@ def pf(cache): def perc(m): with baca.scope(m.get(1, 2)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -373,7 +372,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 10"), ) baca.spanners.material_annotation( - baca.select.rleak(baca.select.pleaves(o)), + baca.select.pleaves(o), "4-5 -|", abjad.Tweak(r"- \tweak color #darkgreen"), abjad.Tweak(r"- \tweak staff-padding 14.5"), @@ -400,7 +399,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 10"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-7 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -414,7 +413,7 @@ def vn(m): with baca.scope(m[2]) as o: baca.dynamic(o.phead(0), '"f"') baca.spanners.material_annotation( - o.rleaves(), + o, "A.3 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -430,7 +429,7 @@ def vn(m): "p niente o< p > pp", ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -470,7 +469,7 @@ def va(m): with baca.scope(m[2]) as o: baca.dynamic(o.phead(0), '"f"') baca.spanners.material_annotation( - o.rleaves(), + o, "A.3 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -492,7 +491,7 @@ def va(m): abjad.Tweak(r"- \tweak parent-alignment-X 0"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "A.4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -548,7 +547,7 @@ def vc(m, metadata): abjad.Tweak(r"- \tweak parent-alignment-X 0"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "3-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py index 79edab4402..37855c4be3 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -198,7 +198,7 @@ def VC(voice, time_signatures): def fl(m): with baca.scope(m.get(1, 3)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -208,7 +208,7 @@ def fl(m): def cl(m): with baca.scope(m.get(1, 3)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -244,7 +244,7 @@ def pf(cache): with baca.scope(m.get(1, 3)) as o: baca.override.dls_staff_padding(o, 2.5) baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -261,7 +261,7 @@ def pf(cache): baca.override.dls_staff_padding(o, 5) baca.dynamic(o.phead(0), "(f)") baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -309,7 +309,7 @@ def perc(m): baca.override.stem_down(o.pleaves()) with baca.scope(m.get(1, 4)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -331,7 +331,6 @@ def perc(m): "A.2 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 10.5"), - with_next_leaf=True, ) baca.staff_position(o, -1) baca.override.stem_down(o.pleaves()) @@ -365,7 +364,7 @@ def vn(m): ) baca.override.dls_staff_padding(o, 9) baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), ) @@ -378,7 +377,7 @@ def vn(m): baca.override.dls_staff_padding(o, 5) baca.dynamic(o.phead(0), "f") baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -399,7 +398,7 @@ def vn(m): abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-2 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), ) @@ -417,7 +416,7 @@ def va(m): baca.stem_tremolo(o.phead(-1)) with baca.scope(m.get(1, 5)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "A.4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -444,7 +443,7 @@ def va(m): abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-2 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), ) @@ -466,7 +465,7 @@ def vc(m): ) baca.override.dls_staff_padding(o, 9) baca.spanners.material_annotation( - o.rleaves(), + o, "4-1 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), ) @@ -479,7 +478,7 @@ def vc(m): baca.override.dls_staff_padding(o, 5) baca.dynamic(o.phead(0), "f") baca.spanners.material_annotation( - o.rleaves(), + o, "2-4 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -495,7 +494,7 @@ def vc(m): abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-2 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), ) diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index 058a32a5da..403bfc9d6f 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -267,7 +267,7 @@ def fl(m): "o< mp >o p > pp", ) baca.spanners.material_annotation( - o.rleaves(), + o, "2-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), @@ -299,7 +299,7 @@ def eh(m): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -320,7 +320,7 @@ def cl(m): ) with baca.scope(m.get(3, 8)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "4-3 / 4-4 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -371,7 +371,6 @@ def pf(cache): "2-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) with baca.scope(m[5]) as o: baca.staff_lines(o.leaf(0), 3) @@ -442,7 +441,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-3 / 4-4 =|", abjad.Tweak(r"- \tweak staff-padding 13"), ) @@ -483,7 +482,7 @@ def va(m): abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-4 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -538,7 +537,6 @@ def vn_va_vc(cache): baca.select.tleaves(o), "4-3 =|", abjad.Tweak(r"- \tweak staff-padding 9.5"), - with_next_leaf=True, ) baca.staccato(o.pheads()) baca.override.stem_down(o.pleaves()) diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index 005af69748..e73cec476d 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -186,7 +186,6 @@ def fl(m): "1-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) baca.staff_position(o, 0) with baca.scope(m[5]) as o: @@ -204,7 +203,7 @@ def fl(m): ) with baca.scope(m.get(5, 8)) as o: baca.spanners.material_annotation( - o.rleaves(), + o, "5-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -244,7 +243,7 @@ def cl(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 10) baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 / 5-1 =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -271,7 +270,7 @@ def eh(m): abjad.Tweak(r"- \tweak bound-details.right.padding 2"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 / 5-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -295,7 +294,7 @@ def pf(cache): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -308,7 +307,7 @@ def perc(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 / 5-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -335,7 +334,6 @@ def vn(m): "1-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 5.5"), - with_next_leaf=True, ) baca.staff_position(o, 0) with baca.scope(m.get(4, 6)) as o: @@ -347,7 +345,7 @@ def vn(m): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 5.5"), ) @@ -360,7 +358,7 @@ def va(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o, 5) baca.spanners.material_annotation( - o.rleaves(), + o, "4-5 / 5-1 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -384,7 +382,6 @@ def vc(m, metadata): "1-1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ), baca.override.note_head_style_harmonic(o.pleaves()) baca.spanners.string_number( diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py index 6829a662e6..cd976a1e3d 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -149,7 +149,7 @@ def fl(m): with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 4) baca.spanners.material_annotation( - o.rleaves(), + o, "5-2 / 5-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -191,7 +191,7 @@ def cl(m): "pp < p > pp", ) baca.spanners.material_annotation( - o.rleaves(), + o, "5-2 =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -222,7 +222,7 @@ def pf(cache): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -248,7 +248,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 6"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "A.1 -|", abjad.Tweak(r"- \tweak color #red"), abjad.Tweak(r"- \tweak staff-padding 8"), @@ -266,7 +266,7 @@ def perc(m): abjad.Tweak(r"- \tweak staff-padding 8"), ) baca.spanners.material_annotation( - o.rleaves(), + o, "MM =|", abjad.Tweak(r"- \tweak staff-padding 8"), ) @@ -291,7 +291,6 @@ def vn(cache): baca.select.tleaves(o), "5-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) @@ -317,7 +316,6 @@ def va(m): baca.select.tleaves(o), "5-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, ) @@ -348,7 +346,6 @@ def vc(m): baca.select.tleaves(o), "5-3 =|", abjad.Tweak(r"- \tweak staff-padding 8"), - with_next_leaf=True, )