Add flags for 200+ regions.

This change also reorganized how the NotoColorEmoji font is created.
2014-08-12 19:28:00 -07:00 · 2014-08-12 19:28:00 -07:00 · 085b3b2841
parent 0810eacb07
commit 085b3b2841
951 changed files with 122 additions and 45 deletions
--- a/103
+++ b/103
@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@ -14,29 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+
 EMOJI = NotoColorEmoji
-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 -o7 "$@"
-
-%.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(UNI)
-	python $(ADD_GLYPHS) "$<" "$@" "$(EMOJI_PNG128)"
-
-%.ttf: %.ttx
-	@rm -f "$@"
-	ttx "$<"
-
-$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) $(EMOJI_PNG128)*.png $(EMOJI_PNG64)*.png
-	python $(EMOJI_BUILDER) -V $< "$@" $(EMOJI_PNG128) $(EMOJI_PNG64)
-	python $(PUA_ADDER) "$@" "$@-with-pua"
-	mv "$@-with-pua" "$@"
+font: $(EMOJI).ttf

 CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
 LDFLAGS = `pkg-config --libs cairo`
@ -44,6 +22,81 @@ LDFLAGS = `pkg-config --libs cairo`
 waveflag: waveflag.c
 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)

+FLAGS = AD AE AF AG AI AL AM AO AR AS AT AU AW AX AZ \
+	BA BB BD BE BF BG BH BI BJ BM BN BO BR BS BT BW BY BZ \
+	CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ \
+	DE DJ DK DM DO DZ \
+	EC EE EG ER ES ET EU \
+	FI FJ FM FO FR \
+	GA GB GD GE GG GH GI GL GM GN GQ GR GT GU GW GY \
+	HK HN HR HT HU \
+	ID IE IL IM IN IO IQ IR IS IT \
+	JE JM JO JP \
+	KE KG KH KI KM KN KP KR KW KY KZ \
+	LA LB LC LI LK LR LS LT LU LV LY \
+	MA MC MD ME MG MH MK ML MM MN MO MP MR MS MT MU MV MW MX MY MZ \
+	NA NE NF NG NI NL NO NP NR NU NZ \
+	OM \
+	PA PE PF PG PH PK PL PN PR PS PT PW PY \
+	QA \
+	RO RS RU RW \
+	SA SB SC SD SE SG SI SK SL SM SN SO SR SS ST SV SX SY SZ \
+	TC TD TG TH TJ TK TL TM TN TO TR TT TV TW TZ \
+	UA UG US UY UZ \
+	VA VC VE VG VI VN VU \
+	WS \
+	YE \
+	ZA ZM ZW
+
+FLAGS_SRC_DIR = ../third_party/region-flags/png
+FLAGS_DIR = ./flags
+
+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
+	mkdir -p $(FLAGS_DIR)
+	./waveflag "$<" "$@"
+	optipng -quiet -o7 "$@"
+
+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)"
+
+%.ttf: %.ttx
+	@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)
+	python $(PUA_ADDER) "$@" "$@-with-pua"
+	mv "$@-with-pua" "$@"
+
 clean:
-	rm -f waveflag
 	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.01"/>
+    <fontRevision value="1.11"/>
    <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.01
+      Version 1.11
    </namerecord>
    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
      NotoColorEmoji
--- a/flag_glyph_name.py
+++ b/flag_glyph_name.py
@ -0,0 +1,35 @@
+#!/usr/bin/python
+#
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Generate a glyph name for flag emojis."""
+
+__author__ = 'roozbeh@google.com (Roozbeh Pournader)'
+
+import sys
+
+from nototools import add_emoji_gsub
+
+def two_letter_code_to_glyph_name(iso_code):
+    return 'u%04x_%04x' % (
+        add_emoji_gsub.reg_indicator(iso_code[0]),
+        add_emoji_gsub.reg_indicator(iso_code[1]))
+
+def main():
+    print ' '.join([
+        two_letter_code_to_glyph_name(iso_code) for iso_code in sys.argv[1:]])
+
+if __name__ == '__main__':
+    main()
--- a/png/128/emoji_u1f1e8_1f1f3.png
+++ b/png/128/emoji_u1f1e8_1f1f3.png
--- a/png/128/emoji_u1f1e9_1f1ea.png
+++ b/png/128/emoji_u1f1e9_1f1ea.png
--- a/png/128/emoji_u1f1ea_1f1f8.png
+++ b/png/128/emoji_u1f1ea_1f1f8.png
--- a/png/128/emoji_u1f1eb_1f1f7.png
+++ b/png/128/emoji_u1f1eb_1f1f7.png
--- a/png/128/emoji_u1f1ec_1f1e7.png
+++ b/png/128/emoji_u1f1ec_1f1e7.png
--- a/png/128/emoji_u1f1ee_1f1f9.png
+++ b/png/128/emoji_u1f1ee_1f1f9.png
--- a/png/128/emoji_u1f1ef_1f1f5.png
+++ b/png/128/emoji_u1f1ef_1f1f5.png
--- a/png/128/emoji_u1f1f0_1f1f7.png
+++ b/png/128/emoji_u1f1f0_1f1f7.png
--- a/png/128/emoji_u1f1f7_1f1fa.png
+++ b/png/128/emoji_u1f1f7_1f1fa.png
--- a/png/128/emoji_u1f1fa_1f1f8.png
+++ b/png/128/emoji_u1f1fa_1f1f8.png
--- a/png/128/emoji_u203c.png.disabled
+++ b/png/128/emoji_u203c.png.disabled
--- a/png/128/emoji_u2049.png.disabled
+++ b/png/128/emoji_u2049.png.disabled
--- a/png/128/emoji_u2139.png.disabled
+++ b/png/128/emoji_u2139.png.disabled
--- a/png/128/emoji_u2194.png.disabled
+++ b/png/128/emoji_u2194.png.disabled
--- a/png/128/emoji_u2195.png.disabled
+++ b/png/128/emoji_u2195.png.disabled
--- a/png/128/emoji_u2196.png.disabled
+++ b/png/128/emoji_u2196.png.disabled
--- a/png/128/emoji_u2197.png.disabled
+++ b/png/128/emoji_u2197.png.disabled
--- a/png/128/emoji_u2198.png.disabled
+++ b/png/128/emoji_u2198.png.disabled
--- a/png/128/emoji_u2199.png.disabled
+++ b/png/128/emoji_u2199.png.disabled
--- a/png/128/emoji_u21a9.png.disabled
+++ b/png/128/emoji_u21a9.png.disabled
--- a/png/128/emoji_u21aa.png.disabled
+++ b/png/128/emoji_u21aa.png.disabled
--- a/png/128/emoji_u24c2.png.disabled
+++ b/png/128/emoji_u24c2.png.disabled
--- a/png/128/emoji_u25aa.png.disabled
+++ b/png/128/emoji_u25aa.png.disabled
--- a/png/128/emoji_u25ab.png.disabled
+++ b/png/128/emoji_u25ab.png.disabled
--- a/png/128/emoji_u25b6.png.disabled
+++ b/png/128/emoji_u25b6.png.disabled
--- a/png/128/emoji_u25c0.png.disabled
+++ b/png/128/emoji_u25c0.png.disabled
--- a/png/128/emoji_u25fb.png.disabled
+++ b/png/128/emoji_u25fb.png.disabled
--- a/png/128/emoji_u25fc.png.disabled
+++ b/png/128/emoji_u25fc.png.disabled
--- a/png/128/emoji_u25fd.png.disabled
+++ b/png/128/emoji_u25fd.png.disabled
--- a/png/128/emoji_u25fe.png.disabled
+++ b/png/128/emoji_u25fe.png.disabled
--- a/png/128/emoji_u2600.png.disabled
+++ b/png/128/emoji_u2600.png.disabled
--- a/png/128/emoji_u260e.png.disabled
+++ b/png/128/emoji_u260e.png.disabled
--- a/png/128/emoji_u2660.png.disabled
+++ b/png/128/emoji_u2660.png.disabled
--- a/png/128/emoji_u2663.png.disabled
+++ b/png/128/emoji_u2663.png.disabled
--- a/png/128/emoji_u2665.png.disabled
+++ b/png/128/emoji_u2665.png.disabled
--- a/png/128/emoji_u2666.png.disabled
+++ b/png/128/emoji_u2666.png.disabled
--- a/png/128/emoji_u2668.png.disabled
+++ b/png/128/emoji_u2668.png.disabled
--- a/png/128/emoji_u26aa.png.disabled
+++ b/png/128/emoji_u26aa.png.disabled
--- a/png/128/emoji_u26ab.png.disabled
+++ b/png/128/emoji_u26ab.png.disabled
--- a/png/128/emoji_u2702.png.disabled
+++ b/png/128/emoji_u2702.png.disabled
--- a/png/128/emoji_u2708.png.disabled
+++ b/png/128/emoji_u2708.png.disabled
--- a/png/128/emoji_u2709.png.disabled
+++ b/png/128/emoji_u2709.png.disabled
--- a/png/128/emoji_u270f.png.disabled
+++ b/png/128/emoji_u270f.png.disabled
--- a/png/128/emoji_u2712.png.disabled
+++ b/png/128/emoji_u2712.png.disabled
--- a/png/128/emoji_u2714.png.disabled
+++ b/png/128/emoji_u2714.png.disabled
--- a/png/128/emoji_u2716.png.disabled
+++ b/png/128/emoji_u2716.png.disabled
--- a/png/128/emoji_u2733.png.disabled
+++ b/png/128/emoji_u2733.png.disabled
--- a/png/128/emoji_u2734.png.disabled
+++ b/png/128/emoji_u2734.png.disabled
--- a/png/128/emoji_u2744.png.disabled
+++ b/png/128/emoji_u2744.png.disabled
--- a/png/128/emoji_u2747.png.disabled
+++ b/png/128/emoji_u2747.png.disabled
--- a/png/128/emoji_u2757.png.disabled
+++ b/png/128/emoji_u2757.png.disabled
--- a/png/128/emoji_u2764.png.disabled
+++ b/png/128/emoji_u2764.png.disabled
--- a/png/128/emoji_u27a1.png.disabled
+++ b/png/128/emoji_u27a1.png.disabled
--- a/png/128/emoji_u2934.png.disabled
+++ b/png/128/emoji_u2934.png.disabled
--- a/png/128/emoji_u2935.png.disabled
+++ b/png/128/emoji_u2935.png.disabled
--- a/png/128/emoji_u2b05.png.disabled
+++ b/png/128/emoji_u2b05.png.disabled
--- a/png/128/emoji_u2b06.png.disabled
+++ b/png/128/emoji_u2b06.png.disabled
--- a/png/128/emoji_u2b07.png.disabled
+++ b/png/128/emoji_u2b07.png.disabled
--- a/png/128/emoji_u2b1b.png.disabled
+++ b/png/128/emoji_u2b1b.png.disabled
--- a/png/128/emoji_u2b1c.png.disabled
+++ b/png/128/emoji_u2b1c.png.disabled
--- a/png/128/emoji_u2b50.png.disabled
+++ b/png/128/emoji_u2b50.png.disabled
--- a/png/128/emoji_u2b55.png.disabled
+++ b/png/128/emoji_u2b55.png.disabled
--- a/png/128/emoji_u3297.png.disabled
+++ b/png/128/emoji_u3297.png.disabled
--- a/png/128/emoji_u3299.png.disabled
+++ b/png/128/emoji_u3299.png.disabled
--- a/png/64/emoji_u0023.png
+++ b/png/64/emoji_u0023.png
--- a/png/64/emoji_u0023_20e3.png
+++ b/png/64/emoji_u0023_20e3.png
--- a/png/64/emoji_u0030.png
+++ b/png/64/emoji_u0030.png
--- a/png/64/emoji_u0030_20e3.png
+++ b/png/64/emoji_u0030_20e3.png
--- a/png/64/emoji_u0031.png
+++ b/png/64/emoji_u0031.png
--- a/png/64/emoji_u0031_20e3.png
+++ b/png/64/emoji_u0031_20e3.png
--- a/png/64/emoji_u0032.png
+++ b/png/64/emoji_u0032.png
--- a/png/64/emoji_u0032_20e3.png
+++ b/png/64/emoji_u0032_20e3.png
--- a/png/64/emoji_u0033.png
+++ b/png/64/emoji_u0033.png
--- a/png/64/emoji_u0033_20e3.png
+++ b/png/64/emoji_u0033_20e3.png
--- a/png/64/emoji_u0034.png
+++ b/png/64/emoji_u0034.png
--- a/png/64/emoji_u0034_20e3.png
+++ b/png/64/emoji_u0034_20e3.png
--- a/png/64/emoji_u0035.png
+++ b/png/64/emoji_u0035.png
--- a/png/64/emoji_u0035_20e3.png
+++ b/png/64/emoji_u0035_20e3.png
--- a/png/64/emoji_u0036.png
+++ b/png/64/emoji_u0036.png
--- a/png/64/emoji_u0036_20e3.png
+++ b/png/64/emoji_u0036_20e3.png
--- a/png/64/emoji_u0037.png
+++ b/png/64/emoji_u0037.png
--- a/png/64/emoji_u0037_20e3.png
+++ b/png/64/emoji_u0037_20e3.png
--- a/png/64/emoji_u0038.png
+++ b/png/64/emoji_u0038.png
--- a/png/64/emoji_u0038_20e3.png
+++ b/png/64/emoji_u0038_20e3.png
--- a/png/64/emoji_u0039.png
+++ b/png/64/emoji_u0039.png
--- a/png/64/emoji_u0039_20e3.png
+++ b/png/64/emoji_u0039_20e3.png
--- a/png/64/emoji_u00a9.png
+++ b/png/64/emoji_u00a9.png
--- a/png/64/emoji_u00ae.png
+++ b/png/64/emoji_u00ae.png
--- a/png/64/emoji_u1f004.png
+++ b/png/64/emoji_u1f004.png
--- a/png/64/emoji_u1f0cf.png
+++ b/png/64/emoji_u1f0cf.png
--- a/png/64/emoji_u1f170.png
+++ b/png/64/emoji_u1f170.png
--- a/png/64/emoji_u1f171.png
+++ b/png/64/emoji_u1f171.png
--- a/png/64/emoji_u1f17e.png
+++ b/png/64/emoji_u1f17e.png
--- a/png/64/emoji_u1f17f.png
+++ b/png/64/emoji_u1f17f.png
--- a/png/64/emoji_u1f18e.png
+++ b/png/64/emoji_u1f18e.png
--- a/png/64/emoji_u1f191.png
+++ b/png/64/emoji_u1f191.png
--- a/png/64/emoji_u1f192.png
+++ b/png/64/emoji_u1f192.png
--- a/Show More
+++ b/Show More