X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocumentation-generate.scm;h=6219ce53c3f3a0de56b2ad3f8ff3d26a4f190f7b;hb=acb0f57f5829647a48ffc5d81b8b3246e20863f8;hp=82649a53ac4029b7fba130fa8652c9d2d4b09c10;hpb=3b2376c6828136cdbc078015c0b9bee26bffb448;p=lilypond.git

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 82649a53ac..6219ce53c3 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;; File entry point for generated documentation
@@ -20,6 +20,7 @@
 	       "document-functions.scm"
 	       "document-translation.scm"
 	       "document-music.scm"
+	       "document-identifiers.scm"
 	       "document-backend.scm"
 	       "document-markup.scm"))
 
@@ -33,14 +34,22 @@
  (markup-doc-string)
  (open-output-file "markup-commands.tely"))
 
+(display 
+ (markup-list-doc-string)
+ (open-output-file "markup-list-commands.tely"))
+
+(display 
+ (identifiers-doc-string)
+ (open-output-file "identifiers.tely"))
+
 
 (display
  (backend-properties-doc-string all-user-grob-properties)
- (open-output-file "layout-properties.tely") )
+ (open-output-file "layout-properties.tely"))
 
 (display
  (translation-properties-doc-string all-user-translation-properties)
- (open-output-file "context-properties.tely") )
+ (open-output-file "context-properties.tely"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -54,71 +63,81 @@
 (display
  (string-append
   (texi-file-head "LilyPond program-reference" file-name
-		  "(lilypond-internals.info)")
+		  "(lilypond/lilypond-internals.info)")
   "
 
+@c NOTE: This is documentation-generate.scm, not macros.itexi
+
+
 @ifhtml
-@macro usermanref{NAME}
-@uref{../lilypond/\\NAME\\.html,\\NAME\\}
+@c ***** HTML *****
+
+@macro ruser{NAME}
+@ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro
-@end ifhtml
 
-@ifinfo
-@macro usermanref{NAME}
-@ref{\\NAME\\,,,lilypond/lilypond}
+@macro glossaryref{NAME}
+@ref{\\NAME\\,,,music-glossary}
 @cindex \\NAME\\
 @end macro
-@end ifinfo
 
-@iftex
-@macro usermanref{NAME}
-@ref{\\NAME\\}@c
+@macro inputfileref{DIR,NAME}
+@uref{source/\\DIR\\/out-www/collated-files.html#\\NAME\\,@file{\\DIR\\/\\NAME\\}}@c
 @end macro
-@end iftex
 
-@ifhtml
-@macro glossaryref{NAME}
-@uref{../music-glossary/\\NAME\\.html,\\NAME\\}
-@cindex \\NAME\\
+@macro q{TEXT}
+@html
+&lsquo;\\TEXT\\&rsquo;
+@end html
 @end macro
 @end ifhtml
 
+
 @ifinfo
+@c ***** info *****
+
+@macro ruser{NAME}
+@inforef{\\NAME\\,,,lilypond}
+@cindex \\NAME\\
+@end macro
+
 @macro glossaryref{NAME}
 @inforef{\\NAME\\,,lilypond/music-glossary}
 @cindex \\NAME\\
 @end macro
-@end ifinfo
 
-
-@macro internalsref{NAME}
-@ref{\\NAME\\}
+@macro inputfileref{DIR,NAME}
+@file{\\DIR\\/\\NAME\\}
 @end macro
 
-@ifhtml
-
-@macro inputfileref{DIR,NAME}
-@uref{../../../../\\DIR\\/out-www/collated-files.html#\\NAME\\,@file{\\DIR\\/\\NAME\\}}@c
+@macro q{TEXT}
+`\\TEXT\\'
 @end macro
+@end ifinfo
 
-@end ifhtml
 
-@ifinfo
+@iftex
+@c ***** TeX *****
 
-@macro inputfileref{DIR,NAME}
-@file{\\DIR\\/\\NAME\\}
+@macro ruser{NAME}
+@ref{\\NAME\\}@c
 @end macro
 
-@end ifinfo
-
-@iftex
 @macro inputfileref{DIR,NAME}@c
 @file{\\DIR\\/\\NAME\\}@c
 @end macro
+
+@macro q{TEXT}
+`\\TEXT\\'
+@end macro
 @end iftex
 
 
+@macro internalsref{NAME}
+@ref{\\NAME\\}
+@end macro
+
 
 @ignore
 @omftitle LilyPond internals
@@ -137,7 +156,9 @@
   (make <texi-node>
     #:name "Top"
     #:text 
-    (string-append  "This is the program reference for LilyPond version " (lilypond-version))
+    (string-append  "This is the program reference for version "
+		    (lilypond-version)
+		    " of LilyPond, the GNU music typesetter.")
 
     #:children
     (list
@@ -152,10 +173,6 @@
 
 @printindex cp
 
-@unnumbered Variable index
-
-@printindex vr
-
 @unnumbered Function index
 
 @printindex fn
@@ -164,7 +181,3 @@
 
 (dump-node top-node out-port 0)
 (newline (current-error-port))
-
-
-
-