resolve merge

[lilypond.git] / Documentation / snippets / lyrics-old-spacing-settings.ly

diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
new file mode 100644 (file)
index 0000000..d27f8ee
--- /dev/null
+++ b/Documentation/snippets/lyrics-old-spacing-settings.ly
@@ -0,0 +1,129 @@
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
+
+\header {
+%% Translation of GIT committish: 27b1197f3bae8512c14d946752cd3e40e7c76016
+  doctitlede = "Textverteilung wie in Version 2.12 für neuere Versionen"
+
+  texidocde = "
+Die vertikale Maschine für die Platzverteilung wurde für die Version 2.14
+verändert.  Das kann dazu führen, dass Gesangstext unterschiedlich
+verteilt wird.  Es ist möglich, die Eigenschaften der @code{Lyric}-
+und @code{Staff}-Kontexte so einzustellen, dass die Platzverteilung
+wie in der Version 2.12 arbeitet.
+"
+
+
+%% Translation of GIT committish: c1d5bb448321d688185e0c6b798575d4c325ae80
+  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"
+
+  doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
+
+  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.
+"
+} % begin verbatim
+
+
+global = {
+  \key d \major
+  \time 3/4
+}
+
+sopMusic = \relative c' {
+  % VERSE ONE
+  fis4 fis fis | \break
+  fis4. e8 e4
+}
+
+altoMusic = \relative c' {
+  % VERSE ONE
+  d4 d d |
+  d4. b8 b4 |
+}
+
+tenorMusic = \relative c' {
+  a4 a a |
+  b4. g8 g4 |
+}
+
+bassMusic = \relative c {
+  d4 d d |
+  g,4. g8 g4 |
+}
+
+words = \lyricmode {
+  Great is Thy faith- ful- ness,
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Lyrics = sopranos
+    \new Staff = women <<
+      \new Voice = "sopranos" {
+        \voiceOne
+        \global \sopMusic
+      }
+      \new Voice = "altos" {
+        \voiceTwo
+        \global \altoMusic
+      }
+    >>
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors"
+    \new Staff = men <<
+      \clef bass
+      \new Voice = "tenors" {
+        \voiceOne
+        \global \tenorMusic
+      }
+      \new Voice = "basses" {
+        \voiceTwo  \global \bassMusic
+      }
+    >>
+    \new Lyrics = basses
+    \context Lyrics = sopranos \lyricsto sopranos \words
+    \context Lyrics = altos \lyricsto altos \words
+    \context Lyrics = tenors \lyricsto tenors \words
+    \context Lyrics = basses \lyricsto basses \words
+  >>
+  \layout {
+    \context {
+      \Lyrics
+      \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 =
+        #'((basic-distance . 0)
+          (minimum-distance . 2)
+          (padding . 2))
+    }
+  }
+}
+