X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-identifiers.scm;h=2a2e0ce074b620a28217cd8f9b1a078b4efa440b;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=93b062b8d2294829b80a8a9387efdf3e089de7d0;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/scm/document-identifiers.scm b/scm/document-identifiers.scm
index 93b062b8d2..2a2e0ce074 100644
--- a/scm/document-identifiers.scm
+++ b/scm/document-identifiers.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2006--2010 Han-Wen Nienhuys <hanwen@lilypond.org>
+;;;; Copyright (C) 2006--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -23,54 +23,48 @@
        (music-func (cdr music-func-pair))
        (func (ly:music-function-extract music-func))
        (arg-names
-	(map symbol->string
-	     (cddr (cadr (procedure-source func)))))
+        (map symbol->string
+             (cddr (cadr (procedure-source func)))))
        (doc (procedure-documentation func))
-       (sign (object-property func 'music-function-signature))
-       (type-names (map type-name sign))
-
+       (sign (ly:music-function-signature music-func))
+       (type-names (map (lambda (pred)
+                          (if (pair? pred)
+                              (format #f "[~a]" (type-name (car pred)))
+                              (format #f "(~a)" (type-name pred))))
+                        sign))
        (signature-str
-	(string-join
-	 (map (lambda (x) (format "@var{~a} (~a)"
-				  (car x)
-				  (cadr x)))
-	      (zip arg-names type-names)))))
-    (format
-     "@item @code{~a}~a~a
-@findex ~a
+        (string-join
+         (map (lambda (arg type) (format #f "@var{~a} ~a" arg type))
+              arg-names (cdr type-names)))))
+    (format #f
+            "@item @code{~a} ~a ~a~a
+@funindex ~a
 ~a
 "
-     name-sym (if (equal? "" signature-str) "" " - ") signature-str
-     name-sym
-     (if doc doc "(undocumented; fixme)"))))
+            name-sym (car type-names)
+            (if (string-null? signature-str) "" " - ") signature-str
+            name-sym
+            (if doc
+                doc
+                (begin
+                  (ly:warning "music function `~a' not documented." name-sym)
+                  "(undocumented; fixme)")))))
 
 
 (define (document-object obj-pair)
-  (cond
-   ((ly:music-function? (cdr obj-pair))
-    (document-music-function obj-pair))
-   (else
-    #f)))
-
-
-(define (identifier<? a b)
-  (ly:string-ci<?
-   (symbol->string (car a))
-   (symbol->string (car b))))
-
+  (and (ly:music-function? (cdr obj-pair))
+       (document-music-function obj-pair)))
 
 (define-public (identifiers-doc-string)
-  (format
-   "@table @asis
+  (format #f
+          "@table @asis
 ~a
 @end table
 "
-   (string-join
-    (filter
-     identity
-     (map
-      document-object
-      (sort
-       (ly:module->alist (current-module))
-       identifier<?)))
-    "")))
+          (string-join
+           (filter-map
+            document-object
+            (sort
+             (ly:module->alist (current-module))
+             identifier<?)))
+          ""))