Merge commit 'origin' into includes

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

diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index baad1dc9645f9437025b5acdbc6258abafea2465..40af604f84e7b4ddcb3f14f504cd140a2fcd7c88 100644 (file)
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -1,22 +1,23 @@
-\version "2.11.34"
+\version "2.12.0"
 \include "english.ly"
+#(set-global-staff-size 15)
+\paper{
+  line-width = 16\cm
+  indent = 0\cm
+}
+ 
+\layout {
+  \context { \Score
+    \override PaperColumn #'keep-inside-line = ##t
+    \override NonMusicalPaperColumn #'keep-inside-line = ##t
+  }
+}
 
 % NR 1.8 Text
 
 % L. v. Beethoven, Op. 110
 % Piano sonata 31
-% measures 1 - 
-
-#(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))
-}
+% measures 1 - 7
 
 \layout {
    \context {
@@ -47,7 +48,7 @@
 
       <df'' g'>4
       <bf' g'>2
-      _ \markup { \italic { "ten." } }
+      _ \markup { \italic { ten. } }
 
       |
 
@@ -64,10 +65,10 @@
 
             \once \override TextScript #'staff-padding = #4
             ef''8. (
-            _ \markup { \italic { "tranqu." } }
+            _ \markup { \italic { tranqu. } }
             d''16 )
             df''8 \trill \fermata
-            _ \markup { \italic { "ten." } }
+            _ \markup { \italic { ten. } }
          }
 
          \new Voice {
@@ -88,7 +89,7 @@
       \oneVoice
       \once \override TextScript #'staff-padding = #4
       df''32 
-      _ \markup { \italic "dolce" }
+      _ \markup { \italic dolce }
       c''32 
       df''32
       ef''32
@@ -154,7 +155,7 @@
             |
 
             bf4
-            bf8 ^ \markup { \italic "ten." }
+            bf8 ^ \markup { \italic ten. }
          }
 
          \new Voice {
@@ -182,9 +183,9 @@
       \override Staff.SustainPedalLineSpanner #'outside-staff-priority = #1000
       \override Staff.SustainPedalLineSpanner #'staff-padding = #7
       \once \override TextScript #'padding = #2
-      af16 \sustainDown
+      af16 \sustainOn
       ^ \markup \italic { non staccato }
-      _ \markup \italic { molto \dynamic p, sempre tranquillo
+      _ \markup \italic { molto \concat {\dynamic {p},} sempre tranquillo
          ed egualmente, non rubato }
       <ef' c'>16
       <ef' c'>16
@@ -193,18 +194,18 @@
       <ef' c'>16
       <ef' c'>16
       <ef' c'>16
-      af16 \sustainDown
+      af16 \sustainOn
       <ef' c'>16
       <ef' c'>16
       <ef' c'>16
 
       |
 
-      bf16 \sustainDown
+      bf16 \sustainOn
       <ef' df'>16
       <ef' df'>16
       <ef' df'>16
-      bf16 \sustainDown
+      bf16 \sustainOn
       <ef' df'>16
       <ef' df'>16
       <ef' df'>16
@@ -216,7 +217,7 @@
       |
 
       \override Staff.SustainPedalLineSpanner #'staff-padding = #4
-      df'16 \sustainDown
+      df'16 \sustainOn
       <bf' g' ef'>16
       <bf' g' ef'>16
       <bf' g' ef'>16
@@ -224,7 +225,7 @@
       <bf' g' ef'>16
       <bf' g' ef'>16
       <bf' g' ef'>16
-      df'16 \sustainDown
+      df'16 \sustainOn
       <bf' g' ef'>16
       <bf' g' ef'>16
       <bf' g' ef'>16