X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-backend.scm;h=95be16550a9230bfeace0329c37667fd005c7422;hb=38eb0e029bdeb5ff9dfa5ca3be83ce2f285dbe09;hp=02a09736b0927715bde6dfe74458599d14d300e8;hpb=73abdfa52f0403da92b84e248dc7454e63215005;p=lilypond.git

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index 02a09736b0..95be16550a 100644
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -2,13 +2,35 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
+(define (sort-grob-properties x)
+  ;; force 'meta to the end of each prop-list
+  (let ((meta (assoc 'meta x)))
+    (append (sort (assoc-remove! x 'meta) ly:alist-ci<?)
+            (list meta))))
+
+;; properly sort all grobs, properties, and interfaces
+;; within the all-grob-descriptions alist
+(map
+  (lambda (x)
+    (let* ((props      (assoc-ref all-grob-descriptions (car x)))
+           (meta       (assoc-ref props 'meta))
+           (interfaces (assoc-ref meta 'interfaces)))
+      (set! all-grob-descriptions
+        (sort (assoc-set! all-grob-descriptions (car x)
+               (sort-grob-properties
+                (assoc-set! props 'meta
+                 (assoc-set! meta 'interfaces
+                  (sort interfaces ly:symbol-ci<?)))))
+              ly:alist-ci<?))))
+  all-grob-descriptions)
+
 (define (interface-doc-string interface grob-description)
   (let* ((name (car interface))
 	 (desc (cadr interface))
-	 (props (sort (caddr interface) symbol<?))
+	 (props (caddr interface))
 	 (docfunc (lambda (pr)
 		    (property->texi
 		     'backend pr grob-description)))
@@ -25,13 +47,13 @@
 
      (if (pair? uprops)
 	 (string-append
-	  "\n\n@unnumberedsubsubsec User settable properties:\n"
+	  "\n\n@subsubheading User settable properties:\n"
 	  (description-list->texi user-propdocs #t))
 	 "")
 
      (if (pair? iprops)
 	 (string-append
-	  "\n\n@unnumberedsubsubsec Internal properties:\n"
+	  "\n\n@subsubheading Internal properties:\n"
 	  (description-list->texi internal-propdocs #t))
 	 ""))))
 
@@ -56,12 +78,10 @@
   (let* ((name (symbol->string (car interface)))
 	 (interface-list (human-listify
 			  (map ref-ify
-			       (sort
 				(map symbol->string
 				     (hashq-ref iface->grob-table
 						(car interface)
-						'()))
-				string<?)))))
+						'()))))))
     (make <texi-node>
       #:name name
       #:text (string-append
@@ -120,9 +140,9 @@ node."
 	    engraver-list))
        "."
 
-       "\n\nStandard settings: \n\n"
+       "\n\nStandard settings:\n\n"
        (grob-alist->texi description)
-       "\n\nThis object supports the following interface(s): \n"
+       "\n\nThis object supports the following interface(s):\n"
        (human-listify ifacedoc)
        "."))))
 
@@ -139,8 +159,6 @@ node."
      (cons (cons key val)  prior))
    '() (ly:all-grob-interfaces)))
 
-(set! interface-description-alist (sort interface-description-alist alist<?))
-
 ;;;;;;;;;; check for dangling backend properties.
 (define (mark-interface-properties entry)
   (map (lambda (x) (set-object-property! x 'iface-marked #t))
@@ -171,7 +189,7 @@ node."
     (map interface-doc interface-description-alist)))
 
 (define (backend-properties-doc-string lst)
-  (let* ((ps (sort (map symbol->string lst) string<?))
+  (let* ((ps (sort (map symbol->string lst) ly:string-ci<?))
 	 (descs (map (lambda (prop)
 		       (property->texi 'backend (string->symbol prop) '())) ps))
 	 (texi (description-list->texi descs #f)))