Merge branch 'master' into dev/texi2html

[lilypond.git] / input / lsr / single-staff-template-with-notes-and-lyrics.ly

diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly
index 5250472ad3c174807351c4a90333825c6e51a267..5b3ddde4d425a62767121198212a1cc349c33972 100644 (file)
--- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly
+++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.46"
+\version "2.11.51"
 
 \header {
   lsrtags = "vocal-music, template"
@@ -8,34 +8,32 @@
   texidoc = "
 This small template demonstrates a simple melody with lyrics. Cut and
 paste, add notes, then words for the lyrics. This example turns off
-automatic beaming, which is common for vocal parts. If you want to use
-automatic beaming, you'll have to change or comment out the relevant
-line.
+automatic beaming, which is common for vocal parts. To use automatic
+beaming, change or comment out the relevant line.
 
 "
   doctitle = "Single staff template with notes and lyrics"
 } % begin verbatim
 melody = \relative c' {
-            \clef treble
-            \key c \major
-            \time 4/4
-         
-            a4 b c d
-         }
-         
-         text = \lyricmode {
-            Aaa Bee Cee Dee
-         }
-         
-         \score{
-            <<
-               \new Voice = "one" {
-                  \autoBeamOff
-                  \melody
-               }
-               \new Lyrics \lyricsto "one" \text
-            >>
-            \layout { }
-            \midi { }
-         }
+  \clef treble
+  \key c \major
+  \time 4/4
+  
+  a4 b c d
+}
 
+text = \lyricmode {
+  Aaa Bee Cee Dee
+}
+
+\score{
+  <<
+    \new Voice = "one" {
+      \autoBeamOff
+      \melody
+    }
+    \new Lyrics \lyricsto "one" \text
+  >>
+  \layout { }
+  \midi { }
+}