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=6ea379abfcba4dbec33cefdbbfcd777d2027f491;hb=4da41a2143501789ca2e3acfd8efa77a1f606b30;hp=d5cbedb3240cef3230b50e8ee60d9a920d6996df;hpb=69f0ec479a6ade46d0a227755bb02562112c6743;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 d5cbedb324..6ea379abfc 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,35 +1,61 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% 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.1"
+\version "2.14.0"
 
 \header {
   lsrtags = "text, vocal-music, contexts-and-engravers, template"
 
-%% Translation of GIT committish: f39a9724d9f51ed9d0d464689ef62f549d7b8dd6
+%% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb
   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}.
 
 "
   doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
-  
-%% Translation of GIT committish: 17633f6b8681af86230aa84597fe7561e98c91d6
+
+
+%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
+  texidocja = "
+このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が
+@code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
+"
+
+%% Translation of GIT committish: 514674cb00c18629242dfcde0c1a4976758adc56
+  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 
+In diesem Beispiel werden die Texte mit den Befehlen
 @code{alignAboveContext} und @code{alignBelowContext}
 über und unter dem System angeordnet.
 "
 
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が 
-@code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
+  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"
 
   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}.
 
@@ -72,33 +98,25 @@ 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
+    \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 \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)
-    }
-  }
 }