Merge branch 'master' into dev/texi2html

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

diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 625816d55281c2436e58a7a41592dffdc3facd6d..60ca5b98bc1d19695a80e07c56746d77d2f7b4cd 100644 (file)
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -1,23 +1,18 @@
-\version "2.11.34"
+\version "2.11.51"
 \include "english.ly"
-
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
 % NR 1.3 Expressive marks
 
 % L. v. Beethoven, Op. 49 no. 1 
 % 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
@@ -157,6 +152,7 @@
       |
 
       <d'' c'' a'>4 \fermata
+      r8 r4 r8
    }
 
    % LH Staff
@@ -262,6 +258,7 @@
       |
 
       <d' fs>4 \fermata
+      r8 r4 r8
    }
 
 >>