(write-preamble): new function.

(write-preamble): load mac fonts via fondu, even if gs-font-load
is set.

diff --git a/ChangeLog b/ChangeLog
index 9be6d2c60f34176642303c0f34dddb1e5b4b4965..2a7831586357caefa1de3e48c53f2b8efdb170d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/framework-ps.scm (write-preamble): new function.
+       (write-preamble): load mac fonts via fondu, even if gs-font-load
+       is set.
+
 2006-05-03  Werner Lemberg  <wl@gnu.org>
 
        * mf/GNUmakefile (FC_FIND): Fix typo.

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index ec7fbef6be81b19a034066ad46534fac097959f3..23b8d04ac8d76c7d7268cf65d21e61905a64d881 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -264,15 +264,20 @@
 
       (cons
        name
-       (cond
-       ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
-        (ps-load-file (ly:find-file
-                       (format "~a.otf"  file-name))))
-       ((string? bare-file-name)
-        (ps-load-file file-name))
-       (else
-        (ly:warning (_ "can't embed ~S=~S") name file-name)
-         "")))))
+       
+       (if (mac-font? bare-file-name)
+          (handle-mac-font name bare-file-name)
+          (cond
+           ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+            (ps-load-file (ly:find-file
+                           (format "~a.otf"  file-name))))
+           ((string? bare-file-name)
+            (ps-load-file file-name))
+           (else
+            (ly:warning (_ "can't embed ~S=~S") name file-name)
+            "")))
+
+         )))
 
   (define (dir-join a b)
     (if (equal? a "")
@@ -341,7 +346,15 @@
        (else
        (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
        ""))))
-      
+
+    (define (mac-font? bare-file-name)
+      (and
+       (eq? PLATFORM 'darwin)
+       bare-file-name
+       (or
+       (string-match "\\.dfont" bare-file-name)
+       (= (stat:size (stat bare-file-name)) 0))))
+
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
           (name (cadr font-name-filename))
@@ -352,14 +365,7 @@
        name
        (cond
 
-       ((and
-         (eq? PLATFORM 'darwin)
-         bare-file-name (string-match "\\.dfont" bare-file-name))
-        (handle-mac-font name bare-file-name))
-       
-       ((and
-         (eq? PLATFORM 'darwin)
-         bare-file-name (= (stat:size (stat bare-file-name)) 0))
+       ((mac-font? bare-file-name)
         (handle-mac-font name bare-file-name))
 
        ((and font (cff-font? font))