New chapter, changes to table of contents.

diff --git a/ChangeLog b/ChangeLog
index cbd058f4aa5272d3beaaecc801b956360beeb3e9..bd546918a0f6865ffb78e47b519855e69a5552d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,15 @@
 
        * Documentation/user/global.itely: better docs for \header.
 
+       * Documentation/user/putting.itely: new chapter; placeholder
+       for future expansion.
+
+       * Documentation/user/examples.itely: moved "suggestions for
+       writing LP files" section into putting.itely.
+
+       * Documentation/user/lilypond.itely: added new chapter,
+       fixed the short table of contents.
+
 2005-05-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/framework-ps.scm (write-preamble): extract CFF from OTF

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index b1226f529968af86c16cacaa7327566c7ec0ad6d..0910c1f2ba56ad5a5c143b0cf109cd9b863b9400 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -8,64 +8,16 @@ beautiful printed scores!
 
 @c bad node name for ancient notation to avoid confict
 @menu
-* Suggestions for writing LilyPond files::
-* Single staff::
-* Piano templates::
-* String quartet::
-* Vocal ensembles::
-* Ancient notation templates::
-* Jazz combo::
-* Other templates::
-* Lilypond-book templates::
+* Single staff::                
+* Piano templates::             
+* String quartet::              
+* Vocal ensembles::             
+* Ancient notation templates::  
+* Jazz combo::                  
+* Other templates::             
+* Lilypond-book templates::     
 @end menu
 
-@c TODO explain \score{} ?  Maybe add a note to the tutorial?
-
-@node Suggestions for writing LilyPond files
-@section Suggestions for writing LilyPond files
-
-Now you're ready to begin writing larger LilyPond files -- not just the
-little examples in the tutorial, but whole pieces.  But how should you
-go about doing it?
-
-The best answer is ``however you want to do it.''  As long as LilyPond
-can understand your files and produces the output that you want, it
-doesn't matter what your files look like.  That said, sometimes we
-make mistakes when writing files.  If LilyPond can't understand your
-files, or produces output that you don't like, how do you fix the
-problem?
-
-Here are a few suggestions that can help you to avoid or fix
-problems:
-
-@itemize @bullet
-@item Include @code{\version} numbers in every file.  Note that all
-templates contain a @code{\version "2.4.0"} string.  We
-highly recommend that you always include the @code{\version}, no matter
-how small your file is.  Speaking from personal experience, it's
-quite frustrating to try to remember which version of LilyPond you were
-using a few years ago.  @code{convert-ly} requires you to declare
-which version of LilyPond you used.
-
-@item Include checks: See @ref{Bar check} and @ref{Octave check}.  If you
-include checks every so often, then if you make a mistake, you can pinpoint
-it quicker.  How often is ``every so often''?  It depends on the complexity
-of the music.  For very simple music, perhaps just once or twice.  For
-very complex music, every bar.
-
-@item One bar per line.  If there is anything complicated, either in the music
-itself or in the output you desire, it's often good to write only one bar
-per line.  Saving screen space by cramming eight bars per line just isn't
-worth it if you have to `debug' your files.
-
-@item Comment your files, with either bar numbers (every so often) or
-references to musical themes (``second theme in violins'', ``fourth
-variation'').  You may not need it when you're writing the piece for
-the first time, but if you want to go back and change something two
-or three years later, you won't know how your file is structured if you
-don't comment the file.
-
-@end itemize
 
 @node Single staff
 @section Single staff

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 4dda8df08e772a9ba7439e791548eafd3d5e1cf7..904a997844a9ee6bea22b19cb60a7e39867ded1c 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -253,6 +253,8 @@ of this and other documentation.
 * Introduction::                   What, Why, How.
 * Tutorial::                       A tutorial introduction.
 * Example templates::              Larger examples.
+* Putting it all together::        Demonstrates real-life LilyPond usage.
+* Running LilyPond::               Operation.
 * Basic notation::                 Standard musical notation.
 * Instrument-specific notation::   Notation that is only used for some
                                    instruments.
@@ -261,15 +263,14 @@ of this and other documentation.
 
 * Changing defaults::              Tuning output.
 * Interfaces for programmers::
-* Running LilyPond::               Operation.
-* Converting from other formats::  Converting to lilypond source format.
 * LilyPond-book::                  Integrating text and music.
+* Converting from other formats::  Converting to lilypond source format.
 * Literature list::
 * Scheme tutorial::
 * Notation manual details::
 * Point and click::             
-* GNU Free Documentation License:: FDL.
 * Cheat sheet::     
+* GNU Free Documentation License:: FDL.
 * Unified index::
 @end menu
 @end ifnottex
@@ -282,6 +283,7 @@ of this and other documentation.
 @include introduction.itely 
 @include tutorial.itely
 @include examples.itely
+@include putting.itely
 @include invoking.itely
 @include basic-notation.itely
 @include instrument-notation.itely