X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/44dbddb624a00ce72a8120c07e545d060273fc72..b1db17617e16cb9468808f7e2aea0ad8c96c166e:/charset.plp

diff --git a/charset.plp b/charset.plp
index 5358a37..05336c1 100644
--- a/charset.plp
+++ b/charset.plp
@@ -238,18 +238,18 @@ sub tabinput {
 		elsif ($param =~ m{ \A cols = (\d+) \z }x) {
 			$row{cols} = $1;
 		}
-		elsif ($param =~ m{ \A (?<offset> \d+) (?: [-] (?<endpoint> \d+) )? \z }x) {
+		elsif ($param =~ m{ \A (?<start> \d+) (?: [-] (?<end> \d+) )? \z }x) {
 			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} }++;
+				my $skip = int(($row{endpoint} || $row{startpoint}) / $row{cols});
+				for ($skip + 1 .. ($+{start} / $row{cols}) - 1) {
+					$row{skip}->{ $_ * $row{cols} - $row{startpoint} }++;
 				}
 			}
 			else {
-				$row{offset} = $+{offset};
+				$row{startpoint} = $+{start};
 			}
-			$row{endpoint} = $+{endpoint} || 0;
+			$row{endpoint} = $+{end} || 0;
 		}
 		else {
 			Alert("Unknown option <q>$param</q> for charset $input");
@@ -268,12 +268,15 @@ sub tabinput {
 		$row{endpoint} = $end - $start;
 		$row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
 		$row{offset} = $start % 256;
+		$row{startpoint} = 0;
 	}
 	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};
+		$row{endpoint} ||= 1023;
+		$row{endpoint}   *= $row{cell}->{colsize};
+		$row{startpoint} *= $row{cell}->{colsize};
 	}
 	elsif (lc $input eq 'u') {
 		$row{cell} = do 'charset-unicode.inc.pl'
@@ -281,8 +284,7 @@ sub tabinput {
 
 		$row{endpoint} ||= 8191;
 		$row{endpoint}  *= $row{cell}->{colsize};
-		$row{startpoint} = $row{cell}->{colsize} * $row{offset};
-		$row{offset} = 0;
+		$row{startpoint} *= $row{cell}->{colsize};
 		$row{set} = 'Unicode ' . (
 			$row{startpoint} <  0x10000 && $row{endpoint} < 0x10000 ? 'BMP' :
 			$row{startpoint} >= 0x10000 && $row{endpoint} < 0x20000 ? 'SMP' :
@@ -296,6 +298,7 @@ sub tabinput {
 		$row{endpoint} = 255;
 	}
 	elsif ($row{set} = Encode::resolve_alias($input)) {
+		$row{offset} = delete $row{startpoint};
 		$row{endpoint} ||= 255;
 		if ($row{set} eq 'MacHebrew' or $row{set} eq 'MacThai') {
 			# array of possibly multiple characters per code point
@@ -363,7 +366,7 @@ sub range_cell {
 	$len /= $colsize;
 	$name //= $len <= 2 ? 'res' : 'reserved';
 
-	if (my $part = $offset/$colsize % $cols) {
+	if (my $part = ($offset - $info->{startpoint})/$colsize % $cols) {
 		# continued row
 		my $rest = $cols - $part;  # remaining
 		$rest = $len if $len < $rest; #TODO: optimise