Deleted some accidentally double-pasted lines in lilypond-book.itely; began

work on examples.itely.

diff --git a/ChangeLog b/ChangeLog
index 4420f02f2d769b6ab188771af8a776596ea67b4a..ea52e31c1af5516d3b66b0aa9895b69c74b3272d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-25  Graham Percival   <gperlist@shaw.ca>
+
+       * Documentation/user/lilypond-book.itely: slight clean-up.
+
+       * Documentation/user/examples.itely: began section.
+
 2004-08-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/slur-quanting.cc (score_extra_encompass): avoid other slurs

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 1c057b67f3b0ca51545dfac0f69faf7eb93308c8..08a23de471ff8385ca82637a539b0c8752c43ada 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -1,4 +1,79 @@
 @node Example templates
 @chapter Example templates
 
-[TODO]
+This section of the manual contains templates with the LilyPond score
+already set up for you.  Just add notes, run LilyPond, and enjoy
+beautiful printed scores!
+
+@menu
+* Single staff::
+@end menu
+
+@c   more sections to come soon.
+
+
+@node Single staff
+@section Single staff
+
+The first example gives you a staff with notes, suitable for a solo
+instrument or a melodic fragment.  Cut and paste this into a file,
+add notes, and you're finished!
+
+@lilypond[verbatim]
+
+melody = \relative c' {
+\clef treble
+\key c \major
+\time 4/4
+
+  a4 b c d
+}
+
+\score{
+  \new Staff \melody
+  \paper { }
+  \midi { \tempo 4=60 }
+}
+
+@end lilypond
+
+@*
+
+The next example 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.
+
+@lilypond[verbatim]
+
+melody = \relative c' {
+\clef treble
+\key c \major
+\time 4/4
+
+  a4 b c d
+}
+
+text = \lyrics {
+  Aaa Bee Cee Dee
+}
+
+\score{
+  <<
+    \context Voice = one {
+      \set Staff.autoBeaming = ##f
+      \melody
+      }
+    \lyricsto "one" \new Lyrics \text
+  >>
+  \paper { }
+  \midi { \tempo 4=60 }
+}
+
+@end lilypond
+
+
+
+
+

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index a10a8ebe7d4972125dae403d24660da233c15784..0f14bda4e7f801913e3124dd603d4b601d508e3a 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -426,9 +426,6 @@ documents are composed from small @file{.ly} files in this way:
   @{ c'4 @}
 @end example
 
-@item relative, relative=@var{N}
-uses relative octave mode.  By default, notes are specified relative
-to middle C.  The optional integer argument specifies the octave of the
 @item relative, relative=@var{N}
 uses relative octave mode.  By default, notes are specified relative
 to middle C.  The optional integer argument specifies the octave of the