Merge with master

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

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index 8a828b4a8cd44d78e4cb52474e15d8191cebc053..08cc17cd33ce4d64c12e366d9a8e48e1a19ec7f7 100644 (file)
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (interface-doc-string interface grob-description)
@@ -12,8 +12,11 @@
         (docfunc (lambda (pr)
                    (property->texi
                     'backend pr grob-description)))
-        (iprops (filter (lambda (x) (object-property x 'backend-internal) ) props))
-        (uprops (filter (lambda (x) (not (object-property x 'backend-internal)) ) props))
+        (iprops (filter (lambda (x) (object-property x 'backend-internal))
+                        props))
+        (uprops (filter
+                 (lambda (x) (not (object-property x 'backend-internal)))
+                 props))
         (user-propdocs (map docfunc uprops))
         (internal-propdocs (map docfunc iprops)))
 
@@ -62,7 +65,7 @@
               (map ref-ify
                    (sort 
                     (map symbol->string
-                         (hashq-ref iface->grob-table (car interface) '() ))
+                         (hashq-ref iface->grob-table (car interface) '()))
                     string<?)))))))
 
 (define (grob-alist->texi alist)
@@ -85,7 +88,7 @@ node."
         (ifacedoc (map (lambda (iface)
                          (if (pair? iface)
                              (ref-ify (symbol->string (car iface)))
-                             (error (format "Error making doc of ~s" name))))
+                             (ly:error (_ "pair expected in doc ~s") name)))
                        (reverse ifaces)))
         (engravers (filter
                     (lambda (x) (engraver-makes-grob? name x)) all-engravers-list))
@@ -121,23 +124,25 @@ node."
 
 ;;;;;;;;;; check for dangling backend properties.
 (define (mark-interface-properties entry)
-  (map (lambda (x) (set-object-property! x  'iface-marked #t)) (caddr (cdr entry))))
+  (map (lambda (x) (set-object-property! x 'iface-marked #t))
+       (caddr (cdr entry))))
 
 (map mark-interface-properties interface-description-alist)
 
 (define (check-dangling-properties prop)
   (if (not (object-property prop 'iface-marked))
-      (error  "\ndefine-grob-properties.scm: Can't find interface for property:" prop)))
+      (ly:error (string-append "define-grob-properties.scm: "
+               (_ "cannot find interface for property: ~S")) prop)))
 
 (map check-dangling-properties all-backend-properties)
 
 ;;;;;;;;;;;;;;;;
 
 (define (lookup-interface name)
-  (let* ((entry (hashq-ref (ly:all-grob-interfaces) name '() )))
-    (if (equal? entry #f)
-       (error "Unknown interface" name))
-    entry))
+  (let* ((entry (hashq-ref (ly:all-grob-interfaces) name #f)))
+    (if entry
+       entry
+       (ly:error (_ "unknown Grob interface: ~S") name))))
 
 (define (all-interfaces-doc)
   (make <texi-node>