Merge branch 'master' into lilypond/translation

[lilypond.git] / input / lsr / vertically-aligning-ossias-and-lyrics.ly

diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly
index db2261c836a1afc4ad5814a62228b135872bef08..384cb442a1e9db29475122a97b40276759420a9d 100644 (file)
--- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly
+++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly
@@ -6,9 +6,9 @@
   lsrtags = "vocal-music, tweaks-and-overrides, spacing"
 
   texidoc = "
-This snippet demonstrates the use of the @code{alignBelowContext} and
-@code{alignAboveContext} properties to control the positioning of
-lyrics and ossias.
+This snippet demonstrates the use of the context properties
+@code{alignBelowContext} and @code{alignAboveContext} to control the
+positioning of lyrics and ossias.
 
 "
   doctitle = "Vertically aligning ossias and lyrics"
@@ -17,22 +17,27 @@ lyrics and ossias.
   ragged-right = ##t
 }
 
-\relative <<
+\relative c' <<
   \new Staff = "1" { c4 c s2 }
   \new Staff = "2" { c4 c s2 }
   \new Staff = "3" { c4 c s2 }
   { \skip 2
     <<
       \lyrics {
-       \set alignBelowContext = #"1"
-       below8 first staff
+        \set alignBelowContext = #"1"
+        lyrics4 below
       }
-      \new Staff {
-       \set Staff.alignAboveContext = #"3"
-       \times 4/6 {
-         \override TextScript #'padding = #3
-         c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
-       }
+      \new Staff \with {
+        alignAboveContext = #"3"
+        fontSize = #-2
+        \override StaffSymbol #'staff-space = #(magstep -2)
+        \remove "Time_signature_engraver"
+      } {
+        \times 4/6 {
+          \override TextScript #'padding = #3
+          c8^"ossia above" d e d e f
+        }
       }
-    >> }
+    >>
+  }
 >>