Merge branch 'staging' of ssh://git.sv.gnu.org/srv/git/lilypond into staging

[lilypond.git] / Documentation / snippets / vertically-aligning-ossias-and-lyrics.ly

diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
index 20fe06fb027dae9fe5d5fedf392825f501b9c63e..4a85d9d6a4d45f32980e47f88c0b0aa8dab0c6a9 100644 (file)
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -4,40 +4,11 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.2"
+\version "2.17.11"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides, vocal-music"
 
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-Este fragmento de código muestra el uso de las propiedades de
-contexto @code{alignBelowContext} y @code{alignAboveContext} para
-controlar la posición de la letra y los compases de ossia.
-
-"
-  doctitlees = "Alineación vertical de la letra y los compases de ossia"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-Dieser Schnipsel zeigt, wie man die Kontexteigenschaften
-@code{alignBelowContext} und @code{alignAboveContext} benutzen kann, um
-die Positionierung von Gesangstext und Ossia-Abschnitten zu kontrollieren.
-
-"
-  doctitlede = "Gesangstext und Ossia vertikal ausrichten"
-
-%% Translation of GIT committish: 4ab2514496ac3d88a9f3121a76f890c97cedcf4e
-  texidocfr = "
-Cet exemple illustre la manière de positionner une portée d'ossia et
-des paroles à l'aide des propriétés de contexte @code{alignBelowContext}
-et @code{alignAboveContext}.
-
-"
-  doctitlefr = "Positionnement d'une ossia et des paroles"
-
-
   texidoc = "
 This snippet demonstrates the use of the context properties
 @code{alignBelowContext} and @code{alignAboveContext} to control the
@@ -65,15 +36,14 @@ positioning of lyrics and ossias.
       \new Staff \with {
         alignAboveContext = #"3"
         fontSize = #-2
-        \override StaffSymbol #'staff-space = #(magstep -2)
+        \override StaffSymbol.staff-space = #(magstep -2)
         \remove "Time_signature_engraver"
       } {
-        \times 4/6 {
-          \override TextScript #'padding = #3
+        \tuplet 6/4 {
+          \override TextScript.padding = #3
           c8[^"ossia above" d e d e f]
         }
       }
     >>
   }
 >>
-