summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/cidtype0.c
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
commit796176898c849ec72156930daa2ea150b68c48a3 (patch)
treedf9ae1a767183ead147947882f8895cf07f2417a /Build/source/texk/dvipdfm-x/cidtype0.c
parent31053cc388d6f0b348b297a3a0b950e8d707916a (diff)
Remove most of font related #ifdef XETEX
Almost all of this is not needed now since XeTeX’s native fonts are always passed by file name and face index now, so we can use original dvipdfmx direct file based code instead of using a FreeType font face. Has the side effect of fixing: https://sourceforge.net/p/xetex/bugs/97/ git-svn-id: svn://tug.org/texlive/trunk@34718 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/cidtype0.c')
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c
index 4fbb7401f50..f8e67471369 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.c
+++ b/Build/source/texk/dvipdfm-x/cidtype0.c
@@ -509,14 +509,10 @@ CIDFont_type0_dofont (CIDFont *font)
if (!used_chars)
ERROR("Unexpected error: Font not actually used???");
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
-#else
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_OTFONT);
if (!fp)
ERROR("Could not open OpenType font file: %s", font->ident);
sfont = sfnt_open(fp);
-#endif
if (!sfont)
ERROR("Could not open OpenType font file: %s", font->ident);
@@ -527,11 +523,7 @@ CIDFont_type0_dofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (2)?");
-#ifdef XETEX
- cffont = cff_open(sfont, offset, font->options->index);
-#else
cffont = cff_open(fp, offset, font->options->index);
-#endif
if (!cffont)
ERROR("Could not open CFF font.");
if (!(cffont->flag & FONTTYPE_CIDFONT))
@@ -734,11 +726,6 @@ CIDFont_type0_open (CIDFont *font, const char *name,
ASSERT(font);
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(name, DPX_RES_TYPE_OTFONT);
if (!fp)
return -1;
@@ -747,18 +734,13 @@ CIDFont_type0_open (CIDFont *font, const char *name,
if (!sfont) {
ERROR("Not a CFF/OpenType font (3)?");
}
-#endif
if (sfont->type != SFNT_TYPE_POSTSCRIPT ||
sfnt_read_table_directory(sfont, 0) < 0 ||
(offset = sfnt_find_table_pos(sfont, "CFF ")) == 0) {
ERROR("Not a CFF/OpenType font (4)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, opt->index);
-#else
cffont = cff_open(sfont->stream, offset, opt->index);
-#endif
if (!cffont) {
ERROR("Cannot read CFF font data");
}
@@ -912,15 +894,11 @@ CIDFont_type0_t1cdofont (CIDFont *font)
if (!used_chars)
ERROR("Unexpected error: Font not actually used???");
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
-#else
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_OTFONT);
if (!fp)
ERROR("Could not open OpenType font file: %s", font->ident);
sfont = sfnt_open(fp);
-#endif
if (!sfont)
ERROR("Could not open OpenType font file: %s", font->ident);
@@ -931,11 +909,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (6)?");
-#ifdef XETEX
- cffont = cff_open(sfont, offset, font->options->index);
-#else
cffont = cff_open(fp, offset, font->options->index);
-#endif
if (!cffont)
ERROR("Could not open CFF font.");
if (cffont->flag & FONTTYPE_CIDFONT)
@@ -1168,17 +1142,11 @@ CIDFont_type0_t1copen (CIDFont *font, const char *name,
ASSERT(font);
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(name, DPX_RES_TYPE_OTFONT);
if (!fp)
return -1;
sfont = sfnt_open(fp);
-#endif
if (!sfont) {
ERROR("Not a CFF/OpenType font (7)?");
}
@@ -1188,11 +1156,7 @@ CIDFont_type0_t1copen (CIDFont *font, const char *name,
ERROR("Not a CFF/OpenType font (8)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, opt->index);
-#else
cffont = cff_open(fp, offset, opt->index);
-#endif
if (!cffont) {
ERROR("Cannot read CFF font data");
}
@@ -1551,11 +1515,6 @@ CIDFont_type0_t1open (CIDFont *font, const char *name,
strcpy(fontname, shortname);
RELEASE(shortname);
-#ifdef XETEX
- font->ft_to_gid = cff_get_ft_to_gid(cffont);
- cffont->ft_to_gid = NULL;
-#endif
-
cff_close(cffont);
if (opt->style != FONT_STYLE_NONE) {
@@ -2082,9 +2041,5 @@ CIDFont_type0_t1dofont (CIDFont *font)
void
CIDFont_type0_release(CIDFont *font)
{
-#ifdef XETEX
- if (font->ft_to_gid)
- RELEASE(font->ft_to_gid);
-#endif
return;
}