From fc0ab7f36d8c9ae16b79c08ab58ba5ba631bd534 Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Mon, 30 Nov 2015 17:49:52 -0800 Subject: [PATCH] Update NotoColorEmoji template so that it passes lint, bump version. - fix ascent/descent in hhea and os/2 to match noto UI expectations, zero linegap, clear useTypoMetrics bit, set weight to regular (400). - add missing entries to name table, update revision - map U+0000 to null glyph (not .notdef) In addition, this tweaks the Makefile in some small ways: - quiet zopflipng output somewhat (listen to your cpu fan to know that something's happening) :-) - make flag-symlinks target an order-only dependency (it was triggering quantize+compress even when images hadn't changed) - add comment about how to bypass make bug if multithread hangs --- Makefile | 15 +++++++++++--- NotoColorEmoji.tmpl.ttx.tmpl | 38 ++++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 4773371fe..324165ea6 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ PNGQUANTDIR := third_party/pngquant PNGQUANT := $(PNGQUANTDIR)/pngquant PNGQUANTFLAGS = --speed 1 --skip-if-larger --force -# zopflipng is better (about 10%) but much slower. it will be used if +# zopflipng is better (about 5-10%) but much slower. it will be used if # present. pass ZOPFLIPNG= as an arg to make to use optipng instead. ZOPFLIPNG = zopflipng @@ -163,7 +163,7 @@ flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR) ) \ ) -$(RENAMED_FLAG_FILES): flag-symlinks +$(RENAMED_FLAG_FILES): | flag-symlinks $(QUANTIZED_DIR)/%.png: $(RENAMED_FLAGS_DIR)/%.png $(PNGQUANT) | $(QUANTIZED_DIR) $(PNGQUANT) $(PNGQUANTFLAGS) -o "$@" "$<" @@ -175,10 +175,19 @@ $(COMPRESSED_DIR)/%.png: $(QUANTIZED_DIR)/%.png | check_compress_tool $(COMPRESS ifdef MISSING_ZOPFLI $(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<" else - $(ZOPFLIPNG) -y "$<" "$@" 2> /dev/null + $(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1 endif +# Make 3.81 can endless loop here if the target is missing but no +# prerequisite is updated and make has been invoked with -j, e.g.: +# File `font' does not exist. +# File `NotoColorEmoji.tmpl.ttx' does not exist. +# File `font' does not exist. +# File `NotoColorEmoji.tmpl.ttx' does not exist. +# ... +# Run make without -j if this happens. + %.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES) @python $(ADD_GLYPHS) "$<" "$@" "$(COMPRESSED_DIR)/emoji_u" diff --git a/NotoColorEmoji.tmpl.ttx.tmpl b/NotoColorEmoji.tmpl.ttx.tmpl index 9ab095006..51b25a733 100644 --- a/NotoColorEmoji.tmpl.ttx.tmpl +++ b/NotoColorEmoji.tmpl.ttx.tmpl @@ -13,7 +13,7 @@ - + @@ -33,9 +33,9 @@ - - - + + + @@ -73,7 +73,7 @@ - + @@ -104,14 +104,14 @@ - + - - - - - + + + + + @@ -132,7 +132,7 @@ - + @@ -156,7 +156,7 @@ Noto Color Emoji - Version 1.23 + Version 1.24 NotoColorEmoji @@ -164,9 +164,21 @@ Noto is a trademark of Google Inc. + + Google, Inc. + + + Google, Inc. + + + Color emoji font using CBDT glyph data. + http://www.google.com/get/noto/ + + http://www.google.com/get/noto/ + This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the SIL Open Font License for the specific language, permissions and limitations governing your use of this Font Software.