diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-16 23:03:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-16 23:03:12 +0000 |
commit | de882e95ec1fea84935459b68bbee1a79fe8dd84 (patch) | |
tree | 522aa66ee5df5e24f19924ab6efd33179e018c5d /Build/source/texk/web2c/pdftexdir/writet3.c | |
parent | 889606b61ddfceabb38e3bef6d34b48ff2148f4f (diff) |
.enc files for bitmap fonts, pdftex r772
git-svn-id: svn://tug.org/texlive/trunk@43519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/writet3.c')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/writet3.c | 59 |
1 files changed, 55 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c index 6b0a5d3c4eb..a7f7a18c3d7 100644 --- a/Build/source/texk/web2c/pdftexdir/writet3.c +++ b/Build/source/texk/web2c/pdftexdir/writet3.c @@ -254,7 +254,31 @@ static boolean writepk(internalfontnumber f) return true; } -void writet3(int objnum, internalfontnumber f) +static void remove_duplicate_glyph_names(char **g, const char *encname) +{ + struct avl_table *gl_tree; + char *aa; + int i; + gl_tree = avl_create(comp_string_entry, NULL, &avl_xallocator); + assert(gl_tree != NULL); + for (i = 0; i < 256; i++) { + if (g[i] == notdef) + continue; + aa = (char *) avl_find(gl_tree, g[i]); + if (aa == NULL) { + aa = (char *) avl_probe(gl_tree, g[i]); + assert(aa != NULL); + } else { + pdftex_warn("%s: duplicate glyph name `%s' at position %d", + encname, g[i], i); + xfree(g[i]); + g[i] = (char *) notdef; + } + } + avl_destroy(gl_tree, NULL); +} + +void writet3(fm_entry * fm, int objnum, internalfontnumber f) { static char t3_font_scale_str[] = "\\pdffontscale"; int i; @@ -262,12 +286,19 @@ void writet3(int objnum, internalfontnumber f) int first_char, last_char; integer pk_font_scale; boolean is_notdef; + fe_entry *fe; + char **glyph_names; + integer tounicode_objnum; t3_glyph_num = 0; t3_image_used = false; for (i = 0; i < 256; i++) { t3_char_procs[i] = 0; t3_char_widths[i] = 0; } + fe = fm ? get_fe_entry(fm->encname) : NULL; + glyph_names = fe ? fe->glyph_names : NULL; + if (glyph_names) + remove_duplicate_glyph_names(glyph_names, fm->encname); packfilename(fontname[f], getnullstr(), maketexstring(".pgc")); cur_file_name = makecstring(makenamestring()); is_pk_font = false; @@ -298,6 +329,11 @@ void writet3(int objnum, internalfontnumber f) if (pdfcharmarked(f, i)) break; last_char = i; + /* write ToUnicode entry if needed */ + if (fixedgentounicode > 0 && !pdffontnobuiltintounicode[f] && fe != NULL) + tounicode_objnum = write_tounicode(glyph_names, fm->tfm_name,fe->name); + else + tounicode_objnum = 0; pdfbegindict(objnum, 1); /* Type 3 font dictionary */ pdf_puts("/Type /Font\n/Subtype /Type3\n"); pdf_printf("/Name /F%i\n", (int) f); @@ -344,7 +380,12 @@ void writet3(int objnum, internalfontnumber f) pdf_printf("/%s", notdef); is_notdef = true; } else { - pdf_printf("/a%i", first_char); + if (glyph_names + && glyph_names[first_char] + && glyph_names[first_char] != notdef) + pdf_printf("/%s", glyph_names[first_char]); + else + pdf_printf("/a%i", first_char); is_notdef = false; } for (i = first_char + 1; i <= last_char; i++) { @@ -358,15 +399,25 @@ void writet3(int objnum, internalfontnumber f) pdf_printf(" %i", i); is_notdef = false; } - pdf_printf("/a%i", i); + if (glyph_names && glyph_names[i] && glyph_names[i] != notdef) + pdf_printf("/%s", glyph_names[i]); + else + pdf_printf("/a%i", i); } } pdf_puts("]\n"); + if (tounicode_objnum != 0) + pdf_printf("/ToUnicode %i 0 R\n", (int) tounicode_objnum); pdfenddict(); pdfbegindict(cptr, 1); /* CharProcs dictionary */ for (i = first_char; i <= last_char; i++) if (t3_char_procs[i] != 0) - pdf_printf("/a%i %i 0 R\n", (int) i, (int) t3_char_procs[i]); + if (glyph_names && glyph_names[i] && glyph_names[i] != notdef) + pdf_printf("/%s %i 0 R\n", glyph_names[i], + (int) t3_char_procs[i]); + else + pdf_printf("/a%i %i 0 R\n", (int) i, + (int) t3_char_procs[i]); pdfenddict(); t3_close(); tex_printf(">"); |