*** empty log message ***

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index d0d949645fc19ff1265949e31c97052dc4ea593e..cbf3ce2acfc9fd1f70df316ae6cb0f744b2e4dde 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,5 +1,12 @@
 @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
@@ -23,7 +30,7 @@
 @iftex
 @macro texisharp {word}
 @tex
-$\\sharp$%
+\\raise0.5ex\\fetachar\\fetasharp
 @end tex
 @end macro
 @end iftex
@@ -37,47 +44,33 @@ b
 @iftex
 @macro texiflat {word}
 @tex
-$\\flat$%
+\\kern0.15em\\fetachar\\fetaflat
 @end tex
 @end macro
 @end iftex
 
-
-
+@macro arrow{}
 @iftex
-@macro separate 
-@c I want some space over here,  not silly characters.
-@tex
-@end tex
-@end macro
+@tex $\\Rightarrow$ @end tex@c
 @end iftex
-
-@c \heartsf was supposed to be filled?
-
-@c center*** is broken?
-
-@ifinfo
-@macro separate
-
-@quotation
-@end quotation
-@end macro
-@end ifinfo
-
 @ifhtml
-@macro separate
 @html
-<p></p><br><br>
+&rarr;
 @end html
-@end macro
 @end ifhtml
+@ifinfo
+-->
+@end ifinfo
+@end macro
+
 
 
 @c dup?
 @ifhtml
 @macro internalsref{NAME}
 @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
-@cindex \NAME\@c
+@c should we do this? 
+@cindex @code{\NAME\}
 @end macro
 
 
@@ -90,7 +83,7 @@ $\\flat$%
 
 @ifinfo
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
 @cindex \NAME\@c
 @end macro
 
@@ -123,9 +116,17 @@ 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
@@ -145,6 +146,13 @@ internals document,  @internalsref{\NAME\}
 
 @end macro
 
+@macro context{NAME}@c
+@code{\NAME\}@c should use internalsref
+@cindex \NAME\@c
+@end macro
+
+
+
 
 @c
 @c ARGGGHHHHH! I want
@@ -156,10 +164,3 @@ internals document,  @internalsref{\NAME\}
 @cindex @code{\WHAT\}
 @code{\WHAT\}, 
 @end macro
-
-@macro syntax
-@noindent
-@subsubheading Syntax
-
-@end macro
-