diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-29 12:13:50 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-29 12:13:50 +0000 |
commit | de569c5d3871e3aea62a0d01e2f86d50f1202591 (patch) | |
tree | e6a1bdc5157ce11b4259419dd95039fad8a54649 /Build/source/texk/dvipdfm-x/vf.c | |
parent | 73f00680f2596baff50bd68e9d639450da2c95d2 (diff) |
dvipdfm-x: Merging dvipdfmx and xdvipdfmx, now just one set of source files
git-svn-id: svn://tug.org/texlive/trunk@31302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/vf.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/vf.c | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/Build/source/texk/dvipdfm-x/vf.c b/Build/source/texk/dvipdfm-x/vf.c index b1f6b1d471b..a03c921cf68 100644 --- a/Build/source/texk/dvipdfm-x/vf.c +++ b/Build/source/texk/dvipdfm-x/vf.c @@ -38,6 +38,7 @@ #include "tfm.h" #include "dvi.h" #include "vf.h" +#include "dvipdfmx.h" #include "dvicodes.h" @@ -198,13 +199,6 @@ static void read_a_font_def(FILE *vf_file, signed long font_id, int thisfont) return; } -#ifdef XETEX -#define MAX_BITS 16 -#else -#define MAX_BITS 24 -#endif - - static void process_vf_file (FILE *vf_file, int thisfont) { int eof = 0, code; @@ -244,12 +238,12 @@ 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 < (1UL << MAX_BITS)) + if (ch < (is_xetex ? 0x10000UL : 0x1000000UL)) read_a_char_def (vf_file, thisfont, pkt_len, ch); else { fprintf (stderr, "char=%ld\n", ch); - ERROR ("Long character (>%d bits) in VF file.\nI can't handle long characters!\n", - MAX_BITS); + ERROR ("Long character (>%s bits) in VF file.\nI can't handle long characters!\n", + is_xetex ? "16" : "24"); } break; } @@ -462,13 +456,11 @@ static void vf_set2(unsigned char **start, unsigned char *end) return; } -#ifndef XETEX static void vf_set3(unsigned char **start, unsigned char *end) { vf_set (unsigned_triple(start, end)); return; } -#endif static void vf_putrule(unsigned char **start, unsigned char *end, spt_t ptsize) { @@ -506,13 +498,11 @@ static void vf_put2(unsigned char **start, unsigned char *end) return; } -#ifndef XETEX static void vf_put3(unsigned char **start, unsigned char *end) { dvi_put (unsigned_triple(start, end)); return; } -#endif static void vf_push(void) { @@ -874,13 +864,13 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font) vf_set2(&start, end); break; case SET3: -#ifndef XETEX - vf_set3(&start, end); - break; -#endif + if (!is_xetex) { + vf_set3(&start, end); + break; + } case SET4: - ERROR ("Multibyte (>%d bits) character in VF packet.\nI can't handle this!", - MAX_BITS); + ERROR ("Multibyte (>%s bits) character in VF packet.\nI can't handle this!", + is_xetex ? "16" : "24"); break; case SET_RULE: vf_setrule(&start, end, ptsize); @@ -892,13 +882,13 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font) vf_put2(&start, end); break; case PUT3: -#ifndef XETEX - vf_put3(&start, end); - break; -#endif + if (!is_xetex) { + vf_put3(&start, end); + break; + } case PUT4: - ERROR ("Multibyte (>%d bits) character in VF packet.\nI can't handle this!", - MAX_BITS); + ERROR ("Multibyte (>%s bits) character in VF packet.\nI can't handle this!", + is_xetex ? "16" : "24"); break; case PUT_RULE: vf_putrule(&start, end, ptsize); |