CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/05/03 01:00:25

Modified files:
        scm            : framework-ps.scm 

Log message:
        * scm/framework-ps.scm (write-preamble): extract CFF from OTF
        fonts directly.
        
        * scm/framework-ps.scm (ps-embed-cff): reinstate.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.96&tr2=1.97&r1=text&r2=text

Patches:
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.96 lilypond/scm/framework-ps.scm:1.97
--- lilypond/scm/framework-ps.scm:1.96  Tue May  3 00:51:28 2005
+++ lilypond/scm/framework-ps.scm       Tue May  3 01:00:25 2005
@@ -250,12 +250,13 @@
         (cached-file-contents
          (format "~a.pfa" (munge-lily-font-name file-name))))
        
-       ((cff-font? font)
+       ((and bare-file-name (string-match "\\.ttf" bare-file-name))
+        (ly:ttf->pfa bare-file-name))
+
+       ((and font (cff-font? font))
         (ps-embed-cff (ly:otf-font-table-data font "CFF ")
                       name
                       0))
-       ((and bare-file-name (string-match "\\.ttf" bare-file-name))
-        (ly:ttf->pfa bare-file-name))
        (bare-file-name (cached-file-contents bare-file-name))
        (cff-file-name  (cached-file-contents cff-file-name))
        (else


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

Reply via email to