From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Fri, 28 Oct 2016 14:17:43 +0000 (+0900)
Subject: Issue 4992/5: Add never-embed-font-list for `-dgs-load-fonts`
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=25369cc54853cf02a42a723c19e4c0f70865677f;p=lilypond.git

Issue 4992/5: Add never-embed-font-list for `-dgs-load-fonts`

When you use both `-dgs-never-embed-fonts` and `-dgs-load-fonts` options,
Ghostscript never embed fonts except TrueType for PDF file output.
---

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 8bafb758f0..b26e9d40c9 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -343,18 +343,26 @@
                     name)
         (load-font font-name-filename))
        (else
-        (cons name
-              (if (mac-font? bare-file-name)
-                  (handle-mac-font name bare-file-name)
-                  (cond
-                   ((and font (cff-font? font))
-                    (ps-load-file (ly:find-file
-                                   (format #f "~a.otf" file-name))))
-                   ((string? bare-file-name)
-                    (ps-load-file file-name))
-                   (else
-                    (ly:warning (_ "cannot embed ~S=~S") name file-name)
-                    ""))))))))
+        (begin
+          (if (or (and font (cff-font? font))
+                  (and (string? bare-file-name)
+                       (not (eq? (ly:get-font-format
+                                  bare-file-name
+                                  font-index) 'TrueType))))
+              (set! never-embed-font-list
+                    (append never-embed-font-list (list name))))
+          (cons name
+                (if (mac-font? bare-file-name)
+                    (handle-mac-font name bare-file-name)
+                    (cond
+                     ((and font (cff-font? font))
+                      (ps-load-file (ly:find-file
+                                     (format #f "~a.otf" file-name))))
+                     ((string? bare-file-name)
+                      (ps-load-file file-name))
+                     (else
+                      (ly:warning (_ "cannot embed ~S=~S") name file-name)
+                      "")))))))))
 
   (define (dir-join a b)
     (if (equal? a "")