From da6412649ab7efbaf241335385c169d14726b54d Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 9 Apr 2017 02:38:43 +0200
Subject: [PATCH] charset: rename unicode request names

Replace unicode|U by logically related u|uu.
Specific U$number can be unambiguously case-insensitive.
---
 charset.plp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/charset.plp b/charset.plp
index aa81d0b..ca38182 100644
--- a/charset.plp
+++ b/charset.plp
@@ -62,7 +62,6 @@ print join " •\n", (
 		cyrillic => 0,
 		hebrew   => 0,
 	],
-	[ uc => 'Unicode' ],
 );
 :>.
 </p>
@@ -78,8 +77,8 @@ sub tabinput {
 	my $input = shift or return;
 
 	state $ALIAS = {
-		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 )],
+		default    => [qw( u+0-639 utf-8+realsize iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],
+		unicode    => [qw( uu+cols=32 u+0-4095 u+4096-6319 u+6320-8191 )],
 		us         => [qw( cp437 cp863 gsm0338 AdobeStandardEncoding )],
 		ebcdic     => [qw( cp37 cp500 cp1047 posix-bc cp1026 cp875 )],
 		iso        => [map {"iso-8859-$_"} 1 .. 11, 13 .. 16],
@@ -247,7 +246,7 @@ sub tabinput {
 		}
 	}
 
-	if ($input =~ /^U([0-9a-fA-F]+)(?:-([0-9a-fA-F]+))?/) {
+	if ($input =~ m{ \A u ([0-9a-f]+) (?:-([0-9a-f]+))? \z }ix) {
 		my $start = hex($1) << ($2 ? 4 : 8);
 		my $end = $2 ? (hex($2) << 4) + $row{cols} - 1 : $start + 255;
 		$row{table} = join '', map { chr } $start .. $end;
@@ -256,13 +255,13 @@ sub tabinput {
 		$row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
 		$row{offset} = $start % 256;
 	}
-	elsif ($input eq 'U') {
+	elsif (lc $input eq 'uu') {
 		$row{set} = 'Unicode planes';
 		$row{cell} = do 'charset-ucplanes.inc.pl'
 			or Alert('Table data could not be read', $@ || $!);
 		$row{endpoint} = 1023 * $row{cell}->{colsize};
 	}
-	elsif ($input eq 'unicode') {
+	elsif (lc $input eq 'u') {
 		$row{cell} = do 'charset-unicode.inc.pl'
 			or Alert('Table data could not be read', $@ || $!);
 
-- 
2.30.0