official-2013/optimized-text: produce all nescessary graphics for the web

2 files changed, 21 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index b857464..946a9ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # SVG2PNG: Each is buggy in their own way
 # ImageMagick: doesn't support transparency
-#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $2
+#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-bacground $5) $2
 # librsvg: doesn't support <style> element
-#SVG2PNG = rsvg-convert $1 -o $2 $(if $3,-w $3) $(if $4,-h $4)
+SVG2PNG = rsvg-convert $1 -o $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,--background-color=$5)
 # Inkscape: messes up gradients
-SVG2PNG = inkscape $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4)
+#SVG2PNG = inkscape $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,-b '$5')
 
 # PNG2ICO
 # png2ico: doesn't read PNG transparency properly
@@ -16,15 +16,23 @@ PNG2ICO = icotool -c $1 -o $2
 #PNGCRUSH = cp $1 $2
 PNGCRUSH = pngcrush $1 $2
 
-all: \
-	archlogo.png \
-	favicon.ico \
+all: website \
+	logo.png \
 	logotype-color-darkbg.png \
 	logotype-color-lightbg.png \
 	logotype-grayscale.png \
 	logotype-mono-black.png \
 	logotype-mono-white.png \
 
+website: \
+	apple-touch-icon-57x57.png \
+	apple-touch-icon-72x72.png \
+	apple-touch-icon-114x114.png \
+	apple-touch-icon-144x144.png \
+	icon-transparent-64x64.png \
+	archlogo.png \
+	favicon.ico
+
 clean:
 	rm -f *.png *.ico
 
@@ -37,5 +45,11 @@ clean:
 %.ico: %.png Makefile
 	$(call PNG2ICO,$<,$@)
 
-favicon.png: %.png: %.svg Makefile
+favicon.raw.png: logo.svg Makefile
 	$(call SVG2PNG,$<,$@,16)
+
+apple-touch-icon-%.raw.png: logo.svg Makefile
+	$(call SVG2PNG,$<,$@,$(firstword $(subst x, ,$*)),$(lastword $(subst x, ,$*)),#ffffff)
+
+icon-transparent-%.raw.png: logo.svg Makefile
+	$(call SVG2PNG,$<,$@,$(firstword $(subst x, ,$*)),$(lastword $(subst x, ,$*)))
diff --git a/favicon.svg b/logo.svg
index 516d5f1..516d5f1 100644
--- a/favicon.svg
+++ b/logo.svg