From 7ffd70c8bf485c8c0777899c792d68ef9ed58436 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 23 May 2022 19:29:30 +0200 Subject: [PATCH] charset: inline prebuilt characters table Replace setup code as far as possible to run before static compilation. --- charset-encoding.inc.pl | 94 ++++++++++++++++++++--------------------- charset.plp | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/charset-encoding.inc.pl b/charset-encoding.inc.pl index 3eb7cc7..ab0eeda 100644 --- a/charset-encoding.inc.pl +++ b/charset-encoding.inc.pl @@ -71,8 +71,9 @@ use utf8; }, }, 'adobesymbol' => {inherit => ['symbol' => '20-7F+A0', '' => '20-7F+A0']}, # minor differences, irrelevant except for different '€' - 'wingdings' => {inherit => ['' => '20'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x20), qw( + 'wingdings' => { + inherit => ['' => '20'], + table => [(map {chr} 0 .. 0x20), qw( 🖉 ✂ ✁ 👓 🕭 🕮 🕯 🕿 ✆ 🖂 🖃 📪 📫 📬 📭 📁 📂 📄 🗏 🗐 🗄 ⌛ 🖮 🖰 🖲 🖳 🖴 🖫 🖬 ✇ ✍ 🖎 ✌ 👌 👍 👎 ☜ ☞ ☝ ☟ 🖐 ☺ 😐 ☹ 💣 ☠ 🏳 🏱 ✈ ☼ 💧 ❄ 🕆 ✞ 🕈 ✠ ✡ ☪ ☯ ॐ ☸ ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓ 🙰 🙵 ● 🔾 ■ □ 🞐 ❑ ❒ ⬧ ⧫ ◆ ❖ ⬥ ⌧ ⮹ ⌘ 🏵 🏶 🙶 🙷  @@ -80,10 +81,11 @@ use utf8; ▪ ⚪ 🞆 🞈 ◉ ◎ 🔿 ▪ ◻ 🟂 ✦ ★ ✶ ✴ ✹ ✵ ⯐ ⌖ ⟡ ⌑ ⯑ ✪ ✰ 🕐 🕑 🕒 🕓 🕔 🕕 🕖 🕗 🕘 🕙 🕚 🕛 ⮰ ⮱ ⮲ ⮳ ⮴ ⮵ ⮶ ⮷ 🙪 🙫 🙕 🙔 🙗 🙖 🙐 🙑 🙒 🙓 ⌫ ⌦ ⮘ ⮚ ⮙ ⮛ ⮈ ⮊ ⮉ ⮋ 🡨 🡪 🡩 🡫 🡬 🡭 🡯 🡮 🡸 🡺 🡹 🡻 🡼 🡽 🡿 🡾 ⇦ ⇨ ⇧ ⇩ ⬄ ⇳ ⬀ ⬁ ⬃ ⬂ 🢬 🢭 🗶 ✔ 🗷 🗹  - )]; - }}, - 'wingdings2' => {inherit => ['' => '20'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x20), qw( + )], + }, + 'wingdings2' => { + inherit => ['' => '20'], + table => [(map {chr} 0 .. 0x20), qw( 🖊 🖋 🖌 🖍 ✄ ✀ 🕾 🕽 🗅 🗆 🗇 🗈 🗉 🗊 🗋 🗌 🗍 📋 🗑 🗔 🖵 🖶 🖷 🖸 🖭 🖯 🖱 🖒 🖓 🖘 🖙 🖚 🖛 👈 👉 🖜 🖝 🖞 🖟 🖠 🖡 👆 👇 🖢 🖣 🖑 🗴 ✓ 🗵 ☑ ☒ ☒ ⮾ ⮿ ⦸ ⦸ 🙱 🙴 🙲 🙳 ‽ 🙹 🙺 🙻 🙦 🙤 🙥 🙧 🙚 🙘 🙙 🙛 ⓪ ① ② ③ ④ ⑤ ⑥ ⑦ ⑧ ⑨ ⑩ ⓿ ❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿  @@ -91,10 +93,11 @@ use utf8; ■ ◼ ⬛ ⬜ 🞑 🞒 🞓 🞔 ▣ 🞕 🞖 🞗 ⬩ ⬥ ◆ ◇ 🞚 ◈ 🞛 🞜 🞝 ⬪ ⬧ ⧫ ◊ 🞠 ◖ ◗ ⯊ ⯋ ◼ ⬥ ⬟ ⯂ ⬣ ⬢ ⯃ ⯄ 🞡 🞢 🞣 🞤 🞥 🞦 🞧 🞨 🞩 🞪 🞫 🞬 🞭 🞮 🞯 🞰 🞱 🞲 🞳 🞴 🞵 🞶 🞷 🞸 🞹 🞺 🞻 🞼 🞽 🞾 🞿 🟀 🟂 🟄 ✦ 🟉 ★ ✶ 🟋 ✷ 🟏 🟒 ✹ 🟃 🟇 ✯ 🟍 🟔 ⯌ ⯍ ※ ⁂ - )]; - }}, - 'wingdings3' => {inherit => ['' => '20'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x20), qw( + )], + }, + 'wingdings3' => { + inherit => ['' => '20'], + table => [(map {chr} 0 .. 0x20), qw( ⭠ ⭢ ⭡ ⭣ ⭦ ⭧ ⭩ ⭨ ⭰ ⭲ ⭱ ⭳ ⭶ ⭸ ⭻ ⭽ ⭤ ⭥ ⭪ ⭬ ⭫ ⭭ ⭍ ⮠ ⮡ ⮢ ⮣ ⮤ ⮥ ⮦ ⮧ ⮐ ⮑ ⮒ ⮓ ⮀ ⮃ ⭾ ⭿ ⮄ ⮆ ⮅ ⮇ ⮏ ⮍ ⮎ ⮌ ⭮ ⭯ ⎋ ⌤ ⌃ ⌥ ⎵ ⏡ ⇪ ⮸ 🢠 🢡 🢢 🢣 🢤 🢥 🢦 🢧 🢨 🢩 🢪 🢫 ← → ↑ ↓ ↖ ↗ ↙ ↘ 🡘 🡙 ▲ ▼ △ ▽ ◄ ► ◁ ▷ ◣ ◢ ◤ ◥ 🞀 🞂 🞁  @@ -102,10 +105,11 @@ use utf8; 🠇 🠈 🠊 🠉 🠋 🠠 🠢 🠤 🠦 🠨 🠨 🠪 🢜 🢝 🢞 🢟 🠮 🠰 🠲 🠴 🠶 🠸 🠺 🠹 🠻 🢘 🢚 🢙 🢛 🠼 🠾 🠽 🠿 🡀 🡂 🡁 🡃 🡄 🡆 🡅 🡇 ⮨ ⮩ ⮪ ⮫ ⮬ ⮭ ⮮ ⮯ 🡠 🡢 🡡 🡣 🡤 🡥 🡧 🡦 🡰 🡲 🡱 🡳 🡴 🡵 🡷 🡶 🢀 🢂 🢁 🢃 🢄 🢅 🢇 🢆 🢐 🢒 🢑 🢓 🢔 🢖 🢕 🢗 - )]; - }}, - 'webdings' => {inherit => ['' => '20'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x20), qw( + )], + }, + 'webdings' => { + inherit => ['' => '20'], + table => [(map {chr} 0 .. 0x20), qw( 🕷 🕸 🕲 🕶 🏆 🎖 🖇 🗨 🗩 🗰 🗱 🌶 🎗 ▞ 🙼 🗕 🗖 🗗 ⏴ ⏵ ⏶ ⏷ ⏪ ⏩ ⏮ ⏭ ⏸ ⏹ ⏺ 🗚 🗳 🛠 🏗 🏘 🏙 🏚 🏜 🏭 🏛 🏠 🏖 🏝 🛣 🔍 🏔 👁 👂 🏞 🏕 🛤 🏟 🛳 🕬 🕫 🕨 🔈 🎔 🎕 🗬 🙽 🗭 🗪 🗫 ⮔ ✔ 🚲 □ 🛡 📦 🛱 ■ 🚑 🛈 🛩 🛰 🟈 🕴 ⚫ 🛥 🚔 🗘 🗙 ❓ 🛲 🚇 🚍 ⛳ 🛇 ⊖ 🚭 🗮 | 🗯 🗲  @@ -113,8 +117,8 @@ use utf8; 🕵 🕰 🖽 🖾 📋 🗒 🗓 📖 📚 🗞 🗟 🗃 🗂 🖼 🎭 🎜 🎘 🎙 🎧 💿 🎞 📷 🎟 🎬 📽 📹 📾 📻 🎚 🎛 📺 💻 🖥 🖦 🖧 🕹 🎮 🕻 🕼 📟 🖁 🖀 🖨 🖩 🖿 🖪 🗜 🔒 🔓 🗝 📥 📤 🕳 🌣 🌤 🌥 🌦 ☁ 🌧 🌨 🌩 🌪 🌬 🌫 🌜 🌡 🛋 🛏 🍽 🍸 🛎 🛍 Ⓟ ♿ 🛆 🖈 🎓 🗤 🗥 🗦 🗧 🛪 🐿 🐦 🐟 🐕 🐈 🙬 🙮 🙭 🙯 🗺 🌍 🌏 🌎 🕊 - )]; - }}, + )], + }, 'iso-8859-2' => {inherit => ['iso-8859-1' => 'A0']}, 'iso-8859-3' => {inherit => ['iso-8859-1' => 'A0']}, #TODO: also apply to iso-8859-9 @@ -161,8 +165,9 @@ use utf8; 'koi8-u' => {inherit => ['koi8-r' => '90-BF']}, 'koi8-f' => {inherit => ['koi8-u' => '90-BF']}, - 'mik' => {inherit => ['cp437' => '80-D8', 'cp866' => 'B0'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x7F), qw( + 'mik' => { + inherit => ['cp437' => '80-D8', 'cp866' => 'B0'], + table => [(map {chr} 0 .. 0x7F), qw( А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ж з и й к л м н о п @@ -171,8 +176,8 @@ use utf8; ░ ▒ ▓ │ ┤ № § ╗ ╝ ┘ ┌ █ ▄ ▌ ▐ ▀ α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ - ), "\xA0"]; - }}, + ), "\xA0"], + }, 'macromanian' => {inherit => ['MacRoman' => 'A0-BF+D0-DF']}, 'macrumanian' => {inherit => ['MacRomanian' => 'A0-BF+D0-DF', 'MacRoman' => 'A0-BF+D0-DF']}, @@ -219,22 +224,24 @@ use utf8; 'cp875' => {inherit => ['cp37' => '30']}, legacy => [qw( cp437 ATASCII PETSCII MSX ZX-Spectrum ANSEL )], - 'petscii' => {inherit => ['' => '40-7F+A0-BF'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x3F), qw( + 'petscii' => { + inherit => ['' => '40-7F+A0-BF'], + table => [(map {chr} 0 .. 0x3F), 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 [ £ ] ↑ ← 🭹 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 ┼ 🮌 │ 🮖 🮘 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ▌ ▄ ▔ ▁ ▏ ▒ ▕ 🮏 🮙 🮇 ├ ▗ └ ┐ ▂ ┌ ┴ ┬ ┤ ▎ ▍ 🮈 🮂 🮃 ▃ ✓ ▖ ▝ ┘ ▘ ▚ - )]; - }}, - 'atascii' => {inherit => ['' => '0-1F+60-7F'], setup => sub { - $_[0]->{table} = [qw( + )], + }, + 'atascii' => { + inherit => ['' => '0-1F+60-7F'], + table => [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 ♠ | 🢰 ◀ ▶ - )]; - }}, + )], + }, 'zx-spectrum' => { inherit => ['' => '50-8F'], set => 'ascii', @@ -244,19 +251,18 @@ use utf8; 0x7F => '© ▝▘▀▗▐▚▜▖▞▌▛▄▟▙█', }, }, - 'msx' => {inherit => ['cp437' => '80-FF'], setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0x7F), qw( + 'msx' => { + inherit => ['cp437' => '80-FF'], + table => [(map {chr} 0 .. 0x7F), qw( Ç ü é â ä à å ç ê ë è ï î ì Ä Å É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ á í ó ú ñ Ñ ª º ¿ ⌐ ¬ ½ ¼ ¡ « » à ã Ĩ ĩ Õ õ Ũ ũ IJ ij ¾ ∽ ◊ ‰ ¶ § ▂ ▚ ▆ 🮂 ▬ 🮅 ▎ ▞ ▊ 🮇 🮊 🮙 🮘 🭭 🭯 🭬 🭮 🮚 🮛 ▘ ▗ ▝ ▖ 🮖 Δ ‡ ω █ ▄ ▌ ▐ ▀ α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ ⌀ ∈ ∩ ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ - )]; - }}, + )], + }, 'brascii' => { inherit => ['' => 'D0-DF+F0-FF'], - setup => sub { - $_[0]->{table} = [(map {chr} 0 .. 0xFF)]; - }, + table => [(map {chr} 0 .. 0xFF)], replace => { 0xD7 => 'Œ', 0xF7 => 'œ', @@ -265,8 +271,7 @@ use utf8; 'ansel' => { note => '+GEDCOM', inherit => ['' => 'A0-CF+E0-FE'], - setup => sub { - $_[0]->{table} = [ + table => [ (undef) x 0xA0, undef, qw( Ł Ø Đ Þ Æ Œ ʹ · ♭ ® ± Ơ Ư ʾ ), undef, qw( ʿ ł ø đ þ æ œ ʺ ı £ ð ), undef, qw( ơ ư ), undef, undef, @@ -277,8 +282,7 @@ use utf8; 0x327, 0x328, 0x0323, 0x0324, 0x0325, 0x333, 0x332, 0x326, 0x31C, 0x32E, 0xFE22, 0xFE23, undef, undef, 0x313, undef, ), - ]; - }, + ], replace => { # GEDCOM extensions 0xBE => '□', @@ -295,8 +299,7 @@ use utf8; 'ti86' => { note => 'similar to TI85', inherit => ['', => '0-1F+80-EC'], - setup => sub { - $_[0]->{table} = [ + table => [ undef, qw( 𝐛 𝐨 𝐝 𝐡 ▶ ⬆ ⬇ ∫ × 𝐀 𝐁 𝐂 𝐃 𝐄 𝐅 √ ⁻¹ ² ∠ ° ʳ ᵀ ≤ ≠ ≥ ⁻ ᴇ → ⏨ ↑ ↓ @@ -311,14 +314,12 @@ use utf8; ■ ∕ ‐ ² ° ³ :⃞ ➧ ⧵ 🙽 ◥ ◣ ⊸ ∘ ⋱ █ ⇧ A⃞ a⃞ _ ⇧̲ A̲ a̲ ▒ ⬞ ˖ · ⁴ ﹦ ), - ]; - }, + ], }, 'ti89' => { note => 'also TI92(+)', inherit => ['', => '0-1F+7F-BE'], - setup => sub { - $_[0]->{table} = [ + table => [ qw( ▒ ␁ ␂ ␃ ␄ ␅ ␆ 🔔 ⌫ ⇥ ), chr(0xA), qw( ⬏ ⤒ ↵ 🔒 ✓ ■ ◂ ▸ ▴ ▾ ← → ↑ ↓ ◀ ▶ ⬆ ∪ ∩ ⊂ ∈ @@ -330,8 +331,7 @@ use utf8; … ¡ ¢ £ ¤ ¥ ¦ § √ © ª « ¬ ⁻ ® ¯ ° ± ² ³ ⁻¹ µ ¶ · ⁺ ¹ º » 𝑑 ∫ ∞ ¿ ), - ]; - }, + ], }, '' => {setup => sub { diff --git a/charset.plp b/charset.plp index 2eb601f..d1e8d4d 100644 --- a/charset.plp +++ b/charset.plp @@ -97,7 +97,7 @@ sub tabinput { state $visible = {'' => 1}; # all present tables my %row = (offset => 0, cols => 16); - $row{$_} = $charset->{$_} for qw( note ); # copy metadata + $row{$_} = $charset->{$_} for qw( note table ); # copy metadata if (not defined $params) { my @parents = @{ $charset->{inherit} || [] }; -- 2.30.0