From: Han-Wen Nienhuys Date: Tue, 7 Jun 2005 14:38:08 +0000 (+0000) Subject: release commit X-Git-Tag: release/2.5.29 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6539ee6493856f32692c68559ed903d15d2e50a7;p=lilypond.git release commit --- diff --git a/ChangeLog b/ChangeLog index 6d719d18aa..7f0f69dfab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-06-07 Han-Wen Nienhuys + * VERSION (PATCH_LEVEL): release 2.5.29 + * ttftool/parse.c (readNamingTable): handle Apple/8bit encoding too. * scm/framework-ps.scm (font-file-as-ps-string): new function. diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 6251246559..fb1c4efd50 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -330,12 +330,12 @@ (cached-file-contents (format "~a.pfa" (munge-lily-font-name file-name)))) ((and -; (eq? PLATFORM 'darwin) + (eq? PLATFORM 'darwin) bare-file-name (string-match "\\.dfont" bare-file-name)) (handle-mac-font name bare-file-name)) ((and -; (eq? PLATFORM 'darwin) + (eq? PLATFORM 'darwin) bare-file-name (= (stat:size (stat bare-file-name)) 0)) (handle-mac-font name bare-file-name))