X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=cbf3ce2acfc9fd1f70df316ae6cb0f744b2e4dde;hb=7dfd01bf92557e33629fcc6930a4f97031470fc8;hp=b7dff0aa8dd9b30fa0529096940d5b5be6803980;hpb=b2d26e5c74581cef0e024e74c734e3ec17ad0007;p=lilypond.git

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b7dff0aa8d..cbf3ce2acf 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,44 +1,166 @@
+@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
+<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
+
 
 @ifnottex
-@macro keyindex {word}
-@cindex @code{ \word\ }
+@macro texisharp {word}
+#
 @end macro
+@end ifnottex
 
-@macro indexcode {word}
-@cindex @code{ \word\ }
+@iftex
+@macro texisharp {word}
+@tex
+\\raise0.5ex\\fetachar\\fetasharp
+@end tex
+@end macro
+@end iftex
+
+@ifnottex
+@macro texiflat {word}
+b
 @end macro
 @end ifnottex
 
 @iftex
-@macro keyindex {word}
-@cindex @code{ \word\ }
+@macro texiflat {word}
+@tex
+\\kern0.15em\\fetachar\\fetaflat
+@end tex
+@end macro
+@end iftex
 
+@macro arrow{}
+@iftex
+@tex $\\Rightarrow$ @end tex@c
+@end iftex
+@ifhtml
+@html
+&rarr;
+@end html
+@end ifhtml
+@ifinfo
+-->
+@end ifinfo
 @end macro
 
-@macro indexcode {word}
-@cindex @code{ \word\ }
 
+
+@c dup?
+@ifhtml
+@macro internalsref{NAME}
+@uref{../lilypond-internals/\NAME\.html,\NAME\}@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 iftex
+
+@end ifhtml
 
 @ifinfo
-@macro rgrob {word}
-@ref{ (lilypond-internals)Grob \word\, \word\ },
+@macro internalsref{NAME}
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
+@cindex \NAME\@c
+@end macro
 
+@macro inputfileref{DIR,NAME}
+@file{\DIR\/\NAME\}
 @end macro
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \word\, \word\ },
 
+@end ifinfo
+
+@iftex
+@macro internalsref{NAME}@c
+@cindex \NAME\@c
+@code{\NAME\}@c
+@end macro
+@macro inputfileref{DIR,NAME}@c
+@file{\DIR\/\NAME\}@c
+@end macro
+@end iftex
+
+
+@iftex
+@macro seeinternals{NAME}
+internals document,  @internalsref{\NAME\}
+@end macro
+@end iftex
+
+@ifnottex
+@macro seeinternals{NAME}
+@internalsref{\NAME\}
+@end macro
+@end ifnottex
+
+@ifinfo
+@macro usermanref{NAME}
+@ref{\NAME\,,,lilypond/lilypond}@c
 @end macro
 @end ifinfo
 
 @ifnotinfo
-@macro rgrob {word}
-@ref{ (lilypond-internals)Grob \word\, \word\ }
+@macro usermanref{NAME}
+@ref{\NAME\}@c
+@end macro
+@end ifnotinfo
+
+@macro refbugs
+@noindent
+@subsubheading Bugs
 
 @end macro
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \word\, \word\ }
+
+@macro seealso
+@noindent
+@subsubheading See also
 
 @end macro
-@end ifnotinfo
+
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
+@end macro
+
+@macro context{NAME}@c
+@code{\NAME\}@c should use internalsref
+@cindex \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\}, 
+@end macro