Cleaned up music.py files.

trevorbaca · Feb 5, 2024 · 58bf36b · 58bf36b
1 parent 95f607c
commit 58bf36b
Show file tree

Hide file tree

Showing 15 changed files with 218 additions and 218 deletions.
diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py
@@ -189,7 +189,7 @@ def vn(m):
     with baca.scope(m[1]) as o:
         baca.pitch(o, "E4")
         baca.dynamic(o.phead(0), '"f"')
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.tleaves(o),
             staff_padding=3,
         )
@@ -206,7 +206,7 @@ def va(m):
     with baca.scope(m[1]) as o:
         baca.pitch(o, "E4")
         baca.dynamic(o.phead(0), '"f"')
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.tleaves(o),
             staff_padding=3,
         )

diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
@@ -403,31 +403,31 @@ def eh(m):
         baca.pitches(o, "E4 Eb~4 E~4 E4 E#+4")
         baca.dynamic(o.phead(0), "f")
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
     with baca.scope(m.get(27, 30)) as o:
         baca.pitches(o, "F#4 F#+4 E#4 E#+4")
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
     with baca.scope(m.get(41, 46)) as o:
         baca.pitches(o, "G#4 F#+4 G4 G+4 G#+4")
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
     with baca.scope(m.get(57, 62)) as o:
         baca.pitches(o, "A#4 A+4 A#+4")
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
@@ -444,7 +444,7 @@ def eh(m):
         baca.pitches(o, "C4 C+4 C~4 C#4")
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
@@ -627,7 +627,7 @@ def perc(m):
         )
         baca.staff_position(o, 1)
         baca.override.stem_up(o.pleaves())
-        baca.spanners.trill(
+        baca.rspanners.trill(
             baca.select.tleaves(o),
             abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
         )
@@ -707,12 +707,12 @@ def vn(m):
         baca.dynamic(o.phead(0), '"f"')
         baca.pitch(o, "E4")
     with baca.scope(m.get(63, 65)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
     with baca.scope(m.get(69, 70)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
@@ -729,12 +729,12 @@ def vn(m):
         baca.spanners.beam(o.pleaves()[:2])
         baca.spanners.beam(o.leaves()[-4:])
     with baca.scope(m.get(81, 83)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
     with baca.scope(m.get(87, 88)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
@@ -788,12 +788,12 @@ def va(m):
         baca.dynamic(o.phead(0), '"f"')
         baca.pitch(o, "E4")
     with baca.scope(m.get(1, 62)) as o:
-        baca.spanners.xfb(
+        baca.rspanners.xfb(
             o,
             staff_padding=5.5,
         )
     with baca.scope(m.get(63, 65)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
@@ -812,7 +812,7 @@ def va(m):
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
     with baca.scope(m.get(69, 70)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
@@ -825,7 +825,7 @@ def va(m):
         baca.dynamic(o.phead(0), '"f"')
         baca.pitch(o, "E4")
     with baca.scope(m.get(71, 80)) as o:
-        baca.spanners.xfb(
+        baca.rspanners.xfb(
             o,
             staff_padding=5.5,
         )
@@ -844,18 +844,18 @@ def va(m):
             pieces=[o.ltleaves()],
         )
         baca.stem_tremolo(abjad.select.get(baca.select.pleaves(o), [0, -1]))
-        baca.spanners.xfb(
+        baca.rspanners.xfb(
             o,
             right_broken=True,
             staff_padding=5.5,
         )
     with baca.scope(m.get(81, 83)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )
     with baca.scope(m.get(87, 88)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.ltleaves(o),
             staff_padding=3,
         )

diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
@@ -410,7 +410,7 @@ def eh(m):
         library.keynoise_pitches(o, rotation=-2)
     with baca.scope(m.get(13, 16)) as o:
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
@@ -429,7 +429,7 @@ def eh(m):
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
     with baca.scope(m.get(23, 30)) as o:
         for run in baca.select.runs(o):
-            baca.spanners.trill(
+            baca.rspanners.trill(
                 run,
                 abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
             )
@@ -440,7 +440,7 @@ def eh(m):
         baca.override.note_head_style_cross(o.pleaves())
         library.keynoise_pitches(o, rotation=-3)
     with baca.scope(m.get(31, 44)) as o:
-        baca.spanners.trill(
+        baca.rspanners.trill(
             baca.select.tleaves(o),
             abjad.Tweak(r"- \tweak bound-details.right.padding 2"),
         )
@@ -733,7 +733,7 @@ def perc(cache):
             r"\baca-woodblock-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "MM =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -769,7 +769,7 @@ def vn(m):
             hide_middle_stems=True,
         )
     with baca.scope(m.get(9, 22)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.tleaves(o),
             staff_padding=3,
         )
@@ -812,13 +812,13 @@ def vn(m):
         )
         baca.staff_position(o, 0)
     with baca.scope(m.get(53, 68)) as o:
-        baca.spanners.clb(
+        baca.rspanners.clb(
             baca.select.ltleaves(o),
             3,
             staff_padding=5.5,
         )
     with baca.scope(m.get(73, 80)) as o:
-        baca.spanners.clb(
+        baca.rspanners.clb(
             baca.select.ltleaves(o),
             3,
             staff_padding=5.5,
@@ -849,7 +849,7 @@ def va(m):
         baca.dynamic(o.phead(0), '"ff"')
         baca.pitch(o, "F4")
     with baca.scope(m.get(1, 8)) as o:
-        baca.spanners.xfb(
+        baca.rspanners.xfb(
             o,
             staff_padding=5.5,
         )
@@ -866,7 +866,7 @@ def va(m):
             hide_middle_stems=True,
         )
     with baca.scope(m.get(9, 22)) as o:
-        baca.spanners.spazzolato(
+        baca.rspanners.spazzolato(
             baca.select.tleaves(o),
             staff_padding=3,
         )
@@ -891,7 +891,7 @@ def va(m):
         )
     with baca.scope(m.get(53, 80)) as o:
         baca.override.beam_positions(o, -3.5)
-        baca.spanners.clb(
+        baca.rspanners.clb(
             baca.select.tleaves(o),
             2,
             staff_padding=5.5,
@@ -980,7 +980,7 @@ 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.spanners.clb(
+        baca.rspanners.clb(
             baca.select.tleaves(o),
             2,
             staff_padding=5.5,

diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py
@@ -209,7 +209,7 @@ def fl(m):
         baca.pitch(o, "G#3")
         baca.staff_lines(o.leaf(0), 5)
     with baca.scope(m.leaves()) as o:
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -232,7 +232,7 @@ def eh(m):
         baca.dynamic(o.phead(0), '"mf"')
         baca.staff_position(o, 0)
     with baca.scope(m.leaves()) as o:
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -256,7 +256,7 @@ def cl(m):
         baca.dynamic(o.phead(0), "p")
         baca.pitch(o, "C2")
     with baca.scope(m.leaves()) as o:
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -288,7 +288,7 @@ def pf(cache):
         baca.clef(o.leaf(0), "bass")
         baca.dynamic(o.phead(0), "mp")
     with baca.scope(m.get(3, 4)) as o:
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             o,
             "2-1 -|",
             abjad.Tweak(r"- \tweak color #darkgreen"),
@@ -319,22 +319,22 @@ def pf(cache):
 
 def perc(m):
     with baca.scope(m[1]) as o:
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             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(
+        baca.rspanners.material_annotation(
             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(
+        baca.rspanners.material_annotation(
             o,
             "MM =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -349,7 +349,7 @@ 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.spanners.clb(
+        baca.rspanners.clb(
             baca.select.tleaves(o),
             3,
             staff_padding=5.5,
@@ -362,7 +362,7 @@ def vn(m):
         baca.staff_position(o, 0)
     with baca.scope(m.leaves()) as o:
         baca.override.dls_staff_padding(o, 6)
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -402,7 +402,7 @@ def va(m):
             abjad.Tweak(r"- \tweak padding 1.5"),
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
         )
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             baca.select.ltleaves(o),
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
@@ -415,13 +415,13 @@ def vc(m, metadata):
         baca.staff_lines(o.leaf(0), 5)
         baca.clef(o.leaf(0), "treble")
         baca.override.dls_staff_padding(o, 8)
-        baca.spanners.material_annotation(
+        baca.rspanners.material_annotation(
             o,
             "1-1 / 1-2 =|",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.override.note_head_style_harmonic(o.pleaves())
-        baca.spanners.string_number(
+        baca.rspanners.string_number(
             o,
             "IV",
             staff_padding=5.5,