(define-fonts): Load .enc only once.

diff --git a/ChangeLog b/ChangeLog
index 46132b5a7699c3ee2f37145aff76b781d0ee3d95..6f584a6a524df788ff00657e3f9f83c33a778a80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/output-ps.scm (define-fonts): Load .enc only once.
+
        * mf/GNUmakefile (INSTALLATION_OUT_SUFFIXES): Install .enc files
        too.
 

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 0597ee23bf2b79690ff056f715e19b422a3d4f0d..a2ef3d9512dff979b8b72276dbe54b592b0b8f1b 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -205,7 +205,7 @@
           (fontname (ly:font-name font))
           (mangled (possibly-mangle-fontname fontname))
           (coding-alist (ly:font-encoding-alist font))
-          (encoding (assoc-get 'input-name coding-alist ))
+          (encoding (assoc-get 'input-name coding-alist))
           (designsize (ly:font-design-size font))
           (magnification (* (ly:font-magnification font)))
           (ops (ly:paper-lookup paper 'outputscale))
@@ -224,22 +224,29 @@
         (format (current-error-port) "ops ~S\n" ops)
         (format (current-error-port) "scaling ~S\n" scaling)))
       
-      (if (or (equal? encoding "ISOLatin1Encoding")
-             ;; UGH, uhg 
-             (equal? fontname "feta20")
-             (equal? fontname "parmesan20"))
+      (if (equal? encoding "AdobeStandardEncoding")
          (define-font command mangled scaling)
          ;; FIXME: should rather tag encoded font
          (let ((raw (string-append command "-raw"))
-               (vector (get-coding-command encoding))
-               (filename (get-coding-filename encoding)))
+               (vector (get-coding-command encoding)))
            (string-append
-            (ly:kpathsea-gulp-file filename)
             (define-font raw mangled scaling)
             (reencode-font raw vector command))))))
   
-  (apply string-append
-        (map (lambda (x) (font-load-command paper x)) font-list)))
+  (define (font-load-encoding encoding)
+    (let ((filename (get-coding-filename encoding)))
+      (ly:kpathsea-gulp-file filename)))
+
+  (let* ((encoding-list (map (lambda (x)
+                              (assoc-get 'input-name
+                                         (ly:font-encoding-alist x)))
+                            font-list))
+        (encodings (uniq-list (sort-list encoding-list string<?))))
+    
+    (string-append
+     (apply string-append (map font-load-encoding encodings))
+     (apply string-append
+           (map (lambda (x) (font-load-command paper x)) fonts)))))
 
 (define (define-origin file line col) "")