From b629882793e6bce84965692b7e1d96f86539ca59 Mon Sep 17 00:00:00 2001
From: BulbyVR <26726264+TheDrawingCoder-Gamer@users.noreply.github.com>
Date: Sat, 23 Apr 2022 13:22:42 -0400
Subject: Properly add regional indicators, with ZWNJ

---
 scripts/codegen.sh       | 4 ++--
 scripts/emoji_codegen.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/codegen.sh b/scripts/codegen.sh
index 24fbc6be..9ba5c5df 100644
--- a/scripts/codegen.sh
+++ b/scripts/codegen.sh
@@ -2,6 +2,6 @@
 ROOT=$(realpath "$PWD/$(dirname "$0")/..")
 cd $ROOT
 cat resources/provider-header.txt > src/emoji/Provider.cpp 
-# 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
+cat resources/extra_emoji.txt resources/emoji-test.txt > resources/complete-emoji.txt
+scripts/emoji_codegen.py resources/complete-emoji.txt resources/shortcodes.txt >> src/emoji/Provider.cpp
 cd - > /dev/null
diff --git a/scripts/emoji_codegen.py b/scripts/emoji_codegen.py
index 05b1d764..9dae1544 100755
--- a/scripts/emoji_codegen.py
+++ b/scripts/emoji_codegen.py
@@ -78,7 +78,7 @@ if __name__ == '__main__':
             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
 
         #TODO: Handle skintone modifiers in a sane way
-- 
cgit 1.4.1