CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/10 21:16:53
Modified files:
. : ChangeLog
scm : framework-ps.scm
Log message:
(load-font-via-GS): new function.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3589&tr2=1.3590&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3589 lilypond/ChangeLog:1.3590
--- lilypond/ChangeLog:1.3589 Tue May 10 18:40:43 2005
+++ lilypond/ChangeLog Tue May 10 21:16:52 2005
@@ -1,5 +1,7 @@
2005-05-10 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
- * 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 <[EMAIL PROTECTED]>
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.101 lilypond/scm/framework-ps.scm:1.102
--- lilypond/scm/framework-ps.scm:1.101 Sun May 8 19:12:25 2005
+++ lilypond/scm/framework-ps.scm Tue May 10 21:16:53 2005
@@ -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?
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
