CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/27 22:04:31
Modified files:
. : ChangeLog
scm : framework-ps.scm
Log message:
(write-preamble): only load fonts if their
filename is a string.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3668&tr2=1.3669&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3668 lilypond/ChangeLog:1.3669
--- lilypond/ChangeLog:1.3668 Fri May 27 12:00:13 2005
+++ lilypond/ChangeLog Fri May 27 22:04:30 2005
@@ -1,3 +1,8 @@
+2005-05-28 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/framework-ps.scm (write-preamble): only load fonts if their
+ filename is a string.
+
2005-05-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/output-svg.scm (circle): support circle.
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.107 lilypond/scm/framework-ps.scm:1.108
--- lilypond/scm/framework-ps.scm:1.107 Fri May 20 18:09:02 2005
+++ lilypond/scm/framework-ps.scm Fri May 27 22:04:31 2005
@@ -231,7 +231,11 @@
(define (load-font-via-GS font-name-filename)
(define (ps-load-file name)
- (format "(~a) (r) file .loadfont " name))
+ (format
+ (if (string? name)
+ "(~a) (r) file .loadfont\n"
+ "% fontfile ~a could not be found\n")
+ name))
(let* ((font (car font-name-filename))
(name (cadr font-name-filename))
@@ -314,7 +318,8 @@
(lambda (x y) (string<? (cadr x) (cadr y))))))
;; ttftool/fopencookie is broken on Windows,
;; possibly a stack corruption bug.
- (pfas (map (if (eq? PLATFORM 'windows) load-font-via-GS load-font)
+ (pfas (map (if
+ (eq? PLATFORM 'windows) load-font-via-GS load-font)
font-names)))
pfas))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
