(string-append): Fix @usermanref,

@glossaryref.

diff --git a/ChangeLog b/ChangeLog
index 088a70e52c11964180d9b4bd188dc02b982262e4..f0693a917d325e77fa13f2148b31c759dbbba0b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/documentation-generate.scm (string-append): Fix @usermanref,
+       @glossaryref.
+
        * Documentation/index.html.in: 
        * Documentation/user/GNUmakefile (depth): Update from 2.5.
 

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 537579f2f8f47932e137a8b400c26493211fd547..ddd340fa6a8d1d62f86dc9a7bf572b38e296a5e8 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -64,16 +64,18 @@
                  "(lilypond-internals.info)")
   "
 
+@c NOTE: This is documentation-generate.scm, not macros.itexi
+
 @ifhtml
 @macro usermanref{NAME}
-@uref{../lilypond/\\NAME\\.html,\\NAME\\}
+@ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro
 @end ifhtml
 
 @ifinfo
 @macro usermanref{NAME}
-@ref{\\NAME\\,,,lilypond/lilypond}
+@inforef{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro
 @end ifinfo
@@ -86,7 +88,7 @@
 
 @ifhtml
 @macro glossaryref{NAME}
-@uref{../music-glossary/\\NAME\\.html,\\NAME\\}
+@ref{\\NAME\\,,,music-glossary}
 @cindex \\NAME\\
 @end macro
 @end ifhtml
@@ -126,7 +128,6 @@
 @end iftex
 
 
-
 @ignore
 @omftitle LilyPond internals
 @omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen