CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/06/19 13:50:24

Modified files:
        .              : ChangeLog 
        scm            : framework-ps.scm 

Log message:
        (write-preamble): downcase filename before
        string-matching. Should fix .TTF files (as opposed to ttf files)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3799&tr2=1.3800&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.122&tr2=1.123&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3799 lilypond/ChangeLog:1.3800
--- lilypond/ChangeLog:1.3799   Sun Jun 19 11:21:06 2005
+++ lilypond/ChangeLog  Sun Jun 19 13:50:23 2005
@@ -1,5 +1,8 @@
 2005-06-19  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+       * 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).
 
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.122 lilypond/scm/framework-ps.scm:1.123
--- lilypond/scm/framework-ps.scm:1.122 Fri Jun 17 13:02:55 2005
+++ lilypond/scm/framework-ps.scm       Sun Jun 19 13:50:24 2005
@@ -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))


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to