diff --git a/.gitignore b/.gitignore
index 6fd419cc5..6d4350e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
WhatsAppEmoji.ttf
+WhatsAppEmoji.tmpl.ttf
+WhatsAppEmoji.tmpl.ttx
# Byte-compiled / optimized / DLL files
__pycache__/
diff --git a/Makefile b/Makefile
index c8a9691de..4f0210b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,8 @@ ADD_GLYPHS_FLAGS = -a $(NOTO_EMOJI_SRC_DIR)/emoji_aliases.txt
PUA_ADDER = $(NOTO_EMOJI_SRC_DIR)/map_pua_emoji.py
VS_ADDER = add_vs_cmap.py # from nototools
-
EMOJI_NAMES = $(notdir $(wildcard $(EMOJI_SRC_DIR)/emoji_u*.png))
-EMOJI_FILES= $(addprefix $(EMOJI_DIR)/,$(EMOJI_NAMES)))
+EMOJI_FILES = $(addprefix $(EMOJI_DIR)/,$(EMOJI_NAMES))
ALL_NAMES = $(EMOJI_NAMES)
@@ -85,11 +84,9 @@ ifdef MISSING_ADDER
$(error "$(VS_ADDER) not in path, run setup.py in nototools")
endif
-
$(EMOJI_DIR) $(QUANTIZED_DIR) $(COMPRESSED_DIR):
mkdir -p "$@"
-
# imagemagick's -extent operator munges the grayscale images in such a fashion
# that while it can display them correctly using libpng12, chrome and gimp using
# both libpng12 and libpng16 display the wrong gray levels.
@@ -118,10 +115,10 @@ $(COMPRESSED_DIR)/%.png: $(QUANTIZED_DIR)/%.png | check_compress_tool $(COMPRESS
# ...
# Run make without -j if this happens.
-%.ttx: $(RES_DIR)/%.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES)
- @$(PYTHON) $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS)
+$(RES_DIR)/$(EMOJI).tmpl.ttx: $(RES_DIR)/$(EMOJI).tmpl.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES)
+ $(PYTHON) $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS)
-%.ttf: $(RES_DIR)/%.ttx
+$(RES_DIR)/%.ttf: $(RES_DIR)/%.ttx
@rm -f "$@"
ttx "$<"
@@ -138,7 +135,7 @@ install:
cp -f $(EMOJI).ttf $(PREFIX)/share/fonts/
clean:
- rm -f $(EMOJI).ttf
+ rm -f $(EMOJI).ttf $(RES_DIR)/$(EMOJI).tmpl.ttf $(RES_DIR)/$(EMOJI).tmpl.ttx
rm -rf $(BUILD_DIR)
.SECONDARY: $(EMOJI_FILES) $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)
diff --git a/res/WhatsAppEmoji.tmpl.ttf b/res/WhatsAppEmoji.tmpl.ttf
deleted file mode 100644
index b8897a99b..000000000
Binary files a/res/WhatsAppEmoji.tmpl.ttf and /dev/null differ
diff --git a/res/WhatsAppEmoji.tmpl.ttx.tmpl b/res/WhatsAppEmoji.tmpl.ttx.tmpl
index 8033489db..d0a134110 100644
--- a/res/WhatsAppEmoji.tmpl.ttx.tmpl
+++ b/res/WhatsAppEmoji.tmpl.ttx.tmpl
@@ -78,7 +78,7 @@
-
+
@@ -246,7 +246,7 @@
WhatsApp Emoji
- Version 2.21.23.23
+ Version 221.2323
WhatsAppEmoji
@@ -266,9 +266,6 @@
https://github.com/dmlls/whatsapp-emoji-linux
-
- https://github.com/dmlls/whatsapp-emoji-linux
-
Specific information about WhatsApp emoji licensing is not publicly available.