summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJjgod Jiang <gzjjgod@gmail.com>2015-04-25 12:13:13 +0000
committerJjgod Jiang <gzjjgod@gmail.com>2015-04-25 12:13:13 +0000
commitb5712528be02bef1e90466fc6dfdc9429b112cde (patch)
treeeb50208fea41d06a5f9111da6fbf7e70f9724ecd /Build
parent80ebd89c97fe1891981d8fc0ac4f2797c15a489c (diff)
Restore Mac TrueType support removed in r34718
r34718 accidentally removed Mac TrueType font support, broke fonts like Osaka on OS X. git-svn-id: svn://tug.org/texlive/trunk@37043 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/sfnt.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 22603862204..279e04fa8bb 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-25 Jiang Jiang <gzjjgod@gmail.com>
+
+ * sfnt.c: Fix Mac TrueType font support.
+ bug found by Richard Koch <richardmoncriefkoch@icloud.com>.
+
2015-04-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi.c, tt_cmap.c: Fixed a dfont bug, from Akira,
diff --git a/Build/source/texk/dvipdfm-x/sfnt.c b/Build/source/texk/dvipdfm-x/sfnt.c
index 5ede43de387..fa338349aaa 100644
--- a/Build/source/texk/dvipdfm-x/sfnt.c
+++ b/Build/source/texk/dvipdfm-x/sfnt.c
@@ -64,7 +64,7 @@ sfnt_open (FILE *fp)
type = sfnt_get_ulong(sfont);
- if (type == SFNT_TRUETYPE) {
+ if (type == SFNT_TRUETYPE || type == SFNT_MAC_TRUE) {
sfont->type = SFNT_TYPE_TRUETYPE;
} else if (type == SFNT_OPENTYPE) {
sfont->type = SFNT_TYPE_OPENTYPE;