Merge branch 'master' into lilypond/translation

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

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 6219ce53c3f3a0de56b2ad3f8ff3d26a4f190f7b..da2763f5aa136846c4de6e35fe93fd55c299c5de 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)
@@ -69,28 +73,40 @@
 @c NOTE: This is documentation-generate.scm, not macros.itexi
 
 
+@macro q{TEXT}
+@quoteleft{}\\TEXT\\@quoteright{}
+@end macro
+
+@macro qq{TEXT}
+@quotedblleft{}\\TEXT\\@quotedblright{}
+@end macro
+
+
 @ifhtml
 @c ***** HTML *****
 
-@macro ruser{NAME}
-@ref{\\NAME\\,,,lilypond}
-@cindex \\NAME\\
+@ifset bigpage
+
+@macro ruser{TEXT}
+@ref{\\TEXT\\,,,lilypond-big-page,Notation Reference}
+@cindex \\TEXT\\
 @end macro
 
-@macro glossaryref{NAME}
-@ref{\\NAME\\,,,music-glossary}
+@end ifset
+
+@ifclear bigpage
+
+@macro ruser{NAME}
+@ref{\\NAME\\,,,lilypond,Notation Reference}
 @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
 
-@macro q{TEXT}
-@html
-‘\\TEXT\\’
-@end html
-@end macro
 @end ifhtml
 
 
@@ -98,12 +114,7 @@
 @c ***** info *****
 
 @macro ruser{NAME}
-@inforef{\\NAME\\,,,lilypond}
-@cindex \\NAME\\
-@end macro
-
-@macro glossaryref{NAME}
-@inforef{\\NAME\\,,lilypond/music-glossary}
+@ref{\\NAME\\,,,lilypond,Notation Reference}
 @cindex \\NAME\\
 @end macro
 
@@ -111,9 +122,6 @@
 @file{\\DIR\\/\\NAME\\}
 @end macro
 
-@macro q{TEXT}
-`\\TEXT\\'
-@end macro
 @end ifinfo
 
 
@@ -128,13 +136,10 @@
 @file{\\DIR\\/\\NAME\\}@c
 @end macro
 
-@macro q{TEXT}
-`\\TEXT\\'
-@end macro
 @end iftex
 
 
-@macro internalsref{NAME}
+@macro rinternals{NAME}
 @ref{\\NAME\\}
 @end macro