X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fvocal-ensemble-template.ly;h=e0d4639be0b856433f6cff4936fed0f1548ce509;hb=db22ad98af264b424e36b161c23fed43111b5c8a;hp=a7834cb5d3a324c4bca9696fd09f961c6cc0a523;hpb=6019a1e8f0301c1c3bf86ccc92178d820f9c3784;p=lilypond.git

diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index a7834cb5d3..e0d4639be0 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,50 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.13.29"
+\version "2.18.0"
 
 \header {
-  lsrtags = "vocal-music, template"
-
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
-  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 @qq{Himno}, las cuatro
-voces se reagrupan en sólo dos pentagramas.
-
-"
-  doctitlees = "Plantilla de conjunto vocal"
-
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
-  texidocja = "
-これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
-もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
-便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
-歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  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: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
-  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 = "really-simple, template, vocal-music"
 
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
@@ -57,6 +20,13 @@ 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 +62,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 +76,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 +91,10 @@ 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)
-    }
-  }
 }
-