X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=840d118de06b4ded5b20d605015f93ca26d75600;hb=92fc81cc00d06d4a18e6040f7c64ce73a28d579d;hp=15e446bbab7b97bfe25fa68e25e5a4ccda235c87;hpb=25e0ad87d00c21597de319ed4554f18a7c4e6b1d;p=lilypond.git

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 15e446bbab..840d118de0 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,152 +1,189 @@
-@ifnottex
-@macro reng {word}
-@ref{ (lilypond-internals)\word\, \word\ }
+@c -*- coding: latin-1; mode: texinfo; -*-
 
-@end macro
+@ifnottex
+  @macro texisharp {word}
+  #
+  @end macro
+  @macro texiflat {word}
+  b
+  @end macro
 @end ifnottex
 
+@c FIXME, use \fetaaccidentalsXMC?
+@c \\kern0.15em\\fetachar\\fetaflat
 @iftex
-@macro reng {word}
-\word\
-@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 rgrob {word}
-@ref{ (lilypond-internals)\word\, \word\ }
-
-@end macro
-@end ifnottex
-
+@macro arrow{}
 @iftex
-@macro rgrob {word}
-\word\
-@end macro
+@tex $\\Rightarrow$ @end tex@c
 @end iftex
+@ifhtml
+@html
+→
+@end html
+@end ifhtml
+@ifinfo
+-->
+@end ifinfo
+@end macro
 
 
-@ifnottex
-@macro rint {word}
-@ref{ (lilypond-internals)\word\, \word\ }
+@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
+
+@macro internalsref{NAME}@c
+@c annoying parentheses stripped by add-html-footer.py
+@ref{\NAME\,,,lilypond-internals}@c
+@findex \NAME\
 @end macro
-@end ifnottex
 
-@iftex
-@macro rint {word}
-\word\
+@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 iftex
 
-@ifnottex
-@macro texisharp {word}
-#
+@macro rglos{NAME}@c
+@c annoying parentheses stripped by add-html-footer.py
+@ref{\NAME\,,,music-glossary}@c
+@findex \NAME\
 @end macro
-@end ifnottex
+ 
+@end ifhtml
 
-@iftex
-@macro texisharp {word}
-@tex
-$\\sharp$
-@end tex
+
+@ifdocbook
+@c ***** DOCBOOK-XML *****
+
+@macro internalsref{NAME}
+@ref{\NAME\,,,lilypond-internals}@c
+@findex @code{\NAME\}
+@end macro
+ 
+@macro inputfileref{DIR,NAME}
+@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
-@end iftex
 
-@ifnottex
-@macro texiflat {word}
-b
+@macro rglos{NAME}@c
+@ref{\NAME\,,,music-glossary}@c
+@findex \NAME\
 @end macro
-@end ifnottex
 
-@iftex
-@macro texiflat {word}
-@tex
-$\\flat$
-@end tex
+@end ifdocbook
+
+
+@ifinfo
+@c **** INFO ****
+
+@macro internalsref{NAME}
+@inforef{\NAME\,,lilypond-internals}@c
+@findex \NAME\@c
 @end macro
-@end iftex
 
+@macro inputfileref{DIR,NAME}
+@file{\DIR\/\NAME\}
+@end macro
 
+@macro rglos{NAME}@c
+@inforef{\NAME\,,,music-glossary}@c
+@findex \NAME\
+@end macro
 
-@iftex
-@macro separate 
-@c I want some space over here,  not silly characters.
-@tex
-@end tex
+@macro usermanref{NAME}
+@inforef{\NAME\}@c
 @end macro
-@end iftex
 
-@c \heartsf was supposed to be filled?
+@end ifinfo
 
-@c center*** is broken?
 
-@ifinfo
-@macro separate
+@c **** TEX ****
+@iftex
 
-@quotation
-@end quotation
+@macro internalsref{NAME}@c
+@findex \NAME\ @c
+@code{\NAME\}@c
 @end macro
-@end ifinfo
 
-@ifhtml
-@macro separate
-@html
-<p></p><br><br>
-@end html
+@macro inputfileref{DIR,NAME}@c
+@file{\DIR\/@/\NAME\}@c
 @end macro
-@end ifhtml
 
-@ignore
+@macro rglos {NAME}
+@findex \NAME\ @c
+@code{\NAME\}@c
+@end macro
 
-@c Huh, do outline mode and texinfo really fight eachother?
-@c Outline can only use spaces to indent topic headers
-@c (or bullets, but then topics can't start with `@c').
-@c Texinfo can't have spaces in macro names.
+@macro seeinternals{NAME}
+internals document, @internalsref{\NAME\}
+@end macro
 
-@macro c_ {word}
-\word\
-@node \word\
-@section \word\
+@macro usermanref{NAME}
+user manual, @internalsref{\NAME\}
 @end macro
 
-@macro c__ {word}
-\word\
-@menu
-* \word\::                      
-@end menu
+@end iftex
 
-@node \word\
-@subsection \word\
-@end macro
+@ifnottex
+@c **** not TEX ****
 
-@macro c___ {word}
-\word\
-@node \word\
-@unnumberedsubsubsection \word\
+@macro seeinternals{NAME}
+@internalsref{\NAME\}
 @end macro
 
-@macro c_ {word}
+@ifnotinfo
+@macro usermanref{NAME}
+@ref{\NAME\}@c
 @end macro
+@end ifnotinfo
 
-@end ignore
+@end ifnottex
 
+@macro refbugs
+@noindent
+@subsubheading Bugs
 
-@ifhtml
-@macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}
-@cindex \NAME\
 @end macro
-@macro seeinternals{NAME}
-See @internalsref{\NAME\}
+
+@macro seealso
+@noindent
+@subsubheading See also
+
 @end macro
-@end ifhtml
-@ifnothtml
-@macro seeinternals{NAME}
+
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
 @end macro
-@macro internalsref{NAME}
-@cindex \NAME\
-\NAME\
+
+@macro context{NAME}@c
+@code{\NAME\}@c should use internalsref
+@findex \NAME\@c
+@end macro
+
+@macro refcommand{WHAT}
+@findex \WHAT\
+@code{\WHAT\} 
 @end macro
-@end ifnothtml