* Documentation/user/lilypond.tely:

* Documentation/user/lilypond-book.itely: Fix names of lilypond
and lilypond-book nodes, so that `info lilypond' visits the manual
at top level, and `info lilypond-book' visits the lilypond-book
section.

* Documentation/user/GNUmakefile (local-install-info): Fix rules
and packager messages.

diff --git a/ChangeLog b/ChangeLog
index 7d45f729bfc8f936d17c37ea18163f93b17b3909..86b2f28c46a9036fd8d0565aed629d630242bc9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-11-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * Documentation/user/lilypond.tely:
+       * Documentation/user/lilypond-book.itely: Fix names of lilypond
+       and lilypond-book nodes, so that `info lilypond' visits the manual
+       at top level, and `info lilypond-book' visits the lilypond-book
+       section.
+
+       * Documentation/user/GNUmakefile (local-install-info): Fix rules
+       and packager messages.
+
        * lily/pangofc-afm-decoder.cc: Update test.
 
 2004-11-16  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 0980a1ab6bd81c9a656c4f48f12ca58197086e69..b342ffa3f290ba6853ffe08a236d2ea648cacf31 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -44,31 +44,71 @@ ifeq ($(out),www)
 # This builds all .info targets with images, in out-www.
 # Viewawble with a recent Emacs, doing: M-x info out-www/lilypond.info
 
-#info: $(INFO_FILES)
-
 # Cancel the special, non-image info generation rule that skips images:
 $(outdir)/%.info: $(outdir)/%.nexi
 
-local-install-info: install-info info
+local-install-info: info
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## Can not have absolute symlinks because some binary packages build schemes
 ## install files in nonstandard root.  Best we can do is to notify the
 ## builder or packager.
-       @echo "***"
+       @echo
+       @echo "***************************************************************"
+       @echo "Please add or update the LilyPond direntries, do"
+       @echo
+       @echo "    install-info --info-dir=$(infodir) $(outdir)/lilypond.info"
+       @echo
        @echo "For images in the INFO docs to work, do: "
+       @echo
        @echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)"
        @echo "or add something like that to the postinstall script."
-       @echo "***"
+       @echo
 else
+
+       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+       install-info --info-dir=$(infodir) $(outdir)/lilypond.info
        (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
 endif
 
 local-uninstall-WWW:
        rm -f $(package_infodir)/*.png
+
+else
+
+# Cancel the default info generation rule that generates images:
+$(outdir)/%.info: # $(outdir)/%.texi
+
+local-install-info: info
+       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
+## Can not have absolute symlinks because some binary packages build schemes
+## install files in nonstandard root.  Best we can do is to notify the
+## builder or packager.
+       @echo
+       @echo "***************************************************************"
+       @echo "Please add or update the LilyPond direntries, do"
+       @echo
+       @echo "    install-info --info-dir=$(infodir) out/lilypond.info"
+       @echo
+       @echo "For images in the INFO docs to work, do"
+       @echo
+       @echo "    make out=www install-info "
+       @echo
+       @echo "and read the extra instructions."
+       @echo
 else
-    # Cancel the default info generation rule that generates images:
-    $(outdir)/%.info: # $(outdir)/%.texi
+       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+       install-info --info-dir=$(infodir) $(outdir)/lilypond.info
+       @echo
+       @echo "***************************************************************"
+       @echo "For images in the INFO docs to work, do"
+       @echo
+       @echo "    make out=www install-info "
+       @echo
+endif
+
+
 endif
 
 # All web targets, except info image symlinks and info docs are

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index ca028e88568677c4a184487a647203a5b247883e..53a68f0c9388f43ac17c45d14602e1a81851ebe5 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -1233,7 +1233,7 @@ gcdg = { \grace { g'32[ c' d']  } }
 @section Lilypond-book templates
 
 These templates are for use with @code{lilypond-book}.  If you're not familiar
-with this program, please refer to @ref{Integrating text and music}.
+with this program, please refer to @ref{LilyPond-book}.
 
 @subsection LaTeX
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index ce974f9b867b65f37372020516d6b9765a6ffa99..a4eb8354b4cea2d1cc7a16dd6d419fb3d2127991 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -681,11 +681,10 @@ programs.
 
 @item
 @ifhtml
-The
+The chapter
 @end ifhtml
-@emph{@ref{Integrating text and music}}
-explains the details behind creating documents with in-line music
-examples (like this manual).
+@emph{@ref{LilyPond-book}} explains the details behind creating
+documents with in-line music examples (like this manual).
 
 @item
 @ifhtml

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 6f7861eb2e89dd0092d0199159f16812f18eb171..b168f35c49435c5046fd38641eb219cb76e4a1f8 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -13,9 +13,9 @@ TODO: cleanup
 @end ignore
 
 
-
-@node Integrating text and music
-@chapter Integrating text and music
+@c Note: keep this node named so that `info lilypond-book' brings you here.
+@node LilyPond-book
+@chapter LilyPond-book: Integrating text and music
 
 If you want to add pictures of music to a document, you can simply do it
 the way you would do with other types of pictures.  The pictures are
@@ -31,13 +31,13 @@ the music are adjusted to match the layout of your document.
 This procedure may be applied to La@TeX{}, HTML or Texinfo documents.
 
 @menu
-* An example of a musicological document::
-* Integrating LaTeX and music::
-* Integrating Texinfo and music::
-* Integrating HTML and music::
-* Music fragment options::
-* Invoking lilypond-book::
-* Filename extensions::
+* An example of a musicological document::  
+* Integrating LaTeX and music::  
+* Integrating Texinfo and music::  
+* Integrating HTML and music::  
+* Music fragment options::      
+* Invoking lilypond-book::      
+* Filename extensions::         
 @end menu
 
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 5603e400aef4128fc98eab5bf99a09f35da9eea4..e7456862bfcf8bd46dc6f404dc8426a9b7dc04a8 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -14,18 +14,28 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 @dircategory GNU music project
 @direntry
-@c  prepend GNU for dir, must be unique
-@c  do not list the `lilypond' node at toplevel, so that `info lilypond'
-@c  goes to Top.
+@ignore
+
+  * Prepend GNU for dir, must be unique.
+  
+  * Do not list the `lilypond' node at toplevel, so that `info lilypond'
+    goes to Top.
+
+  * List all commands in direntry.
+  
 @c  * lilypond: (lilypond/lilypond)Running LilyPond.      Invoking the
-@c  LilyPond  program.
-* GNU LilyPond: (lilypond/lilypond).           The GNU music typesetter.
+@c    LilyPond  program.
+  
+@end ignore
+
+* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
+* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.          
 * 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.          
-* musedata2ly: (lilypond/lilypond)Invoking musedata2ly.        Importing MuseData.
+* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
+* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
 * mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup. 
+* musedata2ly: (lilypond/lilypond)Invoking musedata2ly.        Importing MuseData.
 @end direntry
 
 
@@ -251,7 +261,7 @@ of this and other documentation.
 * Interfaces for programmers::
 * Running LilyPond::               Operation.
 * Converting from other formats::  Converting to lilypond source format.
-* Integrating text and music::     Integrating text and music with lilypond-book.
+* LilyPond-book::                  Integrating text and music.
 * Literature list::
 * Scheme tutorial::
 * Notation manual details::