X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3e2e19818a6102eff505984ca2430ae3ac901d08..0c9d5cd332b3a9124f75926de5094c90b353e238:/charset-encoding.inc.pl?ds=sidebyside

diff --git a/charset-encoding.inc.pl b/charset-encoding.inc.pl
index fc6b4b1..71ba2ba 100644
--- a/charset-encoding.inc.pl
+++ b/charset-encoding.inc.pl
@@ -1,8 +1,9 @@
 use 5.014;
 use warnings;
+use utf8;
 
 +{
-	default    => [qw( u+0-27F utf-8+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 )],
 	unicode    => [qw( uu+cols=32+realsize u+0-FFF u+1000-18AF u+18B0-1FFF )],
 	us         => [qw( cp437 cp863 gsm0338 AdobeStandardEncoding )],
 	ebcdic     => [qw( cp37 cp500 cp1047 posix-bc cp1026 cp875 )],
@@ -45,17 +46,35 @@ use warnings;
 	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
-	'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']},
-	'wingdings2'   => {inherit => ['' => '20']},
-	'wingdings3'   => {inherit => ['' => '20']},
-	'webdings'     => {inherit => ['' => '20']},
+	'wingdings'    => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings}},
+	'wingdings2'   => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings2}},
+	'wingdings3'   => {inherit => ['' => '20'], setup => sub {require Encode::Wingdings3}},
+	'webdings'     => {inherit => ['' => '20'], setup => sub {require Encode::Webdings}},
 
 	'iso-8859-2'   => {inherit => ['iso-8859-1' => 'A0']},
 	'iso-8859-3'   => {inherit => ['iso-8859-1' => 'A0']}, #TODO: also apply to iso-8859-9
@@ -122,4 +141,55 @@ use warnings;
 	'cp1047'       => {inherit => ['cp37' => '10-2F+50-5F+A0-BF']},
 	'cp1026'       => {inherit => ['cp37' => '40']},
 	'cp875'        => {inherit => ['cp37' => '30']},
+
+	''             => {setup => sub {
+		my $row = shift;
+		$row->{offset} = delete $row->{startpoint};
+		$row->{set} = 'Unicode characters';
+		my $block = $row->{offset} >> 8;
+		$row->{endpoint} ||= ($block + 1 << 8) - 1;
+		$block == ($row->{endpoint} >> 8) or undef $block;
+
+		$row->{table} = join '', map { chr } $row->{offset} .. $row->{endpoint};
+		utf8::upgrade($row->{table});  # prevent latin1 output
+
+		$row->{endpoint} -= $row->{offset};
+
+		if (defined $block) {
+			$row->{set} = sprintf 'Unicode block U+%02Xxx', $block;
+			$row->{offset} %= 0x100;
+		}
+
+		return $row;
+	}},
+	u              => {setup => sub {
+		my $row = shift;
+		$row->{cell} = do 'charset-unicode.inc.pl'
+			or Alert('Table data could not be read', $@ || $!);
+
+		$row->{endpoint} ||= 0x1FFF;
+		$row->{set} = 'Unicode ' . (
+			$row->{startpoint} <  0x1000 && $row->{endpoint} < 0x1000 ? 'BMP' :
+			$row->{startpoint} >= 0x1000 && $row->{endpoint} < 0x2000 ? 'SMP' :
+			'allocations'
+		);
+		return $row;
+	}},
+	uu             => {setup => sub {
+		my $row = shift;
+		$row->{cell} = do 'charset-ucplanes.inc.pl'
+			or Alert('Table data could not be read', $@ || $!);
+		$row->{endpoint} ||= 0x3FF;
+		$row->{set} = 'Unicode planes';
+		return $row;
+	}},
+	utf8           => {setup => sub {
+		my $row = shift;
+		$row->{set} = 'UTF-8';
+		$row->{cell} = do 'charset-utf8.inc.pl'
+			or Alert('Table data could not be read', $@ || $!);
+		$row->{endpoint} = 0xFF;
+		return $row;
+	}},
+	'utf-8'        => 'utf8',
 };