* scm/framework-ps.scm (ps-font-command): use string-hash for

hashing, to ensure that 11 and 18 are processed in Emmentaler-{11,18}

* scm/framework-ps.scm (munge-lily-font-name): new function
(write-preamble): hack: insert PFA equivalent of CFF into
.PS. This makes LilyPond output printable on normal PS printers
again.

diff --git a/ChangeLog b/ChangeLog
index b50bd89ba781530e61174f9a4bdbf796ffd0b856..95c90107fbc8726a34d85da430dc523ff1023be4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/framework-ps.scm (ps-font-command): use string-hash for
+       hashing, to ensure that 11 and 18 are processed in Emmentaler-{11,18}
+
        * lily/main.cc (setup_paths): either add mf/out to search path or 
        fonts/{otf,type1,etc}
        

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 23cb0841c23df989174f0cda1d1c699d5bf43584..3a2e9db1f84e50f887acaf5afe65112837deb493 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -31,9 +31,13 @@
 (define-public (ps-font-command font)
   (let* ((name (munge-lily-font-name (ly:font-file-name font)))
         (magnify (ly:font-magnification font)))
+  (display font)
+  (display name)
+  (display magnify)
+  (newline)
 
     (string-append
-     "magfont" (string-encode-integer (hash  name 1000000))
+     "magfont" (string-encode-integer (string-hash  name 1000000))
      "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
 
 (define (tex-font? fontname)