X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-identifiers.scm;h=fcd8f932146181b6dc016eac3d1b9d04fbbd1796;hb=9ec7c79078944a94e2e9abbf8e1b3299c9706389;hp=43d26323ff88e6e0de971812adc275bfc853aebb;hpb=ea4fdf1afa3e6bb9a7c586f5a533be93ff3312d3;p=lilypond.git diff --git a/scm/document-identifiers.scm b/scm/document-identifiers.scm index 43d26323ff..fcd8f93214 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--2011 Han-Wen Nienhuys +;;;; Copyright (C) 2006--2012 Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -26,16 +26,18 @@ (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 #f "@var{~a} (~a)" - (car x) - (cadr x))) - (zip arg-names (cdr type-names)))))) + (map (lambda (arg type) (format #f "@var{~a} ~a" arg type)) + arg-names (cdr type-names))))) (format #f - "@item @code{~a} (~a) ~a~a + "@item @code{~a} ~a ~a~a @funindex ~a ~a "