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

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 55962b53a17554221ce46cdc00f366e8789dfa0e..5a98638c2b1747ac538561d12da9ac4a11e5ca5c 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -6,7 +6,6 @@
     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 --
@@ -14,63 +13,39 @@
 @set backslash \
 
 @c to get decent quotes in `foo' and ``foo''
-@c  these need to be split up so that "@qq{foo}." looks nice.  :(
-@iftex
 @macro q{TEXT}
-`\TEXT\'
+@quoteleft{}\TEXT\@quoteright{}
 @end macro
 
 @macro qq{TEXT}
-``\TEXT\''
-@end macro
-@end iftex
-
-
-@ifinfo
-@macro q{TEXT}
-`\TEXT\'
+@quotedblleft{}\TEXT\@quotedblright{}
 @end macro
 
-@macro qq{TEXT}
-``\TEXT\''
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
 @end macro
-@end ifinfo
 
-
-@ifhtml
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
+@c TODO: define different output for info
+@macro notation{TEXT}
+@var{\TEXT\}
 @end macro
 
-@macro qq{TEXT}
-@html
-“\TEXT\”
-@end html
-@end macro
-@end ifhtml
 
 
-@ifdocbook
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
-@end macro
+@c   **** Headings in a doc subsection ****
 
-@macro qq{TEXT}
-@xml
-“\TEXT\”
-@end xml
+@c not really a heading, but...
+@macro smallspace
+@sp 1
 @end macro
-@end ifdocbook
-
-
-
-
-@c   **** Headings in a doc subsection ****
 
+@c obsolete; being removed.
 @macro refcommands
 @noindent
 @subsubheading Predefined commands
@@ -91,20 +66,10 @@
 
 @macro refbugs
 @noindent
-@subsubheading Bugs
-
-@end macro
-
+@subsubheading Known issues and warnings
 
-@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\
@@ -254,6 +219,11 @@
 @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}
@@ -282,19 +252,22 @@
 
 @macro rglos {TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
 @macro rprogram{TEXT}
-program usage manual, @internalsref{\TEXT\}
+program usage manual, @ref{\TEXT\,,,lilypond-program}
+@c @internalsref{\TEXT\}
 @end macro
 
 @macro ruser{TEXT}
-user manual, @internalsref{\TEXT\}
+notation reference, @ref{\TEXT\,,,lilypond}
+@c @internalsref{\TEXT\}
 @end macro
 
 @macro rlearning{TEXT}
-learning manual, @internalsref{\TEXT\}
+learning manual, @ref{\TEXT\,,,lilypond-learning}
+@c @internalsref{\TEXT\}
 @end macro
 
 @end iftex