add rule for .nexi

diff --git a/ChangeLog b/ChangeLog
index 78849608af8768268aea43d8b5f395b018e00bb8..ad2d4d18cee7ca362d5c1995749020c6ef07690c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2004-03-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * Documentation/user/GNUmakefile: add rule for .nexi
+
 2004-03-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * Documentation/user/music-glossary.tely: move glossary direntry
+
        * stepmake/stepmake/texinfo-vars.make (INFOINSTALL): 
        only do mkdir/install-info if INFO_INSTALL_FILES != "".
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 2e83124b7e24977772569c7c9800e17269fa1c3d..0b818d9638b614dd22a7eedcb8da5a0486bb7522 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -153,6 +153,7 @@ $(builddir)/mf/$(outconfbase)/feta16list.ly:
        $(MAKE) -C $(topdir)/mf
 
 $(outdir)/lilypond.texi: $(ITELY_FILES) macros.itexi 
+$(outdir)/lilypond.nexi: $(ITELY_FILES) macros.itexi 
 
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 2e2e63b75e7052d0218b68e8ebad98e2674b78c0..7ba191a38a261e9c91dd6431458e18be86e7cef7 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -19,7 +19,6 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @c  goes to Top.
 @c  * lilypond: (lilypond/lilypond)Invoking LilyPond.      Titling LilyPond scores.
 * GNU LilyPond: (lilypond/lilypond).           The GNU music typesetter.
-* Glossary: (lilypond/music-glossary).                  Glossary of music terms.
 * convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
 * midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
 * etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 1d12f9c94539e027a41c41539aa0fd2af9a53161..de4c5c0e46facc6d0694f27862b24ae5eb73a8ae 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -2,6 +2,10 @@
 @settitle Music Glossary
 @setfilename music-glosssary.info
 
+@dircategory GNU music project
+@direntry
+* Glossary: (lilypond/music-glossary).                  Glossary of music terms.
+@end direntry
 
 @ifhtml
 This document is also available in @uref{music-glossary.ps.gz,gzipped

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 2f3b4c6b052ad80b84c5bfd8b712fee11ed2856a..800ef240b2cda9e327f280a61247a8e8097bd358 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -3557,7 +3557,7 @@ This results in the following output:
 @lilypond[raggedright]
 \score {
   \context ChoirStaff 
-  \notes \relative c'' <<
+  \notes \relative c' <<
     \new staff {
       as'' c e2 cis,2
     }

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 744c04894c79e0425a90a98a4660b78f4d7352c5..f1f6cb19e1a42d0ed1d6a828806da637f340839b 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1340,7 +1340,7 @@ Entering such parts is done by entering each voice as a sequence (with
 @code{@{ .. @}}), and combining those simultaneously, separating the
 voices with @code{\\}:
 
-@lilypond[verbatim,relative=1]
+@lilypond[verbatim,relative=2]
   << { a4 g2 f4~ f4 } \\
      { r4 g4 f2  f4 } >>
 @end lilypond
@@ -1349,7 +1349,7 @@ For polyphonic music typesetting, spacer rests can also be convenient: these
 are rests that do not print.  It is useful for filling up voices that
 temporarily do not play. Here is the same example with a spacer rest
 instead of a normal rest
-@lilypond[relative=1]
+@lilypond[relative=2]
  << { a4 g2 f4~ f4 } \\
     { s4 g4 f2  f4 } >>
 @end lilypond