Render Luma crosshairs with Inkscape to avoid rsvg inconsistencies

diff --git a/gfx/crosshairs/luma/gfx/common.filters b/gfx/crosshairs/luma/gfx/common.filters
index 45de8bac96ecb255ded08fffcce94c1adc834fa8..262a99a227bc02f131521df1b644444784646363 100644 (file)
--- a/gfx/crosshairs/luma/gfx/common.filters
+++ b/gfx/crosshairs/luma/gfx/common.filters
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
        <defs>
-               <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-                       <feMorphology operator="dilate" radius="0.7" in="SourceAlpha"/>
-                       <feColorMatrix values="1 0 0 0 0.25 0 1 0 0 0.25 0 0 1 0 0.25 0 0 0 0.7 0"/>
+               <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2" color-interpolation-filters="sRGB">
+                       <feMorphology operator="dilate" radius="1" in="SourceGraphic"/>
+                       <feColorMatrix values="0.25 0 0 0 0 0 0.25 0 0 0 0 0 0.25 0 0 0 0 0 0.5 0"/>
                        <feGaussianBlur stdDeviation="1" result="shadow"/>
                        <feMerge>
                                <feMergeNode in="shadow"/>
                                <feMergeNode in="SourceGraphic"/>
                        </feMerge>
                </filter>
-               <filter id="shadowdot" x="-0.5" y="-0.5" width="2" height="2">
-                       <feMorphology operator="dilate" radius="1.4" in="SourceAlpha"/>
-                       <feColorMatrix values="1 0 0 0 0.25 0 1 0 0 0.25 0 0 1 0 0.25 0 0 0 0.7 0"/>
-                       <feGaussianBlur stdDeviation="2"/>
-                       <feOffset dx="0.25" dy="0.25" result="shadow"/>
+               <filter id="shadowdot" x="-0.5" y="-0.5" width="2" height="2" color-interpolation-filters="sRGB">
+                       <feMorphology operator="dilate" radius="1" in="SourceGraphic"/>
+                       <feColorMatrix values="0.25 0 0 0 0 0 0.25 0 0 0 0 0 0.25 0 0 0 0 0 0.875 0"/>
+                       <feGaussianBlur stdDeviation="2" result="shadow"/>
                        <feMerge>
                                <feMergeNode in="shadow"/>
                                <feMergeNode in="SourceGraphic"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair32.svg b/gfx/crosshairs/luma/gfx/crosshair32.svg
index 0dc4cd61f4bd1dadc8cde02f2d2b916d419bda1d..f8d02f474758422adafc54bd8f258d76fbc33498 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair32.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair32.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="56" height="56">
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="2" cx="28" cy="28" r="7"/>
-       </g>
+       <circle style="fill:none;stroke:#fff;stroke-width:2;filter:url(common.filters#shadow)" cx="28" cy="28" r="7"/>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair33.svg b/gfx/crosshairs/luma/gfx/crosshair33.svg
index 580713580fb41a0e0b299a4c3b5ca79c2d92b9f0..3d7ff4d64bbd354377d1081db564ca855641a4c1 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair33.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair33.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="56" height="56">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <path d="M 22,20.5 20.5,22 34,35.5 35.5,34 z"/>
                <path d="M 34,20.5 35.5,22 22,35.5 20.5,34 z"/>
        </g>

diff --git a/gfx/crosshairs/luma/gfx/crosshair34.svg b/gfx/crosshairs/luma/gfx/crosshair34.svg
index fee3e2bd902a0328b7d65405d7e54ffc6a42e487..e00deb0674b9110bf8c246957a5ec195468019b7 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair34.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair34.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="56" height="56">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="27" y="12" width="2" height="32"/>
                <rect x="12" y="27" width="32" height="2"/>
        </g>

diff --git a/gfx/crosshairs/luma/gfx/crosshair35.svg b/gfx/crosshairs/luma/gfx/crosshair35.svg
index ea7cb5249d0dd3e3acaf1b1504e8445cf53a47d7..6d949a99ba3fc87cc6a5901a0dd6ad8ea330c479 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair35.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair35.svg
@@ -2,11 +2,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
        <defs>
                <radialGradient id="gradient" gradientUnits="userSpaceOnUse" cx="40.5" cy="40.5" r="20">
-                       <stop stop-color="#fff" stop-opacity="0" offset="0"/>
+                       <stop stop-color="#e7e7e7" stop-opacity="0" offset="0"/>
                        <stop stop-color="#fff" offset="1"/>
                </radialGradient>
        </defs>
-       <g fill="url(#gradient)" filter="url(common.filters#shadow)">
+       <g style="fill:url(#gradient);filter:url(common.filters#shadow)">
                <rect x="40" y="8" width="1" height="29"/>
                <rect x="44" y="40" width="29" height="1"/>
                <rect x="40" y="44" width="1" height="29"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair36.svg b/gfx/crosshairs/luma/gfx/crosshair36.svg
index f8e7bfe416ef16d50f02de4c3795d918566fe125..2c2539e233ad061545bba1a62b6b18717e328dd4 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair36.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair36.svg
@@ -2,11 +2,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
        <defs>
                <radialGradient id="gradient" gradientUnits="userSpaceOnUse" cx="40" cy="40" r="20">
-                       <stop stop-color="#fff" stop-opacity="0" offset="0"/>
+                       <stop stop-color="#e7e7e7" stop-opacity="0" offset="0"/>
                        <stop stop-color="#fff" offset="1"/>
                </radialGradient>
        </defs>
-       <g fill="url(#gradient)" filter="url(common.filters#shadow)">
+       <g style="fill:url(#gradient);filter:url(common.filters#shadow)">
                <path d="M 44,37.5 42.5,36 64,14.5 65.5,16 z"/>
                <path d="M 42.5,44 44,42.5 65.5,64 64,65.5 z"/>
                <path d="M 36,42.5 37.5,44 16,65.5 14.5,64 z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair37.svg b/gfx/crosshairs/luma/gfx/crosshair37.svg
index 62396c62d1809f9426e2bb7001683bf294ab7c75..8fa444b7b353a874358ed49c497a99f90a015b9f 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair37.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair37.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="22" y="22" width="1" height="1"/>
                <rect x="22" y="4" width="1" height="13"/>
                <rect x="21.9" y="3" width="1.2" height="14" transform="matrix(-0.5,0.866,-0.866,-0.5,53.24,14.26)"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair38.svg b/gfx/crosshairs/luma/gfx/crosshair38.svg
index a21e04a30c00e22fe4ff414986084d49b800a6a2..ecc4246cede39397afe7a40d9c271c744271e69e 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair38.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair38.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="22" y="22" width="1" height="1"/>
                <rect x="28" y="22" width="13" height="1"/>
                <rect x="22" y="28" width="1" height="13"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair39.svg b/gfx/crosshairs/luma/gfx/crosshair39.svg
index 28ea3f3a1f87afc52ca2d43a9268e6981064d34b..f9504534a59cd2ab6a58a28a8a11a49d77ea9448 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair39.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair39.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="22" y="22" width="1" height="1"/>
                <rect x="22" y="4" width="1" height="13"/>
                <rect x="28" y="22" width="13" height="1"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair40.svg b/gfx/crosshairs/luma/gfx/crosshair40.svg
index 8a92f342becc67aacbecf2d7f15da30c8fbc667c..21433f7d6f3cff31e563a046a746243ff6409809 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair40.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair40.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="22" y="22" width="1" height="1"/>
                <path d="M 26,18.1 26.9,19 37,8.9 36.1,8 z"/>
                <path d="M 26,26.9 26.9,26 37,36.1 36.1,37 z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair41.svg b/gfx/crosshairs/luma/gfx/crosshair41.svg
index fde3bab19560c29804954d7ce2e2b25bd86a71c5..e8c073da9dbf022a3b7680ccab2ea53964baf4d8 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair41.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair41.svg
@@ -8,8 +8,8 @@
                        <rect x="0" y="27" width="18" height="18"/>
                </clipPath>
        </defs>
-       <g filter="url(common.filters#shadow)">
-               <rect fill="#fff" x="22" y="22" width="1" height="1"/>
-               <circle fill="none" stroke="#fff" stroke-width="1.5" clip-path="url(#clip)" cx="22.5" cy="22.5" r="16"/>
+       <g style="filter:url(common.filters#shadow)">
+               <rect style="fill:#fff" x="22" y="22" width="1" height="1"/>
+               <circle style="fill:none;stroke:#fff;stroke-width:1.5" clip-path="url(#clip)" cx="22.5" cy="22.5" r="16"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair42.svg b/gfx/crosshairs/luma/gfx/crosshair42.svg
index 971e84e840c5d61633c4af3fb1551a76fc498ba5..7c827c7695d8095ecbda079bdedafdedf906ba87 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair42.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair42.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="44" height="44">
-       <g filter="url(common.filters#shadow)">
-               <rect fill="#fff" x="22" y="22" width="1" height="1"/>
-               <circle fill="none" stroke="#fff" stroke-width="1.5" cx="22.5" cy="22.5" r="16"/>
+       <g style="filter:url(common.filters#shadow)">
+               <rect style="fill:#fff" x="22" y="22" width="1" height="1"/>
+               <circle style="fill:none;stroke:#fff;stroke-width:1.5" cx="22.5" cy="22.5" r="16"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair43.svg b/gfx/crosshairs/luma/gfx/crosshair43.svg
index 9f850ddc71aa5097b87135a12cc962628d26dbec..7d37b5c184b946e2a1799070c8419535dae98485 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair43.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair43.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="31" y="6" width="2" height="18"/>
                <rect x="31" y="5" width="2" height="19" transform="matrix(-0.5,0.866,-0.866,-0.5,75.71,20.29)"/>
                <rect x="31" y="5" width="2" height="19" transform="matrix(-0.5,-0.866,0.866,-0.5,20.29,75.71)"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair44.svg b/gfx/crosshairs/luma/gfx/crosshair44.svg
index ef2110fdc433c197c19b154def739a95f649d4f5..d899f35703f845751e06ede56be36d75061a071e 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair44.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair44.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="40" y="31" width="18" height="2"/>
                <rect x="31" y="40" width="2" height="18"/>
                <rect x="6" y="31" width="18" height="2"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair45.svg b/gfx/crosshairs/luma/gfx/crosshair45.svg
index 0d2c44e69356f8f4af5875d22da4eb1a43beb98a..3b16f086bc455a1f3db6576887dd4b398ebf30d1 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair45.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair45.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="31" y="6" width="2" height="18"/>
                <rect x="40" y="31" width="18" height="2"/>
                <rect x="31" y="40" width="2" height="18"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair46.svg b/gfx/crosshairs/luma/gfx/crosshair46.svg
index ab3d2122a8e30f1f7dbeb8ce2ac3bc112f5aeb63..c3ee1a2bbd41134567500737440dc1414ca9646e 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair46.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair46.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <path d="M 27.5,26 13,11.5 11.5,13 26,27.5 z"/>
                <path d="M 36.5,26 51,11.5 52.5,13 38,27.5 z"/>
                <path d="M 36.5,38 51,52.5 52.5,51 38,36.5 z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair47.svg b/gfx/crosshairs/luma/gfx/crosshair47.svg
index 70825600e813ca14970a27d5981fa6baea91d698..6798f1c6349f8177e7bf9af1226003e9d263ed67 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair47.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair47.svg
@@ -8,7 +8,7 @@
                        <rect y="38" x="0" width="26" height="26"/>
                </clipPath>
        </defs>
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="2" clip-path="url(#clip)" cx="32" cy="32" r="23"/>
+       <g style="filter:url(common.filters#shadow)">
+               <circle style="fill:none;stroke:#fff;stroke-width:2" clip-path="url(#clip)" cx="32" cy="32" r="23"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair48.svg b/gfx/crosshairs/luma/gfx/crosshair48.svg
index df9b47bee7e34f2031d1b9b914349892e6025b55..86612f0acf4ffc1118ba23226570f499fffe52b1 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair48.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair48.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="2" cx="32" cy="32" r="23"/>
-       </g>
+       <circle style="fill:none;stroke:#fff;stroke-width:2;filter:url(common.filters#shadow)" cx="32" cy="32" r="23"/>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair49.svg b/gfx/crosshairs/luma/gfx/crosshair49.svg
index 774077b3aeffdafb3ddffba3da497347acc29fb7..902ca0d2a33743e9b05966466dd5d5bf32896c30 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair49.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair49.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="45" y="9" width="6" height="27"/>
                <rect x="45" y="7" width="6" height="29" transform="matrix(-0.5,0.866,-0.866,-0.5,113.57,30.43)"/>
                <rect x="45" y="7" width="6" height="29" transform="matrix(-0.5,-0.866,0.866,-0.5,30.43,113.57)"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair50.svg b/gfx/crosshairs/luma/gfx/crosshair50.svg
index ed290b1ab1f06a58c518efbb57175d5ccc58934d..1903f18dc8ed6e77627d69debeef3577e49ae1f9 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair50.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair50.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="60" y="45" width="27" height="6"/>
                <rect x="45" y="60" width="6" height="27"/>
                <rect x="9" y="45" width="27" height="6"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair51.svg b/gfx/crosshairs/luma/gfx/crosshair51.svg
index 57c3bb666d675841cc2b56f6346aeaa17d188501..451ba73cc651338efe383afb59835a03808c311d 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair51.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair51.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="45" y="9" width="6" height="27"/>
                <rect x="60" y="45" width="27" height="6"/>
                <rect x="45" y="60" width="6" height="27"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair52.svg b/gfx/crosshairs/luma/gfx/crosshair52.svg
index e32072e0e1dca537f1dd4c47afa91e7eb0cc50f9..97b30b04997f28c138202996dc2e7c0657ff7ff5 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair52.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair52.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <path d="M 55,37 75,17 79,21 59,41 z"/>
                <path d="M 41,37 21,17 17,21 37,41 z"/>
                <path d="M 55,59 75,79 79,75 59,55 z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair53.svg b/gfx/crosshairs/luma/gfx/crosshair53.svg
index f4356ba69ddfa5817f344da3fa7d50552626080d..d03d571249d166f59ff24ce4531725e48160c1f8 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair53.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair53.svg
@@ -8,7 +8,7 @@
                        <rect x="0" y="57" width="39" height="39"/>
                </clipPath>
        </defs>
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="6" clip-path="url(#clip)" cx="48" cy="48" r="34"/>
+       <g style="filter:url(common.filters#shadow)">
+               <circle style="fill:none;stroke:#fff;stroke-width:6" clip-path="url(#clip)" cx="48" cy="48" r="34"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair54.svg b/gfx/crosshairs/luma/gfx/crosshair54.svg
index 75ef1e2b7c34a59f3f0bc65c78d6b5837a762dbd..38f63c0c1f00503194b76ac29e614df224182644 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair54.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair54.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="6" cx="48" cy="48" r="34"/>
-       </g>
+       <circle style="fill:none;stroke:#fff;stroke-width:6;filter:url(common.filters#shadow)"  cx="48" cy="48" r="34"/>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair55.svg b/gfx/crosshairs/luma/gfx/crosshair55.svg
index 7b67221457269ae0f908e5d12bdbc0f11ba7afc7..cf3e9913d39185203b272841792c7e47e3f27f27 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair55.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair55.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1">
-       <g filter="url(common.filters#shadow)" fill="#fff">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect y="31" x="3" height="2" width="22"/>
                <rect y="31" x="39" height="2" width="22"/>
                <rect y="9" x="31" height="16" width="2"/>
                <rect y="38" x="31" height="16" width="2"/>
-               <g opacity=".3">
+               <g style="fill:#f1f1f1;opacity:.3">
                        <path d="m7 26 4.5-6h7.5l-4 6z"/>
                        <path d="m7 38 4.5 6h7.5l-4-6z"/>
                        <path d="m57 26-4.5-6h-7.5l4 6z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair56.svg b/gfx/crosshairs/luma/gfx/crosshair56.svg
index ee380a85842c54df2a53dcfb79cf50282798b2f3..52909e646f5eca3ce2e74a90b84af845fc58fa49 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair56.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair56.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="fill:#fff;filter:url(common.filters#shadow)">
                <rect x="31" y="6" width="2" height="18"/>
                <rect x="40" y="31" width="18" height="2"/>
                <rect x="31" y="40" width="2" height="18"/>
                <rect x="6" y="31" width="18" height="2"/>
-               <g opacity="0.5">
+               <g style="fill:#f3f3f3;opacity:.5">
                        <path d="m 11,11 0,12 4,0 0,-8 8,0 0,-4 z"/>
                        <path d="m 53,11 0,12 -4,0 0,-8 -8,0 0,-4 z"/>
                        <path d="m 11,53 0,-12 4,0 0,8 8,0 0,4 z"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair57.svg b/gfx/crosshairs/luma/gfx/crosshair57.svg
index 6dc531aeaaaba4cd42581f9f42cb120caa4c2e3d..faf38ba9ab4e76c560b628443a829847f982b1b1 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair57.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair57.svg
@@ -8,9 +8,9 @@
                        <rect y="42" x="0" width="23" height="23"/>
                </clipPath>
        </defs>
-       <g filter="url(common.filters#shadow)">
-               <circle fill="none" stroke="#fff" stroke-width="4" opacity="0.5" clip-path="url(#clip)" cx="32" cy="32" r="25"/>
-               <g fill="#fff">
+       <g style="filter:url(common.filters#shadow)">
+               <circle style="fill:none;stroke:#f3f3f3;stroke-width:4;opacity:.5" clip-path="url(#clip)" cx="32" cy="32" r="25"/>
+               <g style="fill:#fff">
                        <rect x="31" y="6" width="2" height="18"/>
                        <rect x="40" y="31" width="18" height="2"/>
                        <rect x="31" y="40" width="2" height="18"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair58.svg b/gfx/crosshairs/luma/gfx/crosshair58.svg
index b32453a95199d1ae91b6363e3e287a7db2ccf68d..ce75fd4f750ec292b893c5e2175aa0c1e50ccb4d 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair58.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair58.svg
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="96" height="96">
-       <g fill="#fff" filter="url(common.filters#shadow)">
-               <g opacity="0.5">
+       <g style="filter:url(common.filters#shadow)">
+               <g style="fill:#f3f3f3;opacity:.5">
                        <path id="segment" d="m 46,10 0,3 c -7.4,0 -14.2,2.3 -19.8,6.2 l 1.1,1.7 C 18.7,26.8 13,36.7 13,48 l -3.5,0 c 0,6.7 1.8,13 5,18.4 l 5.6,-3.3 C 17.5,58.7 16,53.5 16,48 16,31.4 29.4,18 46,18 c 3.5,0 6.9,0.6 10,1.7 L 58.7,12.2 C 54.7,10.8 50.5,10 46,10 z"/>
                        <use xlink:href="#segment" transform="matrix(-1,0,0,-1,96,96)"/>
                </g>
-               <use xlink:href="#segment" transform="matrix(0,0.5,-0.5,0,72,25)"/>
-               <use xlink:href="#segment" transform="matrix(0,-0.5,0.5,0,24,71)"/>
+               <g style="fill:#fff">
+                       <use xlink:href="#segment" transform="matrix(0,0.5,-0.5,0,72,25)"/>
+                       <use xlink:href="#segment" transform="matrix(0,-0.5,0.5,0,24,71)"/>
+               </g>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair59.svg b/gfx/crosshairs/luma/gfx/crosshair59.svg
index 8275d3955c6abde9c984d2e4d3209e9f4f0ae4cd..60eafad197f984f177e0079b8af683a49645ef8a 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair59.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair59.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="96" width="96" version="1.1">
-       <g filter="url(common.filters#shadow)" fill="#fff">
+       <g style="filter:url(common.filters#shadow)">
                <g id="segment">
-                       <path opacity=".6" d="m24 18-17 16v10h3v8h-3v10l17 16 1.67772-1.8047c-8.6253-6.8169-13.6628-17.2014-13.6777-28.1953 0.0007-11.0005 5.0309-21.397 13.6562-28.2246z"/>
-                       <path d="m52.0176 28.9492-1.0176 3.0508h-6l-1.0156-3.0488c-3.9372 1.80521-7.44851 5.85226-9.83984 9.23438l2.43945 1.72852c2.6216-3.7055 6.8769-5.91 11.416-5.9141 4.5377 0.006944 8.7906 2.21274 11.4102 5.91797l2.45312-1.73828c-2.39302-3.38148-5.90768-7.42694-9.8457-9.23047z"/>
-                       <path opacity=".3" d="m47 19v8h2v-8z"/>
-                       <path opacity=".3" d="m19 49h9v-2h-9z"/>
+                       <path style="fill:#fff" d="m52.0176 28.9492-1.0176 3.0508h-6l-1.0156-3.0488c-3.9372 1.80521-7.44851 5.85226-9.83984 9.23438l2.43945 1.72852c2.6216-3.7055 6.8769-5.91 11.416-5.9141 4.5377 0.006944 8.7906 2.21274 11.4102 5.91797l2.45312-1.73828c-2.39302-3.38148-5.90768-7.42694-9.8457-9.23047z"/>
+                       <path style="fill:#f6f6f6;opacity:.6" d="m24 18-17 16v10h3v8h-3v10l17 16 1.67772-1.8047c-8.6253-6.8169-13.6628-17.2014-13.6777-28.1953 0.0007-11.0005 5.0309-21.397 13.6562-28.2246z"/>
+                       <path style="fill:#f1f1f1;opacity:.3" d="m47 19v8h2v-8z"/>
+                       <path style="fill:#f1f1f1;opacity:.3" d="m19 49h9v-2h-9z"/>
                </g>
                <use xlink:href="#segment" transform="matrix(-1,0,0,-1,96,96)"/>
        </g>

diff --git a/gfx/crosshairs/luma/gfx/crosshair60.svg b/gfx/crosshairs/luma/gfx/crosshair60.svg
index bcb569aa0576d1bc2d5dff485f7f7f5b353076b4..537cc1d85ba9b674ef96db001f5e0c2cb1d07e91 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair60.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair60.svg
@@ -12,8 +12,8 @@
                        <path d="M 48,52.6 -27,96 123,96 z" transform="matrix(-0.5,-0.866,0.866,-0.5,30.43,113.57)"/>
                </clipPath>
        </defs>
-       <g fill="none" stroke="#fff" filter="url(common.filters#shadow)">
-               <circle clip-path="url(#clip-outer)" stroke-width="6" cx="48" cy="48" r="34"/>
-               <circle clip-path="url(#clip-inner)" stroke-width="3" cx="48" cy="48" r="12.5" opacity="0.6"/>
+       <g style="fill:none;filter:url(common.filters#shadow)">
+               <circle style="stroke:#fff;stroke-width:6" clip-path="url(#clip-outer)" cx="48" cy="48" r="34"/>
+               <circle style="stroke:#f6f6f6;stroke-width:3;opacity:.6" clip-path="url(#clip-inner)" cx="48" cy="48" r="12.5"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair61.svg b/gfx/crosshairs/luma/gfx/crosshair61.svg
index 57dff7a88e8c54eecfca36e2a6bde17b8a51d79e..91449cbb1c0b767f123629ad213db6270ecf576f 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair61.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair61.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="96" width="96" version="1.1">
-       <g filter="url(common.filters#shadow)">
-               <g id="segment" fill="#fff">
-                       <path d="m37 16 2 1 3-6h12l3 6 2-1-3-8h-16z"/>
-                       <path opacity=".6" d="m47 20v10h2v-10z"/>
+       <g style="filter:url(common.filters#shadow)">
+               <g id="segment">
+                       <path style="fill:#fff" d="m37 16 2 1 3-6h12l3 6 2-1-3-8h-16z"/>
+                       <path style="fill:#f6f6f6;opacity:.6" d="m47 20v10h2v-10z"/>
                </g>
                <use xlink:href="#segment" transform="matrix(-.5 .866 -.866 -.5 113.57 30.43)"/>
                <use xlink:href="#segment" transform="matrix(-.5 -.866 .866 -.5 30.43 113.57)"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair62.svg b/gfx/crosshairs/luma/gfx/crosshair62.svg
index 6f17bf2759ee069bf04ee309841c5add3c79cf3a..9ffe8fbee3060ff243b7f430402b6eb2e36408c6 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair62.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair62.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="96" width="96" version="1.1">
-       <g fill="none" stroke="#fff" filter="url(common.filters#shadow)">
-               <path id="segment" stroke-width="5" d="m29 23 5-9h28l5 9"/>
+       <g style="fill:none;filter:url(common.filters#shadow)">
+               <path id="segment" style="stroke:#fff;stroke-width:5" d="m29 23 5-9h28l5 9"/>
                <use xlink:href="#segment" transform="matrix(-.5 .866 -.866 -.5 113.57 30.43)"/>
                <use xlink:href="#segment" transform="matrix(-.5 -.866 .866 -.5 30.43 113.57)"/>
-               <path stroke-width="2" opacity="0.5" d="m45.3522 34-10.6235 18.4035 2.6478 4.58473h21.247l2.6478-4.58473-10.6235-18.4035h-5.2956z"/>
+               <path style="stroke:#f3f3f3;stroke-width:2;opacity:.5" d="m45.3522 34-10.6235 18.4035 2.6478 4.58473h21.247l2.6478-4.58473-10.6235-18.4035h-5.2956z"/>
        </g>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshair63.svg b/gfx/crosshairs/luma/gfx/crosshair63.svg
index 0e41217e45c3eee60afa47c071209dcb5b205b25..8cbeaa8240113be55a01ed336d5613eac54f31e0 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair63.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair63.svg
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" height="112" width="112" version="1.1">
-       <g filter="url(common.filters#shadow)">
-               <g fill="#fff">
+       <g style="filter:url(common.filters#shadow)">
+               <g style="fill:#fff">
                        <path d="m44 51v-8h-7l-6 6h-22v2z"/>
                        <path d="m44 61v8h-7l-6-6h-22v-2z"/>
                        <path d="m68 51v-8h7l6 6h22v2z"/>
                        <path d="m68 61v8h7l6-6h22v-2z"/>
                </g>
-               <g opacity=".5" fill="#fff">
+               <g style="fill:#f3f3f3;opacity:.5">
                        <rect y="64" x="54" width="4" height="19"/>
                        <rect y="29" x="54" width="4" height="19"/>
                </g>
-               <g opacity=".75" stroke="#fff" stroke-width="2.5" fill="none">
+               <g style="fill:none;stroke:#f7f7f7;stroke-width:2.5;opacity:.75">
                        <path d="m49 25.5h-30l-13 13.5"/>
                        <path d="m63 25.5h30l13 13.5"/>
                        <path d="m49 86.5h-30l-13-13.5"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair64.svg b/gfx/crosshairs/luma/gfx/crosshair64.svg
index 47a81b0b1ab8433facd9606fd46a864baa67d5ff..2468e9805d1a3d8b80ed147e6cecb6a5c79ec898 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair64.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair64.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="128" height="128">
-       <g fill="#fff" filter="url(common.filters#shadow)">
+       <g style="filter:url(common.filters#shadow)">
                <g id="segment">
-                       <path opacity="0.5" d="m 72.9,14.8 -0.7,4 c 18.8,3.3 33.7,18.2 37.1,37 l 7.8,-1.5 c -1.3,-7.1 -3.9,-13.7 -7.7,-19.6 l -5.8,-1.3 C 96.2,23.9 85.3,17.1 72.9,14.8 z"/>
-                       <path d="m 68.9,36.9 -0.8,4.4 c 10.7,1.5 19.2,8.8 21.4,18.1 l 2.4,-0.5 C 90.5,52.8 86.6,47.5 81.1,43.8 L 80.3,40.7 C 76.9,38.8 73.1,37.5 68.9,36.9 z"/>
+                       <path style="fill:#f3f3f3;opacity:.5" d="m 72.9,14.8 -0.7,4 c 18.8,3.3 33.7,18.2 37.1,37 l 7.8,-1.5 c -1.3,-7.1 -3.9,-13.7 -7.7,-19.6 l -5.8,-1.3 C 96.2,23.9 85.3,17.1 72.9,14.8 z"/>
+                       <path style="fill:#fff" d="m 68.9,36.9 -0.8,4.4 c 10.7,1.5 19.2,8.8 21.4,18.1 l 2.4,-0.5 C 90.5,52.8 86.6,47.5 81.1,43.8 L 80.3,40.7 C 76.9,38.8 73.1,37.5 68.9,36.9 z"/>
                </g>
                <use xlink:href="#segment" transform="matrix(1,0,0,-1,0,128)"/>
                <use xlink:href="#segment" transform="matrix(-1,0,0,1,128,0)"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair65.svg b/gfx/crosshairs/luma/gfx/crosshair65.svg
index 15506bbb0cd23603a4efb7a0689de561cfbe75bc..5b1fbde6ee098d68ee8b638f4c1f50ca6d7ec3ef 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair65.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair65.svg
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.1">
-       <g filter="url(common.filters#shadow)">
-               <g stroke="#fff" fill="none">
-                       <g opacity=".7" stroke-width="5">
-                               <path d="m115 78a37 37 0 0 1 -37 37"/>
-                               <path d="m14 77a37 37 0 0 0 37 37"/>
-                               <path d="m14 51a37 37 0 0 1 37 -37"/>
-                               <path d="m114 51a37 37 0 0 0 -37 -37"/>
-                       </g>
-                       <g stroke-width="2">
+       <g style="filter:url(common.filters#shadow)">
+               <g style="fill:none">
+                       <g style="stroke:#fff;stroke-width:2">
                                <path d="m76.5 61a9.5 9.5 0 0 0 -9.5 -9.5"/>
                                <path d="m76.5 67a9.5 9.5 0 0 1 -9.5 9.5"/>
                                <path d="m51.5 67a9.5 9.5 0 0 0 9.5 9.5"/>
                                <path d="m51.5 61a9.5 9.5 0 0 1 9.5 -9.5"/>
                        </g>
+                       <g style="stroke:#f7f7f7;stroke-width:5;opacity:.7">
+                               <path d="m115 78a37 37 0 0 1 -37 37"/>
+                               <path d="m14 77a37 37 0 0 0 37 37"/>
+                               <path d="m14 51a37 37 0 0 1 37 -37"/>
+                               <path d="m114 51a37 37 0 0 0 -37 -37"/>
+                       </g>
                </g>
-               <g opacity=".4" fill="#fff">
+               <g style="fill:#f2f2f2;opacity:.4">
                        <rect y="20" x="54" height="2" width="20"/>
                        <rect y="26" x="58" height="2" width="12"/>
                        <rect y="32" x="62" height="2" width="4"/>

diff --git a/gfx/crosshairs/luma/gfx/crosshair66.svg b/gfx/crosshairs/luma/gfx/crosshair66.svg
index 5025064d9b834e0f3723889bb67956bf3b807989..7f52851a8e2ef3268221d70e04806e32f89ba246 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshair66.svg
+++ b/gfx/crosshairs/luma/gfx/crosshair66.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="128" width="128" version="1.1">
-       <g filter="url(common.filters#shadow)">
-               <g id="segment" fill="#fff">
-                       <path opacity=".75" d="m33.4258 108.471a54 54 0 0 1 -22.7832 -36.471h10.1504a44 44 0 0 0 0.287109 1.53711l-6.82812 1.51758a51 51 0 0 0 5.94531 14.9531l0.859375-0.509766a50 50 0 0 0 14.6464 15.66l-2.27734 3.3125zm0-88.9414a54 54 0 0 0 -22.7832 36.4704h10.1504a44 44 0 0 1 0.287109 -1.53711l-6.82812-1.51758a51 51 0 0 1 5.94531 -14.9531l0.859375 0.509766a50 50 0 0 1 14.6464 -15.6602l-2.27734-3.3125z"/>
-                       <path opacity=".5" d="m34.2 40.4 2.3 1.9c2.9-3.6 6.5-6.6 10.5-8.9l1 1.8c4.7-2.7 10.2-4.2 16-4.2s11.3 1.5 16 4.2l1-1.8c4 2.3 7.6 5.3 10.5 8.9l2.3-1.9c-7-8.7-17.7-14.4-29.8-14.4s-22.8 5.7-29.8 14.4z"/>
-                       <path d="m58.3 80.5-0.8 2.4c-4.2-1.5-7.8-4.3-10.2-7.9l-5.3-2.5-1-7.5h4v-2h-4l1-7.5 5.3-2.5c2.4-3.6 6-6.4 10.2-7.9l0.8 2.4c-6.9 2.3-11.8 8.8-11.8 16.5s4.9 14.2 11.8 16.5z"/>
+       <g style="filter:url(common.filters#shadow)">
+               <g id="segment">
+                       <path style="fill:#f7f7f7;opacity:.75" d="m33.4258 108.471a54 54 0 0 1 -22.7832 -36.471h10.1504a44 44 0 0 0 0.287109 1.53711l-6.82812 1.51758a51 51 0 0 0 5.94531 14.9531l0.859375-0.509766a50 50 0 0 0 14.6464 15.66l-2.27734 3.3125zm0-88.9414a54 54 0 0 0 -22.7832 36.4704h10.1504a44 44 0 0 1 0.287109 -1.53711l-6.82812-1.51758a51 51 0 0 1 5.94531 -14.9531l0.859375 0.509766a50 50 0 0 1 14.6464 -15.6602l-2.27734-3.3125z"/>
+                       <path style="fill:#f3f3f3;opacity:.5" d="m34.2 40.4 2.3 1.9c2.9-3.6 6.5-6.6 10.5-8.9l1 1.8c4.7-2.7 10.2-4.2 16-4.2s11.3 1.5 16 4.2l1-1.8c4 2.3 7.6 5.3 10.5 8.9l2.3-1.9c-7-8.7-17.7-14.4-29.8-14.4s-22.8 5.7-29.8 14.4z"/>
+                       <path style="fill:#fff" d="m58.3 80.5-0.8 2.4c-4.2-1.5-7.8-4.3-10.2-7.9l-5.3-2.5-1-7.5h4v-2h-4l1-7.5 5.3-2.5c2.4-3.6 6-6.4 10.2-7.9l0.8 2.4c-6.9 2.3-11.8 8.8-11.8 16.5s4.9 14.2 11.8 16.5z"/>
                </g>
                <use xlink:href="#segment" transform="matrix(-1,0,0,-1,128,128)"/>
        </g>

diff --git a/gfx/crosshairs/luma/gfx/crosshairdot.svg b/gfx/crosshairs/luma/gfx/crosshairdot.svg
index ac35d3874b9e49eef4986e03d2af715dad35f458..886f94385852c6a8c74b441ba246580299de470c 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshairdot.svg
+++ b/gfx/crosshairs/luma/gfx/crosshairdot.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128">
-       <g filter="url(common.filters#shadowdot)">
-               <circle fill="#fff" cx="64" cy="64" r="7"/>
-       </g>
+       <circle style="fill:#fff;filter:url(common.filters#shadowdot)" cx="64" cy="64" r="7"/>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshairmoustache.svg b/gfx/crosshairs/luma/gfx/crosshairmoustache.svg
index 19a85989da665efca5f35bc2816bb8380ef9a0a2..8a4ea378c713bbe6332665148d97871f6a20da5b 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshairmoustache.svg
+++ b/gfx/crosshairs/luma/gfx/crosshairmoustache.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <path fill="#fff" filter="url(common.filters#shadow)" d="m 8,26 c -3,0 -5,3 -5,6 0,6 5,10 15,10 7,0 11,-3 14,-7 3,4 7,7 14,7 10,0 15,-4 15,-10 0,-3 -2,-6 -5,-6 -2,0 -4,2 -3,4 1,-2 4,-2 4,1 0,2 -2,3 -4,3 -6,0 -8,-8 -14,-8 -3,0 -5,1 -7,4 -2,-3 -4,-4 -7,-4 -6,0 -8,8 -14,8 -2,0 -4,-1 -4,-3 0,-3 3,-3 4,-1 1,-2 -1,-4 -3,-4 z"/>
+       <path style="fill:#fff;filter:url(common.filters#shadow)" d="m 8,26 c -3,0 -5,3 -5,6 0,6 5,10 15,10 7,0 11,-3 14,-7 3,4 7,7 14,7 10,0 15,-4 15,-10 0,-3 -2,-6 -5,-6 -2,0 -4,2 -3,4 1,-2 4,-2 4,1 0,2 -2,3 -4,3 -6,0 -8,-8 -14,-8 -3,0 -5,1 -7,4 -2,-3 -4,-4 -7,-4 -6,0 -8,8 -14,8 -2,0 -4,-1 -4,-3 0,-3 3,-3 4,-1 1,-2 -1,-4 -3,-4 z"/>
 </svg>

diff --git a/gfx/crosshairs/luma/gfx/crosshairtuba.svg b/gfx/crosshairs/luma/gfx/crosshairtuba.svg
index 587e9527f72a6ff0457d7f58535ec9cf5f3db6f5..bf8b466cfe315ecb85e738fe60fb02ed6ca96878 100644 (file)
--- a/gfx/crosshairs/luma/gfx/crosshairtuba.svg
+++ b/gfx/crosshairs/luma/gfx/crosshairtuba.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <path fill="#fff" opacity="0.7" filter="url(common.filters#shadow)" d="m 24,49 0,-22 22,-5.5 0,16.4 c -1.5,-0.9 -3.4,-1.4 -5.5,-1.4 -4.7,0 -8.5,2.7 -8.5,6 0,3.3 3.8,6 8.5,6 4.7,0 8.5,-2.7 8.5,-6 L 49,12 21,19 21,44.4 C 19.5,43.5 17.6,43 15.5,43 10.8,43 7,45.7 7,49 c 0,3.3 3.8,6 8.5,6 4.7,0 8.5,-2.7 8.5,-6 z"/>
+       <path style="fill:#f7f7f7;opacity:.75;filter:url(common.filters#shadow)" d="m 24,49 0,-22 22,-5.5 0,16.4 c -1.5,-0.9 -3.4,-1.4 -5.5,-1.4 -4.7,0 -8.5,2.7 -8.5,6 0,3.3 3.8,6 8.5,6 4.7,0 8.5,-2.7 8.5,-6 L 49,12 21,19 21,44.4 C 19.5,43.5 17.6,43 15.5,43 10.8,43 7,45.7 7,49 c 0,3.3 3.8,6 8.5,6 4.7,0 8.5,-2.7 8.5,-6 z"/>
 </svg>

diff --git a/gfx/crosshairs/luma/render-crosshairs.sh b/gfx/crosshairs/luma/render-crosshairs.sh
deleted file mode 100755 (executable)
index 52569e2..0000000
--- a/gfx/crosshairs/luma/render-crosshairs.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-# TASK
-#   Render crosshairs from gfx/crosshair*.svg to DATADIR/gfx/crosshair*.tga,
-#   if they are newer than their target tga file.
-#
-# NOTES
-#   To compensate for filter rendering errors and to reduce rbg noise,
-#   the svg files are rendered at a large size and then scaled down.
-#
-# DEPENDENCIES
-#   rsvg-convert (librsvg)
-#   convert (imagemagick)
-#
-# USAGE
-#   ./render-svg.sh DATADIR
-#
-# USAGE EXAMPLE
-#   ./render-crosshairs.sh ~/.xonotic/data
-
-
-# Check for argument
-if [ -z "$1" ]; then
-       echo "Usage: $0 DATADIR"
-       exit 1
-fi
-
-
-data="$1"; shift
-maxScale=8
-maxPixels=100000000
-
-
-for svg in gfx/*.svg; do
-       ext="${svg##*.}"
-       dir="$data/${svg%/*}"
-       tga="$data/${svg%.*}.tga"
-
-       if [ "$ext" = "svg" ] && [ -f "$svg" ] && [ "$svg" -nt "$tga" ]; then
-               echo "Rendering $tga"
-
-               w=$(identify -format "%w" "$svg")
-               h=$(identify -format "%h" "$svg")
-               scale=$(echo "s=sqrt($maxPixels/$w/$h);if(s>$maxScale)s=$maxScale;s" | bc)
-
-               mkdir -p "$dir"
-               rsvg-convert -z "$scale" "$svg" | convert - -scale "$w" "$tga"
-       fi
-done

diff --git a/gfx/crosshairs/luma/render.sh b/gfx/crosshairs/luma/render.sh
new file mode 100755 (executable)
index 0000000..4d93ba2
--- /dev/null
+++ b/gfx/crosshairs/luma/render.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+# Task:
+#   Render SVG files from ./path/file.svg to OUTDIR/path/file.tga
+#   Overwrites existing tga files.
+#
+# Usage:
+#   ./render.sh OUTDIR SVG...
+#
+# Examples:
+#   One file:  ./render.sh ~/.xonotic/data gfx/crosshair64.svg
+#   All files: ./render.sh ~/.xonotic/data $(find . -name "*.svg")
+#
+# Dependencies:
+#   Inkscape (1.0.1)
+#   ImageMagick (7.0.7)
+
+outDir="$1"; shift
+
+for svg in "$@"; do
+       # Extract name components
+       svgDir=$(dirname -- "$svg")
+       svgName=$(basename -- "$svg" .svg)
+
+       # Compose target file names
+       dir="$outDir/$svgDir"
+       tga="$dir/$svgName.tga"
+       tmp="$dir/$svgName.tmp.png"
+
+       # Ensure target directory exists
+       mkdir --parent "$dir"
+
+       # Render image
+       inkscape --export-filename "$tmp" "$svg"
+       convert -auto-orient "$tmp" -compress RLE "$tga"
+       rm "$tmp"
+done