X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d7f0d5ab5464a06c0eff760183900d479dbe6728..a3f9b6de6bde0cd3f32faee7e4c982f6e7d42aaf:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index b2e4d09..c0a4cb0 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -136,7 +136,7 @@ sub cell {
 		if ($input =~ /[ -~]/) {
 			push @class, 'l5', 'u-ascii'; # ascii
 		}
-		elsif ($input =~ /^\p{in=6.0}+$/) {
+		elsif ($input =~ /^\p{in=6.0}+$/ and $input !~ /\p{Co}/) {
 			push @class, 'l2'; # in unicode 6.0
 		}
 		else {
@@ -173,8 +173,8 @@ sub cell {
 				}
 			}
 			else {
-				if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
-					$anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $cell);
+				if ($_ eq 'hex' or $input =~ /^[^a-zA-Z]$/) {
+					$anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $input);
 					last;
 				}
 			}
@@ -248,10 +248,16 @@ sub table {
 	my @colheads;
 	while ($digraphs->[0] !~ /^\./) {
 		my $cell = shift @$digraphs or last;
-		push @colheads, sprintf(
-			'<%s%s>%s',
+		if ($cell eq '>') {
+			push @colheads, '<tr>';
+			next;
+		}
+		push @colheads, join('',
+			'<',
 			$cell =~ s/^-// ? 'td' : 'th',
-			$cell =~ s/:(.*)// ? qq{ title="$1"} : '',
+			$cell =~ s/:(.*)// && qq{ title="$1"},
+			$cell =~ s/^(>+)// && ' colspan='.(length($1) + 1),
+			'>',
 			$cell eq '_' ? '&nbsp;' : $cell
 		);
 	}