CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/07 07:06:20
Modified files:
scm : framework-ps.scm
Log message:
oops
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.128&tr2=1.129&r1=text&r2=text
Patches:
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.128 lilypond/scm/framework-ps.scm:1.129
--- lilypond/scm/framework-ps.scm:1.128 Sat Aug 6 21:57:45 2005
+++ lilypond/scm/framework-ps.scm Sun Aug 7 07:06:19 2005
@@ -193,7 +193,7 @@
;; PFAaybabtu.otf.pfa, but the second case now produces aybabtu.otf,
;; which still fails because .otf files cannot be embedded.
(regexp-substitute/global #f "^([eE]mmentaler|[aA]ybabtu)"
- name 'pre "PFA" 1 'post ".pfa"))
+ name 'pre "PFA" 1 'post))
(define (cff-font? font)
(let*
@@ -250,9 +250,9 @@
(cons
(munge-lily-font-name name)
(cond
- ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+ ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
(ps-load-file (ly:find-file
- (munge-lily-font-name file-name))))
+ (format "~a.pfa" (munge-lily-font-name file-name)))))
((string? bare-file-name)
(ps-load-file (munge-lily-font-name file-name)))
(else
@@ -333,8 +333,9 @@
(cons
(munge-lily-font-name name)
(cond
- ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
- (cached-file-contents (munge-lily-font-name file-name)))
+ ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+ (cached-file-contents
+ (format "~a.pfa" (munge-lily-font-name file-name))))
((and
(eq? PLATFORM 'darwin)
bare-file-name (string-match "\\.dfont" bare-file-name))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
