--- rxvt-unicode/src/gentables	2004/03/15 01:27:46	1.5
+++ rxvt-unicode/src/gentables	2004/12/10 19:55:55	1.9
@@ -5,6 +5,11 @@
 use v5.8.2;
 use utf8;
 use Encode;
+use Encode::JP;
+use Encode::CN;
+use Encode::KR;
+use Encode::HanExtra;
+use Encode::JIS2K;
 
 my $gen;
 
@@ -236,26 +241,25 @@
 #ifdef ENCODING_$group
 
 $tab1$tab2
-struct rxvt_codeset_conv_$base : rxvt_codeset_conv {
-  uint32_t from_unicode (unicode_t unicode) const {
-$fun1  }
+static uint32_t cs_$base\_from_unicode (unicode_t unicode) {
+$fun1}
 EOF
 
 if ($TO_UNICODE) {
    print OUT <<EOF
 #if ENCODING_TO_UNICODE
-  unicode_t to_unicode (uint32_t enc) const {
-$fun2  }
+static unicode_t cs_$base\_to_unicode (uint32_t enc) {
+$fun2}
 #endif
 EOF
 }
 
 print OUT <<EOF;
-} rxvt_codeset_conv_$base;
 
 #else
 
-#define rxvt_codeset_conv_$base rxvt_codeset_conv_unknown
+#define cs_$base\_from_unicode cs_unknown_from_unicode
+#define cs_$base\_to_unicode   cs_unknown_to_unicode
 
 #endif
 EOF
@@ -266,18 +270,19 @@
 __DATA__
 VN		viscii			viscii
 KR		ksc5601_1987_0		ksc5601-raw
-CN		gb2312_1980_0		gb2312-raw
-CN_EXT		cns11643_1992_1		cns11643-1
-CN_EXT		cns11643_1992_2		cns11643-2
-CN_EXT		cns11643_1992_3		cns11643-3
-CN_EXT		cns11643_1992_4		cns11643-4
-CN_EXT		cns11643_1992_5		cns11643-5
-CN_EXT		cns11643_1992_6		cns11643-6
-CN_EXT		cns11643_1992_7		cns11643-7
-CN_EXT		cns11643_1992_f		cns11643-f
-CN		big5			big5
-CN_EXT		big5_ext		big5ext
-CN_EXT		big5_plus		big5plus
+ZH		gb2312_1980_0		gb2312-raw
+ZH		gbk_0			gbk
+ZH_EXT		cns11643_1992_1		cns11643-1
+ZH_EXT		cns11643_1992_2		cns11643-2
+ZH_EXT		cns11643_1992_3		cns11643-3
+ZH_EXT		cns11643_1992_4		cns11643-4
+ZH_EXT		cns11643_1992_5		cns11643-5
+ZH_EXT		cns11643_1992_6		cns11643-6
+ZH_EXT		cns11643_1992_7		cns11643-7
+ZH_EXT		cns11643_1992_f		cns11643-f
+ZH		big5			big5
+ZH_EXT		big5_ext		big5ext
+ZH_EXT		big5_plus		big5plus
 EU		koi8_r			koi8-r
 EU		koi8_u			koi8-u
 DEFAULT		iso8859_1		iso-8859-1