* GNUmakefile.in (EXTRA_DIST_FILES): remove VIM stuff.

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index b94ada7b0317868c7b899285d8a44112e2669277..8a187a9b08513381e92d1ea76c21217caee120ca 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -1,29 +1,30 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename lilypond.info
 @settitle GNU LilyPond
-
-
+@iftex
+@afourpaper
+@end iftex
 
 @ignore
-Distributions will want to install lilypond.info doing:
+Distributions will want to install lilypond.info in postinstall, doing:
 
-    ./install-info --info-dir=/usr/share/info out/lilypond.info
+    install-info --info-dir=/usr/share/info out/lilypond.info
     
 @end ignore
+
 @dircategory GNU music project
 @direntry
 @c    ;; prepend GNU for dir, must be unique
-* GNU LilyPond: (lilypond).                    The GNU music typesetter.
-* 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.
-* etf2ly: (lilypond)Invoking etf2ly::          Importing Finale.
-* abc2ly: (lilypond)Invoking abc2ly::          Importing ABC.          
-* pmx2ly: (lilypond)Invoking pmx2ly::          Importing PMX.
-* musedata2ly: (lilypond)Invoking musedata2ly::
-                                               Importing Musedata.
-* mup2ly: (lilypond)Invoking mup2ly::          Importing MUP. 
+* GNU LilyPond: (./lilypond/lilypond).           The GNU music typesetter.
+* lilypond: (./lilypond/lilypond)Invoking LilyPond.      Titling LilyPond scores.
+* Glossary: (./lilypond/music-glossary).                  Glossary of music terms.
+* convert-ly: (./lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
+* midi2ly: (./lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
+* etf2ly: (./lilypond/lilypond)Invoking etf2ly.          Importing Finale.
+* abc2ly: (./lilypond/lilypond)Invoking abc2ly.          Importing ABC.          
+* pmx2ly: (./lilypond/lilypond)Invoking pmx2ly.          Importing PMX.
+* musedata2ly: (./lilypond/lilypond)Invoking musedata2ly.        Importing MuseData.
+* mup2ly: (./lilypond/lilypond)Invoking mup2ly.          Importing Mup. 
 @end direntry
 
 
@@ -78,7 +79,7 @@ PostScript} and @uref{../lilypond.pdf,PDF}.
 
 
 
-Copyright @copyright{} 1999--2003 by the authors
+Copyright @copyright{} 1999--2004 by the authors
 
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.1
@@ -90,17 +91,18 @@ Copyright @copyright{} 1999--2003 by the authors
 @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 
- }
+@lilypond[raggedright]
+\score {
+    \context Lyrics \notes {
+        \override Score.RehearsalMark   #'self-alignment-X = #LEFT
+        \mark #(ly:export (string-append
+             "(For LilyPond version " (lilypond-version) ")"))
+        s2
+     }
+     \paper {
+         indent = 0.0\pt
+         raggedright = ##t
+     }
 }
 @end lilypond
   
@@ -111,7 +113,7 @@ s2
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2003 by the authors
+Copyright 1999--2004 by the authors
 
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.1
@@ -125,11 +127,13 @@ Copyright 1999--2003 by the authors
 
 @ifnottex
 @node Top
-@top
-
-@chapter GNU LilyPond --- The music typesetter
+@top GNU LilyPond --- The music typesetter
+@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user manual for GNU LilyPond 1.8.0.
+This is the user manual for GNU LilyPond 2.1.x series.
+@ifhtml
+(See the bottom of this page for the exact version number).
+@end ifhtml
 
 @cindex web site
 
@@ -137,7 +141,7 @@ A further source of information is the website, which can be found at
 @uref{http://www.lilypond.org/}.  The website contains on-line copies of
 this and other documentation.
 
-@mbinclude dedication.itely
+@include dedication.itely
 
 @menu
 * Preface::                        Preface.
@@ -145,41 +149,41 @@ this and other documentation.
 * Tutorial::                       A tutorial introduction.
 * Notation manual::                All notation supported, and how to
                                    produce it.
-* Literature::                     Books about notation and engraving.
+* Using LilyPond::               How it all works.
 * 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.
-* Index::                          Unified index.
+* Unified index::                  
 * Reference manual details::
 * Cheat sheet::     
 * GNU Free Documentation License:: FDL.
 @end menu
 @end ifnottex
 
-
 @contents
 
-@mbinclude macros.itexi
-@mbinclude preface.itely
-@mbinclude introduction.itely 
-@mbinclude tutorial.itely
-@mbinclude refman.itely
-@mbinclude literature.itely
-@mbinclude internals.itely
-@mbinclude invoking.itexi
-@mbinclude lilypond-book.itely
-@mbinclude converters.itely
+
+@include macros.itexi
+@include preface.itely
+@include introduction.itely 
+@include tutorial.itely
+@include refman.itely
+@include running.itely
+@include internals.itely
+@include invoking.itexi
+@include lilypond-book.itely
+@include converters.itely
 
 
 @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
+@include appendices.itely
+@include cheatsheet.itely
+@include fdl.itexi
 
 @bye