Merge branch 'master' into lilypond/translation

[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 dd5088bf537fefca1c97ba27793e338ecaf98733..2db3a10684d89820907a7cdabe513254c89233c9 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.39"
+% 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 {
-  lsrtags = "vocal-music, template"
-
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+%% Translation of GIT committish: 615cbf212fdaf0b220b3330da417d0c3602494f2
   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
@@ -25,6 +27,16 @@ voces se reagrupan en sólo dos pentagramas.
 便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
 歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
 
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Ecco una tipica partitura vocale SATB per quattro parti. Se il gruppo è più grande,
+è spesso utile inserire una sezione che venga poi inclusa in tutte le parti.
+Ad esempio, l'indicazione di tempo e l'armatura di chiave sono quasi sempre
+le stesse per tutte le parti. Come nel modello dell'@qq{Inno}, le quattro voci
+sono raggruppate in due righi soltanto.
+"
+  doctitleit = "Modello per gruppo vocale"
+
 %% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
   texidocde = "
 Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren
@@ -49,17 +61,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
@@ -95,7 +116,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
@@ -107,7 +131,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" {