X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e51287199a48ab223d72d41a8b28ddb8b9b2818a..cbc1de6f50a19ddb875fab91fcb97ab3c65c402e:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index 3435730..68d20f0 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'unicode glyph cheat sheet',
-	version => 'v1.0',
+	version => '1.1',
 	description => [
 		"Common Unicode characters with digraph or code point, layed out for quick location.",
 		"Includes general symbols, arrows, drawing characters, and IPA letters.",
@@ -10,281 +10,161 @@ Html({
 	keywords => [qw'
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
-	stylesheet => [qw'light dark red'],
+	stylesheet => [qw'light dark mono circus red'],
+	data => [qw'unicode-table.inc.pl unicode-char.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">
 
 <:
-my $diinfo = do 'digraphs.inc.pl';
-my %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
-	sort { length $a <=> length $b } keys %$diinfo;
+use Shiar_Sheet::FormatChar;
+my $glyphs = Shiar_Sheet::FormatChar->new;
 
-sub glyph_table {
-	my ($digraphs) = @_;
-
-	my @rows;
-
-	my @colheads;
-	while ($digraphs->[0] !~ /^\./) {
-		my $cell = shift @$digraphs or last;
-		push @colheads, sprintf(
-			'<%s%s>%s',
-			$cell =~ s/^-// ? 'td' : 'th',
-			$cell =~ s/:(.*)// ? qq{ title="$1"} : '',
-			$cell eq '_' ? '&nbsp;' : $cell
-		);
-	}
-	push @rows, sprintf '<thead><tr>%s<tbody>', join '', @colheads if @colheads;
-
-	my $colspan = 1;
-	for my $cell (@$digraphs) {
-		if ($cell =~ s/^\.//) {
-			# dot indicates start of a new row
-			push @rows, '';
-			if ($cell =~ s/^>//) {
-				# header cell text follows
-				$cell =~ s/_/ /g;  # underscores may be used instead of whitespace (for qw//ability)
-				$rows[-1] .= '<th>'.($cell || '&nbsp;');
-			}
-			next;
-		}
-		elsif ($cell eq '>') {
-			# merge this cell to the next column
-			$colspan++;
-			next;
-		}
-
-		my ($code, $name);
-
-		# determine display class
-		my @class;
-		if ($cell eq '-') {
-			$cell = '';
-		}
-		elsif ($cell eq '=') {
-			push @class, 'di-invalid';
-			$cell = '';
-		}
-		else {
-			push @class, 'X';
-
-			if ($cell =~ s/^-//) {
-				push @class, 'di-rare'; # discouraged
-			}
-
-			$code = join '', map { $di{ord $_} || '' } split //, $cell;
-			$name = $diinfo->{$code}->[1];
-			length $code == 2 or undef $code;
-
-			if (defined $code) {
-				push @class, 'di-d'; # digraph
-				push @class, 'di-prop' # unofficial
-					if $diinfo->{$code}->[2] =~ /\bXz\b/;
-			}
-
-			if ($cell =~ /[ -~]/) {
-				push @class, 'di-a'; # ascii
-			}
-			else {
-				push @class, 'di-b'; # basic unicode
-			}
-		}
-
-		# add cell html
-		$rows[-1] .= sprintf('<td%s%s%s>%s%s',
-			defined $name  ? qq{ title="$name"}  : '',
-			@class ? sprintf(' class="%s"', join ' ', @class) : '',
-			$colspan > 1 && qq{ colspan="$colspan"},
-			$cell eq '' ? '&nbsp;' : EscapeHTML($cell),
-			defined $code ? sprintf(' <small class="digraph">%s</small>', EscapeHTML($code))
-				: length($cell) == 1 && $cell !~ /[a-z]/
-					? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
-					: '',
-		);
-
-		$colspan = 1;
-	}
-
-	return sprintf qq{<table class="glyphs dilabel">\n%s</table>\n},
-		join '', map {"<tr>$_\n"} @rows;
+if (exists $get{di}) {
+	$glyphs->{anno} = [ (!defined $get{di} || $get{di}) && 'di', 'hex' ];
 }
-
-sub print_glyph_tables {
-	while (@_) {
-		printf '<div class="section"><h2>%s</h2>'."\n\n", shift;
-		while (ref $_[0] and $_ = shift) {
-			print glyph_table($_);
-		}
-		print '</div>';
-	}
+if (exists $get{q}) {
+	$glyphs->{anno} = [];
+}
+if (exists $get{html}) {
+	$glyphs->{anno} = ['html', 'xml'];
+	$glyphs->{style} = 'html';
 }
 
 our $verbose = exists $get{v};
 
-print_glyph_tables(
-	'Popular',
-	[qw{. « » . ‹ › . ‘ ’ . “ ” . „ ‚ . ‟ ‛}],
-	[qw{. † ‡ • . § ¶ # . © ® ™ . ° ′ ″ . − × ÷ . ± ² √}],
-	[qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ }],
-	[qw{. å ä ö ü ß . ā æ ø ű ſ}],
-	[qw{. ñ ç é ê è . ŋ č ų ŭ ů }],
-	[qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
-	[qw{. α β}],
-
-	'Symbols',
-	[qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
-	[qw{. ♠ ♡ ♢ ♣ . ♤ ♥ ♦ ♧}],
-	[qw{. ☮ ☯ ☻ ♪ ♲ ♿ }],
-	[qw{. ✂ ✉ ☎ }], [qw{. ⚠ ☡ ☠}],
-	'Signs',
-	[qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇}],  # solar
-	[qw{. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓}],  # zodiac
-
-	'Key commands',
-	[qw{. ⇥ ⇤ . ␣ ⌫ }], # common spacing
-	[qw{. ⎀ ⇱ ⇞ . ⌦ ⇲ ⇟ }], # edit block
-	[qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }], # modifier
-	[qw{. ⎈ ⌥ ⌘ ⎄ }], [qw{. ↵ ⎋ ⎉ ⎊ }], # command
-	[qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }], # player ui
+my @config = qw(
+	Popular
+		punctuation/quoting
+			common=-5?common
+		symbols/binary?symbols/binary=-5
+		latin/sample=-1
+			?sample=2-
+			?uncommon
+		punctuation/version
+		punctuation/marks
+			spacing
+	Symbols
+		symbols/currency
+			cards=-3?cards
+			?chess
+			harvey
+			signs1
+			communic=0?communic
+			trinity=0?trinity
+			signs2
+	Signs
+			solar
+			?minorplanets
+			zodiac=0-1=3?zodiac
+	Key_commands
+		keys/spacing
+			editing
+			modifier
+			control
+			command
+			android=0
+			ps
+			?player
+	Mathematics
+		math/size
+			equal
+			set
+			logic
+	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
+			tones
+			contours
+	?Japanese
+		?japanese/hira
+			?hiraderiv
+			?kata
+			?kataderiv
+);
 
-	'Arrows',
-	[qw{. ↖ ↑ ↗ ↔ . ← - → ↕ . ↙ ↓ ↘ -}],
-	[qw{. ⇖ ⇑ ⇗ ⇔ . ⇐ - ⇒ ⇕ . ⇙ ⇓ ⇘ -}],
-	[qw{. ⬁ ⇧ ⬀ ⬄ . ⇦ - ⇨ ⇳ . ⬃ ⇩ ⬂ -}],
-	[qw{. ⬉ ⬆ ⬈ ⬌ . ⬅ - ➡ ⬍ . ⬋ ⬇ ⬊ -}],
-	[qw{. ◩ ⬒ ⬔   . ◧ □ ◨   . ⬕ ⬓ ◪  }],
-	[qw{. ◤ ▲ ◥   . ◀ ◆ ▶   . ◣ ▼ ◢  }],
-	[qw{. ◸ △ ◹   . ◁ ◇ ▷   . ◺ ▽ ◿  }],
-$verbose ? (
-	[qw{.    .  -  .    }],
-	[qw{.    .  -  .    }],
-) : (),
+splice @config, 4, 2, qw(
+		latin/vowels=-5?latin/vowels
+			 westeuro
+			?easteuro
+) if exists $get{html};
 
-	'Line drawing',
-	[qw{. ╔ ╦ ╗ ═ . ╠ ╬ ╣ ║ . ╚ ╩ ╝ - }],
-	[qw{. ╒ ╤ ╕ . ╞ ╪ ╡ . ╘ ╧ ╛ }],
-	[qw{. ╓ ╥ ╖ . ╟ ╫ ╢ . ╙ ╨ ╜ }],
-	[qw{. ┌ ┬ ┐ . ├ ┼ ┤ . └ ┴ ┘}],
-	[qw{. ┏ ┳ ┓ . ┣ ╋ ┫ . ┗ ┻ ┛}],
-	[qw{. ┍ ┯ ┑ . ┝ ┿ ┥ . ┕ ┷ ┙}],
-	[qw{. ┎ ┰ ┒ . ┠ ╂ ┨ . ┖ ┸ ┚}],
-	[qw{
-		. ╴ ─ ╌ ┄ ┈ ╶ ╾
-		. ╸ ━ ╍ ┅ ┉ ╺ ╼
-		. ╵ │ ╎ ┆ ┊ ╷ ╿
-		. ╹ ┃ ╏ ┇ ┋ ╻ ╽
-	}],
-	[qw{. ╭ ╮ . ╰ ╯ }],
-	[qw{. ╱ ╳ ╲ }],
-	# ┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃╄╅╆╇╈╉╊
+$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $Request, $get{q};
 
-	'Blocks',
-	[qw{. □ ▣ ■ . ▤ ▦ ▥ . ▧ ▩ ▨}],
-	[qw{. ░ . ▒ . ▓ }],
-	[qw{. ▘ ▀ ▝ . ▌ █ ▐ . ▖ ▄ ▗ }],
-	[qw{. ▛ ▚ ▟ . ▙ ▞ ▜ }],
-	[qw{. ▁ ▂ ▃ ▄ ▅ ▆ ▇ ▔ . ▏ ▎ ▍ ▌ ▋ ▊ ▉ ▕ }],
+my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
 
-	'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 ɶ  - -  ɑ ɒ
-	}],
+$glyphs->print(map {
+	my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
+	if (!$_) {
+		();
+	}
+	elsif (/[A-Z]/) {
+		tr/_/ /;
+		$_;
+	}
+	else {
+		state $group;
+		$group = $1 if s{^([^/]+)/}{};
+		my @select = s/=(.*)// ? split(/=/, $1) : ();
+		my $table = $tables->{$group}->{$_}
+			or die "Unknown table specified: $group/$_";
+
+		if (@select) {
+			my $rowlen;
+			for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
+				last if $table->[$rowlen] =~ /\./;
+			}
+			my @cells = map {
+				my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1;
+				$_ * $rowlen .. $end * $rowlen - 1;
+			} @select;
+			$table = [ @$table[@cells] ];
+		}
+		$table;
+	}
+} @config);
 
-$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 ヷ ヸ ヴ ヹ ヺ
-	}],
-) : (),
-);
+say "</div>\n";
 
-:></div>
+say for $glyphs->legend;
 
-<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
-	</table>
-</div>
+:>
+<script type="text/javascript" src="/clipboard.js"></script>