X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=840d118de06b4ded5b20d605015f93ca26d75600;hb=9c43d3a570985eae791c774c5d8d9a05e8739964;hp=6a8b7c7bb8cb7daddf3c096bbba97751f425088d;hpb=05d9cd1cc17b47ec7852ecc260b69271cc1e146e;p=lilypond.git

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 6a8b7c7bb8..840d118de0 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,46 +1,31 @@
-@c -*-texinfo-*-
-
-@c Reference GLOSsary
-@macro rglos {NAME}
-@ifhtml
-@c ugh: @ref assumes that external refs are split documents too
-@html
-<a style="text-decoration: none; color: inherit;" href="../music-glossary.html#\NAME\">\NAME\</a>@c
-@end html
-@end ifhtml
-@ifnothtml
-\NAME\@c
-@end ifnothtml
-@end macro
-
+@c -*- coding: latin-1; mode: texinfo; -*-
 
 @ifnottex
-@macro texisharp {word}
-#
-@end macro
+  @macro texisharp {word}
+  #
+  @end macro
+  @macro texiflat {word}
+  b
+  @end macro
 @end ifnottex
 
+@c FIXME, use \fetaaccidentalsXMC?
+@c \\kern0.15em\\fetachar\\fetaflat
 @iftex
-@macro texisharp {word}
-@tex
-$\\sharp$%
-@end tex
-@end macro
+ @macro texiflat {word}
+ @tex
+ FIXME: fetaflat
+ @end tex
+ @end macro
+@c FIXME, use \fetaaccidentalsXC?
+@c  \\raise0.5ex\\fetachar\\fetasharp
+ @macro texisharp {word}
+  @tex
+  FIXME: fetasharp
+  @end tex
+  @end macro
 @end iftex
 
-@ifnottex
-@macro texiflat {word}
-b
-@end macro
-@end ifnottex
-
-@iftex
-@macro texiflat {word}
-@tex
-$\\flat$%
-@end tex
-@end macro
-@end iftex
 
 @macro arrow{}
 @iftex
@@ -57,90 +42,122 @@ $\\flat$%
 @end macro
 
 
+@ifhtml
+@c ***** HTML *****
 
+@c makeinfo-4.7 encodes html names, which means that nodes that
+@c contain nonalphanum characters will be broken links on the website.
+@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @inforef{} adds ``See'' to the sentence, which is annoying, but
+@c better than a broken link.
+@c @inforef{\NAME\,,lilypond-internals}@c
+@c using @ref without punctuation is OK without for formats other than info
 
-@iftex
-@macro separate 
-@c I want some space over here,  not silly characters.
-@tex
-@end tex
+@macro internalsref{NAME}@c
+@c annoying parentheses stripped by add-html-footer.py
+@ref{\NAME\,,,lilypond-internals}@c
+@findex \NAME\
 @end macro
-@end iftex
-
-@c \heartsf was supposed to be filled?
-
-@c center*** is broken?
-
-@ifinfo
-@macro separate
 
-@quotation
-@end quotation
+@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
+@macro inputfileref{DIR,NAME}
+@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
-@end ifinfo
 
-@ifhtml
-@macro separate
-@html
-<p></p><br><br>
-@end html
+@macro rglos{NAME}@c
+@c annoying parentheses stripped by add-html-footer.py
+@ref{\NAME\,,,music-glossary}@c
+@findex \NAME\
 @end macro
+ 
 @end ifhtml
 
 
-@c dup?
-@ifhtml
+@ifdocbook
+@c ***** DOCBOOK-XML *****
+
 @macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
-@cindex \NAME\@c
+@ref{\NAME\,,,lilypond-internals}@c
+@findex @code{\NAME\}
 @end macro
-
-
-
+ 
 @macro inputfileref{DIR,NAME}
-@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
-@end ifhtml
+@macro rglos{NAME}@c
+@ref{\NAME\,,,music-glossary}@c
+@findex \NAME\
+@end macro
+
+@end ifdocbook
+
 
 @ifinfo
+@c **** INFO ****
+
 @macro internalsref{NAME}
 @inforef{\NAME\,,lilypond-internals}@c
-@cindex \NAME\@c
+@findex \NAME\@c
 @end macro
 
 @macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}
 @end macro
 
+@macro rglos{NAME}@c
+@inforef{\NAME\,,,music-glossary}@c
+@findex \NAME\
+@end macro
+
+@macro usermanref{NAME}
+@inforef{\NAME\}@c
+@end macro
+
 @end ifinfo
 
+
+@c **** TEX ****
 @iftex
+
 @macro internalsref{NAME}@c
-@cindex \NAME\@c
+@findex \NAME\ @c
 @code{\NAME\}@c
 @end macro
+
 @macro inputfileref{DIR,NAME}@c
-@file{\DIR\/\NAME\}@c
+@file{\DIR\/@/\NAME\}@c
 @end macro
-@end iftex
 
+@macro rglos {NAME}
+@findex \NAME\ @c
+@code{\NAME\}@c
+@end macro
 
-@iftex
 @macro seeinternals{NAME}
-internals document,  @internalsref{\NAME\}
+internals document, @internalsref{\NAME\}
+@end macro
+
+@macro usermanref{NAME}
+user manual, @internalsref{\NAME\}
 @end macro
+
 @end iftex
 
 @ifnottex
+@c **** not TEX ****
+
 @macro seeinternals{NAME}
 @internalsref{\NAME\}
 @end macro
-@end ifnottex
 
+@ifnotinfo
 @macro usermanref{NAME}
 @ref{\NAME\}@c
 @end macro
+@end ifnotinfo
+
+@end ifnottex
 
 @macro refbugs
 @noindent
@@ -160,21 +177,13 @@ internals document,  @internalsref{\NAME\}
 
 @end macro
 
-@macro context{NAME}
+@macro context{NAME}@c
 @code{\NAME\}@c should use internalsref
-@cindex \NAME\@c
+@findex \NAME\@c
 @end macro
 
-
-
-
-@c
-@c ARGGGHHHHH! I want
-@c @cindex @code{@backslash\WHAT\}
-@c how do I do that?
-@c   --hwn
-
 @macro refcommand{WHAT}
-@cindex @code{\WHAT\}
-@code{\WHAT\}, 
+@findex \WHAT\
+@code{\WHAT\} 
 @end macro
+