summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/pdfdev.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-09-02 05:52:49 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-09-02 05:52:49 +0000
commitfb6550fbe69fce7c2de2436cd935f89b7bab9c07 (patch)
tree2cb3c21866970ffc8f9731ee3dd88a1f42f3f3e9 /Build/source/texk/dvipdfm-x/pdfdev.c
parent454f3d71a60c411c0e2209264f400ac3adb0a751 (diff)
Experimental support for XeTeX transparency font feature (S. Hirata).
git-svn-id: svn://tug.org/texlive/trunk@48542 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/pdfdev.c')
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdev.c32
1 files changed, 3 insertions, 29 deletions
diff --git a/Build/source/texk/dvipdfm-x/pdfdev.c b/Build/source/texk/dvipdfm-x/pdfdev.c
index 553b271dead..488d0bf47dd 100644
--- a/Build/source/texk/dvipdfm-x/pdfdev.c
+++ b/Build/source/texk/dvipdfm-x/pdfdev.c
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2016 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -52,8 +52,6 @@
#include "pdfdev.h"
-#include "cff.h"
-
static int verbose = 0;
void
@@ -500,8 +498,6 @@ struct dev_font {
int ucs_plane;
int is_unicode;
-
- cff_charsets *cff_charsets;
};
static struct dev_font *dev_fonts = NULL;
@@ -963,26 +959,8 @@ handle_multibyte_string (struct dev_font *font,
p = *str_ptr;
length = *str_len;
- if (ctype == -1 && font->cff_charsets) { /* freetype glyph indexes */
- /* Convert freetype glyph indexes to CID. */
- const unsigned char *inbuf = p;
- unsigned char *outbuf = sbuf0;
- for (i = 0; i < length; i += 2) {
- unsigned int gid;
- gid = *inbuf++ << 8;
- gid += *inbuf++;
-
- gid = cff_charsets_lookup_cid(font->cff_charsets, gid);
-
- *outbuf++ = gid >> 8;
- *outbuf++ = gid & 0xff;
- }
-
- p = sbuf0;
- length = outbuf - sbuf0;
- }
/* _FIXME_ */
- else if (font->is_unicode) { /* UCS-4 */
+ if (font->is_unicode) { /* UCS-4 */
if (ctype == 1) {
if (length * 4 >= FORMAT_BUF_SIZE) {
WARN("Too long string...");
@@ -1045,7 +1023,7 @@ handle_multibyte_string (struct dev_font *font,
* encoding.
* TODO: A character decomposed to multiple characters.
*/
- if (ctype != -1 && font->enc_id >= 0) {
+ if (font->enc_id >= 0) {
const unsigned char *inbuf;
unsigned char *outbuf;
int inbytesleft, outbytesleft;
@@ -1316,7 +1294,6 @@ pdf_close_device (void)
pdf_release_obj(dev_fonts[i].resource);
dev_fonts[i].tex_name = NULL;
dev_fonts[i].resource = NULL;
- dev_fonts[i].cff_charsets = NULL;
}
RELEASE(dev_fonts);
}
@@ -1499,9 +1476,6 @@ pdf_dev_locate_font (const char *font_name, spt_t ptsize)
if (font->font_id < 0)
return -1;
- if (mrec)
- font->cff_charsets = mrec->opt.cff_charsets;
-
/* We found device font here. */
if (i < num_dev_fonts) {
font->real_font_index = i;