formatchar: highlight by unicode range if no digraphs

[sheet.git] / unicode.plp

diff --git a/unicode.plp b/unicode.plp
index fe653f9278182eeeca14209a81ad06d4f7ab924e..71499530bf12c15f9e5233d1b31314247012a36f 100644 (file)
--- a/unicode.plp
+++ b/unicode.plp
@@ -16,8 +16,11 @@ Html({
 :>
 <h1>Common Unicode</h1>
 
-<p>i^k in <a href="/vi">Vim</a>.
-Also see the <a href="/digraphs">complete digraphs table</a>.</p>
+<p>
+Glyphs are followed by
+<a href="/digraphs">digraph</a> or <a href="/charset">code point</a>,
+i^k or i^vu respectively in <a href="/vi">Vim</a>.
+</p>
 
 <div class="diinfo">
 
@@ -25,27 +28,35 @@ Also see the <a href="/digraphs">complete digraphs table</a>.</p>
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
-sub print_glyph_tables {
-       while (@_) {
-               printf '<div class="section"><h2>%s</h2>'."\n\n", shift;
-               while (ref $_[0] and $_ = shift) {
-                       print $glyphs->table($_);
-               }
-               print '</div>';
-       }
+if (exists $get{di}) {
+       $glyphs->{digraph} = defined $get{di} ? ! !$get{di} : 1;
+       $glyphs->{unicode} = 1;
+}
+if (exists $get{q}) {
+       $glyphs->{unicode} = -1;
+       $glyphs->{digraph}--;
 }
 
 our $verbose = exists $get{v};
 
-print_glyph_tables(
+$glyphs->print(
        'Popular',
        [qw{. « » . ‹ › . ‘ ’ . “ ” . „ ‚ . ‟ ‛}],
        [qw{. † ‡ • . § ¶ # . © ® ™ . ° ′ ″ . − × ÷ . ± ² √}],
        [qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }, $verbose ? () : qw{. ◄ ►}],
        [qw{. å ä ö ü ß . ā æ ø ű ſ}],
-       [qw{. ñ ç é ê è . ŋ č ų ŭ ů }],
-       [qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
+       [qw{
+               . á è õ û ç . ą ı ơ ů þ
+       }],
+       $verbose ? [qw{
+               .>Englisc   æ ð ē ȝ œ þ ƿ
+               .>Sámi      á č đ ŋ š ŧ ž
+               .>Slavic    ą ě ł ů ź ż ž
+               .>Türkçe    ç ğ ı İ ö ş ü
+               .>Esperanto ĉ ĝ ĥ ĵ ŝ ŭ
+       }] : (),
        [qw{. α β}],
+       [qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
 
        'Symbols',
        [qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
@@ -200,8 +211,8 @@ $verbose ? (
 <div class="legend">
        <table class="glyphs"><tr>
        <td class="X di-a">ascii
-       <td class="X di-d">digraph
-       <td class="X di-prop">proposed
+       <td class="X di-d"><:= $glyphs->{digraph} ? 'digraph' : 'latin1' :>
+       <td class="X di-prop"><:= $glyphs->{digraph} ? 'proposed' : 'BMP' :>
        <td class="X di-b">other unicode
        <td class="X di-rare">discouraged
        </table>