X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a748ed6eb94a8cb8b7cf09ef9f87104e8f371f82..77ac3d52d89913a79cca834d882c54a58c15a488:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 839144f..c93a48a 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -10,7 +10,7 @@ use PLP::Functions 'EscapeHTML';
 
 our $VERSION = '1.08';
 
-our $uc = do 'unicode-char.inc.pl';
+our $uc = do 'data/unicode-char.inc.pl';
 
 sub new {
 	my ($class) = @_;
@@ -86,7 +86,7 @@ sub cell {
 		if ($self->{style} eq 'univer') {
 			if ($input =~ /\p{age=unassigned}/) {
 				# check include for assignments after unicode 6.0 (perl v5.14)
-				state $agemap = do 'unicode-age.inc.pl';
+				state $agemap = do 'data/unicode-age.inc.pl';
 				my $version = $agemap->{$codepoint};
 				push @class, $version ? 'l2' : 'l1';
 			}
@@ -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
 		);
 	}
@@ -275,13 +281,21 @@ sub print {
 }
 
 sub legend {
-	my @classes = (
+	my $self = shift;
+	my @classes = $self->{style} eq 'univer' ? (
 		[l5 => 'unicode 1.1'],
 		[l4 => '20th century'],
 		[l3 => 'in 6.0 (2010)'],
 		[l2 => 'recent assignments'],
 		[l1 => 'proposed'],
 		[ex => 'irregular'],
+	) : (
+		[l5 => 'ascii'],
+		[l4 => $self->{style} eq 'di' ? 'digraph' : 'latin1'],
+		[l3 => $self->{style} eq 'di' ? 'proposed' : 'HTML4'],
+		[l2 => 'unicode ≤6.0'],
+		[l1 => 'other unicode'],
+		[ex => 'discouraged'],
 	);
 
 	return (