diff --git a/Makefile b/Makefile index e8d53b5a4..ec05f5491 100644 --- a/Makefile +++ b/Makefile @@ -209,11 +209,7 @@ endif %.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES) @python $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS) -%.ttf: %.ttx - @rm -f "$@" - ttx "$<" - -$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \ +$(EMOJI).ttf: $(EMOJI).tmpl.ttx $(EMOJI_BUILDER) $(PUA_ADDER) \ $(ALL_COMPRESSED_FILES) | check_vs_adder @python $(EMOJI_BUILDER) $(SMALL_METRICS) -V $< "$@" "$(COMPRESSED_DIR)/emoji_u" @python $(PUA_ADDER) "$@" "$@-with-pua" diff --git a/third_party/color_emoji/emoji_builder.py b/third_party/color_emoji/emoji_builder.py index 278dd2bc0..2f4d5762d 100644 --- a/third_party/color_emoji/emoji_builder.py +++ b/third_party/color_emoji/emoji_builder.py @@ -475,7 +475,11 @@ By default they are dropped. print() - font = ttx.TTFont(font_file) + if font_file.endswith(".ttx"): + font = ttx.TTFont() + font.importXML(font_file) + else: + font = ttx.TTFont(font_file) print("Loaded font '%s'." % font_file) font_metrics = FontMetrics(font['head'].unitsPerEm, font['hhea'].ascent,