Pass Noto Color Emoji bitmaps through pngquant.

2014-09-17 19:31:16 -07:00 · 2014-09-17 19:31:16 -07:00 · 4654a37dd2
parent 459d1cd472
commit 4654a37dd2
875 changed files with 12 additions and 16 deletions
--- a/24
+++ b/24
@ -18,6 +18,12 @@ font: $(EMOJI).ttf

 CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
 LDFLAGS = `pkg-config --libs cairo`
+PNGQUANTDIR := $(abspath `pwd`/../../third_party/pngquant)
+PNGQUANT := $(PNGQUANTDIR)/pngquant
+PNGQUANTFLAGS = --speed 1 --skip-if-larger --ext '.png' --force
+
+$(PNGQUANT):
+	cd $(PNGQUANTDIR) && make

 waveflag: waveflag.c
 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
@ -56,31 +62,24 @@ glyph_name = $(shell ./flag_glyph_name.py $(flag))

 WAVED_FLAGS := $(foreach flag,$(FLAGS),$(FLAGS_DIR)/$(flag).png)
 PNG128_FLAGS := $(foreach flag,$(FLAGS),$(addprefix ./png/128/emoji_$(glyph_name),.png))
-PNG64_FLAGS := $(foreach flag,$(FLAGS),$(addprefix ./png/64/emoji_,$(glyph_name).png))

-$(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag
+$(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT)
 	mkdir -p $(FLAGS_DIR)
 	./waveflag "$<" "$@"
 	optipng -quiet -o7 "$@"
+	$(PNGQUANT) $(PNGQUANTFLAGS) "$@"

 flag-symlinks: $(WAVED_FLAGS)
 	$(foreach flag,$(FLAGS),ln -fs ../../flags/$(flag).png ./png/128/emoji_$(glyph_name).png;)

-$(PNG64_FLAGS): $(PNG128_FLAGS)
-
 $(PNG128_FLAGS): flag-symlinks

 EMOJI_PNG128 = ./png/128/emoji_u
-EMOJI_PNG64 = ./png/64/emoji_u

 EMOJI_BUILDER = ../third_party/color_emoji/emoji_builder.py
 ADD_GLYPHS = ../third_party/color_emoji/add_glyphs.py
 PUA_ADDER = ../nototools/map_pua_emoji.py

-$(EMOJI_PNG64)%.png: $(EMOJI_PNG128)%.png
-	convert -geometry 50% "$<" "$@"
-	optipng -quiet -o7 "$@"
-
 %.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(UNI) flag-symlinks
 	python $(ADD_GLYPHS) "$<" "$@" "$(EMOJI_PNG128)"

@ -88,16 +87,13 @@ $(EMOJI_PNG64)%.png: $(EMOJI_PNG128)%.png
 	@rm -f "$@"
 	ttx "$<"

-PNG64_IMAGES := $(patsubst $(EMOJI_PNG128)%,$(EMOJI_PNG64)%,$(wildcard $(EMOJI_PNG128)*.png)) $(PNG64_FLAGS)
-
-$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) $(PNG64_IMAGES) $(EMOJI_PNG128)*.png flag-symlinks
-	python $(EMOJI_BUILDER) -V $< "$@" $(EMOJI_PNG128) $(EMOJI_PNG64)
+$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) $(EMOJI_PNG128)*.png flag-symlinks
+	python $(EMOJI_BUILDER) -V $< "$@" $(EMOJI_PNG128)
 	python $(PUA_ADDER) "$@" "$@-with-pua"
 	mv "$@-with-pua" "$@"

 clean:
 	rm -f $(EMOJI).ttf $(EMOJI).tmpl.ttf $(EMOJI).tmpl.ttx
-	rm -f $(EMOJI_PNG64)*.png
 	rm -f waveflag
 	rm -rf $(FLAGS_DIR)
 	rm -f `find -type l -name "*.png"`
--- a/NotoColorEmoji.tmpl.ttx.tmpl
+++ b/NotoColorEmoji.tmpl.ttx.tmpl
@ -9,7 +9,7 @@
  <head>
    <!-- Most of this table will be recalculated by the compiler -->
    <tableVersion value="1.0"/>
-    <fontRevision value="1.11"/>
+    <fontRevision value="1.12"/>
    <checkSumAdjustment value="0x4d5a161a"/>
    <magicNumber value="0x5f0f3cf5"/>
    <flags value="00000000 00001011"/>
@ -145,7 +145,7 @@
      Noto Color Emoji
    </namerecord>
    <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-      Version 1.11
+      Version 1.12
    </namerecord>
    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
      NotoColorEmoji
--- a/png/128/emoji_u0023.png
+++ b/png/128/emoji_u0023.png
--- a/png/128/emoji_u0023_20e3.png
+++ b/png/128/emoji_u0023_20e3.png
--- a/png/128/emoji_u0030.png
+++ b/png/128/emoji_u0030.png
--- a/png/128/emoji_u0030_20e3.png
+++ b/png/128/emoji_u0030_20e3.png
--- a/png/128/emoji_u0031.png
+++ b/png/128/emoji_u0031.png
--- a/png/128/emoji_u0031_20e3.png
+++ b/png/128/emoji_u0031_20e3.png
--- a/png/128/emoji_u0032.png
+++ b/png/128/emoji_u0032.png
--- a/png/128/emoji_u0032_20e3.png
+++ b/png/128/emoji_u0032_20e3.png
--- a/png/128/emoji_u0033.png
+++ b/png/128/emoji_u0033.png
--- a/png/128/emoji_u0033_20e3.png
+++ b/png/128/emoji_u0033_20e3.png
--- a/png/128/emoji_u0034.png
+++ b/png/128/emoji_u0034.png
--- a/png/128/emoji_u0034_20e3.png
+++ b/png/128/emoji_u0034_20e3.png
--- a/png/128/emoji_u0035.png
+++ b/png/128/emoji_u0035.png
--- a/png/128/emoji_u0035_20e3.png
+++ b/png/128/emoji_u0035_20e3.png
--- a/png/128/emoji_u0036.png
+++ b/png/128/emoji_u0036.png
--- a/png/128/emoji_u0036_20e3.png
+++ b/png/128/emoji_u0036_20e3.png
--- a/png/128/emoji_u0037.png
+++ b/png/128/emoji_u0037.png
--- a/png/128/emoji_u0037_20e3.png
+++ b/png/128/emoji_u0037_20e3.png
--- a/png/128/emoji_u0038.png
+++ b/png/128/emoji_u0038.png
--- a/png/128/emoji_u0038_20e3.png
+++ b/png/128/emoji_u0038_20e3.png
--- a/png/128/emoji_u0039.png
+++ b/png/128/emoji_u0039.png
--- a/png/128/emoji_u0039_20e3.png
+++ b/png/128/emoji_u0039_20e3.png
--- a/png/128/emoji_u00a9.png
+++ b/png/128/emoji_u00a9.png
--- a/png/128/emoji_u00ae.png
+++ b/png/128/emoji_u00ae.png
--- a/png/128/emoji_u1f004.png
+++ b/png/128/emoji_u1f004.png
--- a/png/128/emoji_u1f0cf.png
+++ b/png/128/emoji_u1f0cf.png
--- a/png/128/emoji_u1f170.png
+++ b/png/128/emoji_u1f170.png
--- a/png/128/emoji_u1f171.png
+++ b/png/128/emoji_u1f171.png
--- a/png/128/emoji_u1f17e.png
+++ b/png/128/emoji_u1f17e.png
--- a/png/128/emoji_u1f17f.png
+++ b/png/128/emoji_u1f17f.png
--- a/png/128/emoji_u1f18e.png
+++ b/png/128/emoji_u1f18e.png
--- a/png/128/emoji_u1f191.png
+++ b/png/128/emoji_u1f191.png
--- a/png/128/emoji_u1f192.png
+++ b/png/128/emoji_u1f192.png
--- a/png/128/emoji_u1f193.png
+++ b/png/128/emoji_u1f193.png
--- a/png/128/emoji_u1f194.png
+++ b/png/128/emoji_u1f194.png
--- a/png/128/emoji_u1f195.png
+++ b/png/128/emoji_u1f195.png
--- a/png/128/emoji_u1f196.png
+++ b/png/128/emoji_u1f196.png
--- a/png/128/emoji_u1f197.png
+++ b/png/128/emoji_u1f197.png
--- a/png/128/emoji_u1f198.png
+++ b/png/128/emoji_u1f198.png
--- a/png/128/emoji_u1f199.png
+++ b/png/128/emoji_u1f199.png
--- a/png/128/emoji_u1f19a.png
+++ b/png/128/emoji_u1f19a.png
--- a/png/128/emoji_u1f1e6.png
+++ b/png/128/emoji_u1f1e6.png
--- a/png/128/emoji_u1f1e7.png
+++ b/png/128/emoji_u1f1e7.png
--- a/png/128/emoji_u1f1e8.png
+++ b/png/128/emoji_u1f1e8.png
--- a/png/128/emoji_u1f1e9.png
+++ b/png/128/emoji_u1f1e9.png
--- a/png/128/emoji_u1f1ea.png
+++ b/png/128/emoji_u1f1ea.png
--- a/png/128/emoji_u1f1eb.png
+++ b/png/128/emoji_u1f1eb.png
--- a/png/128/emoji_u1f1ec.png
+++ b/png/128/emoji_u1f1ec.png
--- a/png/128/emoji_u1f1ed.png
+++ b/png/128/emoji_u1f1ed.png
--- a/png/128/emoji_u1f1ee.png
+++ b/png/128/emoji_u1f1ee.png
--- a/png/128/emoji_u1f1ef.png
+++ b/png/128/emoji_u1f1ef.png
--- a/png/128/emoji_u1f1f0.png
+++ b/png/128/emoji_u1f1f0.png
--- a/png/128/emoji_u1f1f1.png
+++ b/png/128/emoji_u1f1f1.png
--- a/png/128/emoji_u1f1f2.png
+++ b/png/128/emoji_u1f1f2.png
--- a/png/128/emoji_u1f1f3.png
+++ b/png/128/emoji_u1f1f3.png
--- a/png/128/emoji_u1f1f4.png
+++ b/png/128/emoji_u1f1f4.png
--- a/png/128/emoji_u1f1f5.png
+++ b/png/128/emoji_u1f1f5.png
--- a/png/128/emoji_u1f1f6.png
+++ b/png/128/emoji_u1f1f6.png
--- a/png/128/emoji_u1f1f7.png
+++ b/png/128/emoji_u1f1f7.png
--- a/png/128/emoji_u1f1f8.png
+++ b/png/128/emoji_u1f1f8.png
--- a/png/128/emoji_u1f1f9.png
+++ b/png/128/emoji_u1f1f9.png
--- a/png/128/emoji_u1f1fa.png
+++ b/png/128/emoji_u1f1fa.png
--- a/png/128/emoji_u1f1fb.png
+++ b/png/128/emoji_u1f1fb.png
--- a/png/128/emoji_u1f1fc.png
+++ b/png/128/emoji_u1f1fc.png
--- a/png/128/emoji_u1f1fd.png
+++ b/png/128/emoji_u1f1fd.png
--- a/png/128/emoji_u1f1fe.png
+++ b/png/128/emoji_u1f1fe.png
--- a/png/128/emoji_u1f1ff.png
+++ b/png/128/emoji_u1f1ff.png
--- a/png/128/emoji_u1f201.png
+++ b/png/128/emoji_u1f201.png
--- a/png/128/emoji_u1f202.png
+++ b/png/128/emoji_u1f202.png
--- a/png/128/emoji_u1f21a.png
+++ b/png/128/emoji_u1f21a.png
--- a/png/128/emoji_u1f22f.png
+++ b/png/128/emoji_u1f22f.png
--- a/png/128/emoji_u1f232.png
+++ b/png/128/emoji_u1f232.png
--- a/png/128/emoji_u1f233.png
+++ b/png/128/emoji_u1f233.png
--- a/png/128/emoji_u1f234.png
+++ b/png/128/emoji_u1f234.png
--- a/png/128/emoji_u1f235.png
+++ b/png/128/emoji_u1f235.png
--- a/png/128/emoji_u1f236.png
+++ b/png/128/emoji_u1f236.png
--- a/png/128/emoji_u1f237.png
+++ b/png/128/emoji_u1f237.png
--- a/png/128/emoji_u1f238.png
+++ b/png/128/emoji_u1f238.png
--- a/png/128/emoji_u1f239.png
+++ b/png/128/emoji_u1f239.png
--- a/png/128/emoji_u1f23a.png
+++ b/png/128/emoji_u1f23a.png
--- a/png/128/emoji_u1f250.png
+++ b/png/128/emoji_u1f250.png
--- a/png/128/emoji_u1f251.png
+++ b/png/128/emoji_u1f251.png
--- a/png/128/emoji_u1f300.png
+++ b/png/128/emoji_u1f300.png
--- a/png/128/emoji_u1f301.png
+++ b/png/128/emoji_u1f301.png
--- a/png/128/emoji_u1f302.png
+++ b/png/128/emoji_u1f302.png
--- a/png/128/emoji_u1f303.png
+++ b/png/128/emoji_u1f303.png
--- a/png/128/emoji_u1f304.png
+++ b/png/128/emoji_u1f304.png
--- a/png/128/emoji_u1f305.png
+++ b/png/128/emoji_u1f305.png
--- a/png/128/emoji_u1f306.png
+++ b/png/128/emoji_u1f306.png
--- a/png/128/emoji_u1f307.png
+++ b/png/128/emoji_u1f307.png
--- a/png/128/emoji_u1f308.png
+++ b/png/128/emoji_u1f308.png
--- a/png/128/emoji_u1f309.png
+++ b/png/128/emoji_u1f309.png
--- a/png/128/emoji_u1f30a.png
+++ b/png/128/emoji_u1f30a.png
--- a/png/128/emoji_u1f30b.png
+++ b/png/128/emoji_u1f30b.png
--- a/png/128/emoji_u1f30c.png
+++ b/png/128/emoji_u1f30c.png
--- a/png/128/emoji_u1f30d.png
+++ b/png/128/emoji_u1f30d.png
--- a/png/128/emoji_u1f30e.png
+++ b/png/128/emoji_u1f30e.png
--- a/png/128/emoji_u1f30f.png
+++ b/png/128/emoji_u1f30f.png
--- a/Show More
+++ b/Show More