git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
font: save queried character numbers in include
[sheet.git]
/
Shiar_Sheet
/
FormatChar.pm
diff --git
a/Shiar_Sheet/FormatChar.pm
b/Shiar_Sheet/FormatChar.pm
index f22f42bebd517cc1ffbd5e43a0d86b6ccd7595ad..f676ead1da9cb2a1f7951545f532a39bf513f86a 100644
(file)
--- 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 ($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)";
my $cell = EscapeHTML($string || $char);
my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
@@
-37,7
+37,7
@@
sub glyph_html {
$cell = "<span>$cell</span>" if $class =~ /\bZs\b/;
$cell = ' ' if $cell eq '';
$cell = "<span>$cell</span>" 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 {
}
sub glyphs_html {
@@
-61,7
+61,7
@@
sub glyph_cell {
sub cell {
my ($self, $input, $html) = @_;
sub cell {
my ($self, $input, $html) = @_;
- my (@class, $title, $cell, $mnem);
+ my (@class, $title, $cell, $mnem
, $entity
);
if ($input eq '-') {
$cell = '';
if ($input eq '-') {
$cell = '';
@@
-78,9
+78,9
@@
sub cell {
}
$input =~ s/^\\//; # escaped char
}
$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
}
if ($class =~ /\bu-di\b/) {
push @class, ('l3', 'u-di'); # standard digraph
}
@@
-88,6
+88,11
@@
sub cell {
push @class, ('l2', 'u-prop'); # unofficial
}
}
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) {
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$/) {
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(' <small class="digraph">%s</small>', EscapeHTML($entity));
last;
}
$anno = sprintf(' <small class="digraph">%s</small>', EscapeHTML($entity));
last;
}