Imported Upstream version 2.16.0

[lilypond.git] / Documentation / snippets / vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly

diff --git a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
index 2aa33091223c71b852925a2ae3b5a6a2c6db99da..c4c1f61ccbf74cf90f3bba1513f20570ecfb4cc1 100644 (file)
--- a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
@@ -4,58 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.16.0"
 
 \header {
-%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
-  texidocit = "
-Questo modello è fondamentalmente analogo al semplice modello @qq{Complesso vocale},
-con l'unica differenza che qui tutti i versi del testo sono posizionati
-usando @code{alignAboveContext} e @code{alignBelowContext}.
-
-"
-  doctitleit = "Modello per gruppo vocale con testo allineato sotto e sopra i righi"
-
-  lsrtags = "text, vocal-music, contexts-and-engravers, template"
-
-
-
-
-%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
-  texidoces = "
-Esta plantilla es, básicamente, la misma que la sencilla plantilla
-@qq{Conjunto vocal}, excepto que aquí todas las líneas de letra se
-colocan utilizando @code{alignAboveContext} y
-@code{alignBelowContext}.
-
-"
-  doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
-
-
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
-  texidocja = "
-このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が
-@code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
-"
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-In diesem Beispiel werden die Texte mit den Befehlen
-@code{alignAboveContext} und @code{alignBelowContext}
-über und unter dem System angeordnet.
-"
-
-  doctitlede = "Vorlage für Vokalensemble mit dem Gesangstext über und unter dem System"
-
-
-%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
-  texidocfr = "
-Ce canevas ressemble beaucoup à celui pour chœur à quatre voix mixtes.
-La différence réside dans le fait que les paroles sont positionnées en
-ayant recours à @code{alignAboveContext} et @code{alignBelowContext}.
-
-"
-  doctitlefr = "Ensemble vocal avec alignement des paroles selon le contexte"
+  lsrtags = "contexts-and-engravers, template, text, vocal-music"
 
   texidoc = "
 This template is basically the same as the simple @qq{Vocal ensemble}
@@ -66,6 +18,7 @@ using @code{alignAboveContext} and @code{alignBelowContext}.
   doctitle = "Vocal ensemble template with lyrics aligned below and above the staves"
 } % begin verbatim
 
+
 global = {
   \key c \major
   \time 4/4
@@ -105,10 +58,12 @@ bassWords = \lyricmode {
       \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> }
       \new Voice = "altos" { \voiceTwo << \global \altoMusic >> }
     >>
-    \new Lyrics \with { alignAboveContext = #"women" } \lyricsto "sopranos" \sopWords
-    \new Lyrics \with { alignBelowContext = #"women" } \lyricsto "altos" \altoWords
-    % we could remove the line about this with the line below, since we want
-    % the alto lyrics to be below the alto Voice anyway.
+    \new Lyrics \with { alignAboveContext = #"women" }
+      \lyricsto "sopranos" \sopWords
+    \new Lyrics \with { alignBelowContext = #"women" }
+      \lyricsto "altos" \altoWords
+    % we could remove the line about this with the line below, since
+    % we want the alto lyrics to be below the alto Voice anyway.
     % \new Lyrics \lyricsto "altos" \altoWords
 
     \new Staff = "men" <<
@@ -116,10 +71,11 @@ bassWords = \lyricmode {
       \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> }
       \new Voice = "basses" { \voiceTwo << \global \bassMusic >> }
     >>
-    \new Lyrics \with { alignAboveContext = #"men" } \lyricsto "tenors" \tenorWords
-    \new Lyrics \with { alignBelowContext = #"men" } \lyricsto "basses" \bassWords
+    \new Lyrics \with { alignAboveContext = #"men" }
+      \lyricsto "tenors" \tenorWords
+    \new Lyrics \with { alignBelowContext = #"men" }
+      \lyricsto "basses" \bassWords
     % again, we could replace the line above this with the line below.
     % \new Lyrics \lyricsto "basses" \bassWords
   >>
 }
-