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

[commits+kakuto at tug.org]

Revision: 43645
          http://tug.org/svn/texlive?view=revision&revision=43645
Author:   kakuto
Date:     2017-03-30 10:36:37 +0200 (Thu, 30 Mar 2017)
Log Message:
-----------
pdftexdir/ptexmac.h: remove duplicate macros (from 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/ptexmac.h

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2017-03-30 00:06:08 UTC (rev 43644)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2017-03-30 08:36:37 UTC (rev 43645)
@@ -1,5 +1,6 @@
 2017-03-30  Pali Roh\'ar  <pali.rohar at gmail.com>
 
+	* ptexmac.h: remove duplicate macros.
 	* writet3.c (writet3): ensure fm is non-NULL before dereferencing.
 	* mapfile.c (check_fm_entry): omit check for is_reencoded, i.e.,
 	an .enc file. This way, each bitmap font is embedded separately,

Modified: trunk/Build/source/texk/web2c/pdftexdir/mapfile.c
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/mapfile.c	2017-03-30 00:06:08 UTC (rev 43644)
+++ trunk/Build/source/texk/web2c/pdftexdir/mapfile.c	2017-03-30 08:36:37 UTC (rev 43645)
@@ -539,7 +539,7 @@
             set_opentype(fm);
         else
             set_type1(fm);
-    } else
+    } else if (is_std_t1font(fm))
         set_type1(fm);          /* assume a builtin font is Type1 */
     if (check_fm_entry(fm, true) != 0)
         goto bad_line;

Modified: trunk/Build/source/texk/web2c/pdftexdir/ptexmac.h
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ptexmac.h	2017-03-30 00:06:08 UTC (rev 43644)
+++ trunk/Build/source/texk/web2c/pdftexdir/ptexmac.h	2017-03-30 08:36:37 UTC (rev 43645)
@@ -163,7 +163,6 @@
 #  define set_type1(fm)       ((fm)->type |= F_TYPE1)
 #  define set_truetype(fm)    ((fm)->type |= F_TRUETYPE)
 #  define set_opentype(fm)    ((fm)->type |= F_OTF)
-#  define set_subfont(fm)     ((fm)->type |= F_SUBFONT)
 
 #  define unset_included(fm)  ((fm)->type &= ~F_INCLUDED)
 #  define unset_subsetted(fm) ((fm)->type &= ~F_SUBSETTED)
@@ -172,7 +171,6 @@
 #  define unset_type1(fm)     ((fm)->type &= ~F_TYPE1)
 #  define unset_truetype(fm)  ((fm)->type &= ~F_TRUETYPE)
 #  define unset_opentype(fm)  ((fm)->type &= ~F_OTF)
-#  define unset_subfont(fm)   ((fm)->type &= ~F_SUBFONT)
 
 #  define is_included(fm)     (((fm)->type & F_INCLUDED) != 0)
 #  define is_subsetted(fm)    (((fm)->type & F_SUBSETTED) != 0)
@@ -181,7 +179,6 @@
 #  define is_type1(fm)        (((fm)->type & F_TYPE1) != 0)
 #  define is_truetype(fm)     (((fm)->type & F_TRUETYPE) != 0)
 #  define is_opentype(fm)     (((fm)->type & F_OTF) != 0)
-#  define is_subfont(fm)      (((fm)->type & F_SUBFONT) != 0)
 
 #  define fm_slant(fm)        (fm)->slant
 #  define fm_extend(fm)       (fm)->extend