From 1024a780d22263428c8e7bf9a5a5f6c65991612a Mon Sep 17 00:00:00 2001
From: tucker <tucker@newer.systems>
Date: Tue, 30 Jan 2024 15:28:42 -0500
Subject: [PATCH] edits

---
 manuscripts/2i.ly      | 40 ++++++++++++++++++-------------
 manuscripts/8i.ly      | 54 +++++++++++++++++++++---------------------
 variables/variables.ly | 45 ++++++++++++-----------------------
 3 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/manuscripts/2i.ly b/manuscripts/2i.ly
index 64d7c65..6d752f3 100644
--- a/manuscripts/2i.ly
+++ b/manuscripts/2i.ly
@@ -40,28 +40,34 @@ d[ c) \change Staff = "di2" bes,( a) \change Staff = "ui2" g'( f) \change Staff
 \accidentalStyle piano
 <<
 \relative { \tmarktthree \set tieWaitForNote = ##t
-\override DynamicLineSpanner.staff-padding = #7
-\time 7/8 s8\fff\> s8 s8 s8 s8 s8 s8 |
-s8 s8 s8 s8 s8\mf s8 s8 |
-s8 s8 s8 s8\< s8 s8 s8 |
-s8 s8 s8\ff\> s8 s8 s8 s8 |
+\override DynamicLineSpanner.staff-padding = #1
+\time 7/8 s8^\fff^\> s8 s8 s8 s8 s8 s8 |
+s8 s8 s8 s8 s8^\mf s8 s8 |
+s8 s8 s8 s8^\< s8 s8 s8 |
+s8 s8 s8 s8^\ff^\> s8 s8 s8 |
 s8 s8 s8 s8 s8 s8 s8 |
-s8\mp s8 s8 s8 s8 s8 s8\< |
-s8 s8 s8 s8 s8 s8\f\> s8 |
+s8 s8^\mp s8
+\override DynamicLineSpanner.staff-padding = #4
+s8 s8 s8 s8^\< |
+s8 s8 s8 s8 s8^\f^\> s8 s8 |
 s8 s8 s8 s8 s8 s8 s8 |
-s8 s8 s8 s8\p s8 s8 s8 |
+s8 s8 s8 s8^\p s8 s8 s8 |
+\override DynamicLineSpanner.staff-padding = #5
 s8 s8 s8\< s8 s8 s8 s8 |
 s8 s8\mf\> s8 s8\change Staff = "ui2" s8^"poco rit." \change Staff = "di2" s8 s8 |
 s8 s8 s8 s8 s8 s8 s8\pp |
-s8\fff\> s8 s8 s8 s8 s8 s8 |
-s8 s8 s8 s8 s8\mf s8 s8 |
-s8 s8 s8 s8\< s8 s8 s8 |
-s8 s8 s8\ff\> s8 s8 s8 s8 |
-s8 s8 s8 s8 s8 s8 s8 |
-s8\mp s8 s8 s8 s8 s8 s8\< |
-s8 s8 s8 s8 s8 s8\f\> s8 |
-s8 s8 s8 s8 s8 s8 s8 |
-s8 s8 s8 s8\p s8 s8 s8 |
+\override DynamicLineSpanner.staff-padding = #0
+s8^\fff^\> s8 s8 s8 s8 s8 s8 |
+s8 s8 s8 s8 s8^\mf s8 s8 |
+\override DynamicLineSpanner.staff-padding = #3
+s8 s8 s8 s8^\< s8 s8 s8 |
+s8 s8 s8 s8^\ff^\> s8 s8 s8 |
+s8 s8 s8 s8 s8 s8 s8^\mp |
+s8 s8 s8 s8 s8 s8 s8\< |
+s8 s8 s8 s8 s8  s8\f s8 |
+s8^\> s8 s8 s8 s8 s8 s8 |
+s8 s8 s8 s8^\p s8 s8 s8 |
+\override DynamicLineSpanner.staff-padding = #5
 s8 s8 s8\< s8 s8 s8 s8 |
 s8 s8\mf\> s8 s8 s8 s8 s8 |
 s8 s8 s8 s8 s8 s8 s8\pp
diff --git a/manuscripts/8i.ly b/manuscripts/8i.ly
index 0710679..dfd9ce9 100644
--- a/manuscripts/8i.ly
+++ b/manuscripts/8i.ly
@@ -9,30 +9,30 @@
 <<
 \relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=154
 \override DynamicLineSpanner.staff-padding = \phds
-\time 7/8 \stemUp r4\p r4 r4 f''8^.^>^\ffsempre |
+\time 7/8 \stemUp r4\p r4 r8 r8 f''8^.^>^\ffsempre |
 r4 r4 r8 c8^.^> r8 |
-a'8^.^> s8 s4 s4. |
-s8 s8 s8 d,^.^> s4. |
-s2 r8 e8^.^> r8 |
+a'8^.^> r8 r4 r4. |
+r4 r8 d,^.^> r4. |
+r4 r4 r8 e8^.^> r8 |
 r8 g^.^> r4 r4. |
 r4 r4 r8 cis^.^> r8 |
-r8 bes8^.^> s4 s4. |
+r8 bes8^.^> r4 r4. |
 aes8^.^> r8 r4 r4. |
-r4 r4 r4 ees8^.^> |
-r8 fis8^.^> r8^"poco rit." s4. r8 |
-b8^.^> r8 r8 s8 s4. |
+r4 r4 r8 r8 ees8^.^> |
+r8 fis8^.^> r4^"poco rit." r4. |
+b8^.^> r8 r4 r8 r8 r8\fermata |
 \bar "||"
 \tempo "Poco meno mosso" 4=144
-f8^.^> s8 s4 s4. |
-s4 s4 s4 c8(^> |
+f8^.^> r8 r4 r4. |
+r4 r4 r4 c8(^> |
 a'8^>^.) r8 r4 r4. |
 r4 r4 r4 d,8^.^> |
 e8^.^> r8 r4 r4. |
-r8 g^.^> r4 s4. |
+r8 g^.^> r4 r4. |
 r4 r4 r8 cis^.^> r8 |
-r8 bes8^.^> s4 s4. |
-gis8^.^> s8 r4 r8 s4 |
-r4 s4 s8 r8 ees8^.^> |
+r8 bes8^.^> r4 r4. |
+gis8^.^> s8 r4 r4. |
+r4 r4 r8 r8 ees8^.^> |
 \tempo "Meno mosso" 4=72
 ges^.^> r8 r4 r4. |
 r4 r4 r4 ces8^.^> |
@@ -48,25 +48,25 @@ r4 r4 r4 ces8^.^> |
 \time 7/8 \stemUp a4^( e8[ g8)] s4. |
 r8 aes4( ges4. f8)-. |
 s8 s8_\< s4 s4. |
-s4 s8_\f s8 \stemDown \change Staff = "u" c'4. |
-dis2^( \change Staff = "d" gis,4 fis8) |
+s4 s8_\f s8 c'4. |
+dis2^( gis,4 fis8) |
 g4( e8[) f-.] s4. |
 \stemUp s4 s4 s4 cis,8_. |
-\change Staff = "u" \stemDown c''4(\mf d2 a8) |
-\change Staff = "d" \stemUp r4 fis4( e8-.) s4 |
+\stemDown c''4(\mf d2 a8) |
+\stemUp r4 fis4( e8-.) s4 |
 f8[_.^\> c,_. aes''_. d,,_. g'_. bes,_.] r8 |
-\stemDown b'8-.^\p \change Staff = "u" \stemUp s8 s8 c4_( d8) s8 |
+\stemDown b'8-.^\p \stemUp s8 s8 c4_( d8) s8 |
 s8 s8 s8 des8_( bes4 ees8)\fermata |
-\change Staff = "d" s8 \stemDown a,,[^.^\ff c'^. e,,^. b''^. g,^. \change Staff = "u" d'']^. |
-des[^. \change Staff = "d" aes,^. \change Staff = "u" ees''^. \change Staff = "d" ges,,^. bes'^. f,]^. s8 |
+s8 \stemDown a,,[^.^\ff c'^. e,,^. b''^. g,^. d'']^. |
+des[^. aes,^. ees''^. ges,,^. bes'^. f,]^. s8 |
 s8 r8^\mp \stemUp e'4( gis fis8) |
 r8 g4( f8-.) s4. |
 s8 s8^\pp s4 s4. |
 s8 r8 a8([\mf c] d4.) |
 b8([ ais]~ ais2 cis8-. ) |
 s4 s4 s4. |
-s4 s4  s8 \change Staff = "u" cis4-- |
-s4 c8_( d4 \change Staff = "d" bes4) |
+s4 s4  s8 cis4-- |
+s4 c8_( d4 bes4) |
 s4 e,8-. s8 s4. |
 r8^\> f4( ges aes)\p |
 \bar "|."
@@ -76,8 +76,8 @@ r8^\> f4( ges aes)\p |
 \override DynamicLineSpanner.staff-padding = \phds
 \time 7/8 \stemDown r8 c,4._( d8[ b'8]) r8 |
 des,4( ees4 bes8) s4 |
-r8 \stemNeutral e8[_. \change Staff = "u" cis''^. \change Staff = "d" gis,_. \change Staff = "u" d''^. \change Staff = "d" fis,,_. \change Staff = "u" b'^.] |
-ees8[^. \change Staff = "d" g,,-. \change Staff = "u" bes'^.] \change Staff = "d" \stemDown r4 a,8([ f]) |
+r8 \stemNeutral e8[^. cis''^. gis,^. d''^. fis,,^. b'^.] |
+ees8[^. g,,^. bes'^.] \stemDown r4 a,8([ f]) |
 r8_\> ais8[_( b cis,]) s4. |
 s4 s8 s8_\pp bes'8[^. c,^. d^.] |
 fis'8^.[ b,^. dis'^. ais,^. gis']^. r8 s8 |
@@ -93,8 +93,8 @@ ees,4( bes' c,8)[-. a''^.] r8 |
 r8 dis,,8[^. cis''^. gis,^. ais'^. fis,^. b'^.] |
 g,8^. s8 s4 r8 f8[( e)] |
 s4 fis8([ gis] dis4.) |
-\stemNeutral c8_. r8 d8[_.^\p \change Staff = "u" f''^. g^. e^. \change Staff = "d" a,,]_. |
-\change Staff = "u" r8 dis'8[^. \change Staff = "d" fis,,_.  b']-. \stemDown e,,4(\< a8) |
+\stemNeutral c8_. r8 d8[^.^\p f''^. g^. e^. a,,]^. |
+r8 dis'8[^. fis,,^.  b']-. \stemDown e,,4(\< a8) |
 f8( aes4. g4.)\mf |
 r8 b4^\f c,8[^. g''^. d,^. a'']^. |
 des,,4( bes' ees,4.)
diff --git a/variables/variables.ly b/variables/variables.ly
index 456edb4..30ab0e5 100644
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -53,181 +53,166 @@ D = \change Staff = "d"
 %barline notations
 
 one-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Aug 14, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1660518082293 } }
   }
 }
 
 two-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Aug 29, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1661781408932 } }
   }
 }
 
 three-barlineMarkup = \markup {
-  \with-dimensions #'(+7.7 . +7.7) #'(0 . 0)
+  \with-dimensions #'(+8.7 . +8.7) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Sep 07, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1662603692350 } }
   }
 }
 
 four-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Sep 20, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1663722072473 } }
   }
 }
 
 five-barlineMarkup = \markup {
-  \with-dimensions #'(+7.7 . +7.7) #'(0 . 0)
+  \with-dimensions #'(+8.7 . +8.7) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Lansing, MI (Apr 18, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1681821703025 } }
   }
 }
 
 six-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Oct 20, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1666354838403 } }
   }
 }
 
 seven-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Jan 12, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1673533434392 } }
   }
 }
 
 eight-barlineMarkup = \markup {
-  \with-dimensions #'(+7.7 . +7.7) #'(0 . 0)
+  \with-dimensions #'(+8.7 . +8.7) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Lansing, MI (Jan 06, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1673052692437 } }
   }
 }
 
 nine-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Jan 10, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1673401987439 } }
   }
 }
 
 ten-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Apr 15, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1681537384482 } }
   }
 }
 
 eleven-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Oct 29, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1667099098403 } }
   }
 }
 
 twelve-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Oct 30, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1667143160032 } }
   }
 }
 
 thirteen-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Apr 05, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1680723242730 } }
   }
 }
 
 fourteen-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Apr 27, 2023) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1682571212379 } }
   }
 }
 
 fifteen-barlineMarkup = \markup {
-  \with-dimensions #'(+8 . +8) #'(0 . 0)
+  \with-dimensions #'(+9 . +9) #'(0 . 0)
   \whiteout
   \pad-around #0.1
   \rotate #90 \teeny \fontsize #-3
   \column {
     \line { "                       " \italic { Rochester, NY (Aug 18, 2022) } }
     \vspace #-0.4
-    \line { "                       " \fontsize #-3 \typewriter { 1660852714574 } }
   }
 }
-- 
2.39.5