X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3d6f1a6afd0d5bd83e105821553124b37e036668..0ecd498b120e427bd58940919ef05cb8c653ad68:/unicode-table.inc.pl

diff --git a/unicode-table.inc.pl b/unicode-table.inc.pl
index 3907553..01d537a 100644
--- a/unicode-table.inc.pl
+++ b/unicode-table.inc.pl
@@ -1,35 +1,53 @@
-{
+use utf8;
++{
 
 punctuation => {
 	quoting  => [qw{. « » . ‹ › . ‘ ’ . “ ” . „ ‚ . ‟ ‛}],
-	common   => [qw{. † ‡ • . § ¶ # . © ® ™ . ° ′ ″ . − × ÷ . ± ² √ . 年 月 日}],
-	marks    => [qw{. ¿ … 〃 ‐ – . ‽ · ※ ‒ — }],
-	spacing  => [split / /, join ' ',
-		". \x{2003} \x{2009} \x{2007} \x{A0} \x{200B}",
-		". \x{2002} \x{200A} \x{2008} \x{AD} \x{200C}",
+	common   => [qw{
+		. † ‡ • . § ¶ # . © ® ™
+		. ° ′ ″ . − × ÷ . ± ² √
+		. ¹ ⁿ ³ . ¼ ½ ¾ . 年 月 日
+	}],
+	marks    => [qw{. ¿ … 〃 . ‽ · ※ }],
+	spacing  => [
+		split / +/, join ' ',
+		". — – ‒  \x{2011} \x{2010}  \x{AD} \x{200D}",  # dashes
+		". \x{2003} \x{2002} \x{2007}  \x{A0} \x{2009}  \x{200B} \x{200C}",  # spaces
+		# em en figure  nobreak hyphen  break joiner
 	],
 	version  => [qw{. α β}],
 },
 
 symbols => {
 	binary   => [qw{. ⚋ ⚊ . ⚐ ⚑ . ☺ ☹ . ✓ ✗ . ✔ ✘ . ◄ ► }], # opposites
-	currency => [qw{. ¤ ¢ ₥ € £ ₨ $ ¥ . ฿ ₫ ₭ ₦ ₱ ₮ ₩ ₪}],
-	cards    => [qw{. ♠ ♡ ♢ ♣ . ♤ ♥ ♦ ♧}],
+	currency => [qw{. ¤ ¢ ₥ € £ ₹ $ ¥ . ฿ ₫ ₭ ₺ ₦ ₽ ₩ ₪}],
+	cards    => [
+		qw{. ♢ ♡ ♠ ♣ . ♦ ♥ ♤ ♧ }, # diamonds, hearts, clubs, spades
+#		qw{. 🔔 ❀ -⛨ 🌰 }, # bells, roses, shields, acorns
+#		qw{. ⚚ ⚘ ⚔ ⚒ }, # merchant, clergy, nobility, peasant
+#		qw{. ❂ 🏆 ⚔ -🔧 }, # coins, cups, swords, clubs
+		qw{. ▽̶ ▽ △ △̶ }, # earth, water, fire, air
+		qw{. ☷ ☵ ☲ ☰ }, # earth, water, fire, heaven [cq ☴ wind]
+		qw{. 土 水 火 金 }, # earth, water, fire, metal
+	],
 	chess    => [qw{. ♙ ♘ ♗ ♖ ♕ ♔ . ♟ ♞ ♝ ♜ ♛ ♚ }],
 	signs1   => [qw{. ☮ ☯ ☻ ♪ ♲ ♿ }],
 	signs2   => [qw{. ⚠ ☡ ☠}],
 	communic => [ # note, mail, fax, phone, alt phone
-		qw{. ✂ ✉ ℻ ☎ ☏ }, # scissors, envelope, fax sign, black phone, white phone
-		qw{. 🔞 🔾 🔰 🔮 🕀 }, # paperclip, postal horn, fax machine, receiver, cell
+		qw{. ✂ ✉ ℻ ☎ 📱 }, # scissors, envelope, fax sign, black phone, mobile
+		qw{. 📎 📯 📠 ☏ 📞 }, # paperclip, postal horn, fax machine, white phone, receiver
 	],
-	trinity  => [qw{. ✊ ✋ ✌ . 🖹 🐜 👼 }], # rock, paper, scissors; terran, protoss, zerg
-	solar    => [qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇}], # sun, mercury-neptune, pluto
+	trinity  => [qw{. ✊ ✋ ✌ . 🚹 🐜 👽 }], # rock, paper, scissors; terran, protoss, zerg
+	solar    => [qw{. ☉ ☿ ♀ ♁ ♂ ♃ ♄ ⛢ ♆ }], # sun, mercury-neptune
+	minorplanets => [qw{. ⚳ ⚴ ⚵ ⚶ ⚷ ♇ }], # 1ceres, 2pallas, 3juno, 4vesta, 2060chiron, 134340pluto
 	zodiac   => [
 		qw{. ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓ }, # western signs
 		qw{. 寅 卯 辰 巳 午 未 申 酉 戌 亥 子 丑 }, # chinese signs (earthly branches)
 		qw{. 虎 兔 龍 蛇 馬 羊 猴 雞 狗 豬 鼠 牛 }, # chinese names
 		qw{. 🐅 🐇 🐉 🐍 🐎 🐐 🐒 🐓 🐕 🐖 🐀 🐂 }, # chinese animals
+		qw{. 🐏 🐂 👬 -🍤 -🐅 -👰 ⚖ -♏ 🎯 🐐 🚾 🐟 }, # western signs
 	],
+	harvey   => [qw{. ○ ◔ ◑ ◕ ● }],
 },
 
 keys => {
@@ -38,14 +56,19 @@ keys => {
 	modifier => [qw{. ⇪ ⇯ ⇭ . ⇧ ⇮ № }], # (lock and select) shift, l3, num
 	control  => [qw{. ⎈ ⌥ ⌘ ⎄ }], # ctrl, option, cmd, compose
 	command  => [qw{. ↵ ⎋ ⎉ ⎊ }], # enter, esc, pause, break
-	player   => [qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }],
+	replace  => [qw{. � ␦ }], # substitute char, #2
+	player   => [qw{. ► ⏩ ⏭ ◼ ⚫ . ◄ ⏪ ⏮ ⏏ -❚❚ }], # play, fast, skip, stop, record
+	android  => [qw{. ↩ ⌂ ❐ ⋮ . 🔍 -⌽ 📞 🔊 }], # back, home, windows, menu; search, power, receive, sound
+	android4 => [qw{. ◁ ⚪ ◻ ⋮ }], # back, home, recent, menu
+	ps       => [qw{. ○ ☓ □ △ }], # circle, cross, square, triangle
+	gamepad  => [qw{. Ⓐ Ⓑ ◭ ◮ }], # A, B, L1, R1
 },
 
 math => {
 	equal    => [qw{. ∼ ≈ ≅ ≡ ∃ . ≁ ≉ ≇ ≢ ∄ }],
 	size     => [qw{. ≪ < ≤ \= ≥ \> ≫ . - ≮ ≰ ≠ ≱ ≯ - }],
 	set      => [qw{. ∈ ⊂ ⊆ ∀ ⊇ ⊃ ∋ ∪ . ∉ ⊄ ⊈ ∅ ⊉ ⊅ ∌ ∩ }],
-	logic    => [qw{. ∧ ∨ ⊻ ⊥ ¬ . ⊼ ⊽ ↔ ⊤ - }],
+	logic    => [qw{. ∧ ∨ ⊻ ⊥ ¬ . ⊼ ⊽ ↔ ⊤ - }], # and, or, xor, falsum, not; nand, nor, iff, tee
 
 	constant => [qw{. ℝ πϖ ℯ φ ϑ ∂ ℵ }],
 	predicate=> [qw{. ∴ ∵ }],
@@ -66,6 +89,21 @@ arrows => {
 	whitetri => [qw{. ◸ △ ◹   . ◁ ◇ ▷   . ◺ ▽ ◿   }],
 	-large   => [qw{.      .  -    .      }],
 	-heavy   => [qw{.      .  -    .      }],
+	dash     => [qw{. ⇢ ⇣ . ⇡ ⇠ }],
+	twohead  => [qw{. ↠ ↡ . ↟ ↞ }],
+	frombar  => [qw{. ↦ ↧ . ↥ ↤ }],
+	  tobar  => [qw{. ⇥ ⤓ . ⤒ ⇤ }],
+	 stroke  => [qw{. ⇸ ⤈ . ⤉ ⇷ }],
+	dstroke  => [qw{. ⇻ ⇟ . ⇞ ⇺ }],
+	pair     => [qw{. ⇉ ⇊ . ⇈ ⇇ }],
+	both     => [qw{. ⇄ ⇅ . ⇵ ⇆ }],
+	triple   => [qw{. ⇛ ⤊ . ⤋ ⇚ }],
+	quad     => [qw{. ⭆ ⟱ . ⟰ ⭅ }],
+	    tip  => [qw{. ↱ ⬎ . ⬑ ↲ }],
+	antitip  => [qw{. ⬐ ↰ . ↳ ⬏ }],
+	halfwidth=> [qw{. ￫ ￬ . ￪ ￩ }],
+	barbout  => [qw{. ⇀ ⇂ . ↿ ↽ }],
+	barbin   => [qw{. ⇁ ⇃ . ↾ ↼ }],
 },
 
 lines => {
@@ -103,6 +141,25 @@ latin => {
 		. ă ę œ ů š ð
 		. ı ė º ư ș đ
 	}],
+	vowels   => [qw{
+		. á é í ó ú ý
+		. â ê î ô û ŷ
+		. à è ì ò ù ỳ
+		. ã ẽ ĩ õ ũ ỹ
+		. ä ë ï ö ü ÿ
+		. æ & ij œ ᵫ -
+		. å - ı ⱺ ů ẙ
+		. ă ĕ ĭ ŏ ŭ -
+		. ǎ ě ǐ ǒ ǔ -
+		. ą ę į ǫ ų -
+	}],
+	westeuro => [qw{
+		. ç ð ñ ß þ
+	}],
+	easteuro => [qw{
+		. č ď ľ ň ř š ť ž
+		. ć đ ł ń ŕ ś ŧ ź ż
+	}],
 	uncommon => [qw{
 		.>Englisc   æ ð ē ȝ œ þ ƿ
 		.>Sámi      á č đ ŋ š ŧ ž
@@ -110,31 +167,33 @@ latin => {
 		.>Türkçe    ç ğ ı İ ö ş ü
 		.>Español   ñ á é í ó ú ü
 		.>Română    ă â î ș ț
-		.>Esperanto ĉ ĝ ĥ ĵ ŝ ŭ
+		.>Esperanto ª ĉ ĝ ĥ ĵ ŝ ŭ
 	}],
 },
 
 ipa => {
 	cons => [qw{
+		- >Labial >>>Coronal >>Dorsal >>Laryngeal >
 		- 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  ɖ  ɟ  ɡ  ɢ  =  -  =
+		.>Plosive                   p  -ȹ >  >  t  ʈ  c  k  q  -  ʡ  ʔ
+		.>Voiced_Plosive            b  -ȸ >  >  d  ɖ  ɟ  ɡ  ɢ  =  =  =
 		.>Nasal                     m  ɱ  >  >  n  ɳ  ɲ  ŋ  ɴ  =  =  =
-		.>Trill                     ʙ  -  >  >  r  -  -  =  ʀ  =  -я =
-		.>Tap/flap                  -  ⱱ  >  >  ɾ  ɽ  -  =  ɢ̆  =  -  =
+		.>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                 ɓ  ɗ̪  >  >  ɗ  -ᶑ ʄ  ɠ  ʛ  =  =  =
-	}],
+		.>Lateral_fricative         =  =  >  >  ɬ  ꞎ  - -Ɬ  -  =  =  =
+		.>Voiced_lateral_fricative  =  =  >  >  ɮ -ɮ̢  -  -  -  =  =  =
+		.>Approximant               -  ʋ  >  >  ɹ  ɻ  j  ɰ  -  -ʕ̞ =  =
+		.>Lateral_approximant       =  = -l̪  >  l  ɭ  ʎ  ʟ -ʟ̠  =  =  =
+		.>Click                     ʘ  -  ǀ  ǁ  ǃ -‼  ǂ -ʞ  -  =  =  =
+		.>Implosive                 ɓ  ɗ̪  >  >  ɗ -ᶑ  ʄ  ɠ  ʛ  =  =  =
+		.>Articulation              ʷ  ᶹ   ̪   ͇  -  ˞  ʲ  ˠ   ̴  >  ˤ  ʰ
+	}], #TODO: > Labial  > > > Coronal  > Dorsal  > > Laryngeal
 	consco => [qw{
-		- co:coarticulated .>sç ɕ .>zʝ ʑ .>ʃx ɧ .>jʷ ɥ .>hw̥ ʍ .>ɰʷ w
+		- co:coarticulated .>sç ɕ .>zʝ ʑ .>ʃx ɧ .>jʷ ɥ .>lˠ ɫ .>hw̥ ʍ .>ɰʷ w
 	}],
 	vowels => [(
 		'-',
@@ -142,12 +201,33 @@ ipa => {
 		qw{Front Central Back}
 	), qw{
 		.>Close      i y  ɨ ʉ  ɯ u
-		.>Near-close ɪ ʏ  - -  - ʊ
+		.>Near-close ɪ ʏ -ᵻ -ᵿ -ω ʊ
 		.>Close-mid  e ø  ɘ ɵ  ɤ o
-		.>Mid        - -  ə -  - -
+		.>Mid       -ᴇ -  ə - - -ⱺ
 		.>Open-mid   ɛ œ  ɜ ɞ  ʌ ɔ
 		.>Near-open  æ -  ɐ -  - -
-		.>Open       a ɶ  - -  ɑ ɒ
+		.>Open       a ɶ -ä -ɒ̈ ɑ ɒ
+	}],
+	tones => [qw{
+		.>Upstep     > ꜛ
+		.>Higher     ˥  ̋
+		.>High       ˦  ́
+		.>Mid        ˧  ̄
+		.>Low        ˨  ̀
+		.>Lower      ˩  ̏
+		.>Downstep   > ꜜ
+	}],
+	contours => [qw{
+		-         >Rising >Falling
+		.>High    ˧˥   ᷄   ˥˧   ᷇
+		.>Rising  ˩˥   ̌   ˧˦˩  ᷈
+		.>Falling ˨˩˦  ᷉   ˥˩   ̂
+		.>Low     ˩˧   ᷅   ˧˩   ᷆
+	}], #TODO: annotate Rising-Falling as Peaking, Falling-Rising as Dipping
+	supraseg => [qw{
+		. ˌ ˈ ˈˈ
+		. ̆ ˑ ː
+		. ‿ | ‖
 	}],
 },