From b6d5340ce0bbfe6dc5676038550cb296da023501 Mon Sep 17 00:00:00 2001
From: Brad Erickson <eosrei@gmail.com>
Date: Thu, 23 Jun 2016 10:51:49 -0700
Subject: svg: Add Power Symbols

Adds the Unicode 9.0 Power Symbol glyphs. They aren't emoji, but
should be supported anyway.

Details: http://unicodepowersymbol.com/
---
 Makefile | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c5e574f..45d4050 100644
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,21 @@ OSX_PACKAGE := build/$(FONT_PREFIX)-OSX-$(VERSION)
 LINUX_PACKAGE := $(FONT_PREFIX)-Linux-$(VERSION)
 DEB_PACKAGE := fonts-emojione-svginot
 
-# There are two SVG source directories to keep the emojione assets separate.
+# There are two SVG source directories to keep the emojione assets separate
+# from the additions
 SVG_EMOJIONE := assets/emojione-svg
-SVG_MORE := assets/svg
+SVG_EXTRA := assets/svg
+# B&W only glyphs which will not be processed.
+SVG_EXTRA_BW := assets/svg-bw
 
 # Create the lists of traced and color SVGs
-SVG_FILES := $(wildcard $(SVG_EMOJIONE)/*.svg) $(wildcard $(SVG_MORE)/*.svg)
+SVG_FILES := $(wildcard $(SVG_EMOJIONE)/*.svg) $(wildcard $(SVG_EXTRA)/*.svg)
 SVG_STAGE_FILES := $(patsubst $(SVG_EMOJIONE)/%.svg, build/stage/%.svg, $(SVG_FILES))
-SVG_STAGE_FILES := $(patsubst $(SVG_MORE)/%.svg, build/stage/%.svg, $(SVG_STAGE_FILES))
-SVG_TRACE_FILES := $(patsubst build/stage/%.svg, build/svg-trace/%.svg, $(SVG_STAGE_FILES))
+SVG_STAGE_FILES := $(patsubst $(SVG_EXTRA)/%.svg, build/stage/%.svg, $(SVG_STAGE_FILES))
+SVG_BW_FILES := $(patsubst build/stage/%.svg, build/svg-bw/%.svg, $(SVG_STAGE_FILES))
 SVG_COLOR_FILES := $(patsubst build/stage/%.svg, build/svg-color/%.svg, $(SVG_STAGE_FILES))
 
-.PHONY: all package regular-package linux-package osx-package clean
+.PHONY: all package regular-package linux-package osx-package copy-extra clean
 
 all: $(REGULAR_FONT) $(OSX_FONT)
 
@@ -71,19 +74,22 @@ osx-package: $(OSX_FONT)
 	7z a -tzip -mx=9 $(OSX_PACKAGE).zip ./$(OSX_PACKAGE)
 
 # Build both versions of the fonts
-$(REGULAR_FONT): $(SVG_TRACE_FILES) $(SVG_COLOR_FILES)
+$(REGULAR_FONT): $(SVG_BW_FILES) $(SVG_COLOR_FILES) copy-extra
 	$(SCFBUILD) -c scfbuild.yml -o $(REGULAR_FONT) --font-version="$(VERSION)"
 
-$(OSX_FONT): $(SVG_TRACE_FILES) $(SVG_COLOR_FILES)
+$(OSX_FONT): $(SVG_BW_FILES) $(SVG_COLOR_FILES) copy-extra
 	$(SCFBUILD) -c scfbuild-osx.yml -o $(OSX_FONT) --font-version="$(VERSION)"
 
+copy-extra: build/svg-bw
+	cp $(SVG_EXTRA_BW)/* build/svg-bw/
+
 # Create black SVG traces of the color SVGs to use as glyphs.
 # 1. Make the EmojiOne SVG into a PNG with Inkscape
 # 2. Make the PNG into a BMP with ImageMagick and add margin by increasing the
 #    canvas size to allow the outer "stroke" to fit.
 # 3. Make the BMP into a Edge Detected PGM with mkbitmap
 # 4. Make the PGM into a black SVG trace with potrace
-build/svg-trace/%.svg: build/staging/%.svg | build/svg-trace
+build/svg-bw/%.svg: build/staging/%.svg | build/svg-bw
 	inkscape -w 1000 -h 1000 -z -e $(TMP)/$(*F).png $<
 	convert $(TMP)/$(*F).png -gravity center -extent 1066x1066 $(TMP)/$(*F).bmp
 	rm $(TMP)/$(*F).png
@@ -100,7 +106,7 @@ build/svg-color/%.svg: build/staging/%.svg | build/svg-color
 build/staging/%.svg: $(SVG_EMOJIONE)/%.svg | build/staging
 	cp $< $@
 
-build/staging/%.svg: $(SVG_MORE)/%.svg | build/staging
+build/staging/%.svg: $(SVG_EXTRA)/%.svg | build/staging
 	cp $< $@
 
 # Create the build directories
@@ -110,8 +116,8 @@ build:
 build/staging: | build
 	mkdir build/staging
 
-build/svg-trace: | build
-	mkdir build/svg-trace
+build/svg-bw: | build
+	mkdir build/svg-bw
 
 build/svg-color: | build
 	mkdir build/svg-color
-- 
cgit v1.2.3