Comment-out \fetaflat,

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index e89d5ad8ee25edc62df5f7a194f8ea378e85fbc9..678ff5effcdcc32dea718e6dc565c30e38582521 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,10 +1,10 @@
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
 
 @tex
 \input feta20.tex
-\font\fetasixteen=feta16
-\def\fetafont{\fetasixteen}
-\def\fetachar#1{\hbox{\fetasixteen#1}}
+\global\font\fetasixteen=feta16
+\gdef\fetafont{\fetasixteen}
+\gdef\fetachar#1{\hbox{\fetasixteen#1}}
 @end tex
 
 @c Reference GLOSsary
@@ -30,15 +30,19 @@
   @end macro
 @end ifnottex
 
+@c FIXME, use \fetaaccidentalsXMC?
+@c \\kern0.15em\\fetachar\\fetaflat
 @iftex
  @macro texiflat {word}
  @tex
- \\kern0.15em\\fetachar\\fetaflat
+ FIXME: fetaflat
  @end tex
  @end macro
+@c FIXME, use \fetaaccidentalsXC?
+@c  \\raise0.5ex\\fetachar\\fetasharp
  @macro texisharp {word}
   @tex
-  \\raise0.5ex\\fetachar\\fetasharp
+  FIXME: fetasharp
   @end tex
   @end macro
 @end iftex
@@ -61,46 +65,58 @@
 
 
 @c dup?
-
 @ifhtml
 
  @c ***** HTML *****
 
+@macro internalsref{NAME}@c
+@c makeinfo-4.7 encodes html names, which means that nodes that
+@c contain nonalphanum characters will be broken links on the website.
+@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @inforef{} adds ``See'' to the sentence, which is annoying, but
+@c better than a broken link.
+@c @inforef{\NAME\,,lilypond-internals}@c
+@c using @ref without punctuation is OK without for formats other than info
+@ref{\NAME\,,,lilypond-internals}@c
+@c should we do this? 
+@findex \NAME\
+@end macro
+
+
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
+
+@end ifhtml
+
+@c dup?
+@ifdocbook
+
+ @c ***** DOCBOOK-XML *****
+
  @macro internalsref{NAME}
  @c makeinfo-4.7 encodes html names
  @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
  @inforef{\NAME\,,lilypond-internals}@c
  @c should we do this? 
- @cindex @code{\NAME\}
+ @findex @code{\NAME\}
  @end macro
 
- @macro hyphenatedinternalsref{NAME,NODENAME}
- @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
- @inforef{\NODENAME\,,lilypond-internals}@c
- @c should we do this? 
- @cindex @code{\NAME\}
- @end macro
 
  @macro inputfileref{DIR,NAME}
  @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
  @end macro
 
-@end ifhtml
+@end ifdocbook
 
 @ifinfo
 
 @c **** INFO ****
 @macro internalsref{NAME}
 @inforef{\NAME\,,lilypond/lilypond-internals}@c
-@cindex \NAME\@c
+@findex \NAME\@c
 @end macro
 
-@macro hyphenatedinternalsref{NAME,NODENAME}
-@c FIXME: suspicious info file name?
-@inforef{\NODENAME\,,lilypond-internals}@c
-@c should we do this? 
-@cindex @code{\NAME\}
-@end macro
 
 @macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}
@@ -117,24 +133,17 @@
 @c **** TEX ****
 
 @macro internalsref{NAME}@c
-@cindex @code{\NAME\} @c
+@findex \NAME\ @c
 @code{\NAME\}@c
 @end macro
 
 @macro inputfileref{DIR,NAME}@c
-@file{\DIR\/\NAME\}@c
-@end macro
-
-@macro hyphenatedinternalsref{NAME,NODENAME}
-@code{\NAME\}@c
-@c should we do this? 
-@cindex @code{\NAME\} @c
+@file{\DIR\/@/\NAME\}@c
 @end macro
 
 
-
 @macro seeinternals{NAME}
-internals document,  @internalsref{\NAME\}
+internals document, @internalsref{\NAME\}
 @end macro
 @end iftex
 
@@ -172,19 +181,27 @@ internals document,  @internalsref{\NAME\}
 
 @macro context{NAME}@c
 @code{\NAME\}@c should use internalsref
-@cindex \NAME\@c
+@findex \NAME\@c
 @end macro
 
+@c I want
+@c @cindex @code{@backslash\WHAT\}
+@c how do I do that?  --hwn
 
+@ignore
 
+Is this question still relevant?  With texinfo 4.7,
+escape the backslash, like so  --jcn
 
-@c
-@c ARGGGHHHHH! I want
-@c @cindex @code{@backslash\WHAT\}
-@c how do I do that?
-@c   --hwn
+@macro refcommand{WHAT}
+@cindex @code{\\\WHAT\}
+@code{\WHAT\},
+@end macro
+
+@end ignore
 
 @macro refcommand{WHAT}
-@cindex @code{\WHAT\}
-@code{\WHAT\}, 
+@findex \WHAT\
+@code{\WHAT\} 
 @end macro
+