From 676a7e2b0c4287c10849550ff1537360011e2d9b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 4 May 2006 08:49:05 +0000 Subject: [PATCH] (write-preamble): new function. (write-preamble): load mac fonts via fondu, even if gs-font-load is set. --- ChangeLog | 6 ++++++ scm/framework-ps.scm | 42 ++++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9be6d2c60f..2a78315863 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-04 Han-Wen Nienhuys + + * 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 * mf/GNUmakefile (FC_FIND): Fix typo. diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index ec7fbef6be..23b8d04ac8 100644 --- 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)) -- 2.39.5