X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-markup.scm;h=41b6f61f1baca92695c01187cce0d748016f51f7;hb=b16d78084944afc117e8bb972d277e70c6d23208;hp=c35369699c58f31dde2dadd2e3b68667c93b9055;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index c35369699c..41b6f61f1b 100644
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -79,8 +79,11 @@
   (let* ((category-string (symbol->string category))
          (category-name (string-capitalize (regexp-substitute/global #f
                                         "-" category-string 'pre " " 'post)))
-        (markup-functions (hashq-ref markup-functions-by-category
-                                          category)))
+        (markup-functions (hash-fold (lambda (markup-function dummy functions)
+				       (cons markup-function functions))
+				     '()
+				     (hashq-ref markup-functions-by-category
+						category))))
     (make <texi-node>
       #:appendix #t
       #:name category-name
@@ -92,14 +95,6 @@
                           (sort markup-functions markup-function<?)))
               "\n@end table"))))
 
-(define (markup-list-doc-string)
-  (string-append
-   "@table @asis"
-   (apply string-append
-          (map doc-markup-function
-               (sort markup-list-function-list markup-function<?)))
-   "\n@end table"))
-
 (define (markup-doc-node)
   (make <texi-node>
     #:appendix #t
@@ -118,11 +113,16 @@
                                                   raw-categories))))
                  (map markup-category-doc-node categories))))
 
-(define (markup-list-doc-node)
-  (make <texi-node>
-    #:appendix #t
-    #:name "Text markup list commands"
-    #:desc ""
-    #:text (string-append
-            "The following commands can all be used with @code{\\markuplines}.\n"
-            (markup-list-doc-string))))
+(define (markup-list-doc-string)
+  (string-append
+   "@table @asis"
+   (apply string-append
+	  (map doc-markup-function
+	       (sort (hash-fold (lambda (markup-list-function dummy functions)
+				  (cons markup-list-function functions))
+				'()
+				markup-list-functions)
+		     markup-function<?)))
+   "\n@end table"))
+
+