X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fvocal-ensemble-template-with-automatic-piano-reduction.ly;h=e404d43ee11f2c9994d5e73c9e5f1d760a05c49a;hb=e187116454ed48e95a22936dc38dcf70f7ac984a;hp=c3c3570c73a1959cbb23523ebab1cf7f9c99d915;hpb=4e8f3c896223d20f0504d480e04fa764a565fd81;p=lilypond.git

diff --git a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
index c3c3570c73..e404d43ee1 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,53 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.13.29"
+\version "2.18.0"
 
 \header {
-  lsrtags = "vocal-music, keyboards, template"
-
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
-  texidoces = "
-
-Esta plantilla añade una reducción de piano automática a la partitura
-vocal SATB estándar que se mostró en la @qq{Plantilla de conjunto
-vocal}. Esto presenta uno de los puntos fuertes de LilyPond: podemos
-usar una definición de música más de una vez. Si se hace cualquier
-cambio en las notas de la parte vocal (digamos @code{tenorMusic}),
-entonces los cambios se aplicarán también a la reducción de piano.
-
-"
-  doctitlees = "Plantilla de conjunto vocal con reducción de piano automática"
-
-
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
-  texidocja = "
-このテンプレートは、\"合唱テンプレート\"で示された標準の SATB ボーカル譜に自動@c
-ピアノ譜を付け加えています。これは LilyPond の強みの 1 つを示しています - 音楽@c
-定義を何回も使用することができます。ボーカルの音符 (例えば、@code{tenorMusic}
-の音符) に変更が加えられた場合、その変更はピアノ譜にも適用されます。
-"
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-In diesem Beispiel wird ein automatischer Klavierauszug zu der
-Chorpartitur hinzugefügt. Das zeigt eine der Stärken von LilyPond
--- man kann eine Variable mehr als einmal benutzen. Wenn Sie
-irgendeine Änderung an einer Chorstimme vornehmen, (etwa
-tenorMusic), verändert sich auch der Klavierauszug entsprechend.
-"
-
-
-%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
-  texidocfr = "
-Ce canevas ajoute une réduction pour piano à une partition standard pour
-chœur à quatre voix mixtes.  Ceci illustre l'un des avantages de
-LilyPond : une expression musicale peut être réutilisée sans effort.
-Toute modification apportée à l'une des voix, mettons @code{tenorMusique},
-sera automatiquement reportée dans la réduction pour piano.
-
-"
-  doctitlefr = "Ensemble vocal avec réduction pour piano"
+  lsrtags = "automatic-notation, keyboards, template, vocal-music"
 
   texidoc = "
 This template adds an automatic piano reduction to the standard SATB
@@ -61,33 +21,40 @@ reduction.
   doctitle = "Vocal ensemble template with automatic piano reduction"
 } % 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
 }
 
-sopMusic = \relative c'' {
-  c4 c c8[( b)] c4
+sopMusic = \relative {
+  c''4 c c8[( b)] c4
 }
 sopWords = \lyricmode {
   hi hi hi hi
 }
 
-altoMusic = \relative c' {
-  e4 f d e
+altoMusic = \relative {
+  e'4 f d e
 }
 altoWords =\lyricmode {
   ha ha ha ha
 }
 
-tenorMusic = \relative c' {
+tenorMusic = \relative {
   g4 a f g
 }
 tenorWords = \lyricmode {
   hu hu hu hu
 }
 
-bassMusic = \relative c {
+bassMusic = \relative {
   c4 c g c
 }
 bassWords = \lyricmode {
@@ -97,23 +64,30 @@ bassWords = \lyricmode {
 \score {
   <<
     \new ChoirStaff <<
-      \new Lyrics = sopranos { s1 }
-      \new Staff = women <<
-        \new Voice = sopranos { \voiceOne << \global \sopMusic >> }
-        \new Voice = altos { \voiceTwo << \global \altoMusic >> }
+      \new Lyrics = "sopranos" \with {
+        % This is needed for lyrics above a staff
+        \override VerticalAxisGroup.staff-affinity = #DOWN
+      }
+      \new Staff = "women" <<
+        \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> }
+        \new Voice = "altos" { \voiceTwo << \global \altoMusic >> }
       >>
-      \new Lyrics = altos { s1 }
-      \new Lyrics = tenors { s1 }
-      \new Staff = men <<
+      \new Lyrics = "altos"
+      \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 { \voiceOne <<\global \tenorMusic >> }
-        \new Voice = basses { \voiceTwo <<\global \bassMusic >> }
+        \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> }
+        \new Voice = "basses" { \voiceTwo << \global \bassMusic >> }
       >>
-      \new Lyrics = basses { s1 }
-      \context Lyrics = sopranos \lyricsto sopranos \sopWords
-      \context Lyrics = altos \lyricsto altos \altoWords
-      \context Lyrics = tenors \lyricsto tenors \tenorWords
-      \context Lyrics = basses \lyricsto basses \bassWords
+      \new Lyrics = "basses"
+      \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
+      \context Lyrics = "altos" \lyricsto "altos" \altoWords
+      \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
+      \context Lyrics = "basses" \lyricsto "basses" \bassWords
     >>
     \new PianoStaff <<
       \new Staff <<
@@ -131,13 +105,4 @@ bassWords = \lyricmode {
       >>
     >>
   >>
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
 }
-