Fix documentation build

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

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index a4233e3f69cbe7e724543c4e8d7197976476277a..71ba5a274fa616c3bbf111fab909af2f0eab4657 100644 (file)
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -1,9 +1,20 @@
-;;;; document-backend.scm -- Functions for backend documentation
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.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
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define (sort-grob-properties x)
   ;; force 'meta to the end of each prop-list
@@ -57,13 +68,12 @@
          (description-list->texi internal-propdocs #t))
         ""))))
 
-(define iface->grob-table (make-vector 61 '()))
+(define iface->grob-table (make-hash-table 61))
 ;; extract ifaces, and put grob into the hash table.
 (map
  (lambda (x)
-   (let* ((metah (assoc 'meta (cdr x)))
-         (meta (cdr metah))
-         (ifaces (cdr (assoc 'interfaces meta))))
+   (let* ((meta (assoc-get 'meta (cdr x)))
+         (ifaces (assoc-get 'interfaces meta)))
 
      (map (lambda (iface)
            (hashq-set!
@@ -78,10 +88,12 @@
   (let* ((name (symbol->string (car interface)))
         (interface-list (human-listify
                          (map ref-ify
+                              (sort
                                (map symbol->string
                                     (hashq-ref iface->grob-table
                                                (car interface)
-                                               '()))))))
+                                               '()))
+                               ly:string-ci<?)))))
     (make <texi-node>
       #:name name
       #:text (string-append
@@ -108,16 +120,18 @@
   "Given a property alist DESCRIPTION, make a documentation
 node."
 
-  (let* ((metah (assoc 'meta description))
-        (meta (cdr metah))
-        (name (cdr (assoc 'name meta)))
+  (let* ((meta (assoc-get 'meta description))
+        (name (assoc-get 'name meta))
         ;;       (bla (display name))
-        (ifaces (map lookup-interface (cdr (assoc 'interfaces meta))))
-        (ifacedoc (map (lambda (iface)
-                         (if (pair? iface)
-                             (ref-ify (symbol->string (car iface)))
-                             (ly:error (_ "pair expected in doc ~s") name)))
-                       (reverse ifaces)))
+        (ifaces (map lookup-interface (assoc-get 'interfaces meta)))
+        (ifacedoc (map ref-ify
+                       (sort
+                        (map (lambda (iface)
+                               (if (pair? iface)
+                                   (symbol->string (car iface))
+                                   (ly:error (_ "pair expected in doc ~s") name)))
+                             ifaces)
+                        ly:string-ci<?)))
         (engravers (filter
                     (lambda (x) (engraver-makes-grob? name x))
                     all-engravers-list))