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 7602d9d3469505457fa84a7664c051e63f042695..e5e3637ebf9ecd9e64b17fbc2a4e1ed3c25fb4bd 100644 (file)
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,49 +1,76 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.1"
+% 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: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% 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
 todas las partes.  Por ejemplo, el compás y la armadura casi siempre
-son los mismos para todas. Como en la plantilla \"Himno\", las cuatro
+son los mismos para todas. Como en la plantilla @qq{Himno}, las cuatro
 voces se reagrupan en sólo dos pentagramas.
 
 "
   doctitlees = "Plantilla de conjunto vocal"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
-  texidocde = "
-Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren 
-Stücken ist es oft sinnvoll, eine allgemeine Variable zu bestimmen, 
-die in allen Stimmen eingefügt wird. Taktart und Vorzeichen etwa 
-sind fast immer gleich in allen Stimmen.
-"
-
-  doctitlede = "Vorlage für Vokalensemble"
 
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+%% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
   texidocja = "
 これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
 もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
 便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
 歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
 
+%% 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,
+die in allen Stimmen eingefügt wird. Taktart und Vorzeichen etwa
+sind fast immer gleich in allen Stimmen.
+"
+
+  doctitlede = "Vorlage für Vokalensemble"
+
+
+%% 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
+de recourrir à une section spécifique incluse dans chacune des parties,
+tout particulièrement pour gérer la métrique et la tonalité qui,
+la plupart du temps, sont communes à tous les pupitres.  Comme il est
+d'usage pour les hymnes, les quatre voix sont réparties sur deux
+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 \"Hymn\" template, the four voices are
+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
@@ -79,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 >>
@@ -90,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
@@ -102,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
-  >>  
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
+    \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
+  >>
 }