remove incompatible lines and #ifdef upTeX

git-svn-id: svn://tug.org/texlive/trunk@24509 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 70 insertions, 479 deletions

diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 665db3fc10d..3102306fa7d 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* dvi.c, spc-pdfm.c, tfm.c and vf.c: remove incompatible lines
+	with the non-upTeX case and erase #ifdef upTeX.
+
 2011-09-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* dvi.c, spc-pdfm.c, tfm.c and vf.c: apply patches by Takuji Tanaka
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
index 58a233ff574..bec2876c2f9 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-04-uptex: remove incompatible lines and erase #ifdef upTeX.
+
 2011-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-05-typo (new): Fix typo "featre" -> "feature".
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
index f621caea2af..f0cbbde6424 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
@@ -1,36 +1,31 @@
 diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
---- dvipdfmx-20110311.orig/src/dvi.c	2011-03-09 08:43:18.000000000 +0100
-+++ dvipdfmx-20110311/src/dvi.c	2011-09-07 10:55:45.000000000 +0200
-@@ -58,6 +58,12 @@
+--- dvipdfmx-20110311.orig/src/dvi.c	Wed Mar 09 16:43:18 2011
++++ dvipdfmx-20110311/src/dvi.c	Sat Nov 05 22:25:11 2011
+@@ -58,6 +58,10 @@
  #define TEX_FONTS_ALLOC_SIZE 16u
  #define VF_NESTING_MAX       16u
  
-+#if defined(upTeX)
 +/* UTF-32 over U+FFFF -> UTF-16 surrogate pair */
 +#define UTF32toUTF16HS(x)  (0xd800 + (((x-0x10000) >> 10) & 0x3ff))
 +#define UTF32toUTF16LS(x)  (0xdc00 + (  x                 & 0x3ff))
-+#endif
 +
  /* Interal Variables */
  static FILE          *dvi_file  = NULL;
  
-@@ -734,7 +740,11 @@
+@@ -734,7 +738,7 @@
  {
    struct loaded_font *font;
    spt_t               width, height, depth;
-+#if defined(upTeX)
+-  unsigned char       wbuf[2];
 +  unsigned char       wbuf[4];
-+#else
-   unsigned char       wbuf[2];
-+#endif
  
    if (current_font < 0) {
      ERROR("No font selected!");
-@@ -753,7 +763,18 @@
+@@ -753,7 +757,14 @@
  
    switch (font->type) {
    case  PHYSICAL:
-+#if defined(upTeX)
+-    if (ch > 255) { /* _FIXME_ */
 +    if (ch > 65535) { /* _FIXME_ */
 +      wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
 +      wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
@@ -39,29 +34,23 @@ diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
 +      pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
 +			 width, font->font_id, 2);
 +    } else if (ch > 255) { /* _FIXME_ */
-+#else
-     if (ch > 255) { /* _FIXME_ */
-+#endif
        wbuf[0] = (ch >> 8) & 0xff;
        wbuf[1] =  ch & 0xff;
        pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
-@@ -805,7 +826,11 @@
+@@ -805,7 +816,7 @@
  {
    struct loaded_font *font;
    spt_t               width, height, depth;
-+#if defined(upTeX)
+-  unsigned char       wbuf[2];
 +  unsigned char       wbuf[4];
-+#else
-   unsigned char       wbuf[2];
-+#endif
  
    if (current_font < 0) {
      ERROR("No font selected!");
-@@ -821,7 +846,18 @@
+@@ -821,7 +832,14 @@
      /* Treat a single character as a one byte string and use the
       * string routine.
       */
-+#if defined(upTeX)
+-    if (ch > 255) { /* _FIXME_ */
 +    if (ch > 65535) { /* _FIXME_ */
 +      wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
 +      wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
@@ -70,409 +59,200 @@ diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
 +      pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
 +			 width, font->font_id, 2);
 +    } else if (ch > 255) { /* _FIXME_ */
-+#else
-     if (ch > 255) { /* _FIXME_ */
-+#endif
        wbuf[0] = (ch >> 8) & 0xff;
        wbuf[1] =  ch & 0xff;
        pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
-@@ -898,6 +934,14 @@
-   dvi_set(get_unsigned_pair(dvi_file));
+@@ -899,6 +917,12 @@
  }
  
-+#if defined(upTeX)
-+static void
+ static void
 +do_set3 (void)
 +{
 +  dvi_set(get_unsigned_triple(dvi_file));
 +}
-+#endif
 +
- static void
++static void
  do_setrule (void)
  {
-@@ -935,6 +979,14 @@
+   SIGNED_QUAD  width, height;
+@@ -935,6 +959,12 @@
    dvi_put(get_unsigned_pair(dvi_file));
  }
  
-+#if defined(upTeX)
 +static void
 +do_put3 (void)
 +{
 +  dvi_put(get_unsigned_triple(dvi_file));
 +}
-+#endif
 +
  void
  dvi_push (void) 
  {
-@@ -1414,8 +1466,14 @@
+@@ -1414,8 +1444,9 @@
      switch (opcode) {
      case SET1: do_set1(); break;
      case SET2: do_set2(); break;
-+#if defined(upTeX)
+-    case SET3: case SET4:
+-      ERROR("Multibyte (>16 bits) character not supported!");
 +    case SET3: do_set3(); break;
 +    case SET4:
 +      ERROR("Multibyte (>24 bits) character not supported!");
-+#else
-     case SET3: case SET4:
-       ERROR("Multibyte (>16 bits) character not supported!");
-+#endif
        break;
  
      case SET_RULE:
-@@ -1424,8 +1482,14 @@
+@@ -1424,8 +1455,9 @@
  
      case PUT1: do_put1(); break;
      case PUT2: do_put2(); break;
-+#if defined(upTeX)
+-    case PUT3: case PUT4:
+-      ERROR ("Multibyte character (>16 bits) not supported!");
 +    case PUT3: do_put3(); break;
 +    case PUT4:
 +      ERROR ("Multibyte character (>24 bits) not supported!");
-+#else
-     case PUT3: case PUT4:
-       ERROR ("Multibyte character (>16 bits) not supported!");
-+#endif
        break;
  
      case PUT_RULE:
-diff -ur dvipdfmx-20110311.orig/src/spc_pdfm.c dvipdfmx-20110311/src/spc_pdfm.c
---- dvipdfmx-20110311.orig/src/spc_pdfm.c	2011-03-08 03:08:35.000000000 +0100
-+++ dvipdfmx-20110311/src/spc_pdfm.c	2011-09-07 10:55:45.000000000 +0200
-@@ -419,6 +419,98 @@
-   return  0;
- }
- 
-+#if defined(upTeX)
-+/* tables/values used in UTF-8 interpretation -
-+   code is based on ConvertUTF.[ch] sample code
-+   published by the Unicode consortium */
-+static unsigned long
-+offsetsFromUTF8[6] =    {
-+        0x00000000UL,
-+        0x00003080UL,
-+        0x000E2080UL,
-+        0x03C82080UL,
-+        0xFA082080UL,
-+        0x82082080UL
-+};
-+
-+static unsigned char
-+bytesFromUTF8[256] = {
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-+};
-+
-+static int
-+maybe_reencode_utf8(pdf_obj *instring)
-+{
-+  unsigned char* inbuf;
-+  int            inlen;
-+  int            non_ascii = 0;
-+  unsigned char* cp;
-+  unsigned char* op;
-+  unsigned char  wbuf[WBUF_SIZE];
-+
-+  if (!instring)
-+    return 0;
-+
-+  inlen = pdf_string_length(instring);
-+  inbuf = pdf_string_value(instring);
-+
-+  /* check if the input string is strictly ASCII */
-+  for (cp = inbuf; cp < inbuf + inlen; ++cp) {
-+    if (*cp > 127) {
-+      non_ascii = 1;
-+    }
-+  }
-+  if (non_ascii == 0)
-+    return 0; /* no need to reencode ASCII strings */
-+
-+  cp = inbuf;
-+  op = wbuf;
-+  *op++ = 0xfe;
-+  *op++ = 0xff;
-+  while (cp < inbuf + inlen) {
-+    unsigned long usv = *cp++;
-+    int extraBytes = bytesFromUTF8[usv];
-+    if (cp + extraBytes > inbuf + inlen)
-+      return -1; /* ill-formed, so give up reencoding */
-+    switch (extraBytes) {   /* note: code falls through cases! */
-+      case 5: usv <<= 6; usv += *cp++;
-+      case 4: usv <<= 6; usv += *cp++;
-+      case 3: usv <<= 6; usv += *cp++;
-+      case 2: usv <<= 6; usv += *cp++;
-+      case 1: usv <<= 6; usv += *cp++;
-+      case 0: ;
-+    };
-+    usv -= offsetsFromUTF8[extraBytes];
-+    if (usv > 0x10FFFF)
-+      return -1; /* out of valid Unicode range, give up */
-+    if (usv > 0xFFFF) {
-+      /* supplementary-plane character: generate high surrogate */
-+      unsigned long hi = 0xdc00 + (usv - 0x10000) % 0x0400;
-+      if (op > wbuf + WBUF_SIZE - 2)
-+        return -1; /* out of space */
-+      *op++ = hi / 256;
-+      *op++ = hi % 256;
-+      usv = 0xd800 + (usv - 0x10000) / 0x0400;
-+      /* remaining value in usv is the low surrogate */
-+    }
-+    if (op > wbuf + WBUF_SIZE - 2)
-+      return -1; /* out of space */
-+    *op++ = usv / 256;
-+    *op++ = usv % 256;
-+  }
-+
-+  pdf_set_string(instring, wbuf, op - wbuf);
-+  return 0;
-+}
-+#endif
-+
- static int
- needreencode (pdf_obj *kp, pdf_obj *vp, struct tounicode *cd)
- {
-@@ -453,19 +545,38 @@
- modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
- {
-   int               r = 0; /* continue */
-+#if !defined(upTeX)
-   CMap             *cmap;
-   struct tounicode *cd = dp;
-+#endif
- 
-   ASSERT( pdf_obj_typeof(kp) == PDF_NAME );
- 
-+#if !defined(upTeX)
-   if (!cd || cd->cmap_id < 0 || !cd->taintkeys)
-     return  -1;
-+#endif
- 
-   switch (pdf_obj_typeof(vp)) {
-   case  PDF_STRING:
-+#if !defined(upTeX)
-     cmap = CMap_cache_get(cd->cmap_id);
-     if (needreencode(kp, vp, cd)) {
-       r = reencodestring(cmap, vp);
-+#else
-+    {
-+      CMap             *cmap;
-+      struct tounicode *cd = dp;
-+      if (cd && cd->cmap_id >= 0 && cd->taintkeys) {
-+        cmap = CMap_cache_get(cd->cmap_id);
-+        if (needreencode(kp, vp, cd)) {
-+          r = reencodestring(cmap, vp);
-+        }
-+      }
-+      else {
-+        r = maybe_reencode_utf8(vp);
-+      }
-+#endif
-       if (r < 0) /* error occured... */
-         WARN("Failed to convert input string to UTF16...");
-     }
-@@ -486,8 +597,10 @@
- {
-   pdf_obj  *dict;
- 
-+#if !defined(upTeX)
-   if (cd->cmap_id < 0)
-     return  parse_pdf_dict(pp, endptr, NULL);
-+#endif
- 
-   /* :( */
-   if (cd->unescape_backslash) 
 diff -ur dvipdfmx-20110311.orig/src/tfm.c dvipdfmx-20110311/src/tfm.c
---- dvipdfmx-20110311.orig/src/tfm.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/tfm.c	2011-09-07 10:55:45.000000000 +0200
-@@ -55,6 +55,14 @@
+--- dvipdfmx-20110311.orig/src/tfm.c	Sat Mar 05 13:44:49 2011
++++ dvipdfmx-20110311/src/tfm.c	Sat Nov 05 22:33:49 2011
+@@ -55,6 +55,12 @@
  #define IS_JFM(i) ((i) == JFM_ID || (i) == JFMV_ID)
  #endif /* !WITHOUT_ASCII_PTEX */
  
-+#if defined(upTeX)
 +#if !defined(WITHOUT_ASCII_PTEX)
-+#define INDEX(i)  ((i>0xFFFFul ? 0x10000ul : i))
++#define CHARACTER_INDEX(i)  ((i>0xFFFFul ? 0x10000ul : i))
 +#else
-+#define INDEX(i)  ((i))
-+#endif
++#define CHARACTER_INDEX(i)  ((i))
 +#endif
 +
  /*
   * TFM Record structure:
   * Multiple TFM's may be read in at once.
-@@ -162,7 +170,11 @@
+@@ -162,7 +168,7 @@
  struct coverage
  {
    long           first_char;
-+#if defined(upTeX)
+-  unsigned short num_chars;
 +  long           num_chars;
-+#else
-   unsigned short num_chars;
-+#endif
  };
  
  /*
-@@ -208,7 +220,11 @@
+@@ -208,7 +214,7 @@
  {
    if (charcode >= map->coverage.first_char &&
        charcode <= map->coverage.first_char + map->coverage.num_chars)
-+#if defined(upTeX)
-+    return map->indices[INDEX(charcode - map->coverage.first_char)];
-+#else
-     return map->indices[charcode - map->coverage.first_char];
-+#endif
+-    return map->indices[charcode - map->coverage.first_char];
++    return map->indices[CHARACTER_INDEX(charcode - map->coverage.first_char)];
    else
      return -1;
  
-@@ -224,7 +240,11 @@
+@@ -224,7 +230,7 @@
  	 charcode >= map->coverages[idx].first_char; idx--) {
      if (charcode <=
  	map->coverages[idx].first_char + map->coverages[idx].num_chars)
-+#if defined(upTeX)
-+      return map->indices[INDEX(idx)];
-+#else
-       return map->indices[idx];
-+#endif
+-      return map->indices[idx];
++      return map->indices[CHARACTER_INDEX(idx)];
    }
  
    return -1;
-@@ -479,12 +499,20 @@
+@@ -479,12 +485,13 @@
      fm->charmap.type = MAPTYPE_CHAR;
      fm->charmap.data = map = NEW(1, struct char_map);
      map->coverage.first_char = 0;
-+#if defined(upTeX)
+-    map->coverage.num_chars  = 0xFFFFu;
+-    map->indices    = NEW(0x10000L, unsigned short);
 +    map->coverage.num_chars  = 0x10FFFFu;
 +    map->indices    = NEW(0x10001ul, unsigned short);
-+#else
-     map->coverage.num_chars  = 0xFFFFu;
-     map->indices    = NEW(0x10000L, unsigned short);
-+#endif
  
      for (code = 0; code <= 0xFFFFu; code++) {
        map->indices[code] = tfm->chartypes[code];
      }
-+#if defined(upTeX)
 +    map->indices[0x10000ul] = tfm->chartypes[0];
-+#endif
    } else {
      struct range_map *map;
  
-@@ -493,7 +521,11 @@
+@@ -493,7 +500,7 @@
      map->num_coverages = 1;
      map->coverages     = NEW(map->num_coverages, struct coverage);
      map->coverages[0].first_char = 0;
-+#if defined(upTeX)
+-    map->coverages[0].num_chars  = 0xFFFFu;
 +    map->coverages[0].num_chars  = 0x10FFFFu;
-+#else
-     map->coverages[0].num_chars  = 0xFFFFu;
-+#endif
      map->indices = NEW(1, unsigned short);
      map->indices[0] = 0; /* Only default type used. */
    }
-@@ -784,7 +816,11 @@
+@@ -784,7 +791,7 @@
      jfm_do_char_type_array(tfm_file, &tfm);
      jfm_make_charmap(fm, &tfm);
      fm->firstchar = 0;
-+#if defined(upTeX)
+-    fm->lastchar  = 0xFFFFl;
 +    fm->lastchar  = 0x10FFFFl;
-+#else
-     fm->lastchar  = 0xFFFFl;
-+#endif
      fm->fontdir   = (tfm.id == JFMV_ID) ? FONT_DIR_VERT : FONT_DIR_HORIZ;
      fm->source    = SOURCE_TYPE_JFM;
    }
 diff -ur dvipdfmx-20110311.orig/src/vf.c dvipdfmx-20110311/src/vf.c
---- dvipdfmx-20110311.orig/src/vf.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/vf.c	2011-09-07 10:55:45.000000000 +0200
-@@ -238,11 +238,19 @@
+--- dvipdfmx-20110311.orig/src/vf.c	Sat Mar 05 13:44:49 2011
++++ dvipdfmx-20110311/src/vf.c	Sat Nov 05 22:35:40 2011
+@@ -238,11 +238,11 @@
  	ch = get_unsigned_quad (vf_file);
  	/* Skip over TFM width since we already know it */
  	get_unsigned_quad (vf_file);
-+#if defined(upTeX)
+-	if (ch < 65536L) 
 +	if (ch < 0x1000000L) 
-+#else
- 	if (ch < 65536L) 
-+#endif
  	  read_a_char_def (vf_file, thisfont, pkt_len, ch);
  	else {
  	  fprintf (stderr, "char=%ld\n", ch);
-+#if defined(upTeX)
+-	  ERROR ("Long character (>16 bits) in VF file.\nI can't handle long characters!\n");
 +	  ERROR ("Long character (>24 bits) in VF file.\nI can't handle long characters!\n");
-+#else
- 	  ERROR ("Long character (>16 bits) in VF file.\nI can't handle long characters!\n");
-+#endif
  	}
  	break;
        }
-@@ -455,6 +463,14 @@
+@@ -455,6 +455,12 @@
    return;
  }
  
-+#if defined(upTeX)
 +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)
  {
    SIGNED_QUAD width, height;
-@@ -491,6 +507,14 @@
+@@ -491,6 +497,12 @@
    return;
  }
  
-+#if defined(upTeX)
 +static void vf_put3(unsigned char **start, unsigned char *end)
 +{
 +  dvi_put (unsigned_triple(start, end));
 +  return;
 +}
-+#endif
 +
  static void vf_push(void)
  {
    dvi_push();
-@@ -850,9 +874,17 @@
- 	case SET2:
+@@ -851,8 +863,10 @@
  	  vf_set2(&start, end);
  	  break;
-+#if defined(upTeX)
-+	case SET3:
+ 	case SET3:
 +	  vf_set3(&start, end);
 +	  break;
-+	case SET4:
-+	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
-+#else
- 	case SET3:
  	case SET4:
- 	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-+#endif
+-	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
++	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
  	  break;
  	case SET_RULE:
  	  vf_setrule(&start, end, ptsize);
-@@ -863,9 +895,17 @@
- 	case PUT2:
+@@ -864,8 +878,10 @@
  	  vf_put2(&start, end);
  	  break;
-+#if defined(upTeX)
-+	case PUT3:
+ 	case PUT3:
 +	  vf_put3(&start, end);
 +	  break;
-+	case PUT4:
-+	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
-+#else
- 	case PUT3:
  	case PUT4:
- 	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-+#endif
+-	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
++	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
  	  break;
  	case PUT_RULE:
  	  vf_putrule(&start, end, ptsize);
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c
index 4a2d344bec5..3da43b19a8a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c
@@ -58,11 +58,9 @@
 #define TEX_FONTS_ALLOC_SIZE 16u
 #define VF_NESTING_MAX       16u
 
-#if defined(upTeX)
 /* UTF-32 over U+FFFF -> UTF-16 surrogate pair */
 #define UTF32toUTF16HS(x)  (0xd800 + (((x-0x10000) >> 10) & 0x3ff))
 #define UTF32toUTF16LS(x)  (0xdc00 + (  x                 & 0x3ff))
-#endif
 
 /* Interal Variables */
 static FILE          *dvi_file  = NULL;
@@ -740,11 +738,7 @@ dvi_set (SIGNED_QUAD ch)
 {
   struct loaded_font *font;
   spt_t               width, height, depth;
-#if defined(upTeX)
   unsigned char       wbuf[4];
-#else
-  unsigned char       wbuf[2];
-#endif
 
   if (current_font < 0) {
     ERROR("No font selected!");
@@ -763,7 +757,6 @@ dvi_set (SIGNED_QUAD ch)
 
   switch (font->type) {
   case  PHYSICAL:
-#if defined(upTeX)
     if (ch > 65535) { /* _FIXME_ */
       wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
       wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
@@ -772,9 +765,6 @@ dvi_set (SIGNED_QUAD ch)
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
 			 width, font->font_id, 2);
     } else if (ch > 255) { /* _FIXME_ */
-#else
-    if (ch > 255) { /* _FIXME_ */
-#endif
       wbuf[0] = (ch >> 8) & 0xff;
       wbuf[1] =  ch & 0xff;
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
@@ -826,11 +816,7 @@ dvi_put (SIGNED_QUAD ch)
 {
   struct loaded_font *font;
   spt_t               width, height, depth;
-#if defined(upTeX)
   unsigned char       wbuf[4];
-#else
-  unsigned char       wbuf[2];
-#endif
 
   if (current_font < 0) {
     ERROR("No font selected!");
@@ -846,7 +832,6 @@ dvi_put (SIGNED_QUAD ch)
     /* Treat a single character as a one byte string and use the
      * string routine.
      */
-#if defined(upTeX)
     if (ch > 65535) { /* _FIXME_ */
       wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
       wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
@@ -855,9 +840,6 @@ dvi_put (SIGNED_QUAD ch)
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
 			 width, font->font_id, 2);
     } else if (ch > 255) { /* _FIXME_ */
-#else
-    if (ch > 255) { /* _FIXME_ */
-#endif
       wbuf[0] = (ch >> 8) & 0xff;
       wbuf[1] =  ch & 0xff;
       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
@@ -934,13 +916,11 @@ do_set2 (void)
   dvi_set(get_unsigned_pair(dvi_file));
 }
 
-#if defined(upTeX)
 static void
 do_set3 (void)
 {
   dvi_set(get_unsigned_triple(dvi_file));
 }
-#endif
 
 static void
 do_setrule (void)
@@ -979,13 +959,11 @@ do_put2 (void)
   dvi_put(get_unsigned_pair(dvi_file));
 }
 
-#if defined(upTeX)
 static void
 do_put3 (void)
 {
   dvi_put(get_unsigned_triple(dvi_file));
 }
-#endif
 
 void
 dvi_push (void) 
@@ -1466,14 +1444,9 @@ dvi_do_page (unsigned n,
     switch (opcode) {
     case SET1: do_set1(); break;
     case SET2: do_set2(); break;
-#if defined(upTeX)
     case SET3: do_set3(); break;
     case SET4:
       ERROR("Multibyte (>24 bits) character not supported!");
-#else
-    case SET3: case SET4:
-      ERROR("Multibyte (>16 bits) character not supported!");
-#endif
       break;
 
     case SET_RULE:
@@ -1482,14 +1455,9 @@ dvi_do_page (unsigned n,
 
     case PUT1: do_put1(); break;
     case PUT2: do_put2(); break;
-#if defined(upTeX)
     case PUT3: do_put3(); break;
     case PUT4:
       ERROR ("Multibyte character (>24 bits) not supported!");
-#else
-    case PUT3: case PUT4:
-      ERROR ("Multibyte character (>16 bits) not supported!");
-#endif
       break;
 
     case PUT_RULE:
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c
index ca46ade2c40..fac8ca255a9 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c
@@ -419,98 +419,6 @@ reencodestring (CMap *cmap, pdf_obj *instring)
   return  0;
 }
 
-#if defined(upTeX)
-/* tables/values used in UTF-8 interpretation -
-   code is based on ConvertUTF.[ch] sample code
-   published by the Unicode consortium */
-static unsigned long
-offsetsFromUTF8[6] =    {
-        0x00000000UL,
-        0x00003080UL,
-        0x000E2080UL,
-        0x03C82080UL,
-        0xFA082080UL,
-        0x82082080UL
-};
-
-static unsigned char
-bytesFromUTF8[256] = {
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-static int
-maybe_reencode_utf8(pdf_obj *instring)
-{
-  unsigned char* inbuf;
-  int            inlen;
-  int            non_ascii = 0;
-  unsigned char* cp;
-  unsigned char* op;
-  unsigned char  wbuf[WBUF_SIZE];
-
-  if (!instring)
-    return 0;
-
-  inlen = pdf_string_length(instring);
-  inbuf = pdf_string_value(instring);
-
-  /* check if the input string is strictly ASCII */
-  for (cp = inbuf; cp < inbuf + inlen; ++cp) {
-    if (*cp > 127) {
-      non_ascii = 1;
-    }
-  }
-  if (non_ascii == 0)
-    return 0; /* no need to reencode ASCII strings */
-
-  cp = inbuf;
-  op = wbuf;
-  *op++ = 0xfe;
-  *op++ = 0xff;
-  while (cp < inbuf + inlen) {
-    unsigned long usv = *cp++;
-    int extraBytes = bytesFromUTF8[usv];
-    if (cp + extraBytes > inbuf + inlen)
-      return -1; /* ill-formed, so give up reencoding */
-    switch (extraBytes) {   /* note: code falls through cases! */
-      case 5: usv <<= 6; usv += *cp++;
-      case 4: usv <<= 6; usv += *cp++;
-      case 3: usv <<= 6; usv += *cp++;
-      case 2: usv <<= 6; usv += *cp++;
-      case 1: usv <<= 6; usv += *cp++;
-      case 0: ;
-    };
-    usv -= offsetsFromUTF8[extraBytes];
-    if (usv > 0x10FFFF)
-      return -1; /* out of valid Unicode range, give up */
-    if (usv > 0xFFFF) {
-      /* supplementary-plane character: generate high surrogate */
-      unsigned long hi = 0xdc00 + (usv - 0x10000) % 0x0400;
-      if (op > wbuf + WBUF_SIZE - 2)
-        return -1; /* out of space */
-      *op++ = hi / 256;
-      *op++ = hi % 256;
-      usv = 0xd800 + (usv - 0x10000) / 0x0400;
-      /* remaining value in usv is the low surrogate */
-    }
-    if (op > wbuf + WBUF_SIZE - 2)
-      return -1; /* out of space */
-    *op++ = usv / 256;
-    *op++ = usv % 256;
-  }
-
-  pdf_set_string(instring, wbuf, op - wbuf);
-  return 0;
-}
-#endif
-
 static int
 needreencode (pdf_obj *kp, pdf_obj *vp, struct tounicode *cd)
 {
@@ -545,38 +453,19 @@ static int
 modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
 {
   int               r = 0; /* continue */
-#if !defined(upTeX)
   CMap             *cmap;
   struct tounicode *cd = dp;
-#endif
 
   ASSERT( pdf_obj_typeof(kp) == PDF_NAME );
 
-#if !defined(upTeX)
   if (!cd || cd->cmap_id < 0 || !cd->taintkeys)
     return  -1;
-#endif
 
   switch (pdf_obj_typeof(vp)) {
   case  PDF_STRING:
-#if !defined(upTeX)
     cmap = CMap_cache_get(cd->cmap_id);
     if (needreencode(kp, vp, cd)) {
       r = reencodestring(cmap, vp);
-#else
-    {
-      CMap             *cmap;
-      struct tounicode *cd = dp;
-      if (cd && cd->cmap_id >= 0 && cd->taintkeys) {
-        cmap = CMap_cache_get(cd->cmap_id);
-        if (needreencode(kp, vp, cd)) {
-          r = reencodestring(cmap, vp);
-        }
-      }
-      else {
-        r = maybe_reencode_utf8(vp);
-      }
-#endif
       if (r < 0) /* error occured... */
         WARN("Failed to convert input string to UTF16...");
     }
@@ -597,10 +486,8 @@ my_parse_pdf_dict (const char **pp, const char *endptr, struct tounicode *cd)
 {
   pdf_obj  *dict;
 
-#if !defined(upTeX)
   if (cd->cmap_id < 0)
     return  parse_pdf_dict(pp, endptr, NULL);
-#endif
 
   /* :( */
   if (cd->unescape_backslash) 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c
index 92135b0bf18..dd5387b1cb4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c
@@ -55,12 +55,10 @@ static int verbose = 0;
 #define IS_JFM(i) ((i) == JFM_ID || (i) == JFMV_ID)
 #endif /* !WITHOUT_ASCII_PTEX */
 
-#if defined(upTeX)
 #if !defined(WITHOUT_ASCII_PTEX)
-#define INDEX(i)  ((i>0xFFFFul ? 0x10000ul : i))
+#define CHARACTER_INDEX(i)  ((i>0xFFFFul ? 0x10000ul : i))
 #else
-#define INDEX(i)  ((i))
-#endif
+#define CHARACTER_INDEX(i)  ((i))
 #endif
 
 /*
@@ -170,11 +168,7 @@ tfm_font_clear (struct tfm_font *tfm)
 struct coverage
 {
   long           first_char;
-#if defined(upTeX)
   long           num_chars;
-#else
-  unsigned short num_chars;
-#endif
 };
 
 /*
@@ -220,11 +214,7 @@ lookup_char (const struct char_map *map, long charcode)
 {
   if (charcode >= map->coverage.first_char &&
       charcode <= map->coverage.first_char + map->coverage.num_chars)
-#if defined(upTeX)
-    return map->indices[INDEX(charcode - map->coverage.first_char)];
-#else
-    return map->indices[charcode - map->coverage.first_char];
-#endif
+    return map->indices[CHARACTER_INDEX(charcode - map->coverage.first_char)];
   else
     return -1;
 
@@ -240,11 +230,7 @@ lookup_range (const struct range_map *map, long charcode)
 	 charcode >= map->coverages[idx].first_char; idx--) {
     if (charcode <=
 	map->coverages[idx].first_char + map->coverages[idx].num_chars)
-#if defined(upTeX)
-      return map->indices[INDEX(idx)];
-#else
-      return map->indices[idx];
-#endif
+      return map->indices[CHARACTER_INDEX(idx)];
   }
 
   return -1;
@@ -499,20 +485,13 @@ jfm_make_charmap (struct font_metric *fm, struct tfm_font *tfm)
     fm->charmap.type = MAPTYPE_CHAR;
     fm->charmap.data = map = NEW(1, struct char_map);
     map->coverage.first_char = 0;
-#if defined(upTeX)
     map->coverage.num_chars  = 0x10FFFFu;
     map->indices    = NEW(0x10001ul, unsigned short);
-#else
-    map->coverage.num_chars  = 0xFFFFu;
-    map->indices    = NEW(0x10000L, unsigned short);
-#endif
 
     for (code = 0; code <= 0xFFFFu; code++) {
       map->indices[code] = tfm->chartypes[code];
     }
-#if defined(upTeX)
     map->indices[0x10000ul] = tfm->chartypes[0];
-#endif
   } else {
     struct range_map *map;
 
@@ -521,11 +500,7 @@ jfm_make_charmap (struct font_metric *fm, struct tfm_font *tfm)
     map->num_coverages = 1;
     map->coverages     = NEW(map->num_coverages, struct coverage);
     map->coverages[0].first_char = 0;
-#if defined(upTeX)
     map->coverages[0].num_chars  = 0x10FFFFu;
-#else
-    map->coverages[0].num_chars  = 0xFFFFu;
-#endif
     map->indices = NEW(1, unsigned short);
     map->indices[0] = 0; /* Only default type used. */
   }
@@ -816,11 +791,7 @@ read_tfm (struct font_metric *fm, FILE *tfm_file, UNSIGNED_QUAD tfm_file_size)
     jfm_do_char_type_array(tfm_file, &tfm);
     jfm_make_charmap(fm, &tfm);
     fm->firstchar = 0;
-#if defined(upTeX)
     fm->lastchar  = 0x10FFFFl;
-#else
-    fm->lastchar  = 0xFFFFl;
-#endif
     fm->fontdir   = (tfm.id == JFMV_ID) ? FONT_DIR_VERT : FONT_DIR_HORIZ;
     fm->source    = SOURCE_TYPE_JFM;
   }
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c
index 8783a256ede..d2a6e178207 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c
@@ -238,19 +238,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 defined(upTeX)
 	if (ch < 0x1000000L) 
-#else
-	if (ch < 65536L) 
-#endif
 	  read_a_char_def (vf_file, thisfont, pkt_len, ch);
 	else {
 	  fprintf (stderr, "char=%ld\n", ch);
-#if defined(upTeX)
 	  ERROR ("Long character (>24 bits) in VF file.\nI can't handle long characters!\n");
-#else
-	  ERROR ("Long character (>16 bits) in VF file.\nI can't handle long characters!\n");
-#endif
 	}
 	break;
       }
@@ -463,13 +455,11 @@ static void vf_set2(unsigned char **start, unsigned char *end)
   return;
 }
 
-#if defined(upTeX)
 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)
 {
@@ -507,13 +497,11 @@ static void vf_put2(unsigned char **start, unsigned char *end)
   return;
 }
 
-#if defined(upTeX)
 static void vf_put3(unsigned char **start, unsigned char *end)
 {
   dvi_put (unsigned_triple(start, end));
   return;
 }
-#endif
 
 static void vf_push(void)
 {
@@ -874,17 +862,11 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font)
 	case SET2:
 	  vf_set2(&start, end);
 	  break;
-#if defined(upTeX)
 	case SET3:
 	  vf_set3(&start, end);
 	  break;
 	case SET4:
 	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
-#else
-	case SET3:
-	case SET4:
-	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-#endif
 	  break;
 	case SET_RULE:
 	  vf_setrule(&start, end, ptsize);
@@ -895,17 +877,11 @@ void vf_set_char(SIGNED_QUAD ch, int vf_font)
 	case PUT2:
 	  vf_put2(&start, end);
 	  break;
-#if defined(upTeX)
 	case PUT3:
 	  vf_put3(&start, end);
 	  break;
 	case PUT4:
 	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
-#else
-	case PUT3:
-	case PUT4:
-	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-#endif
 	  break;
 	case PUT_RULE:
 	  vf_putrule(&start, end, ptsize);