X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9cabbcb99510ce7c9256d085d1c9de6c0b5fc8ce..6ae2e63f9d7f8944b507b7396686a733c6422739:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 647280e..4668c55 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -6,7 +6,7 @@ use warnings;
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -81,6 +81,7 @@ sub cell {
 			push @class, 'ex'; # discouraged
 		}
 
+		$input =~ s/^\\//;  # escaped char
 		($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
 		if ($self->{style} = 'di') {
@@ -108,18 +109,40 @@ sub cell {
 	}
 
 	my $anno = '';
-	for (@{ $self->{anno} }) {
-		if ($_ eq 'di') {
-			if (defined $mnem and length $mnem) {
-				$anno = sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem));
+	if ($cell ne '') {
+		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;
 			}
-		}
-		else {
-			if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
-				$anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $cell);
+			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;
+				}
+			}
 		}
 	}
 
@@ -182,11 +205,13 @@ sub table {
 sub print {
 	my $self = shift;
 	while (@_) {
-		printf '<div class="section"><h2>%s</h2>'."\n\n", shift;
+		print '<div class="section">';
+		printf '<h2>%s</h2>', shift unless ref $_[0];
+		print "\n\n";
 		while (ref $_[0] and $_ = shift) {
 			print $self->table($_);
 		}
-		print '</div>';
+		print "\n</div>";
 	}
 }