* scripts/convert-ly.py (conv): remove \lyrics from \lyricsto.

[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 ea462ae0843e39ef4fcbec2c0fc2355f571aaaca..2fdb82090826d0ec4f69a1e997fc4ee5364ec9d3 100644 (file)
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,32 +1,30 @@
-#(ly:set-option 'old-relative)
-\version "1.9.4"
-
-\header {
-  texidoc = "Popsong format: chords, melody and lyrics."
+\version "2.3.8"
+\header
+{
+    texidoc = "Popsong format: chords, melody and lyrics."
 }
 
-melody = \notes \relative c' {
-  a b c d
+melody =  \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 Lyrics \text
   >>
   \paper { }
   \midi  { }