texlive[43680] Build/source/texk/web2c/pdftexdir:

[commits+kakuto at tug.org]

Revision: 43680
          http://tug.org/svn/texlive?view=revision&revision=43680
Author:   kakuto
Date:     2017-04-02 07:59:52 +0200 (Sun, 02 Apr 2017)
Log Message:
-----------
pdftexdir/writet3.c: output /ToUnicode object in /Font object, not in /Encoding object (Pali Roh\'ar)

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/mapfile.c
    trunk/Build/source/texk/web2c/pdftexdir/writet3.c

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2017-04-02 00:06:11 UTC (rev 43679)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2017-04-02 05:59:52 UTC (rev 43680)
@@ -1,3 +1,12 @@
+2017-04-02  Akira Kakuto  <kakuto at 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 at gmail.com>
+
+	* writet3.c: output /ToUnicode object in /Font object, not
+	in /Encoding object.
+
 2017-04-01  Pali Roh\'ar  <pali.rohar at gmail.com>
 
 	* mapfile.c, ptexlib.h, ptexmac.h, writefont.c, pdftex.defines,

Modified: trunk/Build/source/texk/web2c/pdftexdir/mapfile.c
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/mapfile.c	2017-04-02 00:06:11 UTC (rev 43679)
+++ trunk/Build/source/texk/web2c/pdftexdir/mapfile.c	2017-04-02 05:59:52 UTC (rev 43680)
@@ -296,6 +296,12 @@
                 ("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 */

Modified: trunk/Build/source/texk/web2c/pdftexdir/writet3.c
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/writet3.c	2017-04-02 00:06:11 UTC (rev 43679)
+++ trunk/Build/source/texk/web2c/pdftexdir/writet3.c	2017-04-02 05:59:52 UTC (rev 43680)
@@ -362,6 +362,8 @@
     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 @@
         }
     }
     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++)