Cleaned up music.py files.

trevorbaca · Feb 4, 2024 · a26a123 · a26a123
1 parent 87cfb55
commit a26a123
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 131 deletions.
diff --git 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
@@ -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,22 +320,22 @@ 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"),
         )
     with baca.scope(m.get(4, 5)) as o:
         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
@@ -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
@@ -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
@@ -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"),
         )