From e3b3ba96fbbfbbefc0a74432bc20b7643944ef7c Mon Sep 17 00:00:00 2001
From: tucker <tucker@newer.systems>
Date: Thu, 10 Aug 2023 11:17:38 -0400
Subject: [PATCH] rename

---
 book.ly                 |  2 +-
 manuscripts/clarinet.ly | 13 +++++++---
 manuscripts/piano.ly    | 55 ++++++++++++++++++++++++++++++++---------
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/book.ly b/book.ly
index 5dd8c76..157a5f5 100644
--- a/book.ly
+++ b/book.ly
@@ -29,7 +29,7 @@
 	\Score
 	\override RehearsalMark.break-visibility = #begin-of-line-invisible
 	\override BarNumber.font-size = #1
-	\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/1)
+	\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
       }
     }
   }
diff --git a/manuscripts/clarinet.ly b/manuscripts/clarinet.ly
index f2de4b9..4941042 100644
--- a/manuscripts/clarinet.ly
+++ b/manuscripts/clarinet.ly
@@ -8,9 +8,16 @@
 \relative {
   \numericTimeSignature
   \clef treble
-  \time 4/2
-  f'2--\p  f-- f-- f--  |
+  \time 2/2
+  f'2--\p  f-- |
+  f-- f--  |
   \time 3/2
-  r2 e4( fis a,~ 16 d,8.~ |
+  r2 \tuplet 3/2 { e4^( fis a,~ } 4  d,4~ |
   d1 cis'4) r4 |
+  \time 3/4
+  r4 r4 r4 |
+  \time 5/8
+  r4 r4 r8 |
+  \time 2/2
+  R1 |
 }
diff --git a/manuscripts/piano.ly b/manuscripts/piano.ly
index 3827f1e..d4a5373 100644
--- a/manuscripts/piano.ly
+++ b/manuscripts/piano.ly
@@ -12,11 +12,17 @@
     \accidentalStyle piano
     <<
       \relative { \numericTimeSignature
-      \time 4/2
-      <c c'>2\pp <ees c'> <ees g> <d g>
+      \time 2/2
+      R1 | R1
       \time 3/2
-      <des g>1~ 4 r8. g16 |
-      <g c>2 <f c'>4.. ges16 <f c'>2 |
+      R1*3/2 |
+      R1*3/2 |
+      \time 3/4
+      R1*3/4 |
+      \time 5/8
+      R1*5/8 |
+      \time 2/2
+      R1*2/2 |
 
 
       }
@@ -27,13 +33,38 @@
     \clef bass
     \set Staff.pedalSustainStyle = #'mixed
     \accidentalStyle piano
-    <<
-      \relative { \numericTimeSignature
-      \time 4/2
-      aes,,2 aes bes bes |
-      ces1~ 4 r4 |
-      aes'2 aes bes |
-      }
-    >>
+    \override Score.SpacingSpanner.strict-grace-spacing = ##t
+    \relative { \numericTimeSignature
+      <<
+	\relative {
+	  \voiceOne
+	  \time 2/2
+	  <c c'>2^\pp <ees c'> | <ees g> <d g> |
+	  \time 3/2
+	  <des g>1~ 4 \afterGrace r4 { g8 } |
+	  <g c>2 \afterGrace <f c'> { ges8 } <f c'>2 |
+	  \time 3/4
+	  \afterGrace 15/16 <ees c'>2. { d8 } |
+	  \time 5/8
+	  <d b'>2 <e cis'>8
+	  \time 2/2
+	  <ees g c>2 <d b'>2 |
+	}
+	\new Voice \relative { \numericTimeSignature
+	  \voiceTwo
+	  \time 2/2
+	  aes,,2 aes | bes bes |
+	  \time 3/2
+	  ces1~ 4 r4 |
+	  aes'2 aes bes |
+	  \time 3/4
+	  bes,2. |
+	  \time 5/8
+	  fis'2 a8
+	  \time 2/2
+	  bes2 s2 |
+	}
+      >>
+    }
   }
 >>
-- 
2.39.5