* lily/parser.yy (chord_body_element): add DRUM_PITCH to chords

[lilypond.git] / input / template / satb.ly

diff --git a/input/template/satb.ly b/input/template/satb.ly
index ae636c8aba071fe0db0299baf4d032ea0cb301d2..10364e754ec8b2cd196ac618ababc1f55d9e569c 100644 (file)
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "1.7.6"
+\version "2.1.10"
 \header {
 
     texidoc = "
@@ -6,7 +6,7 @@
 " 
 }
 
-sopMusic = \notes  \relative c'' { c4 c [c8( )b] c4 }
+sopMusic = \notes  \relative c'' { c4 c c8[( b)] c4 }
 sopWords = \lyrics { hi4 hi hi hi  }
 
 altoMusic = \notes  \relative c' { e4 f d e }
@@ -19,28 +19,28 @@ bassMusic = \notes \relative c { c4 c g c }
 bassWords = \lyrics { ho4 ho ho ho }
 
 \score { \notes
-         \context StaffGroup <
-             \property Score.automaticMelismata = ##t
-         \context Lyrics = sopLyrs { s1 }
-         \context Staff = women { s1 }
-         \context Lyrics = altoLyrs { s1 }
-         \context Lyrics = tenorLyrs { s1 }
-         \context Staff = men {\clef bass s1 }
-         \context Lyrics = bassLyrs { s1 }
-         \addlyrics
-               \context Staff = women \context Voice = VA { \voiceOne \sopMusic }
-               \context Lyrics = sopLyrs { \sopWords}
-         \addlyrics
-               \context Staff = women \context Voice = VB { \voiceTwo \altoMusic }
-               \context Lyrics = altoLyrs { \altoWords}
-         \addlyrics
-               \context Staff = men \context Voice = VA { \voiceOne \tenorMusic }
-               \context Lyrics = tenorLyrs { \tenorWords}
-         \addlyrics
-               \context Staff = men  \context Voice = VB { \voiceTwo \bassMusic }
-               \context Lyrics = bassLyrs { \bassWords}
+         \context StaffGroup <<
+             \context LyricsVoice = sopranos { s1 }
+             \context Staff = women <<
+                 \context Voice = sopranos { \voiceOne \sopMusic }
+                 \context Voice = altos { \voiceTwo \altoMusic }
+             >>
+             \context LyricsVoice = altos { s1 }
+             \context LyricsVoice = tenors { s1 }
+             \context Staff = men <<
+                 \clef bass
+                 \context Voice = tenors { \voiceOne \tenorMusic }
+                 \context Voice = basses { \voiceTwo \bassMusic }
+             >>
+             \context LyricsVoice = basses { s1 }
+
+             
+             \context LyricsVoice = sopranos \lyricsto sopranos \sopWords
+             \context LyricsVoice = altos \lyricsto altos \altoWords
+             \context LyricsVoice = tenors \lyricsto tenors \tenorWords
+             \context LyricsVoice = basses \lyricsto basses \bassWords
          
-         >
+         >>
   \paper {
     \translator {