X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=c903f39a89d3ee33b86de0775e5771fc3ef2b2b9;hb=d0c094c43a5b5792856fb94bd4cb9c2cfabc929c;hp=fc67ae86c647de16de3c7096675aeed539681f98;hpb=13355f53c125c2e67bfab3ec4d1f4ec81f75fa55;p=lilypond.git

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index fc67ae86c6..c903f39a89 100644
--- 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
@@ -65,20 +65,19 @@
 
  @c ***** HTML *****
 
- @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\}
- @end macro
+@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 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
@@ -96,15 +95,9 @@
  @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
@@ -117,15 +110,9 @@
 @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\}
@@ -142,7 +129,7 @@
 @c **** TEX ****
 
 @macro internalsref{NAME}@c
-@cindex @code{\NAME\} @c
+@findex \NAME\ @c
 @code{\NAME\}@c
 @end macro
 
@@ -150,13 +137,6 @@
 @file{\DIR\/\NAME\}@c
 @end macro
 
-@macro hyphenatedinternalsref{NAME,NODENAME}
-@code{\NAME\}@c
-@c should we do this? 
-@cindex @code{\NAME\} @c
-@end macro
-
-
 
 @macro seeinternals{NAME}
 internals document,  @internalsref{\NAME\}
@@ -197,7 +177,7 @@ internals document,  @internalsref{\NAME\}
 
 @macro context{NAME}@c
 @code{\NAME\}@c should use internalsref
-@cindex \NAME\@c
+@findex \NAME\@c
 @end macro
 
 
@@ -210,6 +190,6 @@ internals document,  @internalsref{\NAME\}
 @c   --hwn
 
 @macro refcommand{WHAT}
-@cindex @code{\WHAT\}
-@code{\WHAT\}, 
+@findex \WHAT\
+@code{\WHAT\} 
 @end macro