fix wide characters; tested iso10646

diff --git a/Makefile b/Makefile
index 16ea0ae8b6093058a1be07c6f58be294f8c3291d..8e27113dd13d819011d4bc749487208422dcc81a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ default: all
 
 all:
        ./mkrules <specs
+       cp manual/*.rules rules/
 
 install:
        perl -pe 's#^(our \$$prefix=").*("\;\s*)$$#$$1$(prefix)$$2#' \

diff --git a/TODO b/TODO
index e3b28cf19edf6bdd0dfff06976652a3375641c55..e411b3d54f9b6b7563e944844fee2ed6a980e396 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1 @@
--trad-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-    is missing the proper quotes
-   fixed I think
-
 Need to somehow fix up xterm to use the new font
-
-wide fonts

diff --git a/bad/12x13ja.pcf.gz b/bad/12x13ja.pcf.gz
new file mode 100644 (file)
index 0000000..6c827d0
Binary files /dev/null and b/bad/12x13ja.pcf.gz differ

diff --git a/manual/Trad,12,13,0,-2.rules b/manual/Trad,12,13,0,-2.rules
new file mode 100644 (file)
index 0000000..3d26220
--- /dev/null
+++ b/manual/Trad,12,13,0,-2.rules
@@ -0,0 +1,8 @@
+# -*- perl -*-
+sub {
+    if ($props{' 7bit'}) {
+       # bad characters are from 12x13ja.pcf.gz
+       s/^0000;0C00;0600;0100;0000;0000;0000;0000;0000;0000;0000;0000;0000$/0000;0E00;0600;0100;0000;0000;0000;0000;0000;0000;0000;0000;0000/;
+       s/^0000;0C00;0C00;0C00;0800;0000;0000;0000;0000;0000;0000;0000;0000$/0000;0700;0600;0800;0000;0000;0000;0000;0000;0000;0000;0000;0000/;
+    }
+}

diff --git a/specs b/specs
index 0d743074014ffc30edaba8ad3f1281e7f8632ef3..6919580449a26a9d8f4d380007225fa616118a36 100644 (file)
--- a/specs
+++ b/specs
@@ -7,8 +7,7 @@ rules                   Trad
 partial                        a
 entire                 [ ] ( ) { } d42 & W
 
-verbatim       if ($props{'CHARSET_REGISTRY'} =~ m/iso8859|utf|iso10646/i &&
-verbatim           $props{'ENCODING'} <= 127) {
+verbatim       if ($props{' 7bit'}) {
 entire                 ` '
 verbatim       }
 

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 5e291333a2c17e30ec30b24ac8839a98399cfaf5..65d1d086c333112bdeb5f0727f2e7a687fd49197 100755 (executable)
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -112,6 +112,9 @@ sub processbdf ($$$$) {
                $y=0;
                $glyph='';
                $state='bitmap';
+               $props{' 7bit'}=
+                   ($props{'CHARSET_REGISTRY'} =~ m/iso8859|utf|iso10646/i &&
+                    $props{'ENCODING'} <= 127);
            }
        }
        print $outbdf $_ or die $!;