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

fonts directly.

* buildscripts/gen-emmentaler-scripts.py (i): idem.

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

diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py
index 3895d660d72b0d4932ca731427edc28b816eab89..e13d9c9f5ea51f7ec82596c72ba6386522bdbbca 100644 (file)
--- a/buildscripts/gen-emmentaler-scripts.py
+++ b/buildscripts/gen-emmentaler-scripts.py
@@ -70,7 +70,7 @@ Generate("%(filename)s-%(design_size)d.svg");
 SetFontNames("PFA%(name)s-%(design_size)d", "PFA%(name)s", "PFA%(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 # different name to prevent conflict with OTF
-LoadEncodingFile("feta%(design_size)d.enc");
+#LoadEncodingFile("feta%(design_size)d.enc");
 Generate("PFA%(filename)s-%(design_size)d.pfa");
 ''' % vars()
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 4177cc62426e814a52cb61b7cce744445b2da138..eb7f3afd5c60a7c773be957f7733db0aad81f213 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -261,7 +261,7 @@
        (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)