X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e243ba6955889ecb639cd547e1420520527b9d3e..5eb91cbedd5d8014061c5a78e4d205d5a782ebd0:/writing-latn.inc.pl

diff --git a/writing-latn.inc.pl b/writing-latn.inc.pl
index c7ed2dd..babdb40 100644
--- a/writing-latn.inc.pl
+++ b/writing-latn.inc.pl
@@ -1,3 +1,4 @@
+use 5.014;
 use utf8;
 use List::Util qw( pairs );
 
@@ -16,7 +17,7 @@ my $U = 0;  # optional unicode alternatives
 (
 'Uppercase' => [qw{ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z }],
 'Lowercase' => [qw{ a b c d e f g h i j k l m n o p q r s t u v w x y z }],
-'Sütterlin' => [qw{ a b c d e f g h i j k l m n o p q r ſ s t u v w x y z }],
+'Sütterlin' => [qw{ a b c d e f g h i j k l m n o p q r ſ s t u v w x y z }],
 'Old Roman Cursive' => [
 	map { m/^(-?)(\w.*)/ ? $1.'<svg width="20" height="20" viewBox="0 0 12 20"><path d="'.$2.'"/></svg>' : $_ }
 	"m2,4 c1,2 8,9 8,9 M2,15 6,9",
@@ -48,18 +49,20 @@ my $U = 0;  # optional unicode alternatives
 ],
 'Sutton <abbr title="American Sign Lanugage">ASL</abbr>' => [
 	# American manual alphabet in Sutton (U+1D800+) notation
-	map { pack 'W*', map { hex "1D$_" } unpack '(A3)*', $_ } qw{
+	map { !!$_ && pack 'W*', map { hex "1D$_" } unpack '(A3)*', $_ } qw{
 	8F7a9c    847a9c    86Da9c    801a9c    84Aa9c
 	8CEa9c    8F0       815aa2    892a9c    892a9c9A2aac
 	840a9c    8DCa9c    88Da9c
 	819a9c    876a9c    840a9caA1 8F0a9caA1 81Aa9c
 	903a9c    8FBa9c    815a9c    80Ea9c    887a9c
 	806a9c    89Aa9c    800a9c945aaa
+	0         965aa6
 }],
 '<abbr title="International Telegraph Alphabet">ITA</abbr>2' => [
 	map { tr/01/○●/r =~ s/..\K/ /r } qw(
 	11000 10011 01110 10010 10000 10110 01011 00101 01100 11010 11110 01001 00111
 	00110 00011 01101 11101 01010 10100 00001 11100 01111 11001 10111 10101 10001
+	00100
 )],
 'Braille' => [qw{ ⠁ ⠃ ⠉ ⠙ ⠑ ⠋ ⠛ ⠓ ⠊ ⠚ ⠅ ⠇ ⠍ ⠝ ⠕ ⠏ ⠟ ⠗ ⠎ ⠞ ⠥ ⠧ ⠺ ⠭ ⠽ ⠵ }],
 '5-point Tactile' => [
@@ -85,13 +88,17 @@ my $U = 0;  # optional unicode alternatives
 	11 12 13 14 15 21 22 23  > 24 25 31 32
 	33 34 35 41 42 43 44 45 51 52 53 54 55
 })],
-'Tap simplified' => [disptap(qw{
+'Short Tap' => [disptap(qw{
 	11 12 13 14 21 22 23 20 > 31 -13 32 33
 	30 41 42 -13 43 40 10 51 52 53 50 -31 -40
 })],
+'Cards' => [(
+	map { chr(0x1F0A0 + $_), sprintf('<b>%s</b>', chr(0x1F0B0 + $_)) }  # spades, hearts
+	1 .. 11, 13, 14  # A 2-10 J Q K
+), '', chr(0x1F0CF), chr(0x1F0DF) ],
 'Maritime flags' => [
 	# International Code of Signals, SVG fills
-	map { '<svg width="20" height="20" viewBox="0 0 30 30">'.s/\n?\t+//gr.'</svg>' }
+	map { !!$_ && '<svg width="20" height="20" viewBox="0 0 30 30">'.s/\n?\t+//gr.'</svg>' }
 	split /\n\n/, qq{
 		<path fill="$C{blue}" d="M0,0 h30 l-7.5,15 7.5,15 h-30 z"/>
 		<path fill="white" d="M0,0 h15 v30 h-15"/>
@@ -183,6 +190,14 @@ my $U = 0;  # optional unicode alternatives
 		<path fill="$C{blue}" d="M30,0 v31 l-15,-15"/>
 		<path fill="$C{yellow}" d="M0,0  h31 l-15,15"/>
 		<path fill="$C{red}" d="M0,30 h31 l-15,-15"/>
+
+
+
+		<path fill="$C{blue}" d="M0,5 30,15 0,25"/>
+		<path fill="$C{yellow}" d="M0,9 20,15 0,21"/>
+
+		<path fill="$C{blue}" d="M0,5 30,15 0,25"/>
+		<path fill="white" d="M15,10 30,15 15,20"/>
 	},
 ],
 'Flag semaphore' => [
@@ -242,10 +257,12 @@ my $U = 0;  # optional unicode alternatives
 ],
 'Code 39' => [
 	# ISO/IEC 16388
-	map { tr/012/ ❘❙/r } qw(
+	map { !!$_ && tr/012/ ❘❙/r }
+	# bar widths (1-2) followed by space of width 1 (implied) or 2 (0)
+	qw(
 		211012 121012 221011 112012 212011 122011 111022 211021 121021 112021
 		211102 121102 221101 112102 212101 122101 111202 211201 121201 112201
-		201112 102112 202111 101212 201211 102211
+		201112 102112 202111 101212 201211 102211        102121 0 101221
 	)
 ],
 'Code 93' => [
@@ -263,7 +280,7 @@ my $U = 0;  # optional unicode alternatives
 	qw(
 		21111 21121 21131 22111 22121 23111 11211 11221 11231
 		12211 13211 11112 11122 11132 12112 13112 21211 21221
-		21112 21122 22112 22211 11212 11222 12212 12311
+		21112 21122 22112 22211 11212 11222 12212 12311 31121
 	)
 ],
 'Code 128' => [
@@ -272,27 +289,32 @@ my $U = 0;  # optional unicode alternatives
 		join ' ',
 		map {
 			$_ eq '' ? 'm2,-7' :
-			$_ eq '-' ? 'm4,-7' :
+			$_ eq '.' ? 'm3,-7' :
+			$_ eq ':' ? 'm4,-7' :
 			join 'm1,-7', ('v7') x $_
 		}
-		split /(-)?/, $_  # each bar [123] and space [ -]
+		split /([.:])?/  # each bar [123] and space [ .:]
 	}
-	# bar widths (1-3) followed by space of width 1 (implied) or 3 (-)
+	# bar widths (1-3) followed by space of width 1 (implied), 2 (.) or 3 (:)
 	qw(
-		11-2 1-12 1-1-2 12-1 1-21 1-2-1 21-1 2-11 2-1-1 123  12-3 1-23 132
-		13-2 1-32 332   21-3 2-13 231   23-1 233  312   31-2 3-12 321  32-1
+		11:2 1:12 1:1:2 12:1 1:21 1:2:1 21:1 2:11 2:1:1 123  12:3 1:23 132
+		13:2 1:32 332   21:3 2:13 231   23:1 233  312   31:2 3:12 321  32:1 22.2
 	)
 ],
 '<abbr title="Royal Mail 4-State Customer Code">RM4SCC</abbr>' => [
-	map { sprintf
-		'<svg width="20" height="20" viewBox="0 0 8 6">'
-		. '<path d="M1%s"/></svg>',
-		join ' m2',
-		map { sprintf ',%dv%dm0,-%d',
-			($_ & 1 ? 0 : 2),  2 + ($_ & 2) + ($_ & 1) * 2,
-			($_ & 1 ? 0 : 2) + 2 + ($_ & 2) + ($_ & 1) * 2,
-		}
-		split //, $_
+	map {
+		my $len = length $_;
+		!$len ? '' : sprintf(
+			'<svg width="%d" height="20" viewBox="0 0 %d 6">'
+			. '<path d="M1%s"/></svg>',
+			$len * 5, $len * 2,
+			join ' m2',
+			map { sprintf ',%dv%dm0,-%d',
+				($_ & 1 ? 0 : 2),  2 + ($_ & 2) + ($_ & 1) * 2,
+				($_ & 1 ? 0 : 2) + 2 + ($_ & 2) + ($_ & 1) * 2,
+			}
+			split //
+		);
 	}
 	qw(
 		                    2121 2301
@@ -300,7 +322,32 @@ my $U = 0;  # optional unicode alternatives
 		1023 1203 1221 3003 3021 3201
 		1032 1212 1230 3012 3030 3210
 		1122 1302 1320 3102 3120 3300
-	)
+		0033
+	), # 0 for space
+	'', 1, 3  # start/end
+],
+"D'ni" => [
+	map {
+		state $window = 'M-.5,-.5H12.5V12.5H-.5Z';
+		state $v = [
+			'',
+			'M0,6 12,6',
+			'M0,12 Q6,6 12,12',
+			'M0,6 6,12 12,6',
+			'M3,0 3,6 12,6',
+			'M0,0 12,12 M0,12 12,0', # cross
+			'M5.5,6 h1', # dot
+		];
+		state $h = [
+			'',
+			'M6,0 6,12',
+			'M0,0 Q6,6 0,12',
+			'M6,-.5 0,6 6,12.5',
+			'M6,12 6,3 12,3',
+		];
+		sprintf '<svg width="20" height="20" viewBox="-.5 -.5 13 13"><path d="%s"/></svg>',
+			$window . ($h->[$_ % 5] . $v->[$_ / 5] || $v->[6]);
+	} 0 .. 5*5
 ],
 'Pigpen' => [
 	map {
@@ -331,24 +378,27 @@ my $U = 0;  # optional unicode alternatives
 		. '<path d="M0,0%s %s4,0 %s4,4 %s0,4 %s0,0"/></svg>',
 		'h.5v.5h-.5v-.5',  # start anchor
 		map { ['M', 'h0M', 'L']->[$_] }
-		split //, $_
+		split //
 	}
 	# draw style (0=empty, 1=dot, 2=line connect) to right, down, left, up
 	qw(
 		0010 0112 2022 2220 2000 2012 0122 0202 0020 0220 0012 0022 2202
-		0222 2222 0102 0200 2201 2002 2200 0100 0110 0120 2001 2010 2020
+		0222 2222 0102 0200 2201 2002 2200 0100 0110 0120 2001 2010 2020 0
 	),
 ],
 'Chromacons' => [
 	# Colour Alphabet by Paul Green-Armytage (2010)
-	map { sprintf '<span style="background:#%s" title="%s">%s</span>', split(/:/, $_), chr(8195) }
+	map {
+		sprintf !$_ ? '<span>%2$s</span>' : '<span style="background:#%s" title="%s">%s</span>',
+			split(/:/), chr(8195);
+	}
 	qw{
 		F0A3FF:Amethyst 0075DC:Blue      993F00:Caramel  4C005C:Damson   191919:Ebony
 		005C31:Forest   2BCE48:Green     FFCC99:Honeydew 808080:Iron     94FFB5:Jade
 		8F7C00:Khaki    9DCC00:Lime      C20088:Mallow
 		003380:Navy     FFA405:Orpiment  FFA8BB:Pink     426600:Quagmire FF0010:Red
 		5EF1F2:Sky      00998F:Turquoise E0FF66:Uranium  740AFF:Violet   990000:Wine
-		FFFF80:Xanthin  FFFF00:Yellow    FF5005:Zinnia
-	},
+		FFFF80:Xanthin  FFFF00:Yellow    FF5005:Zinnia   0
+	}
 ],
 );