Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / obtaining-2.12-lyrics-spacing-in-newer-versions.ly

diff --git a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
index 20bc4871b7ff3a85a6986ef1ad05c798d5366996..de3e108a48ddd409f42afcee13e1ec400e16a6d2 100644 (file)
--- a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
+++ b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
@@ -1,45 +1,21 @@
 %% 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: ea0b270e14781707ab52683acddf9302bbe337f3
-  texidoces = "
-El motor de espaciado vertical cambió en la versión 2.14.  Esto puede
-hacer que se altere el espaciado de la letra de las canciones.  Es
-posible fijar propiedades para los contextos @code{Lyric} y
-@code{Staff} de forma que el motor de espaciado se comporte como lo
-hacía en la versión 2.12.
-
-"
-
-  doctitlees = "Conseguir el espaciado de la letra de la versión 2.12
-  en versiones más recientes"
-
-
-%% Translation of GIT committish: 0f93dd92ffa0319328e58148458d22c5448b3d58
-  texidocfr = "
-La version 2.14 a donné naissance à un nouveau moteur pour l'espacement
-vertical des paroles.  Celles-ci peuvent donc se retrouver positionnées
-différemment.  Le moteur adoptera les usages de la version 2.12 une fois
-que vous aurez réglé certaines propriétés des contextes @code{Lyric} et
-@code{Staff}.
-
-"
-  doctitlefr = "Espacement des paroles selon les pratiques de la version 2.12"
-
-
   lsrtags = "vocal-music"
 
   texidoc = "
-The vertical spacing engine changed for version 2.14.  This can cause
-lyrics to be spaced differently.  It is possible to set properties for
-@code{Lyric} and @code{Staff} contexts to get the spacing engine to
-behave as it did in version 2.12.
+The vertical spacing engine changed since version 2.14.  This can cause
+lyrics to be spaced differently.
+
+It is possible to set properties for @code{Lyric} and @code{Staff}
+contexts to get the spacing engine to behave as it did in version 2.12.
+
 
 "
   doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
@@ -73,7 +49,7 @@ bassMusic = \relative c {
 }
 
 words = \lyricmode {
-  Great is Thy faith- ful- ness,
+  Great is Thy faith -- ful -- ness,
 }
 
 \score {
@@ -110,15 +86,15 @@ words = \lyricmode {
   \layout {
     \context {
       \Lyrics
-      \override VerticalAxisGroup #'staff-affinity = ##f
-      \override VerticalAxisGroup #'staff-staff-spacing =
+      \override VerticalAxisGroup.staff-affinity = ##f
+      \override VerticalAxisGroup.staff-staff-spacing =
         #'((basic-distance . 0)
           (minimum-distance . 2)
           (padding . 2))
     }
     \context {
       \Staff
-      \override VerticalAxisGroup #'staff-staff-spacing =
+      \override VerticalAxisGroup.staff-staff-spacing =
         #'((basic-distance . 0)
           (minimum-distance . 2)
           (padding . 2))