--- rxvt-unicode/src/table/koi8_u.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/table/koi8_u.h	2004/08/04 03:29:29	1.4
@@ -36,22 +36,8 @@
   0x8f, 0x90, 0x91, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x94
 };
-static const uint16_t koi8_u_t_0[] = {
-  0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2580,
-  0x2584, 0x2588, 0x258c, 0x2590, 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2022, 0x221a, 0x2248,
-  0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, 0x2550, 0x2551, 0x2552, 0x0451,
-  0x0454, 0x2554, 0x0456, 0x0457, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x0491, 0x255d, 0x255e,
-  0x255f, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, 0x2566, 0x2567, 0x2568, 0x2569,
-  0x256a, 0x0490, 0x256c, 0x00a9, 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-  0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, 0x044f, 0x0440, 0x0441,
-  0x0442, 0x0443, 0x0436, 0x0432, 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a,
-  0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, 0x0425, 0x0418, 0x0419, 0x041a,
-  0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-  0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a
-};
 
-struct rxvt_codeset_conv_koi8_u : rxvt_codeset_conv {
-  uint32_t from_unicode (uint32_t unicode) const {
+static uint32_t cs_koi8_u_from_unicode (unicode_t unicode) {
     if (unicode <= 0x007f) return unicode;
     if (unicode == 0x2022) return 0x0095;
     if (unicode == 0x221a) return 0x0096;
@@ -67,17 +53,11 @@
     if (0x2500 <= unicode && unicode <= 0x25a0)
       return koi8_u_f_9472[unicode - 0x2500] == 0 ? NOCHAR : koi8_u_f_9472[unicode - 0x2500];
     return NOCHAR;
-  }
-  uint32_t to_unicode (uint32_t enc) const {
-    if (enc <= 0x007f) return enc;
-    if (0x0080 <= enc && enc <= 0x00ff)
-      return koi8_u_t_0[enc - 0x0080];
-    return NOCHAR;
-  }
-} rxvt_codeset_conv_koi8_u;
+}
 
 #else
 
-#define rxvt_codeset_conv_koi8_u rxvt_codeset_conv_unknown
+#define cs_koi8_u_from_unicode cs_unknown_from_unicode
+#define cs_koi8_u_to_unicode   cs_unknown_to_unicode
 
 #endif