-@ifinfo
-@macro rgrob {word}
-@ref{ (lilypond-internals)\word\, \word\ },
+@c -*-texinfo-*-
+
+@c Only reference in HTML.
+@macro htmlref {NAME}
+@ifhtml
+@ref{\NAME\}@c
+@end ifhtml
+@ifnothtml
+\NAME\@c
+@end ifnothtml
+@end macro
+
+
+
+@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
+@end ifhtml
+@ifnothtml
+\NAME\@c
+@end ifnothtml
@end macro
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \word\, \word\ },
+
+@ifnottex
+@macro texisharp {word}
+#
@end macro
-@end ifinfo
+@end ifnottex
+
+@iftex
+@macro texisharp {word}
+@tex
+$\\sharp$%
+@end tex
+@end macro
+@end iftex
+
+@ifnottex
+@macro texiflat {word}
+b
+@end macro
+@end ifnottex
+
+@iftex
+@macro texiflat {word}
+@tex
+$\\flat$%
+@end tex
+@end macro
+@end iftex
+
-@ifnotinfo
-@macro rgrob {word}
-@ref{ (lilypond-internals)\word\, \word\ }
+@iftex
+@macro separate
+@c I want some space over here, not silly characters.
+@tex
+@end tex
@end macro
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \word\, \word\ }
+@end iftex
+@c \heartsf was supposed to be filled?
+
+@c center*** is broken?
+
+@ifinfo
+@macro separate
+
+@quotation
+@end quotation
@end macro
-@end ifnotinfo
+@end ifinfo
+@ifhtml
+@macro separate
+@html
+<p></p><br><br>
+@end html
+@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.
+@c dup?
+@ifhtml
+@macro internalsref{NAME}
+@uref{../lilypond-internals/\NAME\.html,\NAME\}
+@cindex \NAME\
+@end macro
-@macro c_ {word}
-\word\
-@node \word\
-@section \word\
+@macro fileref{DIR,NAME}
+@uref{../../../\DIR\/out-www/collated-files.html#\NAME\}
@end macro
+@end ifhtml
-@macro c__ {word}
-\word\
-@node \word\
-@subsection \word\
+@ifinfo
+@macro internalsref{NAME}
+@inforef{\NAME\,,lilypond-internals}
+@cindex \NAME\
@end macro
-@macro c___ {word}
-\word\
-@node \word\
-@unnumberedsubsubsection \word\
+@macro fileref{DIR,NAME}
+@file{\DIR\/\NAME\}
@end macro
-@end ignore
+@end ifinfo
+
+@iftex
+@macro internalsref{NAME}
+@cindex \NAME\
+@code{\NAME\}
+@end macro
+@macro fileref{DIR,NAME}
+@file{\DIR\/\NAME\}
+@end macro
+@end iftex
+
+
+@iftex
+@macro seeinternals{NAME}
+internals document, @internalsref{\NAME\}
+@end macro
+@end iftex
-@macro c_ {word}
+@ifnottex
+@macro seeinternals{NAME}
+@internalsref{\NAME\}
@end macro
+@end ifnottex