Unify define-builtin-markup-command and define-markup-command

[lilypond.git] / scm / document-markup.scm

diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index c35369699c58f31dde2dadd2e3b68667c93b9055..19462e4424fbef2a72fb22ff298a2b43dce291f4 100644 (file)
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -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
@@ -97,7 +100,11 @@
    "@table @asis"
    (apply string-append
           (map doc-markup-function
-               (sort markup-list-function-list markup-function<?)))
+               (sort (hash-fold (lambda (markup-list-function dummy functions)
+                                 (cons markup-list-function functions))
+                               '()
+                               markup-list-functions)
+                    markup-function<?)))
    "\n@end table"))
 
 (define (markup-doc-node)