Issue 4994/3: Fix font exporting for internal fonts

This commit fixes the conflict of `-dgs-load-fonts` option
and `-dfont-export-dir=[dir]`.

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 4df9ba3e6f90d52da14c257690ba0dbe24f5264b..4a17477cb8f29e1e6b069ed1380ed20cf1810485 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -309,7 +309,8 @@
 
     (define (ps-load-file file-name)
       (if (string? file-name)
-          (if (string-contains file-name (ly:get-option 'datadir))
+          (if (and (not (ly:get-option 'font-export-dir))
+                   (string-contains file-name (ly:get-option 'datadir)))
               (begin
                 (set! file-name (ly:string-substitute (ly:get-option 'datadir)
                                                       "" file-name))