From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 3 May 2005 00:42:56 +0000 (+0000)
Subject: * scm/framework-ps.scm (write-preamble): extract CFF from OTF
X-Git-Tag: release/2.5.22~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ec966af050b25a860b1c3cd047a833ddd59f11e;p=lilypond.git

* 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 3895d660d7..e13d9c9f5e 100644
--- 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 4177cc6242..eb7f3afd5c 100644
--- 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)