* mf/feta18.mf: design size is 18 not 22.5

[lilypond.git] / Documentation / user / lilypond.tely

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 69f48c53cc885bf8faf97c024fbbd9d381ff5f44..1e3964cef8562e82c0eec30f527eea1655fbc088 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -1,10 +1,11 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename lilypond.info
 @settitle GNU LilyPond
+@iftex
+@afourpaper
+@end iftex
+
 
-@html
-<!--- @@WEB-TITLE@@=User Manual --->
-@end html
 
 @ignore
 Distributions will want to install lilypond.info doing:
@@ -16,7 +17,7 @@ Distributions will want to install lilypond.info doing:
 @direntry
 @c    ;; prepend GNU for dir, must be unique
 * GNU LilyPond: (lilypond).                    The GNU music typesetter.
-* ly2dvi: (lilypond)Invoking ly2dvi::          Titling LilyPond scores.
+* lilypond: (lilypond)Invoking lilypond::      Titling LilyPond scores.
 * Glossary: (music-glossary).                  Glossary of music terms.
 * convert-ly: (lilypond)Invoking convert-ly::  Older LilyPond versions.
 * midi2ly: (lilypond)Invoking midi2ly::        Importing MIDI.
@@ -33,7 +34,7 @@ Distributions will want to install lilypond.info doing:
 @omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen
 @omfdescription User manual  of the LilyPond music engraving system
 @omftype user manual
-@omfcategory Music
+@omfcategory Applications|Publishing
 @omflanguage English
 @end ignore
 
@@ -46,6 +47,9 @@ HINTS FOR STYLE
 * don't refer to LilyPond in the text. The reader knows what the
 manual is about
 
+* if you do, capitalization is LilyPond.
+
+
 * don't explicitly refer to the reader/user.  There is no one else
 besides the reader and the writer.
 
@@ -57,6 +61,8 @@ besides the reader and the writer.
 print. Instead refer to an example input file (@inputfileref), these
 are clickable in HTML.
 
+* abbrevs in caps, e.g. HTML, DVI, MIDI, etc.
+
 @end ignore
 
 @ifhtml
@@ -70,7 +76,7 @@ PostScript} and @uref{../lilypond.pdf,PDF}.
 @subtitle The music typesetter
 @author Han-Wen Nienhuys
 @author Jan Nieuwenhuizen
-@author J@"{u}gen Reuter
+@author J@"{u}rgen Reuter
 @author Rune Zedeler
 
 
@@ -84,6 +90,23 @@ Copyright @copyright{} 1999--2003 by the authors
   A copy of the license is included in the section entitled ``GNU
   Free Documentation License''.
 
+@vskip 20pt
+
+  
+@lilypond[singleline]
+\score { \context Lyrics \notes {
+    \property Score.RehearsalMark \set #'self-alignment-X = #LEFT
+
+\mark #(ly:export    (string-append "(For LilyPond version "
+(lilypond-version) ")"))
+s2
+ }
+ \paper { indent = 0.0\pt
+ raggedright   = ##t 
+ }
+}
+@end lilypond
+  
 
 @end titlepage
 
@@ -109,7 +132,7 @@ Copyright 1999--2003 by the authors
 
 @chapter GNU LilyPond --- The music typesetter
 
-This is the user manual for GNU LilyPond 1.7.16.
+This is the user manual for GNU LilyPond 2.1.0.
 
 @cindex web site
 
@@ -122,15 +145,17 @@ this and other documentation.
 @menu
 * Preface::                        Preface.
 * Introduction::                   What, Why, How.
-* Tutorial::                       A tutorial introduction to LilyPond.
-* Reference Manual::               Reference Manual.
-* Advanced Topics::                How it all works.
+* Tutorial::                       A tutorial introduction.
+* Notation manual::                All notation supported, and how to
+                                   produce it.
+* Literature list::                Books about notation and engraving.
+* Technical manual::               How it all works.
 * Invoking LilyPond::              Operation.
 * Converting from other formats::  Converting to lilypond source format.
 * lilypond-book manual::           Integrating text and music with lilypond-book.
-* Literature::                     Additional reading material.
-* Index::                          Unified index.
-* Reference manual details::                
+* Unified index::                  
+* Reference manual details::
+* Cheat sheet::     
 * GNU Free Documentation License:: FDL.
 @end menu
 @end ifnottex
@@ -151,12 +176,13 @@ this and other documentation.
 
 
 @c FIXME: Index has two alphabetically sorted lists @code vs plain?
-@node Index
-@unnumbered Index
+@node Unified index
+@unnumbered Unified index
 
 @printindex cp
 
 @mbinclude appendices.itely
+@mbinclude cheatsheet.itely
 @mbinclude fdl.itexi
 
 @bye