From b0bdd8cd0fed764f189d773b0b0f69d25415a8f5 Mon Sep 17 00:00:00 2001 From: Jjgod Jiang Date: Tue, 9 Feb 2016 10:59:28 +0000 Subject: texk/dvipdfm-x/dvi.c: Tweak skip_native_font_def() to make it handle more flags git-svn-id: svn://tug.org/texlive/trunk@39637 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 5 +++++ Build/source/texk/dvipdfm-x/dvi.c | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 5dc2f56d64e..a70e0e35717 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2016-02-09 Jiang Jiang + + * dvi.c: Tweak skip_native_font_def() to make it handle more + flags. + 2016-02-09 Akira Kakuto * dvi.c: disable check_postamble() introduced by Peter, because diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 3aa4f31b0b8..b686473d756 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1611,8 +1611,10 @@ skip_native_font_def (void) flags = get_unsigned_pair(dvi_file); name_length = get_unsigned_byte(dvi_file); skip_bytes(name_length + 4, dvi_file); - if (flags & XDV_FLAG_COLORED) + if ((flags & XDV_FLAG_COLORED) || (flags & XDV_FLAG_EMBOLDEN) || + (flags & XDV_FLAG_EXTEND) || (flags & XDV_FLAG_SLANT)) { skip_bytes(4, dvi_file); + } } static void @@ -1739,7 +1741,6 @@ do_glyphs (void) * We recover the code in the TeX Live 2015 here, * because embolden !=0 etc. work if we do so. */ -#if 0 static void check_postamble (void) { @@ -1772,7 +1773,6 @@ check_postamble (void) num_pages = 0; /* force loop to terminate */ } -#endif /* 0 */ /* Most of the work of actually interpreting * the dvi file is here. @@ -1840,14 +1840,12 @@ dvi_do_page (double page_paper_height, double hmargin, double vmargin) * We recover the code in the TeX Live 2015 here, * because embolden !=0 etc. work if we do so. */ -#if 0 if (linear) { if ((opcode = get_unsigned_byte(dvi_file)) == POST) check_postamble(); else ungetc(opcode, dvi_file); } -#endif /* 0 */ return; case PUSH: @@ -1971,12 +1969,10 @@ dvi_init (char *dvi_filename, double mag) * We recover the code in the TeX Live 2015 here, * because embolden !=0 etc. work if we do so. */ -#if 0 if ((ch = get_unsigned_byte(dvi_file)) == POST) check_postamble(); else ungetc(ch, dvi_file); -#endif /* 0 */ } else { dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE); if (!dvi_file) { -- cgit v1.2.3