Merge commit 'origin'

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

diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
index 2a62265f0fd1284d1ae44a7dc9a326e4374d6558..8dd8df2b3d8cccd3aa410e999ceb55d8ed0662f6 100644 (file)
--- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
@@ -1,117 +1,79 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.

-%% Tags: text, vocal-music, contexts-and-engravers, template
-\version "2.11.35"
+\version "2.11.48"

 
 

-\header { texidoc = "
+\header {
+  lsrtags = "text, vocal-music, contexts-and-engravers, template"
+
+  texidoc = "

 This template is basically the same as the simple \"Vocal ensemble\"
 template, with the exception that here all the lyrics lines are placed
 This template is basically the same as the simple \"Vocal ensemble\"
 template, with the exception that here all the lyrics lines are placed

-using alignAboveContext and alignBelowContext.
-" }
-% begin verbatim
+using @code{alignAboveContext} and @code{alignBelowContext}.
+
+"
+  doctitle = "Vocal ensemble template with lyrics aligned below and above the staves"
+} % begin verbatim

 global = {
 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 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 <<
-                 \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
-         % again, we could replace the line above this with the line below.
-         %    \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)
-              }
-           }
-         }
-         
-         
-         \score {
-           \new ChoirStaff <<
-              \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 \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 \lyricsto basses \bassWords
-           >>
-         
-           \layout {
-              \context {
-                 % a little smaller so lyrics
-                 % can be closer to the staff
-                 \Staff
-                 \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-              }
-           }
-         } 
+  \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 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 <<
+      \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
+    % again, we could replace the line above this with the line below.
+    % \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)
+    }
+  }
+}