X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/1d37e00ff50c4cee3f23749febcfe6e33e1f608a..3f38a7192491a73a1527179cdd68218f023aed61:/digraphs.plp?ds=sidebyside diff --git a/digraphs.plp b/digraphs.plp index fbe8a5d..65d2a3b 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -1,48 +1,39 @@ -<: -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 = 'v1.0'; - -$header{content_type} = 'text/html; charset=utf-8'; - -:> - - -
-i^k in Vim. -Also see common digraphs.
- -Unofficial proposals -are available as ex commands.
+<(common.inc.plp)><: + +my $mode = $Request || 'vim'; +my $include = 'digraphs' . ($mode ne 'vim' && "-$mode"); +my $cmp = exists $get{cmp} ? ($get{cmp} // 1) : !!$Request; + +my $di = eval { Data($include) } || {}; +warn "error in $include: ", @{$@} if ref $@; + +Html({ + title => "$mode digraph cheat sheet", + version => '1.5', + description => $di->{description} // [ + "Complete table of digraph characters from", + ($di->{title} // $mode) . ".", + ], + keywords => [@{ $di->{keywords} // [] }, qw' + digraph mnemonic compose composition pair + character char glyph table unicode vim + '], + data => ["data/$include.json"], +}); + +%{$di} or Abort( + "Requested digraphs$modenot available", + '404 request not found', +); -<: -my $di = do 'digraphs.inc.pl'; +say "
$_
" for $di->{intro} // (); -sub quote { - local $_ = shift; - s/"/"/g; - s/</g; - s/>/>/g; - return $_; +if (exists $get{v}) { + # show characters for inverted mnemonics (vim alternatives) + $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 = ( @@ -52,53 +43,68 @@ 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 eq 'xorg') { + #TODO determine character usage from declared keys + $chars2[0] = [qw( # ^ _ ` ~ )]; + @chars = @chars2; +} + +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}) { + if (not defined $di->{key}->{$mnem}) { print ' | '; next; } - if (ref $di->{$mnem} ne 'ARRAY') { - printf ' | ', quote($mnem); + 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; + my $glyph = $string || !!$codepoint && 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, $cmp ? $support : + $di->{flagclass}->{$support} // "u-$support" if $support; - $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 " |
control - | spacing - | modifier - | spacing modifier + | space + | combining + | spacing modifier | quote | punctuation | symbol @@ -114,21 +120,11 @@ print " |
unicode - | latin1 - | ascii - | proposed
+<: } :>
+
|