From 3c999f715ca70cea9de8e7fbc6d90cfc6d995e7e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 27 Apr 2013 11:05:32 -0400
Subject: official-2013/optimized-text: produce all nescessary graphics for the
 web

---
 official-2013/optimized-text/Makefile    | 28 +++++++++++++++++++++-------
 official-2013/optimized-text/favicon.svg | 31 -------------------------------
 official-2013/optimized-text/logo.svg    | 31 +++++++++++++++++++++++++++++++
 official-2013/readme.txt                 |  7 ++++---
 4 files changed, 56 insertions(+), 41 deletions(-)
 delete mode 100644 official-2013/optimized-text/favicon.svg
 create mode 100644 official-2013/optimized-text/logo.svg

diff --git a/official-2013/optimized-text/Makefile b/official-2013/optimized-text/Makefile
index b857464..946a9ab 100644
--- a/official-2013/optimized-text/Makefile
+++ b/official-2013/optimized-text/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/official-2013/optimized-text/favicon.svg b/official-2013/optimized-text/favicon.svg
deleted file mode 100644
index 516d5f1..0000000
--- a/official-2013/optimized-text/favicon.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
-     width="177.73" height="177.73">
-  <g transform="translate(-6.4912883,8.855)">
-    <path style="fill:#787dab"
-          d="m 148.61515553,5
-             c -4.58342,0.43796 -9.44975,1.24294 -14.52578,2.31649
-             l -32.15841,33.00327
-             c 3.68608,0.44343 7.05945,1.17552 10.13806,2.20749
-             L 148.61515553,5
-             z
-             m 22.64718,1.85319
-             -44.50399,45.64862
-             c 12.51629,16.22018 8.10738,48.80242 -18.23218,102.49819
-             19.48728,-21.27235 104.53594,-126.9849 65.62498,-146.92041
-             -0.90341,-0.46286 -1.89131,-0.861 -2.88881,-1.2264
-             z
-             m -59.30231,6.4317
-             c -6.15635,1.95909 -12.422699,4.18004 -18.668237,6.54069
-             l -21.28452,21.82957
-             c 4.882365,-0.79156 9.511695,-1.32363 13.87173,-1.60792
-             L 111.96002553,13.28489
-             z
-             M 80.04687853,25.03088
-             C 41.21574853,41.00354 6.49128833,60.51418 6.49128833,60.51418
-             27.11934853,52.78365 45.74921353,47.00453 62.00544853,43.5356
-             l 18.04143,-18.50472
-             z" />
-  </g>
-</svg>
diff --git a/official-2013/optimized-text/logo.svg b/official-2013/optimized-text/logo.svg
new file mode 100644
index 0000000..516d5f1
--- /dev/null
+++ b/official-2013/optimized-text/logo.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     width="177.73" height="177.73">
+  <g transform="translate(-6.4912883,8.855)">
+    <path style="fill:#787dab"
+          d="m 148.61515553,5
+             c -4.58342,0.43796 -9.44975,1.24294 -14.52578,2.31649
+             l -32.15841,33.00327
+             c 3.68608,0.44343 7.05945,1.17552 10.13806,2.20749
+             L 148.61515553,5
+             z
+             m 22.64718,1.85319
+             -44.50399,45.64862
+             c 12.51629,16.22018 8.10738,48.80242 -18.23218,102.49819
+             19.48728,-21.27235 104.53594,-126.9849 65.62498,-146.92041
+             -0.90341,-0.46286 -1.89131,-0.861 -2.88881,-1.2264
+             z
+             m -59.30231,6.4317
+             c -6.15635,1.95909 -12.422699,4.18004 -18.668237,6.54069
+             l -21.28452,21.82957
+             c 4.882365,-0.79156 9.511695,-1.32363 13.87173,-1.60792
+             L 111.96002553,13.28489
+             z
+             M 80.04687853,25.03088
+             C 41.21574853,41.00354 6.49128833,60.51418 6.49128833,60.51418
+             27.11934853,52.78365 45.74921353,47.00453 62.00544853,43.5356
+             l 18.04143,-18.50472
+             z" />
+  </g>
+</svg>
diff --git a/official-2013/readme.txt b/official-2013/readme.txt
index c0c237e..12b03a3 100644
--- a/official-2013/readme.txt
+++ b/official-2013/readme.txt
@@ -8,10 +8,11 @@ Directories:
                    Araya Navarro ("Shackra").
   `optimized-path` Optimized versions of the art with simpler SVG
                    source, that use <path> elements to draw the
-		   text.
+                   text.
   `optimized-text` Further simplified versions, that use <text> to
-                   draw the text.  Also includes `archlogo` and
-  		   `favicon` graphics for the website.
+                   draw the text.  Also includes a bare logo (not
+                   logotype) and produces all derived graphics for the
+                   website.
 
 The `optimized-path` versions should render identically to the
 originals (but Inkscape and copyright metadata isn't there).
-- 
cgit v1.2.3