Begin using 3-value @lsr macros.

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b5a231d35414aab7273a70a8084f8023b4a6f3b0..df8844a4287e9109bdd5531fff67504446dcacd1 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,65 +13,27 @@
 @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\'
-@end macro
-
-@macro qq{TEXT}
-``\TEXT\''
-@end macro
-@end iftex
-
-
-@ifinfo
-@macro q{TEXT}
-`\TEXT\'
-@end macro
-
-@macro qq{TEXT}
-``\TEXT\''
-@end macro
-@end ifinfo
-
-
-@ifhtml
 @macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
+@quoteleft{}\TEXT\@quoteright{}
 @end macro
 
 @macro qq{TEXT}
-@html
-“\TEXT\”
-@end html
+@quotedblleft{}\TEXT\@quotedblright{}
 @end macro
-@end ifhtml
 
-
-@ifdocbook
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
-@end macro
-
-@macro qq{TEXT}
-@xml
-“\TEXT\”
-@end xml
-@end macro
-@end ifdocbook
-
-@c  TODO: experimental.  Don't use unless Graham confirms it.
 @macro warning{TEXT}
 @quotation
+@quotation
 @cartouche
-@strong{Note:} \TEXT\
+@b{Note:} \TEXT\
 @end cartouche
 @end quotation
+@end quotation
+@end macro
+
+@c TODO: define different output for info
+@macro notation{TEXT}
+@var{\TEXT\}
 @end macro
 
 
@@ -84,7 +45,7 @@
 @sp 1
 @end macro
 
-@c absolete; being removed.
+@c obsolete; being removed.
 @macro refcommands
 @noindent
 @subsubheading Predefined commands
@@ -93,7 +54,8 @@
 
 @macro commonprop
 @noindent
-@subsubheading Commonly tweaked properties
+@c @subsubheading Commonly tweaked properties
+@subsubheading Selected Snippets
 
 @end macro
 
@@ -101,6 +63,7 @@
 @noindent
 @subsubheading See also
 
+@indent
 @end macro
 
 @macro refbugs
@@ -110,16 +73,6 @@
 @end macro
 
 
-@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\
@@ -129,10 +82,10 @@
 
 @c   **** Links and references ****
 
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
+@c usage: @lsr{ancient,Ancient-notation,custodes.ly}
+@macro lsr{SECTION,DIR,TEXT}
 @ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
+@uref{source/input/lsr/snippets/\SECTION\.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
 @file{\DIR\/\TEXT\}
@@ -141,10 +94,10 @@
 
 @macro lsrdir{DIR}
 @ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
+@uref{source/input/lsr/snippets/\DIR\.html,\DIR\}
 @end ifhtml
 @ifnothtml
-@file{\DIR\}
+\DIR\
 @end ifnothtml
 @end macro
 
@@ -268,6 +221,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}
@@ -296,19 +254,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