*** empty log message ***

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 678ff5effcdcc32dea718e6dc565c30e38582521..dd912e4176565275e0f858c9741ac9ca97735f7e 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -1,11 +1,5 @@
 @c -*- coding: latin-1; mode: texinfo; -*-
 
-@tex
-\input feta20.tex
-\global\font\fetasixteen=feta16
-\gdef\fetafont{\fetasixteen}
-\gdef\fetachar#1{\hbox{\fetasixteen#1}}
-@end tex
 
 @c Reference GLOSsary
 @macro rglos {NAME}
@@ -101,7 +95,10 @@
  @c should we do this? 
  @findex @code{\NAME\}
  @end macro
-
+ 
+ @macro usermanref{NAME}
+ @inforef{\NAME\,,lilypond}@c
+ @end macro
 
  @macro inputfileref{DIR,NAME}
  @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
@@ -117,20 +114,18 @@
 @findex \NAME\@c
 @end macro
 
-
 @macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}
 @end macro
 
-
 @macro usermanref{NAME}
 @ref{\NAME\,,,lilypond/lilypond}@c
 @end macro
 
 @end ifinfo
 
-@iftex
 @c **** TEX ****
+@iftex
 
 @macro internalsref{NAME}@c
 @findex \NAME\ @c
@@ -141,12 +136,15 @@
 @file{\DIR\/@/\NAME\}@c
 @end macro
 
-
 @macro seeinternals{NAME}
 internals document, @internalsref{\NAME\}
 @end macro
-@end iftex
 
+@macro usermanref{NAME}
+user manual, @internalsref{\NAME\}
+@end macro
+
+@end iftex
 @c **** not TEX ****
 
 @ifnottex
@@ -155,11 +153,11 @@ internals document, @internalsref{\NAME\}
  @end macro
 @end ifnottex
 
-@ifnotinfo
+@ifnottex
  @macro usermanref{NAME}
  @ref{\NAME\}@c
  @end macro
-@end ifnotinfo
+@end ifnottex
 
 @macro refbugs
 @noindent