Merge branch '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 3279c7ee3a4bbac85ecc6587974d8e8848d64d83..f7d73eec09b0fbc5cc7252b3938045e8f4519615 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
 
@@ -29,35 +42,24 @@
       |
       \set doubleSlurs = ##f
       bf'8.. (
-      af'32-1
-      g'8-2 ) \staccato
-      f'8-3 \staccato
+      af'32
+      g'8 ) \staccato
+      f'8 \staccato
       |
       e'4-2
       r8
       \once \override Script #'script-priority = #-100
       \afterGrace
-         f'8 ( \trill ^ \markup { \finger "3-5-3-5" }
-         { e'16-2 [ f'16-3 ] }
+         f'8 ( \trill ^ \markup { \finger "3-2" }
+         { e'16 [ f'16 ] }
       |
-      g'8..-5
+      g'8..-3
       f'32
-      e'8-3 ) \staccato
+      e'8-1 ) \staccato
       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
+      c'4
+      r4
    }
    
    % LH Staff
@@ -81,30 +83,19 @@
       g8-1 ) \staccato
       f8 \staccato
       |
-      e4-3
+      e4
       r8
       \afterGrace
          f8 ( \trill _ \markup { \finger "2-1" }
-         { e16-3 [ f16 ] }
+         { e16 [ f16 ] }
       |
       g8..-1
       f32
-      e8-3 ) \staccato
-      d8-2 \staccato
-      |
-      c4-3
-      r8
-      r16.
-      c32-3
-      |
-      c8-2
-      r16.
-      c32
-      c8
-      r16.
-      c32
+      e8 ) \staccato
+      d8 \staccato
       |
-      c8
+      c4
+      r4
    }
 
 >>