diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-06-25 14:08:05 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-06-25 14:08:05 +0000 |
commit | cc6aa42af9e93d8f6ccc61baa0c90370e92f7fa9 (patch) | |
tree | 516ac1a9dda0ede28d87720bc0275a45789a16be /Build/source/texk/dvipdfm-x/type1c.c | |
parent | ed2b54f5b66c81f8607ddb231b0e164e3b6cf235 (diff) |
dvipdfm-x: (From S. Hirata) Modify to make PDF/A generation a bit easier.
git-svn-id: svn://tug.org/texlive/trunk@41537 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/type1c.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/type1c.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfm-x/type1c.c b/Build/source/texk/dvipdfm-x/type1c.c index 5035009d90f..777ca53929b 100644 --- a/Build/source/texk/dvipdfm-x/type1c.c +++ b/Build/source/texk/dvipdfm-x/type1c.c @@ -201,10 +201,18 @@ add_SimpleMetrics (pdf_font *font, cff_font *cffont, double width; if (tfm_id < 0) /* tfm is not found */ width = scaling * widths[code]; - else + else { + double diff; width = 1000. * tfm_get_width(tfm_id, code); + diff = width - scaling * widths[code]; + if (fabs(diff) > 1.) { + WARN("Glyph width mismatch for TFM and font (%s)", + pdf_font_get_mapname(font)); + WARN("TFM: %g vs. CFF font: %g", width, widths[code]); + } pdf_add_array(tmp_array, pdf_new_number(ROUND(width, 0.1))); + } } else { pdf_add_array(tmp_array, pdf_new_number(0.0)); } @@ -229,6 +237,7 @@ int pdf_font_load_type1c (pdf_font *font) { pdf_obj *fontdict, *descriptor; + pdf_obj *pdfcharset; /* Actually string object */ char *usedchars; char *fontname, *uniqueTag, *ident, *fullname; FILE *fp = NULL; @@ -449,6 +458,7 @@ pdf_font_load_type1c (pdf_font *font) * Subset font */ num_glyphs = 1; + pdfcharset = pdf_new_stream(0); for (code = 0; code < 256; code++) { card16 gid, j; s_SID sid_orig, sid; @@ -498,6 +508,9 @@ pdf_font_load_type1c (pdf_font *font) usedchars[code] = 0; /* Set unused for writing correct encoding */ continue; } + pdf_add_stream(pdfcharset, "/", 1); + pdf_add_stream(pdfcharset, enc_vec[code], strlen(enc_vec[code])); + if (verbose > 2) { MESG("/%s", enc_vec[code]); } @@ -717,10 +730,13 @@ pdf_font_load_type1c (pdf_font *font) } /* - * CharSet might be recommended for subsetted font, but it is meaningful - * only for Type 1 font... + * CharSet */ - + pdf_add_dict(descriptor, + pdf_new_name("CharSet"), + pdf_new_string(pdf_stream_dataptr(pdfcharset), + pdf_stream_length(pdfcharset))); + pdf_release_obj(pdfcharset); /* * Write PDF FontFile data. */ |