X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/27571d3daf75e6f3c60044cb2788abd263403bd1..9445c538bedc82733b7b1c6eb9df7bf9cb54ed64:/digraphs.plp diff --git a/digraphs.plp b/digraphs.plp index 54097cb..6b1a5c2 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,42 +1,50 @@ <(common.inc.plp)><: -use 5.010; # state + +my $mode = ($Request // '') eq 'xorg' || exists $get{xorg}; +my $modename = $mode ? 'X.Org' : 'RFC-1345'; Html({ title => 'digraph cheat sheet', - version => 'v1.0', + version => '1.3', description => [ - "Complete table of digraph characters from RFC-1345.", + "Complete table of digraph characters from $modename.", ], keywords => [qw' digraph mnemonic compose composition pair - character char glyph table unicode vim + character char glyph table unicode vim xorg x11 x '], stylesheet => [qw'light'], - data => [qw( digraphs.inc.pl )], + data => [qw( data/digraphs.inc.pl )], }); :> -

RFC-1345 Digraphs

- -

Character mnemonics -following composition key ⎄: -i^k in Vim, -^u^\ in Emacs, -^a^v in Screen. -Also see common Unicode.

- -

Unofficial proposals -are available as ex commands.

+

<:= $modename :> Digraphs

+ +

Character mnemonics following compose key ⎄<: +say join("\n", + $mode ? ( + ' in the X Window System (Shift+AltGr by default).', + 'Differences from RFC-1345 are indicated.', + ) : (':', + 'i^k in Vim,', + '^u^\ in Emacs,', + '^a^v in Screen.', + 'Similar but different from X.Org.', + ), + 'Also see common Unicode.

', +); +say '

Unofficial proposals', + ' are available as ex commands.' if not $mode; +:> <: -my $di = do 'digraphs.inc.pl' - or die "Error loading digraphs data: ", $@ // $!; +my $di = Data('digraphs'); if (exists $get{v}) { # show characters for inverted mnemonics (vim alternatives) - $di->{ substr($_, 1, 1) . substr($_, 0, 1) } ||= - [ $di->{$_}->[0], '', 'l0 ex', '', $di->{$_}->[4] ] - for grep { ref $di->{$_} } keys %{$di}; + $di->{key}->{ substr($_, 1, 1) . substr($_, 0, 1) } ||= [ + $di->{key}->{$_}->[0], '', 'l0 ex', '', $di->{key}->{$_}->[4] + ] for grep { ref $di->{key}->{$_} } keys %{ $di->{key} }; } my @chars = ( @@ -49,13 +57,14 @@ my @chars2 = (['_'], @chars); # trailing character (extended set) my @columns = !exists $get{split} ? \@chars2 : ([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]); -if (exists $get{xorg}) { - my $xorg = do 'data/digraphs-xorg.inc.pl' - or die "Error loading Xorg data: ", $@ // $!; - $_ = [ord $_] for values %{$xorg}; +if ($mode) { + my $xorg = Data('digraphs-xorg'); + $_->[3] = undef for values %{$xorg}; # reset alias classes $xorg->{$_}->[2] = # class = compatibility - $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict - $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l2' # rfc|any|none + !$di->{key}->{$_} ? 'l2' : # free + $di->{key}->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict + $di->{key}->{$_}->[2] eq 'l4' ? 'l5' : # rfc + 'l3' # any for keys %{$xorg}; for my $cp (map {$_->[0]} values %{$xorg}) { @@ -78,17 +87,17 @@ if (exists $get{xorg}) { $chars2[0] = [qw( # ^ _ ` ~ )]; @chars = @chars2; - $di = $xorg; + $di->{key} = $xorg; } for my $colchars (@columns) { print ''; print qq'' for map {scalar @$_} @{$colchars}; -print "\n"; +say ''; for my $section (qw{thead tfoot}) { print "<$section>'; @@ -96,20 +105,22 @@ for my $c1group (@chars) { print '
↳"; print '', EscapeHTML($_) for map {@$_} @{$colchars}; - print " \n"; + say ' '; } for my $c1group (@chars) { print '
', EscapeHTML($c1); for my $c2 (map {@$_} @$colchars) { my $mnem = $c1 . $c2; - if (not defined $di->{$mnem}) { + if (not defined $di->{key}->{$mnem}) { print ''; next; } - if (ref $di->{$mnem} ne 'ARRAY') { + if (ref $di->{key}->{$mnem} ne 'ARRAY') { printf '', EscapeHTML($mnem); next; } - my ($codepoint, $name, $prop, $script, $string) = @{ $di->{$mnem} }; + my ($codepoint, $name, $support, $script, $string) = + @{ $di->{key}->{$mnem} }; my $glyph = $string || chr $codepoint; utf8::upgrade($glyph); # prevent latin1 output my $desc = $mnem . ($name && " ($name)"); - my @class = ('X', grep {$_} $prop, $script); + my @class = ('X', grep {$_} $script); + push @class, $mode ? $support : "u-$support" if $support; $glyph = EscapeHTML($glyph); $glyph = "$glyph" if $script =~ /\bZs\b/; @@ -117,14 +128,14 @@ for my $c1group (@chars) { printf "\n".'%s', join(' ', @class), EscapeHTML($desc), $glyph; } - print "\n", EscapeHTML($c1), "\n"; + say "\n", EscapeHTML($c1); } } -print "
\n"; +say ''; print '


' if exists $get{split}; } -if (exists $get{xorg}) { +if ($mode) { :>
@@ -158,13 +169,10 @@ if (exists $get{xorg}) {
chinese
- -
unicode - latin1 - ascii - vim extension - proposal - not in vim + <: + print qq(\n\t
$di->{flag}->{$_}) + for sort keys %{ $di->{flag} }; +:>