Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / user / macros.itexi

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 32536c3cd5d5c1b1dea9dc6b9a0df809ed4614ab..142edd4405d62cd1c6219ec510aeb22af80244aa 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -62,7 +62,7 @@
 
 @macro lsrdir{DIR}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+  @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
 @end ifhtml
 @ifnothtml
   @file{\DIR\}
@@ -115,31 +115,49 @@
 @ref{\NAME\,,,music-glossary-big-page}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program-big-page}
+@end macro
+
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-big-page}
+@end macro
+
 @end ifset
 
 
 @ifclear bigpage
 
-@c annoying parentheses stripped by add-html-footer.py
 @macro internalsref{NAME}
 @vindex \NAME\
 @ref{\NAME\,,,lilypond-internals}
 @end macro
 
-@c annoying parentheses stripped by add-html-footer.py
 @macro rglos{NAME}
 @vindex \NAME\
 @ref{\NAME\,,,music-glossary}
 @end macro
 
-@end ifclear
-
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
 
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
 @end macro
 
+@end ifclear
+
+
 @c to get decent quotes in `foo'
 @macro q{TEXT}
 @html
@@ -174,6 +192,16 @@
 @ref{\NAME\,,,music-glossary}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
+@end macro
+
 @c to get decent quotes in `foo'
 @macro q{TEXT}
 @xml
@@ -203,7 +231,7 @@
 @file{\DIR\/\NAME\}
 @end macro
 
-@macro rglos{NAME}@c
+@macro rglos{NAME}
 @vindex \NAME\
 @inforef{\NAME\,,,music-glossary}
 @end macro
@@ -212,6 +240,16 @@
 @inforef{\NAME\}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
+@end macro
+
 @c to get decent quotes in `foo'
 @macro q{TEXT}
 `\TEXT\'
@@ -250,6 +288,12 @@ internals document, @internalsref{\NAME\}
 user manual, @internalsref{\NAME\}
 @end macro
 
+@macro rprogram{NAME}
+program usage manual, @internalsref{\NAME\}
+@end macro
+
+@alias ruser=usermanref
+
 @c to get decent quotes in `foo'
 @macro q{TEXT}
 `\TEXT\'