update

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 711ad408ece389ba732e92adddb610db601fc4b3..803e261bcf87ec45f353de9cde7178b75c39983a 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -6,14 +6,46 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c   ***** Displaying text *****
+
 @c we need this since @q{\} doesn't work with makeinfo 4.8 --
 @c say @q{@value{backslash}} instead
 @set backslash \
 
+@c to get decent quotes in `foo' and ``foo''
+@macro q{TEXT}
+@quoteleft{}\TEXT\@quoteright{}
+@end macro
+
+@macro qq{TEXT}
+@quotedblleft{}\TEXT\@quotedblright{}
+@end macro
 
-@c **** format-independant ****
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
+@end macro
 
-@c   regions of a doc subsection
+@c TODO: define different output for info
+@macro notation{TEXT}
+@var{\TEXT\}
+@end macro
+
+
+
+@c   **** Headings in a doc subsection ****
+
+@c not really a heading, but...
+@macro smallspace
+@sp 1
+@end macro
+
+@c obsolete; being removed.
 @macro refcommands
 @noindent
 @subsubheading Predefined commands
@@ -34,22 +66,16 @@
 
 @macro refbugs
 @noindent
-@subsubheading Bugs
+@subsubheading Known issues and warnings
 
 @end macro
 
 
-@c  use inside the text
 @macro context{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}@c should use internalsref
 @end macro
 
-@macro refcommand{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}
-@end macro
-
 @macro funindex {TEXT}
 @findex \TEXT\
 @kindex \TEXT\
@@ -57,67 +83,7 @@
 
 
 
-@c  *** Macros with variable output ***
-
-@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\'
-@end ifinfo
-@iftex
-`\TEXT\'
-@end iftex
-@ifhtml
-@html
-‘\TEXT\’
-@end html
-@end ifhtml
-@end macro
-@end ifnotdocbook
-
-@ifdocbook
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
-@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\''
-@end ifinfo
-@iftex
-``\TEXT\''
-@end iftex
-@ifhtml
-@html
-“\TEXT\”
-@end html
-@end ifhtml
-@end macro
-@end ifnotdocbook
-
-@ifdocbook
-@macro qq{TEXT}
-@xml
-“\TEXT\”
-@end xml
-@end macro
-@end ifdocbook
-
-
-
-
+@c   **** Links and references ****
 
 @c usage: @lsr{ancient,custodes.ly}
 @macro lsr{DIR,TEXT}
@@ -139,8 +105,6 @@
 @end macro
 
 
-
-
 @c  Definitions for references:
 @c     @internalsref
 @c     @rglos
@@ -260,11 +224,6 @@
 @inforef{\TEXT\,,lilypond-internals}
 @end macro
 
-@macro rglos{TEXT}
-@vindex \TEXT\
-@inforef{\TEXT\,,,music-glossary}
-@end macro
-
 @macro rprogram{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program}