Doc: misc minor changes to Usage.

diff --git a/Documentation/application/converters.itely b/Documentation/application/converters.itely
index 0b072317a7a17215655266424f71a9d0f229cb55..9efee75e0cc0f767bb0756c9cdee94cd784ecac5 100644 (file)
--- a/Documentation/application/converters.itely
+++ b/Documentation/application/converters.itely
@@ -22,8 +22,7 @@ These are separate programs from @command{lilypond} itself, and are
 run on the command line; see @ref{Command-line usage} for more
 information.  If you have MacOS 10.3 or 10.4 and you have trouble
 running some of these scripts, e.g. @code{convert-ly}, see
-FIXME FIXME 
-@c @ref{Setup for MacOS X}.
+@rgeneral{MacOS X}.
 
 
 @knownissues
@@ -36,7 +35,7 @@ bug reports will almost certainly not be resolved.
 * Invoking musicxml2ly::        Importing MusicXML.
 * Invoking abc2ly::             Importing ABC.
 * Invoking etf2ly::             Importing Finale.
-* Generating LilyPond files::   GUIs, transcribers, and algorithmic composition programs.
+* Other formats::
 @end menu
 
 
@@ -199,6 +198,9 @@ input file is a zip-compressed MusicXML file.
 @node Invoking abc2ly
 @section Invoking @code{abc2ly}
 
+@warning{This program is not supported, and may be remove from
+future versions of LilyPond.}
+
 @cindex ABC
 
 ABC is a fairly simple ASCII based format.  It is described at the ABC site:
@@ -264,6 +266,9 @@ ABC synchronizes words and notes at the beginning of a line;
 @node Invoking etf2ly
 @section Invoking @command{etf2ly}
 
+@warning{This program is not supported, and may be remove from
+future versions of LilyPond.}
+
 @cindex ETF
 @cindex enigma
 @cindex Finale
@@ -301,43 +306,12 @@ The list of articulation scripts is incomplete.  Empty measures
 confuse @command{etf2ly}.  Sequences of grace notes are ended improperly.
 
 
-@node Generating LilyPond files
-@section Generating LilyPond files
+@node Other formats
+@section Other formats
 
 @cindex External programs, generating LilyPond files
 
-LilyPond itself does not come with support for any other formats, but
-there are some external tools that also generate LilyPond files.
-
-These tools include
-
-@itemize
-@item
-@uref{http://@/www@/.denemo@/.org/,Denemo}, a graphical score editor.
-@item
-@uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
-monophonic MIDI to LilyPond converter.
-@item
-@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
-Emacs major mode.
-@item
-@uref{http://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
-@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
-@item
-@uref{http://@/noteedit@/.berlios@/.de,NoteEdit}
-which imports @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
-@item
-@uref{http://@/www@/.rosegardenmusic@/.com,Rosegarden},
-which imports MIDI
-@item
-@uref{http://@/common-lisp@/.net/project/fomus/,FOMUS},
-a LISP library to generate music notation
-@item
-@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml},
-has experimental export for LilyPond.
-@item
-@uref{http://www.tuxguitar.com.ar/}, can export to LilyPond.
-@item
-@uref{http://musescore.org} can also export to LilyPond.
-@end itemize
+LilyPond itself does not come with support for any other formats,
+but some external tools can also generate LilyPond files.  These
+are listed in @rgeneral{Alternate editors}.
 

diff --git a/Documentation/application/lilypond-book.itely b/Documentation/application/lilypond-book.itely
index fa22f2e72e7faeba0bcebb5a06fd2e040defe614..19649e2c3971404b1164a8353eb42675e8b70df7 100644 (file)
--- a/Documentation/application/lilypond-book.itely
+++ b/Documentation/application/lilypond-book.itely
@@ -27,7 +27,7 @@ the music are adjusted to match the layout of your document.
 This is a separate program from @command{lilypond} itself, and is run
 on the command line; for more information, see @ref{Command-line
 usage}.  If you have MacOS 10.3 or 10.4 and you have trouble running
-@code{lilypond-book}, see FIXME FIXME @c @ref{Setup for MacOS X}.
+@code{lilypond-book}, see @rgeneral{MacOS X}.
 
 This procedure may be applied to @LaTeX{}, HTML, Texinfo or DocBook
 documents.

diff --git a/Documentation/application/running.itely b/Documentation/application/running.itely
index c123b8bc959a542d8488e267162e500ade64cb2c..1d221793e20ab71ac7448aacb921ade274caad35 100644 (file)
--- a/Documentation/application/running.itely
+++ b/Documentation/application/running.itely
@@ -738,10 +738,11 @@ There is support for different text editors for LilyPond.
 @menu
 * Emacs mode::                  
 * Vim mode::                    
+* Other editors::
 @end menu
 
 @node Emacs mode
-@subsection Emacs mode
+@unnumberedsubsec Emacs mode
 
 Emacs has a @file{lilypond-mode}, which provides keyword
 autocompletion, indentation, LilyPond specific parenthesis matching
@@ -766,7 +767,7 @@ your @var{load-path} by appending the following line (as modified) to your
 
 
 @node Vim mode
-@subsection Vim mode
+@unnumberedsubsec Vim mode
 
 For @uref{http://@/www@/.vim@/.org,VIM}, a @file{vimrc} is supplied,
 along with syntax coloring tools.  A Vim mode for entering music and
@@ -797,5 +798,11 @@ where $@{LILYPOND_VERSION@} is your LilyPond version.  If LilyPond was not
 installed in @file{/usr/local/}, then change this path accordingly.
 
 
+@node Other editors
+@unnumberedsubsec Other editors
 
+Other editors (both text and graphical) support LilyPond, but
+their special configuration files are not distributed with
+LilyPond.  Consult their documentation for more information.  Such
+editors are listed in @rgeneral{Alternate editors}.
 

diff --git a/Documentation/application/suggestions.itely b/Documentation/application/suggestions.itely
index a32768ac0094212642ac8ab628d50139fa27c2bc..dc1cb14f6c5592a8bed384d57705cb06cb4bfca3 100644 (file)
--- a/Documentation/application/suggestions.itely
+++ b/Documentation/application/suggestions.itely
@@ -44,7 +44,7 @@ structured in order to be easier (or harder) to update.
 * General suggestions::         
 * Typesetting existing music::  
 * Large projects::              
-* When things don't work::      
+* Troubleshooting::             
 * Make and Makefiles::          
 @end menu
 
@@ -194,15 +194,8 @@ g4\fthenp c'8. e16
 @end itemize
 
 
-@node When things don't work
-@section When things don't work
-
-@menu
-* Troubleshooting (taking it all apart)::  
-@end menu
-
-@node Troubleshooting (taking it all apart)
-@subsection Troubleshooting (taking it all apart)
+@node Troubleshooting
+@section Troubleshooting
 
 Sooner or later, you will write a file that LilyPond cannot
 compile.  The messages that LilyPond gives may help

diff --git a/Documentation/general/introduction.itexi b/Documentation/general/introduction.itexi
index 2a3610195c54c6db902f2efddbbb8db813e07edd..02628af63df816e7568e5577252ab6e05ced7a3d 100644 (file)
--- a/Documentation/general/introduction.itexi
+++ b/Documentation/general/introduction.itexi
@@ -902,6 +902,38 @@ Other features are lyric hyphenation and running LilyPond on
 multiple files at once from within the KDE file manager.
 
 
+FIXME
+Other programs can export LilyPond code:
+
+@itemize
+@item
+@uref{http://@/www@/.denemo@/.org/,Denemo}, a graphical score editor.
+@item
+@uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
+monophonic MIDI to LilyPond converter.
+@item
+@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
+Emacs major mode.
+@item
+@uref{http://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
+@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
+@item
+@uref{http://@/noteedit@/.berlios@/.de,NoteEdit}
+which imports @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
+@item
+@uref{http://@/www@/.rosegardenmusic@/.com,Rosegarden},
+which imports MIDI
+@item
+@uref{http://@/common-lisp@/.net/project/fomus/,FOMUS},
+a LISP library to generate music notation
+@item
+@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml},
+has experimental export for LilyPond.
+@item
+@uref{http://www.tuxguitar.com.ar/}, can export to LilyPond.
+@item
+@uref{http://musescore.org} can also export to LilyPond.
+@end itemize
 @divEnd