charset: generic glyph replacement from metadata

Common format with full support for partial overlaps.

diff --git a/charset-encoding.inc.pl b/charset-encoding.inc.pl
index eee5aa252dec757ae6b66ca7e26396c345d16bb7..71ba2bae277446e4a68666dab5081b1cdc3875ef 100644 (file)
--- a/charset-encoding.inc.pl
+++ b/charset-encoding.inc.pl
@@ -1,5 +1,6 @@
 use 5.014;
 use warnings;
 use 5.014;
 use warnings;

+use utf8;

 
 +{
        default    => [qw( u+0-27F utf8+realsize iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],
 
 +{
        default    => [qw( u+0-27F utf8+realsize iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],


@@ -45,12 +46,30 @@ use warnings;
        11 => 'thai',
 
        'ascii'        => {inherit => ['' => '00-7F']},
        11 => 'thai',
 
        'ascii'        => {inherit => ['' => '00-7F']},

-       'cp437'        => {inherit => ['cp850' => 0, 'ascii' => '00-1F+80']}, # ascii range overridden later
+       'cp437'        => {
+               inherit => ['cp850' => 0, 'ascii' => '00-1F+80'], # ascii range overridden later
+               replace => {
+                       0    => ' ☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼', # visible variants of control characters
+                       0xED => 'ϕ', # non-greek usage and appearance
+               },
+       },

        'gsm0338'      => {inherit => ['ascii' => '00-7F']},
        'dingbats'     => {inherit => ['' => '20-7F+A0']},
        'macdingbats'  => {inherit => ['dingbats' => '80-9F']},
        'adobezdingbat'=> {inherit => ['MacDingbats' => '80-9F']}, # should be identical but maps to private use
        'gsm0338'      => {inherit => ['ascii' => '00-7F']},
        'dingbats'     => {inherit => ['' => '20-7F+A0']},
        'macdingbats'  => {inherit => ['dingbats' => '80-9F']},
        'adobezdingbat'=> {inherit => ['MacDingbats' => '80-9F']}, # should be identical but maps to private use

-       'symbol'       => {inherit => ['' => '20-7F+A0']},
+       'symbol'       => {
+               inherit => ['' => '20-7F+A0'],
+               replace => {
+                       0x60 => '│', # replace radical extender by closest unicode equivalent
+                       0xBD => '⏐⎯', # arrow extenders
+                       0xD2 => '®©™', # serif variants
+                       0xE0 => '◊', # replace lookalike, should match AdobeSymbol
+                       0xE2 => '®©™', # sans-serif variants
+                       0xE6 => '⎛⎜⎝⎡⎢⎣⎧⎨⎩⎪',
+                       0xF0 => '€',
+                       0xF4 => '⎮⌡⎞⎟⎠⎤⎥⎦⎫⎬⎭',
+               },
+       },

        'adobesymbol'  => {inherit => ['symbol' => '20-7F+A0', '' => '20-7F+A0']}, # minor differences, irrelevant except for different '€'
        'wingdings'    => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings}},
        'wingdings2'   => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings2}},
        'adobesymbol'  => {inherit => ['symbol' => '20-7F+A0', '' => '20-7F+A0']}, # minor differences, irrelevant except for different '€'
        'wingdings'    => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings}},
        'wingdings2'   => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings2}},

diff --git a/charset.plp b/charset.plp
index ed495fe2ae89352fa10641847cd2d19d3436378c..7f19bc183e6fb02abd1d91622041cf7f75479905 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -164,33 +164,6 @@ sub tabinput {
                        $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $row{endpoint});
                }
 
                        $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $row{endpoint});
                }
 

-               if ($row{set} eq 'cp437') {
-                       if ($row{offset} <= 0xED and $row{endpoint} >= 0xED) {
-                               # replace phi glyph
-                               substr($row{table}, 0xED - $row{offset}, 1) = 'ϕ';
-                       }
-                       if ($row{offset} < 0x20) {
-                               # replace control characters by visible variants
-                               my $sub = substr ' ☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼', $row{offset};
-                               substr($row{table}, 0, length $sub) = $sub;
-                       }
-               }
-               elsif ($row{set} eq 'symbol') {
-                       if ($row{offset} <= 0x60 and $row{endpoint} >= 0x60) {
-                               # replace radical extender by closest unicode equivalent
-                               substr($row{table}, 0x60 - $row{offset},  1) = '│';
-                       }
-                       if ($row{offset} <= 0xBD and $row{endpoint} >= 0xFF) {
-                               substr($row{table}, 0xBD - $row{offset},  2) = '⏐⎯'; # arrow extenders
-                               substr($row{table}, 0xD2 - $row{offset},  3) = '®©™'; # serif variants
-                               substr($row{table}, 0xE0 - $row{offset},  1) = '◊'; # replace lookalike, should match AdobeSymbol
-                               substr($row{table}, 0xE2 - $row{offset},  3) = '®©™'; # sans-serif variants
-                               substr($row{table}, 0xE6 - $row{offset}, 10) = '⎛⎜⎝⎡⎢⎣⎧⎨⎩⎪';
-                               substr($row{table}, 0xF0 - $row{offset},  1) = '€';
-                               substr($row{table}, 0xF4 - $row{offset}, 11) = '⎮⌡⎞⎟⎠⎤⎥⎦⎫⎬⎭';
-                       }
-               }
-

                $row{endpoint} -= $row{offset};
 
                $visible->{ascii} =  # assume common base
                $row{endpoint} -= $row{offset};
 
                $visible->{ascii} =  # assume common base


@@ -200,6 +173,32 @@ sub tabinput {
                Alert("Encoding <q>$input</q> unknown");
                return;
        }
                Alert("Encoding <q>$input</q> unknown");
                return;
        }

+
+       if (my $replace = $charset->{replace}) {
+               while (my ($offset, $sub) = each %{$replace}) {
+                       $offset -= $row{offset};
+
+                       my $length = length $sub;
+
+                       if ($offset < 0) {
+                               $offset > -$length or next; # at least one character after start
+                               # trim leftmost part to start at offset
+                               substr($sub, 0, -$offset) = '';
+                               $length += $offset;
+                               $offset = 0;
+                       }
+
+                       if ((my $excess = $row{endpoint} - $offset - $length + 1) < 0) {
+                               $excess > -$length or next;
+                               # trim rightmost part to prevent overflow
+                               substr($sub, $excess) = '';
+                               $length += $excess;
+                       }
+
+                       substr($row{table}, $offset, $length) = $sub;
+               }
+       }
+

        push @request, \%row;
 }
 tabinput($_) for @tablist;
        push @request, \%row;
 }
 tabinput($_) for @tablist;