@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
@iftex
@macro texisharp {word}
@tex
-$\\sharp$%
+\\raise0.5ex\\fetachar\\fetasharp
@end tex
@end macro
@end iftex
@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>
+→
@end html
-@end macro
@end ifhtml
+@ifinfo
+-->
+@end ifinfo
+@end macro
+
@c dup?
@ifhtml
@macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}
-@cindex \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\}}
+@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
@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
@c @cindex @code{@backslash\WHAT\}
@cindex @code{\WHAT\}
@code{\WHAT\},
@end macro
-
-@macro syntax
-@noindent
-@heading Syntax
-
-@end macro