X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f58c07717bb2e77d1f5010a23f4986ec85ff4f7a..880f11929c6cbc978df62cd1f7d218d901714d3a:/unicode.plp?ds=inline
diff --git a/unicode.plp b/unicode.plp
index 33de0fb..f558448 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -22,105 +22,14 @@ Also see the complete digraphs table.
<:
-my $diinfo = do 'digraphs.inc.pl';
-my %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
- sort { length $a <=> length $b } keys %$diinfo;
-
-sub glyph_table {
- my ($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;
-
- my $colspan = 1;
- for my $cell (@$digraphs) {
- if ($cell =~ s/^\.//) {
- # dot indicates start of a new row
- push @rows, '';
- if ($cell =~ s/^>//) {
- # header cell text follows
- $cell =~ s/_/ /g; # underscores may be used instead of whitespace (for qw//ability)
- $rows[-1] .= ''.($cell || ' ');
- }
- next;
- }
- elsif ($cell eq '>') {
- # merge this cell to the next column
- $colspan++;
- next;
- }
-
- my ($code, $name);
-
- # determine display class
- my @class;
- if ($cell eq '-') {
- $cell = '';
- }
- elsif ($cell eq '=') {
- push @class, 'di-invalid';
- $cell = '';
- }
- else {
- push @class, 'X';
-
- if ($cell =~ s/^-//) {
- push @class, 'di-rare'; # discouraged
- }
-
- $code = join '', map { $di{ord $_} || '' } split //, $cell;
- $name = $diinfo->{$code}->[1];
- length $code == 2 or undef $code;
-
- if (defined $code) {
- push @class, 'di-d'; # digraph
- push @class, 'di-prop' # unofficial
- if $diinfo->{$code}->[2] =~ /\bXz\b/;
- }
-
- if ($cell =~ /[ -~]/) {
- push @class, 'di-a'; # ascii
- }
- else {
- push @class, 'di-b'; # basic unicode
- }
- }
-
- # add cell html
- $rows[-1] .= sprintf(' | %s%s',
- defined $name ? qq{ title="$name"} : '',
- @class ? sprintf(' class="%s"', join ' ', @class) : '',
- $colspan > 1 && qq{ colspan="$colspan"},
- $cell eq '' ? ' ' : EscapeHTML($cell),
- defined $code ? sprintf(' %s', EscapeHTML($code))
- : length($cell) == 1 && $cell !~ /[a-z]/
- ? sprintf(' %04X', 'value', ord $cell)
- : '',
- );
-
- $colspan = 1;
- }
-
- return sprintf qq{\n},
- join '', map {" | $_\n"} @rows;
-}
+use Shiar_Sheet::FormatChar;
+my $glyphs = Shiar_Sheet::FormatChar->new;
sub print_glyph_tables {
while (@_) {
printf '%s
'."\n\n", shift;
while (ref $_[0] and $_ = shift) {
- print glyph_table($_);
+ print $glyphs->table($_);
}
print '';
}
@@ -134,8 +43,9 @@ print_glyph_tables(
[qw{. â ⡠⢠. § ¶ # . © ® ⢠. ° â² â³ . â à ÷ . ± ² â}],
[qw{. â â . â â . ⺠⹠. â â . â â }],
[qw{. Ã¥ ä ö ü à . Ä Ã¦ ø ű Å¿}],
- [qw{. ¿ ç ñ é ê è}],
- [qw{. α β}], [qw{. ×}],
+ [qw{. ñ ç é ê è . Å Ä Å³ Šů }],
+ [qw{. ¿ ⦠ã â â . ⽠· â» â â }],
+ [qw{. α β}],
'Symbols',
[qw{. ¤ ¢ ⥠⬠£ ⨠$ Â¥ . ฿ â« â ⦠Ⱡ⮠⩠âª}],
@@ -211,7 +121,7 @@ $verbose ? (
.>Implosive É É̪ > > É -á¶ Ê É Ê = = =
}],
[qw{
- co . É . Ê . ɧ . É¥ . Ê . w
+ - co:coarticulated .>sç É .>zÊ Ê .>Êx ɧ .>jÊ· É¥ .>hwÌ¥ Ê .>É°Ê· w
}],
[(
'-',