X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2876b76b7b654f43dd1668c4a963a049450ed66c..v1.10-46-g4c43bcbed6:/Shiar_Sheet/FormatChar.pm?ds=sidebyside
diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ee0c310..c93a48a 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -8,9 +8,9 @@ use utf8;
use Data::Dump 'pp';
use PLP::Functions 'EscapeHTML';
-our $VERSION = '1.06';
+our $VERSION = '1.08';
-our $uc = do 'unicode-char.inc.pl';
+our $uc = do 'data/unicode-char.inc.pl';
sub new {
my ($class) = @_;
@@ -31,15 +31,15 @@ sub glyph_html {
my ($self, $char) = @_;
my $codepoint = ord $char;
my $info = $self->glyph_info($codepoint);
- my ($class, $name, $mnem, $html, $string) = @$info;
+ my ($class, $name, $mnem, $entity, $string) = @$info;
my $cell = EscapeHTML($string || $char);
- my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
+ my $title = sprintf 'U+%04X%s', $codepoint, !!$name && " ($name)";
- $cell = "$cell" if $class =~ /\bZs\b/;
+ $cell = "$cell" if $class and $class =~ /\bZs\b/;
$cell = ' ' if $cell eq '';
- return ($cell, EscapeHTML($title), "X $class", $mnem, $html);
+ return ($cell, EscapeHTML($title), !!$class && "X $class", $mnem, $entity);
}
sub glyphs_html {
@@ -86,7 +86,7 @@ sub cell {
if ($self->{style} eq 'univer') {
if ($input =~ /\p{age=unassigned}/) {
# check include for assignments after unicode 6.0 (perl v5.14)
- state $agemap = do 'unicode-age.inc.pl';
+ state $agemap = do 'data/unicode-age.inc.pl';
my $version = $agemap->{$codepoint};
push @class, $version ? 'l2' : 'l1';
}
@@ -109,7 +109,7 @@ sub cell {
}
if ($self->{style} eq 'di') {
- if ($mnem =~ /â¦/) {
+ if ($mnem and $mnem =~ /â¦/) {
# incomplete representation, usually partial
}
elsif ($class =~ /\bu-di\b/) {
@@ -136,7 +136,7 @@ sub cell {
if ($input =~ /[ -~]/) {
push @class, 'l5', 'u-ascii'; # ascii
}
- elsif ($input =~ /^\p{in=6.0}+$/) {
+ elsif ($input =~ /^\p{in=6.0}+$/ and $input !~ /\p{Co}/) {
push @class, 'l2'; # in unicode 6.0
}
else {
@@ -173,50 +173,39 @@ sub cell {
}
}
else {
- if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
- $anno = sprintf(' %04X', 'value', ord $cell);
+ if ($_ eq 'hex' or $input =~ /^[^a-zA-Z]$/) {
+ $anno = sprintf(' %04X', 'value', ord $input);
last;
}
}
}
}
- return sprintf('
%s%s',
- defined $title ? qq{ title="$title"} : '',
- @class ? sprintf(' class="%s"', join ' ', @class) : '',
- $html || '',
+ return sprintf('<%s>%s%s',
+ join(' ', 'td',
+ defined $title ? qq{title="$title"} : (),
+ @class ? sprintf('class="%s"', join ' ', @class) : (),
+ $html || (),
+ ),
$cell eq '' ? ' ' : $cell,
$anno,
);
}
-sub table {
- my ($self, $digraphs) = @_;
-
- my @rows;
-
- my @colheads;
- while ($digraphs->[0] !~ /^\./) {
- my $cell = shift @$digraphs or last;
- push @colheads, sprintf(
- '<%s%s>%s',
- $cell =~ s/^-// ? 'td' : 'th',
- $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
- $cell eq '_' ? ' ' : $cell
- );
- }
- push @rows, sprintf '%s | ', join '', @colheads if @colheads;
+sub row {
+ my ($self, $cells) = @_;
+ my @html;
my $colspan = 1;
- for my $cell (@$digraphs) {
+ for my $cell (@{$cells}) {
if ($cell =~ s/^\.//) {
# dot indicates start of a new row
- push @rows, '';
+ push @html, '
';
if ($cell =~ s/^>//) {
# header cell text follows
$cell =~ s/_/ /g; # underscores may be used instead of whitespace (for qw//ability)
my $class = $cell =~ s/^-// && ' class="ex"';
- $rows[-1] .= "".($cell || ' ');
+ $html[-1] .= " | ".($cell || ' ');
}
next;
}
@@ -225,17 +214,57 @@ sub table {
$colspan++;
next;
}
+ elsif ($cell eq '>-') {
+ $html[-1] .= ' | ';
+ next;
+ }
+ elsif ($cell =~ m/^) {
+ $html[-1] .= ' | '.$cell;
+ next;
+ }
- $rows[-1] .= $self->cell($cell,
- $colspan > 1 && qq{ colspan="$colspan"},
+ $html[-1] .= $self->cell($cell,
+ $colspan > 1 && qq{colspan="$colspan"},
);
$colspan = 1;
}
- return sprintf qq{\n},
- @{ $self->{anno} } ? ' dilabel' : '',
- join '', map {"$_\n"} @rows;
+ return @html;
+}
+
+sub tabletag {
+ my ($self) = @_;
+ my $class = 'glyphs';
+ $class .= ' dilabel' if @{ $self->{anno} };
+ return sprintf '', $class;
+}
+
+sub table {
+ my ($self, $digraphs) = @_;
+
+ my @rows;
+
+ my @colheads;
+ while ($digraphs->[0] !~ /^\./) {
+ my $cell = shift @$digraphs or last;
+ if ($cell eq '>') {
+ push @colheads, '';
+ next;
+ }
+ push @colheads, join('',
+ '<',
+ $cell =~ s/^-// ? 'td' : 'th',
+ $cell =~ s/:(.*)// && qq{ title="$1"},
+ $cell =~ s/^(>+)// && ' colspan='.(length($1) + 1),
+ '>',
+ $cell eq '_' ? ' ' : $cell
+ );
+ }
+ push @rows, sprintf '%s ', join '', @colheads if @colheads;
+ push @rows, $self->row($digraphs);
+
+ return join '', map {"$_\n"} $self->tabletag, @rows, ' ';
}
sub print {
@@ -251,5 +280,30 @@ sub print {
}
}
+sub legend {
+ my $self = shift;
+ my @classes = $self->{style} eq 'univer' ? (
+ [l5 => 'unicode 1.1'],
+ [l4 => '20th century'],
+ [l3 => 'in 6.0 (2010)'],
+ [l2 => 'recent assignments'],
+ [l1 => 'proposed'],
+ [ex => 'irregular'],
+ ) : (
+ [l5 => 'ascii'],
+ [l4 => $self->{style} eq 'di' ? 'digraph' : 'latin1'],
+ [l3 => $self->{style} eq 'di' ? 'proposed' : 'HTML4'],
+ [l2 => 'unicode â¤6.0'],
+ [l1 => 'other unicode'],
+ [ex => 'discouraged'],
+ );
+
+ return (
+ '',
+ (map { sprintf '%s', @{$_} } @classes),
+ ' |
',
+ );
+}
+
1;
|