Cleaned up music.py files

trevorbaca · Feb 12, 2024 · 444c1ce · 444c1ce
1 parent 056ead3
commit 444c1ce
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 33 deletions.
diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
@@ -753,6 +753,7 @@ def va(m):
         baca.mspanners.scp(
             baca.select.cmgroups(o, [12, 4, 10, 4, 10, 6, 10, 6]),
             "tasto -> pont. ->",
+            do_not_rleak=True,
             staff_padding=3,
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
@@ -801,6 +802,7 @@ def va(m):
         baca.mspanners.scp(
             [o.ltleaves()],
             "tasto -> pont.",
+            do_not_rleak=True,
             staff_padding=3,
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
@@ -832,6 +834,7 @@ def va(m):
         baca.mspanners.scp(
             [o.ltleaves()],
             "pont. -> tasto",
+            do_not_rleak=True,
             staff_padding=3,
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
@@ -872,8 +875,9 @@ def vc(m):
             "p < f",
         )
         baca.mspanners.scp(
-            [baca.select.rleak(baca.select.ltleaves(o))],
+            [o.ltleaves()],
             "tasto -> PO",
+            rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(23, 36)) as o:
@@ -882,8 +886,9 @@ def vc(m):
             "f > p",
         )
         baca.mspanners.scp(
-            [baca.select.rleak(baca.select.ltleaves(o))],
+            [o.ltleaves()],
             "(PO) -> tasto",
+            rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(47, 54)) as o:
@@ -892,8 +897,9 @@ def vc(m):
             "p < ff",
         )
         baca.mspanners.scp(
-            [baca.select.rleak(baca.select.ltleaves(o))],
+            [o.ltleaves()],
             "(tasto) -> poco pont.",
+            rleak=True,
             staff_padding=3,
         )
         baca.mspanners.vibrato(
@@ -913,6 +919,7 @@ def vc(m):
         baca.mspanners.scp(
             [o],
             "(poco pont.) -> tasto",
+            do_not_rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(71, 88)) as o:

diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
@@ -787,8 +787,9 @@ def vn(m):
         library.clb_staff_positions(o, rotation=-3)
     with baca.scope(m.get(23, 52)) as o:
         baca.mspanners.scp(
-            baca.select.rleak(baca.select.ltleaves(o)),
+            baca.select.ltleaves(o),
             r"\baca-tasto-plus-pochiss-scratch-markup =|",
+            rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(53, 56)) as o:
@@ -878,8 +879,9 @@ def va(m):
         )
     with baca.scope(m.get(23, 52)) as o:
         baca.mspanners.scp(
-            baca.select.rleak(baca.select.ltleaves(o)),
+            baca.select.ltleaves(o),
             r"\baca-tasto-plus-pochiss-scratch-markup =|",
+            rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(53, 56)) as o:
@@ -917,8 +919,9 @@ def vc(m):
             "(p) < ff",
         )
         baca.mspanners.scp(
-            [o.rleaves()],
+            [o],
             "(tasto) -> molto pont.",
+            rleak=True,
             staff_padding=3,
         )
         baca.mspanners.vibrato(
@@ -934,9 +937,10 @@ def vc(m):
         )
     with baca.scope(m.get(23, 30)) as o:
         baca.mspanners.scp(
-            [o.rleaves()],
+            [o],
             "(molto pont.) -> tasto",
-            abjad.Tweak(r"- \tweak staff-padding 3"),
+            rleak=True,
+            staff_padding=3,
         )
         baca.mspanners.vibrato(
             [o],
@@ -961,10 +965,10 @@ def vc(m):
             r"\baca-non-vib-markup",
             abjad.Tweak(r"- \tweak staff-padding 5.5"),
         )
-        leaves = baca.select.rleak(baca.select.ltleaves(o))
         baca.mspanners.scp(
-            baca.select.mgroups(leaves, [12, 12]),
+            baca.select.mgroups(baca.select.ltleaves(o), [12, 12]),
             "(tasto) -> PO -> tasto poss.",
+            do_not_rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(61, 80)) as o:

diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py
@@ -433,10 +433,10 @@ def vn(m):
             "D4 Eb4 Eb4 Eb4",
             allow_repeats=True,
         )
-        leaves = o.leaves()[-3:]
         baca.mspanners.scp(
-            baca.select.lparts(leaves, [1, 2]),
+            baca.select.lparts(o[-3:], [1, 2]),
             "ord. -> pont. -> ord.",
+            do_not_rleak=True,
             staff_padding=5.5,
         )
     with baca.scope(m.get(1, 2)) as o:
@@ -468,10 +468,10 @@ def va(m):
             "D4 D4 D4 Eb4",
             allow_repeats=True,
         )
-        leaves = o.leaves()[:3]
         baca.mspanners.scp(
-            baca.select.lparts(leaves, [1, 2]),
+            baca.select.lparts(o[:3], [1, 2]),
             "ord. -> pont. -> ord.",
+            do_not_rleak=True,
             staff_padding=5.5,
         )
     with baca.scope(m.get(1, 2)) as o:

diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py
@@ -431,10 +431,10 @@ def vn(m):
                 baca.select.lparts(o, [1, 1, 2]),
                 "p - o< p > pp",
             )
-            leaves = o.leaves()[-3:]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[-3:], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m.get(6, 10)) as o:
@@ -473,10 +473,10 @@ def va(m):
                 baca.select.lparts(o, [1, 1, 2]),
                 "o< p > pp p",
             )
-            leaves = o.leaves()[:3]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[:3], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m.get(8, 10)) as o:

diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py
@@ -375,10 +375,10 @@ def vn(m):
     for n in [1, 2, 3, 4, 5, 6, 7, 9]:
         with baca.scope(m.get(n)) as o:
             for clpart in baca.select.clparts(o, [4]):
-                clpart = abjad.select.leaves(clpart)[-3:]
                 baca.mspanners.scp(
-                    baca.select.lparts(clpart, [1, 2]),
+                    baca.select.lparts(clpart[-3:], [1, 2]),
                     "ord. -> pont. -> ord.",
+                    do_not_rleak=True,
                     staff_padding=8,
                 )
     with baca.scope(m.get(1, 4)) as o:
@@ -442,6 +442,7 @@ def va(m):
             r"\baca-null-markup || ord. -> pont. -> ord. ||"
             r" ord. -> pont. -> ord. || \baca-null-markup",
             do_not_bookend=True,
+            do_not_rleak=True,
             staff_padding=8,
         )
     with baca.scope(m.get(1, 4)) as o:
@@ -462,6 +463,7 @@ def va(m):
             r"ord. -> pont. -> ord. || \baca-null-markup ||"
             r" ord. -> pont. -> ord. || \baca-null-markup ||",
             do_not_bookend=True,
+            do_not_rleak=True,
             staff_padding=8,
         )
     with baca.scope(m[3]) as o:
@@ -480,6 +482,7 @@ def va(m):
             r"\baca-null-markup || ord. -> pont. -> ord. ||"
             r" ord. -> pont. -> ord. || \baca-null-markup",
             do_not_bookend=True,
+            do_not_rleak=True,
             staff_padding=8,
         )
     with baca.scope(m[4]) as o:
@@ -498,15 +501,16 @@ def va(m):
             r"ord. -> pont. -> ord. || \baca-null-markup ||"
             r" \baca-null-markup || ord. -> pont. -> ord. ||",
             do_not_bookend=True,
+            do_not_rleak=True,
             staff_padding=8,
         )
     for n in [5, 6, 7, 9]:
         with baca.scope(m.get(n)) as o:
             for clpart in baca.select.clparts(o, [4]):
-                clpart = abjad.select.leaves(clpart)[-3:]
                 baca.mspanners.scp(
-                    baca.select.lparts(clpart, [1, 2]),
+                    baca.select.lparts(clpart[-3:], [1, 2]),
                     "ord. -> pont. -> ord.",
+                    do_not_rleak=True,
                     staff_padding=8,
                 )
     with baca.scope(m.get(5, 8)) as o:
@@ -558,8 +562,9 @@ def vc(m):
         baca.override.dls_staff_padding(o, 5)
         baca.flat_glissando(o, "F2")
         baca.mspanners.scp(
-            baca.select.rleak(baca.select.ltleaves(o)),
+            o.ltleaves(),
             "tasto =|",
+            rleak=True,
             staff_padding=3,
         )
     with baca.scope(m.get(1, 3)) as o:

diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py
@@ -387,10 +387,10 @@ def vn(m):
                 baca.select.lparts(o, [1, 1, 2]),
                 "mp - o< mp > p",
             )
-            leaves = o.leaves()[-3:]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[-3:], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m.get(1, 3)) as o:
@@ -429,10 +429,10 @@ def vn(m):
         baca.stem_tremolo(o.pleaves())
     for n in [6, 7]:
         with baca.scope(m[n]) as o:
-            leaves = o.leaves()[-3:]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[-3:], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m.get(6, 8)) as o:
@@ -460,10 +460,10 @@ def va(m):
                 baca.select.lparts(o, [1, 1, 2]),
                 "mp - o< mp > p",
             )
-            leaves = o.leaves()[-3:]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[-3:], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m[4]) as o:
@@ -492,10 +492,10 @@ def va(m):
         )
     for n in [6, 7]:
         with baca.scope(m[n]) as o:
-            leaves = o.leaves()[-3:]
             baca.mspanners.scp(
-                baca.select.lparts(leaves, [1, 2]),
+                baca.select.lparts(o[-3:], [1, 2]),
                 "ord. -> pont. -> ord.",
+                do_not_rleak=True,
                 staff_padding=5.5,
             )
     with baca.scope(m.get(6, 8)) as o:

diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py
@@ -441,10 +441,10 @@ def vn(m):
                 baca.quadruple_staccato(plt)
             elif duration == abjad.Duration((1, 4)):
                 baca.stem_tremolo(plt)
-        leaves = o.leaves()[-3:]
         baca.mspanners.scp(
-            baca.select.lparts(leaves, [1, 2]),
+            baca.select.lparts(o[-3:], [1, 2]),
             "ord. -> pont. -> ord.",
+            do_not_rleak=True,
             staff_padding=5.5,
         )
     with baca.scope(m.get(5, 7)) as o: