Merge branch 'master' into dev/texi2html

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

diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index e1826feb1e1f248475a7addb53617cd85ce773eb..12fbd98c86a674210b6d56bfa940b42120b4d7ed 100644 (file)
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -1,6 +1,12 @@
-\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.5 Simultaneous notes
 
 % L. v. Beethoven, Op. 111
@@ -8,17 +14,6 @@
 % Movt II - Arietta - Adagio molto semplice e cantabile
 % measures 108 - 118
 
-#(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
@@ -109,6 +104,7 @@
          \key ef \major
          c'''8. [
          cs'''8. \f ] \stopTrillSpan 
+         r8.
          
       }
 
@@ -292,6 +288,7 @@
       \key ef \major
       r8.
       r8.
+      r8.
          
    }