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 e83b1f7753b8d12c139bef662e9f36cd47a48124..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,19 +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 {
   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"
@@ -47,7 +49,7 @@ bassMusic = \relative c {
 }
 
 words = \lyricmode {
-  Great is Thy faith- ful- ness,
+  Great is Thy faith -- ful -- ness,
 }
 
 \score {
@@ -84,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))