git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
digraphs: expand intro, with links to (and from) screen and emacs
[sheet.git]
/
Shiar_Sheet
/
FormatChar.pm
diff --git
a/Shiar_Sheet/FormatChar.pm
b/Shiar_Sheet/FormatChar.pm
index 35f60765c7c394022482159c694629272b13fb2c..ee0c31065f9c7e716dafb92b38960d8af0a8b911 100644
(file)
--- a/
Shiar_Sheet/FormatChar.pm
+++ b/
Shiar_Sheet/FormatChar.pm
@@
-3,6
+3,7
@@
package Shiar_Sheet::FormatChar;
use 5.010;
use strict;
use warnings;
use 5.010;
use strict;
use warnings;
+use utf8;
use Data::Dump 'pp';
use PLP::Functions 'EscapeHTML';
use Data::Dump 'pp';
use PLP::Functions 'EscapeHTML';
@@
-51,7
+52,7
@@
sub glyphs_html {
EscapeHTML($_[0]), # cell
join(' | ', map { $_->[1] } @chars), # title
$chars[0][2], # class
EscapeHTML($_[0]), # cell
join(' | ', map { $_->[1] } @chars), # title
$chars[0][2], # class
- join(' ',
grep { defined } map { $_->[3]
} @chars), # digraph
+ join(' ',
map { $_->[3] // '…'
} @chars), # digraph
);
}
);
}
@@
-80,7
+81,7
@@
sub cell {
$input =~ s/^\\//; # escaped char
($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input);
$input =~ s/^\\//; # escaped char
($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input);
- my $codepoint = ord
(substr $input, 0, 1)
;
+ my $codepoint = ord
$input
;
if ($self->{style} eq 'univer') {
if ($input =~ /\p{age=unassigned}/) {
if ($self->{style} eq 'univer') {
if ($input =~ /\p{age=unassigned}/) {
@@
-108,32
+109,38
@@
sub cell {
}
if ($self->{style} eq 'di') {
}
if ($self->{style} eq 'di') {
- if ($class =~ /\bu-di\b/) {
- push @class, ('l3', 'u-di'); # standard digraph
+ if ($mnem =~ /…/) {
+ # incomplete representation, usually partial
+ }
+ elsif ($class =~ /\bu-di\b/) {
+ push @class, ('l4', 'u-di'); # standard digraph
}
elsif ($class =~ /\bu-prop\b/) {
}
elsif ($class =~ /\bu-prop\b/) {
- push @class, ('l
2
', 'u-prop'); # unofficial
+ push @class, ('l
3
', 'u-prop'); # unofficial
}
}
elsif ($self->{style} eq 'html') {
if (defined $entity) {
}
}
elsif ($self->{style} eq 'html') {
if (defined $entity) {
- push @class, ('l3', 'u-html');
+ push @class, (
$codepoint <= 0xFF ? 'l4' :
'l3', 'u-html');
}
}
else {
if ($codepoint <= 0xFF) {
}
}
else {
if ($codepoint <= 0xFF) {
- push @class, 'l
3
', 'u-lat1'; # latin1
+ push @class, 'l
4
', 'u-lat1'; # latin1
}
elsif ($codepoint <= 0xD7FF) {
}
elsif ($codepoint <= 0xD7FF) {
- push @class, 'l
2
', 'u-bmp'; # bmp
+ push @class, 'l
3
', 'u-bmp'; # bmp
}
}
if ($input =~ /[ -~]/) {
}
}
if ($input =~ /[ -~]/) {
- push @class, 'l4', 'u-ascii'; # ascii
+ push @class, 'l5', 'u-ascii'; # ascii
+ }
+ elsif ($input =~ /^\p{in=6.0}+$/) {
+ push @class, 'l2'; # in unicode 6.0
}
else {
}
else {
- push @class, 'l1'; #
basic
unicode
+ push @class, 'l1'; #
any
unicode
}
}}
}
}}