* scm/framework-ps.scm (reencode-font): Handling font scaling

and reencoding differently to work around a bug in gs 8.30 and
earlier.
Update callers.

diff --git a/ChangeLog b/ChangeLog
index 4e514dc08433f02dbb4457c9e904658a0556bce9..467fb79d0397fafa642d3cfb8d3d689170624240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-11  Matthias Neeracher  <neeracher@mac.com>
+
+       * scm/framework-ps.scm (reencode-font): Handling font scaling
+       and reencoding differently to work around a bug in gs 8.30 and
+       earlier.
+       Update callers.
+
 2004-09-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/*-engraver.cc: remove all Protected_scm objects to fix GC

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 007763e95aefe018c7d8c1e838f7f621ba257602..bb04b7efbf0106421494906bc657e8087ca46f38 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -76,11 +76,11 @@
      "/" command " { /" fontname " findfont "
      (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
 
-  (define (reencode-font plain encoding command)
+  (define (reencode-font fontname encoding scaling command)
     (let ((coding-vector (get-coding-command encoding)))
       (string-append
-       plain " " coding-vector " /" command " reencode-font\n"
-       "/" command "{ /" command " findfont 1 scalefont } bind def\n")))
+       "/" fontname " findfont " coding-vector " /" command " reencode-font\n"
+       "/" command "{ /" command " findfont " (ly:number->string scaling) " output-scale div scalefont } bind def\n")))
 
   (define (standard-tex-font? x)
     (or (equal? (substring x 0 2) "ms")
@@ -121,7 +121,7 @@
        (define-font plain fontname scaling)
        (if (equal? input-encoding font-encoding)
           ""
-          (reencode-font plain input-encoding command)))))
+          (reencode-font fontname input-encoding scaling command)))))
 
   (define (font-load-encoding encoding)
     (let ((filename (get-coding-filename encoding)))