diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-03-30 08:36:37 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-03-30 08:36:37 +0000 |
| commit | 97685751cc7e379a3c8fa1bfff0ce3712bb60415 (patch) | |
| tree | dfd281851bd1a7313d2c5cf45d088ee5b18e9e6b | |
| parent | 380fc2e06498b7ee18e7d38ebfb29b4602ee542e (diff) | |
pdftexdir/ptexmac.h: remove duplicate macros (from Pali Roh\'ar)
git-svn-id: svn://tug.org/texlive/trunk@43645 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 1 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/mapfile.c | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ptexmac.h | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index c788f747633..abfcf2aba78 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,5 +1,6 @@ 2017-03-30 Pali Roh\'ar <pali.rohar@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, diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c index 25f61f7071e..8b2e270b643 100644 --- a/Build/source/texk/web2c/pdftexdir/mapfile.c +++ b/Build/source/texk/web2c/pdftexdir/mapfile.c @@ -539,7 +539,7 @@ static void fm_scan_line(void) 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; diff --git a/Build/source/texk/web2c/pdftexdir/ptexmac.h b/Build/source/texk/web2c/pdftexdir/ptexmac.h index d60ad86c349..b8af84c238d 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexmac.h +++ b/Build/source/texk/web2c/pdftexdir/ptexmac.h @@ -163,7 +163,6 @@ size_t T##_limit # 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 @@ size_t T##_limit # 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 @@ size_t T##_limit # 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 |