Merge remote-tracking branch 'origin/master' into 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 7c17454df3c0fa6bdaef17b37f58c192bd1dbc6d..e78416a1069e3c03f135afa0893c9e8221668886 100644 (file)
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,66 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.14.2"
+\version "2.18.0"
 
 \header {
-  lsrtags = "template, vocal-music, really-simple"
-
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  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: bfc88203ac2572737480e78ef2635ed35b458441
-  texidocja = "
-これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
-もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
-便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
-歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
-
-%% Translation of GIT committish: c3b519f0dd5ff0f8ccfc9a39ed1fe8df8b43741c
-  texidocit = "
-Ecco una tipica partitura corale a quattro parti, SATB. Se il complesso è più
-ampio, è spesso comodo scrivere gli elementi comuni in un'unica sezione, che
-verrà 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 ripartite in due soli righi.
-"
-  doctitleit = "Modello per complesso vocale"
-
-%% 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 = "really-simple, template, vocal-music"
 
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
@@ -73,7 +20,6 @@ regrouped on only two staves.
   doctitle = "Vocal ensemble template"
 } % begin verbatim
 
-
 \paper {
   top-system-spacing #'basic-distance = #10
   score-system-spacing #'basic-distance = #20
@@ -118,7 +64,7 @@ bassWords = \lyricmode {
   \new ChoirStaff <<
     \new Lyrics = "sopranos" \with {
       % this is needed for lyrics above a staff
-      \override VerticalAxisGroup #'staff-affinity = #DOWN
+      \override VerticalAxisGroup.staff-affinity = #DOWN
     }
     \new Staff = "women" <<
       \new Voice = "sopranos" {
@@ -133,7 +79,7 @@ bassWords = \lyricmode {
     \new Lyrics = "altos"
     \new Lyrics = "tenors" \with {
       % this is needed for lyrics above a staff
-      \override VerticalAxisGroup #'staff-affinity = #DOWN
+      \override VerticalAxisGroup.staff-affinity = #DOWN
     }
     \new Staff = "men" <<
       \clef bass
@@ -152,4 +98,3 @@ bassWords = \lyricmode {
     \context Lyrics = "basses" \lyricsto "basses" \bassWords
   >>
 }
-