From 96e41a712f2ede3ca7416b98a1f67699b0dde2a5 Mon Sep 17 00:00:00 2001
From: Tucker Johnson <tucker@newer.systems>
Date: Tue, 3 Oct 2023 13:26:19 -0400
Subject: [PATCH] engrave

---
 manuscripts/III-clarinet.ly | 17 +++++++++++++++++
 manuscripts/III-piano.ly    | 35 +++++++++++++++++++++++++++++------
 variables/variables.ly      |  3 ---
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index 5d3adbc..1c1ba82 100644
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -21,4 +21,21 @@
   \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 } |
+  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) |
+  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) |
 }
diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly
index f202be1..864576e 100644
--- a/manuscripts/III-piano.ly
+++ b/manuscripts/III-piano.ly
@@ -21,17 +21,28 @@
         r4 <f bes>2~ 4. cis'8( |
         \time 4/4 <fis, gis~>4 <gis dis'>2.) |
         \time 3/4 r4 a8( <e b'>~ 4) |
-        \clef treble
-        \time 4/4 d'4( <c g'>2.) |
+        \clef treble \time 4/4 d'4( <c g'>2.) |
         \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'~ cis bes aes' ees~ |
-        2 r4 \tuplet 3/2 { r8 a, e'} |
+        \time 4/4 r8 f8( fis cis') r8 (bes aes' ees~ |
+        2) r4 \tuplet 3/2 { r8 a,( e') } |
         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 |
+        R1*3/4 |
+        R1*3/4 |
+        R1*3/4 |
+        \time 4/4 R1 |
+        R1 |
+        ees1 |
+        des1 |
       }
     >>
   }
@@ -57,11 +68,23 @@
         \time 7/8 a8~([ <a cis>~ <a cis~ fis~>] <cis fis>2) |
         \time 3/4 b8~( <b gis'>~ <b gis' e'>2) |
         \time 7/8 bes8~([ <bes ees>~ <bes ees f'>~] 2) |
-        \time 4/4 \tuplet 3/2 { d,8( <b' g'>4~ } 4) \tuplet 3/2 { c,8( <a' e'>4~ } 4) |
-        \tuplet 3/2 { des,8( <aes' f'>4~ } 4) \tuplet 3/2 { ees8( <bes' ges'>4~ } 4) |
+        \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 |
         <bes, f'>1~\arpeggio |
         1 |
+        r2 <c g'>2~\arpeggio |
+        1~ |
+        4 d,2.~ |
+        4~ <d b''>2.
+        \time 3/4 b'8~( <b e'>8~ 2) |
+        c'8~( <c g'>~ <c g' d'>2) |
+        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) }
       }
     }
 >>
diff --git a/variables/variables.ly b/variables/variables.ly
index 43126a5..9451115 100644
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -40,9 +40,6 @@ ppsempre =
 #:transparent "f" #:normal-text #:italic "sempre" ) )
 
 
-utwo = \change Staff = "ui2"
-dtwo = \change Staff = "di2"
-
 U = \change Staff = "u"
 D = \change Staff = "d"
 
-- 
2.39.5