X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/04d963b223ec1e49784c96a1b6b36cddf6cd29f0..e50cae0ec4af55472c2cf91951e13bed049eea94:/digraphs.plp?ds=sidebyside diff --git a/digraphs.plp b/digraphs.plp index 67d2a1a..b40eac0 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,148 +1,102 @@ -<: -use utf8; -use strict; -use warnings; -use open IO => ':utf8'; - -our $VERSION = '1.0'; - -$header{content_type} = 'text/html; charset=utf-8'; - -:> - - -
-Unofficial proposals +are available as ex commands.
<: -my $di = do 'digraphs.inc.pl'; - -sub quote { - local $_ = shift; - s/"/"/g; - s/</g; - s/>/>/g; - return $_; +my $di = do 'digraphs.inc.pl' + or die "Error loading digraphs data: ", $@ // $!; + +my @chars = ( + [qw{! " % ' ( ) * + , - . /}], + ['0'..'9'], [qw{: ; < = > ?}], + ['A'..'M'], ['N'..'Z'], + ['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 = same as rfc | any other spec | xorg only + $di->{$_} ? $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l1' + for keys %{$xorg}; + $chars2[0] = [qw( # ^ _ ` ~ )]; + @chars = @chars2; + $di = $xorg; } -my @chars = ((map {chr} ord '!' .. ord 'Z'), 'a'..'z'); -splice @chars, $_, 1, () for 2, 3-1, 5-2, 31-3; # remove character exceptions # $ & @ -my @chars2 = (@chars, '_'); # trailing character (extended set) - -print '"; - print " | $_" for @chars2; + print "<$section> | |||||
---|---|---|---|---|---|---|
â³"; + print ' | ', EscapeHTML($_) for map {@$_} @{$colchars}; + print " | \n"; } -print ' | ||||
$c1"; - for my $c2 (@chars2) { - my $mnem = $c1 . $c2; - if (not defined $di->{$mnem}) { - print ' | '; - next; +for my $c1group (@chars) { + 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 ' | ', EscapeHTML($mnem); + next; + } + my ($codepoint, $name, $prop, $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); + + $glyph = EscapeHTML($glyph); + $glyph = "$glyph" if $script =~ /\bZs\b/; + + printf "\n".' | %s', + join(' ', @class), EscapeHTML($desc), $glyph; } - my ($codepoint, $name, $prop, $script) = @{ $di->{$mnem} }; - - my $glyph = chr $codepoint; - utf8::upgrade($glyph); # prevent latin1 output - my $desc = $mnem . ($name && " ($name)"); - my @class = ('X', grep {$_} $prop, $script); - - $glyph = quote($glyph); - $glyph = "$glyph" if $prop eq 'Zs'; - - printf "\n".' | %s', - join(' ', @class), quote($desc), $glyph; + print "\n | ", EscapeHTML($c1), "\n"; } - print "\n | $c1\n"; } print " |
control - | spacing - | modifier - | spacing modifier + | space + | combining + | spacing modifier | quote | punctuation | symbol @@ -154,17 +108,18 @@ print " |
unicode - | ascii | latin1 - | private - | proposed + | ascii + | vim extension + | proposal + | not in vim |