add \global to definitions for

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 794cbbdc840cf62107fedb1acd331e025511103b..4cf09a6c6bc77ffe0fe57258bd920a9aceb349bf 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,5 +1,11 @@
 @c -*-texinfo-*-
 
+@tex
+\input feta20.tex
+\global\font\fetasixteen=feta16
+\gdef\fetafont{\fetasixteen}
+\gdef\fetachar#1{\hbox{\fetasixteen#1}}
+@end tex
 
 @c Reference GLOSsary
 @macro rglos {NAME}
@@ -16,130 +22,194 @@
 
 
 @ifnottex
-@macro texisharp {word}
-#
-@end macro
+  @macro texisharp {word}
+  #
+  @end macro
+  @macro texiflat {word}
+  b
+  @end macro
 @end ifnottex
 
 @iftex
-@macro texisharp {word}
-@tex
-$\\sharp$%
-@end tex
-@end macro
+ @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
 
-@ifnottex
-@macro texiflat {word}
-b
-@end macro
-@end ifnottex
 
+@macro arrow{}
 @iftex
-@macro texiflat {word}
-@tex
-$\\flat$%
-@end tex
-@end macro
+@tex $\\Rightarrow$ @end tex@c
 @end iftex
+@ifhtml
+@html
+→
+@end html
+@end ifhtml
+@ifinfo
+-->
+@end ifinfo
+@end macro
 
 
 
-@iftex
-@macro separate 
-@c I want some space over here,  not silly characters.
-@tex
-@end tex
-@end macro
-@end iftex
+@c dup?
+@ifhtml
 
-@c \heartsf was supposed to be filled?
+ @c ***** HTML *****
 
-@c center*** is broken?
+@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
+
+ @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
+
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
 
-@ifinfo
-@macro separate
+@end ifhtml
 
-@quotation
-@end quotation
-@end macro
-@end ifinfo
+@c dup?
+@ifdocbook
 
-@ifhtml
-@macro separate
-@html
-<p></p><br><br>
-@end html
-@end macro
-@end ifhtml
+ @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
 
-@c dup?
-@ifhtml
-@macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
-@cindex \NAME\@c
-@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
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
 
-@end ifhtml
+@end ifdocbook
 
 @ifinfo
+
+@c **** INFO ****
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
 @cindex \NAME\@c
 @end macro
 
-@macro inputfileref{DIR,NAME}i
+@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
 
+
+@macro usermanref{NAME}
+@ref{\NAME\,,,lilypond/lilypond}@c
+@end macro
+
 @end ifinfo
 
 @iftex
+@c **** TEX ****
+
 @macro internalsref{NAME}@c
-@cindex \NAME\@c
+@cindex @code{\NAME\} @c
 @code{\NAME\}@c
 @end macro
+
 @macro inputfileref{DIR,NAME}@c
 @file{\DIR\/\NAME\}@c
 @end macro
-@end iftex
+
+@macro hyphenatedinternalsref{NAME,NODENAME}
+@code{\NAME\}@c
+@c should we do this? 
+@cindex @code{\NAME\} @c
+@end macro
+
 
 
-@iftex
 @macro seeinternals{NAME}
 internals document,  @internalsref{\NAME\}
 @end macro
 @end iftex
 
+@c **** not TEX ****
+
 @ifnottex
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
-@end macro
+ @macro seeinternals{NAME}
+ @internalsref{\NAME\}
+ @end macro
 @end ifnottex
 
+@ifnotinfo
+ @macro usermanref{NAME}
+ @ref{\NAME\}@c
+ @end macro
+@end ifnotinfo
+
 @macro refbugs
 @noindent
-@heading Bugs
+@subsubheading Bugs
 
 @end macro
 
 @macro seealso
 @noindent
-@heading See also
+@subsubheading See also
 
 @end macro
 
 @macro refcommands
 @noindent
-@heading Predefined commands
+@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
@@ -151,9 +221,3 @@ internals document,  @internalsref{\NAME\}
 @cindex @code{\WHAT\}
 @code{\WHAT\}, 
 @end macro
-
-@macro syntax
-@noindent
-@heading Syntax
-
-@end macro