Skip to content

Commit

Permalink
Cleaned up music.py files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@trevorbaca
trevorbaca committed Apr 26, 2024
1 parent cd4857a commit 9fbf9a7
Show file tree
Hide file tree
Showing 16 changed files with 469 additions and 469 deletions.
8 changes: 4 additions & 4 deletions faberge/sections/01/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ def eh(m):
baca.markup(
o.pleaf(0),
r"\baca-boxed-ratchet-markup",
baca.postevent.parent_alignment_x(0),
baca.postevent.staff_padding(6),
baca.tweak.parent_alignment_x(0),
baca.tweak.staff_padding(6),
)
baca.dynamic(
o.phead(0),
"(f)",
baca.postevent.x_extent_zero(),
baca.postevent.extra_offset((-2, 0)),
baca.tweak.x_extent_zero(),
baca.tweak.extra_offset((-2, 0)),
)
baca.override.dls_staff_padding(o, 8.5)

Expand Down
52 changes: 26 additions & 26 deletions faberge/sections/02/music.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ def GLOBALS(skips):
wrappers = baca.rehearsal_mark(
skips[1 - 1],
"A",
baca.postevent.extra_offset((0, 9)),
baca.tweak.extra_offset((0, 9)),
)
baca.tags.tag(wrappers, baca.tags.ONLY_PARTS)
wrappers = baca.rehearsal_mark(
skips[1 - 1],
"A",
baca.postevent.extra_offset((0, 6)),
baca.tweak.extra_offset((0, 6)),
)
baca.tags.tag(wrappers, baca.tags.ONLY_SCORE)
wrappers = baca.rehearsal_mark(
skips[1 - 1],
"A",
baca.postevent.extra_offset((0, 18)),
baca.tweak.extra_offset((0, 18)),
)
baca.tags.tag(wrappers, baca.tags.ONLY_SECTION)

Expand Down Expand Up @@ -331,7 +331,7 @@ def fl(m):
baca.markup(
o.pleaf(0),
r"\faberge-match-sound-of-crotales-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
with baca.scope(m.get(13, 26)) as o:
baca.pitch(o, "F6")
Expand Down Expand Up @@ -361,7 +361,7 @@ def fl(m):
baca.markup(
o.mmrest(0),
r"\baca-boxed-to-bass-flute-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
baca.instrument(o.leaf(0), "BassFlute", library.manifests)
baca.short_instrument_name(o.leaf(0), "B. fl.", library.manifests)
Expand All @@ -382,8 +382,8 @@ def fl(m):
baca.pitches(o, "F#4 F#3", allow_repeats=True)
library.bfl_color_fingerings(
o.pheads(),
baca.postevent.parent_alignment_x(-0.5),
baca.postevent.staff_padding(3.5),
baca.tweak.parent_alignment_x(-0.5),
baca.tweak.staff_padding(3.5),
)
baca.hairpin(
o.tleaves()[:1],
Expand All @@ -408,7 +408,7 @@ def eh(m):
for run in baca.select.runs(o):
baca.spanners.trill(
run,
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
with baca.scope(m.get(27, 30)) as o:
Expand All @@ -417,7 +417,7 @@ def eh(m):
for run in baca.select.runs(o):
baca.spanners.trill(
run,
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
with baca.scope(m.get(41, 46)) as o:
Expand All @@ -426,7 +426,7 @@ def eh(m):
for run in baca.select.runs(o):
baca.spanners.trill(
run,
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
with baca.scope(m.get(57, 62)) as o:
Expand All @@ -435,7 +435,7 @@ def eh(m):
for run in baca.select.runs(o):
baca.spanners.trill(
run,
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
with baca.scope(m.get(81, 88)) as o:
Expand All @@ -444,7 +444,7 @@ def eh(m):
baca.markup(
o.pleaf(0),
r"\baca-boxed-keynoise-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
),
baca.dynamic(o.phead(0), '"ff"')
with baca.scope(m.get(89, 92)) as o:
Expand All @@ -453,7 +453,7 @@ def eh(m):
for run in baca.select.runs(o):
baca.spanners.trill(
run,
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
baca.dynamic(o.phead(0), "f")
Expand All @@ -468,7 +468,7 @@ def cl(m):
baca.markup(
o.pleaf(0),
r"\faberge-match-sound-of-crotales-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
baca.pitch(o, "F#6")
library.dal_niente_hairpins(o, "f")
Expand Down Expand Up @@ -498,7 +498,7 @@ def cl(m):
baca.markup(
o.mmrest(0),
r"\baca-boxed-to-bass-clarinet-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
with baca.scope(m.get(47, 92)) as o:
baca.override.dls_staff_padding(o, 8)
Expand Down Expand Up @@ -629,13 +629,13 @@ def perc(m):
baca.markup(
o.pleaf(0),
r"\baca-boxed-castanets-markup",
baca.postevent.staff_padding(8),
baca.tweak.staff_padding(8),
)
baca.staff_position(o, 1)
baca.override.stem_direction_up(o.pleaves())
baca.spanners.trill(
baca.select.tleaves(o),
baca.postevent.bound_details_right_padding(2),
baca.tweak.bound_details_right_padding(2),
rleak=True,
)
with baca.scope(m[87]) as o:
Expand All @@ -645,8 +645,8 @@ def perc(m):
baca.markup(
o.plt(-1),
r"\baca-boxed-bd-struck-markup",
baca.postevent.parent_alignment_x(0),
baca.postevent.staff_padding(8),
baca.tweak.parent_alignment_x(0),
baca.tweak.staff_padding(8),
)
baca.staff_position(o, -1)
baca.override.stem_direction_down(o.pleaves())
Expand All @@ -658,7 +658,7 @@ def perc(m):
baca.markup(
o.pleaf(0),
r"\baca-boxed-crotales-bowed-markup",
baca.postevent.staff_padding(6),
baca.tweak.staff_padding(6),
)
library.dal_niente_hairpins(o, "f")
with baca.scope(m.get(1, 80)) as o:
Expand All @@ -667,8 +667,8 @@ def perc(m):
baca.markup(
o.pleaf(0),
r"\baca-boxed-crotales-bowed-markup",
baca.postevent.extra_offset((-6, 0)),
baca.postevent.staff_padding(6),
baca.tweak.extra_offset((-6, 0)),
baca.tweak.staff_padding(6),
)


Expand All @@ -679,7 +679,7 @@ def vn(m):
baca.markup(
o.pleaf(0),
r"\faberge-match-sound-of-crotales-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
baca.pitch(o, "F#6")
library.dal_niente_hairpins(o, "f")
Expand Down Expand Up @@ -888,8 +888,8 @@ def vc(m):
baca.markup(
o.pleaf(0),
r"\faberge-poco-vib-sempre-markup",
baca.postevent.parent_alignment_x(0),
baca.postevent.staff_padding(5.5),
baca.tweak.parent_alignment_x(0),
baca.tweak.staff_padding(5.5),
)
with baca.scope(m.get(1, 16)) as o:
baca.hairpin(
Expand Down Expand Up @@ -938,7 +938,7 @@ def vc(m):
baca.markup(
o.pleaf(0),
r"\baca-sub-non-vib-markup",
baca.postevent.padding(1.5),
baca.tweak.padding(1.5),
)
with baca.scope(m.get(71, 80)) as o:
baca.spanners.scp(
Expand Down
Loading

0 comments on commit 9fbf9a7

Please sign in to comment.