Merge branch 'master' into dev/texi2html

[lilypond.git] / scm / documentation-generate.scm

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index fa6298cd00e32caf6af5be4846720e7509d7cc84..975ef1f9627c47d7babc9341988e6265a9ce64ab 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;; File entry point for generated documentation
@@ -30,13 +30,17 @@
  (slot-ref (all-scheme-functions-doc) 'text)
  (open-output-file "scheme-functions.tely"))
 
-(display 
- (markup-doc-string)
- (open-output-file "markup-commands.tely"))
+;;(display 
+;; (markup-doc-string)
+;; (open-output-file "markup-commands.tely"))
 
-(display 
- (markup-list-doc-string)
- (open-output-file "markup-list-commands.tely"))
+(call-with-output-file "markup-commands.tely"
+  (lambda (port)
+    (dump-node (markup-doc-node) port 2 #t)))
+
+(call-with-output-file "markup-list-commands.tely"
+  (lambda (port)
+    (dump-node (markup-list-doc-node) port 2 #t)))
 
 (display 
  (identifiers-doc-string)
@@ -72,16 +76,34 @@
 @ifhtml
 @c ***** HTML *****
 
-@macro usermanref{NAME}
-@ref{\\NAME\\,,,lilypond}
+@ifset bigpage
+
+@macro ruser{TEXT}
+@ref{\\TEXT\\,,,lilypond-big-page,Notation Reference}
+@cindex \\TEXT\\
+@end macro
+
+@macro glossaryref{TEXT}
+@vindex \\TEXT\\
+@ref{\\TEXT\\,,,music-glossary-big-page,Music Glossary}
+@end macro
+
+@end ifset
+
+@ifclear bigpage
+
+@macro ruser{NAME}
+@ref{\\NAME\\,,,lilypond,Notation Reference}
 @cindex \\NAME\\
 @end macro
 
 @macro glossaryref{NAME}
-@ref{\\NAME\\,,,music-glossary}
+@ref{\\NAME\\,,,music-glossary,Music Glossary}
 @cindex \\NAME\\
 @end macro
 
+@end ifclear
+
 @macro inputfileref{DIR,NAME}
 @uref{source/\\DIR\\/out-www/collated-files.html#\\NAME\\,@file{\\DIR\\/\\NAME\\}}@c
 @end macro
@@ -97,13 +119,8 @@
 @ifinfo
 @c ***** info *****
 
-@macro usermanref{NAME}
-@inforef{\\NAME\\,,,lilypond}
-@cindex \\NAME\\
-@end macro
-
-@macro glossaryref{NAME}
-@inforef{\\NAME\\,,lilypond/music-glossary}
+@macro ruser{NAME}
+@ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro
 
@@ -120,7 +137,7 @@
 @iftex
 @c ***** TeX *****
 
-@macro usermanref{NAME}
+@macro ruser{NAME}
 @ref{\\NAME\\}@c
 @end macro
 
@@ -134,7 +151,7 @@
 @end iftex
 
 
-@macro internalsref{NAME}
+@macro rinternals{NAME}
 @ref{\\NAME\\}
 @end macro
 
@@ -148,7 +165,7 @@
 @omfcategory Applications|Publishing
 @end ignore
 
-
+@contents
 ")
  out-port)