* Documentation/user/music-glossary.tely: add @omf tags

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 78a8c0bb85fab49970d72232e89bb52cd5bcee02..c6b0c58d39597e239cff5a80a5bc93d7a5ea183a 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -2,24 +2,55 @@
 @setfilename lilypond.info
 @settitle GNU LilyPond
 
+@html
+<!--- @@WEB-TITLE@@=User Manual --->
+@end html
 
+@ignore
+Distributions will want to install lilypond.info doing:
+
+    ./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.
-@c * install-info: (texinfo)Invoking install-info. Update info/dir entries.
-@c * texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
+* GNU LilyPond: (lilypond).                    The GNU music typesetter.
+* ly2dvi: (lilypond)Invoking ly2dvi::          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. 
 @end direntry
 
 
+@ignore
+@omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen
+@omfdescription User manual  of the LilyPond music engraving system
+@omftype user manual
+@omfcategory Music 
+@end ignore
+
+
+
+@ifhtml
+This document is also available in @uref{../lilypond.ps.gz,gzipped
+PostScript} and @uref{../lilypond.pdf,PDF}.
+@end ifhtml
+
+
 @titlepage
 @title GNU LilyPond
 @subtitle The music typesetter
-@author Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano
+@author    
 
 
-
-Copyright @copyright{} 1999--2001 by the authors
+Copyright @copyright{} 1999--2002 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
@@ -31,10 +62,12 @@ Copyright @copyright{} 1999--2001 by the authors
 
 @end titlepage
 
-@ifinfo
+@c Han-Wen Nienhuys, Jan Nieuwenhuizen, Adrian Mariano, Tom Cato Amundsen.
+
+@ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999 Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano
+Copyright 1999-2002 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
@@ -43,17 +76,16 @@ Copyright 1999 Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano
   A copy of the license is included in the section entitled ``GNU
   Free Documentation License''.
 
-@end ifinfo
+@end ifnottex
+
 
 @ifnottex
 @node Top
-@c FIXME: this should not be necessary...
 @top
 
 @chapter GNU LilyPond --- The music typesetter
 
-LilyPond produces sheet music from input files.  This document describes
-how to use LilyPond.
+This is the user manual for GNU LilyPond 1.7.14.
 
 @cindex web site
 
@@ -61,53 +93,47 @@ 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
 
 @menu
+* Preface::                        Preface.
+* Introduction::                   What, Why, How.
 * Tutorial::                       A tutorial introduction to LilyPond.
 * Reference Manual::               Reference Manual.
-* Tricks::                       Features, tips and tricks.
+* Advanced Topics::                How it all works.
 * Invoking LilyPond::              Operation.
-* Bug reports::                   Where to report bugs.
-* ly2dvi::                         Generating nice output with titles.
-* convert-ly::                     Upgrading input files.
-* Conversion tools::               Converting from MIDI input.
-* Internals::                      How it all works.
-* Literature::                     additional reading
-* Index of internals:(lilypond-internals).  Auto generated detailed documentation.
-* Index::                  Unified index.
-* Function Index::         Function index.
-* GNU Free Documentation License::     FDL.
+* Converting from other formats::  Converting to lilypond source format.
+* Integrating text and music with lilypond-book::
+                                   The lilypond-book manual.
+* Literature::                     Additional reading material.
+* Index::                          Unified index.
+* Refman appendix::                
+* 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 tricks.itely
 @mbinclude internals.itely
 @mbinclude invoking.itexi
-@mbinclude bugs.itexi
-@mbinclude ly2dvi.itexi
-@mbinclude convert-ly.itexi
-@mbinclude convertors.itely
+@mbinclude lilypond-book.itely
+@mbinclude converters.itely
 @mbinclude literature.itely
 
+
 @c FIXME: Index has two alphabetically sorted lists @code vs plain?
 @node Index
 @unnumbered Index
 
 @printindex cp
 
-@node Function Index
-@unnumbered Function Index
-
-@printindex fn
-
+@mbinclude appendices.itely
 @mbinclude fdl.itexi
 
 @bye