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

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 7543acf9e3bfb014807b2b116be0adda5309ad4a..0274641da2e0b1e0f1d2244653c7f27ef3ae4632 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -53,24 +53,37 @@
 @c @inforef{\NAME\,,lilypond-internals}@c
 @c using @ref without punctuation is OK without for formats other than info
 
-@macro internalsref{NAME}@c
 @c annoying parentheses stripped by add-html-footer.py
-@ref{\NAME\,,,lilypond-internals}@c
-@findex \NAME\
+@macro internalsref{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-internals}
 @end macro
 
 @c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
 @macro inputfileref{DIR,NAME}
-@c @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
-@uref{\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
-@macro rglos{NAME}@c
 @c annoying parentheses stripped by add-html-footer.py
-@ref{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@macro rglos{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,music-glossary}
+@end macro
+
+@c to get decent quotes in `foo'
+@macro q{TEXT}
+@html
+‘\TEXT\’
+@end html
+@end macro
+
+@c to get decent quotes in ``foo''
+@macro qq{TEXT}
+@html
+“\TEXT\”
+@end html
 @end macro
- 
+
 @end ifhtml
 
 
@@ -78,17 +91,31 @@
 @c ***** DOCBOOK-XML *****
 
 @macro internalsref{NAME}
-@ref{\NAME\,,,lilypond-internals}@c
-@findex @code{\NAME\}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-internals}
 @end macro
- 
+
 @macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
 @end macro
 
-@macro rglos{NAME}@c
-@ref{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@macro rglos{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,music-glossary}
+@end macro
+
+@c to get decent quotes in `foo'
+@macro q{TEXT}
+@xml
+‘\TEXT\’
+@end xml
+@end macro
+
+@c to get decent quotes in ``foo''
+@macro qq{TEXT}
+@xml
+“\TEXT\”
+@end xml
 @end macro
 
 @end ifdocbook
@@ -98,8 +125,8 @@
 @c **** INFO ****
 
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
-@findex \NAME\@c
+@vindex \NAME\
+@inforef{\NAME\,,lilypond-internals}
 @end macro
 
 @macro inputfileref{DIR,NAME}
@@ -107,12 +134,22 @@
 @end macro
 
 @macro rglos{NAME}@c
-@inforef{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@vindex \NAME\
+@inforef{\NAME\,,,music-glossary}
 @end macro
 
 @macro usermanref{NAME}
-@inforef{\NAME\,,lilypond}@c
+@inforef{\NAME\}
+@end macro
+
+@c to get decent quotes in `foo'
+@macro q{TEXT}
+`\TEXT\'
+@end macro
+
+@c to get decent quotes in ``foo''
+@macro qq{TEXT}
+``\TEXT\''
 @end macro
 
 @end ifinfo
@@ -121,18 +158,18 @@
 @c **** TEX ****
 @iftex
 
-@macro internalsref{NAME}@c
-@findex \NAME\ @c
-@code{\NAME\}@c
+@macro internalsref{NAME}
+@vindex \NAME\
+@code{\NAME\}
 @end macro
 
-@macro inputfileref{DIR,NAME}@c
-@file{\DIR\/@/\NAME\}@c
+@macro inputfileref{DIR,NAME}
+@file{\DIR\/@/\NAME\}
 @end macro
 
 @macro rglos {NAME}
-@findex \NAME\ @c
-@code{\NAME\}@c
+@vindex \NAME\
+@code{\NAME\}
 @end macro
 
 @macro seeinternals{NAME}
@@ -143,8 +180,19 @@ internals document, @internalsref{\NAME\}
 user manual, @internalsref{\NAME\}
 @end macro
 
+@c to get decent quotes in `foo'
+@macro q{TEXT}
+`\TEXT\'
+@end macro
+
+@c to get decent quotes in ``foo''
+@macro qq{TEXT}
+``\TEXT\''
+@end macro
+
 @end iftex
 
+
 @ifnottex
 @c **** not TEX ****
 
@@ -154,18 +202,26 @@ user manual, @internalsref{\NAME\}
 
 @ifnotinfo
 @macro usermanref{NAME}
-@ref{\NAME\}@c
+@ref{\NAME\}
 @end macro
 @end ifnotinfo
 
 @end ifnottex
 
+
+@c **** ALL ****
+
 @macro refbugs
 @noindent
 @subsubheading Bugs
 
 @end macro
 
+@macro moreinfo
+@subheading More information
+
+@end macro
+
 @macro seealso
 @noindent
 @subsubheading See also
@@ -178,13 +234,25 @@ user manual, @internalsref{\NAME\}
 
 @end macro
 
-@macro context{NAME}@c
+@macro context{NAME}
+@vindex \NAME\
 @code{\NAME\}@c should use internalsref
-@findex \NAME\@c
 @end macro
 
 @macro refcommand{WHAT}
-@findex \WHAT\
-@code{\WHAT\} 
+@vindex \WHAT\
+@code{\WHAT\}
+@end macro
+
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
+@end macro
+
+@macro funindex {WORD}
+@findex \WORD\
+@kindex \WORD\
 @end macro
 
+@c EOF