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 d137ae1b1d27456d167725fff8e3c4ec6967415b..975ef1f9627c47d7babc9341988e6265a9ce64ab 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -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)
@@ -89,12 +93,12 @@
 @ifclear bigpage
 
 @macro ruser{NAME}
-@ref{\\NAME\\,,,lilypond}
+@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
 
@@ -116,12 +120,7 @@
 @c ***** info *****
 
 @macro ruser{NAME}
-@inforef{\\NAME\\,,,lilypond}
-@cindex \\NAME\\
-@end macro
-
-@macro glossaryref{NAME}
-@inforef{\\NAME\\,,lilypond/music-glossary}
+@ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro
 
@@ -152,7 +151,7 @@
 @end iftex
 
 
-@macro internalsref{NAME}
+@macro rinternals{NAME}
 @ref{\\NAME\\}
 @end macro
 
@@ -166,7 +165,7 @@
 @omfcategory Applications|Publishing
 @end ignore
 
-
+@contents
 ")
  out-port)