rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly add regional indicators, with ZWNJ

Browse Source
This commit is contained in:
BulbyVR 2022-04-23 13:22:42 -04:00
parent 209865e882
commit b629882793
4 changed files with 3690 additions and 14752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
resources/extra_emoji.txt
View File

@ -1,27 +1,27 @@
# group: Symbols # group: Symbols
1F1E6 ; fully-qualified # ๐Ÿ‡ฆ E6.0 regional indicator a 200C 1F1E6 200C ; fully-qualified # โ€Œ๐Ÿ‡ฆโ€Œ E6.0 regional indicator a
1F1E7 ; fully-qualified # ๐Ÿ‡ง E6.0 regional indicator b 200C 1F1E7 200C ; fully-qualified # โ€Œ๐Ÿ‡งโ€Œ E6.0 regional indicator b
1F1E8 ; fully-qualified # ๐Ÿ‡จ E6.0 regional indicator c 200C 1F1E8 200C ; fully-qualified # โ€Œ๐Ÿ‡จโ€Œ E6.0 regional indicator c
1F1E9 ; fully-qualified # ๐Ÿ‡ฉ E6.0 regional indicator d 200C 1F1E9 200C ; fully-qualified # โ€Œ๐Ÿ‡ฉโ€Œ E6.0 regional indicator d
1F1EA ; fully-qualified # ๐Ÿ‡ช E6.0 regional indicator e 200C 1F1EA 200C ; fully-qualified # โ€Œ๐Ÿ‡ชโ€Œ E6.0 regional indicator e
1F1EB ; fully-qualified # ๐Ÿ‡ซ E6.0 regional indicator f 200C 1F1EB 200C ; fully-qualified # โ€Œ๐Ÿ‡ซโ€Œ E6.0 regional indicator f
1F1EC ; fully-qualified # ๐Ÿ‡ฌ E6.0 regional indicator g 200C 1F1EC 200C ; fully-qualified # โ€Œ๐Ÿ‡ฌโ€Œ E6.0 regional indicator g
1F1ED ; fully-qualified # ๐Ÿ‡ญ E6.0 regional indicator h 200C 1F1ED 200C ; fully-qualified # โ€Œ๐Ÿ‡ญโ€Œ E6.0 regional indicator h
1F1EE ; fully-qualified # ๐Ÿ‡ฎ E6.0 regional indicator i 200C 1F1EE 200C ; fully-qualified # โ€Œ๐Ÿ‡ฎโ€Œ E6.0 regional indicator i
1F1EF ; fully-qualified # ๐Ÿ‡ฏ E6.0 regional indicator j 200C 1F1EF 200C ; fully-qualified # โ€Œ๐Ÿ‡ฏโ€Œ E6.0 regional indicator j
1F1F0 ; fully-qualified # ๐Ÿ‡ฐ E6.0 regional indicator k 200C 1F1F0 200C ; fully-qualified # โ€Œ๐Ÿ‡ฐโ€Œ E6.0 regional indicator k
1F1F1 ; fully-qualified # ๐Ÿ‡ฑ E6.0 regional indicator l 200C 1F1F1 200C ; fully-qualified # โ€Œ๐Ÿ‡ฑโ€Œ E6.0 regional indicator l
1F1F2 ; fully-qualified # ๐Ÿ‡ฒ E6.0 regional indicator m 200C 1F1F2 200C ; fully-qualified # โ€Œ๐Ÿ‡ฒโ€Œ E6.0 regional indicator m
1F1F3 ; fully-qualified # ๐Ÿ‡ณ E6.0 regional indicator n 200C 1F1F3 200C ; fully-qualified # โ€Œ๐Ÿ‡ณโ€Œ E6.0 regional indicator n
1F1F4 ; fully-qualified # ๐Ÿ‡ด E6.0 regional indicator o 200C 1F1F4 200C ; fully-qualified # โ€Œ๐Ÿ‡ดโ€Œ E6.0 regional indicator o
1F1F5 ; fully-qualified # ๐Ÿ‡ต E6.0 regional indicator p 200C 1F1F5 200C ; fully-qualified # โ€Œ๐Ÿ‡ตโ€Œ E6.0 regional indicator p
1F1F6 ; fully-qualified # ๐Ÿ‡ถ E6.0 regional indicator q 200C 1F1F6 200C ; fully-qualified # โ€Œ๐Ÿ‡ถโ€Œ E6.0 regional indicator q
1F1F7 ; fully-qualified # ๐Ÿ‡ท E6.0 regional indicator r 200C 1F1F7 200C ; fully-qualified # โ€Œ๐Ÿ‡ทโ€Œ E6.0 regional indicator r
1F1F8 ; fully-qualified # ๐Ÿ‡ธ E6.0 regional indicator s 200C 1F1F8 200C ; fully-qualified # โ€Œ๐Ÿ‡ธโ€Œ E6.0 regional indicator s
1F1F9 ; fully-qualified # ๐Ÿ‡น E6.0 regional indicator t 200C 1F1F9 200C ; fully-qualified # โ€Œ๐Ÿ‡นโ€Œ E6.0 regional indicator t
1F1FA ; fully-qualified # ๐Ÿ‡บ E6.0 regional indicator u 200C 1F1FA 200C ; fully-qualified # โ€Œ๐Ÿ‡บโ€Œ E6.0 regional indicator u
1F1FB ; fully-qualified # ๐Ÿ‡ป E6.0 regional indicator v 200C 1F1FB 200C ; fully-qualified # โ€Œ๐Ÿ‡ปโ€Œ E6.0 regional indicator v
1F1FC ; fully-qualified # ๐Ÿ‡ผ E6.0 regional indicator w 200C 1F1FC 200C ; fully-qualified # โ€Œ๐Ÿ‡ผโ€Œ E6.0 regional indicator w
1F1FD ; fully-qualified # ๐Ÿ‡ฝ E6.0 regional indicator x 200C 1F1FD 200C ; fully-qualified # โ€Œ๐Ÿ‡ฝโ€Œ E6.0 regional indicator x
1F1FE ; fully-qualified # ๐Ÿ‡พ E6.0 regional indicator y 200C 1F1FE 200C ; fully-qualified # โ€Œ๐Ÿ‡พโ€Œ E6.0 regional indicator y
1F1FF ; fully-qualified # ๐Ÿ‡ฟ E6.0 regional indicator z 200C 1F1FF 200C ; fully-qualified # โ€Œ๐Ÿ‡ฟโ€Œ E6.0 regional indicator z

4
scripts/codegen.sh
View File

@ -2,6 +2,6 @@
ROOT=$(realpath "$PWD/$(dirname "$0")/..") ROOT=$(realpath "$PWD/$(dirname "$0")/..")
cd $ROOT cd $ROOT
cat resources/provider-header.txt > src/emoji/Provider.cpp cat resources/provider-header.txt > src/emoji/Provider.cpp
# cat resources/extra_emoji.txt resources/emoji-test.txt > resources/complete-emoji.txt cat resources/extra_emoji.txt resources/emoji-test.txt > resources/complete-emoji.txt
scripts/emoji_codegen.py resources/emoji-test.txt resources/shortcodes.txt >> src/emoji/Provider.cpp scripts/emoji_codegen.py resources/complete-emoji.txt resources/shortcodes.txt >> src/emoji/Provider.cpp
cd - > /dev/null cd - > /dev/null

2
scripts/emoji_codegen.py
View File

@ -78,7 +78,7 @@ if __name__ == '__main__':
continue continue
char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName.strip()).groups() char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName).groups()
shortname = name shortname = name
#TODO: Handle skintone modifiers in a sane way #TODO: Handle skintone modifiers in a sane way

18384
src/emoji/Provider.cpp
View File

File diff suppressed because it is too large Load Diff