@c -*- coding: utf-8; mode: texinfo; -*-
-@c FIXME: rearranged this file; macros that don't depend on the output
-@c format should go at the beginning. -gp
+@c **** all formats ****
+
+@macro refbugs
+@noindent
+@subsubheading Bugs
+
+@end macro
+
+@macro moreinfo
+@subheading More information
+
+@end macro
+
+@macro seealso
+@noindent
+@subsubheading See also
+
+@end macro
+
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
+@end macro
+
+@macro context{NAME}
+@vindex \NAME\
+@code{\NAME\}@c should use internalsref
+@end macro
+
+@macro refcommand{WHAT}
+@vindex \WHAT\
+@code{\WHAT\}
+@end macro
+
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
+@end macro
+
+@macro funindex {WORD}
+@findex \WORD\
+@kindex \WORD\
+@end macro
+
+
+
+@c *** Macros with variable output ***
-@c in retrospect this is _not_ one of the output-insensitive macros.
-@c I'll fix it soon.
@c usage: @lsr{ancient,custodes.ly}
@macro lsr{DIR,NAME}
-@uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@ifhtml
+ @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@end ifhtml
+@ifnothtml
+ @file{\DIR\/\NAME\}
+@end ifnothtml
@end macro
@macro lsrdir{DIR}
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+@ifhtml
+ @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+@end ifhtml
+@ifnothtml
+ @file{\DIR\}
+@end ifnothtml
@end macro
-@ifnottex
- @macro texisharp {word}
- #
- @end macro
- @macro texiflat {word}
- b
- @end macro
-@end ifnottex
-@c FIXME, use \fetaaccidentalsXMC?
-@c \\kern0.15em\\fetachar\\fetaflat
-@iftex
- @macro texiflat {word}
- @tex
- FIXME: fetaflat
- @end tex
- @end macro
-@c FIXME, use \fetaaccidentalsXC?
-@c \\raise0.5ex\\fetachar\\fetasharp
- @macro texisharp {word}
- @tex
- FIXME: fetasharp
- @end tex
- @end macro
-@end iftex
@macro arrow{}
@c @inforef{\NAME\,,lilypond-internals}@c
@c using @ref without punctuation is OK without for formats other than info
-@c annoying parentheses stripped by add-html-footer.py
+@ifset bigpage
+
@macro internalsref{NAME}
@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@ref{\NAME\,,,lilypond-internals-big-page}
@end macro
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@macro rglos{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,music-glossary-big-page}
+@end macro
+
+@end ifset
+
+
+@ifclear bigpage
+
+@c annoying parentheses stripped by add-html-footer.py
+@macro internalsref{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-internals}
@end macro
@c annoying parentheses stripped by add-html-footer.py
@ref{\NAME\,,,music-glossary}
@end macro
+@end ifclear
+
+
+@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
+@macro inputfileref{DIR,NAME}
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@end macro
+
@c to get decent German quotes in `foo'
@macro q{TEXT}
@html
@c to get decent German quotes in `foo'
@macro q{TEXT}
-@xml
+@html
‚\TEXT\‘
-@end xml
+@end html
@end macro
@c to get decent German quotes in ``foo''
@macro qq{TEXT}
-@xml
+@html
„\TEXT\“
-@end xml
+@end html
@end macro
@end ifdocbook
@end ifnottex
-@c **** ALL ****
-
-@macro refbugs
-@noindent
-@subsubheading Bugs
-
-@end macro
-
-@macro moreinfo
-@subheading More information
-
-@end macro
-
-@macro seealso
-@noindent
-@subsubheading See also
-
-@end macro
-
-@macro refcommands
-@noindent
-@subsubheading Predefined commands
-
-@end macro
-
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
-@end macro
-
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
-@end macro
-
-@macro commonprop
-@noindent
-@subsubheading Commonly tweaked properties
-
-@end macro
-
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
-@end macro
-
@c EOF
+
@c -*- coding: utf-8; mode: texinfo; -*-
-@c FIXME: rearranged this file; macros that don't depend on the output
-@c format should go at the beginning. -gp
+@c **** all formats ****
+
+@macro refbugs
+@noindent
+@subsubheading Bugs
+
+@end macro
+
+@macro moreinfo
+@subheading More information
+
+@end macro
+
+@macro seealso
+@noindent
+@subsubheading See also
+
+@end macro
+
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
+@end macro
+
+@macro context{NAME}
+@vindex \NAME\
+@code{\NAME\}@c should use internalsref
+@end macro
+
+@macro refcommand{WHAT}
+@vindex \WHAT\
+@code{\WHAT\}
+@end macro
+
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
+@end macro
+
+@macro funindex {WORD}
+@findex \WORD\
+@kindex \WORD\
+@end macro
+
+
+
+@c *** Macros with variable output ***
-@c in retrospect this is _not_ one of the output-insensitive macros.
-@c I'll fix it soon.
@c usage: @lsr{ancient,custodes.ly}
@macro lsr{DIR,NAME}
-@uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@ifhtml
+ @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@end ifhtml
+@ifnothtml
+ @file{\DIR\/\NAME\}
+@end ifnothtml
@end macro
@macro lsrdir{DIR}
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+@ifhtml
+ @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+@end ifhtml
+@ifnothtml
+ @file{\DIR\}
+@end ifnothtml
@end macro
-@ifnottex
- @macro texisharp {word}
- #
- @end macro
- @macro texiflat {word}
- b
- @end macro
-@end ifnottex
-@c FIXME, use \fetaaccidentalsXMC?
-@c \\kern0.15em\\fetachar\\fetaflat
-@iftex
- @macro texiflat {word}
- @tex
- FIXME: fetaflat
- @end tex
- @end macro
-@c FIXME, use \fetaaccidentalsXC?
-@c \\raise0.5ex\\fetachar\\fetasharp
- @macro texisharp {word}
- @tex
- FIXME: fetasharp
- @end tex
- @end macro
-@end iftex
@macro arrow{}
@c @inforef{\NAME\,,lilypond-internals}@c
@c using @ref without punctuation is OK without for formats other than info
-@c annoying parentheses stripped by add-html-footer.py
+@ifset bigpage
+
@macro internalsref{NAME}
@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@ref{\NAME\,,,lilypond-internals-big-page}
@end macro
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@macro rglos{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,music-glossary-big-page}
+@end macro
+
+@end ifset
+
+
+@ifclear bigpage
+
+@c annoying parentheses stripped by add-html-footer.py
+@macro internalsref{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-internals}
@end macro
@c annoying parentheses stripped by add-html-footer.py
@ref{\NAME\,,,music-glossary}
@end macro
+@end ifclear
+
+
+@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
+@macro inputfileref{DIR,NAME}
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@end macro
+
@c to get decent quotes in `foo'
@macro q{TEXT}
@html
@c to get decent quotes in `foo'
@macro q{TEXT}
-@xml
+@html
‘\TEXT\’
-@end xml
+@end html
@end macro
-@c to get decent quotes in ``foo''
+@c to get decent French quotes in ``foo''
@macro qq{TEXT}
-@xml
+@html
« \TEXT\ »
-@end xml
+@end html
@end macro
@end ifdocbook
`\TEXT\'
@end macro
-@c to get decent quotes in ``foo''
+@c to get decent French quotes in ``foo''
@macro qq{TEXT}
« \TEXT\ »
@end macro
`\TEXT\'
@end macro
-@c to get decent quotes in ``foo''
+@c to get decent French quotes in ``foo''
@macro qq{TEXT}
<< \TEXT\ >>
@end macro
@end ifnottex
-@c **** ALL ****
-
-@macro refbugs
-@noindent
-@subsubheading Bugs
-
-@end macro
-
-@macro moreinfo
-@subheading More information
-
-@end macro
-
-@macro seealso
-@noindent
-@subsubheading See also
-
-@end macro
-
-@macro refcommands
-@noindent
-@subsubheading Predefined commands
-
-@end macro
-
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
-@end macro
-
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
-@end macro
-
-@macro commonprop
-@noindent
-@subsubheading Commonly tweaked properties
-
-@end macro
-
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
-@end macro
-
@c EOF