X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/a226a258f1c08e8dc9b2bb3003955dff3bdf5159..e4a7c6505a32ed30e872bfab2b8cbf411e7a9b13:/digraphs.plp?ds=sidebyside diff --git a/digraphs.plp b/digraphs.plp index b4d3d01..24eb8f5 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,42 +1,51 @@ -<: -use utf8; -use strict; -use warnings; -no warnings 'qw'; # to quote or not to quote, that is the question -use open IO => ':utf8'; - -our $VERSION = '1.0'; - -$header{content_type} = 'text/html; charset=utf-8'; - -:> - - -
-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'; - -sub quote { - local $_ = shift; - s/"/"/g; - s/</g; - s/>/>/g; - return $_; +my $di = do 'data/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 = ( @@ -46,53 +55,102 @@ 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 ($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 ' | ', quote($_) for map {@$_} @chars2; - print " | \n"; + print ' | ', EscapeHTML($_) for map {@$_} @{$colchars}; + say ' | '; } for my $c1group (@chars) { print ' | ||
---|---|---|---|---|---|---|
', quote($c1); - for my $c2 (map {@$_} @chars2) { + print ' | ||||||
', EscapeHTML($c1); + for my $c2 (map {@$_} @$colchars) { my $mnem = $c1 . $c2; if (not defined $di->{$mnem}) { print ' | '; next; } if (ref $di->{$mnem} ne 'ARRAY') { - printf ' | ', quote($mnem); + printf ' | ', 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 = quote($glyph); - $glyph = "$glyph" if $prop eq 'Zs'; + $glyph = EscapeHTML($glyph); + $glyph = "$glyph" if $script =~ /\bZs\b/; printf "\n".' | %s', - join(' ', @class), quote($desc), $glyph; + join(' ', @class), EscapeHTML($desc), $glyph; } - print "\n | ", quote($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 @@ -110,23 +168,12 @@ print " |
unicode - | latin1 - | ascii - | proposed + | full support + | vim extension + | vim v8.0 + | proposal + | not in vim |