diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-02 05:59:52 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-04-02 05:59:52 +0000 |
| commit | 251cdad189c3575df15f78b0cf081f055c95140d (patch) | |
| tree | b4881df50399fbc5f63635811647ae5db8de9040 /Build/source | |
| parent | 849e0e275302fc34f2135f2ad9d21cd259302cd4 (diff) | |
pdftexdir/writet3.c: output /ToUnicode object in /Font object, not in /Encoding object (Pali Roh\'ar)
git-svn-id: svn://tug.org/texlive/trunk@43680 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 9 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/mapfile.c | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/writet3.c | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index dbdcd6ee8f3..8efc9200803 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,12 @@ +2017-04-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * mapfile.c: warn if only tfm name is specified in a map entry for type3. + +2017-04-02 Pali Roh\'ar <pali.rohar@gmail.com> + + * writet3.c: output /ToUnicode object in /Font object, not + in /Encoding object. + 2017-04-01 Pali Roh\'ar <pali.rohar@gmail.com> * mapfile.c, ptexlib.h, ptexmac.h, writefont.c, pdftex.defines, diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c index ab665164a29..06973f4cc87 100644 --- a/Build/source/texk/web2c/pdftexdir/mapfile.c +++ b/Build/source/texk/web2c/pdftexdir/mapfile.c @@ -296,6 +296,12 @@ static int check_fm_entry(fm_entry * fm, boolean warn) ("invalid entry for `%s': both ps_name and font file missing", fm->tfm_name); a += 1; + } else if (is_type3(fm) && fm->encname == NULL) { + if (warn) + pdftex_warn + ("invalid entry for `%s': encoding file for type3 missing", + fm->tfm_name); + a += 1; } /* TrueType fonts cannot be reencoded without subsetting */ diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c index bdcfa58eb3b..936d4591c79 100644 --- a/Build/source/texk/web2c/pdftexdir/writet3.c +++ b/Build/source/texk/web2c/pdftexdir/writet3.c @@ -362,6 +362,8 @@ void writet3(fm_entry * fm, int objnum, internalfontnumber f) cptr = pdfnewobjnum(); pdf_printf("/Widths %i 0 R\n/Encoding %i 0 R\n/CharProcs %i 0 R\n", (int) wptr, (int) eptr, (int) cptr); + if (tounicode_objnum != 0) + pdf_printf("/ToUnicode %i 0 R\n", (int) tounicode_objnum); pdfenddict(); pdfbeginobj(wptr, 1); /* chars width array */ pdf_puts("["); @@ -406,8 +408,6 @@ void writet3(fm_entry * fm, int objnum, internalfontnumber f) } } 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++) |