diff --git a/Makefile b/Makefile index f50f6f37b..b3eae49f2 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ 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 %.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(UNI) python $(ADD_GLYPHS) "$<" "$@" "$(EMOJI_PNG128)" @@ -28,8 +29,10 @@ ADD_GLYPHS= ../third_party/color_emoji/add_glyphs.py @rm -f "$@" ttx "$<" -$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(EMOJI_PNG128)*.png $(EMOJI_PNG64)*.png +$(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" "$@" clean: rm -f $(EMOJI).ttf $(EMOJI).tmpl.ttf $(EMOJI).tmpl.ttx diff --git a/png/128/emoji_u0023.png b/png/128/emoji_u0023.png new file mode 100644 index 000000000..f2eb67c1a Binary files /dev/null and b/png/128/emoji_u0023.png differ diff --git a/png/128/emoji_ufe82c.png b/png/128/emoji_u0023_20e3.png similarity index 100% rename from png/128/emoji_ufe82c.png rename to png/128/emoji_u0023_20e3.png diff --git a/png/128/emoji_u0030.png b/png/128/emoji_u0030.png new file mode 100644 index 000000000..9240b1536 Binary files /dev/null and b/png/128/emoji_u0030.png differ diff --git a/png/128/emoji_ufe837.png b/png/128/emoji_u0030_20e3.png similarity index 100% rename from png/128/emoji_ufe837.png rename to png/128/emoji_u0030_20e3.png diff --git a/png/128/emoji_u0031.png b/png/128/emoji_u0031.png new file mode 100644 index 000000000..0e13769de Binary files /dev/null and b/png/128/emoji_u0031.png differ diff --git a/png/128/emoji_ufe82e.png b/png/128/emoji_u0031_20e3.png similarity index 100% rename from png/128/emoji_ufe82e.png rename to png/128/emoji_u0031_20e3.png diff --git a/png/128/emoji_u0032.png b/png/128/emoji_u0032.png new file mode 100644 index 000000000..f2daec653 Binary files /dev/null and b/png/128/emoji_u0032.png differ diff --git a/png/128/emoji_ufe82f.png b/png/128/emoji_u0032_20e3.png similarity index 100% rename from png/128/emoji_ufe82f.png rename to png/128/emoji_u0032_20e3.png diff --git a/png/128/emoji_u0033.png b/png/128/emoji_u0033.png new file mode 100644 index 000000000..566068927 Binary files /dev/null and b/png/128/emoji_u0033.png differ diff --git a/png/128/emoji_ufe830.png b/png/128/emoji_u0033_20e3.png similarity index 100% rename from png/128/emoji_ufe830.png rename to png/128/emoji_u0033_20e3.png diff --git a/png/128/emoji_u0034.png b/png/128/emoji_u0034.png new file mode 100644 index 000000000..bbd505ebd Binary files /dev/null and b/png/128/emoji_u0034.png differ diff --git a/png/128/emoji_ufe831.png b/png/128/emoji_u0034_20e3.png similarity index 100% rename from png/128/emoji_ufe831.png rename to png/128/emoji_u0034_20e3.png diff --git a/png/128/emoji_u0035.png b/png/128/emoji_u0035.png new file mode 100644 index 000000000..dd97a6a8e Binary files /dev/null and b/png/128/emoji_u0035.png differ diff --git a/png/128/emoji_ufe832.png b/png/128/emoji_u0035_20e3.png similarity index 100% rename from png/128/emoji_ufe832.png rename to png/128/emoji_u0035_20e3.png diff --git a/png/128/emoji_u0036.png b/png/128/emoji_u0036.png new file mode 100644 index 000000000..526e1a850 Binary files /dev/null and b/png/128/emoji_u0036.png differ diff --git a/png/128/emoji_ufe833.png b/png/128/emoji_u0036_20e3.png similarity index 100% rename from png/128/emoji_ufe833.png rename to png/128/emoji_u0036_20e3.png diff --git a/png/128/emoji_u0037.png b/png/128/emoji_u0037.png new file mode 100644 index 000000000..06c47fb74 Binary files /dev/null and b/png/128/emoji_u0037.png differ diff --git a/png/128/emoji_ufe834.png b/png/128/emoji_u0037_20e3.png similarity index 100% rename from png/128/emoji_ufe834.png rename to png/128/emoji_u0037_20e3.png diff --git a/png/128/emoji_u0038.png b/png/128/emoji_u0038.png new file mode 100644 index 000000000..24723439d Binary files /dev/null and b/png/128/emoji_u0038.png differ diff --git a/png/128/emoji_ufe835.png b/png/128/emoji_u0038_20e3.png similarity index 100% rename from png/128/emoji_ufe835.png rename to png/128/emoji_u0038_20e3.png diff --git a/png/128/emoji_u0039.png b/png/128/emoji_u0039.png new file mode 100644 index 000000000..df804c922 Binary files /dev/null and b/png/128/emoji_u0039.png differ diff --git a/png/128/emoji_ufe836.png b/png/128/emoji_u0039_20e3.png similarity index 100% rename from png/128/emoji_ufe836.png rename to png/128/emoji_u0039_20e3.png diff --git a/png/128/emoji_ufe4ed.png b/png/128/emoji_u1f1e8_1f1f3.png similarity index 100% rename from png/128/emoji_ufe4ed.png rename to png/128/emoji_u1f1e8_1f1f3.png diff --git a/png/128/emoji_ufe4e8.png b/png/128/emoji_u1f1e9_1f1ea.png similarity index 100% rename from png/128/emoji_ufe4e8.png rename to png/128/emoji_u1f1e9_1f1ea.png diff --git a/png/128/emoji_ufe4eb.png b/png/128/emoji_u1f1ea_1f1f8.png similarity index 100% rename from png/128/emoji_ufe4eb.png rename to png/128/emoji_u1f1ea_1f1f8.png diff --git a/png/128/emoji_ufe4e7.png b/png/128/emoji_u1f1eb_1f1f7.png similarity index 100% rename from png/128/emoji_ufe4e7.png rename to png/128/emoji_u1f1eb_1f1f7.png diff --git a/png/128/emoji_ufe4eA.png b/png/128/emoji_u1f1ec_1f1e7.png similarity index 100% rename from png/128/emoji_ufe4eA.png rename to png/128/emoji_u1f1ec_1f1e7.png diff --git a/png/128/emoji_ufe4e9.png b/png/128/emoji_u1f1ee_1f1f9.png similarity index 100% rename from png/128/emoji_ufe4e9.png rename to png/128/emoji_u1f1ee_1f1f9.png diff --git a/png/128/emoji_ufe4e5.png b/png/128/emoji_u1f1ef_1f1f5.png similarity index 100% rename from png/128/emoji_ufe4e5.png rename to png/128/emoji_u1f1ef_1f1f5.png diff --git a/png/128/emoji_ufe4ee.png b/png/128/emoji_u1f1f0_1f1f7.png similarity index 100% rename from png/128/emoji_ufe4ee.png rename to png/128/emoji_u1f1f0_1f1f7.png diff --git a/png/128/emoji_ufe4ec.png b/png/128/emoji_u1f1f7_1f1fa.png similarity index 100% rename from png/128/emoji_ufe4ec.png rename to png/128/emoji_u1f1f7_1f1fa.png diff --git a/png/128/emoji_ufe4E6.png b/png/128/emoji_u1f1fa_1f1f8.png similarity index 100% rename from png/128/emoji_ufe4E6.png rename to png/128/emoji_u1f1fa_1f1f8.png diff --git a/png/64/emoji_u0023.png b/png/64/emoji_u0023.png new file mode 100644 index 000000000..c7d50dfe5 Binary files /dev/null and b/png/64/emoji_u0023.png differ diff --git a/png/64/emoji_ufe82c.png b/png/64/emoji_u0023_20e3.png similarity index 100% rename from png/64/emoji_ufe82c.png rename to png/64/emoji_u0023_20e3.png diff --git a/png/64/emoji_u0030.png b/png/64/emoji_u0030.png new file mode 100644 index 000000000..677d0fe12 Binary files /dev/null and b/png/64/emoji_u0030.png differ diff --git a/png/64/emoji_ufe837.png b/png/64/emoji_u0030_20e3.png similarity index 100% rename from png/64/emoji_ufe837.png rename to png/64/emoji_u0030_20e3.png diff --git a/png/64/emoji_u0031.png b/png/64/emoji_u0031.png new file mode 100644 index 000000000..e28f20a58 Binary files /dev/null and b/png/64/emoji_u0031.png differ diff --git a/png/64/emoji_ufe82e.png b/png/64/emoji_u0031_20e3.png similarity index 100% rename from png/64/emoji_ufe82e.png rename to png/64/emoji_u0031_20e3.png diff --git a/png/64/emoji_u0032.png b/png/64/emoji_u0032.png new file mode 100644 index 000000000..26bde498b Binary files /dev/null and b/png/64/emoji_u0032.png differ diff --git a/png/64/emoji_ufe82f.png b/png/64/emoji_u0032_20e3.png similarity index 100% rename from png/64/emoji_ufe82f.png rename to png/64/emoji_u0032_20e3.png diff --git a/png/64/emoji_u0033.png b/png/64/emoji_u0033.png new file mode 100644 index 000000000..7c478c26b Binary files /dev/null and b/png/64/emoji_u0033.png differ diff --git a/png/64/emoji_ufe830.png b/png/64/emoji_u0033_20e3.png similarity index 100% rename from png/64/emoji_ufe830.png rename to png/64/emoji_u0033_20e3.png diff --git a/png/64/emoji_u0034.png b/png/64/emoji_u0034.png new file mode 100644 index 000000000..50c019a75 Binary files /dev/null and b/png/64/emoji_u0034.png differ diff --git a/png/64/emoji_ufe831.png b/png/64/emoji_u0034_20e3.png similarity index 100% rename from png/64/emoji_ufe831.png rename to png/64/emoji_u0034_20e3.png diff --git a/png/64/emoji_u0035.png b/png/64/emoji_u0035.png new file mode 100644 index 000000000..063d6ddc7 Binary files /dev/null and b/png/64/emoji_u0035.png differ diff --git a/png/64/emoji_ufe832.png b/png/64/emoji_u0035_20e3.png similarity index 100% rename from png/64/emoji_ufe832.png rename to png/64/emoji_u0035_20e3.png diff --git a/png/64/emoji_u0036.png b/png/64/emoji_u0036.png new file mode 100644 index 000000000..f85b9ae5a Binary files /dev/null and b/png/64/emoji_u0036.png differ diff --git a/png/64/emoji_ufe833.png b/png/64/emoji_u0036_20e3.png similarity index 100% rename from png/64/emoji_ufe833.png rename to png/64/emoji_u0036_20e3.png diff --git a/png/64/emoji_u0037.png b/png/64/emoji_u0037.png new file mode 100644 index 000000000..d16cc1d06 Binary files /dev/null and b/png/64/emoji_u0037.png differ diff --git a/png/64/emoji_ufe834.png b/png/64/emoji_u0037_20e3.png similarity index 100% rename from png/64/emoji_ufe834.png rename to png/64/emoji_u0037_20e3.png diff --git a/png/64/emoji_u0038.png b/png/64/emoji_u0038.png new file mode 100644 index 000000000..99d0d4b90 Binary files /dev/null and b/png/64/emoji_u0038.png differ diff --git a/png/64/emoji_ufe835.png b/png/64/emoji_u0038_20e3.png similarity index 100% rename from png/64/emoji_ufe835.png rename to png/64/emoji_u0038_20e3.png diff --git a/png/64/emoji_u0039.png b/png/64/emoji_u0039.png new file mode 100644 index 000000000..39563fe70 Binary files /dev/null and b/png/64/emoji_u0039.png differ diff --git a/png/64/emoji_ufe836.png b/png/64/emoji_u0039_20e3.png similarity index 100% rename from png/64/emoji_ufe836.png rename to png/64/emoji_u0039_20e3.png diff --git a/png/64/emoji_ufe4ed.png b/png/64/emoji_u1f1e8_1f1f3.png similarity index 100% rename from png/64/emoji_ufe4ed.png rename to png/64/emoji_u1f1e8_1f1f3.png diff --git a/png/64/emoji_ufe4e8.png b/png/64/emoji_u1f1e9_1f1ea.png similarity index 100% rename from png/64/emoji_ufe4e8.png rename to png/64/emoji_u1f1e9_1f1ea.png diff --git a/png/64/emoji_ufe4eb.png b/png/64/emoji_u1f1ea_1f1f8.png similarity index 100% rename from png/64/emoji_ufe4eb.png rename to png/64/emoji_u1f1ea_1f1f8.png diff --git a/png/64/emoji_ufe4e7.png b/png/64/emoji_u1f1eb_1f1f7.png similarity index 100% rename from png/64/emoji_ufe4e7.png rename to png/64/emoji_u1f1eb_1f1f7.png diff --git a/png/64/emoji_ufe4eA.png b/png/64/emoji_u1f1ec_1f1e7.png similarity index 100% rename from png/64/emoji_ufe4eA.png rename to png/64/emoji_u1f1ec_1f1e7.png diff --git a/png/64/emoji_ufe4e9.png b/png/64/emoji_u1f1ee_1f1f9.png similarity index 100% rename from png/64/emoji_ufe4e9.png rename to png/64/emoji_u1f1ee_1f1f9.png diff --git a/png/64/emoji_ufe4e5.png b/png/64/emoji_u1f1ef_1f1f5.png similarity index 100% rename from png/64/emoji_ufe4e5.png rename to png/64/emoji_u1f1ef_1f1f5.png diff --git a/png/64/emoji_ufe4ee.png b/png/64/emoji_u1f1f0_1f1f7.png similarity index 100% rename from png/64/emoji_ufe4ee.png rename to png/64/emoji_u1f1f0_1f1f7.png diff --git a/png/64/emoji_ufe4ec.png b/png/64/emoji_u1f1f7_1f1fa.png similarity index 100% rename from png/64/emoji_ufe4ec.png rename to png/64/emoji_u1f1f7_1f1fa.png diff --git a/png/64/emoji_ufe4E6.png b/png/64/emoji_u1f1fa_1f1f8.png similarity index 100% rename from png/64/emoji_ufe4E6.png rename to png/64/emoji_u1f1fa_1f1f8.png