Merge master into nested-bookparts

[lilypond.git] / input / simple-song.ly

diff --git a/input/simple-song.ly b/input/simple-song.ly
index d68971a6de73b1372f2eb52b5ba6a442cc2eaf6a..654ca8f594f2168d54ec4808598e21583cca1558 100644 (file)
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -1,19 +1,17 @@
+
 %% A simple song in LilyPond
 <<
-    \relative {
-       \clef bass
-       d,2 d c4 bes a2 \break
-       c2 c d4 f g2
-    }
-    \newlyrics {
-       My first Li -- ly song,
-       Not much can go wrong!
-    }
+  \relative {
+    \clef bass
+    d,2 d c4 bes a2 \break
+    c2 c d4 f g2
+  }
+  \addlyrics {
+    My first Li -- ly song,
+    Not much can go wrong!
+  }
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.3.4"
+\version "2.11.61"
     
-%% Optional helper for quick click and edit mode.  May be omitted
-#(ly:set-point-and-click 'line-column)
-