-@ifnottex
-@macro reng {word}
-@ref{ (lilypond-internals)\word\, \word\ }
-
-@end macro
-@end ifnottex
-
-@iftex
-@macro reng {word}
-\word\
-@end macro
-@end iftex
+@c -*-texinfo-*-
-@ifnottex
-@macro rgrob {word}
-@ref{ (lilypond-internals)\word\, \word\ }
-
-@end macro
-@end ifnottex
-
-@iftex
-@macro rgrob {word}
-\word\
-@end macro
-@end iftex
-
-
-@ifnottex
-@macro rint {word}
-@ref{ (lilypond-internals)\word\, \word\ }
-
+@c Reference GLOSsary
+@macro rglos {NAME}
+@ifhtml
+@c ugh: @ref assumes that external refs are split documents too
+@html
+<a style="text-decoration: none; color: inherit;" href="../music-glossary.html#\NAME\">\NAME\</a>@c
+@end html
+@end ifhtml
+@ifnothtml
+\NAME\@c
+@end ifnothtml
@end macro
-@end ifnottex
-@iftex
-@macro rint {word}
-\word\
-@end macro
-@end iftex
@ifnottex
@macro texisharp {word}
@iftex
@macro texiflat {word}
@tex
-$\\flat$
+$\\flat$%
@end tex
@end macro
@end iftex
@end macro
@end ifhtml
-@ignore
-
-@c Huh, do outline mode and texinfo really fight eachother?
-@c Outline can only use spaces to indent topic headers
-@c (or bullets, but then topics can't start with `@c').
-@c Texinfo can't have spaces in macro names.
-
-@macro c_ {word}
-\word\
-@node \word\
-@section \word\
-@end macro
-
-@macro c__ {word}
-\word\
-@menu
-* \word\::
-@end menu
-
-@node \word\
-@subsection \word\
-@end macro
-@macro c___ {word}
-\word\
-@node \word\
-@unnumberedsubsubsection \word\
+@c dup?
+@ifhtml
+@macro internalsref{NAME}
+@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@cindex \NAME\@c
@end macro
-@macro c_ {word}
+@macro inputfileref{DIR,NAME}
+@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
@end macro
-@end ignore
-
-
-@ifhtml
-@macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}
-@cindex \NAME\
-@end macro
@end ifhtml
@ifinfo
@macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}
-@cindex \NAME\
+@inforef{\NAME\,,lilypond-internals}@c
+@cindex \NAME\@c
+@end macro
+
+@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}@c
+@file{\DIR\/\NAME\}@c
@end macro
@end iftex
@internalsref{\NAME\}
@end macro
@end ifnottex
+
+@macro refbugs
+@noindent
+@heading Bugs
+
+@end macro
+
+@macro seealso
+@noindent
+@heading See also
+
+@end macro
+
+@macro refcommands
+@noindent
+@heading Predefined commands
+
+@end macro
+
+
+@c
+@c ARGGGHHHHH! I want
+@c @cindex @code{@backslash\WHAT\}
+@c how do I do that?
+@c --hwn
+
+@macro refcommand{WHAT}
+@cindex @code{\WHAT\}
+@code{\WHAT\},
+@end macro
+
+@macro syntax
+@noindent
+@heading Syntax
+
+@end macro