X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dbd4b0affb8c818f92008c4ab8d5f23b9af6ca4d..6bf3cfbf5a62745381ebb3f6c5ee72eabd8366f5:/charset.plp

diff --git a/charset.plp b/charset.plp
index 8996c58..e82e3d7 100644
--- a/charset.plp
+++ b/charset.plp
@@ -77,8 +77,8 @@ 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 )],
-		uc         => [qw( U++ unicode+0-4095 unicode+4096-6319  unicode+6320-8191 )],
+		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 )],
 		iso        => [map {"iso-8859-$_"} 1 .. 11, 13 .. 16],
@@ -221,14 +221,16 @@ sub tabinput {
 		$visible->{$_} //= 0 for $row{parent} || ();
 	}
 
-	if (length $params) {
-		# manual option to double table width
-		$row{cols} *= 2 if $params =~ s/[+]\z//;
-	}
-
 	for my $param (split /[+]+/, $params // '') {
-		if ($param =~ m{ \A (?<offset> \d+) (?: [-] (?<endpoint> \d+) )? \z }x) {
-			if ($row{offset}) {
+		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 (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} }++;
@@ -237,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");
@@ -362,13 +364,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;