From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Tue, 1 Nov 2016 14:06:07 +0000 (+0900)
Subject: Issue 4994/3: Fix font exporting for internal fonts
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=a8fa233db6e568ba1d27b74a42c01a225f71e7df;hp=532c6ba5b3e621e741140a4b25d6fe085d489004;p=lilypond.git

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 4df9ba3e6f..4a17477cb8 100644
--- 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))