diff --git a/dictsource/en_emoji b/dictsource/en_emoji index 30eae967..93715e80 100644 --- a/dictsource/en_emoji +++ b/dictsource/en_emoji @@ -1,8 +1,11 @@ // Emoji and Other Symbol pronunciations for English // -// NOTE: Entries with `text|emoji` in the comments have text and emoji forms. -// They can be followed by [FE0E] to select the text style, and [FE0F] to -// select the emoji style. +// Entries with `text|emoji` in the comments have text and emoji forms. They +// can be followed by [FE0E] to select the text style, and [FE0F] to select +// the emoji style. +// +// NOTE: See `src/ucd-tools/data/espeak-ng/emoji-data.txt` for additional data +// in interpreting ZWJ emoji sequences. $textmode @@ -115,7 +118,9 @@ $textmode ⚒ hammer and pick // [2692] text|emoji ⚓ anchor // [2693] ⚔ crossed swords // [2694] text|emoji +⚕ health worker $emoji_zwj // [2695] text|emoji ⚕ medical symbol // [2695] text|emoji +⚖ judge $emoji_zwj // [2696] text|emoji ⚖ balance scale // [2696] text|emoji ⚗ alembic // [2697] text|emoji ⚙ gear // [2699] text|emoji @@ -155,6 +160,7 @@ $textmode ✂ scissors // [2702] text|emoji ✅ white heavy check mark // [2705] +✈ pilot $emoji_zwj // [2708] text|emoji ✈ airplane // [2708] text|emoji ✉ envelope // [2709] text|emoji ✊ raised fist // [270A] @@ -318,6 +324,7 @@ $textmode 🌻 sunflower // [1F33B] 🌼 blossom // [1F33C] 🌽 ear of corn // [1F33D] +🌾 farmer $emoji_zwj // [1F33E] 🌾 sheaf of rice // [1F33E] 🌿 herb // [1F33F] 🍀 four leaf clover // [1F340] @@ -371,6 +378,7 @@ $textmode 🍰 shortcake // [1F370] 🍱 bento box // [1F371] 🍲 pot of food // [1F372] +🍳 cook $emoji_zwj // [1F373] 🍳 cooking // [1F373] 🍴 fork and knife // [1F374] 🍵 teacup without handle // [1F375] @@ -403,6 +411,7 @@ $textmode 🎐 wind chime // [1F390] 🎑 moon viewing ceremony // [1F391] 🎒 school backpack // [1F392] +🎓 student $emoji_zwj // [1F393] 🎓 graduation cap // [1F393] 🎖 military medal // [1F396] text|emoji 🎗 reminder ribbon // [1F397] text|emoji @@ -415,10 +424,12 @@ $textmode 🎡 ferris wheel // [1F3A1] 🎢 roller coaster // [1F3A2] 🎣 fishing pole // [1F3A3] +🎤 singer $emoji_zwj // [1F3A4] 🎤 microphone // [1F3A4] 🎥 movie camera // [1F3A5] 🎦 cinema // [1F3A6] 🎧 headphone // [1F3A7] +🎨 artist $emoji_zwj // [1F3A8] 🎨 artist palette // [1F3A8] 🎩 top hat // [1F3A9] 🎪 circus tent // [1F3AA] @@ -486,8 +497,10 @@ $textmode 🏨 hotel // [1F3E8] 🏩 love hotel // [1F3E9] 🏪 convenience store // [1F3EA] +🏫 teacher $emoji_zwj // [1F3EB] 🏫 school // [1F3EB] 🏬 department store // [1F3EC] +🏭 factory worker $emoji_zwj // [1F3ED] 🏭 factory // [1F3ED] 🏮 red paper lantern // [1F3EE] 🏯 japanese castle // [1F3EF] @@ -686,7 +699,9 @@ $textmode 💸 money with wings // [1F4B8] 💹 chart increasing with yen // [1F4B9] 💺 seat // [1F4BA] +💻 technologist $emoji_zwj // [1F4BB] 💻 laptop computer // [1F4BB] +💼 office worker $emoji_zwj // [1F4BC] 💼 briefcase // [1F4BC] 💽 computer disk // [1F4BD] 💾 floppy disk // [1F4BE] @@ -793,11 +808,13 @@ $textmode 🔤 input latin letters // [1F524] 🔥 fire // [1F525] 🔦 flashlight // [1F526] +🔧 mechanic $emoji_zwj // [1F527] 🔧 wrench // [1F527] 🔨 hammer // [1F528] 🔩 nut and bolt // [1F529] 🔪 kitchen knife // [1F52A] 🔫 pistol // [1F52B] +🔬 scientist $emoji_zwj // [1F52C] 🔬 microscope // [1F52C] 🔭 telescope // [1F52D] 🔮 crystal ball // [1F52E] @@ -976,6 +993,7 @@ $textmode // 1F680..1F6FF : Transport and Map Symbols +🚀 astronaut $emoji_zwj // [1F680] 🚀 rocket // [1F680] 🚁 helicopter // [1F681] 🚂 locomotive // [1F682] @@ -994,6 +1012,7 @@ $textmode 🚏 bus stop // [1F68F] 🚐 minibus // [1F690] 🚑 ambulance // [1F691] +🚒 firefighter $emoji_zwj // [1F692] 🚒 fire engine // [1F692] 🚓 police car // [1F693] 🚔 oncoming police car // [1F694] diff --git a/src/libespeak-ng/compiledict.c b/src/libespeak-ng/compiledict.c index 48c72797..01335918 100644 --- a/src/libespeak-ng/compiledict.c +++ b/src/libespeak-ng/compiledict.c @@ -116,6 +116,7 @@ MNEM_TAB mnem_flags[] = { { "$alt5", 19 }, { "$alt6", 20 }, { "$alt7", 21 }, + { "$emoji_zwj", 22 }, // alternate emoji pronunciation, when in a ZWJ sequence { "$combine", 23 }, // Combine with the next word diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h index 89f3f680..f27b92ae 100644 --- a/src/libespeak-ng/translate.h +++ b/src/libespeak-ng/translate.h @@ -58,6 +58,7 @@ extern "C" #define FLAG_ALT6_TRANS 0x100000 // language specific #define FLAG_ALT7_TRANS 0x200000 // language specific +#define FLAG_EMOJI_ZWJ 0x400000 // alternate emoji pronunciation, when in a ZWJ sequence #define FLAG_COMBINE 0x800000 // combine with the next word #define FLAG_ALLOW_DOT 0x01000000 // ignore '.' after word (abbreviation) #define FLAG_NEEDS_DOT 0x02000000 // only if the word is followed by a dot diff --git a/src/ucd-tools/data/espeak-ng/emoji-data.txt b/src/ucd-tools/data/espeak-ng/emoji-data.txt new file mode 100644 index 00000000..2775bb94 --- /dev/null +++ b/src/ucd-tools/data/espeak-ng/emoji-data.txt @@ -0,0 +1,49 @@ +# espeak-ng/emoji-data-4.0.txt +# Date: 2017-05-18, 07:15:00 GMT +# Copyright (C) 2017 Reece H. Dunn +# +# This is an extension to the Unicode Character Database emoji-data.txt file. +# It provides additional classification data for interpreting ZWJ emoji +# sequences. +# +# The `Emoji_Role` property is used for object-based roles which have the form: +# +# 1F468 200D Emoji_Role # man (role name) +# 1F468 Emoji_Modifier 200D Emoji_Role # man (modifier name) (role name) +# 1F469 200D Emoji_Role # woman (role name) +# 1F469 Emoji_Modifier 200D Emoji_Role # woman (modifier name) (role name) +# +# It uses the same format as the PropList.txt file. +# +# This data is licensed under the same terms as the Unicode Character +# Database. +# +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in +# the U.S. and other countries. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# +# Unicode Character Database +# For documentation, see http://www.unicode.org/reports/tr44/ + +# ================================================ + +2695 ; Emoji_Role # (⚕) health worker +2696 ; Emoji_Role # (⚖) judge +2708 ; Emoji_Role # (✈) pilot +1F33E ; Emoji_Role # (🌾) farmer +1F373 ; Emoji_Role # (🍳) cook +1F393 ; Emoji_Role # (🎓) student +1F3A4 ; Emoji_Role # (🎤) singer +1F3A8 ; Emoji_Role # (🎨) artist +1F3EB ; Emoji_Role # (🏫) teacher +1F3ED ; Emoji_Role # (🏭) factory worker +1F4BB ; Emoji_Role # (💻) technologist +1F4BC ; Emoji_Role # (💼) office worker +1F527 ; Emoji_Role # (🔧) mechanic +1F52C ; Emoji_Role # (🔬) scientist +1F680 ; Emoji_Role # (🚀) astronaut +1F692 ; Emoji_Role # (🚒) firefighter + +# Total code points: 16 + +#EOF