Merge branch 'master' into dev/texi2html

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

diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index c29327137d22e21e547cfb9e4780487d7a31ecd4..3f9f3cc67d1b9c55ef99b0ff626e2fe73b26cee0 100644 (file)
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -1,6 +1,12 @@
-\version "2.11.38"
+\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.8 Text
 
 % L. v. Beethoven, Op. 110
@@ -171,9 +177,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
@@ -182,18 +188,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
@@ -205,7 +211,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
@@ -213,7 +219,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