charset: support partial cp437 glyph replacement

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 33e5db49c3af58910f0f2048e1412343cabd5141..5e500047d48d8c685598a3ff7b798a65ff8d8093 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -77,7 +77,7 @@ sub tabinput {
        my $input = shift or return;
 
        state $ALIAS = {
-               default    => [qw( unicode+0-639 utf-8 iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],
+               default    => [qw( unicode+0-639 utf-8+realsize iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],
                uc         => [qw( U+cols=32 unicode+0-4095 unicode+4096-6319  unicode+6320-8191 )],
                us         => [qw( cp437 cp863 gsm0338 AdobeStandardEncoding )],
                ebcdic     => [qw( cp37 cp500 cp1047 posix-bc cp1026 cp875 )],
@@ -222,11 +222,15 @@ sub tabinput {
        }
 
        for my $param (split /[+]+/, $params // '') {
-               if ($param =~ m{ \A cols = (\d+) \z }x) {
+               if ($param eq 'realsize') {
+                       $row{realsize}++;
+               }
+               elsif ($param =~ m{ \A cols = (\d+) \z }x) {
                        $row{cols} = $1;
                }
                elsif ($param =~ m{ \A (?<offset> \d+) (?: [-] (?<endpoint> \d+) )? \z }x) {
-                       if ($row{offset}) {
+                       if (defined $row{endpoint}) {
+                               # extend earlier range
                                my $skip = int(($row{endpoint} || $row{offset}) / $row{cols});
                                for ($skip + 1 .. ($+{offset} / $row{cols}) - 1) {
                                        $row{skip}->{ $_ * $row{cols} - $row{offset} }++;
@@ -235,7 +239,7 @@ sub tabinput {
                        else {
                                $row{offset} = $+{offset};
                        }
-                       $row{endpoint} = $+{endpoint};
+                       $row{endpoint} = $+{endpoint} || 0;
                }
                else {
                        Alert("Unknown option <q>$param</q> for charset $input");
@@ -293,14 +297,21 @@ sub tabinput {
                        }
                        $row{endpoint} -= $row{offset};
 
-                       if ($row{set} eq 'cp437' and !$row{offset}) {
-                               substr($row{table}, 237, 1) = pack 'U*', 0x3D5; # phi sign
-                               substr($row{table}, 0, 32) = pack 'U*', map {hex} qw(
-                                       2007 263A 263B 2665 2666 2663 2660 2022
-                                       25D8 25CB 25D9 2642 2640 266A 266B 263C
-                                       25BA 25C4 2195 203C 00B6 00A7 25AC 21A8
-                                       2191 2193 2192 2190 221F 2194 25B2 25BC
-                               );
+                       if ($row{set} eq 'cp437') {
+                               for my $phipos (237 - $row{offset}) {
+                                       next if $phipos < 0 or $phipos > $row{endpoint};
+                                       # replace phi glyph
+                                       substr($row{table}, $phipos, 1) = pack 'U*', 0x3D5;
+                               }
+                               if ($row{offset} == 0) {
+                                       # replace control characters by visible variants
+                                       substr($row{table}, 0, 32) = pack 'U*', map {hex} qw(
+                                               2007 263A 263B 2665 2666 2663 2660 2022
+                                               25D8 25CB 25D9 2642 2640 266A 266B 263C
+                                               25BA 25C4 2195 203C 00B6 00A7 25AC 21A8
+                                               2191 2193 2192 2190 221F 2194 25B2 25BC
+                                       );
+                               }
                        }
 
                        $visible->{ascii} =  # assume common base
@@ -360,13 +371,15 @@ sub range_cell {
                        $class .= ' joind';
                }
 
-               # coalesce multiple rows
-               while ($rows > 3) {
-                       $info->{skip}->{$offset += $rowsize}++;
-                       $rows--;
-               }
-               if ($rows > 2) {
-                       $info->{skip}->{$offset += $rowsize} = 0;
+               unless ($info->{realsize}) {
+                       # coalesce multiple rows
+                       while ($rows > 3) {
+                               $info->{skip}->{$offset += $rowsize}++;
+                               $rows--;
+                       }
+                       if ($rows > 2) {
+                               $info->{skip}->{$offset += $rowsize} = 0;
+                       }
                }
 
                $attr .= sprintf ' rowspan=%d', $rows;