X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fvocal-ensemble-template.ly;h=4498fd3b40db6dc76c8a100c34ed3c1b1af28c76;hb=ff9ca62acddb818b7788d7818a5c7eb0ddb6cdcb;hp=d27ccc8c75c6487b3a712237a6ff60b9e8ec9a9d;hpb=bfc88203ac2572737480e78ef2635ed35b458441;p=lilypond.git

diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index d27ccc8c75..4498fd3b40 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,54 +1,14 @@
-% Do not edit this file; it is automatically
-% generated from Documentation\snippets\new
-% This file is in the public domain.
-%% Note: this file works from version 2.13.31
-\version "2.13.31"
+%% 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.18.0"
 
 \header {
-%% 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.
+  lsrtags = "really-simple, template, vocal-music"
 
-"
-  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 = "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.
@@ -60,34 +20,40 @@ 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
-} % begin verbatim
-
+}
 
-sopMusic = \relative c'' {
-  c4 c c8[( b)] c4
+sopMusic = \relative {
+  c''4 c c8[( b)] c4
 }
 sopWords = \lyricmode {
   hi hi hi hi
 }
 
-altoMusic = \relative c' {
-  e4 f d e
+altoMusic = \relative {
+  e'4 f d e
 }
 altoWords = \lyricmode {
   ha ha ha ha
 }
 
-tenorMusic = \relative c' {
+tenorMusic = \relative {
   g4 a f g
 }
 tenorWords = \lyricmode {
   hu hu hu hu
 }
 
-bassMusic = \relative c {
+bassMusic = \relative {
   c4 c g c
 }
 bassWords = \lyricmode {
@@ -96,7 +62,10 @@ bassWords = \lyricmode {
 
 \score {
   \new ChoirStaff <<
-    \new Lyrics = "sopranos"
+    \new Lyrics = "sopranos" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup.staff-affinity = #DOWN
+    }
     \new Staff = "women" <<
       \new Voice = "sopranos" {
         \voiceOne
@@ -108,7 +77,10 @@ bassWords = \lyricmode {
       }
     >>
     \new Lyrics = "altos"
-    \new Lyrics = "tenors"
+    \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" {
@@ -126,4 +98,3 @@ bassWords = \lyricmode {
     \context Lyrics = "basses" \lyricsto "basses" \bassWords
   >>
 }
-