X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-markup.scm;h=7096a09ec52c4993b6a181b70072740c3f867682;hb=fe37d3cbc1f095a36e65d8ae6f400465e5aab62d;hp=860ece38b6c8e73e5e389c07fd482ffb2d7e506b;hpb=a82dc4a0cca57f285e818f6c227c8428a3c02a71;p=lilypond.git diff --git a/scm/document-markup.scm b/scm/document-markup.scm index 860ece38b6..7096a09ec5 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--2010 Han-Wen Nienhuys +;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify @@ -57,11 +57,11 @@ "@var{" (car x) "} (" (cadr x) ")" )) (zip arg-names sig-type-names)) " " ))) - + (string-append "\n\n@item @code{\\" c-name "} " signature-str "\n@funindex \\" c-name "\n" - "\n@cindex \\" c-name "\n" + "\n@cindex \\" c-name "\n" (if (string? doc-str) doc-str "") @@ -74,16 +74,17 @@ (define (markup-functionstring (procedure-name a)) (symbol->string (procedure-name b)))) - + (define (markup-category-doc-node category) (let* ((category-string (symbol->string category)) - (category-name (string-capitalize (regexp-substitute/global #f - "-" category-string 'pre " " 'post))) - (markup-functions (hash-fold (lambda (markup-function dummy functions) - (cons markup-function functions)) - '() - (hashq-ref markup-functions-by-category - category)))) + (category-name (string-capitalize + (regexp-substitute/global + #f "-" category-string 'pre " " 'post))) + (markup-functions (hash-fold (lambda (markup-function dummy functions) + (cons markup-function functions)) + '() + (hashq-ref markup-functions-by-category + category)))) (make #:appendix #t #:name category-name @@ -102,7 +103,7 @@ #:desc "" #:text "The following commands can all be used inside @code{\\markup @{ @}}." #:children (let* (;; when a new category is defined, update `ordered-categories' - (ordered-categories '(font align graphic music instrument-specific-markup other)) + (ordered-categories '(font align graphic music instrument-specific-markup accordion-registers other)) (raw-categories (hash-fold (lambda (category functions categories) (cons category categories)) (list) @@ -117,12 +118,10 @@ (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