unicode: customisable table configuration

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 30aab5ed68d853141c0bd1b844c813eaf34215e6..4668c5542dc1f52feacdfd972dd9f50755179064 100644 (file)
--- 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->{$_} }
@@ -14,7 +14,7 @@ our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
 
 sub new {
        my ($class) = @_;
-       bless { unicode => 0, anno => 'di', style => 'di' }, $class;
+       bless { anno => ['di', 0], style => 'di' }, $class;
 }
 
 sub glyph_info {
@@ -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') {
@@ -107,17 +108,50 @@ sub cell {
                }
        }
 
+       my $anno = '';
+       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;
+                       }
+                       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;
+                               }
+                       }
+               }
+       }
+
        return sprintf('<td%s%s%s>%s%s',
                defined $title  ? qq{ title="$title"}  : '',
                @class ? sprintf(' class="%s"', join ' ', @class) : '',
                $html || '',
-               $cell eq '' ? ('&nbsp;', '') : ($cell,
-                       $self->{anno} eq 'di' && 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,18 +198,20 @@ sub table {
        }
 
        return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-               $self->{anno} || $self->{unicode} >= 0 ? ' dilabel' : '',
+               @{ $self->{anno} } ? ' dilabel' : '',
                join '', map {"$_\n"} @rows;
 }
 
 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>";
        }
 }