From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 10 May 2005 21:16:53 +0000 (+0000)
Subject: (load-font-via-GS):  new function.
X-Git-Tag: release/2.5.24~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7eb97d29cd4204e6f48ef3b317ea37298717701d;p=lilypond.git

(load-font-via-GS):  new function.
---

diff --git a/ChangeLog b/ChangeLog
index 7746df4016..d76ade4eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-05-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/framework-ps.scm (load-font-via-GS):  new function.
+
 	* lily/pango-font.cc (pango_item_string_stencil): add support for
 	CID keyed font.
 
@@ -65,9 +67,10 @@
 
 2005-05-09  Heikki Junes  <hjunes@cc.hut.fi>
 
-        * po/fi.po: update after a lesson how to update entries against source.
-
-        * po/TODO: document the lesson.
+	* po/fi.po: update after a lesson how to update entries against
+	source.
+	
+	* po/TODO: document the lesson.
 
 2005-05-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 361455307d..e21cbf6a63 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -232,6 +232,27 @@
 
 (define (write-preamble paper load-fonts? port)
  
+  (define (load-font-via-GS font-name-filename)
+    (define (ps-load-file name)
+      (format "(~a) (r) file .loadfontfile " name))
+    
+    (let* ((font (car font-name-filename))
+	   (name (cadr font-name-filename))
+	   (file-name (caddr font-name-filename))
+	   (bare-file-name (ly:find-file file-name)))
+
+      (cons 
+       (munge-lily-font-name name)
+       (cond
+	((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+	 (ps-load-file (munge-lily-font-name file-name)))
+	((string? bare-file-name)
+	 (ps-load-file (munge-lily-font-name file-name)))
+	(else
+	 (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+	  ""))
+       )))
+  
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
 	   (name (cadr font-name-filename))
@@ -294,7 +315,7 @@
 	     (sort (apply append all-font-names)
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
 	   
-	   (pfas (map load-font font-names)))
+	   (pfas (map load-font-via-GS font-names)))
       pfas))
 
   (if load-fonts?