charset: keep original endpoint during character overrides

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 25bc44b6e14ac26f77b98ff3a08be0da33e91fd3..5358a37b47e716e6627b72ea80c706cfe8a92058 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -105,7 +105,7 @@ sub tabinput {
                hebrew     => [qw( iso-8859-8 cp1255 MacHebrew cp862  U59-5F )],
                thai       => [qw( iso-8859-11 cp874 MacThai )],
                vietnamese => [qw( viscii cp1258 MacVietnamese )],
-               symbols    => [qw( symbol dingbats MacDingbats wingdings )],
+               symbols    => [qw( symbol dingbats MacDingbats wingdings wingdings2 wingdings3 webdings )],
 
                # iso-code shorthand
                1 => 'westeur',
@@ -139,6 +139,9 @@ sub tabinput {
                        'symbol'      => ['' => '32-127+160'],
                        'AdobeSymbol' => ['symbol' => '32-127+160', '' => '32-127+160'], # minor differences, irrelevant except for different '€'
                        'wingdings'   => ['' => '32'],
+                       'wingdings2'  => ['' => '32'],
+                       'wingdings3'  => ['' => '32'],
+                       'webdings'    => ['' => '32'],
 
                        'iso-8859-2'  => ['iso-8859-1' => '160'],
                        'iso-8859-3'  => ['iso-8859-1' => '160'], #TODO: also apply to iso-8859-9
@@ -253,8 +256,8 @@ sub tabinput {
                }
        }
 
-       if (lc $input eq 'wingdings') {
-               require Encode::Wingdings;
+       if ($input =~ m{ \A (?:wing|web)dings \d* \z }ix) {
+               eval "require Encode::\u$input";
        }
 
        if ($input =~ m{ \A u ([0-9a-f]+) (?:-([0-9a-f]+))? \z }ix) {
@@ -305,10 +308,9 @@ sub tabinput {
                        # substr strings is twice as fast as splitting to an array
                        $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $row{endpoint});
                }
-               $row{endpoint} -= $row{offset};
 
                if ($row{set} eq 'cp437') {
-                       if ($row{offset} <= 0xED and $row{endpoint} >= 0xED - $row{offset}) {
+                       if ($row{offset} <= 0xED and $row{endpoint} >= 0xED) {
                                # replace phi glyph
                                substr($row{table}, 0xED - $row{offset}, 1) = 'ϕ';
                        }
@@ -319,11 +321,11 @@ sub tabinput {
                        }
                }
                elsif ($row{set} eq 'symbol') {
-                       if ($row{offset} <= 0x60 and $row{endpoint} >= 0x60 - $row{offset}) {
+                       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 - $row{offset}) {
+                       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
@@ -334,6 +336,8 @@ sub tabinput {
                        }
                }
 
+               $row{endpoint} -= $row{offset};
+
                $visible->{ascii} =  # assume common base
                $visible->{ $row{set} } = 1;
        }