X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/28156dcda1b6d8d52bf3f2a9c0086f944400949b..36266207701530f9b615f5b06b86f29b1178fa34:/digraphs.plp diff --git a/digraphs.plp b/digraphs.plp index 3073f9a..44f93e6 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,29 +1,52 @@ <(common.inc.plp)><: +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.2', description => [ - "Complete table of digraph characters from RFC-1345.", + "Complete table of digraph characters from $modename.", ], keywords => [qw' - digraph compose character char glyph table unicode vim + digraph mnemonic compose composition pair + character char glyph table unicode vim xorg x11 x '], stylesheet => [qw'light'], data => [qw( digraphs.inc.pl )], }); :> -
i^k in Vim. -Also see common digraphs.
+Unofficial proposals -are available as ex commands.
+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'; +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{! " % ' ( ) * + , - . /}], @@ -35,14 +58,46 @@ my @chars2 = (['_'], @chars); # trailing character (extended set) my @columns = !exists $get{split} ? \@chars2 : ([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]); +if ($mode) { + 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 ' | ', EscapeHTML($_) for map {@$_} @{$colchars}; - print " | \n"; + say ' | '; } for my $c1group (@chars) { print ' | ', EscapeHTML($mnem); next; } - my ($codepoint, $name, $prop, $script, $string) = @{ $di->{$mnem} }; + my ($codepoint, $name, $support, $script, $string) = @{ $di->{$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 {$_} $support && "u-$support", $script); $glyph = EscapeHTML($glyph); - $glyph = "$glyph" if $prop =~ /\bZs\b/; + $glyph = "$glyph" if $script =~ /\bZs\b/; printf "\n".' | %s', join(' ', @class), EscapeHTML($desc), $glyph; } - print "\n | ", EscapeHTML($c1), "\n"; + say "\n | ", EscapeHTML($c1); } } -print " |
---|
matching RFC-1345 + | matching proposal + | unique to Xorg + | conflict + | duplicate + |
control - | spacing - | modifier - | spacing modifier + | space + | combining + | spacing modifier | quote | punctuation | symbol
@@ -101,12 +168,12 @@ print ' ' if exists $get{split}; |
unicode - | latin1 - | ascii - | vim extension - | proposal - | not in vim + | full support + | vim extension + | vim v8.0 + | proposal + | not in vim |