Cleaned up music.py files.

trevorbaca · Jan 25, 2024 · f26296c · f26296c
1 parent f1c538a
commit f26296c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 68 deletions.
diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
@@ -834,18 +834,16 @@ def vn(m):
         )
         baca.staff_position(o, 0)
     with baca.scope(m.get(53, 68)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.rleak(baca.select.ltleaves(o)),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.rleak(baca.select.ltleaves(o))],
+            staff_padding=5.5,
         )
     with baca.scope(m.get(73, 80)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.rleak(baca.select.ltleaves(o)),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.rleak(baca.select.ltleaves(o))],
+            staff_padding=5.5,
         )
         baca.dynamic(
             o.phead(0),
@@ -920,11 +918,10 @@ def va(m):
         )
     with baca.scope(m.get(53, 80)) as o:
         baca.override.beam_positions(o, -3.5)
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 10)
         baca.staccato(o.pheads()),
@@ -1013,11 +1010,10 @@ def vc(m):
     with baca.scope(m.get(61, 80)) as o:
         baca.override.beam_positions(o, -3.5)
         baca.staff_lines(o.leaf(0), 1)
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 10)
         baca.dynamic(o.phead(0), '"mf"')

diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py
@@ -358,11 +358,10 @@ def vn(m):
     with baca.scope(m.get(1, 3)) as o:
         baca.override.beam_positions(o, -3.5)
     with baca.scope(m.get(1, 4)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.staccato(o.pheads())
         library.clb_staff_positions(o)

diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py
@@ -466,11 +466,10 @@ def vn(m):
     with baca.scope(m[8]) as o:
         baca.staff_lines(o[0], 5)
     with baca.scope(m.get(4, 7)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         ),
         baca.override.dls_staff_padding(o, 8)
 
@@ -572,11 +571,10 @@ def composites(cache):
             baca.override.stem_down(o.pleaves())
             library.clb_staff_positions(o)
             if name in ("va", "vc"):
-                baca.clb_spanner(
-                    (),
+                baca.spanners.clb(
+                    baca.select.tleaves(o, rleak=True),
                     2,
-                    abjad.Tweak(r"- \tweak staff-padding 5.5"),
-                    pieces=[baca.select.tleaves(o, rleak=True)],
+                    staff_padding=5.5,
                 )
                 baca.override.dls_staff_padding(o, 8)
 

diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py
@@ -498,11 +498,10 @@ def vn(m):
         )
     with baca.scope(m.get(3, 7)) as o:
         baca.staccato(o.pheads())
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.rleak(baca.select.ltleaves(o)),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.rleak(baca.select.ltleaves(o))],
+            staff_padding=5.5,
         )
     with baca.scope(m.get(5, 7)) as o:
         library.clb_staff_positions(o)
@@ -548,11 +547,10 @@ def va(m):
         baca.spanners.beam(o.tleaves())
         library.clb_staff_positions(o)
         baca.staccato(o.pheads())
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.material_annotation_spanner(
             (),
@@ -589,11 +587,10 @@ def va(m):
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
             abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
         )
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.rleak(baca.select.ltleaves(o)),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.rleak(baca.select.ltleaves(o))],
+            staff_padding=5.5,
         )
         baca.material_annotation_spanner(
             (),

diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py
@@ -372,11 +372,10 @@ def perc(m):
 def vn(m):
     with baca.scope(m.get(1, 4)) as o:
         baca.staff_lines(o.leaf(0), 1)
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 9)
         baca.material_annotation_spanner(
@@ -403,11 +402,10 @@ def vn(m):
         baca.pitch(o, "A6")
     with baca.scope(m.get(6, 9)) as o:
         baca.staff_lines(o.leaf(0), 1)
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 9)
         baca.dynamic(
@@ -451,11 +449,10 @@ def va(m):
         baca.flat_glissando(o, "F3")
         baca.stem_tremolo(o.pheads())
     with baca.scope(m.get(6, 9)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 9)
         baca.dynamic(
@@ -481,11 +478,10 @@ def vc(m):
     with baca.scope(m.get(1, 4)) as o:
         baca.staff_lines(o.leaf(0), 1)
         baca.clef(o.leaf(0), "treble")
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         baca.override.dls_staff_padding(o, 9)
         baca.material_annotation_spanner(
@@ -525,11 +521,10 @@ def vc(m):
             abjad.Tweak(r"- \tweak staff-padding 9.5"),
             pieces=[o.rleaves()],
         )
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             2,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
         library.clb_staff_positions(o)
 

diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py
@@ -471,11 +471,10 @@ def vn(m):
     with baca.scope(m.get(1, 2)) as o:
         baca.spanners.beam(o.tleaves())
     with baca.scope(m.get(1, 6)) as o:
-        baca.clb_spanner(
-            (),
+        baca.spanners.clb(
+            baca.select.tleaves(o, rleak=True),
             3,
-            abjad.Tweak(r"- \tweak staff-padding 5.5"),
-            pieces=[baca.select.tleaves(o, rleak=True)],
+            staff_padding=5.5,
         )
     with baca.scope(m.get(3, 4)) as o:
         baca.spanners.beam(o.tleaves())
@@ -562,11 +561,10 @@ def vn_va_vc(cache):
             baca.override.stem_down(o.pleaves())
             library.clb_staff_positions(o)
             if name in ("va", "vc"):
-                baca.clb_spanner(
-                    (),
+                baca.spanners.clb(
+                    baca.select.tleaves(o, rleak=True),
                     2,
-                    abjad.Tweak(r"- \tweak staff-padding 5.5"),
-                    pieces=[baca.select.tleaves(o, rleak=True)],
+                    staff_padding=5.5,
                 )
         with baca.scope(m[7]) as o:
             baca.staff_lines(o.leaf(0), 5)