--- rxvt-unicode/src/gentables	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/gentables	2015/04/11 18:27:25	1.11
@@ -1,13 +1,20 @@
 #!/opt/bin/perl
 
-# the generated tables mostly have NOT been chcked so far!
+# the generated tables mostly have NOT been checked so far!
 
 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;
 
+$TO_UNICODE = 0; # also generate to_unicode tables
+
 sub linear {
    my ($a, $l, $h, $b) = @_;
    for ($l .. $h) {
@@ -88,7 +95,7 @@
          } elsif (linear $enc, $b + $l, $b + $h, $enc->[$b + $l]) {
             my $dif = $enc->[$b + $l] - ($b + $l);
             $dif = $dif < 0 ? sprintf "- 0x%04x", -$dif : sprintf "+ 0x%04x", $dif;
-            $fun .= sprintf "if (· <= 0x%04x && 0x%04x <= ·) return · %s;\n", $b + $l, $b + $h, $dif;
+            $fun .= sprintf "if (· >= 0x%04x && 0x%04x >= ·) return · %s;\n", $b + $l, $b + $h, $dif;
          } elsif ($map2[$p] <= 5) { # defunct
             $fun .= "switch (·)\n  {\n";
             for ($l .. $h) {
@@ -215,11 +222,12 @@
       }
    }
 
-   my ($tab1, $fun1) = gen \@enc1, "$base\_f", "unicode";
-   my ($tab2, $fun2) = gen \@enc2, "$base\_t", "enc";
+   my ($tab1, $fun1);
+   my ($tab2, $fun2);
+
+   ($tab1, $fun1) = gen \@enc1, "$base\_f", "unicode";
+   ($tab2, $fun2) = gen \@enc2, "$base\_t", "enc" if $TO_UNICODE;
 
-   #$tab1 =~ s/^/  /gm;
-   #$tab2 =~ s/^/  /gm;
    $fun1 =~ s/^/    /gm;
    $fun2 =~ s/^/    /gm;
 
@@ -233,16 +241,25 @@
 #ifdef ENCODING_$group
 
 $tab1$tab2
-struct rxvt_codeset_conv_$base : rxvt_codeset_conv {
-  uint32_t from_unicode (uint32_t unicode) const {
-$fun1  }
-  uint32_t to_unicode (uint32_t enc) const {
-$fun2  }
-} rxvt_codeset_conv_$base;
+static uint32_t cs_$base\_from_unicode (unicode_t unicode) {
+$fun1}
+EOF
+
+if ($TO_UNICODE) {
+   print OUT <<EOF
+#if ENCODING_TO_UNICODE
+static unicode_t cs_$base\_to_unicode (uint32_t enc) {
+$fun2}
+#endif
+EOF
+}
+
+print OUT <<EOF;
 
 #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
@@ -253,17 +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_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
@@ -278,11 +297,11 @@
 EU		iso8859_10		iso-8859-10
 EU		iso8859_11		iso-8859-11
 EU		iso8859_13		iso-8859-13
-EU		iso8859_14		iso-8859-14	
+EU		iso8859_14		iso-8859-14
 DEFAULT		iso8859_15		iso-8859-15
 EU		iso8859_16		iso-8859-16
 JP		jis0201_1976_0		jis0201-raw
-JP		jis0208_1983_0		jis0208-raw
+JP		jis0208_1990_0		jis0208-raw
 JP		jis0212_1990_0		jis0212-raw
 JP_EXT		jis0213_1		jis0213-1-raw
 JP_EXT		jis0213_2		jis0213-2-raw