Cleaned up music.py files.

trevorbaca · Feb 7, 2024 · c21975d · c21975d
1 parent 3a5877c
commit c21975d
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 261 deletions.
diff --git a/faberge/sections/02/.metadata b/faberge/sections/02/.metadata
@@ -191,16 +191,6 @@
                 value=5,
             ),
         ],
-        "Flute.Music": [
-            baca.Memento(
-                context="Flute.Music",
-                edition=None,
-                manifest=None,
-                prototype="abjad.Dynamic",
-                synthetic_offset=None,
-                value="\\baca-p-parenthesized",
-            )
-        ],
         "Flute.Staff": [
             baca.Memento(
                 context="Flute.Music",

diff --git a/faberge/sections/02/music.ily b/faberge/sections/02/music.ily
@@ -4399,11 +4399,6 @@ number.2.Flute.Music = {
 
     % [Flute.Music measure 81]
     fs''!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
     - \tweak circled-tip ##t
@@ -4476,10 +4471,7 @@ number.2.Flute.Music = {
     % [Flute.Music measure 89]
     \override RepeatTie.extra-offset = #'(-1.5 . 0)
     fs''!2.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -4591,18 +4583,14 @@ number.2.Flute.Music = {
       %! HIDDEN
       %! NOTE
     b'1 * 1/4
-      %! REDUNDANT_DYNAMIC_COLOR
-      %! ANCHOR_NOTE
-      %! REDUNDANT_DYNAMIC
-    - \tweak color #(x11-color 'DeepPink1)
-      %! ANCHOR_NOTE
-      %! REDUNDANT_DYNAMIC
-    \baca-p-parenthesized
       %! ANCHOR_NOTE
       %! DURATION_MULTIPLIER
       %! HIDDEN
       %! NOTE
     %@% ^ \baca-duration-multiplier-markup #"1" #"4"
+      %! ANCHOR_NOTE
+      %! SPANNER_STOP
+    \!
 
 }
 

diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
@@ -370,11 +370,12 @@ def fl(m):
         baca.flat_glissando(o, "F#4")
         baca.spanners.hairpin(
             o.tleaves()[:2],
-            "niente o< p",
+            "o< p",
         )
         baca.spanners.hairpin(
             o.tleaves()[-1:],
-            "(p) >o",
+            "(p) >o !",
+            with_next_leaf=True,
         )
     with baca.scope(m.get(89, 92)) as o:
         baca.pitches(o, "F#4 F#3", allow_repeats=True)
@@ -385,12 +386,11 @@ def fl(m):
         )
         baca.spanners.hairpin(
             o.tleaves()[:2],
-            "niente o< p",
+            "o< p",
         )
-        # TODO: change to baca.spanners.hairpin()
-        baca.piecewise.hairpin(
-            [baca.select.rleak(baca.select.tleaves(o))[-2:]],
-            "(p) >o",
+        baca.spanners.hairpin(
+            baca.select.rleak(baca.select.tleaves(o))[-2:],
+            "(p) >o !",
         )
         baca.override.repeat_tie_extra_offset(o, (-1.5, 0))
         baca.breathe(o.pleaf(-1))

diff --git a/faberge/sections/03/music.ily b/faberge/sections/03/music.ily
@@ -2578,11 +2578,6 @@ number.3.Flute.Music = {
 
     % [Flute.Music measure 9]
     g'2.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \!
     - \tweak parent-alignment-X -0.5
     - \tweak staff-padding 3.5
     ^ \markup { \override #'(circle-padding . 0.25) \circle \finger 2 }
@@ -3900,11 +3895,6 @@ number.3.Flute.Music = {
 
     % [Flute.Music measure 53]
     g''2.
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \!
     - \tweak parent-alignment-X -0.5
     - \tweak staff-padding 3.5
     ^ \markup { \override #'(circle-padding . 0.25) \circle \finger 1 }
@@ -5580,10 +5570,7 @@ number.3.EnglishHorn.Music = {
     r8
 
     d'8
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
     \revert DynamicLineSpanner.staff-padding
     \revert NoteHead.style
@@ -5791,11 +5778,6 @@ number.3.Clarinet.Music = {
       %! REAPPLIED_STAFF_LINES
     \startStaff
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \!
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“BassClarinet”)"
       %! EXPLICIT_DYNAMIC
@@ -5861,10 +5843,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 4]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -5922,10 +5901,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 7]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -5989,10 +5965,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 12]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6050,10 +6023,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 15]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6108,10 +6078,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 17]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6175,10 +6142,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 22]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6242,10 +6206,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 27]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6303,10 +6264,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 30]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6364,10 +6322,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 33]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6431,10 +6386,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 38]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6492,10 +6444,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 41]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6550,10 +6499,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 43]
     f4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6617,10 +6563,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 48]
     fqs!4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6684,10 +6627,7 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 53]
     e4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
@@ -6851,11 +6791,6 @@ number.3.Clarinet.Music = {
 
     % [Clarinet.Music measure 69]
     d4
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
-    \!
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
     - \tweak circled-tip ##t
@@ -9904,10 +9839,7 @@ number.3.Violin.Music = {
     f'16
 
     f'16
-      %! EXPLICIT_DYNAMIC_COLOR
-      %! EXPLICIT_DYNAMIC
-    - \tweak color #blue
-      %! EXPLICIT_DYNAMIC
+      %! SPANNER_STOP
     \!
     ]
 
@@ -11538,10 +11470,7 @@ number.3.Viola.Music = {
         f'8
 
         f'8
-          %! EXPLICIT_DYNAMIC_COLOR
-          %! EXPLICIT_DYNAMIC
-        - \tweak color #blue
-          %! EXPLICIT_DYNAMIC
+          %! SPANNER_STOP
         \!
         ]