Merge master into nested-bookparts

[lilypond.git] / input / manual / expressive-headword.ly

diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 625816d55281c2436e58a7a41592dffdc3facd6d..1ea60271c07221f971b40738d8cb3d8330f17a66 100644 (file)
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -1,5 +1,10 @@
-\version "2.11.34"
+\version "2.11.61"
 \include "english.ly"
+#(set-global-staff-size 15)
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
+}
 
 % NR 1.3 Expressive marks
 
@@ -7,17 +12,6 @@
 % Piano sonata 19 - "Leichte Sonate"
 % measures 1 - 12
 
-#(set-global-staff-size 16)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 %\layout {
 %   \context {
 %      \Score
@@ -37,8 +31,8 @@
       \once \override TextScript #'staff-padding = #2
       d'8 \staccato
       ^ \markup { \column {
-         "RONDO"
-         \italic "Allegro" } }
+         RONDO
+         \italic Allegro } }
       d'8 \staccato
       g'8 \staccato
       a'8 \staccato
@@ -157,6 +151,7 @@
       |
 
       <d'' c'' a'>4 \fermata
+      r8 r4 r8
    }
 
    % LH Staff
@@ -262,6 +257,7 @@
       |
 
       <d' fs>4 \fermata
+      r8 r4 r8
    }
 
 >>