From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 6 Apr 2005 12:46:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.19~43
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7952d4f6df5860b580c306039d4127c135a4ce7b;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 00ecb4f73b..15c8d2a631 100644
--- 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 d34a7be1ed..d21f8bf6aa 100644
--- 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 54a274701e..20a2676ee8 100644
--- 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)