Cleaned up music.py files.

trevorbaca · Apr 24, 2024 · 4fa6258 · 4fa6258
1 parent c5e8a40
commit 4fa6258
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 104 deletions.
diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py
@@ -132,7 +132,7 @@ def eh(m):
             o.phead(0),
             "(f)",
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.override.dls_staff_padding(o, 8.5)
 

diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
@@ -42,7 +42,7 @@ def GLOBALS(skips):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "A",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 9)"),
+        baca.postevent.extra_offset((0, 9)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
     wrappers = baca.rehearsal_mark(
@@ -54,7 +54,7 @@ def GLOBALS(skips):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "A",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 18)"),
+        baca.postevent.extra_offset((0, 18)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)
 
@@ -331,7 +331,7 @@ def fl(m):
         baca.markup(
             o.pleaf(0),
             r"\faberge-match-sound-of-crotales-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
     with baca.scope(m.get(13, 26)) as o:
         baca.pitch(o, "F6")
@@ -361,7 +361,7 @@ def fl(m):
         baca.markup(
             o.mmrest(0),
             r"\baca-boxed-to-bass-flute-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.instrument(o.leaf(0), "BassFlute", library.manifests)
         baca.short_instrument_name(o.leaf(0), "B. fl.", library.manifests)
@@ -444,7 +444,7 @@ def eh(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-keynoise-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         ),
         baca.dynamic(o.phead(0), '"ff"')
     with baca.scope(m.get(89, 92)) as o:
@@ -468,7 +468,7 @@ def cl(m):
         baca.markup(
             o.pleaf(0),
             r"\faberge-match-sound-of-crotales-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.pitch(o, "F#6")
         library.dal_niente_hairpins(o, "f")
@@ -498,7 +498,7 @@ def cl(m):
         baca.markup(
             o.mmrest(0),
             r"\baca-boxed-to-bass-clarinet-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
     with baca.scope(m.get(47, 92)) as o:
         baca.override.dls_staff_padding(o, 8)
@@ -679,7 +679,7 @@ def vn(m):
         baca.markup(
             o.pleaf(0),
             r"\faberge-match-sound-of-crotales-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.pitch(o, "F#6")
         library.dal_niente_hairpins(o, "f")
@@ -938,7 +938,7 @@ def vc(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-sub-non-vib-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
     with baca.scope(m.get(71, 80)) as o:
         baca.spanners.scp(

diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
@@ -45,19 +45,19 @@ def GLOBALS(skips):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "B",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 9)"),
+        baca.postevent.extra_offset((0, 9)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "B",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 14)"),
+        baca.postevent.extra_offset((0, 14)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SCORE)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "B",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 18)"),
+        baca.postevent.extra_offset((0, 18)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)
 
@@ -422,7 +422,7 @@ def eh(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-doubletrill-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.pitch(o, "Eb4")
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
@@ -463,12 +463,12 @@ def eh(m):
             o.phead(0),
             '"mf"',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-airtone-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
             baca.postevent.parent_alignment_x(0),
         )
         baca.staff_position(o, 0)
@@ -478,12 +478,12 @@ def eh(m):
             o.phead(0),
             "(f)",
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-ratchet-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
             baca.postevent.parent_alignment_x(0),
         )
         baca.staff_position(o, 0)
@@ -620,7 +620,7 @@ def pf(cache):
             o.phead(0),
             '"mf"',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
@@ -658,7 +658,7 @@ def perc(cache):
         baca.markup(
             o.ptail(0),
             r"\baca-lv-possibile-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.pitch(o, "G4")
     with baca.scope(m[1]) as o:
@@ -720,7 +720,7 @@ def perc(cache):
             o.phead(0),
             '"mf"',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
@@ -755,7 +755,7 @@ def vn(m):
         baca.markup(
             o.ptail(0),
             r"\baca-lv-possibile-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
         baca.pitch(o, "G6")
         library.dal_niente_hairpins(o, "ff")
@@ -810,12 +810,12 @@ def vn(m):
             o.phead(0),
             '("mf")',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-ob-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
             baca.postevent.parent_alignment_x(0),
         )
         baca.staff_position(o, 0)
@@ -837,7 +837,7 @@ def vn(m):
             o.phead(0),
             '("mf")',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.staccato(o.pheads())
         baca.override.stem_direction_down(o.pleaves())

diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py
@@ -34,19 +34,19 @@ def GLOBALS(skips):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "C",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 9)"),
+        baca.postevent.extra_offset((0, 9)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "C",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 14)"),
+        baca.postevent.extra_offset((0, 14)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SCORE)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "C",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 18)"),
+        baca.postevent.extra_offset((0, 18)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)
     for index, item in (
@@ -197,7 +197,7 @@ def fl(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-airtone-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
             baca.postevent.parent_alignment_x(0),
         )
     for n in [5, 6]:
@@ -223,7 +223,7 @@ def eh(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-airtone-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
     for n in [5, 6]:
         with baca.scope(m[n]) as o:
@@ -247,7 +247,7 @@ def cl(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-airtone-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
         )
     for n in [5, 6]:
         with baca.scope(m[n]) as o:
@@ -408,7 +408,7 @@ def va(m):
         baca.markup(
             o.pleaf(0),
             r"\baca-boxed-ob-markup",
-            abjad.Tweak(r"- \tweak padding 1.5"),
+            baca.postevent.padding(1.5),
             baca.postevent.parent_alignment_x(0),
         )
         baca.spanners.material_annotation(

diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py
@@ -35,19 +35,19 @@ def GLOBALS(skips, rests):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "D",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 9)"),
+        baca.postevent.extra_offset((0, 9)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "D",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 14)"),
+        baca.postevent.extra_offset((0, 14)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SCORE)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "D",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 18)"),
+        baca.postevent.extra_offset((0, 18)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)
     for index, item in (

diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py
@@ -34,19 +34,19 @@ def GLOBALS(skips, rests, first_measure_number):
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "E",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 9)"),
+        baca.postevent.extra_offset((0, 9)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "E",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 14)"),
+        baca.postevent.extra_offset((0, 14)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SCORE)
     wrappers = baca.rehearsal_mark(
         skips[1 - 1],
         "E",
-        abjad.Tweak(r"- \tweak extra-offset #'(0 . 18)"),
+        baca.postevent.extra_offset((0, 18)),
     )
     baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)
     for index, item in (
@@ -225,7 +225,7 @@ def fl(m):
         baca.hairpin(
             baca.select.clparts(o, [1]),
             "o< mf>o !o< mf>o!",
-            (abjad.Tweak(r"- \tweak to-barline ##t"), -1),
+            (baca.postevent.to_bar_line_true(), -1),
             rleak=True,
         )
         baca.pitch(o, "F5")
@@ -322,7 +322,7 @@ def pf(cache):
             o.phead(0),
             '"mf"',
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+            baca.postevent.extra_offset((-2, 0)),
         )
         baca.markup(
             o.pleaf(0),
@@ -341,7 +341,7 @@ def pf(cache):
             o.phead(0),
             "mp",
             abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-            abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"),
+            baca.postevent.extra_offset((-1, 0)),
         )
     with baca.scope(m.get(6, 8)) as o:
         baca.pitch(o, "G3:A3:C4")
@@ -548,7 +548,7 @@ def composites(cache):
                 o.phead(0),
                 '"mf"',
                 abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"),
-                abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"),
+                baca.postevent.extra_offset((-2, 0)),
             )
             baca.spanners.material_annotation(
                 o,