From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 3 May 2005 00:51:28 +0000 (+0000)
Subject: * scm/framework-ps.scm (write-preamble): extract CFF from OTF
X-Git-Tag: release/2.5.22~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dececae721acd4a52dce058200df76a7c8a2f6e9;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 eb7f3afd5c..c8235b083c 100644
--- 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)