From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 27 May 2005 22:04:31 +0000 (+0000)
Subject: (write-preamble): only load fonts if their
X-Git-Tag: release/2.5.27~37
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b576a7b2e38a3c38a40f5393653747ad880b2c16;p=lilypond.git

(write-preamble): only load fonts if their
filename is a string.
---

diff --git a/ChangeLog b/ChangeLog
index 22764291f2..b84e4432ba 100644
--- 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 c80168fdd9..79fb377aaf 100644
--- 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))