Merge master into nested-bookparts

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

diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index 39d7726660c104673503ce8439d57b0d161d558a..5f6c3cf351cd916711336232f5686969624a59a7 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -7,6 +7,10 @@
 @end ignore
 @setfilename lilypond-program.info
 @settitle GNU LilyPond program usage
+@documentencoding UTF-8
+@documentlanguage en
+
+@include macros.itexi
 
 @iftex
 @afourpaper
@@ -21,13 +25,19 @@
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
-@omfdescription User manual of the LilyPond music engraving system
+@omfdescription Program Usage of the LilyPond music engraving system
 @omftype program usage
 @omfcategory Applications|Publishing
 @omflanguage English
 @end ignore
 
 
+@ifnottex
+@node Top
+@top GNU LilyPond --- Application Usage
+@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
+@end ifnottex
+
 @ifhtml
 This document is also available as a
 @uref{source/Documentation/user/lilypond-program.pdf,PDF} and as
@@ -39,9 +49,6 @@ This document is also available as a
 @syncodeindex fn cp
 @syncodeindex vr cp
 
-@documentlanguage en
-@documentencoding utf-8
-
 
 @finalout
 
@@ -52,7 +59,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -65,25 +72,11 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -98,7 +91,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond program usage.
 
-Copyright 1999--2006 by the authors
+Copyright 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -111,14 +104,9 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond --- program usage
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
-
-This is the program usage manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the Application Usage (AU) manual for GNU LilyPond version @version{}.
+For more information about how this fits with the other
+documentation, see @rlearning{About the documentation}.
 
 @cindex web site
 @cindex URL
@@ -129,6 +117,7 @@ of this and other documentation.
 
 @menu
 * Install::                        How to install or compile.
+* Setup::                          Using LilyPond with other programs.
 * Running LilyPond::               Operation.
 * LilyPond-book::                  Integrating text and music.
 * Converting from other formats::  Converting to lilypond source format.
@@ -136,7 +125,6 @@ of this and other documentation.
 Appendices
 
 * GNU Free Documentation License:: License of this document.
-* LilyPond command index::
 * LilyPond index::
 @end menu
 @end ifnottex
@@ -144,20 +132,14 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
-@include install.itexi
+@include install.itely
+@include setup.itely
 @include running.itely
 @include lilypond-book.itely
 @include converters.itely
 
 @include fdl.itexi
 
-@node LilyPond command index
-@appendix LilyPond command index
-
-@printindex ky
-
 @node LilyPond index
 @appendix LilyPond index