X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/378d119f5791fea807f36749ce9ecb5a5c60952e..3e24bf25b4f498277639d4f97e64999ebfc76a11:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index f558448..70f13e6 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -11,13 +11,17 @@ Html({
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
 	stylesheet => [qw'light dark red'],
+	data => [qw'digraphs.inc.pl'],
 });
 
 :>
 <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,43 +29,61 @@ 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{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }],
+	[qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }, $verbose ? () : qw{. ◄ ►}],
 	[qw{. å ä ö ü ß . ā æ ø ű ſ}],
-	[qw{. ñ ç é ê è . ŋ č ų ŭ ů }],
-	[qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
+	[qw{
+		. á è õ û ç . ą ı ơ ů þ
+	}],
+	$verbose ? [qw{
+		.>Englisc   æ ð ē ȝ œ þ ƿ
+		.>Sámi      á č đ ŋ š ŧ ž
+		.>Slavic    ą ě ł ů ź ż ž
+		.>Türkçe    ç ğ ı İ ö ş ü
+		.>Esperanto ĉ ĝ ĥ ĵ ŝ ŭ
+	}] : (),
 	[qw{. α β}],
+	[qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
 
 	'Symbols',
 	[qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
 	[qw{. ♠ ♡ ♢ ♣ . ♤ ♥ ♦ ♧}],
 	[qw{. ☮ ☯ ☻ ♪ ♲ ♿ }],
-	[qw{. ✂ ✉ ☎ }], [qw{. ⚠ ☡ ☠}],
+	[qw{. ✂ ✉ ℻ ☎ ☏}, $verbose ? qw{. 🔞 🔾 🔰 🔮 🕀 } : ()], # communication
+	[qw{. ✊ ✋ ✌ }, $verbose ? qw{. 🖹 🐜 👼 } : ()], # 3-way (RockPaperScissors, TerranProtossZerg)
+	[qw{. ⚠ ☡ ☠}],
 	'Signs',
 	[qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇}],  # solar
-	[qw{. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓}],  # zodiac
+	[qw{
+		. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓
+	}, !$verbose ? () : qw{
+		. 寅 卯 辰 巳 午 未 申 酉 戌 亥 子 丑
+		. 虎 兔 龍 蛇 馬 羊 猴 雞 狗 豬 鼠 牛
+		. 🐅 🐇 🐉 🐍 🐎 🐐 🐒 🐓 🐕 🐖 🐀 🐂
+	}], # zodiac
 
 	'Key commands',
 	[qw{. ⇥ ⇤ . ␣ ⌫ }], # common spacing
 	[qw{. ⎀ ⇱ ⇞ . ⌦ ⇲ ⇟ }], # edit block
 	[qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }], # modifier
 	[qw{. ⎈ ⌥ ⌘ ⎄ }], [qw{. ↵ ⎋ ⎉ ⎊ }], # command
+$verbose ? (
 	[qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }], # player ui
+) : (),
 
 	'Arrows',
 	[qw{. ↖ ↑ ↗ ↔ . ← - → ↕ . ↙ ↓ ↘ -}],
@@ -189,11 +211,13 @@ $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-b">other unicode
-	<td class="X di-rare">discouraged
+	<td class="X l5">ascii
+	<td class="X l4"><:= $glyphs->{digraph} ? 'digraph' : 'latin1' :>
+	<td class="X l2"><:= $glyphs->{digraph} ? 'proposed' : 'BMP' :>
+	<td class="X l0">other unicode
+	<td class="X ex">discouraged
 	</table>
 </div>
 
+<script type="text/javascript" src="/clipboard.js"></script>
+