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

* 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 c8235b083c..2418b1c854 100644
--- 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