* Documentation/user/macros.itexi: comment out funindex expansion.

* Documentation/user/advanced-notation.itely (Balloon help): idem.

* Documentation/user/changing-defaults.itely (Creating contexts): idem.

* Documentation/user/programming-interface.itely (Running a
function on all layout objects): idem.

* Documentation/user/GNUmakefile (TEXI2DVI_FLAGS): add -E.

diff --git a/ChangeLog b/ChangeLog
index 169d803e25b0f79f01309cbaad3cd54bf7a32255..5678194420b9e4f0d172a1ad3afe32f80512a347 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * Documentation/user/macros.itexi: comment out funindex expansion. 
+
        * Documentation/user/music-glossary.tely: junk \oldaddlyrics
        everywhere.
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 5acde52686314c0d2211b428218e4127e3bb6c94..71e82b75c30d14df20537e71bda0813aba71b4eb 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -27,7 +27,7 @@ INFO_DOCS = lilypond lilypond-internals music-glossary
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 STEPMAKE_TEMPLATES=tex texinfo omf documentation
-TEXI2DVI_FLAGS = -E
+#TEXI2DVI_FLAGS = -E
 OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
 LOCALSTEPMAKE_TEMPLATES=lilypond ly

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 0ab3e7e227bcfa8ca6a2356b94d81546aeb318fc..7e06cca0427f0295807728aad3f5a5d743d5f1e8 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3108,7 +3108,7 @@ Program reference: @internalsref{RepeatSlash},
 @internalsref{PercentRepeat}, @internalsref{DoublePercentRepeat},
 @internalsref{DoublePercentRepeatCounter},
 @internalsref{PercentRepeatCounter},
-@internalsref{PercentRepeatedMusic}, and
+@internalsref{PercentRepeatedMusic}.
 
 
 

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 68b52bb51368db7ea2bab262a7113c35c66a1276..25b216e7b273a351ad069d1e17b06769cb8c12e0 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -197,8 +197,8 @@ user manual, @internalsref{\NAME\}
 @end macro
 
 @macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
 @end macro
+@c @findex \WORD\
+@c @kindex \WORD\