From 6cc1535539a6cc5b637173a0581ddff3c09de0bc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 19 Jun 2005 13:50:24 +0000 Subject: [PATCH] (write-preamble): downcase filename before string-matching. Should fix .TTF files (as opposed to ttf files) --- ChangeLog | 3 +++ scm/framework-ps.scm | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d835692a3..ff354c8011 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-06-19 Han-Wen Nienhuys + * scm/framework-ps.scm (write-preamble): downcase filename before + string-matching. Should fix .TTF files (as opposed to ttf files) + * scm/lily.scm (lambda): default resolution 116 (8 pixels per space). diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 66b94b53d3..37dcefd8fe 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -303,21 +303,22 @@ embed)) (define (font-file-as-ps-string name file-name) + (let* + ((downcase-file-name (string-downcase file-name))) + (cond - ((and file-name (string-match "\\.pfa" file-name)) + ((and file-name (string-match "\\.pfa" downcase-file-name)) (cached-file-contents file-name)) - ((and file-name (string-match "\\.pfb" file-name)) + ((and file-name (string-match "\\.pfb" downcase-file-name)) (ly:pfb->pfa file-name)) - ((and file-name (string-match "\\.ttf" file-name)) + ((and file-name (string-match "\\.ttf" downcase-file-name)) (ly:ttf->pfa file-name)) - ((and file-name (string-match "\\.otf" file-name)) + ((and file-name (string-match "\\.otf" downcase-file-name)) (ps-embed-cff (ly:otf->cff file-name) name 0)) - ((and file-name (string-match "\\.ttf" file-name)) - (ly:ttf->pfa file-name)) (else (ly:warning (_ "don't know how to embed ~S=~S") name file-name) "") - )) + ))) (define (load-font font-name-filename) (let* ((font (car font-name-filename)) -- 2.39.5