*** empty log message ***

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 6a8b7c7bb8cb7daddf3c096bbba97751f425088d..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,7 +44,7 @@ b
 @iftex
 @macro texiflat {word}
 @tex
-$\\flat$%
+\\kern0.15em\\fetachar\\fetaflat
 @end tex
 @end macro
 @end iftex
@@ -58,41 +65,12 @@ $\\flat$%
 
 
 
-
-@iftex
-@macro separate 
-@c I want some space over here,  not silly characters.
-@tex
-@end tex
-@end macro
-@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>
-@end html
-@end macro
-@end ifhtml
-
-
 @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
 
 
@@ -105,7 +83,7 @@ $\\flat$%
 
 @ifinfo
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
+@inforef{\NAME\,,lilypond/lilypond-internals}@c
 @cindex \NAME\@c
 @end macro
 
@@ -138,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
@@ -160,7 +146,7 @@ internals document,  @internalsref{\NAME\}
 
 @end macro
 
-@macro context{NAME}
+@macro context{NAME}@c
 @code{\NAME\}@c should use internalsref
 @cindex \NAME\@c
 @end macro