diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py index 64c22bf3f..9020f2e33 100644 --- 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 index ddcb66736..202d2ef61 100644 --- 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 index 5c96feb8d..39470b35b 100644 --- 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 index 6f5533c5c..ecd6c83b9 100644 --- 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 index d9d352a58..07ddf6ffb 100644 --- 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 index 192f42015..85354c77f 100644 --- 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, diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index 5bc45ed01..ca702e0f4 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -34,19 +34,19 @@ def GLOBALS(skips): wrappers = baca.rehearsal_mark( skips[1 - 1], "F", - 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], "F", - 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], "F", - 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 ( @@ -483,7 +483,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)), ) with baca.scope(m.get(3, 4)) as o: baca.spanners.beam(o.tleaves()) @@ -540,7 +540,7 @@ def va(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.override.dls_staff_padding(o, 8) with baca.scope(m.get(3, 4)) as o: @@ -586,7 +586,7 @@ def va(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.spanners.clb( baca.select.ltleaves(o), diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py index 6a4783ac2..a4ec8a8e7 100644 --- a/faberge/sections/08/music.py +++ b/faberge/sections/08/music.py @@ -36,19 +36,19 @@ def GLOBALS(skips, rests, first_measure_number): wrappers = baca.rehearsal_mark( skips[1 - 1], "G", - 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], "G", - 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], "G", - 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 ( @@ -233,14 +233,14 @@ 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), baca.postevent.parent_alignment_x(0), ) baca.dynamic( 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.override.dls_staff_padding(o, 6) baca.staff_lines(o.rleaf(-1), 5) @@ -426,7 +426,7 @@ def vn(m): baca.markup( o.pleaf(0), r"\baca-boxed-ob-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) baca.override.dls_staff_padding(o, 6) baca.spanners.material_annotation( @@ -540,7 +540,7 @@ def vc(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.override.dls_staff_padding(o, 6) diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py index ae8b1cfab..e9025dbe6 100644 --- a/faberge/sections/09/music.py +++ b/faberge/sections/09/music.py @@ -35,19 +35,19 @@ def GLOBALS(skips, rests, first_measure_number): wrappers = baca.rehearsal_mark( skips[1 - 1], "H", - 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], "H", - 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], "H", - 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 ( @@ -314,7 +314,7 @@ def perc(m): baca.markup( o.pleaf(0), r"\baca-boxed-castanets-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) for n in [1, 2]: with baca.scope(m.get(n)) as o: @@ -427,7 +427,7 @@ def vn(m): baca.markup( o.pleaf(0), r"\baca-seven-e-flat", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) baca.pitch(o, "Dtqf5") with baca.scope(m.leaves()) as o: @@ -528,7 +528,7 @@ def va(m): baca.markup( o.pleaf(0), r"\faberge-eleventh-degree-of-e-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) baca.quadruple_staccato(abjad.select.get(baca.select.plts(o), [0], 4)) baca.stem_tremolo(abjad.select.get(baca.select.plts(o), [1, 2, 3], 4)) @@ -536,7 +536,7 @@ def va(m): baca.markup( o.pleaf(0), r"\baca-thirteen-e-flat", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) baca.pitch(o, "Bqs4") with baca.scope(m.leaves()) as o: @@ -597,13 +597,13 @@ def vc(m): with baca.scope(m[n]) as o: baca.down_bow( abjad.select.get(baca.select.pheads(o), [0], 2), - abjad.Tweak(r"- \tweak padding 1"), + baca.postevent.padding(1), abjad.Tweak(r"- \tweak parent-alignment-X 0.5"), full=True, ) baca.up_bow( abjad.select.get(baca.select.pheads(o), [1], 2), - abjad.Tweak(r"- \tweak padding 1"), + baca.postevent.padding(1), abjad.Tweak(r"- \tweak parent-alignment-X 0.5"), ) for note in abjad.select.get(o, ([0], 2)): diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index 440010f66..03cb2c4f2 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -35,19 +35,19 @@ def GLOBALS(skips, first_measure_number): wrappers = baca.rehearsal_mark( skips[1 - 1], "I", - 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], "I", - 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], "I", - 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 ( @@ -304,7 +304,7 @@ def pf(cache): o.phead(0), "f", 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(5, 6)) as o: baca.pitch(o, "G6:A6:B6:C7") @@ -484,7 +484,7 @@ def va(m): o.phead(0), "mp-ancora", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.glissando(o, "D3") baca.spanners.material_annotation( @@ -558,14 +558,14 @@ def vc(m, metadata): ) baca.up_bow( abjad.select.get(baca.select.pheads(o), [1], 2), - abjad.Tweak(r"- \tweak padding 1"), + baca.postevent.padding(1), abjad.Tweak(r"- \tweak parent-alignment-X 0.5"), ) for n in [1, 2, 3, 4]: with baca.scope(m[n]) as o: baca.down_bow( o.phead(0), - abjad.Tweak(r"- \tweak padding 1"), + baca.postevent.padding(1), abjad.Tweak(r"- \tweak parent-alignment-X 0.5"), full=True, ) @@ -595,7 +595,7 @@ def vc(m, metadata): o.phead(0), "f", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.spanners.material_annotation( o, diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 8c55d0f2c..52a638f7b 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -34,19 +34,19 @@ def GLOBALS(skips, first_measure_number): wrappers = baca.rehearsal_mark( skips[1 - 1], "J", - 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], "J", - 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], "J", - 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/12/music.py b/faberge/sections/12/music.py index a3d5dc00b..df89a8a8b 100644 --- a/faberge/sections/12/music.py +++ b/faberge/sections/12/music.py @@ -36,19 +36,19 @@ def GLOBALS(skips): wrappers = baca.rehearsal_mark( skips[1 - 1], "K", - 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], "K", - 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], "K", - 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 ( @@ -277,7 +277,7 @@ def pf(cache): o.phead(0), '"mf"', abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.markup( o.pleaf(0), @@ -408,7 +408,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.spanners.material_annotation( o, @@ -456,7 +456,7 @@ def va(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.spanners.material_annotation( o, @@ -511,7 +511,7 @@ def vc(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.spanners.material_annotation( o, diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index ccb11da04..a2a7f22d0 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -34,19 +34,19 @@ def GLOBALS(skips): wrappers = baca.rehearsal_mark( skips[1 - 1], "L", - 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], "L", - 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], "L", - 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 ( @@ -363,7 +363,7 @@ def pf(cache): o.phead(0), "mp", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-2 . 0)"), + baca.postevent.extra_offset((-2, 0)), ) with baca.scope(m.get(3, 4)) as o: baca.pitch(o, "G3:A3:C4") @@ -385,7 +385,7 @@ def pf(cache): o.phead(0), '"mf"', abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.markup( o.pleaf(0), @@ -420,7 +420,7 @@ def perc(m): o.phead(0), "f-sempre", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.staff_position(o, 1) baca.override.stem_direction_up(o.pleaves()) @@ -437,7 +437,7 @@ def perc(m): o.phead(0), "p-sempre", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.staff_position(o, 0) with baca.scope(m.leaves()) as o: @@ -489,7 +489,7 @@ def va(m): o.phead(0), "p-sempre", abjad.Tweak(r"- \tweak X-extent #'(0 . 0)"), - abjad.Tweak(r"- \tweak extra-offset #'(-1 . 0)"), + baca.postevent.extra_offset((-1, 0)), ) baca.spanners.material_annotation( o, diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index 75a9036eb..b21e3ddfa 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -34,19 +34,19 @@ def GLOBALS(skips): wrappers = baca.rehearsal_mark( skips[1 - 1], "M", - 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], "M", - 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], "M", - 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/15/music.py b/faberge/sections/15/music.py index 021e400af..212132b4e 100644 --- a/faberge/sections/15/music.py +++ b/faberge/sections/15/music.py @@ -35,19 +35,19 @@ def GLOBALS(skips, rests): wrappers = baca.rehearsal_mark( skips[1 - 1], "N", - 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], "N", - 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], "N", - 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 ( @@ -219,7 +219,7 @@ def pf(cache): o.phead(0), "f-whiteout", 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) baca.markup( @@ -294,7 +294,7 @@ def vn(cache): baca.markup( o.pleaf(0), r"\faberge-nine-plus-eleven-of-e-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) with baca.scope(m.leaves()) as o: baca.override.dls_staff_padding(o.leaves(), 6) @@ -319,7 +319,7 @@ def va(m): baca.markup( o.pleaf(0), r"\faberge-seventh-degree-of-e-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), ) baca.pitch(o, "Dqf5") with baca.scope(m.leaves()) as o: diff --git a/faberge/sections/16/music.py b/faberge/sections/16/music.py index 6b9aa9a2f..197539df5 100644 --- a/faberge/sections/16/music.py +++ b/faberge/sections/16/music.py @@ -34,19 +34,19 @@ def GLOBALS(skips): wrappers = baca.rehearsal_mark( skips[1 - 1], "O", - 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], "O", - 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], "O", - 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 ( @@ -166,7 +166,7 @@ def fl_eh_rh(cache): baca.markup( o.pleaf(0), r"\baca-boxed-very-small-maraca-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), baca.postevent.parent_alignment_x(0), ) with baca.scope(m.get(1, 5)) as o: @@ -184,7 +184,7 @@ def perc(m): baca.markup( o.pleaf(0), r"\baca-boxed-bd-sponge-markup", - abjad.Tweak(r"- \tweak padding 1.5"), + baca.postevent.padding(1.5), baca.postevent.parent_alignment_x(0), )