diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/dvi.c | 14 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/vf.c | 23 |
3 files changed, 18 insertions, 23 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index c1e4844625d..3346eaa764e 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -5,6 +5,10 @@ * Makefile.am: Move all files without #ifdef XETEX to libutil.a. + * dvi.c, vf.c: Remove unnecessary is_xetex checks; there is no reason + not to support SET3 and PUT3 in xdvipdfmx (XeTeX does not use them + anyway). + 2014-07-24 Khaled Hosny <khaledhosny@eglug.org> * cff.c. cff.h, cid.c, cid.h, cid_p.h, cidtype0.c, cidtype2.c, diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 0c74084dc95..f7035d7279f 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1237,7 +1237,7 @@ dvi_set (SIGNED_QUAD ch) switch (font->type) { case PHYSICAL: - if (!is_xetex && ch > 65535) { /* _FIXME_ */ + if (ch > 65535) { /* _FIXME_ */ wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff; wbuf[1] = UTF32toUTF16HS(ch) & 0xff; wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff; @@ -1319,7 +1319,7 @@ dvi_put (SIGNED_QUAD ch) /* Treat a single character as a one byte string and use the * string routine. */ - if (!is_xetex && ch > 65535) { /* _FIXME_ */ + if (ch > 65535) { /* _FIXME_ */ wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff; wbuf[1] = UTF32toUTF16HS(ch) & 0xff; wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff; @@ -2246,10 +2246,9 @@ dvi_do_page (long n, switch (opcode) { case SET1: do_set1(); break; case SET2: do_set2(); break; - case SET3: if (!is_xetex) { do_set3(); break; } + case SET3: do_set3(); break; case SET4: - ERROR("Multibyte (>%d bits) character not supported!", - is_xetex ? 16 : 24); + ERROR("Multibyte (>24 bits) character not supported!"); break; case SET_RULE: @@ -2258,10 +2257,9 @@ dvi_do_page (long n, case PUT1: do_put1(); break; case PUT2: do_put2(); break; - case PUT3: if (!is_xetex) { do_put3(); break; } + case PUT3: do_put3(); break; case PUT4: - ERROR("Multibyte (>%d bits) character not supported!", - is_xetex ? 16 : 24); + ERROR("Multibyte (>24 bits) character not supported!"); break; case PUT_RULE: diff --git a/Build/source/texk/dvipdfm-x/vf.c b/Build/source/texk/dvipdfm-x/vf.c index 4787777c782..6b16e98b816 100644 --- a/Build/source/texk/dvipdfm-x/vf.c +++ b/Build/source/texk/dvipdfm-x/vf.c @@ -236,12 +236,11 @@ static void process_vf_file (FILE *vf_file, int thisfont) ch = get_unsigned_quad (vf_file); /* Skip over TFM width since we already know it */ get_unsigned_quad (vf_file); - if (ch < (is_xetex ? 0x10000UL : 0x1000000UL)) + if (ch < 0x1000000UL) read_a_char_def (vf_file, thisfont, pkt_len, ch); else { fprintf (stderr, "char=%ld\n", ch); - ERROR ("Long character (>%s bits) in VF file.\nI can't handle long characters!\n", - is_xetex ? "16" : "24"); + ERROR ("Long character (>24 bits) in VF file.\nI can't handle long characters!\n"); } break; } @@ -858,13 +857,10 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font) vf_set2(&start, end); break; case SET3: - if (!is_xetex) { - vf_set3(&start, end); - break; - } + vf_set3(&start, end); + break; case SET4: - ERROR ("Multibyte (>%s bits) character in VF packet.\nI can't handle this!", - is_xetex ? "16" : "24"); + ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!"); break; case SET_RULE: vf_setrule(&start, end, ptsize); @@ -876,13 +872,10 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font) vf_put2(&start, end); break; case PUT3: - if (!is_xetex) { - vf_put3(&start, end); - break; - } + vf_put3(&start, end); + break; case PUT4: - ERROR ("Multibyte (>%s bits) character in VF packet.\nI can't handle this!", - is_xetex ? "16" : "24"); + ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!"); break; case PUT_RULE: vf_putrule(&start, end, ptsize); |