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 4491c56f1b14ef3a96860b60824715dbc2b286a0..bf138f5f07f38896bd8da09b2a8bcb6e9254958d 100644 (file)
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.14.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides, vocal-music"
@@ -18,7 +18,6 @@ positioning of lyrics and ossias.
   doctitle = "Vertically aligning ossias and lyrics"
 } % begin verbatim
 
-
 \paper {
   ragged-right = ##t
 }
@@ -36,11 +35,11 @@ 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]
         }
       }