Revert 3 4 autobeam rule

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

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index a4233e3f69cbe7e724543c4e8d7197976476277a..5fb8bf9622471ca4f9c22415cbc7a3870f70c2be 100644 (file)
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -61,9 +61,8 @@
 ;; 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 +77,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 +109,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))