Merge branch '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 b8088341252857829998a1a115125ce3abf4d66c..918e0b7b1c54fccd2769dc92a4abd574ea5b10ec 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -7,27 +7,30 @@
 @end ignore
 @setfilename lilypond-program.info
 @settitle GNU LilyPond program usage
+@documentencoding UTF-8
+@documentlanguage en
+
+@include macros.itexi
 
-@iftex
 @afourpaper
-@c don't replace quotes with directed quotes
-@tex
-\gdef\SETtxicodequoteundirected{Foo}
-\gdef\SETtxicodequotebacktick{Bla}
-@end tex
-@end iftex
 
 
 @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 +42,6 @@ This document is also available as a
 @syncodeindex fn cp
 @syncodeindex vr cp
 
-@documentlanguage en
-@documentencoding utf-8
-
 
 @finalout
 
@@ -52,7 +52,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 +65,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 +84,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 +97,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
@@ -137,7 +118,6 @@ of this and other documentation.
 Appendices
 
 * GNU Free Documentation License:: License of this document.
-* LilyPond command index::
 * LilyPond index::
 @end menu
 @end ifnottex
@@ -145,9 +125,7 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
-@include install.itexi
+@include install.itely
 @include setup.itely
 @include running.itely
 @include lilypond-book.itely
@@ -155,11 +133,6 @@ Appendices
 
 @include fdl.itexi
 
-@node LilyPond command index
-@appendix LilyPond command index
-
-@printindex ky
-
 @node LilyPond index
 @appendix LilyPond index