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

[lilypond.git] / Documentation / snippets / putting-lyrics-inside-the-staff.ly

diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
index 71ee760f0821159aaa126ab4aeb69bc551d01fbd..d1676ce31811aab466d03d14a213434304bcbca1 100644 (file)
--- a/Documentation/snippets/putting-lyrics-inside-the-staff.ly
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -1,30 +1,19 @@
 %% 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 {
-%% Translation of GIT committish: 28097cf54698db364afeb75658e4c8e0e0ccd716
-  texidocfr = "
-Des paroles peuvent venir s'inscrire dans la portée même.  Ces paroles
-sont décalées par la dérogation @code{\\override LyricText
-#'extra-offset = #'(0 . dimension)} ; des commandes similaires
-s'occuperont des extenseurs et des tirets.  Le décalage optimal ne peut
-s'obtenir qu'en procédant à tâtons.
-
-"
-  doctitlefr = "Impression des paroles dans la portée"
-
   lsrtags = "staff-notation, text, vocal-music"
 
   texidoc = "
 Lyrics can be moved vertically to place them inside the staff.  The
-lyrics are moved with @code{\\override LyricText #'extra-offset = #'(0
-. dy)} and there are similar commands to move the extenders and
-hyphens.  The offset needed is established with trial and error.
+lyrics are moved with @code{\\override LyricText.extra-offset = #'(0 .
+dy)} and there are similar commands to move the extenders and hyphens.
+The offset needed is established with trial and error.
 
 "
   doctitle = "Putting lyrics inside the staff"
@@ -35,9 +24,8 @@ hyphens.  The offset needed is established with trial and error.
     \new Voice = "voc" \relative c' { \stemDown a bes c8 b c4 }
   >>
   \new Lyrics \with {
-    \override LyricText #'extra-offset = #'(0 . 8.6)
-    \override LyricExtender #'extra-offset = #'(0 . 8.6)
-    \override LyricHyphen #'extra-offset = #'(0 . 8.6)
+    \override LyricText.extra-offset = #'(0 . 8.6)
+    \override LyricExtender.extra-offset = #'(0 . 8.6)
+    \override LyricHyphen.extra-offset = #'(0 . 8.6)
   } \lyricsto "voc" { La la -- la __ _ la }
 >>
-