Begin Trevor's spacing chapter rewrite.

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 0274641da2e0b1e0f1d2244653c7f27ef3ae4632..11b2b59bf13a56d3e21f78b105390e47fcf69cdc 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,5 +1,22 @@
 @c -*- coding: latin-1; mode: texinfo; -*-
 
+@c FIXME: rearranged this file; macros that don't depend on the output
+@c format should go at the beginning.  -gp
+
+
+@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\}}
+@end macro
+
+@macro lsrdir{DIR}
+@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}}
+@end macro
+
+
+
 @ifnottex
   @macro texisharp {word}
   #
@@ -53,15 +70,27 @@
 @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
@@ -70,6 +99,14 @@
 @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