From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 5 Apr 2017 21:26:04 +0000 (+0200)
Subject: charset: support variable number of columns
X-Git-Tag: v1.10~243
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/d1b5f6641ac7325cfe857a04445a2f830cc3c797

charset: support variable number of columns
---

diff --git a/charset.plp b/charset.plp
index d3b27b5..d954e32 100644
--- a/charset.plp
+++ b/charset.plp
@@ -116,9 +116,9 @@ sub range_cell {
 	$len /= $nibsize;
 	$name //= $len <= 2 ? 'res' : 'reserved';
 
-	if (my $part = $offset/$nibsize % 16) {
+	if (my $part = $offset/$nibsize % @nibble) {
 		# continued row
-		my $cols = 16 - $part;  # remaining
+		my $cols = @nibble - $part;  # remaining
 		$cols = $len if $len < $cols; #TODO: optimise
 		if ($len -= $cols) {
 			# continued on new row
@@ -128,15 +128,15 @@ sub range_cell {
 		}
 		$len = $cols;
 	}
-	elsif (my $rows = $len >> 4) {
+	elsif (my $rows = int($len / @nibble)) {
 		# multiple full rows
-		if ($len -= $rows << 4) {
+		if ($len -= $rows * @nibble) {
 			# partial row remains
-			$table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
+			$table->{$offset + $nibsize*$rows * @nibble} //= [$len*$nibsize, "$class joinu", '', $title];
 			$class .= ' joind';
 		}
 		$attr .= sprintf ' rowspan=%d', $rows;
-		$len = 16;
+		$len = scalar @nibble;
 	}
 
 	$attr .= sprintf ' colspan=%d', $len unless $len == 1;
@@ -151,17 +151,17 @@ for my $row (@request) {
 	my $title = $row->{set};
 	$title .= " <aside>($_)</aside>" for $row->{setnote} // ();
 	printf '<caption>%s</caption>', $title;
-	print '<col>' x 17;
+	print '<col>' x (@nibble + 1);
 	for my $section (qw{thead}) {
 		print "<$section><tr><th>↱";
 		print '<th>', $_ for @nibble;
 		print "\n";
 	}
 	print '<tbody>';
-	for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
-		printf '<tr><th>%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
+	for my $msb (0 .. ((length($row->{table}) || 256) - 1) / @nibble) {
+		printf '<tr><th>%X', ($msb + int($row->{offset} / @nibble)) * @nibble * $nibsize;
 		for my $lsb (0 .. $#nibble) {
-			my $val = ( ($msb<<4) + $lsb ) * $nibsize;
+			my $val = ( ($msb * @nibble) + $lsb ) * $nibsize;
 			if ($row->{cell}) {
 				if (ref $row->{cell} eq 'CODE') {
 					print $row->{cell}->($val);