Cleaned up music.py files.

trevorbaca · Feb 7, 2024 · 2b34ca9 · 2b34ca9
1 parent 34b572f
commit 2b34ca9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 81 deletions.
diff --git a/faberge/sections/10/.metadata b/faberge/sections/10/.metadata
@@ -36,16 +36,6 @@
     "first_measure_number": 229,
     "has_anchor_skip": True,
     "persistent_indicators": {
-        "Cello.Music": [
-            baca.Memento(
-                context="Cello.Music",
-                edition=None,
-                manifest=None,
-                prototype="abjad.Dynamic",
-                synthetic_offset=None,
-                value="p",
-            )
-        ],
         "Cello.Staff": [
             baca.Memento(
                 context="Cello.Music",

diff --git a/faberge/sections/10/music.ily b/faberge/sections/10/music.ily
@@ -4151,10 +4151,7 @@ number.10.Cello.Music = {
     \override DynamicLineSpanner.staff-padding = 8
     \override NoteHead.style = #'harmonic
     bf'!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_STOP
@@ -4216,24 +4213,15 @@ number.10.Cello.Music = {
     - \tweak color #blue
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
-    - \tweak to-barline ##t
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
     \>
     \glissando
 
     r4.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
 
     d''8
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
     [
       %! EXPLICIT_DYNAMIC
@@ -4263,17 +4251,11 @@ number.10.Cello.Music = {
     - \tweak color #blue
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
-    - \tweak to-barline ##t
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
     \>
     \glissando
 
     fqs''!8
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
     ]
       %! EXPLICIT_DYNAMIC
@@ -4304,26 +4286,17 @@ number.10.Cello.Music = {
     - \tweak color #blue
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
-    - \tweak to-barline ##t
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
     \>
     \glissando
 
     r4.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
 
     r8
 
     aqf''!4.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -4352,18 +4325,12 @@ number.10.Cello.Music = {
     - \tweak color #blue
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
-    - \tweak to-barline ##t
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
     \>
     \glissando
 
     % [Cello.Music measure 8]
     bf'!2
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -4392,36 +4359,15 @@ number.10.Cello.Music = {
     - \tweak color #blue
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
-    - \tweak to-barline ##t
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
     \>
     \glissando
 
     d''8
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
-    - \tweak circled-tip ##t
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-      %! SPANNER_START
-    \<
     \revert NoteHead.style
 
     r4.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \p
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_STOP
     \bacaStopTextSpanMaterialAnnotation

diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py
@@ -623,11 +623,13 @@ def vc(m, metadata):
             name="CELLO_GLISSANDI",
         ),
         baca.glissando(o.tleaves())
-        for run in baca.select.rleak_runs(o):
+        for run in abjad.select.runs(o):
+            if len(run) % 2 == 0:
+                run = baca.select.rleak(run)
             baca.piecewise.hairpin(
-                baca.select.clparts(run, [1]),
-                "niente o< p >o",
-                do_not_start_spanner_on_final_piece=True,
+                baca.select.lparts(run, (len(run) - 2) * [1] + [2]),
+                "! o< p >o",
+                forbid_al_niente_to_bar_line=True,
             )
     with baca.scope(m.leaves()) as o:
         baca.override.dls_staff_padding(o, 4)

diff --git a/faberge/sections/11/music.ily b/faberge/sections/11/music.ily
@@ -3261,11 +3261,6 @@ number.11.Cello.Music = {
       %! REAPPLIED_STAFF_LINES
     \startStaff
     r4
-      %! REAPPLIED_DYNAMIC_COLOR
-      %! REAPPLIED_DYNAMIC
-    - \tweak color #(x11-color 'green4)
-      %! REAPPLIED_DYNAMIC
-    \p
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Cello”)"
       %! SPANNER_START