(write-preamble): downcase filename before

string-matching. Should fix .TTF files (as opposed to ttf files)

diff --git a/ChangeLog b/ChangeLog
index 3d835692a32bdbca10b33c95dd963c081c295869..ff354c8011c2699c8f0b91687c8c7f2d23269c6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 66b94b53d307d6d0476dd2042f8f10bc0b559265..37dcefd8fefba6548d139e65121353418a9ae0f1 100644 (file)
--- 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))