Fix font metadata

dmlls · Jan 27, 2022 · f00e473 · f00e473
1 parent 6026423
commit f00e473
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git 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
@@ -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
diff --git a/res/WhatsAppEmoji.tmpl.ttx.tmpl b/res/WhatsAppEmoji.tmpl.ttx.tmpl
@@ -78,7 +78,7 @@
   <head>
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="1.0"/>
-    <fontRevision value="2.019"/>
+    <fontRevision value="1.0"/>
     <checkSumAdjustment value="0x4d5a161a"/>
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00001011"/>
@@ -246,7 +246,7 @@
       WhatsApp Emoji
     </namerecord>
     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-      Version 2.21.23.23
+      Version 221.2323
     </namerecord>
     <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
       WhatsAppEmoji
@@ -266,9 +266,6 @@
     <namerecord nameID="11" platformID="3" platEncID="1" langID="0x409">
       https://github.com/dmlls/whatsapp-emoji-linux
     </namerecord>
-    <namerecord nameID="12" platformID="3" platEncID="1" langID="0x409">
-      https://github.com/dmlls/whatsapp-emoji-linux
-    </namerecord>
     <namerecord nameID="13" platformID="3" platEncID="1" langID="0x409">
       Specific information about WhatsApp emoji licensing is not publicly available.
     </namerecord>