From e36b640479ef80471efc8ca21afcd50de589cc7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trevor=20Ba=C4=8Da?= Date: Fri, 23 Feb 2024 09:23:16 -0500 Subject: [PATCH] Cleaned up music.py files --- faberge/sections/04/music.py | 2 +- faberge/sections/05/music.py | 4 ++-- faberge/sections/06/music.ily | 2 -- faberge/sections/06/music.py | 2 +- faberge/sections/07/music.py | 2 +- faberge/sections/10/music.py | 4 ++-- faberge/sections/11/music.py | 4 ++-- faberge/sections/13/music.ily | 1 - faberge/sections/13/music.py | 4 ++-- faberge/sections/14/music.py | 2 +- 10 files changed, 12 insertions(+), 15 deletions(-) diff --git a/faberge/sections/04/music.py b/faberge/sections/04/music.py index 02cc907ef..923a8aac1 100644 --- a/faberge/sections/04/music.py +++ b/faberge/sections/04/music.py @@ -433,7 +433,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ) - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) runs = abjad.select.runs(o) baca.hairpin( baca.select.clparts(runs[0], [1]), diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py index 777e26446..16640ca8b 100644 --- a/faberge/sections/05/music.py +++ b/faberge/sections/05/music.py @@ -245,7 +245,7 @@ def fl_cl(cache): with baca.scope(cache[name][n]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:]) baca.hairpin( baca.select.lparts(o, [1, 1, 2]), "o< mp>o p>pp", @@ -372,7 +372,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ) - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) runs = abjad.select.runs(o) baca.hairpin( baca.select.clparts(runs[0], [1]), diff --git a/faberge/sections/06/music.ily b/faberge/sections/06/music.ily index 3a9615efe..42dc99165 100644 --- a/faberge/sections/06/music.ily +++ b/faberge/sections/06/music.ily @@ -734,7 +734,6 @@ number.6.Flute.Music = { \glissando g'4 - \glissando \once \override DynamicText.self-alignment-X = -0.75 g'4 @@ -1444,7 +1443,6 @@ number.6.Clarinet.Music = { \glissando fs'!4 - \glissando \once \override DynamicText.self-alignment-X = -0.75 fs'!4 diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py index ab9f54224..b81be9430 100644 --- a/faberge/sections/06/music.py +++ b/faberge/sections/06/music.py @@ -295,7 +295,7 @@ def fl_cl(cache): with baca.scope(m[n]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:4]) baca.hairpin( baca.select.lparts(o, [1, 1, len(o) - 2]), "o< mp>o p>pp", diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py index 518c2605f..8414c4b8c 100644 --- a/faberge/sections/07/music.py +++ b/faberge/sections/07/music.py @@ -319,7 +319,7 @@ def fl_cl(cache): with baca.scope(m[n]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:4]) baca.rspanners.trill( o.leaves()[:2], abjad.Tweak(r"- \tweak bound-details.right.padding 2"), diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py index ec18eba7b..806bcad5b 100644 --- a/faberge/sections/10/music.py +++ b/faberge/sections/10/music.py @@ -248,7 +248,7 @@ def fl_cl(cache): with baca.scope(m[n]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:4]) baca.rspanners.trill( o.leaves()[:2], abjad.Tweak(r"- \tweak bound-details.right.padding 2"), @@ -615,7 +615,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ), - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) baca.hairpin( baca.select.lparts(baca.select.rleak(abjad.select.run(o, 0)), [1, 1, 1]), "o< p>o !", diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py index 42c0105e8..ccfa13e66 100644 --- a/faberge/sections/11/music.py +++ b/faberge/sections/11/music.py @@ -246,7 +246,7 @@ def fl_cl(cache): with baca.scope(m[n]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:4]) baca.rspanners.trill( o.leaves()[:2], abjad.Tweak(r"- \tweak bound-details.right.padding 2"), @@ -527,7 +527,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ) - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) run = abjad.select.run(o, 0) baca.hairpin( baca.select.lparts(run, [1, 1, 1, 2]), diff --git a/faberge/sections/13/music.ily b/faberge/sections/13/music.ily index ffa5b1e36..ab72a4239 100644 --- a/faberge/sections/13/music.ily +++ b/faberge/sections/13/music.ily @@ -426,7 +426,6 @@ number.13.Flute.Music = { \glissando g'4 - \glissando \once \override DynamicText.self-alignment-X = -0.75 g'4 diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py index a264628f8..067311539 100644 --- a/faberge/sections/13/music.py +++ b/faberge/sections/13/music.py @@ -261,7 +261,7 @@ def fl(m): with baca.scope(m[3]) as o: baca.override.dynamic_text_self_alignment_x(o.pleaf(2), -1) baca.override.dynamic_text_self_alignment_x(o.pleaf(-1), -0.75) - baca.basic_glissando(o.pleaves()[2:]) + baca.glissando(o.pleaves()[2:4]) baca.hairpin( baca.select.lparts(o, [1, 1, 3]), "o< mp>o p>pp", @@ -519,7 +519,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ) - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) run = abjad.select.run(o, 0) baca.hairpin( baca.select.lparts(run, [1, 1, 1, 1, 1, 1]), diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py index e3f01cf42..38f415cbf 100644 --- a/faberge/sections/14/music.py +++ b/faberge/sections/14/music.py @@ -400,7 +400,7 @@ def vc(m, metadata): metadata=metadata, name="CELLO_GLISSANDI", ) - baca.basic_glissando(o.tleaves()) + baca.glissando(o.tleaves(), do_not_hide_middle_note_heads=True) run = abjad.select.run(o, 0) baca.hairpin( baca.select.lparts(run, [1, 1]),