From efab6ae7b780b5e59e23f54b7968050ba896b86b Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sat, 15 Sep 2007 13:32:32 -0700 Subject: [PATCH] More macro simplifications. --- Documentation/user/basic-notation.itely | 2 +- Documentation/user/macros.itexi | 71 +++++++++---------------- 2 files changed, 27 insertions(+), 46 deletions(-) diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely index 593214733a..0ab04b7eb7 100644 --- 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 5ef01312bb..711ad408ec 100644 --- 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 -- 2.39.5