Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / forcing-hyphens-to-be-shown.ly

diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
index f9958cc0753c7e55cda080db5c7980bc0336aa0f..cf44f33171a49e94bbcfd0134c6c79a4ba9b5f25 100644 (file)
--- a/Documentation/snippets/forcing-hyphens-to-be-shown.ly
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -1,36 +1,14 @@
 %% 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: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-LilyPond n'imprimera de tiret entre deux syllabes que s'il juge qu'il y
-a suffisamment d'espace.  Ce comportement peut être modifié grâce à la
-propriété @code{minimum-distance} de @code{LyricHyphen}.
-
-"
-  doctitlefr = "Impression forcée de tirets entre syllabes"
-
   lsrtags = "vocal-music"
 
-
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-
-Si LilyPond no cree que haya sitio suficiente para un guión separador
-de sílabas, lo omitirá.  Se puede sobreescribir este comportamiento
-con la propiedad @code{minimum-distance} de @code{LyricHyphen}.
-
-"
-  doctitlees = "Forzar la visibilidad de los guiones separadores de sílabas"
-
-
-
   texidoc = "
 If LilyPond does not think there is space for a hyphen, it will be
 omitted.  The behaviour can be overridden with the
@@ -40,7 +18,6 @@ omitted.  The behaviour can be overridden with the
   doctitle = "Forcing hyphens to be shown"
 } % begin verbatim
 
-
 \relative c'' {
   c32 c c c
   c32 c c c
@@ -49,10 +26,10 @@ omitted.  The behaviour can be overridden with the
 }
 \addlyrics {
   syl -- lab word word
-  \override LyricHyphen #'minimum-distance = #1.0
+  \override LyricHyphen.minimum-distance = #1.0
   syl -- lab word word
-  \override LyricHyphen #'minimum-distance = #2.0
+  \override LyricHyphen.minimum-distance = #2.0
   syl -- lab word word
-  \revert LyricHyphen #'minimum-distance
+  \revert LyricHyphen.minimum-distance
   syl -- lab word word
 }