* 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 eb7f3afd5c60a7c773be957f7733db0aad81f213..c8235b083ca15d0968c8fb8d8ce1d2b146c1370f 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -254,14 +254,14 @@
         (ps-embed-cff (ly:otf-font-table-data font "CFF ")
                       name
                       0))
-        (cached-file-contents bare-file-name))
        ((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
         (ly:warning (_ "can't find CFF/PFA/PFB font ~S=~S" name file-name))
-        (cons font-name "")))))
+        (cons font-name "")))
+       )))
 
   
   (define (load-fonts paper)