* Documentation/user/macros.itexi (@internalsref) [info]: Prepend

`lilypond/' to info file name.
(@usermanref) [info]: New variant.

* scm/documentation-generate.scm: Fix definition of @usermanref
and @glossaryref (in the `ifinfo' branch) by prepending `lilypond/'
to info file name.

diff --git a/ChangeLog b/ChangeLog
index ce15579bf48e3fe2726cb87fb450326287129639..0cb9b6a4844cb0655411517b41ffd7362e5f212d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-30  Werner Lemberg  <wl@gnu.org>
+
+       * Documentation/user/macros.itexi (@internalsref) [info]: Prepend
+       `lilypond/' to info file name.
+       (@usermanref) [info]: New variant.
+
+       * scm/documentation-generate.scm: Fix definition of @usermanref
+       and @glossaryref (in the `ifinfo' branch) by prepending `lilypond/'
+       to info file name.
+
 2004-03-30  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * Documentation/user/changing-defaults.itely (Interpretation

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 9d0e1bd74a11b49cdc0d15f165cabda62fc8f310..e7e01562c2019af8b8328e0a8e4cf6585f8ceb23 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -112,7 +112,7 @@ b
 
 @ifinfo
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
 @cindex \NAME\@c
 @end macro
 
@@ -145,9 +145,17 @@ internals document,  @internalsref{\NAME\}
 @end macro
 @end ifnottex
 
+@ifinfo
+@macro usermanref{NAME}
+@ref{\NAME\,,,lilypond/lilypond}@c
+@end macro
+@end ifinfo
+
+@ifnotinfo
 @macro usermanref{NAME}
 @ref{\NAME\}@c
 @end macro
+@end ifnotinfo
 
 @macro refbugs
 @noindent

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 8c47ee102149b5ea75a4f23138b1fa90a2722d4e..e1f8235784703d0b4a413f5ba3f4e0affa18683f 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -75,7 +75,7 @@
 
 @ifinfo
 @macro usermanref{NAME}
-@inforef{\\NAME\\,,lilypond}
+@ref{\\NAME\\,,,lilypond/lilypond}
 @cindex \\NAME\\
 @end macro
 @end ifinfo
@@ -95,7 +95,7 @@
 
 @ifinfo
 @macro glossaryref{NAME}
-@inforef{\\NAME\\,,music-glossary}
+@inforef{\\NAME\\,,lilypond/music-glossary}
 @cindex \\NAME\\
 @end macro
 @end ifinfo