* Merge from stable:

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 611537ed719338839203f2a3984b171f4dd81839..e9b28b47498df94f1b5dee4b159fc23dc9b5d193 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,3 +1,17 @@
+@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 ENGraver description
 @ifnottex
 @macro reng {word}
 @ref{ (lilypond-internals)\word\, \word\ }
@@ -12,6 +26,7 @@
 @end iftex
 
 
+@c Reference GROB description
 @ifnottex
 @macro rgrob {word}
 @ref{ (lilypond-internals)\word\, \word\ }
@@ -26,6 +41,7 @@
 @end iftex
 
 
+@c Reference INTernals document
 @ifnottex
 @macro rint {word}
 @ref{ (lilypond-internals)\word\, \word\ }
@@ -39,6 +55,19 @@
 @end macro
 @end iftex
 
+
+@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
+
+
 @ifnottex
 @macro texisharp {word}
 #
@@ -48,7 +77,7 @@
 @iftex
 @macro texisharp {word}
 @tex
-$\\sharp$
+$\\sharp$%
 @end tex
 @end macro
 @end iftex
@@ -62,7 +91,7 @@ b
 @iftex
 @macro texiflat {word}
 @tex
-$\\flat$
+$\\flat$%
 @end tex
 @end macro
 @end iftex
@@ -70,12 +99,10 @@ $\\flat$
 
 
 @iftex
-@macro separate
-
+@macro separate 
+@c I want some space over here,  not silly characters.
 @tex
-\\hbox to\\hsize{\\hfill\\smallrm*\\textrm*\\smallrm*\\hfill}
 @end tex
-
 @end macro
 @end iftex
 
@@ -87,17 +114,6 @@ $\\flat$
 @macro separate
 
 @quotation
-@quotation
-@quotation
-@quotation
-@quotation
-@quotation
-***
-@end quotation
-@end quotation
-@end quotation
-@end quotation
-@end quotation
 @end quotation
 @end macro
 @end ifinfo
@@ -105,46 +121,43 @@ $\\flat$
 @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
+@end ifhtml
 
-@macro c__ {word}
-\word\
-@menu
-* \word\::                      
-@end menu
-
-@node \word\
-@subsection \word\
+@ifinfo
+@macro internalsref{NAME}
+@inforef{\NAME\,,lilypond-internals}
+@cindex \NAME\
 @end macro
+@end ifinfo
 
-@macro c___ {word}
-\word\
-@node \word\
-@unnumberedsubsubsection \word\
+@iftex
+@macro internalsref{NAME}
+@cindex \NAME\
+@code{\NAME\}
 @end macro
+@end iftex
 
-@macro c_ {word}
-@end macro
 
-@end ignore
+@iftex
+@macro seeinternals{NAME}
+internals document,  @internalsref{\NAME\}
+@end macro
+@end iftex
 
+@ifnottex
+@macro seeinternals{NAME}
+@internalsref{\NAME\}
+@end macro
+@end ifnottex