Merge master into nested-bookparts

[lilypond.git] / input / example-3.ly

diff --git a/input/example-3.ly b/input/example-3.ly
index 8e7adfea4ea2831433deaf9d61b59bce55232dc3..c2827edb881565519bc6786c0eb7544ec271b9c8 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,32 +1,36 @@
-#(ly:set-option 'old-relative)
-\version "2.3.16"
+%%% A full example with two staves
 
-one = \relative c{
-       c'' d e f
+\header {
+  title = "And now, example 3"
+  copyright = "public domain"
 }
 
-two = \relative c{
-       \clef "bass"
-       c'2 g2
+one = \relative {
+  c' d e f
 }
 
-\score{
-       <<
-               \one
-               \two
-       >>
-       \paper{}
-       \midi{}
+two = \relative {
+  \clef "bass"
+  c2 g2
 }
 
-% A full example with two staves
-%
-% Type:
-%
-%     lilypond example-3
-%     xdvi example-3     # or your dvi viewer here
-
-%%
-%% For learning LilyPond, please read the tutorial, included in the
-%% user-manual.
-%% 
+<<
+  \new Staff \one
+  \new Staff \two
+>>
+
+%{
+Type
+
+    lilypond example-3
+    xpdf example-3     # or your PDF viewer here
+
+For learning LilyPond, please read the tutorial
+
+   http://lilypond.org/tutorial
+
+also included in the user-manual.
+%}
+
+%% Optional version number
+\version "2.11.61"