Merge branch 'master' into dev/texi2html

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

diff --git a/input/example-3.ly b/input/example-3.ly
index 1819d7680526db84b19a710e2c0e400d650810ee..30a16d164c34be7380756dcfb5eb13f07ee12afa 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,31 +1,36 @@
-\version "1.3.96";
+%%% A full example with two staves
 
-one = \notes\relative c{
-       c'' d e f
+\header {
+  title = "And now, example 3"
+  copyright = "public domain"
 }
 
-two = \notes\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-mudela example with two staffs
-%
-% Type:
-%
-%     ly2dvi example-3
-%     xdvi example-3     # or your dvi viewer here
-%
-% For more elaborate examples see twinkle.ly, input/* and mutopia/*.
-%
-% A docmument on Mudela is under construction: Documentation/tex/mudela.doc
-% (available as .ps from the website too).
+<<
+  \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.51"