Merge master into nested-bookparts

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

diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
index 362962445b0919d597050e1ba98e5d45cbd59158..f1de7cc2eef6d8510c98374f0ccb92f18b83ad40 100644 (file)
--- a/input/manual/staff-headword.ly
+++ b/input/manual/staff-headword.ly
@@ -1,5 +1,18 @@
-\version "2.11.34"
+\version "2.11.61"
 \include "english.ly"
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+ 
+\layout {
+  \context { \Score
+    \override PaperColumn #'keep-inside-line = ##t
+    \override NonMusicalPaperColumn #'keep-inside-line = ##t
+  }
+}
 
 % NR 1.6 Staff notation
 
@@ -7,17 +20,6 @@
 % Piano sonata 29 - Für das Hammer-Klavier
 % Movt IV
 
-#(set-global-staff-size 14)
-
-\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
@@ -168,7 +170,7 @@
       R1 * 3/4
 
       \bar "||"
-      \key d \major
+      %\key d \major
    }
 
    % LH
@@ -241,7 +243,7 @@
       R1 * 3/4
 
       \bar "||"
-      \key d \major
+      %\key d \major
    }
 
 >>