Cleaned up music.py files.

trevorbaca · Feb 4, 2024 · 45a0214 · 45a0214
1 parent 5e0877a
commit 45a0214
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 13 deletions.
diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
@@ -794,8 +794,9 @@ def va(m):
         baca.pitch(o, "E4")
     with baca.scope(m.get(1, 62)) as o:
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=5.5,
+            with_next_leaf=True,
         )
     with baca.scope(m.get(63, 65)) as o:
         baca.spanners.spazzolato(
@@ -831,8 +832,9 @@ def va(m):
         baca.pitch(o, "E4")
     with baca.scope(m.get(71, 80)) as o:
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=5.5,
+            with_next_leaf=True,
         )
     with baca.scope(m.get(89, 92)) as o:
         baca.dynamic(o.phead(0), "pp")
@@ -850,9 +852,10 @@ def va(m):
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             right_broken=True,
             staff_padding=5.5,
+            with_next_leaf=True,
         )
     with baca.scope(m.get(81, 83)) as o:
         baca.spanners.spazzolato(

diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
@@ -852,8 +852,9 @@ def va(m):
         baca.pitch(o, "F4")
     with baca.scope(m.get(1, 8)) as o:
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=5.5,
+            with_next_leaf=True,
         )
     with baca.scope(m.get(13, 22)) as o:
         baca.spanners.hairpin(

diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py
@@ -516,9 +516,10 @@ def vc(m):
         )
         baca.stem_tremolo(o.pleaf(0))
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             right_broken=True,
             staff_padding=3,
+            with_next_leaf=True,
         )
 
 

diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py
@@ -547,8 +547,9 @@ def va(m):
         baca.dynamic(o.phead(0), "mp")
         baca.override.dls_staff_padding(o, 5)
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
         baca.breathe(o.pleaf(-1))
         baca.spanners.material_annotation(
@@ -614,8 +615,9 @@ def vc(m):
             left_broken=True,
         )
         baca.spanners.xfb(
-            baca.select.tleaves(o, rleak=True),
+            baca.select.tleaves(o),
             staff_padding=3,
+            with_next_leaf=True,
         )
     with baca.scope(m[4]) as o:
         baca.stem_tremolo(o.pleaf(0))

diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py
@@ -461,8 +461,9 @@ def va(m):
         baca.dynamic(o.phead(0), "mp")
         baca.override.dls_staff_padding(o, 5)
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
         baca.spanners.material_annotation(
             o.rleaves(),

diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py
@@ -494,8 +494,9 @@ def va(m):
         )
         baca.stem_tremolo(o.pleaves())
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
     for n in [6, 7]:
         with baca.scope(m[n]) as o:

diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py
@@ -459,8 +459,9 @@ def vn(m):
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
     with baca.scope(m.leaves()) as o:
         baca.override.dls_staff_padding(o.leaves(), 4)
@@ -498,8 +499,9 @@ def va(m):
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
     with baca.scope(m.get(5, 8)) as o:
         baca.flat_glissando(
@@ -569,8 +571,9 @@ def vc(m, metadata):
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
 
 

diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py
@@ -422,8 +422,9 @@ def va(m):
             abjad.Tweak(r"- \tweak staff-padding 5.5"),
         )
         baca.spanners.xfb(
-            o.rleaves(),
+            o,
             staff_padding=3,
+            with_next_leaf=True,
         )
     with baca.scope(m[5]) as o:
         baca.flat_glissando(o, "F3")

diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py
@@ -494,6 +494,8 @@ def va(m):
             baca.spanners.xfb(
                 plt,
                 staff_padding=5,
+                # TODO: is this correct?
+                with_next_leaf=False,
             )
     with baca.scope(m.leaves()) as o:
         baca.override.dls_staff_padding(o, 5)

diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py
@@ -369,6 +369,8 @@ def va(m):
             baca.spanners.xfb(
                 plt,
                 staff_padding=3,
+                # TODO: is this correct?
+                with_next_leaf=False,
             )
     with baca.scope(m.get(1, 4)) as o:
         baca.pitch(o, "Eb3")

diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py
@@ -302,6 +302,8 @@ def va(m):
             baca.spanners.xfb(
                 plt,
                 staff_padding=3,
+                # TODO: is this correct?
+                with_next_leaf=False,
             )
     with baca.scope(m.get(5, 8)) as o:
         baca.markup(