X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4af2c4c329f1a501831734ce6e7e867bf1d26b9d..6c08f60465c441baff92074c3122fcb62457658c:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index c123506..62f6791 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -14,7 +14,7 @@ our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
 
 sub new {
 	my ($class) = @_;
-	bless { digraph => 1, unicode => 0 }, $class;
+	bless { anno => ['di', 0], style => 'di' }, $class;
 }
 
 sub glyph_info {
@@ -83,16 +83,16 @@ sub cell {
 
 		($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
-		if ($self->{digraph}) {
+		if ($self->{style} = 'di') {
 			if (defined $mnem) {
 				push @class, $class =~ /\bXz\b/ ? ('l2', 'u-prop') # unofficial
-					: ('l4', 'u-di'); # standard digraph
+					: ('l3', 'u-di'); # standard digraph
 			}
 		}
 		else {
 			my $codepoint = ord(substr $input, 0, 1);
 			if ($codepoint <= 0xFF) {
-				push @class, 'l4', 'u-lat1';  # latin1
+				push @class, 'l3', 'u-lat1';  # latin1
 			}
 			elsif ($codepoint <= 0xD7FF) {
 				push @class, 'l2', 'u-bmp';  # bmp
@@ -100,10 +100,46 @@ sub cell {
 		}
 
 		if ($input =~ /[ -~]/) {
-			push @class, 'l5', 'u-ascii'; # ascii
+			push @class, 'l4', 'u-ascii'; # ascii
 		}
 		else {
-			push @class, 'l0'; # basic unicode
+			push @class, 'l1'; # basic unicode
+		}
+	}
+
+	my $anno = '';
+	for (@{ $self->{anno} }) {
+		if (/html$/) {
+			require HTML::Entities;
+			if (my $entity = $HTML::Entities::char2entity{$cell}) {
+				$entity = substr($entity, 1, -1) unless /^&/;
+				$anno = sprintf(' <small class="digraph">%s</small>', EscapeHTML($entity));
+				last;
+			}
+		}
+		elsif ($_ eq 'xml') {
+			$anno = sprintf(' <small class="digraph">%s</small>',
+				sprintf '#%d', ord($cell)
+			);
+			last;
+		}
+		elsif ($_ eq '&xml') {
+			$anno = sprintf(' <small class="digraph">%s</small>',
+				sprintf '&amp;#%d;', ord($cell)
+			);
+			last;
+		}
+		elsif ($_ eq 'di') {
+			if (defined $mnem and length $mnem) {
+				$anno = sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem));
+				last;
+			}
+		}
+		else {
+			if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
+				$anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $cell);
+				last;
+			}
 		}
 	}
 
@@ -111,13 +147,8 @@ sub cell {
 		defined $title  ? qq{ title="$title"}  : '',
 		@class ? sprintf(' class="%s"', join ' ', @class) : '',
 		$html || '',
-		$cell eq '' ? ('&nbsp;', '') : ($cell,
-			$self->{digraph} && defined $mnem && length $mnem
-			? sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem))
-			: $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0
-				? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
-				: ''
-		),
+		$cell eq '' ? '&nbsp;' : $cell,
+		$anno,
 	);
 }
 
@@ -164,7 +195,7 @@ sub table {
 	}
 
 	return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-		$self->{digraph} || $self->{unicode} >= 0 ? ' dilabel' : '',
+		@{ $self->{anno} } ? ' dilabel' : '',
 		join '', map {"$_\n"} @rows;
 }