release commit

diff --git a/ChangeLog b/ChangeLog
index 6d719d18aae11cedea434a9b65184adb94e77e2e..7f0f69dfab0075f7251db62feff65c36bc4f4fa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 6251246559664c2c2e497c3c204ab5b6a94c9e76..fb1c4efd509e9c363a995a0b85ab42f9a6e01d66 100644 (file)
--- 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))