From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 23 Dec 2010 20:22:26 +0000 (+0100)
Subject: unicode: include chars, further comments, fixes
X-Git-Tag: v1.5~100
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/fa8b78782cf8ce0639cab402ac0d8d3afca92891

unicode: include chars, further comments, fixes
---

diff --git a/unicode.inc.pl b/unicode.inc.pl
index c77a7ae..ddfece1 100644
--- a/unicode.inc.pl
+++ b/unicode.inc.pl
@@ -5,32 +5,31 @@ punctuation => {
 	common   => [qw{. † ‡ • . § ¶ # . © ® ™ . ° ′ ″ . − × ÷ . ± ² √}],
 	marks    => [qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
 	version  => [qw{. α β}],
-],
+},
 
 symbols => {
-	binary   => [qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }], # opposites
+	binary   => [qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ . ◄ ► }], # opposites
 	currency => [qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
 	cards    => [qw{. ♠ ♡ ♢ ♣ . ♤ ♥ ♦ ♧}],
 	signs1   => [qw{. ☮ ☯ ☻ ♪ ♲ ♿ }],
-	communication => [qw{. ✂ ✉ ℻ ☎ ☏ }],
-	-communication => [qw{. ✂ ✉ ℻ ☎ ☏ . 🔞 🔾 🔰 🔮 🕀 }],
-	trinity  => [qw{. ✊ ✋ ✌ }], # rock paper scissors
-	-trinity => [qw{. ✊ ✋ ✌ . 🖹 🐜 👼 }], # rock paper scissors, terran protoss zerg
 	signs2   => [qw{. ⚠ ☡ ☠}],
+	communic => [qw{. ✂ ✉ ℻ ☎ ☏ . 🔞 🔾 🔰 🔮 🕀 }],
+	trinity  => [qw{. ✊ ✋ ✌ . 🖹 🐜 👼 }], # rock, paper, scissors; terran, protoss, zerg
 	solar    => [qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇}],
-	zodiac   => [qw{
-		. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓
-		. 寅 卯 辰 巳 午 未 申 酉 戌 亥 子 丑
-		. 虎 兔 龍 蛇 馬 羊 猴 雞 狗 豬 鼠 牛
-		. 🐅 🐇 🐉 🐍 🐎 🐐 🐒 🐓 🐕 🐖 🐀 🐂
-	}],
+	zodiac   => [
+		qw{. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓ }, # western signs
+		qw{. 寅 卯 辰 巳 午 未 申 酉 戌 亥 子 丑 }, # chinese signs (earthly branches)
+		qw{. 虎 兔 龍 蛇 馬 羊 猴 雞 狗 豬 鼠 牛 }, # chinese names
+		qw{. 🐅 🐇 🐉 🐍 🐎 🐐 🐒 🐓 🐕 🐖 🐀 🐂 }, # chinese animals
+	],
 },
 
 keys => {
-	spacing  => [qw{. ⇥ ⇤ . ␣ ⌫ }], # tab, char
-	editing  => [qw{. ⎀ ⇱ ⇞ . ⌦ ⇲ ⇟ }], # edit block
-	modifier => [qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }],
-	command  => [qw{. ⎈ ⌥ ⌘ ⎄ }], [qw{. ↵ ⎋ ⎉ ⎊ }],
+	spacing  => [qw{. ⇥ ⇤ . ␣ ⌫ }], # (fw and back) tab, char
+	editing  => [qw{. ⎀ ⇱ ⇞ . ⌦ ⇲ ⇟ }], # ins, home, pgup; del, end, pgdn
+	modifier => [qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }], # (lock and select) shift, l3, num
+	control  => [qw{. ⎈ ⌥ ⌘ ⎄ }], # ctrl, option, cmd, compose
+	command  => [qw{. ↵ ⎋ ⎉ ⎊ }], # enter, esc, pause, break
 	player   => [qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }],
 },
 
@@ -108,7 +107,7 @@ ipa => {
 		.>Click                     ʘ  -  ǀ  ǁ  ǃ  -‼ ǂ  -  -  =  =  =
 		.>Implosive                 ɓ  ɗ̪  >  >  ɗ  -ᶑ ʄ  ɠ  ʛ  =  =  =
 	}],
-	cons2 => [qw{
+	consco => [qw{
 		- co:coarticulated .>sç ɕ .>zʝ ʑ .>ʃx ɧ .>jʷ ɥ .>hw̥ ʍ .>ɰʷ w
 	}],
 	vowels => [(
diff --git a/unicode.plp b/unicode.plp
index 10ba7c6..739e8a7 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -11,7 +11,7 @@ Html({
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
 	stylesheet => [qw'light dark mono circus red'],
-	data => [qw'digraphs.inc.pl'],
+	data => [qw'digraphs.inc.pl unicode.inc.pl'],
 });
 
 :>
@@ -26,6 +26,7 @@ i^k or i^vu respectively in <a href="/vi">Vim</a>.
 <div class="diinfo">
 
 <:
+use 5.010;
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
@@ -40,172 +41,94 @@ if (exists $get{q}) {
 
 our $verbose = exists $get{v};
 
-$glyphs->print(
-	'Popular',
-	[qw{. « » . ‹ › . ‘ ’ . “ ” . „ ‚ . ‟ ‛}],
-	[qw{. † ‡ • . § ¶ # . © ® ™ . ° ′ ″ . − × ÷ . ± ² √}],
-	[qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }, $verbose ? () : qw{. ◄ ►}],
-	[qw{. å ä ö ü ß . ā æ ø ű ſ}],
-	[qw{
-		. á è õ û ç . ą ı ơ ů þ
-	}],
-	$verbose ? [qw{
-		.>Englisc   æ ð ē ȝ œ þ ƿ
-		.>Sámi      á č đ ŋ š ŧ ž
-		.>Slavic    ą ě ł ů ź ż ž
-		.>Türkçe    ç ğ ı İ ö ş ü
-		.>Esperanto ĉ ĝ ĥ ĵ ŝ ŭ
-	}] : (),
-	[qw{. α β}],
-	[qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
-
-	'Symbols',
-	[qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
-	[qw{. ♠ ♡ ♢ ♣ . ♤ ♥ ♦ ♧}],
-	[qw{. ☮ ☯ ☻ ♪ ♲ ♿ }],
-	[qw{. ✂ ✉ ℻ ☎ ☏}, $verbose ? qw{. 🔞 🔾 🔰 🔮 🕀 } : ()], # communication
-	[qw{. ✊ ✋ ✌ }, $verbose ? qw{. 🖹 🐜 👼 } : ()], # 3-way (RockPaperScissors, TerranProtossZerg)
-	[qw{. ⚠ ☡ ☠}],
-	'Signs',
-	[qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇}],  # solar
-	[qw{
-		. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓
-	}, !$verbose ? () : qw{
-		. 寅 卯 辰 巳 午 未 申 酉 戌 亥 子 丑
-		. 虎 兔 龍 蛇 馬 羊 猴 雞 狗 豬 鼠 牛
-		. 🐅 🐇 🐉 🐍 🐎 🐐 🐒 🐓 🐕 🐖 🐀 🐂
-	}], # zodiac
-
-	'Key commands',
-	[qw{. ⇥ ⇤ . ␣ ⌫ }], # common spacing
-	[qw{. ⎀ ⇱ ⇞ . ⌦ ⇲ ⇟ }], # edit block
-	[qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }], # modifier
-	[qw{. ⎈ ⌥ ⌘ ⎄ }], [qw{. ↵ ⎋ ⎉ ⎊ }], # command
-$verbose ? (
-	[qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }], # player ui
-) : (),
-
-	'Arrows',
-	[qw{. ↖ ↑ ↗ ↔ . ← - → ↕ . ↙ ↓ ↘ -}],
-	[qw{. ⇖ ⇑ ⇗ ⇔ . ⇐ - ⇒ ⇕ . ⇙ ⇓ ⇘ -}],
-	[qw{. ⬁ ⇧ ⬀ ⬄ . ⇦ - ⇨ ⇳ . ⬃ ⇩ ⬂ -}],
-	[qw{. ⬉ ⬆ ⬈ ⬌ . ⬅ - ➡ ⬍ . ⬋ ⬇ ⬊ -}],
-	[qw{. ◩ ⬒ ⬔   . ◧ □ ◨   . ⬕ ⬓ ◪  }],
-	[qw{. ◤ ▲ ◥   . ◀ ◆ ▶   . ◣ ▼ ◢  }],
-	[qw{. ◸ △ ◹   . ◁ ◇ ▷   . ◺ ▽ ◿  }],
-$verbose ? (
-	[qw{.    .  -  .    }],
-	[qw{.    .  -  .    }],
-) : (),
-
-	'Line drawing',
-	[qw{. ╔ ╦ ╗ ═ . ╠ ╬ ╣ ║ . ╚ ╩ ╝ - }],
-	[qw{. ╒ ╤ ╕ . ╞ ╪ ╡ . ╘ ╧ ╛ }],
-	[qw{. ╓ ╥ ╖ . ╟ ╫ ╢ . ╙ ╨ ╜ }],
-	[qw{. ┌ ┬ ┐ . ├ ┼ ┤ . └ ┴ ┘}],
-	[qw{. ┏ ┳ ┓ . ┣ ╋ ┫ . ┗ ┻ ┛}],
-	[qw{. ┍ ┯ ┑ . ┝ ┿ ┥ . ┕ ┷ ┙}],
-	[qw{. ┎ ┰ ┒ . ┠ ╂ ┨ . ┖ ┸ ┚}],
-	[qw{
-		. ╴ ─ ╌ ┄ ┈ ╶ ╾
-		. ╸ ━ ╍ ┅ ┉ ╺ ╼
-		. ╵ │ ╎ ┆ ┊ ╷ ╿
-		. ╹ ┃ ╏ ┇ ┋ ╻ ╽
-	}],
-	[qw{. ╭ ╮ . ╰ ╯ }],
-	[qw{. ╱ ╳ ╲ }],
-	# ┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃╄╅╆╇╈╉╊
-
-	'Blocks',
-	[qw{. □ ▣ ■ . ▤ ▦ ▥ . ▧ ▩ ▨}],
-	[qw{. ░ . ▒ . ▓ }],
-	[qw{. ▘ ▀ ▝ . ▌ █ ▐ . ▖ ▄ ▗ }],
-	[qw{. ▛ ▚ ▟ . ▙ ▞ ▜ }],
-	[qw{. ▁ ▂ ▃ ▄ ▅ ▆ ▇ ▔ . ▏ ▎ ▍ ▌ ▋ ▊ ▉ ▕ }],
-
-	'IPA',
-	[qw{
-		- BiL:Bilabial LD:Labiodental D:Dental Alv:Alveolar PA:Postalveolar
-		  Rf:Retroflex Pal:Palatal Vel:Velar Uv:Uvular Ph:Pharyngeal
-		  EG:Epiglottal Gl:Glottal
-		.>Plosive                   p  -ȹ >  >  t  ʈ  c  k  q  =  ʡ  ʔ
-		.>Voiced_Plosive            b  -ȸ >  >  d  ɖ  ɟ  ɡ  ɢ  =  -  =
-		.>Nasal                     m  ɱ  >  >  n  ɳ  ɲ  ŋ  ɴ  =  =  =
-		.>Trill                     ʙ  -  >  >  r  -  -  =  ʀ  =  -я =
-		.>Tap/flap                  -  ⱱ  >  >  ɾ  ɽ  -  =  ɢ̆  =  -  =
-		.>Fricative                 ɸ  f  θ  s  ʃ  ʂ  ç  x  χ  ħ  ʜ  h
-		.>Voiced_fricative          β  v  ð  z  ʒ  ʐ  ʝ  ɣ  ʁ  ʕ  ʢ  ɦ
-		.>Lateral_fricative         =  =  >  >  ɬ  -  -  -  -  =  =  =
-		.>Voiced_lateral_fricative  =  =  >  >  É®  -  -  -  -  =  =  =
-		.>Approximant               -  ʋ  >  >  ɹ  ɻ  j  ɰ  -  -  -  =
-		.>Lateral_approximant       =  =  >  >  l  ɭ  ʎ  ʟ  -  =  =  =
-		.>Click                     ʘ  -  ǀ  ǁ  ǃ  -‼ ǂ  -  -  =  =  =
-		.>Implosive                 ɓ  ɗ̪  >  >  ɗ  -ᶑ ʄ  ɠ  ʛ  =  =  =
-	}],
-	[qw{
-		- co:coarticulated .>sç ɕ .>zʝ ʑ .>ʃx ɧ .>jʷ ɥ .>hw̥ ʍ .>ɰʷ w
-	}],
-	[(
-		'-',
-		map { substr($_, 0, 1).':'.$_, substr($_, 0, 1)." r:$_ rounded" }
-		qw{Front Central Back}
-	), qw{
-		.>Close      i y  ɨ ʉ  ɯ u
-		.>Near-close ɪ ʏ  - -  - ʊ
-		.>Close-mid  e ø  ɘ ɵ  ɤ o
-		.>Mid        - -  ə -  - -
-		.>Open-mid   ɛ œ  ɜ ɞ  ʌ ɔ
-		.>Near-open  æ -  ɐ -  - -
-		.>Open       a ɶ  - -  ɑ ɒ
-	}],
-
-$verbose ? (
-	'Japanese',
-	[qw{
-		  - A  I  U  E  O  _
-		.>  あ い う え お =
-		.>K か き く け こ =
-		.>S さ し す せ そ =
-		.>T た ち つ て と =
-		.>N な に ぬ ね の ん
-		.>H は ひ ふ へ ほ =
-		.>M ま み む め も =
-		.>Y や =  ゆ =  よ =
-		.>R ら り る れ ろ =
-		.>W わ -ゐ = -ゑ を =
-	}],
-	[qw{
-		  - A  I  U  E  O
-		.>G が ぎ ぐ げ ご
-		.>Z ざ じ ず ぜ ぞ
-		.>D だ ぢ づ で ど
-		.>B ば び ぶ べ ぼ
-		.>P ぱ ぴ ぷ ぺ ぽ
-	}],
-	[qw{
-		  - A  I  U  E  O  _
-		.>  ア イ ウ エ オ ー
-		.>K カ キ ク ケ コ =
-		.>S サ シ ス セ ソ =
-		.>T タ チ ツ テ ト =
-		.>N ナ ニ ヌ ネ ノ ン
-		.>H ハ ヒ フ ヘ ホ =
-		.>M マ ミ ム メ モ =
-		.>Y ヤ -  ユ -  ヨ =
-		.>R ラ リ ル レ ロ =
-		.>W ワ ヰ -  ヱ ヲ =
-	}],
-	[qw{
-		  - A  I  U  E  O
-		.>G ガ ギ グ ゲ ゴ
-		.>Z ザ ジ ズ ゼ ゾ
-		.>D ダ ヂ ヅ デ ド
-		.>B バ ビ ブ ベ ボ
-		.>P パ ピ プ ペ ポ
-		.>V ヷ ヸ ヴ ヹ ヺ
-	}],
-) : (),
-);
+my $tables = do 'unicode.inc.pl' or die $@ || $!;
+
+$glyphs->print(map {
+	my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
+	if (/[A-Z]/) {
+		$_;
+	}
+	else {
+		state $group;
+		$group = $1 if s{^([^/]+)/}{};
+		if (s/=(.*)//) {
+			my @select = split /=/, $1;
+			my $table = $tables->{$group}->{$_};
+			my $rowlen;
+			for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
+				last if $table->[$rowlen] =~ /\./;
+			}
+			my @cells = map { $_*$rowlen .. ($_+1)*$rowlen - 1 } @select;
+			[ @$table[@cells] ];
+		}
+		else {
+			$tables->{$group}->{$_};
+		}
+	}
+} qw{
+	Popular
+		punctuation/quoting
+			common
+		symbols/binary?symbols/binary=0
+		latin/sample=0=1
+			sample=2=3
+			?uncommon
+		punctuation/version
+		punctuation/marks
+	Symbols
+		symbols/currency
+			cards
+			signs1
+			communic=0?communic
+			trinity=0?trinity
+			signs2
+	Signs
+			solar
+			zodiac=0?zodiac
+	Key commands
+		keys/spacing
+			editing
+			modifier
+			control
+			command
+			?player
+	Arrows
+		arrows/single
+			double
+			white
+			black
+			block
+			blacktri
+			whitetri
+			?-large
+			?-heavy
+	Line drawing
+		lines/double
+			doubleh
+			doublev
+			single
+			heavy
+			heavyh
+			heavyv
+			straight
+			curved
+			diagonal
+	Blocks
+		block/square
+			shades
+			fill4
+			fill4i
+			fill8
+	IPA
+		ipa/cons
+			consco
+			vowels
+	?Japanese
+		?japanese/hira
+			?hiraderiv
+			?kata
+			?kataderiv
+});
 
 :></div>