* scm/framework-ps.scm (write-preamble): extract CFF from OTF

fonts directly.

* scm/framework-ps.scm (ps-embed-cff): reinstate.

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index c8235b083ca15d0968c8fb8d8ce1d2b146c1370f..2418b1c854827d67bd01bb0aa7feabb442b31d26 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -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