(string-append): Fix @usermanref,

@glossaryref.

diff --git a/ChangeLog b/ChangeLog
index 260bf447a2f2b0f88c4228a95167aa6e5aa2b305..492a6911f09e962bc3fe253e96562d69642d45dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/documentation-generate.scm (string-append): Fix @usermanref,
+       @glossaryref.
+
 2005-03-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/page-layout.scm (default-page-make-stencil): only add header

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index dd912e4176565275e0f858c9741ac9ca97735f7e..03cc9259627a90eeb99a06d4e357077c275fec23 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -91,13 +91,13 @@
  @macro internalsref{NAME}
  @c makeinfo-4.7 encodes html names
  @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
- @inforef{\NAME\,,lilypond-internals}@c
+ @ref{\NAME\,,,lilypond-internals}@c
  @c should we do this? 
  @findex @code{\NAME\}
  @end macro
  
  @macro usermanref{NAME}
- @inforef{\NAME\,,lilypond}@c
+ @ref{\NAME\,,,lilypond}@c
  @end macro
 
  @macro inputfileref{DIR,NAME}
@@ -110,7 +110,7 @@
 
 @c **** INFO ****
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond/lilypond-internals}@c
+@inforef{\NAME\,,lilypond-internals}@c
 @findex \NAME\@c
 @end macro
 
@@ -119,7 +119,7 @@
 @end macro
 
 @macro usermanref{NAME}
-@ref{\NAME\,,,lilypond/lilypond}@c
+@inforef{\NAME\,,lilypond}@c
 @end macro
 
 @end ifinfo

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 651f3d2df454710f40008d970c25dbf73c24cb68..449bf7c5701069e62fb8d7d07a2b15a9198b4adf 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -57,16 +57,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
@@ -79,7 +81,7 @@
 
 @ifhtml
 @macro glossaryref{NAME}
-@uref{../music-glossary/\\NAME\\.html,\\NAME\\}
+@ref{\\NAME\\,,,music-glossary}
 @cindex \\NAME\\
 @end macro
 @end ifhtml