Merge commit 'origin' into includes

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

diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly
index 6e453ffcb44f13aaabc2961730210325b433a2be..8793965d378cbbec8fdd05b354e5b1c4bd2e6c30 100644 (file)
--- a/input/manual/keyboard-headword.ly
+++ b/input/manual/keyboard-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.12.0"
 \include "english.ly"
 
 #(set-global-staff-size 15)
@@ -17,10 +17,6 @@
     \Score
     \remove "Bar_number_engraver"
   }
-  \context {
-    \Staff
-    \remove "Time_signature_engraver"
-  }
 }
 
 fermataLong = \markup {
@@ -28,7 +24,7 @@ fermataLong = \markup {
   \override #'(baseline-skip . 2) {
     \dir-column {
       \musicglyph #"scripts.ufermata"
-      \text \italic \hcenter long
+      \text \italic \center-align long
     }
   }
 }
@@ -138,11 +134,11 @@ fermataLong = \markup {
         s8 \!
         \stemDown
         \once \override Script #'direction = #UP
-        #(set-octavation 1)
+        \ottava #1
         \voiceOne
         \once \override PianoStaff.Arpeggio #'padding = #0.8
         <cs''' as''' cs''''>4. \arpeggio \fermata
-        #(set-octavation 0)
+        \ottava #0
         \bar "|."
       }
     >>