X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dcf2735abfb4761a45521b5fcfd2c0c61d7da4e9..f00c1e5c4de7325c9d5d851a61355fe8638cca95:/digraphs.plp diff --git a/digraphs.plp b/digraphs.plp index 3f2d1bf..4c45044 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,13 +1,15 @@ <(common.inc.plp)><: +use 5.010; # state Html({ title => 'digraph cheat sheet', - version => 'v1.0', + version => 'v1.1', description => [ "Complete table of digraph characters from RFC-1345.", ], keywords => [qw' - digraph compose character char glyph table unicode vim + digraph mnemonic compose composition pair + character char glyph table unicode vim '], stylesheet => [qw'light'], data => [qw( digraphs.inc.pl )], @@ -16,14 +18,26 @@ Html({ :>

RFC-1345 Digraphs

-

i^k in Vim. -Also see common digraphs.

+

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

-

Unofficial proposals +

Unofficial proposals are available as ex commands.

<: -my $di = do 'digraphs.inc.pl'; +my $di = do 'digraphs.inc.pl' + or die "Error loading digraphs data: ", $@ // $!; + +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}; +} my @chars = ( [qw{! " % ' ( ) * + , - . /}], @@ -32,20 +46,55 @@ my @chars = ( ['a'..'m'], ['n'..'z'], ); 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}; + $xorg->{$_}->[2] = # class = compatibility + $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict + $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l2' # rfc|any|none + for keys %{$xorg}; + + for my $cp (map {$_->[0]} values %{$xorg}) { + next if (state $seen = {})->{$cp}++; # List::MoreUtils::uniq + + # find multiple equivalent mnemonics + my @equiv = grep {$cp eq $_->[0]} + map {$xorg->{$_}} sort keys %{$xorg}; # values ordered by mnem. + + # search for the most compatible match + my ($compat) = sort { + $equiv[$b]->[2] cmp $equiv[$a]->[2] # highest level + || $b <=> $a # fallback to last mnemonic + } 0 .. $#equiv; + + # reclassify all but one as level 0 (omitted) + splice @equiv, $compat // -1, 1, (); + $_->[2] = 'l0 ex' for @equiv; + } + $chars2[0] = [qw( # ^ _ ` ~ )]; + @chars = @chars2; + $di = $xorg; +} + +for my $colchars (@columns) { print ''; -print qq'' for map {scalar @$_} @chars2; +print qq'' for map {scalar @$_} @{$colchars}; print "\n"; for my $section (qw{thead tfoot}) { print "<$section>'; for my $c1 (@$c1group) { print '
↳"; - print '', EscapeHTML($_) for map {@$_} @chars2; + print '', EscapeHTML($_) for map {@$_} @{$colchars}; print " \n"; } for my $c1group (@chars) { print '
', EscapeHTML($c1); - for my $c2 (map {@$_} @chars2) { + for my $c2 (map {@$_} @$colchars) { my $mnem = $c1 . $c2; if (not defined $di->{$mnem}) { print ''; @@ -63,7 +112,7 @@ for my $c1group (@chars) { my @class = ('X', grep {$_} $prop, $script); $glyph = EscapeHTML($glyph); - $glyph = "$glyph" if $prop eq 'Zs'; + $glyph = "$glyph" if $script =~ /\bZs\b/; printf "\n".'%s', join(' ', @class), EscapeHTML($desc), $glyph; @@ -72,13 +121,27 @@ for my $c1group (@chars) { } } print "
\n"; +print '
' if exists $get{split}; +} + +if (exists $get{xorg}) { :> +
+ +
matching RFC-1345 + matching proposal + unique to Xorg + conflict + duplicate +
+
+<: } else { :>
control - spacing - modifier - spacing modifier + space + combining + spacing modifier quote punctuation symbol @@ -99,7 +162,10 @@ print "
\n"; unicode latin1 ascii - proposed + vim extension + proposal + not in vim
+<: }