chiark / gitweb /
fix wide characters; tested iso10646
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 10 Jan 2012 00:11:30 +0000 (00:11 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 10 Jan 2012 00:11:30 +0000 (00:11 +0000)
Makefile
TODO
bad/12x13ja.pcf.gz [new file with mode: 0644]
manual/Trad,12,13,0,-2.rules [new file with mode: 0644]
specs
update-xfonts-traditional

index 16ea0ae..8e27113 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 e3b28cf..e411b3d 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
@@ -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 0d74307..6919580 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       }
 
index 5e29133..65d1d08 100755 (executable)
@@ -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 $!;