X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fvocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly;h=40cf86676e15e14d0f49fe01f17225c6b6148132;hb=6e87cd2d1ed7028500bbcf1fe7e454d0127e31f8;hp=0efb8d4fdb45d41309af2e65202b666a1356748e;hpb=92782fde87fb68e945b9eb60cacab6c01d0397df;p=lilypond.git

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 0efb8d4fdb..40cf86676e 100644
--- 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
@@ -1,15 +1,18 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.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.4"
+\version "2.14.0"
 
 \header {
   lsrtags = "text, vocal-music, contexts-and-engravers, template"
 
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Esta plantilla es, básicamente, la misma que la sencilla plantilla
-\"Conjunto vocal\", excepto que aquí todas las líneas de letra se
+@qq{Conjunto vocal}, excepto que aquí todas las líneas de letra se
 colocan utilizando @code{alignAboveContext} y
 @code{alignBelowContext}.
 
@@ -17,13 +20,22 @@ colocan utilizando @code{alignAboveContext} y
   doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
 
 
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
   texidocja = "
 このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が
 @code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+%% Translation of GIT committish: c3b519f0dd5ff0f8ccfc9a39ed1fe8df8b43741c
+  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"
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 In diesem Beispiel werden die Texte mit den Befehlen
 @code{alignAboveContext} und @code{alignBelowContext}
@@ -33,7 +45,7 @@ In diesem Beispiel werden die Texte mit den Befehlen
   doctitlede = "Vorlage für Vokalensemble mit dem Gesangstext über und unter dem System"
 
 
-%% Translation of GIT committish: 892286cbfdbe89420b8181975032ea975e79d2f5
+%% 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
@@ -43,7 +55,7 @@ ayant recours à @code{alignAboveContext} et @code{alignBelowContext}.
   doctitlefr = "Ensemble vocal avec alignement des paroles selon le contexte"
 
   texidoc = "
-This template is basically the same as the simple \"Vocal ensemble\"
+This template is basically the same as the simple @qq{Vocal ensemble}
 template, with the exception that here all the lyrics lines are placed
 using @code{alignAboveContext} and @code{alignBelowContext}.
 
@@ -86,33 +98,29 @@ bassWords = \lyricmode {
 
 \score {
   \new ChoirStaff <<
-    \new Staff = women <<
+    \new Staff = "women" <<
       \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 \lyricsto altos \altoWords
-
-    \new Staff = men <<
+    \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" <<
       \clef bass
       \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
+    % \new Lyrics \lyricsto "basses" \bassWords
   >>
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
 }