X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Flilypond.tely;h=538868182507993639880e488fb239c1086f5d5f;hb=4f9c61203f8ed3984f1a02df4a6942ea0d6f1055;hp=27f7117a6621202e591360e7c394d21900600dac;hpb=b80683cc94b0c22bbe3fccb94a9b2e23787fd10b;p=lilypond.git

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 27f7117a66..5388681825 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -6,7 +6,9 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 @setfilename lilypond.info
-@settitle GNU LilyPond
+@settitle GNU LilyPond user manual
+@documentencoding UTF-8
+@documentlanguage en
 
 @iftex
 @afourpaper
@@ -41,12 +43,11 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @dircategory LilyPond
 @direntry
 * LilyPond: (lilypond/lilypond).           The GNU music typesetter.
-* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
-* convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
-* etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
-* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
-* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
+* abc2ly: (lilypond/lilypond-program)Invoking abc2ly.          Importing ABC.      
+* convert-ly: (lilypond/lilypond-program)Invoking convert-ly.  Older LilyPond versions.
+* etf2ly: (lilypond/lilypond-program)Invoking etf2ly.          Importing Finale.
+* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Integrating text and music.
+* midi2ly: (lilypond/lilypond-program)Invoking midi2ly.        Importing MIDI.
 @end direntry
 
 @c don't remove this comment.
@@ -70,20 +71,16 @@ This document is also available as a
 @syncodeindex fn cp
 @syncodeindex vr cp
 
-@documentlanguage en
-@documentencoding utf-8
-
 
 @finalout
 
 @titlepage
 @title LilyPond
 @subtitle The music typesetter
+@titlefont{User manual}
 @author The LilyPond development team
 
-
-
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -114,7 +111,7 @@ Free Documentation License''.
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -129,7 +126,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2006 by the authors
+Copyright 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -161,37 +158,18 @@ of this and other documentation.
 @include dedication.itely
 
 @menu
-Learning Manual
-
-* Preface::                        Preface.
-* Introduction::                   What, Why, How.
-* Tutorial::                       A tutorial introduction.
-* Putting it all together::        More explanation about LilyPond concepts.
-* Working on LilyPond projects::   Discusses real-life usage.
-* Tweaking output::                Introduction to modifying output.
-
-Notation Reference
-
-* Basic notation::                 Standard musical notation.
-* Instrument-specific notation::   Specialized notation.
-* Advanced notation::              Less frequently used notation.
+* Musical notation::               Musical notation.
+* Specialist notation::            Notation which is only used for
+    specific purposes.
 * Changing defaults::              Tuning output.
 * Non-musical notation::           Output that is not musical notation.
 * Spacing issues::                 Display of output on paper.
 * Interfaces for programmers::     Expert usage.
 
-Program usage
-
-* Running LilyPond::               Operation.
-* LilyPond-book::                  Integrating text and music.
-* Converting from other formats::  Converting to lilypond source format.
-
 Appendices
 
 * Literature list::                Reference works about music notation.
-* Scheme tutorial::                Programming inside LilyPond.
 * Notation manual tables::         Tables and charts.
-* Templates::                      Ready-made templates.
 * Cheat sheet::                    Summary of LilyPond syntax.
 * GNU Free Documentation License:: License of this document.
 * LilyPond command index::
@@ -203,30 +181,18 @@ Appendices
 
 
 @include macros.itexi
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include putting.itely
-@include working.itely
-@include tweaks.itely
-
-@include basic-notation.itely
-@include instrument-notation.itely
-@include advanced-notation.itely
+
+@include notation.itely
+@include specialist.itely
+
 @include changing-defaults.itely
 @include non-music.itely
 @include spacing.itely
 @include programming-interface.itely
 
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
-
 
 @include literature.itely
-@include scheme-tutorial.itely
 @include notation-appendices.itely
-@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi