Docs: run convert-ly for 2.14.0.

[lilypond.git] / Documentation / snippets / vocal-ensemble-template.ly

diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index 606821ed8a3bd56446d8adb1d2cf3e5b4a881db0..e5e3637ebf9ecd9e64b17fbc2a4e1ed3c25fb4bd 100644 (file)
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,12 +1,14 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.20"
+% 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.13.47
+\version "2.14.0"
 
 \header {
-  lsrtags = "vocal-music, template"
-
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 59caa3adce63114ca7972d18f95d4aadc528ec3d
   texidoces = "
 He aquí una partitura vocal estándar para cuatro voces SATB. Con
 grupos mayores, suele ser útil incluir una sección que aparezca en
@@ -17,13 +19,15 @@ voces se reagrupan en sólo dos pentagramas.
 "
   doctitlees = "Plantilla de conjunto vocal"
 
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
+
+%% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
   texidocja = "
 これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
 もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
 便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
 歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
+
+%% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
   texidocde = "
 Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren
 Stücken ist es oft sinnvoll, eine allgemeine Variable zu bestimmen,
@@ -33,7 +37,8 @@ sind fast immer gleich in allen Stimmen.
 
   doctitlede = "Vorlage für Vokalensemble"
 
-%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
+
+%% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
   texidocfr = "
 Ce fichier constitue un canevas standard de partition pour chœur à
 quatre voix mixtes.  Lorsque les ensembles s'étoffent, il est judicieux
@@ -46,17 +51,26 @@ portées.
 "
   doctitlefr = "Ensemble vocal (simple)"
 
+  lsrtags = "vocal-music, template"
+
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
 it is often useful to include a section which is included in all parts.
 For example, the time signature and key signature are almost always the
 same for all parts. Like in the @qq{Hymn} template, the four voices are
 regrouped on only two staves.
-
 "
   doctitle = "Vocal ensemble template"
 } % begin verbatim
 
+
+\paper {
+  top-system-spacing #'basic-distance = #10
+  score-system-spacing #'basic-distance = #20
+  system-system-spacing #'basic-distance = #20
+  last-bottom-spacing #'basic-distance = #10
+}
+
 global = {
   \key c \major
   \time 4/4
@@ -92,8 +106,11 @@ bassWords = \lyricmode {
 
 \score {
   \new ChoirStaff <<
-    \new Lyrics = sopranos { s1 }
-    \new Staff = women <<
+    \new Lyrics = "sopranos" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
+    \new Staff = "women" <<
       \new Voice = "sopranos" {
         \voiceOne
         << \global \sopMusic >>
@@ -103,9 +120,12 @@ bassWords = \lyricmode {
         << \global \altoMusic >>
       }
     >>
-    \new Lyrics = "altos" { s1 }
-    \new Lyrics = "tenors" { s1 }
-    \new Staff = men <<
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
+    \new Staff = "men" <<
       \clef bass
       \new Voice = "tenors" {
         \voiceOne
@@ -115,19 +135,11 @@ bassWords = \lyricmode {
         \voiceTwo << \global \bassMusic >>
       }
     >>
-    \new Lyrics = basses { s1 }
-    \context Lyrics = sopranos \lyricsto sopranos \sopWords
-    \context Lyrics = altos \lyricsto altos \altoWords
-    \context Lyrics = tenors \lyricsto tenors \tenorWords
-    \context Lyrics = basses \lyricsto basses \bassWords
+    \new Lyrics = "basses"
+    \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
+    \context Lyrics = "altos" \lyricsto "altos" \altoWords
+    \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
+    \context Lyrics = "basses" \lyricsto "basses" \bassWords
   >>
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
 }