Update fonts and mapping

Signed-off-by: Youhei SASAKI <[email protected]>

.gitignore

@@ -3,3 +3,7 @@
 
 # Packaging
 .cask
+
+# data
+glyphs/*.ttf
+glyphs/*.otf

Makefile

@@ -1,32 +1,44 @@
-SRCD = fonts
+SRCD = glyphs
 DIST = dists
-TMPD = tmp
 VERSION = $(shell date '+%Y%m%d%H%M%S')
 
 all: build
 
 build: download
 	@[ -d $(DIST) ] ||  mkdir -p $(DIST)
 	@echo "----- build start -----"
-	./scripts/generate_font.py ./config.json > $(DIST)/mapping.txt
+	@PYTHONPATH=$(CURDIR)/scripts \
+	  python3 -c "import sys;import build; sys.exit(build.build('$(VERSION)'))"
+	@rm -f isfit-plus.ttf
 	@echo "----- Everything seems good -----"
 
-download: dev powerline fontawesome md oct logos weather file alltheicons
+download: \
+	set-ui_custom \
+	devicons \
+	fa \
+	fa_ext \
+	file \
+	md \
+	oct \
+	powerline \
+	logos \
+	weather \
+	powerline \
+	alltheicons
 
-dev:
-	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
-	@if [ ! -f $(SRCD)/devicons.ttf ] ; then\
-	  wget https://github.com/vorillaz/devicons/raw/master/fonts/devicons.ttf -O $(SRCD)/devicons.ttf ;\
+set-ui_custom:
+	@[ -d $(SRCD) ] || mkdir -p $(SRCD)
+	@if [ ! -f $(SRCD)/set-ui_custom.otf ] ; then\
+	  wget https://github.com/ryanoasis/nerd-fonts/raw/master/src/glyphs/original-source.otf -O $(SRCD)/set-ui_custom.otf ;\
 	fi
 
-powerline:
+devicons:
 	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
-	@if [ ! -f $(SRCD)/PowerlineExtraSymbols.otf ] ; then\
-	  echo "Download Powerline Extra Symbols" ;\
-	  wget https://github.com/ryanoasis/powerline-extra-symbols/raw/90b84948574773f8a2f08bcd26718f7c158f7a41/PowerlineExtraSymbols.otf -O $(SRCD)/PowerlineExtraSymbols.otf ;\
+	@if [ ! -f $(SRCD)/devicons.ttf ] ; then\
+	  wget https://github.com/vorillaz/devicons/raw/master/fonts/devicons.ttf -O $(SRCD)/devicons.ttf ;\
 	fi
 
-fontawesome:
+fa:
 	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
 	@if [ ! -f $(SRCD)/FontAwesome.otf ] ; then\
 	  echo "Download FontAwesome v4.7.0" ;\
@@ -37,9 +49,16 @@ fontawesome:
 	  rm -f v4.7.0.zip ;\
 	fi
 
+fa_ext:
+	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
+	@if [ ! -f $(SRCD)/font-awesome-extension.ttf ] ; then\
+	  echo "Download FontAwesome Extension" ;\
+	  wget https://github.com/AndreLZGava/font-awesome-extension/raw/master/fonts/font-awesome-extension.ttf -O $(SRCD)/font-awesome-extension.ttf ;\
+	fi
+
 md:
-	@if [ ! -f $(SRCD)/MaterialIcons-Regular.ttf ] ; then\
-	  wget https://github.com/google/material-design-icons/raw/master/iconfont/MaterialIcons-Regular.ttf -O $(SRCD)/MaterialIcons-Regular.ttf ;\
+	@if [ ! -f $(SRCD)/materialdesignicons-webfont.ttf ] ; then\
+	  wget https://github.com/Templarian/MaterialDesign-Webfont/raw/master/fonts/materialdesignicons-webfont.ttf -O $(SRCD)/materialdesignicons-webfont.ttf ;\
 	fi
 
 oct:
@@ -53,6 +72,13 @@ oct:
 	  rm -f v4.4.0.zip ;\
 	fi
 
+powerline:
+	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
+	@if [ ! -f $(SRCD)/PowerlineExtraSymbols.otf ] ; then\
+	  echo "Download Powerline Extra Symbols" ;\
+	  wget https://github.com/ryanoasis/powerline-extra-symbols/raw/90b84948574773f8a2f08bcd26718f7c158f7a41/PowerlineExtraSymbols.otf -O $(SRCD)/PowerlineExtraSymbols.otf ;\
+	fi
+
 logos:
 	@[ -d $(SRCD) ] ||  mkdir -p $(SRCD)
 	@if [ ! -f $(SRCD)/font-logos.ttf ] ; then\
@@ -82,9 +108,9 @@ alltheicons:
 
 clean:
 	@rm -f scripts/*.pyc
+	@rm -fr scripts/_pycache_
 
-# distclean: clean
-# 	rm -fr $(SRCD)/*.ttf
-# 	rm -fr $(SRCD)/*.otf
-# 	rm -fr $(DIST)/*.ttf
-# 	rm -fr $(TMPD)
+distclean: clean
+	rm -fr $(SRCD)/*.ttf
+	rm -fr $(SRCD)/*.otf
+	rm -fr $(DIST)/*.ttf

data/data-alltheicons-in-terminal.el

@@ -1,66 +1,66 @@
 (defvar all-the-icons-in-terminal-data/alltheicons-alist
   '(
-    ("svg"               . "\xebaf")
-    ("jasmine"           . "\xebb0")
-    ("perl"              . "\xebb1")
-    ("javascript"        . "\xebb2")
-    ("git"               . "\xebb3")
-    ("scala"             . "\xebb4")
-    ("apache"            . "\xebb5")
-    ("script"            . "\xebb6")
-    ("less"              . "\xebb7")
-    ("aws"               . "\xebb8")
-    ("grunt"             . "\xebb9")
-    ("d3"                . "\xebba")
-    ("c-line"            . "\xebbb")
-    ("cplusplus-line"    . "\xebbc")
-    ("csharp"            . "\xebbd")
-    ("csharp-line"       . "\xebbe")
-    ("cplusplus"         . "\xebbf")
-    ("coffeescript"      . "\xebc0")
-    ("c"                 . "\xebc1")
-    ("atom"              . "\xebc2")
-    ("bower"             . "\xebc3")
-    ("clojure"           . "\xebc4")
-    ("clojure-line"      . "\xebc5")
-    ("css3"              . "\xebc6")
-    ("css3-alt"          . "\xebc7")
-    ("go"                . "\xebc8")
-    ("google-drive"      . "\xebc9")
-    ("grunt-line"        . "\xebca")
-    ("gulp"              . "\xebcb")
-    ("haskell"           . "\xebcc")
-    ("java"              . "\xebcd")
-    ("javascript-badge"  . "\xebce")
-    ("javascript-shield" . "\xebcf")
-    ("nodejs"            . "\xebd0")
-    ("perldocs"          . "\xebd1")
-    ("prolog"            . "\xebd2")
-    ("python"            . "\xebd3")
-    ("react"             . "\xebd4")
-    ("ruby"              . "\xebd5")
-    ("ruby-alt"          . "\xebd6")
-    ("rust"              . "\xebd7")
-    ("sass"              . "\xebd8")
-    ("stylus"            . "\xebd9")
-    ("swift"             . "\xebda")
-    ("terminal"          . "\xebdb")
-    ("terminal-alt"      . "\xebdc")
-    ("html5"             . "\xebdd")
-    ("nginx"             . "\xebde")
-    ("erlang"            . "\xebdf")
-    ("dlang"             . "\xebe0")
-    ("elixir"            . "\xebe1")
-    ("spring"            . "\xebe2")
-    ("postgresql"        . "\xebe3")
-    ("battery-charging"  . "\xebe4")
-    ("arrow-left"        . "\xebe5")
-    ("arrow-right"       . "\xebe6")
-    ("cup-left"          . "\xebe7")
-    ("cup-right"         . "\xebe8")
-    ("slant-left"        . "\xebe9")
-    ("slant-right"       . "\xebea")
-    ("wave-left"         . "\xebeb")
-    ("wave-right"        . "\xebec")
+    ("svg"               . "\xe0e0")
+    ("jasmine"           . "\xe0e1")
+    ("perl"              . "\xe0e2")
+    ("javascript"        . "\xe0e3")
+    ("git"               . "\xe0e4")
+    ("scala"             . "\xe0e5")
+    ("apache"            . "\xe0e6")
+    ("script"            . "\xe0e7")
+    ("less"              . "\xe0e8")
+    ("aws"               . "\xe0e9")
+    ("grunt"             . "\xe0ea")
+    ("d3"                . "\xe0eb")
+    ("c-line"            . "\xe0ec")
+    ("cplusplus-line"    . "\xe0ed")
+    ("csharp"            . "\xe0ee")
+    ("csharp-line"       . "\xe0ef")
+    ("cplusplus"         . "\xe0f0")
+    ("coffeescript"      . "\xe0f1")
+    ("c"                 . "\xe0f2")
+    ("atom"              . "\xe0f3")
+    ("bower"             . "\xe0f4")
+    ("clojure"           . "\xe0f5")
+    ("clojure-line"      . "\xe0f6")
+    ("css3"              . "\xe0f7")
+    ("css3-alt"          . "\xe0f8")
+    ("go"                . "\xe0f9")
+    ("google-drive"      . "\xe0fa")
+    ("grunt-line"        . "\xe0fb")
+    ("gulp"              . "\xe0fc")
+    ("haskell"           . "\xe0fd")
+    ("java"              . "\xe0fe")
+    ("javascript-badge"  . "\xe0ff")
+    ("javascript-shield" . "\xe100")
+    ("nodejs"            . "\xe101")
+    ("perldocs"          . "\xe102")
+    ("prolog"            . "\xe103")
+    ("python"            . "\xe104")
+    ("react"             . "\xe105")
+    ("ruby"              . "\xe106")
+    ("ruby-alt"          . "\xe107")
+    ("rust"              . "\xe108")
+    ("sass"              . "\xe109")
+    ("stylus"            . "\xe10a")
+    ("swift"             . "\xe10b")
+    ("terminal"          . "\xe10c")
+    ("terminal-alt"      . "\xe10d")
+    ("html5"             . "\xe10e")
+    ("nginx"             . "\xe10f")
+    ("erlang"            . "\xe110")
+    ("dlang"             . "\xe111")
+    ("elixir"            . "\xe112")
+    ("spring"            . "\xe113")
+    ("postgresql"        . "\xe114")
+    ("battery-charging"  . "\xe115")
+    ("arrow-left"        . "\xe116")
+    ("arrow-right"       . "\xe117")
+    ("cup-left"          . "\xe118")
+    ("cup-right"         . "\xe119")
+    ("slant-left"        . "\xe11a")
+    ("slant-right"       . "\xe11b")
+    ("wave-left"         . "\xe11c")
+    ("wave-right"        . "\xe11d")
     ))
 (provide 'data-alltheicons-in-terminal)