Merge remote-tracking branch 'origin/master' into translation

[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 343a900c1e89b222b96f01ce1b499dad85dc88d3..bf138f5f07f38896bd8da09b2a8bcb6e9254958d 100644 (file)
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -1,39 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.16"
+\version "2.18.0"
 
 \header {
-  lsrtags = "vocal-music, tweaks-and-overrides, spacing"
-
-%% Translation of GIT committish: 00ef2ac3dd16e21c9ffdffaa4d6d043a3f1a76e6
-  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: d96023d8792c8af202c7cb8508010c0d3648899d
-  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: d78027a94928ddcdd18fd6534cbe6d719f80b6e6
-  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"
-
+  lsrtags = "spacing, tweaks-and-overrides, vocal-music"
 
   texidoc = "
 This snippet demonstrates the use of the context properties
@@ -61,15 +35,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]
         }
       }
     >>
   }
 >>
-