resti6

diff --git a/manuscripts/11i.ly b/manuscripts/11i.ly
index 1a1e4faceda877e613e6905b78cdc91ae9263de5..dc88cc60e890048468d89331436b14a7c01e1554 100644 (file)
--- a/manuscripts/11i.ly
+++ b/manuscripts/11i.ly
@@ -16,16 +16,16 @@
 \time 3/4 fis4~ fis8) e'8~(->^\mf e4 |
 fis,2.~ |
 \time 2/4 fis2~ |
-\time 4/4 fis8) s8 s2. |
+\time 4/4 fis8) r8 r2. |
 \time 3/4 a,2.( |
-d8)^\markup { \tiny \parenthesize \dynamic p } s8 s2 |
+d8)^\markup { \tiny \parenthesize \dynamic p } r8 r2 |
 \time 4/4 s1 |
-\time 2/4 cis8--^\markup { \tiny \parenthesize \dynamic mf } s8 s4 |
+\time 2/4 cis8--^\markup { \tiny \parenthesize \dynamic mf } r8 r4 |
 \time 3/4 s2. |
 \time 4/4 gis'1 |
 \time 1/4 d8( a8 |
 \time 4/4 e'1~ |
-\time 6/4 e4) s4 s2 s2 |
+\time 6/4 e4) r4 r4 r2. |
 \time 1/4 a,8( b8 |
 \time 4/4 fis'2) gis2~^\pp |
 \time 1/4 gis4 |

diff --git a/manuscripts/6i.ly b/manuscripts/6i.ly
index 5791e4b3a6370503532dd7b5559f75ca7ddc056e..3e77bb1a58b33e341052db2a880b4960df14f68d 100644 (file)
--- a/manuscripts/6i.ly
+++ b/manuscripts/6i.ly
@@ -5,7 +5,7 @@
   <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
-\new Staff = "ui6" {
+\new Staff = "ui6" \with { \consists "Merge_rests_engraver" } {
 \accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
@@ -13,12 +13,12 @@
 \time 4/4 bes''1 |
 \time 5/4 d2~(->^\mf d8 g,8~ g2 |
 \time 2/4 c4 f,4~ |
-\time 5/4 f8) s8 s1 |
+\time 5/4 f8) r8 r4 r2. |
 \time 2/4 s2 |
 \time 4/4 a1~ |
-\time 1/4 a8 s8 |
+\time 1/4 a8 r8 |
 \time 5/4 bes2~-> bes2.~ |
-\time 3/4 bes8^\markup { \tiny \parenthesize \dynamic f } s8 s2 |
+\time 3/4 bes8^\markup { \tiny \parenthesize \dynamic f } r8 r4 r4 |
 \time 2/4 d2 |
 f,2( |
 \time 4/4 e2 a2 |
@@ -30,7 +30,7 @@ f,2( |
 \time 4/4 s1 |
 \time 1/4 s4 |
 \time 2/4 d2~ |
-\time 5/4 d8 s8 s1 |
+\time 5/4 d8 r8 r4 r2. |
 \time 3/4 f2. |
 \time 2/4 a2~^\p |
 \time 4/4 a1 |
@@ -43,52 +43,52 @@ f,2( |
 \override DynamicLineSpanner.staff-padding = \phds
 \time 1/4 gis'4~\p\>|
 \time 4/4 gis1~ |
-\time 5/4 gis8\pp s8 s1 |
+\time 5/4 gis8\pp r8 r4 r2. |
 \time 2/4 s2_\markup { \lower #4.5 \tiny \parenthesize \dynamic mf }|
-\time 5/4 ees8-- s8 s1 |
+\time 5/4 ees8-- r8 r4 r2. |
 \time 2/4 s2 |
 \time 4/4 c'1_\markup { \lower #3 \tiny \parenthesize \dynamic pp } |
 \time 1/4 \tuplet 3/2 { aes8(\f f des'~ } |
 \time 5/4 des2~ des2. |
-\time 3/4 c8--) s8 s2 |
+\time 3/4 c8--) r8 r4 r4 |
 \time 2/4 s2\< |
-aes8-- s8 s4 |
+aes8-- r8 r4 |
 \time 4/4 c1~ |
 \time 5/4 c2~ c2.\mf |
 \time 2/4 des4(\mp aes |
 \time 1/4 bes8 ees,8~ |
-\time 6/4 ees8) s8 s2 s2. |
+\time 6/4 ees8) r8 r4 r4 r2. |
 \time 1/4 f8(\mf c'8 |
-\time 4/4 bes2 ees,8) s8 s4 |
+\time 4/4 bes2 ees,8) r8 r4 |
 \time 1/4 s4\< |
 \time 2/4 g2~\mp |
-\time 5/4 g8 s8 s1 |
+\time 5/4 g8 r8 r4 r2. |
 \time 3/4 s2. |
-\time 2/4 c8--_\markup { \tiny \parenthesize \dynamic ff }  s8 s4 |
+\time 2/4 c8--_\markup { \tiny \parenthesize \dynamic ff }  r8 r4 |
 \time 4/4 s1 |
-\time 2/4 aes8--_\markup { \tiny \parenthesize \dynamic p }  s8 s4 |
+\time 2/4 aes8--_\markup { \tiny \parenthesize \dynamic p }  r8 r4 |
 s2 |
 \time 4/4 g1\p \bar "|."
 }
 >>
 }
-\new Staff = "di6" { \clef bass
+\new Staff = "di6" \with { \consists "Merge_rests_engraver" } { \clef bass
 \accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \override DynamicLineSpanner.staff-padding = \phds
 \time 1/4 e8( cis8 |
 \time 4/4 dis2 fis2~ |
-\time 5/4 fis8) s8 s1|
+\time 5/4 fis8) r8 r4 r2. |
 \time 2/4 s2 |
-\time 5/4 bes8-- s8 s1 |
+\time 5/4 bes8-- r8 r4 r2. |
 \time 2/4 b2~ |
 \time 4/4 b1 |
 \time 1/4 s4 |
 \time 5/4 ees,2~ ees2. |
 \time 3/4 e2.(\p |
 \time 2/4 fis4 b |
-cis8--) s8 s4 |
+cis8--) r8 r4 |
 \time 4/4 s1 |
 \time 5/4 b2~ b2. |
 \time 2/4 s2 |
@@ -100,9 +100,9 @@ cis8--) s8 s4 |
 \time 2/4 b2 |
 \time 5/4 ees,4~(^\mf^\< \tuplet 3/2 { ees4 ges8~ } ges4~ \tuplet 3/2 { ges8 bes4~ } bes4 |
 \time 3/4 aes2.~\ff |
-\time 2/4 aes8) s8 s4 |
+\time 2/4 aes8) r8 r4 |
 \time 4/4 ees1~ |
-\time 2/4 ees8 s8 s4 |
+\time 2/4 ees8 r8 r4 |
 s2 |
 \time 4/4 bes'1\offset Y-offset 1 \fermata \bar "|."
 }
@@ -110,16 +110,16 @@ s2 |
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 1/4 s4_\markup { \lower #4 \tiny { "[parenthesized, courtesy dynamics apply to nearest pitches]" } }  |
 \time 4/4 s1 |
-\time 5/4 b,8-- s8 s1 |
+\time 5/4 b,8-- r8 r4 r2. |
 \time 2/4 a2 |
 \time 5/4 fis2~(\pp fis2. |
 \time 2/4 d4 g4 |
 \time 4/4 e1~ |
-\time 1/4 e8) s8 |
+\time 1/4 e8) r8 |
 \time 5/4 g2~-> g2. |
 \time 3/4 a2.~ |
 \time 2/4 a2~ |
-a8 s8 s4 |
+a8 r8 r4 |
 \time 4/4 s1 |
 \time 5/4 g2~ g2. |
 \time 2/4 s2 |
@@ -133,7 +133,7 @@ a8 s8 s4 |
 \time 3/4 des2. |
 \time 2/4 e,2(\p |
 \time 4/4 b'2 fis2 |
-\time 2/4 cis8--) s8 s4 |
+\time 2/4 cis8--) r8 r4 |
 s2 |
 \time 4/4 d1
 \once \override Staff.BarLine.stencil =