X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/04d963b223ec1e49784c96a1b6b36cddf6cd29f0..e1497cc49fa909c193ec5b165fc7445305be09b5:/digraphs.plp diff --git a/digraphs.plp b/digraphs.plp index 67d2a1a..ab04efd 100644 --- a/digraphs.plp +++ b/digraphs.plp @@ -15,77 +15,7 @@ $header{content_type} = 'text/html; charset=utf-8'; digraph cheat sheet - + @@ -102,38 +32,50 @@ sub quote { return $_; } -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 ''; +my @chars = ( + [qw{! " % ' ( ) * + , - . /}], + ['0'..'9'], [qw{: ; < = > ?}], + ['A'..'M'], ['N'..'Z'], + ['a'..'m'], ['n'..'z'], +); +my @chars2 = (@chars, ['_']); # trailing character (extended set) + +print '
'; +print qq'' for map {scalar @$_} @chars2; +print "\n"; for my $section (qw{thead tfoot}) { print "<$section>'; -for my $c1 (@chars) { - print "'; + for my $c1 (@$c1group) { + print "
 "; - print "$_" for @chars2; + print "$_" for map {@$_} @chars2; } -print '
$c1"; - for my $c2 (@chars2) { - my $mnem = $c1 . $c2; - if (not defined $di->{$mnem}) { - print ''; - next; +for my $c1group (@chars) { + print '
$c1"; + for my $c2 (map {@$_} @chars2) { + my $mnem = $c1 . $c2; + if (not defined $di->{$mnem}) { + print ''; + next; + } + if (ref $di->{$mnem} ne 'ARRAY') { + printf '', quote($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 = quote($glyph); + $glyph = "$glyph" if $prop eq 'Zs'; + + printf "\n".'%s', + join(' ', @class), quote($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$c1\n"; } - print "\n$c1\n"; } print "
\n"; :> @@ -154,17 +96,30 @@ print "\n"; latin hebrew arabic + korean japanese chinese
unicode - ascii latin1 + ascii private proposed
+ +