diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-15 19:54:50 +0000 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-02-15 19:54:50 +0000 |
commit | e75adf0a88365c7a835abccc5988fbabf34e7048 (patch) | |
tree | acad53a359a4713d5be78031c437c8255ba531a6 /Build/source/texk/xdvipdfmx/src | |
parent | 7333a267ad231655f18397451bfbd0c329e2ecaa (diff) |
Fix loading *.dfont files on non-Mac platforms
git-svn-id: svn://tug.org/texlive/trunk@29123 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx/src')
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/cidtype2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Build/source/texk/xdvipdfmx/src/cidtype2.c b/Build/source/texk/xdvipdfmx/src/cidtype2.c index c0257e1b981..0059a1c89ea 100644 --- a/Build/source/texk/xdvipdfmx/src/cidtype2.c +++ b/Build/source/texk/xdvipdfmx/src/cidtype2.c @@ -568,7 +568,9 @@ CIDFont_type2_dofont (CIDFont *font) ERROR("Invalid TTC index in %s.", font->ident); break; case SFNT_TYPE_TRUETYPE: -#ifndef XETEX_MAC +#ifndef XETEX + /* disable the check here becuase sfnt_open() does not distinguish dfont + * from regular trutype */ if (font->options->index > 0) ERROR("Found TrueType font file while expecting TTC file (%s).", font->ident); #endif @@ -971,9 +973,12 @@ CIDFont_type2_open (CIDFont *font, const char *name, offset = ttc_read_offset(sfont, opt->index); break; case SFNT_TYPE_TRUETYPE: -#ifdef XETEX_MAC /* disable the index check here because of how .dfonts are handled */ +#ifdef XETEX + /* disable the check here becuase sfnt_open() does not distinguish dfont + * from regular trutype */ offset = 0; #else + assert (opt->index == 0); if (opt->index > 0) { ERROR("Invalid TTC index (not TTC font): %s", name); } else { |