From 745636f83daa08b35b814d80e8923d881691edf9 Mon Sep 17 00:00:00 2001
From: Tucker Johnson <tucker@newer.systems>
Date: Fri, 7 Mar 2025 19:03:09 -0500
Subject: [PATCH] m. 25

---
 general/scripts.ly      |  5 ++++-
 manuscripts/violinI.ly  | 19 ++++++++++++++-----
 manuscripts/violinII.ly | 13 ++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/general/scripts.ly b/general/scripts.ly
index d38f152..f50dc5a 100644
--- a/general/scripts.ly
+++ b/general/scripts.ly
@@ -12,7 +12,8 @@ timeSpanner =
         \override TextSpanner.bound-details.left.text = \markup { \bold \roman $left }
         \override TextSpanner.bound-details.left-broken.text = ##f
         \override TextSpanner.bound-details.right-broken.text = ##f
-        }
+        \override TextSpanner.bound-details.right.padding = #-1
+      }
     #})
 
 markSpanner =
@@ -31,6 +32,7 @@ markSpanner =
           \markup { \general-align #Y #0 { \arrow-head #X #RIGHT ##f $right } }
         \override TextSpanner.bound-details.left-broken.text = ##f
         \override TextSpanner.bound-details.right-broken.text = ##f
+        \override TextSpanner.bound-details.right.padding = #1
       }
     #})
 
@@ -46,6 +48,7 @@ stringNumberSpanner =
         \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) }
         \override TextSpanner.bound-details.right-broken.text = ##f
         \override TextSpanner.avoid-slur = #'ignore
+        \override TextSpanner.bound-details.right.padding = #-2
       }
     #})
 
diff --git a/manuscripts/violinI.ly b/manuscripts/violinI.ly
index f854183..6cfc4ab 100644
--- a/manuscripts/violinI.ly
+++ b/manuscripts/violinI.ly
@@ -51,12 +51,21 @@
   <bes g'>2~\<\tasto \tuplet 3/2 { 8 des4\glissando } <c e>4~\mp | %014
   \time 5/4 8 r8 d4(\glissando\ord a2) \tuplet 3/2 { r8 fis'8\< ees'8 } | %015
   \time 4/4 d4.\mf gis,,8 b4\glissando f'4 | %016
-  \tuplet 3/2 { \stringNumberSpanner "II" c'4\startTextSpan a4 a4\stopTextSpan } r8 <b, fis'\harmonic>8~ <b fis'\harmonic>4 | %017
-  \time 7/8 R1*7/8 | %018
-  \time 4/4 \tuplet 3/2 { r4 <fis' cis'\harmonic>2~ } <fis cis'\harmonic>4 \stringNumberSpanner "III" g4\startTextSpan | %019
-  bes4 e,2\stopTextSpan <a\3 f'^\2>4 | %020
+  <<
+    {
+      \tuplet 3/2 { \stringNumberSpanner "II" c'4\>\startTextSpan a4 a4\p\stopTextSpan } r8 <b, fis'\harmonic>8~->\sfz\> \after 8 \! <b fis'\harmonic>4 | %017
+      \time 7/8 R1*7/8 | %018
+    }
+    \new Voice {
+      \timeSpanner "rit." s4\startTextSpan s4 s4 s8 s8\stopTextSpan
+      \timeSpanner "accel." s4\startTextSpan s4 s8 s8 s8\stopTextSpan
+    }
+  >>
+  \tempo "a tempo"
+  \time 4/4 \tuplet 3/2 { r4 <fis' cis'\harmonic>2~->\sfz\> } <fis cis'\harmonic>4\! \stringNumberSpanner "III" g4\(\startTextSpan | %019
+  bes4 e,2\<\stopTextSpan <a\3 f'^\2>4 | %020
   \markSpanner "" "sul tasto" ees4.\glissando\startTextSpan c'8 d2\2 | %021
-  \time 3/4 bes2\3\stopTextSpan r4\shortfermata | %022
+  \time 3/4 bes2\3\)\f\stopTextSpan r4\shortfermata | %022
 
   \sectionLabel \markup { \huge \box \bold \sans 23 }
   \time 2/4 \tuplet 3/2 { r8 aes8 g8 } f8 \stringNumberSpanner "II" cis'8\startTextSpan | %023
diff --git a/manuscripts/violinII.ly b/manuscripts/violinII.ly
index bb2b903..4f727cc 100644
--- a/manuscripts/violinII.ly
+++ b/manuscripts/violinII.ly
@@ -30,12 +30,15 @@
   r8 dis8~\tasto dis2 r8 fis'8\2\mp\ord | %014
   \time 5/4 <gis, b,>2~ \tuplet 3/2 { 4 f8~ } f2 | %015
   \time 4/4 r4 g4\mf\> <e g>4 cis4\p | %016
-  \tuplet 3/2 { r4 bes'4 <bes g,>4 } <des\3 \tweak style #'harmonic-mixed g,^\4>4 <e, g,>4 | %017
-  \time 7/8 <d b'>8.[ f16] aes8[ c a] ees4 | %018
-  \time 4/4 bes'4~ \tuplet 3/2 { bes4 aes,8 } d8 f8~ \tuplet 3/2 { f4 ges8 } | %019
-  \tuplet 3/2 { ees8 c4 } a4 g'2~ | %020
+  \tuplet 3/2 { r4 bes'4\< <bes g,>4 } <des\3 \tweak style #'harmonic-mixed g,^\4>4 <e, g,>4 | %017
+  \time 7/8 <d^\4 b'\3>8.[\mf \stringNumberSpanner "IV" f16]\startTextSpan aes8[\stopTextSpan
+  \stringNumberSpanner "III" c8\startTextSpan a]\> ees4 | %018
+  \time 4/4 bes'4~\mp \tuplet 3/2 { bes4\stopTextSpan \stringNumberSpanner "IV" aes,8\<\startTextSpan } d8 f8~\f
+  \tuplet 3/2 { f4 ges8 } | %019
+  \tuplet 3/2 { ees8 c4\glissando } a4\stopTextSpan g'2~\mp\< | %020
   g2 fis2 | %021
-  \time 3/4 cis'4.\glissando e,8 b'4~\shortfermata
+  \time 3/4 \stringNumberSpanner "III" cis'4.\glissando\startTextSpan e,8\f\stopTextSpan b'4~\2\mp\shortfermata
+
   \time 2/4 b4~ b8 r8 | %022
   \time 6/8 <a fis'>4. <ees c'>4. | %023
   \time 4/4 r8 <ges ees'>8~ 4 <c aes'>4 <a c>4 | %024
-- 
2.39.5