From 8c0230fd3ad3b81f78312b783317bda43bc33c9b Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 8 Mar 2016 10:46:36 +1100
Subject: [PATCH] Parameterise more included SVGs

---
 images/svg/crosses/Cross1.svg | 58 ++++++++++++++++++++++++------
 images/svg/crosses/Cross4.svg | 60 ++++++++++++++++++++++++-------
 images/svg/crosses/Cross5.svg | 66 +++++++++++++++++++++++++++--------
 images/svg/crosses/Cross6.svg |  8 ++---
 images/svg/crosses/Star1.svg  |  8 ++---
 5 files changed, 155 insertions(+), 45 deletions(-)

diff --git a/images/svg/crosses/Cross1.svg b/images/svg/crosses/Cross1.svg
index 90a00a76237..94597425990 100644
--- a/images/svg/crosses/Cross1.svg
+++ b/images/svg/crosses/Cross1.svg
@@ -1,12 +1,48 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
-	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="109.5pt" height="109.5pt" viewBox="0 0 109.5 109.5" xml:space="preserve">
-	<g id="Layer_x0020_1" style="&st0;">
-		<path d="M109,59.5H0.5v-9H109v9z"/>
-		<path d="M59,109h-9.25V0.5H59V109z"/>
-		<path d="M74.063,54.75c0-10.873-8.814-19.688-19.688-19.688S34.688,43.877,34.688,54.75s8.814,19.688,19.688,19.688s19.688-8.814,19.688-19.688z"/>
-	</g>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="109.5pt"
+   height="109.5pt"
+   viewBox="0 0 109.5 109.5"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Cross1.svg"><metadata
+     id="metadata15"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="1.7242009"
+     inkscape:cx="69.597458"
+     inkscape:cy="68.4375"
+     inkscape:window-x="1345"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_x0020_1" /><g
+     id="Layer_x0020_1"
+     style="fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;"><path
+       fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"
+       d="M 62.1875 0.625 L 62.1875 44.517578 C 53.085911 46.710007 45.959517 53.957137 43.941406 63.125 L 0.625 63.125 L 0.625 74.375 L 44.085938 74.375 C 46.284396 83.24687 53.293171 90.214971 62.1875 92.357422 L 62.1875 136.25 L 73.75 136.25 L 73.75 92.359375 C 82.645517 90.217739 89.654962 83.248191 91.853516 74.375 L 136.25 74.375 L 136.25 63.125 L 91.996094 63.125 C 89.977694 53.957004 82.852045 46.709831 73.75 44.517578 L 73.75 0.625 L 62.1875 0.625 z "
+       transform="scale(0.8,0.8)"
+       id="path5" /></g></svg>
diff --git a/images/svg/crosses/Cross4.svg b/images/svg/crosses/Cross4.svg
index 952bb6df369..c13afe4b466 100644
--- a/images/svg/crosses/Cross4.svg
+++ b/images/svg/crosses/Cross4.svg
@@ -1,13 +1,49 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
-	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="84.676pt" height="85.03pt" viewBox="0 0 84.676 85.03" xml:space="preserve">
-	<g id="Layer_x0020_1" style="&st0;">
-		<g>
-			<path d="M77.605,84.323L0.884,7.602l6.364-6.364l76.722,76.721l-6.364,6.364z"/>
-			<path d="M7.248,83.969l-6.541-6.541L77.428,0.707l6.54,6.541L7.248,83.969z"/>
-		</g>
-	</g>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="84.676pt"
+   height="85.03pt"
+   viewBox="0 0 84.676 85.03"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Cross4.svg"><metadata
+     id="metadata15"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="2.2203928"
+     inkscape:cx="53.823243"
+     inkscape:cy="53.143749"
+     inkscape:window-x="1345"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g5" /><g
+     id="Layer_x0020_1"
+     style="fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;"><g
+       id="g5"><path
+         fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"
+         d="M 96.785156 0.8828125 L 52.589844 45.078125 L 9.0605469 1.546875 L 1.1054688 9.5019531 L 44.634766 53.033203 L 0.8828125 96.785156 L 9.0605469 104.96094 L 52.8125 61.208984 L 97.005859 105.4043 L 97.007812 105.4043 L 104.96289 97.449219 L 60.767578 53.253906 L 104.96094 9.0605469 L 96.785156 0.8828125 z "
+         transform="scale(0.8,0.8)"
+         id="path7" /></g></g></svg>
diff --git a/images/svg/crosses/Cross5.svg b/images/svg/crosses/Cross5.svg
index 9f8b2c84ab6..9eabda3bdf2 100644
--- a/images/svg/crosses/Cross5.svg
+++ b/images/svg/crosses/Cross5.svg
@@ -1,15 +1,53 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
-	<!ENTITY st0 "fill:none;">
-	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="84.676pt" height="85.03pt" viewBox="0 0 84.676 85.03" xml:space="preserve">
-	<g id="Layer_x0020_1" style="&st1;">
-		<g>
-			<path d="M77.605,84.323L0.884,7.602l6.364-6.364l76.722,76.721l-6.364,6.364z"/>
-			<path d="M7.248,83.969l-6.541-6.541L77.428,0.707l6.54,6.541L7.248,83.969z"/>
-		</g>
-		<path style="&st0;" d="M15.409,15.409h53.858v53.858H15.409V15.409z"/>
-	</g>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="84.676pt"
+   height="85.03pt"
+   viewBox="0 0 84.676 85.03"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Cross5.svg"><metadata
+     id="metadata17"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs15" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="2.2203928"
+     inkscape:cx="53.823243"
+     inkscape:cy="53.143749"
+     inkscape:window-x="1345"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g5" /><g
+     id="Layer_x0020_1"
+     style="fill-rule:nonzero;clip-rule:nonzero;fill:#000400;stroke:#000000;stroke-miterlimit:4;"><g
+       id="g5"><path
+       stroke="param(fill)" stroke-opacity="param(fill-opacity)" stroke-width="1.25" fill="none"
+       d="M15.409,15.409h53.858v53.858H15.409V15.409z"
+       id="path11" />
+       <path
+         fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"
+         d="M 96.785156 0.8828125 L 52.589844 45.078125 L 9.0605469 1.546875 L 1.1054688 9.5019531 L 44.634766 53.033203 L 0.8828125 96.785156 L 9.0605469 104.96094 L 52.8125 61.208984 L 97.005859 105.4043 L 97.007812 105.4043 L 104.96289 97.449219 L 60.767578 53.253906 L 104.96094 9.0605469 L 96.785156 0.8828125 z "
+         transform="scale(0.8,0.8)"
+         id="path7" /></g></g></svg>
diff --git a/images/svg/crosses/Cross6.svg b/images/svg/crosses/Cross6.svg
index d6f6897f9cf..2e29d316a10 100644
--- a/images/svg/crosses/Cross6.svg
+++ b/images/svg/crosses/Cross6.svg
@@ -6,11 +6,11 @@
 ]>
 <svg  width="84.676pt" height="85.03pt" viewBox="0 0 84.676 85.03" xml:space="preserve">
 	<g id="Layer_x0020_1" style="&st0;">
-		<path d="M83.968,7.248H0.708v70.18h83.261V7.248z"/>
-		<path d="M77.428,0.707H7.248v83.261h70.181V0.707z"/>
+		<path d="M83.968,7.248H0.708v70.18h83.261V7.248z" stroke="param(fill)" stroke-opacity="param(fill-opacity)" />
+		<path d="M77.428,0.707H7.248v83.261h70.181V0.707z" stroke="param(fill)" stroke-opacity="param(fill-opacity)"/>
 		<g style="&st1;">
-			<path d="M77.605,84.323L0.884,7.602l6.364-6.364l76.722,76.721l-6.364,6.364z"/>
-			<path d="M7.248,83.969l-6.541-6.541L77.428,0.707l6.54,6.541L7.248,83.969z"/>
+			<path d="M77.605,84.323L0.884,7.602l6.364-6.364l76.722,76.721l-6.364,6.364z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
+			<path d="M7.248,83.969l-6.541-6.541L77.428,0.707l6.54,6.541L7.248,83.969z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
 		</g>
 	</g>
 </svg>
diff --git a/images/svg/crosses/Star1.svg b/images/svg/crosses/Star1.svg
index d5792e03705..0d42b37406d 100644
--- a/images/svg/crosses/Star1.svg
+++ b/images/svg/crosses/Star1.svg
@@ -6,12 +6,12 @@
 <svg  width="109.5pt" height="109.5pt" viewBox="0 0 109.5 109.5" xml:space="preserve">
 	<g id="Layer_x0020_1" style="&st0;">
 		<g>
-			<path d="M90.168,96.942L13.447,20.221l6.364-6.364l76.722,76.721l-6.364,6.364z"/>
-			<path d="M19.811,96.588l-6.541-6.541l76.721-76.721l6.54,6.541L19.811,96.588z"/>
+			<path d="M90.168,96.942L13.447,20.221l6.364-6.364l76.722,76.721l-6.364,6.364z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
+			<path d="M19.811,96.588l-6.541-6.541l76.721-76.721l6.54,6.541L19.811,96.588z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
 		</g>
 		<g>
-			<path d="M109,59.5H0.5v-9H109v9z"/>
-			<path d="M59,109h-9.25V0.5H59V109z"/>
+			<path d="M109,59.5H0.5v-9H109v9z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
+			<path d="M59,109h-9.25V0.5H59V109z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width) 0"/>
 		</g>
 	</g>
 </svg>