* scripts/convert-ly.py (FatalConversionError.subst_in_trans):

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

diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index d47ca5e7e88dec881c07c73ef0921be69e1a23f0..ee730190f03527b4e953fddb5240b86dc1cb013a 100644 (file)
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,20 +1,9 @@
-\version "1.5.68"
 
+\version "2.1.23"
 \header {
-  dedication = "dedication"
-  title = "Title"
-  subtitle = "Subtitle"
-  subsubtitle = "Subsubtitle"
-  composer = "Composer (xxxx-yyyy)"
-  opus = "Opus 0"
-  piece = "Piece I"
-  instrument = "Instrument"
-  arranger = "Arranger"
-  poet = "Poet"
-  texttranslator = "Translator"
-  copyright = "public domain"
-  enteredby = "jcn"
-  source =  "urtext"
+  texidoc ="Classical song format: one staff with melody and lyrics,
+and piano accompaniment."
+  
 }
 
 melody = \notes \relative c'' {
@@ -34,25 +23,23 @@ lower = \notes\relative c {
 }
 
 \score {
-  <
-    \addlyrics
-      \context Staff = mel {
-        \property Staff.autoBeaming = ##f
-        \property Staff.automaticMelismata = ##t
-        \melody
+  <<
+      \context Voice = mel {
+         \autoBeamOff
+         \melody
       }
-      \context Lyrics \text
+      \lyricsto mel \new Lyrics \text
 
-    \context PianoStaff <
-      \context Staff = upper \upper
-      \context Staff = lower <
-       \clef bass
-       \lower
-      >
-    >
-  >
+      \context PianoStaff <<
+         \context Staff = upper \upper
+         \context Staff = lower <<
+             \clef bass
+             \lower
+         >>
+      >>
+  >>
   \paper {
-    \translator { \HaraKiriStaffContext }
+      \translator { \RemoveEmptyStaffContext }
   }  
   \midi { }  
-}
\ No newline at end of file
+}