(write-preamble): only load fonts if their

filename is a string.

diff --git a/ChangeLog b/ChangeLog
index 22764291f2d83c753bca5bd11df8fb218f9ebf11..b84e4432ba85e6224a60cba6591e8c7d69f8f774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/framework-ps.scm (write-preamble): only load fonts if their
+       filename is a string. 
+
 2005-05-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/output-svg.scm (circle): support circle.

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index c80168fdd9406e51b45c065610e56c1787d07bed..79fb377aaf06e89550f5a8386a54656f8b9633b3 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -231,7 +231,11 @@
 
   (define (load-font-via-GS font-name-filename)
     (define (ps-load-file name)
-      (format "(~a) (r) file .loadfont " name))
+      (format
+       (if (string? name)
+          "(~a) (r) file .loadfont\n"
+          "% fontfile ~a could not be found\n")
+       name))
 
     (let* ((font (car font-name-filename))
           (name (cadr font-name-filename))
@@ -314,7 +318,8 @@
                   (lambda (x y) (string<? (cadr x) (cadr y))))))
           ;; ttftool/fopencookie is broken on Windows,
           ;; possibly a stack corruption bug.
-          (pfas (map (if (eq? PLATFORM 'windows) load-font-via-GS load-font)
+          (pfas (map (if
+                      (eq? PLATFORM 'windows) load-font-via-GS load-font)
                      font-names)))
       pfas))