11-12-rests

diff --git a/manuscripts/11i.ly b/manuscripts/11i.ly
index dc88cc60e890048468d89331436b14a7c01e1554..b27e0759dc4d511cef2373af65f4874ded083f7f 100644 (file)
--- a/manuscripts/11i.ly
+++ b/manuscripts/11i.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
@@ -16,9 +16,9 @@
 \time 3/4 fis4~ fis8) e'8~(->^\mf e4 |
 fis,2.~ |
 \time 2/4 fis2~ |
-\time 4/4 fis8) r8 r2. |
+\time 4/4 fis8) r8 r4 r2 |
 \time 3/4 a,2.( |
-d8)^\markup { \tiny \parenthesize \dynamic p } r8 r2 |
+d8)^\markup { \tiny \parenthesize \dynamic p } r8 r4 r4 |
 \time 4/4 s1 |
 \time 2/4 cis8--^\markup { \tiny \parenthesize \dynamic mf } r8 r4 |
 \time 3/4 s2. |
@@ -43,36 +43,36 @@ e2.~ |
 \override DynamicLineSpanner.staff-padding = \phds
 \time 3/4 g'2.(\mp |
 \time 2/4 c4 f,4~ |
-\time 3/4 f8)_\markup { \tiny \parenthesize \dynamic mp } s8 s2 |
+\time 3/4 f8)_\markup { \tiny \parenthesize \dynamic mp } r8 r4 r4 |
 \time 4/4 s1 |
-\time 3/4 a4~( a8 d8)_\markup { \tiny \parenthesize \dynamic p } s4 |
+\time 3/4 a4~( a8 d8)_\markup { \tiny \parenthesize \dynamic p } r4 |
 b2.~\mf\> |
 \time 2/4 b2~ |
-\time 4/4 b8\p s8 s2. |
+\time 4/4 b8\p r8 r4 r2 |
 \time 3/4 e,2. |
 g4~(\mf g8 c,8~ c4 |
 \time 4/4 f1~ |
-\time 2/4 f8) s8 s4 |
+\time 2/4 f8) r8 r4 |
 \time 3/4 c4~\< c8 f8~ f4~ |
 \time 4/4 f1\mp |
 \time 1/4 g4~\p |
 \time 4/4 g1~ |
-\time 6/4 g4 s4 s2\mf s2 |
+\time 6/4 g4 r4 r4\mf r2. |
 \time 1/4 e4~\< |
-\time 4/4 e2~\f e8 s8 s4 |
+\time 4/4 e2~\f e8 r8 r4 |
 \time 1/4 s4\< |
 \time 3/4 b'2.\mf |
 d4~(\p\< d8 a8~ a4 |
 \time 4/4 c1~ |
-\time 2/4 c8)\mp\> s8 s4 |
+\time 2/4 c8)\mp\> r8 r4 |
 \time 4/4 s1 |
-\time 3/4 g8\pp s8 s2 |
+\time 3/4 g8\pp r8 r4 r4 |
 \time 2/4 e2~\f\> |
 \time 3/4 e2.\mp |
 }
 >>
 }
-\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
@@ -86,23 +86,23 @@ s2. |
 \time 2/4 bes2 |
 \time 4/4 \tuplet 3/2 { c2( g2 f2~ } |
 \time 3/4 f2.~ |
-f8) s8 s2 |
+f8) r8 r4 r4 |
 \time 4/4 ees1( |
-\time 2/4 aes8) s8 s4 |
+\time 2/4 aes8) r8 r4 |
 \time 3/4 s2. |
 \time 4/4 ees1~ |
-\time 1/4 ees8 s8 |
+\time 1/4 ees8 r8 |
 \time 4/4 s1 |
 \time 6/4 d4 r4 c2( g'2~ |
 \time 1/4 g4~ |
-\time 4/4 g2~ g8) s8 s4 |
+\time 4/4 g2~ g8) r8 r4 |
 \time 1/4 \tuplet 3/2 { bes8( ees,8 f8~ } |
 \time 3/4 f2.~ |
-f8) s8 s2 |
+f8) r8 r4 r4 |
 \time 4/4 g1 |
 \time 2/4 ees2( |
 \time 4/4 c1 |
-\time 3/4 d8) s8 s2 |
+\time 3/4 d8) r8 r4 r4 |
 \time 2/4 s2 |
 \time 3/4 ees2.\fermata |
 }
@@ -110,30 +110,30 @@ f8) s8 s2 |
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 3/4 s2._\markup { \lower #4 \tiny { "[parenthesized, courtesy dynamics apply to nearest pitches]" } } |
 \time 2/4 bes,2~ |
-\time 3/4 bes8 s8 s2 |
+\time 3/4 bes8 r8 r4 r4 |
 \time 4/4 b1~ |
 \time 3/4 b2 r4 |
 cis2.( |
 \time 2/4 gis4 dis4~ |
-\time 4/4 dis8) s8 s2. |
+\time 4/4 dis8) r8 r4 r2 |
 \time 3/4 b'2.~ |
-b8 s8 s2 |
+b8 r8 r4 r4 |
 \time 4/4 bes1 |
 \time 2/4 ges2\pp |
 \time 3/4 bes2. |
 \time 4/4 des,1~ |
 \time 1/4 des8 s8 |
 \time 4/4 b'2(\pp fis2~ |
-\time 6/4 fis4) s4 s2 s2 |
+\time 6/4 fis4) r4 r4 r2. |
 \time 1/4 s4 |
-\time 4/4 cis'2~ cis8 s8 s4 |
+\time 4/4 cis'2~ cis8 r8 r4 |
 \time 1/4 s4 |
 \time 3/4 ges2.~ |
-ges8 s8 s2 |
+ges8 r8 r4 r4 |
 \time 4/4 f1( |
-\time 2/4 bes8) s8 s4 |
+\time 2/4 bes8) r8 r4 |
 \time 4/4 f2( bes2~ |
-\time 3/4 bes8) s8 s2 |
+\time 3/4 bes8) r8 r4 r4 |
 \time 2/4 b2( |
 \time 3/4 gis2.)
 \once \override Staff.BarLine.stencil =

diff --git a/manuscripts/12i.ly b/manuscripts/12i.ly
index 0eb089b18cf954de474df050164f3ba8cbcc9b50..af4c955888a4922b1bb25b54887cc0ee680f9ee2 100644 (file)
--- a/manuscripts/12i.ly
+++ b/manuscripts/12i.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 { \tmarktfourb \numericTimeSignature \override Hairpin.to-barline = ##f
@@ -13,28 +13,28 @@
 \time 3/4 bes''2.->( |
 g8)->^\markup { \tiny \parenthesize \dynamic ff } r8 r8 aes8~(^\markup { \tiny \parenthesize \dynamic p } aes4 |
 \time 4/4 des,1~ |
-\time 5/4 des2.) s2 |
+\time 5/4 des2.) r2 |
 \time 3/4 s2. |
 f2.~ |
-\time 1/4 f8 s8 |
+\time 1/4 f8 r8 |
 \time 4/4 c2( f2) |
 aes1(^\pp |
 \time 2/4 ges2~ |
-ges4~ ges8) s8 |
+ges4~ ges8) r8 |
 \time 3/4 cis4~( cis8 fis,8~ fis4~ |
 fis2.~ |
-\time 4/4 fis8) s8 s2. |
+\time 4/4 fis8) r8 r4 r2 |
 \time 2/4 ees2 |
 \time 4/4 f1(^\pp |
 \time 3/4 bes,2.~ |
-\time 4/4 bes2~ bes8) s8 s4 |
+\time 4/4 bes2~ bes8) r8 r4 |
 \time 1/4 aes4( |
 \time 4/4 des1) |
 \time 3/4 c4~( c8 fis8~ fis4~ |
 \time 1/4 fis4~ |
-\time 4/4 fis8) s8 s2. |
+\time 4/4 fis8) r8 r4 r2 |
 bes1~ |
-\time 3/4 bes2 s4 |
+\time 3/4 bes2 r4 |
 dis,2.( |
 \time 2/4 cis2)\fermata |
 }
@@ -50,9 +50,9 @@ c2.(\p
 aes2.) |
 \time 1/4 e4~(\mf\< |
 \time 4/4 e1 |
-a8)--\ff s8 s2. |
+a8)--\ff r8 r4 r2 |
 \time 2/4 cis2~_\markup { \lower #4 \tiny \parenthesize \dynamic pp } |
-cis4~ cis8\mf\< s8 |
+cis4~ cis8\mf\< r8 |
 \time 3/4 b2.( |
 e,2.) |
 \time 4/4 gis1~(\f |
@@ -62,45 +62,45 @@ e,2.) |
 \time 4/4 e2) dis2~\p |
 \time 1/4 dis4~\< |
 \time 4/4 dis1~ |
-\time 3/4 dis8\mp s8 s2 |
+\time 3/4 dis8\mp r8 r4 r4 |
 \time 1/4 b'8(\< e,8) |
 \time 4/4 dis2(\mf gis2~ |
 gis1~ |
-\time 3/4 gis2) s4 |
+\time 3/4 gis2) r4 |
 fis2.( |
 \time 2/4 gis2) |
 }
 >>
 }
-\new Staff = "di6" { \clef bass
+\new Staff = "di6" \with { \consists "Merge_rests_engraver" } { \clef bass
 \accidentalStyle piano
 <<
 \relative { \tmarktfourb \numericTimeSignature \override Hairpin.to-barline = ##f
 \override DynamicLineSpanner.staff-padding = \phds
 \time 2/4 g,2( |
 \time 3/4 c2.~-> |
-c8) s8 s2 |
+c8) r8 r4 r4 |
 \time 4/4 e1~ |
-\time 5/4 e2. s2 |
+\time 5/4 e2. r2 |
 \time 3/4 c2.( |
 ges'2.) |
 \time 1/4 b4( |
 \time 4/4 d,1~ |
-d8) s8 s2. |
+d8) r8  r4 r2 |
 \time 2/4 e2( |
 b4) g'4~-> |
 \time 3/4 g2.~ |
 g2. |
 \time 4/4 c1( |
 \time 2/4 g2~ |
-\time 4/4 g8) s8 s2. |
+\time 4/4 g8) r8 r4 r2 |
 \time 3/4 g2.( |
-\time 4/4 d'2~ d8) s8 s4 |
+\time 4/4 d'2~ d8) r8 r4 |
 \time 1/4 b8( fis8~ |
 \time 4/4 fis1) |
 \time 3/4 d2.~ |
 \time 1/4 d4~ |
-\time 4/4 d8 s8 s2. |
+\time 4/4 d8 r8 r4 r2 |
 g1(^\< |
 \time 3/4 d4~ d8) b'8~(^\f b4 |
 e,2.~ |
@@ -110,30 +110,30 @@ e,2.~ |
 \relative { \tmarktfourb \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 2/4 d,4(_\markup { \lower #4 \tiny { "[parenthesized, courtesy dynamics apply to nearest pitches]" } } ees~ |
 \time 3/4 ees2.~ |
-ees8) s8 s2 |
+ees8) r8 r4 r4 |
 \time 4/4 s1 |
-\time 5/4 d2~( d8 a'8)--_\markup { \tiny \parenthesize \dynamic p } s2 |
+\time 5/4 d2~( d8 a'8)--_\markup { \tiny \parenthesize \dynamic p } r2 |
 \time 3/4 bes,2.( |
 ees2.) |
 \time 1/4 g4~ |
 \time 4/4 g1 |
 bes,1~(\pp |
 \time 2/4 bes2 |
-ees4~ ees8) s8 |
+ees4~ ees8) r8 |
 \time 3/4 s2. |
 d4~( d8 a'8~ a4) |
 \time 4/4 bes,1( |
 \time 2/4 f'2~ |
-\time 4/4 f8) s8 s2. |
+\time 4/4 f8) r8 r4 r2 |
 \time 3/4 c'2.~ |
-\time 4/4 c2~ c8 s8 s4 |
+\time 4/4 c2~ c8 r8 r4 |
 \time 1/4 s4 |
 \time 4/4 f,2( bes,2~ |
-\time 3/4 bes8) s8 s2 |
+\time 3/4 bes8) r8 r4 r4 |
 \time 1/4 a4( |
-\time 4/4 g'8) s8 s2. |
+\time 4/4 g'8) r8 r4 r2 |
 c1( |
-\time 3/4 f,2) s4 |
+\time 3/4 f,2) r4 |
 s2. |
 \time 2/4 a2
 \once \override Staff.BarLine.stencil =