(load-font-via-GS): new function.

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index ceac0725e45feb7ad2d06ab4075dcabd3b8fdc27..e08c93f1bfef5aa7b3f161c6b7fd3d7423b5fba6 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -35,7 +35,7 @@
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf" ))
         (cmd (format #f
                      "gs\
- -dCompatibilityLevel=1.2\
+ -dCompatibilityLevel=1.4 \
  -dSAFER\
  -sPAPERSIZE=~a\
  -q\

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index e21cbf6a6349021d7722c24f40e9f77b85602cc1..ded685b366adf14fad726a2140d02d900688561b 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -234,7 +234,7 @@
  
   (define (load-font-via-GS font-name-filename)
     (define (ps-load-file name)
-      (format "(~a) (r) file .loadfontfile " name))
+      (format "(~a) (r) file .loadfont " name))
     
     (let* ((font (car font-name-filename))
           (name (cadr font-name-filename))
@@ -245,7 +245,7 @@
        (munge-lily-font-name name)
        (cond
        ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
-        (ps-load-file (munge-lily-font-name file-name)))
+        (ps-load-file (ly:find-file (format "~a.pfa" (munge-lily-font-name file-name)))))
        ((string? bare-file-name)
         (ps-load-file (munge-lily-font-name file-name)))
        (else
@@ -315,7 +315,7 @@
             (sort (apply append all-font-names)
                   (lambda (x y) (string<? (cadr x) (cadr y))))))
           
-          (pfas (map load-font-via-GS font-names)))
+          (pfas (map load-font font-names)))
       pfas))
 
   (if load-fonts?