* Documentation/user/macros.itexi: @inputfileref macro.

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 7d8699e0b8ee640da1639526403a598be186e0bf..b1435de21ca6c5f48a5db873def234ab765f1155 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,26 +1,65 @@
-@ifinfo
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \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
-@end ifinfo
 
-@ifnotinfo
-@macro reng {word}
-@ref{ (lilypond-internals)Engraver \word\, \word\ }
 
+
+
+@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
-@end ifnotinfo
 
 
+@ifnottex
+@macro texisharp {word}
+#
+@end macro
+@end ifnottex
 
 @iftex
-@macro separate
+@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
-\\hbox to\\hsize{\\hfill\\vrule width1.4 cm height1.0pt\\hfill}
+$\\flat$%
 @end tex
+@end macro
+@end iftex
 
+
+
+@iftex
+@macro separate 
+@c I want some space over here,  not silly characters.
+@tex
+@end tex
 @end macro
 @end iftex
 
@@ -32,17 +71,6 @@
 @macro separate
 
 @quotation
-@quotation
-@quotation
-@quotation
-@quotation
-@quotation
-***
-@end quotation
-@end quotation
-@end quotation
-@end quotation
-@end quotation
 @end quotation
 @end macro
 @end ifinfo
@@ -50,46 +78,55 @@
 @ifhtml
 @macro separate
 @html
-<p></p><center>*<font size=+1>*</font>*</center><br>
+<p></p><br><br>
 @end html
 @end macro
 @end ifhtml
 
-@c netscape 4.x doesn't handle html chars 4.0 :-(
-@c <p></p><center>&hearts;</center><br>
-@c <p></p><center><font size=-1>*</font><font size=0>*</font><font size=-1>*</font></center><br>
-
-@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\
+@c dup?
+@ifhtml
+@macro internalsref{NAME}
+@uref{../lilypond-internals/\NAME\.html,\NAME\}
+@cindex \NAME\
 @end macro
 
-@macro c__ {word}
-\word\
-@menu
-* \word\::                      
-@end menu
+@macro fileref{DIR,NAME}
+@uref{../../../\DIR\/out-www/collated-files.html#\NAME\}
+@end macro
+@end ifhtml
 
-@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
 
-@macro c_ {word}
+@end ifinfo
+
+@iftex
+@macro internalsref{NAME}
+@cindex \NAME\
+@code{\NAME\}
+@end macro
+@macro fileref{DIR,NAME}
+@file{\DIR\/\NAME\}
 @end macro
+@end iftex
+
 
-@end ignore
+@iftex
+@macro seeinternals{NAME}
+internals document,  @internalsref{\NAME\}
+@end macro
+@end iftex
 
+@ifnottex
+@macro seeinternals{NAME}
+@internalsref{\NAME\}
+@end macro
+@end ifnottex