From a7bee572771a3e51671b55a71506f532ad0c0a6b Mon Sep 17 00:00:00 2001
From: Tucker Johnson <tucker@newer.systems>
Date: Sat, 28 Oct 2023 10:24:51 -0400
Subject: [PATCH] work

---
 book.ly                     |   2 +-
 manuscripts/III-clarinet.ly |  59 +++++++++++++++++---
 manuscripts/III-piano.ly    | 104 ++++++++++++++++++++++++++++++++----
 3 files changed, 148 insertions(+), 17 deletions(-)

diff --git a/book.ly b/book.ly
index 4f1492d..16bb86e 100644
--- a/book.ly
+++ b/book.ly
@@ -46,7 +46,7 @@
         \include "manuscripts/III-clarinet.ly"
         \include "manuscripts/III-piano.ly"
       >>
-      %\midi { }
+      \midi { }
       \layout {
         \context {
           \Score
diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index 1c1ba82..269a6f6 100644
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -20,22 +20,69 @@
   \time 3/4 c8) r8 r4 r8 dis8~ |
   \time 7/8 4. b4( e |
   \time 3/4 cis'2) r8 g8( |
-  \time 7/8 a4. ges,2) |
-  \time 4/4 r8 f4.~ 8 ges8( aes'4~ |
-  aes8) r8 c,4~-> c8 b8~-> \tuplet 3/2 { 8 d8( g8 } |
+  \time 7/8 a4. ges,2) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel." }
+  \time 4/4 r8\startTextSpan f4.~ 8 ges8( aes'4~ |
+  aes8) r8 c,4~-> c8 b8~-> \tuplet 3/2 { 8 d8_( g8\stopTextSpan } | \tempo "Piu Mosso" 4=65
   fis'2~ 8) r8 r8 des8( |
   ees,1 |
   aes2.) r16 f'8.~( |
   1 |
   bes,1) |
   r2 a'2~( |
-  a4 e,2.) |
-  \time 3/4 gis,4.( fis'8 cis'4) |
+  a4 e,2.) | \override TextSpanner.bound-details.left.text = \markup { \upright "Rit." }
+  \time 3/4 gis,4.(\startTextSpan fis'8 cis'4)\stopTextSpan | \tempo "A tempo" 4=50
   r8 f,,4( ees8 bes'4~ |
   8) a4( d8 g,[ c8~] |
   8) r8 r8 b8( e,4~ |
   \time 4/4 e4) fis4.( cis'8~ 8.[ ees16] |
   bes2) aes4( f4~ |
   2) r4 d'4~ |
-  4 e,8[( g] a[ b] c4) |
+  4 e,8[( g] a[ b] c4~ |
+  \tempo \markup {
+    \concat {
+      \rhythm { \tuplet 3/2 { 8 } }
+      " = "
+      \rhythm { { 8 } }
+    }
+  } 4 = 75
+  \time 7/4 1) r2. |
+  R1*7/4 |
+  R1*7/4 |
+  R1*7/4 |
+  \time 4/4 r2 r4 \tuplet 5/4 { r8. ees''16( aes,) } |
+  f'2.~ 8 r8 |
+  bes,1 |
+  R1 |
+  fis'2.~ 8 r8 |
+  R1 |
+  cis2. r4 |
+  b8( e,~ 2 g4~ |
+  4) \tuplet 3/2 { c4( a d~ } 4) |
+  fis,2~ 8 f( bes,4~ |
+  8)[ c8]( a' d,~ 2) |
+  g8( ees~ 2) e4~ |
+  e4. cis'8( gis8 b8~ 4) |
+  fis16(\startTextSpan a d,8~ 4) f( dis8.) e,16(\stopTextSpan | \tempo 4=50
+  cis'1) |
+  \tempo \markup {
+    \concat {
+      \rhythm { \tuplet 3/2 { 8 } }
+      " = "
+      \rhythm { { 8 } }
+    }
+  } 4 = 75
+  aes4( bes2.~ |
+  bes2~) 8 r8 r4 |
+  \time 3/4 r4 r4 r8 c8~ |
+  \time 4/4 c2. g4( |
+  \time 3/4 b2.~ |
+  \time 4/4 8) r8 r4 r2\startTextSpan | \tempo 4=50
+  r8\stopTextSpan f,8~( 2. |
+  cis'2. ees4~ |
+  8) r8 r4 r2 |
+  R1 |
+  \time 3/4 r4 bes2( |
+  fis4 gis2) |
+  R1*3/4
+
 }
diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly
index 864576e..3c8979b 100644
--- a/manuscripts/III-piano.ly
+++ b/manuscripts/III-piano.ly
@@ -25,24 +25,63 @@
         \time 3/4 r8 f8~ <f bes,>4~ 8 dis8( |
         \time 7/8 gis4.) b,4(~ <b e>4) |
         \time 3/4 cis'4.( d,8~ 8)[ g]( |
-        \time 7/8 a4. ges,8~ <ges c>~ 4) |
-        \time 4/4 r8 f8( fis cis') r8 (bes aes' ees~ |
-        2) r4 \tuplet 3/2 { r8 a,( e') } |
+        \time 7/8 a4. ges,8~ <ges c>~ 4) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel." }
+        \time 4/4 r8\startTextSpan f8( fis cis') r8 (bes aes' ees~ |
+        2) r4 \tuplet 3/2 { r8 a,( e')\stopTextSpan } \bar "||" \tempo "Piu Mosso" 4=65
         r2 \tuplet 3/2 { r8 c'4~-> } 8 \clef bass e,,8 |
         <d g>1~\arpeggio |
         1 |
         R1 |
         r2 ees2~ |
         4 \clef treble <fis cis' gis'>2.~\arpeggio |
-        1 |
-        \time 3/4 r4 a'2 |
+        1 |\override TextSpanner.bound-details.left.text = \markup { \upright "Rit." }
+        \time 3/4 r4 a'2 \bar "||" \tempo "A tempo" 4=50
         R1*3/4 |
         R1*3/4 |
         R1*3/4 |
         \time 4/4 R1 |
         R1 |
         ees1 |
-        des1 |
+        des1 \bar "||"
+        \time 7/4 r2. \tuplet 3/2 { r4 f'8~( } \tuplet 3/2 { 4 bes,8 } \tuplet 3/2 { ees4) aes,4( des4 } |
+        fis,1~ 4) \tuplet 3/2 { r8 fis4->(~ } 4 |
+        b1) r4 \tuplet 3/2 { r4 e4( d } |
+        c2~ \tuplet 3/2 { 4 a8 } g2.) g4->( |
+        \time 4/4 \tuplet 3/2 { f8 bes4~ } 16) a( cis d e8) fis16( g \tuplet 5/4 { b8) c16( ees aes,) } |
+        f'2.~ 8 r8 |
+        ais,2. <g, g'>8 <d' d'> |
+        <a' a'>4. <cis, cis'>8 <gis' gis'>4 <dis dis'>8 <e e'> |
+        <fis fis'>2. b8( c,~ |
+        4) f2~ 8 aes( |
+        <ges des'>2. <ees bes'>4) |
+        r8 \clef bass <des,, aes'>8~\arpeggio 2. |
+        r8 <bes f'>8~\arpeggio 2. |
+        r2 r8 \clef treble \ottava #1 <ees''' aes>4.~( |
+        4 <cis e b'>2.) |
+        r8 <bes ges'>8~ 2 \ottava #0 r8 <d,, a>8~ |
+        1 |
+        \stemUp \D <bes, g'>4. \U \stemNeutral des''16(\startTextSpan c \tuplet 3/2 { aes'4) bes,8( } g8) b8\stopTextSpan | \tempo 4 = 50
+        r2 \tuplet 3/2 { dis8 fis, dis' } \tuplet 3/2 { fis, dis' fis, } |
+        \tempo \markup {
+          \concat {
+            \rhythm { \tuplet 3/2 { 8 } }
+            " = "
+            \rhythm { { 8 } }
+          }
+        } 4 = 75
+        dis'8 fis, dis' fis, dis' fis, dis' fis, |
+        f' a, f' a, f' a, f' a, |
+        \time 3/4 d a d a d a |
+        d a d a d a d a |
+        \time 3/4 d e, d' e, d' e, |
+        d' e, d' e, d' e, d \clef bass e, | \tempo 4 = 50
+        r8 f8~ 2 8 aes8( |
+        <fis cis'>2.) <bes ees>4~ |
+        8 b8( e,2.) |
+        r4 <g d'>4( <a c>2) |
+        \time 3/4 r4 <f bes>4. cis'8 |
+        <fis, gis~>4 <gis dis'>2 |
+        r4 r8 a8( <b e,>4) |
       }
     >>
   }
@@ -70,7 +109,7 @@
         \time 7/8 bes8~([ <bes ees>~ <bes ees f'>~] 2) |
         \time 4/4 \tuplet 3/2 { d,8 <b' g'>4~ } \tuplet 3/2 { 8 4 } \tuplet 3/2 { c,8 <a' e'>4~ } \tuplet 3/2 { 8 4 } |
         \tuplet 3/2 { des,8 <aes' f'>4~ } \tuplet 3/2 { 8 4 } \tuplet 3/2 { ees8 <bes' ges'>4~ } \tuplet 3/2 { 8 4 } |
-        b,2~->^\mf \tuplet 3/2 { 8 a'4~-> } 8 r8 |
+        \tempo "Piu Mosso" 4=65 b,2~->^\mf \tuplet 3/2 { 8 a'4~-> } 8 r8 |
         <bes, f'>1~\arpeggio |
         1 |
         r2 <c g'>2~\arpeggio |
@@ -82,9 +121,54 @@
         ees,8~( <ees bes'>~ <ees bes' f'>2) |
         gis8( fis'~ <fis cis'>2) |
         \time 4/4 a,8~( <a d>~ <a d b'>2.) |
-        g8~( <g e'>4.~ 8) c'4. |
-        \U \tuplet 3/2 { ees8( \D bes ges } \tuplet 3/2 { bes ges bes } \tuplet 3/2 { ges bes ges } \tuplet 3/2 { bes ges bes) }
-        \U \tuplet 3/2 { des8( \D aes f } \tuplet 3/2 { aes f aes } \tuplet 3/2 { f aes f } \tuplet 3/2 { aes f aes) }
+        g8~( <g e'>4.~ 8) c'4.\pp |
+        \U \tuplet 3/2 { ees8( \D bes\< ges } \tuplet 3/2 { bes ges bes } \tuplet 3/2 { ges\p\> bes ges } \tuplet 3/2 { bes ges bes)\pp } |
+        \U \tuplet 3/2 { des8( \D aes\< f } \tuplet 3/2 { aes f aes } \tuplet 3/2 { f aes f } \tuplet 3/2 { aes f aes)\mp } |
+        <<
+          \relative {
+            \voiceOne
+            \time 7/4 a8[(\f c, a' c, a' c, a' c,] a'[ c, a' c, a' c,]) |
+            g'8[( b, g' b, g' b, g' b,] g'[ b, g' b, g' b,]) |
+            ges'8[( aes, ges' aes, ges' aes, ges' aes,] ges'[ aes, ges' aes, ges' aes,]) |
+            f'8[( bes, f' bes, f' bes, f' bes,] f'[ bes, f']) r8 r4 |
+          }
+          \new Voice \relative {
+            \voiceTwo
+            \time 7/4 e,2.~ 8 8->~ 2. |
+            d2.-> d1~-> |
+            d8 ees8->~ 2.~ 4 2-> |
+            des2.->~ 8 8->~ 2. |
+          }
+        >>
+        \oneVoice
+        \time 4/4 \tuplet 3/2 { b,,8( fis'4~ } 16) g( aes ees' c8) bes16( d \tuplet 5/4 { f8) e16( a cis,) } |
+        gis'2.~ 8 r8 |
+        \tuplet 5/4 { dis8~ <dis fis,>~ <dis fis, b,>4.~ } 2 |
+        <c, e'>2\arpeggio \tuplet 3/2 { d8~ <d bes'>~ <d bes' f'>~ } 4 |
+        <d a'>2.~ 8 des8~ |
+        4 <c g' d'>2.\arpeggio |
+        <a e' b'>1\arpeggio |
+        fis1 |
+        ees1 |
+        g2~ 8 r8 r4 |
+        R1 |
+        R1 |
+        \tuplet 3/2 { c'4~ <c f,,>8~ } 2. |
+        \stemDown ees,,4. \stemNeutral b'''16( gis \tuplet 3/2 { e8) a,( d } fis,16) c'( f, des) |
+        a'4~ <a e'>~ <a e' b'>2~ |
+        4 d4.~ <d g,>4. |
+        c,1 |
+        \time 3/4 ees4.~ <ees bes'>~ |
+        \time 4/4 <ees bes' f'>1 |
+        \time 3/4 fis4.~ <fis cis'>~ |
+        \time 4/4 <fis cis' gis'>1 |
+        c'8~ <c g'>~ <c g' d'>2. |
+        a8~ <a e'>~ <a e' b'>2. |
+        fis4 cis'8~ <cis gis'>8~ 2 |
+        ees,8~ <ees bes'>4~ <ees bes' f'>8~ 2 |
+        \time 3/4 c'8~ <c g'>4~ <c g' d'~>8 d'4 |
+        a,8~ <a e'>~ <a e' b'>2 |
+        fis8~ <fis cis'>~ <fis cis' gis'>2 |
       }
     }
 >>
-- 
2.39.5