X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f2e965b21a4be2aea69d887f619481e04f3ca58a..9215b9563a9ec4860e944a1e9d5a1145c243dfa7:/Shiar_Sheet/FormatChar.pm?ds=sidebyside
diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index f22f42b..f676ead 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -29,7 +29,7 @@ sub glyph_html {
my ($self, $char) = @_;
my $codepoint = ord $char;
my $info = $self->glyph_info($codepoint);
- my ($class, $name, $mnem, $string) = @$info;
+ my ($class, $name, $mnem, $html, $string) = @$info;
my $cell = EscapeHTML($string || $char);
my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
@@ -37,7 +37,7 @@ sub glyph_html {
$cell = "$cell" if $class =~ /\bZs\b/;
$cell = ' ' if $cell eq '';
- return ($cell, EscapeHTML($title), "X $class", $mnem);
+ return ($cell, EscapeHTML($title), "X $class", $mnem, $html);
}
sub glyphs_html {
@@ -61,7 +61,7 @@ sub glyph_cell {
sub cell {
my ($self, $input, $html) = @_;
- my (@class, $title, $cell, $mnem);
+ my (@class, $title, $cell, $mnem, $entity);
if ($input eq '-') {
$cell = '';
@@ -78,9 +78,9 @@ sub cell {
}
$input =~ s/^\\//; # escaped char
- ($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
+ ($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input);
- if ($self->{style} = 'di') {
+ if ($self->{style} eq 'di') {
if ($class =~ /\bu-di\b/) {
push @class, ('l3', 'u-di'); # standard digraph
}
@@ -88,6 +88,11 @@ sub cell {
push @class, ('l2', 'u-prop'); # unofficial
}
}
+ elsif ($self->{style} eq 'html') {
+ if (defined $entity) {
+ push @class, ('l3', 'u-html');
+ }
+ }
else {
my $codepoint = ord(substr $input, 0, 1);
if ($codepoint <= 0xFF) {
@@ -110,9 +115,8 @@ sub cell {
if ($cell ne '') {
for (@{ $self->{anno} }) {
if (/html$/) {
- require HTML::Entities;
- if (my $entity = $HTML::Entities::char2entity{$cell}) {
- $entity = substr($entity, 1, -1) unless /^&/;
+ if (defined $entity) {
+ $entity = "&$entity;" if /^&/;
$anno = sprintf(' %s', EscapeHTML($entity));
last;
}