From da1623e9824e36d8cce1c0cb90b8db05265435e3 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Sat, 5 May 2007 15:17:43 -0700
Subject: [PATCH] Organize macros.texi, and make lsr snippets look better in
 pdf output.

---
 Documentation/user/macros.itexi | 112 +++++++++++++++++---------------
 1 file changed, 60 insertions(+), 52 deletions(-)

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index e152ed305b..432aa0fc6f 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,18 +1,72 @@
 @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 **** 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
 
 
@@ -251,50 +305,4 @@ user manual, @internalsref{\NAME\}
 @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
-- 
2.39.5