X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=6b531fc814bb38b69a4936e956ae9133a7f9ded2;hb=14cc1affca69af428c8e3798a34ddc324006aa71;hp=b817a23ab9ec139b39a5261b222575d4537f84e4;hpb=a565e4f60b397f274dae88cd6485238615870401;p=lilypond.git
diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b817a23ab9..6b531fc814 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,125 +1,223 @@
-@ifnottex
-@macro reng {word}
-@ref{ (lilypond-internals)\word\, \word\ },
+@c -*-texinfo-*-
+@tex
+\input feta20.tex
+\font\fetasixteen=feta16
+\def\fetafont{\fetasixteen}
+\def\fetachar#1{\hbox{\fetasixteen#1}}
+@end tex
+
+@c Reference GLOSsary
+@macro rglos {NAME}
+@ifhtml
+@c ugh: @ref assumes that external refs are split documents too
+@html
+\NAME\@c
+@end html
+@end ifhtml
+@ifnothtml
+\NAME\@c
+@end ifnothtml
@end macro
+
+
+@ifnottex
+ @macro texisharp {word}
+ #
+ @end macro
+ @macro texiflat {word}
+ b
+ @end macro
@end ifnottex
@iftex
-@macro reng {word}
-\word\
+ @macro texiflat {word}
+ @tex
+ \\kern0.15em\\fetachar\\fetaflat
+ @end tex
+ @end macro
+ @macro texisharp {word}
+ @tex
+ \\raise0.5ex\\fetachar\\fetasharp
+ @end tex
+ @end macro
+@end iftex
-@end macro
+
+@macro arrow{}
+@iftex
+@tex $\\Rightarrow$ @end tex@c
@end iftex
+@ifhtml
+@html
+→
+@end html
+@end ifhtml
+@ifinfo
+-->
+@end ifinfo
+@end macro
-@ifnottex
-@macro rgrob {word}
-@ref{ (lilypond-internals)\word\, \word\ },
+@c dup?
+@ifhtml
+
+ @c ***** HTML *****
+
+@macro internalsref{NAME}@c
+@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
+@ref{\NAME\,,,lilypond-internals}@c
+@c should we do this?
+@cindex @code{\NAME\}
@end macro
-@end ifnottex
-@iftex
-@macro rgrob {word}
-\word\
+ @c what is this? -- jcn
+ @macro hyphenatedinternalsref{NAME,NODENAME}
+ @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
+ @c @inforef{\NODENAME\,,lilypond-internals}@c
+ @c should we do this?
+ @c using @ref without punctuation is OK without for formats other than info
+ @ref{\NODENAME\,,\NAME\,lilypond-internals}@c
+ @cindex @code{\NAME\}
+ @end macro
-@end macro
-@end iftex
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
+@end ifhtml
-@ifnottex
-@macro rint {word}
-@ref{ (lilypond-internals)\word\, \word\ },
+@c dup?
+@ifdocbook
+
+ @c ***** DOCBOOK-XML *****
+
+ @macro internalsref{NAME}
+ @c makeinfo-4.7 encodes html names
+ @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+ @inforef{\NAME\,,lilypond-internals}@c
+ @c should we do this?
+ @cindex @code{\NAME\}
+ @end macro
+ @macro hyphenatedinternalsref{NAME,NODENAME}
+ @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
+ @inforef{\NODENAME\,,lilypond-internals}@c
+ @c should we do this?
+ @cindex @code{\NAME\}
+ @end macro
+
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
+
+@end ifdocbook
+
+@ifinfo
+
+@c **** INFO ****
+@macro internalsref{NAME}
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
+@cindex \NAME\@c
@end macro
-@end ifnottex
-@iftex
-@macro rint {word}
-\word\
+@macro hyphenatedinternalsref{NAME,NODENAME}
+@c FIXME: suspicious info file name?
+@inforef{\NODENAME\,,lilypond-internals}@c
+@c should we do this?
+@cindex @code{\NAME\}
+@end macro
+@macro inputfileref{DIR,NAME}
+@file{\DIR\/\NAME\}
@end macro
-@end iftex
+@macro usermanref{NAME}
+@ref{\NAME\,,,lilypond/lilypond}@c
+@end macro
+
+@end ifinfo
@iftex
-@macro separate
+@c **** TEX ****
-@tex
-\\hbox to\\hsize{\\hfill\\smallrm*\\textrm*\\smallrm*\\hfill}
-@end tex
+@macro internalsref{NAME}@c
+@cindex @code{\NAME\} @c
+@code{\NAME\}@c
+@end macro
+@macro inputfileref{DIR,NAME}@c
+@file{\DIR\/\NAME\}@c
@end macro
-@end iftex
-@c \heartsf was supposed to be filled?
+@macro hyphenatedinternalsref{NAME,NODENAME}
+@code{\NAME\}@c
+@c should we do this?
+@cindex @code{\NAME\} @c
+@end macro
-@c center*** is broken?
-@ifinfo
-@macro separate
-
-@quotation
-@quotation
-@quotation
-@quotation
-@quotation
-@quotation
-***
-@end quotation
-@end quotation
-@end quotation
-@end quotation
-@end quotation
-@end quotation
-@end macro
-@end ifinfo
-@ifhtml
-@macro separate
-@html
-***
-@end html
+@macro seeinternals{NAME}
+internals document, @internalsref{\NAME\}
@end macro
-@end ifhtml
+@end iftex
-@c netscape 4.x doesn't handle html chars 4.0 :-(
-@c ♥
-@c ***
+@c **** not TEX ****
-@ignore
+@ifnottex
+ @macro seeinternals{NAME}
+ @internalsref{\NAME\}
+ @end macro
+@end ifnottex
-@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.
+@ifnotinfo
+ @macro usermanref{NAME}
+ @ref{\NAME\}@c
+ @end macro
+@end ifnotinfo
+
+@macro refbugs
+@noindent
+@subsubheading Bugs
-@macro c_ {word}
-\word\
-@node \word\
-@section \word\
@end macro
-@macro c__ {word}
-\word\
-@menu
-* \word\::
-@end menu
+@macro seealso
+@noindent
+@subsubheading See also
-@node \word\
-@subsection \word\
@end macro
-@macro c___ {word}
-\word\
-@node \word\
-@unnumberedsubsubsection \word\
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
@end macro
-@macro c_ {word}
+@macro context{NAME}@c
+@code{\NAME\}@c should use internalsref
+@cindex \NAME\@c
@end macro
-@end ignore
+
+
+@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\},
+@end macro