From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Fri, 11 Dec 2015 16:25:10 +0000 (+0900)
Subject: Issue 4701/1: Fix `-dgs-load-fonts' option with non-Emmentaler music font
X-Git-Tag: release/2.19.35-1~9^2~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb215c0308a2f94278f5be2fbc1b8c28d16550de;p=lilypond.git

Issue 4701/1: Fix `-dgs-load-fonts' option with non-Emmentaler music font

Using CFF-font test instead of internal-font test,
non-Emmentaler CFF-font can be embedded.
---

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 60d7bb3fc0..b45a69d615 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -272,7 +272,7 @@
             (if (mac-font? bare-file-name)
                 (handle-mac-font name bare-file-name)
                 (cond
-                 ((internal-font? file-name)
+                 ((and font (cff-font? font))
                   (ps-load-file (ly:find-file
                                  (format #f "~a.otf" file-name))))
                  ((string? bare-file-name)