--- rxvt-unicode/src/encoding.C	2004/03/03 17:15:49	1.3
+++ rxvt-unicode/src/encoding.C	2004/03/15 01:27:46	1.15
@@ -28,6 +28,8 @@
   { "FCD885915",	CS_ISO8859_15       },
   { "ISO885916",	CS_ISO8859_16       },
                                             
+  { "TIS620*",		CS_ISO8859_11	    }, // close enough
+
   { "ISO10646*",	CS_UNICODE          },
   { "UNICODE",		CS_UNICODE          },
   { "UTF8",		CS_UNICODE          },
@@ -42,12 +44,13 @@
   { "KOI8U",		CS_KOI8_U           },
 
   { "VISCII*",		CS_VISCII	    },
-  { "TIS62025291",	CS_VISCII	    }, // close enough
                                             
   { "JISX0201*",	CS_JIS0201_1976_0   },
-  { "JISX0208*",	CS_JIS0208_1983_0   }, // also wrongly matches -1990-0 (check Encode::JP)
+  { "JISX0208*",	CS_JIS0208_1990_0   }, // also wrongly matches -1987-0? (check Encode::JP)
   { "JISX0212*",	CS_JIS0212_1990_0   },
-  { "JISX0221*",	CS_UNICODE          },
+  { "JISX021320001",	CS_JIS0213_1        },
+  { "JISX021320002",	CS_JIS0213_2        },
+  { "JISX0221*",	CS_UNICODE          }, // _very_ close
                                             
   { "KSC5601*",		CS_KSC5601_1987_0   },
   { "KSX1001*",		CS_KSC5601_1987_0   },
@@ -114,12 +117,12 @@
 }
 
 struct rxvt_codeset_conv_unknown : rxvt_codeset_conv {
-  uint32_t to_unicode (uint32_t enc) const { return NOCHAR; }
-  uint32_t from_unicode (uint32_t unicode) const { return NOCHAR; }
+  unicode_t to_unicode (uint32_t enc) const { return NOCHAR; }
+  uint32_t from_unicode (unicode_t unicode) const { return NOCHAR; }
 } rxvt_codeset_conv_unknown;
 
 struct rxvt_codeset_conv_us_ascii : rxvt_codeset_conv {
-  uint32_t from_unicode (uint32_t unicode) const { return unicode <= 127 ? unicode : NOCHAR; }
+  uint32_t from_unicode (unicode_t unicode) const { return unicode <= 127 ? unicode : NOCHAR; }
 } rxvt_codeset_conv_us_ascii;
 
 struct rxvt_codeset_conv_unicode : rxvt_codeset_conv {
@@ -127,21 +130,10 @@
 } rxvt_codeset_conv_unicode;
 
 struct rxvt_codeset_conv_unicode_16 : rxvt_codeset_conv {
-  uint32_t to_unicode (uint32_t enc) const { return enc; }
-  uint32_t from_unicode (uint32_t unicode) const { return unicode <= 65535 ? unicode : NOCHAR; }
+  unicode_t to_unicode (uint32_t enc) const { return enc; }
+  uint32_t from_unicode (unicode_t unicode) const { return unicode <= 65535 ? unicode : NOCHAR; }
 } rxvt_codeset_conv_unicode_16;
 
-/* block character set, must conform to the dec special pseudofont in defaultfont.C */
-struct rxvt_codeset_conv_special : rxvt_codeset_conv {
-  uint32_t to_unicode (uint32_t enc) const {
-    return enc;
-  }
-
-  uint32_t from_unicode (uint32_t unicode) const {
-    return unicode;
-  }
-} rxvt_codeset_conv_special;
-
 #define ENCODING_DEFAULT
 
 #include "table/iso8859_1.h"
@@ -195,7 +187,7 @@
 //#define ENCODING_JP
 
 #include "table/jis0201_1976_0.h"
-#include "table/jis0208_1983_0.h"
+#include "table/jis0208_1990_0.h"
 #include "table/jis0212_1990_0.h"
 
 //#define ENCODING_JP_EXT
@@ -206,7 +198,6 @@
 // order must match table in encoding.h(!)
 const rxvt_codeset_conv *rxvt_codeset[NUM_CODESETS] = {
   &rxvt_codeset_conv_unknown,
-  &rxvt_codeset_conv_special,
 
   &rxvt_codeset_conv_us_ascii,
 
@@ -230,7 +221,7 @@
   &rxvt_codeset_conv_koi8_u,
 
   &rxvt_codeset_conv_jis0201_1976_0,
-  &rxvt_codeset_conv_jis0208_1983_0,
+  &rxvt_codeset_conv_jis0208_1990_0,
   &rxvt_codeset_conv_jis0212_1990_0,
 
   &rxvt_codeset_conv_jis0213_1,
@@ -258,3 +249,38 @@
   &rxvt_codeset_conv_unicode
 };
 
+#if ENABLE_COMBINING
+# define ENCODING_COMPOSE
+#endif
+
+#include "table/compose.h"
+
+unicode_t
+rxvt_compose (unicode_t c1, unicode_t c2)
+{
+  int l = 0;
+  int r = sizeof (rxvt_compose_table) / sizeof (rxvt_compose_entry) - 1;
+  int m;
+
+  while (r > l)
+    {
+      m = (l + r) / 2;
+      rxvt_compose_entry &c = rxvt_compose_table[m];
+
+      if (c.c1 < c1 || (c.c1 == c1 && c.c2 < c2))
+        l = m + 1;
+      else if (c.c1 > c1 || (c.c1 == c1 && c.c2 > c2))
+        r = m - 1;
+      else
+        return c.r;
+    }
+
+  return NOCHAR;
+}
+
+#include "table/category.h"
+
+bool unicode::is_space (unicode_t c)
+{
+  return IS_SPACE (c);
+}