More macro simplifications.

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 593214733ac18292795d0a41d49905c0b5645df5..0ab04b7eb750c2241483c9f49131184546521c0f 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2198,7 +2198,7 @@ be achieved in LilyPond by setting @code{doubleSlurs},
 
 @seealso
 
-Program reference: @seeinternals{Slur}.
+Program reference: @internalsref{Slur}.
 
 
 @node Phrasing slurs

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 5ef01312bb9448d4967607d49121cabf38379cef..711ad408ece389ba732e92adddb610db601fc4b3 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -62,6 +62,9 @@
 @c   Use inside the text
 
 @c to get decent quotes in `foo'
+
+@c I don't understand why this is necessary, but it is with 4.8. :/
+@ifnotdocbook
 @macro q{TEXT}
 @ifinfo
 `\TEXT\'
@@ -74,17 +77,21 @@
 ‘\TEXT\’
 @end html
 @end ifhtml
-@ignore
+@end macro
+@end ifnotdocbook
+
 @ifdocbook
+@macro q{TEXT}
 @xml
 ‘\TEXT\’
 @end xml
-@end docbook
-@end ignore
 @end macro
+@end ifdocbook
 
 
 @c to get decent quotes in ``foo''
+@c I don't understand why this is necessary, but it is with 4.8. :/
+@ifnotdocbook
 @macro qq{TEXT}
 @ifinfo
 ``\TEXT\''
@@ -97,14 +104,17 @@
 “\TEXT\”
 @end html
 @end ifhtml
-@ignore
+@end macro
+@end ifnotdocbook
+
 @ifdocbook
+@macro qq{TEXT}
 @xml
 “\TEXT\”
 @end xml
-@end docbook
-@end ignore
 @end macro
+@end ifdocbook
+
 
 
 
@@ -131,6 +141,12 @@
 
 
 
+@c  Definitions for references:
+@c     @internalsref
+@c     @rglos
+@c     @rprogram
+@c     @ruser
+@c     @rlearning
 
 @ifhtml
 @c ***** HTML *****
@@ -249,14 +265,6 @@
 @inforef{\TEXT\,,,music-glossary}
 @end macro
 
-@macro usermanref{TEXT}
-@inforef{\TEXT\}
-@end macro
-
-@macro learningref{TEXT}
-@inforef{\TEXT\}
-@end macro
-
 @macro rprogram{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program}
@@ -288,46 +296,19 @@
 @code{\TEXT\}
 @end macro
 
-@macro seeinternals{TEXT}
-internals document, @internalsref{\TEXT\}
+@macro rprogram{TEXT}
+program usage manual, @internalsref{\TEXT\}
 @end macro
 
-@macro usermanref{TEXT}
+@macro ruser{TEXT}
 user manual, @internalsref{\TEXT\}
 @end macro
 
-@macro learningref{TEXT}
+@macro rlearning{TEXT}
 learning manual, @internalsref{\TEXT\}
 @end macro
 
-@macro rprogram{TEXT}
-program usage manual, @internalsref{\TEXT\}
-@end macro
-
-@alias ruser=usermanref
-@alias rlearning=learningref
-
 @end iftex
 
 
-@ifnottex
-@c **** not TEX ****
-
-@macro seeinternals{TEXT}
-@internalsref{\TEXT\}
-@end macro
-
-@ifnotinfo
-@macro usermanref{TEXT}
-@ref{\TEXT\}
-@end macro
-
-@macro learningref{TEXT}
-@ref{\TEXT\}
-@end macro
-@end ifnotinfo
-
-@end ifnottex
-
-
 @c EOF