rename

diff --git a/book.ly b/book.ly
index 5dd8c769c0ec7e353d1d25dbdfa0dc7dff5cbd6b..157a5f50daa1f20b3f1331ba7e9e87af81133cbe 100644 (file)
--- 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 f2de4b9740cadade9eed7c52a0868b5ba5868393..4941042b060b9e16730448e7fc15c9d0b00990f7 100644 (file)
--- 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 3827f1e7b8e1e030e8e70911d4f263e241edb29c..d4a5373e19a72b7bb78ceb4f313a965112a48223 100644 (file)
--- 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 |
+       }
+      >>
+    }
   }
 >>