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

[lilypond.git] / input / template / melody-lyrics-chords.ly

diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 684fcf1f11266e6aa981939b3ebd3f67d614bc26..4da7f5c5d445ccf5abf17d41406e07c1363a4e02 100644 (file)
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,33 +1,31 @@
-#(ly:set-option 'old-relative)
-\version "1.9.2"
-
-\header {
-  texidoc = "Popsong format: chords, melody and lyrics."
+\version "2.1.10"
+\header
+{
+    texidoc = "Popsong format: chords, melody and lyrics."
 }
 
-melody = \notes \relative c' {
-  a b c d
+melody = \notes \relative c'
+{
+    a b c d
 }
 
 text = \lyrics {
-  Aaa Bee Cee Dee
+    Aaa Bee Cee Dee
 }
 
 accompaniment = \chords {
-  a2 c2
+    a2 c2
 }
 
 \score {
-  <
+  <<
     \context ChordNames \accompaniment
-    \addlyrics
-      \context Staff = one {
-        \property Staff.autoBeaming = ##f
-        \property Staff.automaticMelismata = ##t
+    \context Voice = one {
+       \autoBeamOff
         \melody
-      }
-      \context Lyrics \text
-  >
+    }
+    \lyricsto "one" \new LyricsVoice \text
+  >>
   \paper { }
   \midi  { }
 }