*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 00ecb4f73bacd64fa52db83a17cf906a88244f9c..15c8d2a631e9105736f9fdcf41dd542fa18e1913 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,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}
+       * scm/framework-ps.scm (ps-font-command): don't hash, just use
+       name directly.
 
        * lily/main.cc (setup_paths): either add mf/out to search path or 
        fonts/{otf,type1,etc}

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index d34a7be1eda962ea0a78012127a01088f10aa6b8..d21f8bf6aad02480eea440765f00693b6e6c4204 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -239,3 +239,4 @@ LY_DEFINE (ly_effective_prefix, "ly:effective-prefix",
   return scm_makfrom0str (prefix_directory.to_str0 ());
 }
 
+

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 54a274701e7549930f88835e18790ecf87e81281..20a2676ee81eabf5347ae67570988b827392c0e2 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -28,12 +28,14 @@
 (define mm-to-bigpoint
   (/ 72 25.4))
 
+
 (define-public (ps-font-command font)
   (let* ((name (munge-lily-font-name (ly:font-file-name font)))
         (magnify (ly:font-magnification font)))
 
     (string-append
-     "magfont" (string-encode-integer (string-hash  name 1000000))
+     "magfont"
+     (string-regexp-substitute "[ /%]" "_" name)
      "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
 
 (define (tex-font? fontname)