Merge master into nested-bookparts

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

diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly
index 12d7fa86bad600691336f22013e94cccadd507ab..0cadb4dc320ca16065f6c3222c748900bde6b7d5 100644 (file)
--- a/input/manual/editorial-headword.ly
+++ b/input/manual/editorial-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.7 Editorial annotations
 
@@ -7,15 +20,6 @@
 % Piano sonata 18, Movt II, Scherzo
 % Measures 9 - 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 { }
 
 \new PianoStaff <<
@@ -55,18 +59,7 @@
       d'8-2 \staccato
       |
       c'4-3
-      r8
-      r16.
-      c'32-3 \pp
-      |
-      c'8-2
-      r16.
-      c'32
-      c'8
-      r16.
-      c'32
-      |
-      c'8
+      r4
    }
    
    % LH Staff
@@ -102,18 +95,7 @@
       d8-2 \staccato
       |
       c4-3
-      r8
-      r16.
-      c32-3
-      |
-      c8-2
-      r16.
-      c32
-      c8
-      r16.
-      c32
-      |
-      c8
+      r4
    }
 
 >>