From bfc88203ac2572737480e78ef2635ed35b458441 Mon Sep 17 00:00:00 2001
From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Tue, 17 Aug 2010 10:11:32 +0100
Subject: [PATCH] Docs: amend vocal ensemble template

 - remove erroneous skips in Lyrics
---
 .../snippets/new/vocal-ensemble-template.ly   | 81 +++++++++++++++++++
 .../snippets/vocal-ensemble-template.ly       | 46 +++++------
 2 files changed, 102 insertions(+), 25 deletions(-)
 create mode 100644 Documentation/snippets/new/vocal-ensemble-template.ly

diff --git a/Documentation/snippets/new/vocal-ensemble-template.ly b/Documentation/snippets/new/vocal-ensemble-template.ly
new file mode 100644
index 0000000000..4f656b9f50
--- /dev/null
+++ b/Documentation/snippets/new/vocal-ensemble-template.ly
@@ -0,0 +1,81 @@
+\version "2.13.31"
+
+\header {
+  lsrtags = "vocal-music, template"
+  texidoc = "
+Here is a standard four-part SATB vocal score. With larger ensembles,
+it is often useful to include a section which is included in all parts.
+For example, the time signature and key signature are almost always the
+same for all parts. Like in the @qq{Hymn} template, the four voices are
+regrouped on only two staves.
+
+"
+  doctitle = "Vocal ensemble template"
+} % begin verbatim
+
+global = {
+  \key c \major
+  \time 4/4
+}
+
+sopMusic = \relative c'' {
+  c4 c c8[( b)] c4
+}
+sopWords = \lyricmode {
+  hi hi hi hi
+}
+
+altoMusic = \relative c' {
+  e4 f d e
+}
+altoWords = \lyricmode {
+  ha ha ha ha
+}
+
+tenorMusic = \relative c' {
+  g4 a f g
+}
+tenorWords = \lyricmode {
+  hu hu hu hu
+}
+
+bassMusic = \relative c {
+  c4 c g c
+}
+bassWords = \lyricmode {
+  ho ho ho ho
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Lyrics = "sopranos"
+    \new Staff = "women" <<
+      \new Voice = "sopranos" {
+        \voiceOne
+        << \global \sopMusic >>
+      }
+      \new Voice = "altos" {
+        \voiceTwo
+        << \global \altoMusic >>
+      }
+    >>
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors"
+    \new Staff = "men" <<
+      \clef bass
+      \new Voice = "tenors" {
+        \voiceOne
+        << \global \tenorMusic >>
+      }
+      \new Voice = "basses" {
+        \voiceTwo << \global \bassMusic >>
+      }
+    >>
+    \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
+  >>
+}
+
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index a7834cb5d3..d27ccc8c75 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,11 +1,10 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.29"
+% Do not edit this file; it is automatically
+% generated from Documentation\snippets\new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.31
+\version "2.13.31"
 
 \header {
-  lsrtags = "vocal-music, template"
-
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
   texidoces = "
 He aquí una partitura vocal estándar para cuatro voces SATB. Con
@@ -17,12 +16,14 @@ voces se reagrupan en sólo dos pentagramas.
 "
   doctitlees = "Plantilla de conjunto vocal"
 
+
 %% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
   texidocja = "
 これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
 もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
 便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
 歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
+
 %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren
@@ -33,6 +34,7 @@ sind fast immer gleich in allen Stimmen.
 
   doctitlede = "Vorlage für Vokalensemble"
 
+
 %% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
   texidocfr = "
 Ce fichier constitue un canevas standard de partition pour chœur à
@@ -46,6 +48,7 @@ portées.
 "
   doctitlefr = "Ensemble vocal (simple)"
 
+  lsrtags = "vocal-music, template"
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
 it is often useful to include a section which is included in all parts.
@@ -60,7 +63,8 @@ regrouped on only two staves.
 global = {
   \key c \major
   \time 4/4
-}
+} % begin verbatim
+
 
 sopMusic = \relative c'' {
   c4 c c8[( b)] c4
@@ -92,8 +96,8 @@ bassWords = \lyricmode {
 
 \score {
   \new ChoirStaff <<
-    \new Lyrics = sopranos { s1 }
-    \new Staff = women <<
+    \new Lyrics = "sopranos"
+    \new Staff = "women" <<
       \new Voice = "sopranos" {
         \voiceOne
         << \global \sopMusic >>
@@ -103,9 +107,9 @@ bassWords = \lyricmode {
         << \global \altoMusic >>
       }
     >>
-    \new Lyrics = "altos" { s1 }
-    \new Lyrics = "tenors" { s1 }
-    \new Staff = men <<
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors"
+    \new Staff = "men" <<
       \clef bass
       \new Voice = "tenors" {
         \voiceOne
@@ -115,19 +119,11 @@ bassWords = \lyricmode {
         \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
   >>
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
 }
 
-- 
2.39.5