(Which properties to

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index db2c2d8b768547915e1f908114f0fb61cded1cf7..9c81c089789b27aba4346485be40ce7fa7cd6ead 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,23 +1,19 @@
 @c -*-texinfo-*-
 
-@c Only reference in HTML.
-@macro htmlref {NAME}
-@ifhtml
-@ref{\NAME\}@c
-@end ifhtml
-@ifnothtml
-\NAME\@c
-@end ifnothtml
-@end macro
-
-
-
+@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
-@uref{../music-glossary.html#\NAME\,\NAME\}@c
+@html
+<a style="text-decoration: none; color: inherit;" href="../music-glossary.html#\NAME\">\NAME\</a>@c
+@end html
 @end ifhtml
 @ifnothtml
 \NAME\@c
@@ -34,7 +30,7 @@
 @iftex
 @macro texisharp {word}
 @tex
-$\\sharp$%
+\\raise0.5ex\\fetachar\\fetasharp
 @end tex
 @end macro
 @end iftex
@@ -48,11 +44,26 @@ b
 @iftex
 @macro texiflat {word}
 @tex
-$\\flat$%
+\\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
+
+
 
 
 @iftex
@@ -87,35 +98,37 @@ $\\flat$%
 @c dup?
 @ifhtml
 @macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}
-@cindex \NAME\
+@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@cindex \NAME\@c
 @end macro
 
+
+
 @macro inputfileref{DIR,NAME}
-@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
 @end ifhtml
 
 @ifinfo
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}
-@cindex \NAME\
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
+@cindex \NAME\@c
 @end macro
 
-@macro inputfileref{DIR,NAME}i
+@macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}
 @end macro
 
 @end ifinfo
 
 @iftex
-@macro internalsref{NAME}
-@cindex \NAME\
-@code{\NAME\}
+@macro internalsref{NAME}@c
+@cindex \NAME\@c
+@code{\NAME\}@c
 @end macro
-@macro inputfileref{DIR,NAME}
-@file{\DIR\/\NAME\}
+@macro inputfileref{DIR,NAME}@c
+@file{\DIR\/\NAME\}@c
 @end macro
 @end iftex
 
@@ -132,24 +145,43 @@ internals document,  @internalsref{\NAME\}
 @end macro
 @end ifnottex
 
+@ifinfo
+@macro usermanref{NAME}
+@ref{\NAME\,,,lilypond/lilypond}@c
+@end macro
+@end ifinfo
+
+@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
@@ -161,9 +193,3 @@ internals document,  @internalsref{\NAME\}
 @cindex @code{\WHAT\}
 @code{\WHAT\}, 
 @end macro
-
-@macro syntax
-@noindent
-@heading Syntax
-
-@end macro