summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2012-12-21 08:33:52 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx.marker.es>2012-12-21 08:33:52 +0000
commite6d37f6e87aad1a48740c7096408e2457d3527a1 (patch)
tree2c87add33f76e353e66dd954a396b7e65eccd4f4
parentmerge from brach (diff)
downloadinkscape-e6d37f6e87aad1a48740c7096408e2457d3527a1.tar.gz
inkscape-e6d37f6e87aad1a48740c7096408e2457d3527a1.zip
not working
(bzr r11950.1.3)
Diffstat
-rw-r--r--share/icons/icons.svg81
-rw-r--r--share/icons/tango_icons.svg518
-rw-r--r--src/pen-context.cpp844
-rw-r--r--src/pencil-context.cpp19
4 files changed, 712 insertions, 750 deletions
diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 8b4087dca..def0d5d02 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -5586,9 +5586,9 @@
inkscape:window-x="0"
inkscape:window-height="901"
inkscape:window-width="1280"
- inkscape:cy="486.20867"
- inkscape:cx="902.05937"
- inkscape:zoom="7.3367676"
+ inkscape:cy="473.6729"
+ inkscape:cx="953.96494"
+ inkscape:zoom="24.113103"
gridtolerance="6"
snaptogrid="false"
showgrid="true"
@@ -17241,8 +17241,9 @@ http://www.inkscape.org/</dc:description>
<path
sodipodi:nodetypes="ccccccc"
id="path4985-5-5"
- d="m -83.37415,197.5433 c 0,0 -20.67835,0 -20.67835,0 0,0 0,-7.8541 0,-7.8541 0,0 8.84746,0 8.84746,0 0,0 0,13.6806 0,13.6806 0,0 5.91443,0 5.91443,0 0,0 0,-19.3232 0,-19.3232"
- style="fill:none;stroke:#646464;stroke-width:2.25000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ d="m -83.37415,197.5433 -20.67835,0 0,-7.8541 8.84746,0 0,13.6806 5.91443,0 0,-19.35187"
+ style="fill:none;stroke:#646464;stroke-width:2.25000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
<rect
style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
id="rect4989-9-0"
@@ -21733,43 +21734,45 @@ http://www.inkscape.org/</dc:description>
id="rect6174"
style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" />
<g
- style="display:inline"
id="path-mode-bspline"
- inkscape:label="#bspline_mode"
- transform="translate(3.1445385,1.4082523)">
+ transform="matrix(1.3950659,-1.3663987,1.3663987,1.3950659,-466.90113,1305.8744)"
+ inkscape:label="#bspline_mode">
<path
- inkscape:label="#spiro_splines_mode"
- sodipodi:nodetypes="csc"
- id="path-mode-spiro-3"
- d="m 947.71032,68.297825 c 0,0 -0.19425,-4.204156 1.72052,-6.468471 1.94548,-2.300627 5.57499,-2.293308 5.57499,-2.293308"
- style="color:#000000;fill:none;stroke:#0000ff;stroke-width:1.88989151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:none;stroke:#0000ff;stroke-width:0.99609488;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
+ d="m 961.86036,56.036072 c 0,0 1.37815,-1.49823 3.26044,-1.760578 1.88229,-0.262349 3.58408,1.78013 3.58408,1.78013"
+ id="path-mode-spiro-3-8-8"
+ sodipodi:nodetypes="czc"
+ inkscape:label="#spiro_splines_mode" />
<path
- style="fill:none;stroke:#646464;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 945.03712,67.77092 0.0137,-10.388953 9.98731,0"
- id="path6177"
+ inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <rect
- y="56"
- x="954.00323"
- height="1.9975978"
- width="1.9967738"
- id="rect6184"
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
- <rect
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
- id="rect6186"
- width="1.9967738"
- height="1.9975978"
- x="944"
- y="56" />
- <rect
- y="66.921463"
- x="944"
- height="1.9975978"
- width="1.9967738"
- id="rect6188"
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+ id="path6177-8-2"
+ d="m 960.66889,54.876493 4.48905,-4.557718 4.81244,4.713556"
+ style="fill:none;stroke:#646464;stroke-width:0.76814532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ <rect
+ y="-639.91193"
+ x="724.22583"
+ height="1.0229635"
+ width="1.0225416"
+ id="rect8372-9-8"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)" />
+ <rect
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ id="rect6941"
+ width="1.0225416"
+ height="1.0229635"
+ x="724.2002"
+ y="-633.33978" />
+ <rect
+ y="-639.91193"
+ x="731.08893"
+ height="1.0229635"
+ width="1.0225416"
+ id="rect6954"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)" />
</g>
</svg>
diff --git a/share/icons/tango_icons.svg b/share/icons/tango_icons.svg
index 9ce4ffaa7..f899ba5a9 100644
--- a/share/icons/tango_icons.svg
+++ b/share/icons/tango_icons.svg
@@ -15595,9 +15595,9 @@
inkscape:window-x="0"
inkscape:window-height="901"
inkscape:window-width="1280"
- inkscape:cy="1797.8658"
- inkscape:cx="1840.914"
- inkscape:zoom="11.53749"
+ inkscape:cy="1825.5274"
+ inkscape:cx="1880.696"
+ inkscape:zoom="8.01176"
gridtolerance="10000"
snaptogrid="false"
showgrid="false"
@@ -16568,7 +16568,7 @@ http://www.inkscape.org/</dc:description>
transform="translate(-64,-4)">
<path
transform="matrix(1.795342,0,0,1.795342,-669.664,-176.9133)"
- d="m 843,222.75 c 0,0.6904 -0.3358,1.25 -0.75,1.25 -0.4142,0 -0.75,-0.5596 -0.75,-1.25 0,-0.6904 0.3358,-1.25 0.75,-1.25 0.4142,0 0.75,0.5596 0.75,1.25 z"
+ d="m 843,222.75 c 0,0.69036 -0.33579,1.25 -0.75,1.25 -0.41421,0 -0.75,-0.55964 -0.75,-1.25 0,-0.69036 0.33579,-1.25 0.75,-1.25 0.41421,0 0.75,0.55964 0.75,1.25 z"
sodipodi:ry="1.25"
sodipodi:rx="0.75"
sodipodi:cy="222.75"
@@ -16826,7 +16826,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1114.5"
sodipodi:rx="12.5"
sodipodi:ry="2.5"
- d="m 1184,1114.5 c 0,1.381 -5.596,2.5 -12.5,2.5 -6.904,0 -12.5,-1.119 -12.5,-2.5 0,-1.381 5.596,-2.5 12.5,-2.5 6.904,0 12.5,1.119 12.5,2.5 z"
+ d="m 1184,1114.5 c 0,1.3807 -5.5964,2.5 -12.5,2.5 -6.9036,0 -12.5,-1.1193 -12.5,-2.5 0,-1.3807 5.5964,-2.5 12.5,-2.5 6.9036,0 12.5,1.1193 12.5,2.5 z"
transform="matrix(0.7999997,0,0,0.7999901,-925.19967,-871.58883)" />
<path
style="fill:url(#linearGradient13381);fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -16860,11 +16860,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1412.1292"
sodipodi:rx="1.5026019"
sodipodi:ry="1.5026019"
- d="m 1161.776,1412.129 c 0,0.83 -0.672,1.503 -1.502,1.503 -0.83,0 -1.503,-0.673 -1.503,-1.503 0,-0.83 0.673,-1.502 1.503,-1.502 0.83,0 1.502,0.672 1.502,1.502 z"
+ d="m 1161.7764,1412.1292 c 0,0.8298 -0.6727,1.5026 -1.5026,1.5026 -0.8299,0 -1.5026,-0.6728 -1.5026,-1.5026 0,-0.8299 0.6727,-1.5027 1.5026,-1.5027 0.8299,0 1.5026,0.6728 1.5026,1.5027 z"
transform="translate(-1153.0026,-1401.4099)" />
<path
transform="translate(-1143.0026,-1395.4099)"
- d="m 1161.776,1412.129 c 0,0.83 -0.672,1.503 -1.502,1.503 -0.83,0 -1.503,-0.673 -1.503,-1.503 0,-0.83 0.673,-1.502 1.503,-1.502 0.83,0 1.502,0.672 1.502,1.502 z"
+ d="m 1161.7764,1412.1292 c 0,0.8298 -0.6727,1.5026 -1.5026,1.5026 -0.8299,0 -1.5026,-0.6728 -1.5026,-1.5026 0,-0.8299 0.6727,-1.5027 1.5026,-1.5027 0.8299,0 1.5026,0.6728 1.5026,1.5027 z"
sodipodi:ry="1.5026019"
sodipodi:rx="1.5026019"
sodipodi:cy="1412.1292"
@@ -16880,7 +16880,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1412.1292"
sodipodi:rx="1.5026019"
sodipodi:ry="1.5026019"
- d="m 1161.776,1412.129 c 0,0.83 -0.672,1.503 -1.502,1.503 -0.83,0 -1.503,-0.673 -1.503,-1.503 0,-0.83 0.673,-1.502 1.503,-1.502 0.83,0 1.502,0.672 1.502,1.502 z"
+ d="m 1161.7764,1412.1292 c 0,0.8298 -0.6727,1.5026 -1.5026,1.5026 -0.8299,0 -1.5026,-0.6728 -1.5026,-1.5026 0,-0.8299 0.6727,-1.5027 1.5026,-1.5027 0.8299,0 1.5026,0.6728 1.5026,1.5027 z"
transform="translate(-1148.0026,-1398.4099)" />
<path
style="fill:none;fill-rule:evenodd;stroke:#555753;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
@@ -16895,11 +16895,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1412.1292"
sodipodi:rx="1.5026019"
sodipodi:ry="1.5026019"
- d="m 1161.776,1412.129 c 0,0.83 -0.672,1.503 -1.502,1.503 -0.83,0 -1.503,-0.673 -1.503,-1.503 0,-0.83 0.673,-1.502 1.503,-1.502 0.83,0 1.502,0.672 1.502,1.502 z"
+ d="m 1161.7764,1412.1292 c 0,0.8298 -0.6727,1.5026 -1.5026,1.5026 -0.8299,0 -1.5026,-0.6728 -1.5026,-1.5026 0,-0.8299 0.6727,-1.5027 1.5026,-1.5027 0.8299,0 1.5026,0.6728 1.5026,1.5027 z"
transform="translate(-1153.0026,-1395.4099)" />
<path
transform="translate(-1143.0026,-1401.4099)"
- d="m 1161.776,1412.129 c 0,0.83 -0.672,1.503 -1.502,1.503 -0.83,0 -1.503,-0.673 -1.503,-1.503 0,-0.83 0.673,-1.502 1.503,-1.502 0.83,0 1.502,0.672 1.502,1.502 z"
+ d="m 1161.7764,1412.1292 c 0,0.8298 -0.6727,1.5026 -1.5026,1.5026 -0.8299,0 -1.5026,-0.6728 -1.5026,-1.5026 0,-0.8299 0.6727,-1.5027 1.5026,-1.5027 0.8299,0 1.5026,0.6728 1.5026,1.5027 z"
sodipodi:ry="1.5026019"
sodipodi:rx="1.5026019"
sodipodi:cy="1412.1292"
@@ -17266,7 +17266,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.119829,0,0,0.105878,237.4457,94.48869)"
- d="m 280,97.5 c 0,3.5899 -2.7982,6.5 -6.25,6.5 -3.4518,0 -6.25,-2.9101 -6.25,-6.5 0,-3.58985 2.7982,-6.5 6.25,-6.5 3.4518,0 6.25,2.91015 6.25,6.5 z"
+ d="m 280,97.5 c 0,3.58985 -2.79822,6.5 -6.25,6.5 -3.45178,0 -6.25,-2.91015 -6.25,-6.5 0,-3.589851 2.79822,-6.5 6.25,-6.5 3.45178,0 6.25,2.910149 6.25,6.5 z"
sodipodi:ry="6.5"
sodipodi:rx="6.25"
sodipodi:cy="97.5"
@@ -17281,7 +17281,7 @@ http://www.inkscape.org/</dc:description>
style="fill:url(#linearGradient11335);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11359);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(0.401393,0,0,0.385965,168.1187,65.35082)"
- d="m 280,97.5 c 0,3.5899 -2.7982,6.5 -6.25,6.5 -3.4518,0 -6.25,-2.9101 -6.25,-6.5 0,-3.58985 2.7982,-6.5 6.25,-6.5 3.4518,0 6.25,2.91015 6.25,6.5 z"
+ d="m 280,97.5 c 0,3.58985 -2.79822,6.5 -6.25,6.5 -3.45178,0 -6.25,-2.91015 -6.25,-6.5 0,-3.589851 2.79822,-6.5 6.25,-6.5 3.45178,0 6.25,2.910149 6.25,6.5 z"
sodipodi:ry="6.5"
sodipodi:rx="6.25"
sodipodi:cy="97.5"
@@ -17646,7 +17646,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:nodetypes="cccsccccc" />
<path
transform="matrix(0.938759,0,0,0.938488,13.33429,5.86879)"
- d="m 262,78.5 c 0,1.933 -1.567,3.5 -3.5,3.5 -1.933,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
+ d="m 262,78.5 c 0,1.932997 -1.567,3.5 -3.5,3.5 -1.933,0 -3.5,-1.567003 -3.5,-3.5 0,-1.932997 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567003 3.5,3.5 z"
sodipodi:ry="3.5"
sodipodi:rx="3.5"
sodipodi:cy="78.5"
@@ -17678,7 +17678,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="135"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 65,135 c 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 0.55228,0 1,0.4477 1,1 z"
+ d="m 65,135 c 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 0.552285,0 1,0.44772 1,1 z"
transform="matrix(-1,0,0,1,321.0144,-55.92699)" />
<path
sodipodi:type="arc"
@@ -17688,7 +17688,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="135"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 65,135 c 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 0.55228,0 1,0.4477 1,1 z"
+ d="m 65,135 c 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 0.552285,0 1,0.44772 1,1 z"
transform="matrix(-1.5,0,0,1.5,351.5144,-122.927)" />
</g>
<g
@@ -19001,7 +19001,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="309.5"
sodipodi:rx="3.5"
sodipodi:ry="3.5"
- d="m 86,309.5 c 0,1.933 -1.567,3.5 -3.5,3.5 -1.933,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
+ d="m 86,309.5 c 0,1.933 -1.567003,3.5 -3.5,3.5 -1.932997,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567003,-3.5 3.5,-3.5 1.932997,0 3.5,1.567 3.5,3.5 z"
transform="translate(39.50246,0.5)" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -19597,7 +19597,7 @@ http://www.inkscape.org/</dc:description>
id="path5212" />
<path
transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)"
- d="m 67,714 c 0,2.2091 -1.567,4 -3.5,4 -1.933,0 -3.5,-1.7909 -3.5,-4 0,-2.2091 1.567,-4 3.5,-4 1.933,0 3.5,1.7909 3.5,4 z"
+ d="m 67,714 c 0,2.20914 -1.567003,4 -3.5,4 -1.932997,0 -3.5,-1.79086 -3.5,-4 0,-2.20914 1.567003,-4 3.5,-4 1.932997,0 3.5,1.79086 3.5,4 z"
sodipodi:ry="4"
sodipodi:rx="3.5"
sodipodi:cy="714"
@@ -19607,7 +19607,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)"
- d="m 67,714 c 0,2.2091 -1.567,4 -3.5,4 -1.933,0 -3.5,-1.7909 -3.5,-4 0,-2.2091 1.567,-4 3.5,-4 1.933,0 3.5,1.7909 3.5,4 z"
+ d="m 67,714 c 0,2.20914 -1.567003,4 -3.5,4 -1.932997,0 -3.5,-1.79086 -3.5,-4 0,-2.20914 1.567003,-4 3.5,-4 1.932997,0 3.5,1.79086 3.5,4 z"
sodipodi:ry="4"
sodipodi:rx="3.5"
sodipodi:cy="714"
@@ -20418,7 +20418,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="210.5"
sodipodi:rx="5.5"
sodipodi:ry="5.5"
- d="m 111,210.5 c 0,3.0376 -2.4624,5.5 -5.5,5.5 -3.0376,0 -5.5,-2.4624 -5.5,-5.5 0,-3.0376 2.4624,-5.5 5.5,-5.5 3.0376,0 5.5,2.4624 5.5,5.5 z"
+ d="m 111,210.5 c 0,3.03757 -2.46243,5.5 -5.5,5.5 -3.03757,0 -5.5,-2.46243 -5.5,-5.5 0,-3.03757 2.46243,-5.5 5.5,-5.5 3.03757,0 5.5,2.46243 5.5,5.5 z"
transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)" />
<path
sodipodi:type="arc"
@@ -20428,7 +20428,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="210.5"
sodipodi:rx="5.5"
sodipodi:ry="5.5"
- d="m 111,210.5 c 0,3.0376 -2.4624,5.5 -5.5,5.5 -3.0376,0 -5.5,-2.4624 -5.5,-5.5 0,-3.0376 2.4624,-5.5 5.5,-5.5 3.0376,0 5.5,2.4624 5.5,5.5 z"
+ d="m 111,210.5 c 0,3.03757 -2.46243,5.5 -5.5,5.5 -3.03757,0 -5.5,-2.46243 -5.5,-5.5 0,-3.03757 2.46243,-5.5 5.5,-5.5 3.03757,0 5.5,2.46243 5.5,5.5 z"
transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)" />
</g>
</g>
@@ -21247,7 +21247,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="155.5"
sodipodi:rx="5.5"
sodipodi:ry="5.5"
- d="m 235,155.5 c 0,3.0376 -2.4624,5.5 -5.5,5.5 -3.0376,0 -5.5,-2.4624 -5.5,-5.5 0,-3.0376 2.4624,-5.5 5.5,-5.5 3.0376,0 5.5,2.4624 5.5,5.5 z"
+ d="m 235,155.5 c 0,3.03757 -2.46243,5.5 -5.5,5.5 -3.03757,0 -5.5,-2.46243 -5.5,-5.5 0,-3.03757 2.46243,-5.5 5.5,-5.5 3.03757,0 5.5,2.46243 5.5,5.5 z"
transform="translate(95.41614,59.5)" />
<path
style="opacity:1;fill:#99b7d6;fill-opacity:0.70196078;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
@@ -21342,7 +21342,7 @@ http://www.inkscape.org/</dc:description>
id="rect10834" />
<path
transform="matrix(1.103062,0,0,1.10649,-36.96118,-22.90202)"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
sodipodi:ry="5"
sodipodi:rx="5"
sodipodi:cy="215"
@@ -23028,7 +23028,7 @@ http://www.inkscape.org/</dc:description>
transform="translate(933.99995,170.02599)">
<path
transform="matrix(1.087654,0,0,1.087684,-16.16957,-14.33312)"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
sodipodi:ry="7"
sodipodi:rx="7"
sodipodi:cy="159"
@@ -23045,7 +23045,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:none;fill-opacity:0.07664226;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
sodipodi:ry="7"
sodipodi:rx="7"
sodipodi:cy="159"
@@ -23096,7 +23096,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="159"
sodipodi:rx="7"
sodipodi:ry="7"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
transform="matrix(1.00786,0,0,1.007983,-167.1731,96.0569)" />
<rect
style="opacity:1;fill:none;fill-opacity:0.07664226;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
@@ -23117,7 +23117,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="159"
sodipodi:rx="7"
sodipodi:ry="7"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
transform="matrix(1.00786,0,0,1.007983,-167.8785,95.25998)" />
</g>
<path
@@ -23209,7 +23209,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(0.795464,0,0,0.798577,1003.0102,335.4702)"
- d="m 134,162 c 0,6.6274 -5.3726,12 -12,12 -6.6274,0 -12,-5.3726 -12,-12 0,-6.6274 5.3726,-12 12,-12 6.6274,0 12,5.3726 12,12 z"
+ d="m 134,162 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62742 5.37258,-12 12,-12 6.62742,0 12,5.37258 12,12 z"
sodipodi:ry="12"
sodipodi:rx="12"
sodipodi:cy="162"
@@ -23219,7 +23219,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.707159,0,0,0.70714,1013.7833,350.24387)"
- d="m 134,162 c 0,6.6274 -5.3726,12 -12,12 -6.6274,0 -12,-5.3726 -12,-12 0,-6.6274 5.3726,-12 12,-12 6.6274,0 12,5.3726 12,12 z"
+ d="m 134,162 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62742 5.37258,-12 12,-12 6.62742,0 12,5.37258 12,12 z"
sodipodi:ry="12"
sodipodi:rx="12"
sodipodi:cy="162"
@@ -23239,7 +23239,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(0.795464,0,0,0.798577,24.99896,32.67435)"
- d="m 134,162 c 0,6.6274 -5.3726,12 -12,12 -6.6274,0 -12,-5.3726 -12,-12 0,-6.6274 5.3726,-12 12,-12 6.6274,0 12,5.3726 12,12 z"
+ d="m 134,162 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62742 5.37258,-12 12,-12 6.62742,0 12,5.37258 12,12 z"
sodipodi:ry="12"
sodipodi:rx="12"
sodipodi:cy="162"
@@ -23261,7 +23261,7 @@ http://www.inkscape.org/</dc:description>
x="500"
y="150" />
<path
- d="m 514,158 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.1436 1.1436,-4.1244 3,-5.1962 L 508,158 z"
+ d="m 514,158 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-2.14359 1.14359,-4.12436 3,-5.19615 L 508,158 z"
sodipodi:ry="6"
sodipodi:rx="6"
sodipodi:cy="158"
@@ -23293,7 +23293,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="158"
sodipodi:rx="6"
sodipodi:ry="6"
- d="m 514,158 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.1436 1.1436,-4.1244 3,-5.1962"
+ d="m 514,158 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-2.14359 1.14359,-4.12436 3,-5.19615"
sodipodi:open="true" />
</g>
<g
@@ -23315,14 +23315,14 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="158"
sodipodi:rx="6"
sodipodi:ry="6"
- d="m 514,158 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-3.3137 2.6863,-6 6,-6 3.3137,0 6,2.6863 6,6 z" />
+ d="m 514,158 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z" />
<path
id="path5285"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#c80000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline"
d="M 514,158 L 508,158 L 511,153"
sodipodi:nodetypes="ccc" />
<path
- d="m 514,158 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-3.3137 2.6863,-6 6,-6 3.3137,0 6,2.6863 6,6 z"
+ d="m 514,158 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
sodipodi:ry="6"
sodipodi:rx="6"
sodipodi:cy="158"
@@ -23346,7 +23346,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6582);stroke-width:1.00197148;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(1.486562,-4.131452e-2,3.978424e-2,1.466787,-36.46434,-92.69225)"
- d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z"
+ d="m 109.11231,194.24583 -3.48759,2.20705 -0.0186,4.12722 -3.17675,-2.63488 -3.930991,1.25764 1.524251,-3.83549 -2.410831,-3.34996 4.118791,0.26442 2.44101,-3.32803 1.0213,3.99891 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
@@ -23362,7 +23362,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="star" />
<path
transform="matrix(1.106952,-2.662135e-2,2.826901e-2,1.152858,4.878699,-33.10438)"
- d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 z"
+ d="m 108.97917,194.25051 -3.43374,2.00094 0.015,4.20347 -2.96409,-2.64736 -3.99309,1.31326 1.60183,-3.6371 -2.482907,-3.39184 3.954077,0.39951 2.45857,-3.40952 0.84192,3.884 z"
inkscape:randomized="0"
inkscape:rounded="3.469447e-18"
inkscape:flatsided="false"
@@ -23656,7 +23656,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="14.875"
sodipodi:rx="1.3125"
sodipodi:ry="1.3125"
- d="m 14.1875,14.875 c 0,0.72487 -0.58763,1.3125 -1.3125,1.3125 -0.72487,0 -1.3125,-0.58763 -1.3125,-1.3125 0,-0.72487 0.58763,-1.3125 1.3125,-1.3125 0.72487,0 1.3125,0.58763 1.3125,1.3125 z"
+ d="m 14.1875,14.875 c 0,0.724874 -0.587626,1.3125 -1.3125,1.3125 -0.724874,0 -1.3125,-0.587626 -1.3125,-1.3125 0,-0.724874 0.587626,-1.3125 1.3125,-1.3125 0.724874,0 1.3125,0.587626 1.3125,1.3125 z"
transform="matrix(1.12392,0,0,1.12392,0.83338,-2.58525)" />
<path
style="opacity:1;fill:url(#radialGradient4365);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.0640322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -26798,7 +26798,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(0.375607,0,0,0.376774,698.833,582.9556)" />
<path
sodipodi:type="arc"
@@ -26808,7 +26808,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(0.375607,0,0,0.376774,690.833,572.9556)" />
<path
sodipodi:type="arc"
@@ -26818,7 +26818,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(0.375607,0,0,0.376774,706.833,572.9556)" />
<path
sodipodi:type="arc"
@@ -26828,7 +26828,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(0.375607,0,0,0.376774,698.833,592.9556)" />
<path
id="path3789"
@@ -26890,7 +26890,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807036,304.9623,206.775)" />
<path
sodipodi:type="arc"
@@ -26900,7 +26900,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807036,270.4753,278.716)" />
<path
sodipodi:type="arc"
@@ -26910,7 +26910,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807035,316.828,283.148)" />
<path
sodipodi:type="arc"
@@ -26920,7 +26920,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807035,339.8194,239.9834)" />
<path
sodipodi:type="arc"
@@ -26930,7 +26930,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807036,385.4323,235.551)" />
<path
sodipodi:type="arc"
@@ -26940,7 +26940,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807036,414.1713,206.775)" />
<path
sodipodi:type="arc"
@@ -26950,7 +26950,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(2.158934,0,0,1.807036,414.1713,273.92)" />
<use
transform="matrix(1.957219,0,0,1.633125,337.4381,267.7929)"
@@ -27615,7 +27615,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="714"
sodipodi:rx="3.5"
sodipodi:ry="4"
- d="m 67,714 c 0,2.2091 -1.567,4 -3.5,4 -1.933,0 -3.5,-1.7909 -3.5,-4 0,-2.2091 1.567,-4 3.5,-4 1.933,0 3.5,1.7909 3.5,4 z"
+ d="m 67,714 c 0,2.20914 -1.567003,4 -3.5,4 -1.932997,0 -3.5,-1.79086 -3.5,-4 0,-2.20914 1.567003,-4 3.5,-4 1.932997,0 3.5,1.79086 3.5,4 z"
transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)" />
<path
sodipodi:type="arc"
@@ -27625,7 +27625,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="714"
sodipodi:rx="3.5"
sodipodi:ry="4"
- d="m 67,714 c 0,2.2091 -1.567,4 -3.5,4 -1.933,0 -3.5,-1.7909 -3.5,-4 0,-2.2091 1.567,-4 3.5,-4 1.933,0 3.5,1.7909 3.5,4 z"
+ d="m 67,714 c 0,2.20914 -1.567003,4 -3.5,4 -1.932997,0 -3.5,-1.79086 -3.5,-4 0,-2.20914 1.567003,-4 3.5,-4 1.932997,0 3.5,1.79086 3.5,4 z"
transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)" />
</g>
</g>
@@ -27733,7 +27733,7 @@ http://www.inkscape.org/</dc:description>
transform="matrix(0.483821,0,0,0.485303,1213.8938,1423.348)">
<path
transform="matrix(1.125571,0,0,1.125565,-22.76161,-20.24985)"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
sodipodi:ry="7"
sodipodi:rx="7"
sodipodi:cy="159"
@@ -27750,7 +27750,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:none;fill-opacity:0.07664226;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
<path
transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)"
- d="m 186,159 c 0,3.866 -3.134,7 -7,7 -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 z"
+ d="m 186,159 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
sodipodi:ry="7"
sodipodi:rx="7"
sodipodi:cy="159"
@@ -28222,7 +28222,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1114.5"
sodipodi:rx="12.5"
sodipodi:ry="2.5"
- d="m 1184,1114.5 c 0,1.381 -5.596,2.5 -12.5,2.5 -6.904,0 -12.5,-1.119 -12.5,-2.5 0,-1.381 5.596,-2.5 12.5,-2.5 6.904,0 12.5,1.119 12.5,2.5 z"
+ d="m 1184,1114.5 c 0,1.3807 -5.5964,2.5 -12.5,2.5 -6.9036,0 -12.5,-1.1193 -12.5,-2.5 0,-1.3807 5.5964,-2.5 12.5,-2.5 6.9036,0 12.5,1.1193 12.5,2.5 z"
transform="matrix(0.7999997,0,0,0.7999901,-925.19967,-871.58883)" />
<path
style="fill:url(#linearGradient14323);fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000001999999997;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -28394,7 +28394,7 @@ http://www.inkscape.org/</dc:description>
inkscape:tile-w="2.223736"
inkscape:tile-cy="137.9821"
inkscape:tile-cx="375.0941"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -28724,7 +28724,7 @@ http://www.inkscape.org/</dc:description>
inkscape:tile-w="2.223736"
inkscape:tile-cy="137.9821"
inkscape:tile-cx="375.0941"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -28933,7 +28933,7 @@ http://www.inkscape.org/</dc:description>
inkscape:tile-w="2.223736"
inkscape:tile-cy="137.9821"
inkscape:tile-cx="375.0941"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29202,7 +29202,7 @@ http://www.inkscape.org/</dc:description>
inkscape:tile-w="2.223736"
inkscape:tile-cy="137.9821"
inkscape:tile-cx="375.0941"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29728,7 +29728,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29740,7 +29740,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29752,7 +29752,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29770,7 +29770,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-x0="373.9822"
inkscape:tile-y0="136.8702" />
<path
@@ -29782,13 +29782,13 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-x0="373.9822"
inkscape:tile-y0="136.8702" />
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29800,7 +29800,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29818,7 +29818,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-x0="373.9822"
inkscape:tile-y0="136.8702" />
<path
@@ -29830,7 +29830,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-x0="373.9822"
inkscape:tile-y0="136.8702" />
<path
@@ -29842,13 +29842,13 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-x0="373.9822"
inkscape:tile-y0="136.8702" />
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29879,7 +29879,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="137.9821"
sodipodi:rx="1.111868"
sodipodi:ry="1.111868"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
inkscape:tile-cx="375.0941"
inkscape:tile-cy="137.9821"
inkscape:tile-w="2.223736"
@@ -29889,7 +29889,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29901,7 +29901,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29913,7 +29913,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29925,7 +29925,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29937,7 +29937,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29949,7 +29949,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29961,7 +29961,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29973,7 +29973,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29985,7 +29985,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -29997,7 +29997,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30009,7 +30009,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30021,7 +30021,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30033,7 +30033,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30045,7 +30045,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30057,7 +30057,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30069,7 +30069,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30081,7 +30081,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30093,7 +30093,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30105,7 +30105,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30117,7 +30117,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30129,7 +30129,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30141,7 +30141,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30153,7 +30153,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30165,7 +30165,7 @@ http://www.inkscape.org/</dc:description>
<path
inkscape:tile-y0="136.8702"
inkscape:tile-x0="373.9822"
- d="m 376.206,137.9821 c 0,0.6141 -0.4978,1.1119 -1.1119,1.1119 -0.6141,0 -1.1119,-0.4978 -1.1119,-1.1119 0,-0.6141 0.4978,-1.1119 1.1119,-1.1119 0.6141,0 1.1119,0.4978 1.1119,1.1119 z"
+ d="m 376.20595,137.9821 c 0,0.61407 -0.4978,1.11187 -1.11186,1.11187 -0.61407,0 -1.11187,-0.4978 -1.11187,-1.11187 0,-0.61407 0.4978,-1.11187 1.11187,-1.11187 0.61406,0 1.11186,0.4978 1.11186,1.11187 z"
sodipodi:ry="1.111868"
sodipodi:rx="1.111868"
sodipodi:cy="137.9821"
@@ -30461,7 +30461,7 @@ http://www.inkscape.org/</dc:description>
style="fill:url(#radialGradient13335);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="matrix(0.8121477,0,0,0.8512579,200.89668,191.25706)"
- d="m 1164.428,1360.068 c 0,1.66 -1.425,3.006 -3.182,3.006 -1.757,0 -3.182,-1.346 -3.182,-3.006 0,-1.659 1.425,-3.005 3.182,-3.005 1.757,0 3.182,1.346 3.182,3.005 z"
+ d="m 1164.4281,1360.0684 c 0,1.6597 -1.4246,3.0052 -3.182,3.0052 -1.7574,0 -3.182,-1.3455 -3.182,-3.0052 0,-1.6598 1.4246,-3.0052 3.182,-3.0052 1.7574,0 3.182,1.3454 3.182,3.0052 z"
sodipodi:ry="3.0052037"
sodipodi:rx="3.1819804"
sodipodi:cy="1360.0684"
@@ -30477,7 +30477,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1360.0684"
sodipodi:rx="3.1819804"
sodipodi:ry="3.0052037"
- d="m 1164.428,1360.068 c 0,1.66 -1.425,3.006 -3.182,3.006 -1.757,0 -3.182,-1.346 -3.182,-3.006 0,-1.659 1.425,-3.005 3.182,-3.005 1.757,0 3.182,1.346 3.182,3.005 z"
+ d="m 1164.4281,1360.0684 c 0,1.6597 -1.4246,3.0052 -3.182,3.0052 -1.7574,0 -3.182,-1.3455 -3.182,-3.0052 0,-1.6598 1.4246,-3.0052 3.182,-3.0052 1.7574,0 3.182,1.3454 3.182,3.0052 z"
transform="matrix(0.514363,0,0,0.5446361,546.69803,608.25755)" />
<path
sodipodi:nodetypes="cc"
@@ -30491,7 +30491,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:nodetypes="cc" />
<path
transform="matrix(1.2866046,0,0,1.4474004,-329.90628,-609.56345)"
- d="m 1151.435,1360.068 c 0,0.586 -0.534,1.061 -1.193,1.061 -0.659,0 -1.194,-0.475 -1.194,-1.061 0,-0.585 0.535,-1.06 1.194,-1.06 0.659,0 1.193,0.475 1.193,1.06 z"
+ d="m 1151.4349,1360.0684 c 0,0.5857 -0.5342,1.0606 -1.1932,1.0606 -0.659,0 -1.1932,-0.4749 -1.1932,-1.0606 0,-0.5858 0.5342,-1.0607 1.1932,-1.0607 0.659,0 1.1932,0.4749 1.1932,1.0607 z"
sodipodi:ry="1.0606601"
sodipodi:rx="1.1932427"
sodipodi:cy="1360.0684"
@@ -30517,7 +30517,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1360.0684"
sodipodi:rx="1.1932427"
sodipodi:ry="1.0606601"
- d="m 1151.435,1360.068 c 0,0.586 -0.534,1.061 -1.193,1.061 -0.659,0 -1.194,-0.475 -1.194,-1.061 0,-0.585 0.535,-1.06 1.194,-1.06 0.659,0 1.193,0.475 1.193,1.06 z"
+ d="m 1151.4349,1360.0684 c 0,0.5857 -0.5342,1.0606 -1.1932,1.0606 -0.659,0 -1.1932,-0.4749 -1.1932,-1.0606 0,-0.5858 0.5342,-1.0607 1.1932,-1.0607 0.659,0 1.1932,0.4749 1.1932,1.0607 z"
transform="matrix(1.2414508,0,0,1.868014,-283.96855,-1185.1267)" />
<path
style="fill:#555753;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -32511,7 +32511,7 @@ http://www.inkscape.org/</dc:description>
id="ink_toggle_snap_to_bbox_midpoints">
<path
transform="matrix(0.8749999,0,0,0.875,56.39207,5.147436)"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="33"
@@ -32547,7 +32547,7 @@ http://www.inkscape.org/</dc:description>
id="path9141-9-2-5-1" />
<path
transform="matrix(0.8749999,0,0,0.875,19.93758,6.375)"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="33"
@@ -32578,7 +32578,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="33"
sodipodi:rx="2"
sodipodi:ry="2"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
transform="matrix(0.8749999,0,0,0.875,46.21002,5.147436)" />
</g>
<g
@@ -32674,20 +32674,6 @@ http://www.inkscape.org/</dc:description>
id="layer2"
inkscape:label="tango"
style="display:inline">
- <path
- inkscape:label="#spiro_splines_mode"
- sodipodi:nodetypes="csc"
- id="path-mode-spiro-3-5"
- d="m 1833.899,206.58715 c 0,0 -0.7142,-3.12201 1.2005,-5.38632 1.9455,-2.30063 5.7842,-1.14551 5.7842,-1.14551"
- style="color:#000000;fill:none;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- style="color:#000000;fill:none;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
- d="m 1833.899,206.58715 c 0,0 -0.7142,-3.12201 1.2005,-5.38632 1.9455,-2.30063 5.7842,-1.14551 5.7842,-1.14551"
- id="path10160"
- sodipodi:nodetypes="csc"
- inkscape:label="#spiro_splines_mode" />
<g
id="g1885"
transform="translate(1994.0051,528.87665)"
@@ -32722,7 +32708,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="30.857143"
sodipodi:rx="15.571428"
sodipodi:ry="10.142858"
- d="M 38.14286,30.85714 C 38.14286,36.45889 31.17129,41 22.57143,41 13.97157,41 7,36.45889 7,30.85714 7,25.2554 13.97157,20.71429 22.57143,20.71429 c 8.59986,0 15.57143,4.54111 15.57143,10.14285 z"
+ d="m 38.142857,30.857143 c 0,5.601746 -6.971566,10.142858 -15.571429,10.142858 C 13.971566,41.000001 7,36.458889 7,30.857143 7,25.255398 13.971566,20.714286 22.571428,20.714286 c 8.599863,0 15.571429,4.541112 15.571429,10.142857 z"
transform="matrix(0.42338,-3.539134e-2,3.123385e-2,9.65875e-2,-1.261803,12.80558)" />
<path
style="fill:url(#linearGradient22069);fill-opacity:1;fill-rule:evenodd;stroke:#784800;stroke-width:0.79492021;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
@@ -32912,7 +32898,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="10.840971"
sodipodi:rx="3.2482717"
sodipodi:ry="2.4969709"
- d="m -19.18027,10.84097 c 0,1.37904 -1.4543,2.49697 -3.24827,2.49697 -1.79397,0 -3.24827,-1.11793 -3.24827,-2.49697 0,-1.379038 1.4543,-2.49697 3.24827,-2.49697 1.79397,0 3.24827,1.117932 3.24827,2.49697 z"
+ d="m -19.180271,10.840971 c 0,1.379039 -1.454301,2.496971 -3.248272,2.496971 -1.793971,0 -3.248272,-1.117932 -3.248272,-2.496971 0,-1.379039 1.454301,-2.4969709 3.248272,-2.4969709 1.793971,0 3.248272,1.1179319 3.248272,2.4969709 z"
transform="matrix(0.769641,0,0,1.001213,23.26193,-0.854122)" />
<path
sodipodi:type="arc"
@@ -32922,7 +32908,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="10.840971"
sodipodi:rx="3.2482717"
sodipodi:ry="2.4969709"
- d="m -19.18027,10.84097 c 0,1.37904 -1.4543,2.49697 -3.24827,2.49697 -1.79397,0 -3.24827,-1.11793 -3.24827,-2.49697 0,-1.379038 1.4543,-2.49697 3.24827,-2.49697 1.79397,0 3.24827,1.117932 3.24827,2.49697 z"
+ d="m -19.180271,10.840971 c 0,1.379039 -1.454301,2.496971 -3.248272,2.496971 -1.793971,0 -3.248272,-1.117932 -3.248272,-2.496971 0,-1.379039 1.454301,-2.4969709 3.248272,-2.4969709 1.793971,0 3.248272,1.1179319 3.248272,2.4969709 z"
transform="matrix(0.461785,0,0,0.600728,16.35718,3.487523)" />
<rect
style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -33059,7 +33045,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="5.4358912"
sodipodi:rx="4.2346535"
sodipodi:ry="4.5274754"
- d="m 15.13663,5.435891 c 0,2.500456 -1.89592,4.527476 -4.23465,4.527476 -2.338734,0 -4.234653,-2.02702 -4.234653,-4.527476 0,-2.500455 1.895919,-4.5274752 4.234653,-4.5274752 2.33873,0 4.23465,2.0270202 4.23465,4.5274752 z"
+ d="m 15.136634,5.4358912 c 0,2.5004555 -1.895919,4.5274753 -4.234654,4.5274753 -2.3387341,0 -4.2346531,-2.0270198 -4.2346531,-4.5274753 0,-2.5004556 1.895919,-4.52747541 4.2346531,-4.52747541 2.338735,0 4.234654,2.02701981 4.234654,4.52747541 z"
transform="matrix(0.9445825,0,0,0.8834904,0.2021618,0.6974671)" />
<rect
style="opacity:1;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -33097,7 +33083,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="5.4358912"
sodipodi:rx="4.2346535"
sodipodi:ry="4.5274754"
- d="m 15.13663,5.435891 c 0,2.500456 -1.89592,4.527476 -4.23465,4.527476 -2.338734,0 -4.234653,-2.02702 -4.234653,-4.527476 0,-2.500455 1.895919,-4.5274752 4.234653,-4.5274752 2.33873,0 4.23465,2.0270202 4.23465,4.5274752 z"
+ d="m 15.136634,5.4358912 c 0,2.5004555 -1.895919,4.5274753 -4.234654,4.5274753 -2.3387341,0 -4.2346531,-2.0270198 -4.2346531,-4.5274753 0,-2.5004556 1.895919,-4.52747541 4.2346531,-4.52747541 2.338735,0 4.234654,2.02701981 4.234654,4.52747541 z"
transform="matrix(0.708441,0,0,0.6626212,2.7765886,1.8980645)" />
</g>
<g
@@ -33128,7 +33114,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(0.944587,0,0,0.8834952,0.2021317,0.6974191)"
- d="m 15.13663,5.435891 c 0,2.500456 -1.89592,4.527476 -4.23465,4.527476 -2.338734,0 -4.234653,-2.02702 -4.234653,-4.527476 0,-2.500455 1.895919,-4.5274752 4.234653,-4.5274752 2.33873,0 4.23465,2.0270202 4.23465,4.5274752 z"
+ d="m 15.136634,5.4358912 c 0,2.5004555 -1.895919,4.5274753 -4.234654,4.5274753 -2.3387341,0 -4.2346531,-2.0270198 -4.2346531,-4.5274753 0,-2.5004556 1.895919,-4.52747541 4.2346531,-4.52747541 2.338735,0 4.234654,2.02701981 4.234654,4.52747541 z"
sodipodi:ry="4.5274754"
sodipodi:rx="4.2346535"
sodipodi:cy="5.4358912"
@@ -33187,7 +33173,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(0.708441,0,0,0.6626212,2.7765886,1.8980645)"
- d="m 15.13663,5.435891 c 0,2.500456 -1.89592,4.527476 -4.23465,4.527476 -2.338734,0 -4.234653,-2.02702 -4.234653,-4.527476 0,-2.500455 1.895919,-4.5274752 4.234653,-4.5274752 2.33873,0 4.23465,2.0270202 4.23465,4.5274752 z"
+ d="m 15.136634,5.4358912 c 0,2.5004555 -1.895919,4.5274753 -4.234654,4.5274753 -2.3387341,0 -4.2346531,-2.0270198 -4.2346531,-4.5274753 0,-2.5004556 1.895919,-4.52747541 4.2346531,-4.52747541 2.338735,0 4.234654,2.02701981 4.234654,4.52747541 z"
sodipodi:ry="4.5274754"
sodipodi:rx="4.2346535"
sodipodi:cy="5.4358912"
@@ -33420,7 +33406,7 @@ http://www.inkscape.org/</dc:description>
id="path32256" />
<path
transform="matrix(1.078345,0,0,1.0851807,-28.853863,-18.30248)"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
sodipodi:ry="5"
sodipodi:rx="5"
sodipodi:cy="215"
@@ -33498,7 +33484,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="24.296782"
sodipodi:rx="8.087534"
sodipodi:ry="1.9003495"
- d="m -49.76264,24.29678 c 0,1.04954 -3.62091,1.90035 -8.08753,1.90035 -4.46663,0 -8.08754,-0.85081 -8.08754,-1.90035 0,-1.04953 3.62091,-1.90035 8.08754,-1.90035 4.46662,0 8.08753,0.85082 8.08753,1.90035 z"
+ d="m -49.76264,24.296782 c 0,1.049534 -3.620912,1.900349 -8.087534,1.900349 -4.466622,0 -8.087534,-0.850815 -8.087534,-1.900349 0,-1.049535 3.620912,-1.90035 8.087534,-1.90035 4.466622,0 8.087534,0.850815 8.087534,1.90035 z"
transform="matrix(0.989175,0,0,1.31555,293.3512,387.4892)" />
<g
transform="translate(-29.93515,-0.143427)"
@@ -33611,7 +33597,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.5;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.032785,0,0,1.028535,-1.647175,-7.312074)"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
sodipodi:ry="1.9445436"
sodipodi:rx="10.650796"
sodipodi:cy="252.11775"
@@ -33663,7 +33649,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="24.296782"
sodipodi:rx="8.087534"
sodipodi:ry="1.9003495"
- d="m -49.76264,24.29678 c 0,1.04954 -3.62091,1.90035 -8.08753,1.90035 -4.46663,0 -8.08754,-0.85081 -8.08754,-1.90035 0,-1.04953 3.62091,-1.90035 8.08754,-1.90035 4.46662,0 8.08753,0.85082 8.08753,1.90035 z"
+ d="m -49.76264,24.296782 c 0,1.049534 -3.620912,1.900349 -8.087534,1.900349 -4.466622,0 -8.087534,-0.850815 -8.087534,-1.900349 0,-1.049535 3.620912,-1.90035 8.087534,-1.90035 4.466622,0 8.087534,0.850815 8.087534,1.90035 z"
transform="matrix(0.989175,0,0,1.31555,262.1012,387.2496)" />
<rect
style="opacity:1;fill:url(#linearGradient7964);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -33767,7 +33753,7 @@ http://www.inkscape.org/</dc:description>
style="fill:url(#linearGradient7407);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.00000107;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.003826,0,0,1,-288.0306,-622.4396)"
- d="m 11.4375,235.4062 c 0,4.6772 -3.791589,8.4688 -8.46875,8.4688 -4.677161,0 -8.46875,-3.7916 -8.46875,-8.4688 0,-4.6771 3.791589,-8.4687 8.46875,-8.4687 4.677161,0 8.46875,3.7916 8.46875,8.4687 z"
+ d="m 11.4375,235.40625 c 0,4.67716 -3.7915885,8.46875 -8.46875,8.46875 -4.6771615,0 -8.46875,-3.79159 -8.46875,-8.46875 0,-4.67716 3.7915885,-8.46875 8.46875,-8.46875 4.6771615,0 8.46875,3.79159 8.46875,8.46875 z"
sodipodi:ry="8.46875"
sodipodi:rx="8.46875"
sodipodi:cy="235.40625"
@@ -33782,7 +33768,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.2857143;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.885609,0,0,0.885612,-287.6784,-595.4806)"
- d="m 11.4375,235.4062 c 0,4.6772 -3.791589,8.4688 -8.46875,8.4688 -4.677161,0 -8.46875,-3.7916 -8.46875,-8.4688 0,-4.6771 3.791589,-8.4687 8.46875,-8.4687 4.677161,0 8.46875,3.7916 8.46875,8.4687 z"
+ d="m 11.4375,235.40625 c 0,4.67716 -3.7915885,8.46875 -8.46875,8.46875 -4.6771615,0 -8.46875,-3.79159 -8.46875,-8.46875 0,-4.67716 3.7915885,-8.46875 8.46875,-8.46875 4.6771615,0 8.46875,3.79159 8.46875,8.46875 z"
sodipodi:ry="8.46875"
sodipodi:rx="8.46875"
sodipodi:cy="235.40625"
@@ -33792,7 +33778,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(1.119412,0,0,1.555533,-300.8432,-732.5248)"
- d="m 24.875,228.875 c 0,1.2426 -4.19733,2.25 -9.375,2.25 -5.17767,0 -9.375,-1.0074 -9.375,-2.25 0,-1.2426 4.19733,-2.25 9.375,-2.25 5.17767,0 9.375,1.0074 9.375,2.25 z"
+ d="m 24.875,228.875 c 0,1.24264 -4.19733,2.25 -9.375,2.25 -5.17767,0 -9.375,-1.00736 -9.375,-2.25 0,-1.24264 4.19733,-2.25 9.375,-2.25 5.17767,0 9.375,1.00736 9.375,2.25 z"
sodipodi:ry="2.25"
sodipodi:rx="9.375"
sodipodi:cy="228.875"
@@ -33808,7 +33794,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="235.40625"
sodipodi:rx="8.46875"
sodipodi:ry="8.46875"
- d="m 11.4375,235.4062 c 0,4.6772 -3.791589,8.4688 -8.46875,8.4688 -4.677161,0 -8.46875,-3.7916 -8.46875,-8.4688 0,-4.6771 3.791589,-8.4687 8.46875,-8.4687 4.677161,0 8.46875,3.7916 8.46875,8.4687 z"
+ d="m 11.4375,235.40625 c 0,4.67716 -3.7915885,8.46875 -8.46875,8.46875 -4.6771615,0 -8.46875,-3.79159 -8.46875,-8.46875 0,-4.67716 3.7915885,-8.46875 8.46875,-8.46875 4.6771615,0 8.46875,3.79159 8.46875,8.46875 z"
transform="matrix(0.770704,0,0,0.773608,-287.3127,-569.1141)" />
</g>
</g>
@@ -33883,7 +33869,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="19.857143"
sodipodi:rx="7.5535712"
sodipodi:ry="1.7142857"
- d="m 23.60714,19.85714 c 0,0.94678 -3.38185,1.71429 -7.55357,1.71429 -4.17172,0 -7.55357,-0.76751 -7.55357,-1.71429 0,-0.94677 3.38185,-1.71428 7.55357,-1.71428 4.17172,0 7.55357,0.76751 7.55357,1.71428 z"
+ d="m 23.607143,19.857143 c 0,0.946774 -3.381849,1.714286 -7.553571,1.714286 -4.171722,0 -7.5535715,-0.767512 -7.5535715,-1.714286 0,-0.946773 3.3818495,-1.714285 7.5535715,-1.714285 4.171722,0 7.553571,0.767512 7.553571,1.714285 z"
transform="matrix(0.933806,0,0,0.875,-5.044495,2.124997)" />
<path
style="opacity:1;fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:1.00000083;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
@@ -34024,7 +34010,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="40.32143"
sodipodi:rx="22.589285"
sodipodi:ry="7.3214288"
- d="m 48.75,40.32143 c 0,4.04351 -10.11357,7.32143 -22.58928,7.32143 C 13.685,47.64286 3.57143,44.36494 3.57143,40.32143 3.57143,36.27792 13.685,33 26.16072,33 38.63643,33 48.75,36.27792 48.75,40.32143 z"
+ d="m 48.75,40.32143 c 0,4.043514 -10.113567,7.321429 -22.589285,7.321429 -12.475717,0 -22.5892848,-3.277915 -22.5892848,-7.321429 0,-4.043513 10.1135678,-7.321429 22.5892848,-7.321429 12.475718,0 22.589285,3.277916 22.589285,7.321429 z"
transform="matrix(0.941227,0,0,0.452638,-3.980084,26.43506)" />
<path
sodipodi:nodetypes="cccccccccccccccccc"
@@ -34070,7 +34056,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="45.625"
sodipodi:rx="22.5"
sodipodi:ry="4.5"
- d="m 49.625,45.625 c 0,2.48528 -10.07359,4.5 -22.5,4.5 -12.42641,0 -22.5,-2.01472 -22.5,-4.5 0,-2.48528 10.07359,-4.5 22.5,-4.5 12.42641,0 22.5,2.01472 22.5,4.5 z"
+ d="m 49.625,45.625 c 0,2.485281 -10.073593,4.5 -22.5,4.5 -12.426407,0 -22.5,-2.014719 -22.5,-4.5 0,-2.485281 10.073593,-4.5 22.5,-4.5 12.426407,0 22.5,2.014719 22.5,4.5 z"
transform="matrix(0.488889,0,0,0.555555,-2.261111,-5.847192)" />
<path
style="fill:url(#linearGradient8082);fill-opacity:1;fill-rule:evenodd;stroke:#586a9a;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -34090,7 +34076,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="21.21833"
sodipodi:rx="3.800699"
sodipodi:ry="3.800699"
- d="m 28.46105,21.21833 c 0,2.09907 -1.70163,3.8007 -3.8007,3.8007 -2.09907,0 -3.8007,-1.70163 -3.8007,-3.8007 0,-2.09907 1.70163,-3.8007 3.8007,-3.8007 2.09907,0 3.8007,1.70163 3.8007,3.8007 z"
+ d="m 28.461048,21.21833 c 0,2.099068 -1.701631,3.800699 -3.800699,3.800699 -2.099068,0 -3.800699,-1.701631 -3.800699,-3.800699 0,-2.099068 1.701631,-3.800699 3.800699,-3.800699 2.099068,0 3.800699,1.701631 3.800699,3.800699 z"
transform="matrix(0.440329,-0.251438,0.253871,0.434898,-4.734555,7.454736)" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.93590623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -34110,7 +34096,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="7.65625"
sodipodi:rx="0.75"
sodipodi:ry="0.75"
- d="m 2.34375,7.65625 c 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 0.414214,0 0.75,0.335786 0.75,0.75 z" />
+ d="m 2.34375,7.65625 c 0,0.4142136 -0.3357864,0.75 -0.75,0.75 -0.4142136,0 -0.75,-0.3357864 -0.75,-0.75 0,-0.4142136 0.3357864,-0.75 0.75,-0.75 0.4142136,0 0.75,0.3357864 0.75,0.75 z" />
</g>
</g>
<g
@@ -34135,7 +34121,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="30.857143"
sodipodi:rx="15.571428"
sodipodi:ry="10.142858"
- d="M 38.14286,30.85714 C 38.14286,36.45889 31.17129,41 22.57143,41 13.97157,41 7,36.45889 7,30.85714 7,25.2554 13.97157,20.71429 22.57143,20.71429 c 8.59986,0 15.57143,4.54111 15.57143,10.14285 z"
+ d="m 38.142857,30.857143 c 0,5.601746 -6.971566,10.142858 -15.571429,10.142858 C 13.971566,41.000001 7,36.458889 7,30.857143 7,25.255398 13.971566,20.714286 22.571428,20.714286 c 8.599863,0 15.571429,4.541112 15.571429,10.142857 z"
transform="matrix(0.706422,0,0,0.208015,-4.944952,13.47138)" />
<path
style="font-size:54.8693924px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient6334);fill-opacity:1;stroke:#000000;stroke-width:0.99495679;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
@@ -34166,7 +34152,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.5;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.0327867,0,0,0.8999986,-1.6473059,26.344291)"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
sodipodi:ry="1.9445436"
sodipodi:rx="10.650796"
sodipodi:cy="252.11775"
@@ -34234,7 +34220,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:1.02996242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.375848,0,0,1.587816,16.7881,-126.5999)"
- d="m -40.54816,217.6573 c 0,0.3479 -0.32647,0.6298 -0.7292,0.6298 -0.40273,0 -0.7292,-0.2819 -0.7292,-0.6298 0,-0.3478 0.32647,-0.6297 0.7292,-0.6297 0.40273,0 0.7292,0.2819 0.7292,0.6297 z"
+ d="m -40.548155,217.65735 c 0,0.34781 -0.326476,0.62977 -0.729204,0.62977 -0.402728,0 -0.729204,-0.28196 -0.729204,-0.62977 0,-0.34781 0.326476,-0.62977 0.729204,-0.62977 0.402728,0 0.729204,0.28196 0.729204,0.62977 z"
sodipodi:ry="0.629767"
sodipodi:rx="0.72920388"
sodipodi:cy="217.65735"
@@ -34266,7 +34252,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="45.625"
sodipodi:rx="22.5"
sodipodi:ry="4.5"
- d="m 49.625,45.625 c 0,2.48528 -10.07359,4.5 -22.5,4.5 -12.42641,0 -22.5,-2.01472 -22.5,-4.5 0,-2.48528 10.07359,-4.5 22.5,-4.5 12.42641,0 22.5,2.01472 22.5,4.5 z"
+ d="m 49.625,45.625 c 0,2.485281 -10.073593,4.5 -22.5,4.5 -12.426407,0 -22.5,-2.014719 -22.5,-4.5 0,-2.485281 10.073593,-4.5 22.5,-4.5 12.426407,0 22.5,2.014719 22.5,4.5 z"
transform="matrix(0.488889,0,0,0.555555,-2.261111,-5.847192)" />
<path
style="fill:url(#linearGradient22665);fill-opacity:1;fill-rule:evenodd;stroke:#586a9a;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -34286,7 +34272,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="21.21833"
sodipodi:rx="3.800699"
sodipodi:ry="3.800699"
- d="m 28.46105,21.21833 c 0,2.09907 -1.70163,3.8007 -3.8007,3.8007 -2.09907,0 -3.8007,-1.70163 -3.8007,-3.8007 0,-2.09907 1.70163,-3.8007 3.8007,-3.8007 2.09907,0 3.8007,1.70163 3.8007,3.8007 z"
+ d="m 28.461048,21.21833 c 0,2.099068 -1.701631,3.800699 -3.800699,3.800699 -2.099068,0 -3.800699,-1.701631 -3.800699,-3.800699 0,-2.099068 1.701631,-3.800699 3.800699,-3.800699 2.099068,0 3.800699,1.701631 3.800699,3.800699 z"
transform="matrix(0.440329,-0.251438,0.253871,0.434898,-4.734555,7.454736)" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.93590623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -34306,7 +34292,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="7.65625"
sodipodi:rx="0.75"
sodipodi:ry="0.75"
- d="m 2.34375,7.65625 c 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 0.414214,0 0.75,0.335786 0.75,0.75 z" />
+ d="m 2.34375,7.65625 c 0,0.4142136 -0.3357864,0.75 -0.75,0.75 -0.4142136,0 -0.75,-0.3357864 -0.75,-0.75 0,-0.4142136 0.3357864,-0.75 0.75,-0.75 0.4142136,0 0.75,0.3357864 0.75,0.75 z" />
</g>
</g>
<g
@@ -34354,7 +34340,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="269.375"
sodipodi:rx="1.03125"
sodipodi:ry="1.03125"
- d="m -29.46875,269.375 c 0,0.5695 -0.46171,1.0312 -1.03125,1.0312 -0.56954,0 -1.03125,-0.4617 -1.03125,-1.0312 0,-0.5695 0.46171,-1.0313 1.03125,-1.0313 0.56954,0 1.03125,0.4618 1.03125,1.0313 z"
+ d="m -29.46875,269.375 c 0,0.56954 -0.461706,1.03125 -1.03125,1.03125 -0.569544,0 -1.03125,-0.46171 -1.03125,-1.03125 0,-0.56954 0.461706,-1.03125 1.03125,-1.03125 0.569544,0 1.03125,0.46171 1.03125,1.03125 z"
transform="matrix(1.000068,0,0,1.000068,45.00207,-9.424685)" />
<path
style="fill:none;fill-opacity:1;stroke:url(#linearGradient19957);stroke-width:1.03074241;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -34413,7 +34399,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
<path
transform="matrix(1.000068,0,0,0.941303,223.9764,247.3892)"
- d="m -29.46875,269.375 c 0,0.5695 -0.46171,1.0312 -1.03125,1.0312 -0.56954,0 -1.03125,-0.4617 -1.03125,-1.0312 0,-0.5695 0.46171,-1.0313 1.03125,-1.0313 0.56954,0 1.03125,0.4618 1.03125,1.0313 z"
+ d="m -29.46875,269.375 c 0,0.56954 -0.461706,1.03125 -1.03125,1.03125 -0.569544,0 -1.03125,-0.46171 -1.03125,-1.03125 0,-0.56954 0.461706,-1.03125 1.03125,-1.03125 0.569544,0 1.03125,0.46171 1.03125,1.03125 z"
sodipodi:ry="1.03125"
sodipodi:rx="1.03125"
sodipodi:cy="269.375"
@@ -34473,7 +34459,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.5;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.032785,0,0,1.028535,-1.647175,-7.312074)"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
sodipodi:ry="1.9445436"
sodipodi:rx="10.650796"
sodipodi:cy="252.11775"
@@ -34503,7 +34489,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.5;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.032785,0,0,1.028535,-1.647175,-7.312074)"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
sodipodi:ry="1.9445436"
sodipodi:rx="10.650796"
sodipodi:cy="252.11775"
@@ -34533,7 +34519,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.5;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.032785,0,0,1.028535,-1.647175,-7.312074)"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
sodipodi:ry="1.9445436"
sodipodi:rx="10.650796"
sodipodi:cy="252.11775"
@@ -35069,7 +35055,7 @@ http://www.inkscape.org/</dc:description>
style="fill:url(#linearGradient22194);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.05299389;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.0078813,0,0,1.0084163,12.205121,-19.185593)"
- d="m 11.4375,235.4062 c 0,4.6772 -3.791589,8.4688 -8.46875,8.4688 -4.677161,0 -8.46875,-3.7916 -8.46875,-8.4688 0,-4.6771 3.791589,-8.4687 8.46875,-8.4687 4.677161,0 8.46875,3.7916 8.46875,8.4687 z"
+ d="m 11.4375,235.40625 c 0,4.67716 -3.7915885,8.46875 -8.46875,8.46875 -4.6771615,0 -8.46875,-3.79159 -8.46875,-8.46875 0,-4.67716 3.7915885,-8.46875 8.46875,-8.46875 4.6771615,0 8.46875,3.79159 8.46875,8.46875 z"
sodipodi:ry="8.46875"
sodipodi:rx="8.46875"
sodipodi:cy="235.40625"
@@ -35084,7 +35070,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.2857143;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.7938745,0,0,0.7942957,12.840455,31.21974)"
- d="m 11.4375,235.4062 c 0,4.6772 -3.791589,8.4688 -8.46875,8.4688 -4.677161,0 -8.46875,-3.7916 -8.46875,-8.4688 0,-4.6771 3.791589,-8.4687 8.46875,-8.4687 4.677161,0 8.46875,3.7916 8.46875,8.4687 z"
+ d="m 11.4375,235.40625 c 0,4.67716 -3.7915885,8.46875 -8.46875,8.46875 -4.6771615,0 -8.46875,-3.79159 -8.46875,-8.46875 0,-4.67716 3.7915885,-8.46875 8.46875,-8.46875 4.6771615,0 8.46875,3.79159 8.46875,8.46875 z"
sodipodi:ry="8.46875"
sodipodi:rx="8.46875"
sodipodi:cy="235.40625"
@@ -37548,11 +37534,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="215"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(0.4,0,0,0.399996,15.299999,1557.5009)" />
<path
transform="matrix(0.2499999,0,0,0.249998,64.500022,1589.7504)"
- d="m 333,215 c 0,2.7614 -2.2386,5 -5,5 -2.7614,0 -5,-2.2386 -5,-5 0,-2.7614 2.2386,-5 5,-5 2.7614,0 5,2.2386 5,5 z"
+ d="m 333,215 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
sodipodi:ry="5"
sodipodi:rx="5"
sodipodi:cy="215"
@@ -38120,7 +38106,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.24267782;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.124647,0,0,2.143444,-5.266747,-54.16535)"
- d="M 45.375,44.8125 C 45.375,46.57291 36.30877,48 25.125,48 13.94123,48 4.875,46.57291 4.875,44.8125 c 0,-1.76041 9.06623,-3.1875 20.25,-3.1875 11.18377,0 20.25,1.42709 20.25,3.1875 z"
+ d="M 45.375,44.8125 C 45.375,46.572908 36.308766,48 25.125,48 13.941234,48 4.875,46.572908 4.875,44.8125 c 0,-1.760408 9.066234,-3.1875 20.25,-3.1875 11.183766,0 20.25,1.427092 20.25,3.1875 z"
sodipodi:ry="3.1875"
sodipodi:rx="20.25"
sodipodi:cy="44.8125"
@@ -38130,7 +38116,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(1.078311,0,0,1.697757,-3.410901,-28.53532)"
- d="m 44.54773,32.0901 c 0,6.2972 -8.98303,11.40209 -20.06416,11.40209 -11.08113,0 -20.064154,-5.10489 -20.064154,-11.40209 0,-6.29721 8.983024,-11.4021 20.064154,-11.4021 11.08113,0 20.06416,5.10489 20.06416,11.4021 z"
+ d="m 44.547728,32.090096 c 0,6.297204 -8.983029,11.402096 -20.064156,11.402096 -11.081127,0 -20.0641556,-5.104892 -20.0641556,-11.402096 0,-6.297205 8.9830286,-11.402097 20.0641556,-11.402097 11.081127,0 20.064156,5.104892 20.064156,11.402097 z"
sodipodi:ry="11.402097"
sodipodi:rx="20.064156"
sodipodi:cy="32.090096"
@@ -38140,7 +38126,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.964805,0,0,1.49802,-0.631857,-22.12577)"
- d="m 44.54773,32.0901 c 0,6.2972 -8.98303,11.40209 -20.06416,11.40209 -11.08113,0 -20.064154,-5.10489 -20.064154,-11.40209 0,-6.29721 8.983024,-11.4021 20.064154,-11.4021 11.08113,0 20.06416,5.10489 20.06416,11.4021 z"
+ d="m 44.547728,32.090096 c 0,6.297204 -8.983029,11.402096 -20.064156,11.402096 -11.081127,0 -20.0641556,-5.104892 -20.0641556,-11.402096 0,-6.297205 8.9830286,-11.402097 20.0641556,-11.402097 11.081127,0 20.064156,5.104892 20.064156,11.402097 z"
sodipodi:ry="11.402097"
sodipodi:rx="20.064156"
sodipodi:cy="32.090096"
@@ -38191,7 +38177,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="44.8125"
sodipodi:rx="20.25"
sodipodi:ry="3.1875"
- d="M 45.375,44.8125 C 45.375,46.57291 36.30877,48 25.125,48 13.94123,48 4.875,46.57291 4.875,44.8125 c 0,-1.76041 9.06623,-3.1875 20.25,-3.1875 11.18377,0 20.25,1.42709 20.25,3.1875 z"
+ d="M 45.375,44.8125 C 45.375,46.572908 36.308766,48 25.125,48 13.941234,48 4.875,46.572908 4.875,44.8125 c 0,-1.760408 9.066234,-3.1875 20.25,-3.1875 11.183766,0 20.25,1.427092 20.25,3.1875 z"
transform="matrix(1.086654,0,0,1.622689,-2.786163,-28.92021)" />
<path
transform="matrix(0.95613,-0.106523,0.102939,0.989435,9.124845,17.28689)"
@@ -39515,7 +39501,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:1;fill:#ac6036;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(1.1038114,-0.5561777,0.4186871,0.8438557,-210.21455,702.33991)"
- d="m 1188.47,254.6616 c 0,0.3539 -0.327,0.6408 -0.73,0.6408 -0.402,0 -0.729,-0.2869 -0.729,-0.6408 0,-0.3539 0.327,-0.6408 0.729,-0.6408 0.403,0 0.73,0.2869 0.73,0.6408 z"
+ d="m 1188.4697,254.66159 c 0,0.35391 -0.3265,0.64082 -0.7292,0.64082 -0.4027,0 -0.7292,-0.28691 -0.7292,-0.64082 0,-0.35391 0.3265,-0.64081 0.7292,-0.64081 0.4027,0 0.7292,0.2869 0.7292,0.64081 z"
sodipodi:ry="0.6408155"
sodipodi:rx="0.72920388"
sodipodi:cy="254.66159"
@@ -39531,11 +39517,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="254.66159"
sodipodi:rx="0.72920388"
sodipodi:ry="0.6408155"
- d="m 1188.47,254.6616 c 0,0.3539 -0.327,0.6408 -0.73,0.6408 -0.402,0 -0.729,-0.2869 -0.729,-0.6408 0,-0.3539 0.327,-0.6408 0.729,-0.6408 0.403,0 0.73,0.2869 0.73,0.6408 z"
+ d="m 1188.4697,254.66159 c 0,0.35391 -0.3265,0.64082 -0.7292,0.64082 -0.4027,0 -0.7292,-0.28691 -0.7292,-0.64082 0,-0.35391 0.3265,-0.64081 0.7292,-0.64081 0.4027,0 0.7292,0.2869 0.7292,0.64081 z"
transform="matrix(1.1038114,-0.5561777,0.4186871,0.8438557,-209.08329,703.47992)" />
<path
transform="matrix(1.1038114,-0.5561777,0.4186871,0.8438557,-207.95203,704.61993)"
- d="m 1188.47,254.6616 c 0,0.3539 -0.327,0.6408 -0.73,0.6408 -0.402,0 -0.729,-0.2869 -0.729,-0.6408 0,-0.3539 0.327,-0.6408 0.729,-0.6408 0.403,0 0.73,0.2869 0.73,0.6408 z"
+ d="m 1188.4697,254.66159 c 0,0.35391 -0.3265,0.64082 -0.7292,0.64082 -0.4027,0 -0.7292,-0.28691 -0.7292,-0.64082 0,-0.35391 0.3265,-0.64081 0.7292,-0.64081 0.4027,0 0.7292,0.2869 0.7292,0.64081 z"
sodipodi:ry="0.6408155"
sodipodi:rx="0.72920388"
sodipodi:cy="254.66159"
@@ -39611,7 +39597,7 @@ http://www.inkscape.org/</dc:description>
y="562" />
<path
transform="matrix(1.2813363,-3.6011839e-2,3.4291871e-2,1.2785262,1164.8982,324.76867)"
- d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z"
+ d="m 109.11231,194.24583 -3.48759,2.20705 -0.0186,4.12722 -3.17675,-2.63488 -3.930991,1.25764 1.524251,-3.83549 -2.410831,-3.34996 4.118791,0.26442 2.44101,-3.32803 1.0213,3.99891 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
@@ -39627,7 +39613,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="star" />
<path
transform="matrix(0.9659898,-2.2645374e-2,2.466916e-2,0.9806753,1199.2364,381.50336)"
- d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 z"
+ d="m 108.97917,194.25051 -3.43374,2.00094 0.015,4.20347 -2.96409,-2.64736 -3.99309,1.31326 1.60183,-3.6371 -2.482907,-3.39184 3.954077,0.39951 2.45857,-3.40952 0.84192,3.884 z"
inkscape:randomized="0"
inkscape:rounded="3.469447e-18"
inkscape:flatsided="false"
@@ -40040,7 +40026,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#3465a4;fill-opacity:0.75;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="matrix(1.0549534,0,0,1.0549419,1263.53,-243.96372)"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
sodipodi:ry="1.421875"
sodipodi:rx="1.421875"
sodipodi:cy="423.01562"
@@ -40050,7 +40036,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(1.0549408,0,0,1.0549419,1276.26,-243.96404)"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
sodipodi:ry="1.421875"
sodipodi:rx="1.421875"
sodipodi:cy="423.01562"
@@ -40175,7 +40161,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(0.999985,0,0,0.999998,0.5230998,-7.4995922)"
- d="m 1540,202 c 0,1.1046 -0.895,2 -2,2 -1.105,0 -2,-0.8954 -2,-2 0,-1.1046 0.895,-2 2,-2 1.105,0 2,0.8954 2,2 z"
+ d="m 1540,202 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="202"
@@ -41181,7 +41167,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="398.5"
sodipodi:rx="8"
sodipodi:ry="4.5"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5 l -8,0 z"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5 l -8,0 z"
transform="matrix(1.625,0,0,2.8888889,-405.375,-743.22222)"
sodipodi:start="4.712389"
sodipodi:end="6.2831853" />
@@ -41190,7 +41176,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:end="6.2831853"
sodipodi:start="4.712389"
transform="matrix(1.5000028,0,0,2.6666617,-322.00189,-655.16473)"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
sodipodi:ry="4.5"
sodipodi:rx="8"
sodipodi:cy="398.5"
@@ -41206,7 +41192,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="398.5"
sodipodi:rx="8"
sodipodi:ry="4.5"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
transform="matrix(1.3750006,0,0,2.4444425,-239.12544,-566.61034)"
sodipodi:start="4.712389"
sodipodi:end="6.2831853"
@@ -41245,7 +41231,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:end="6.2831853"
sodipodi:start="4.712389"
transform="matrix(1.875,0,0,3.3333333,-571.125,-896.33333)"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5 l -8,0 z"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5 l -8,0 z"
sodipodi:ry="4.5"
sodipodi:rx="8"
sodipodi:cy="398.5"
@@ -41261,7 +41247,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="398.5"
sodipodi:rx="8"
sodipodi:ry="4.5"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
transform="matrix(1.8750025,0,0,3.3333326,-570.62668,-896.83304)"
sodipodi:start="4.712389"
sodipodi:end="6.2831853"
@@ -41271,7 +41257,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:end="6.2831853"
sodipodi:start="4.712389"
transform="matrix(1.7500007,0,0,3.1111092,-487.75044,-808.27701)"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
sodipodi:ry="4.5"
sodipodi:rx="8"
sodipodi:cy="398.5"
@@ -41317,7 +41303,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="398.5"
sodipodi:rx="8"
sodipodi:ry="4.5"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5 l -8,0 z"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5 l -8,0 z"
transform="matrix(1.75,0,0,3.1111089,-488.25,-783.77691)"
sodipodi:start="4.712389"
sodipodi:end="6.2831853" />
@@ -41326,7 +41312,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:end="6.2831853"
sodipodi:start="4.712389"
transform="matrix(1.7500028,0,0,3.1111114,-487.75189,-784.27787)"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
sodipodi:ry="4.5"
sodipodi:rx="8"
sodipodi:cy="398.5"
@@ -41342,7 +41328,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="398.5"
sodipodi:rx="8"
sodipodi:ry="4.5"
- d="m 663,394 c 4.4183,0 8,2.0147 8,4.5"
+ d="m 663,394 c 4.41828,0 8,2.01472 8,4.5"
transform="matrix(1.624997,0,0,2.8888903,-404.87298,-695.72277)"
sodipodi:start="4.712389"
sodipodi:end="6.2831853"
@@ -42352,7 +42338,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1415.5"
sodipodi:rx="9.5"
sodipodi:ry="3.5"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
transform="matrix(0.945724,0,0,0.9999911,51.246544,1.0125683)" />
<rect
y="1404.5"
@@ -42475,7 +42461,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1415.5"
sodipodi:rx="9.5"
sodipodi:ry="3.5"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
transform="matrix(0.7368418,0,0,0.7142773,153.10543,216.44049)" />
</g>
<g
@@ -42501,7 +42487,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#729fcf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
<path
transform="matrix(0.7368418,0,0,0.7142773,153.10543,240.44049)"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
sodipodi:ry="3.5"
sodipodi:rx="9.5"
sodipodi:cy="1415.5"
@@ -42532,7 +42518,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1415.5"
sodipodi:rx="9.5"
sodipodi:ry="3.5"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
transform="matrix(0,0.945724,-0.9999911,0,1925.503,970.7309)" />
<rect
y="1428.5"
@@ -42584,7 +42570,7 @@ http://www.inkscape.org/</dc:description>
y="1280" />
<path
transform="matrix(0.9508347,0,0,0.7142773,48.681023,288.44049)"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
sodipodi:ry="3.5"
sodipodi:rx="9.5"
sodipodi:cy="1415.5"
@@ -42648,7 +42634,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1415.5"
sodipodi:rx="9.5"
sodipodi:ry="3.5"
- d="m 502,1415.5 c 0,1.933 -4.2533,3.5 -9.5,3.5 -5.2467,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.2533,-3.5 9.5,-3.5 5.2467,0 9.5,1.567 9.5,3.5 z"
+ d="m 502,1415.5 c 0,1.933 -4.25329,3.5 -9.5,3.5 -5.24671,0 -9.5,-1.567 -9.5,-3.5 0,-1.933 4.25329,-3.5 9.5,-3.5 5.24671,0 9.5,1.567 9.5,3.5 z"
transform="matrix(0.9508347,0,0,0.7142773,48.681023,312.44049)" />
<rect
style="opacity:1;fill:url(#linearGradient9166);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -42708,7 +42694,7 @@ http://www.inkscape.org/</dc:description>
style="fill:url(#radialGradient13871);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(1.7478195,0,0,1.75,-824.58897,-1151.7485)"
- d="m 1112,1543 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2 z"
+ d="m 1112,1543 c 0,1.1046 -0.8954,2 -2,2 -1.1046,0 -2,-0.8954 -2,-2 0,-1.1046 0.8954,-2 2,-2 1.1046,0 2,0.8954 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="1543"
@@ -42724,11 +42710,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="1543"
sodipodi:rx="2"
sodipodi:ry="2"
- d="m 1112,1543 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2 z"
+ d="m 1112,1543 c 0,1.1046 -0.8954,2 -2,2 -1.1046,0 -2,-0.8954 -2,-2 0,-1.1046 0.8954,-2 2,-2 1.1046,0 2,0.8954 2,2 z"
transform="matrix(0.9987705,0,0,0.8999911,6.3560768,159.1149)" />
<path
transform="matrix(0.4994181,0,0,0.4000183,560.13785,930.17279)"
- d="m 1112,1543 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2 z"
+ d="m 1112,1543 c 0,1.1046 -0.8954,2 -2,2 -1.1046,0 -2,-0.8954 -2,-2 0,-1.1046 0.8954,-2 2,-2 1.1046,0 2,0.8954 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="1543"
@@ -42807,7 +42793,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="5.6153316"
sodipodi:rx="5.9727769"
sodipodi:ry="5.415318"
- d="m 12.48709,5.615332 c 0,2.990797 -2.674107,5.415318 -5.972781,5.415318 -3.298674,0 -5.972777,-2.424521 -5.972777,-5.415318 0,-2.990798 2.674103,-5.4153184 5.972777,-5.4153184 3.298674,0 5.972781,2.4245204 5.972781,5.4153184 z"
+ d="m 12.487086,5.6153316 c 0,2.9907976 -2.6741035,5.4153184 -5.9727771,5.4153184 -3.2986736,0 -5.97277686,-2.4245208 -5.97277686,-5.4153184 0,-2.9907975 2.67410326,-5.41531796 5.97277686,-5.41531796 3.2986736,0 5.9727771,2.42452046 5.9727771,5.41531796 z"
transform="matrix(1.088272,0,0,1.2002989,303.91067,134.25989)" />
<path
sodipodi:type="arc"
@@ -42817,7 +42803,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="5.6153316"
sodipodi:rx="5.9727769"
sodipodi:ry="5.415318"
- d="m 12.48709,5.615332 c 0,2.990797 -2.674107,5.415318 -5.972781,5.415318 -3.298674,0 -5.972777,-2.424521 -5.972777,-5.415318 0,-2.990798 2.674103,-5.4153184 5.972777,-5.4153184 3.298674,0 5.972781,2.4245204 5.972781,5.4153184 z"
+ d="m 12.487086,5.6153316 c 0,2.9907976 -2.6741035,5.4153184 -5.9727771,5.4153184 -3.2986736,0 -5.97277686,-2.4245208 -5.97277686,-5.4153184 0,-2.9907975 2.67410326,-5.41531796 5.97277686,-5.41531796 3.2986736,0 5.9727771,2.42452046 5.9727771,5.41531796 z"
transform="matrix(0.920843,0,0,1.015635,305.00135,135.29686)" />
</g>
<path
@@ -43100,7 +43086,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="6.6972771"
sodipodi:rx="2.365099"
sodipodi:ry="2.1398516"
- d="m 9.370297,6.697277 c 0,1.181807 -1.058891,2.139852 -2.365099,2.139852 -1.306208,0 -2.365099,-0.958045 -2.365099,-2.139852 0,-1.181807 1.058891,-2.139852 2.365099,-2.139852 1.306208,0 2.365099,0.958045 2.365099,2.139852 z"
+ d="m 9.370297,6.6972771 c 0,1.1818074 -1.0588909,2.1398515 -2.365099,2.1398515 -1.3062081,0 -2.365099,-0.9580441 -2.365099,-2.1398515 0,-1.1818074 1.0588909,-2.1398516 2.365099,-2.1398516 1.3062081,0 2.365099,0.9580442 2.365099,2.1398516 z"
transform="matrix(1.058315,0,0,1.1693869,289.58623,224.16759)" />
</g>
<g
@@ -43426,7 +43412,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="252.11775"
sodipodi:rx="10.650796"
sodipodi:ry="1.9445436"
- d="m 87.76963,252.1178 c 0,1.0739 -4.76852,1.9445 -10.65079,1.9445 -5.88228,0 -10.6508,-0.8706 -10.6508,-1.9445 0,-1.074 4.76852,-1.9446 10.6508,-1.9446 5.88227,0 10.65079,0.8706 10.65079,1.9446 z"
+ d="m 87.769631,252.11775 c 0,1.07394 -4.768523,1.94455 -10.650796,1.94455 -5.882272,0 -10.650795,-0.87061 -10.650795,-1.94455 0,-1.07394 4.768523,-1.94454 10.650795,-1.94454 5.882273,0 10.650796,0.8706 10.650796,1.94454 z"
transform="matrix(1.032785,0,0,1.028535,1108.3528,945.68793)" />
<path
style="fill:url(#linearGradient13559);fill-opacity:1;stroke:#4e9a06;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
@@ -43500,7 +43486,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="30.857143"
sodipodi:rx="15.571428"
sodipodi:ry="10.142858"
- d="M 38.14286,30.85714 C 38.14286,36.45889 31.17129,41 22.57143,41 13.97157,41 7,36.45889 7,30.85714 7,25.2554 13.97157,20.71429 22.57143,20.71429 c 8.59986,0 15.57143,4.54111 15.57143,10.14285 z"
+ d="m 38.142857,30.857143 c 0,5.601746 -6.971566,10.142858 -15.571429,10.142858 C 13.971566,41.000001 7,36.458889 7,30.857143 7,25.255398 13.971566,20.714286 22.571428,20.714286 c 8.599863,0 15.571429,4.541112 15.571429,10.142857 z"
transform="matrix(0.6380244,0,0,0.1949628,1172.5338,983.00653)" />
</g>
<g
@@ -43568,7 +43554,7 @@ http://www.inkscape.org/</dc:description>
y="398.7132" />
<path
transform="matrix(0.989175,0,0,1.31555,262.1012,387.2496)"
- d="m -49.76264,24.29678 c 0,1.04954 -3.62091,1.90035 -8.08753,1.90035 -4.46663,0 -8.08754,-0.85081 -8.08754,-1.90035 0,-1.04953 3.62091,-1.90035 8.08754,-1.90035 4.46662,0 8.08753,0.85082 8.08753,1.90035 z"
+ d="m -49.76264,24.296782 c 0,1.049534 -3.620912,1.900349 -8.087534,1.900349 -4.466622,0 -8.087534,-0.850815 -8.087534,-1.900349 0,-1.049535 3.620912,-1.90035 8.087534,-1.90035 4.466622,0 8.087534,0.850815 8.087534,1.90035 z"
sodipodi:ry="1.9003495"
sodipodi:rx="8.087534"
sodipodi:cy="24.296782"
@@ -43797,7 +43783,7 @@ http://www.inkscape.org/</dc:description>
style="opacity:0.24267782;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(0.4938269,0,0,0.9411755,1151.5926,440.82357)"
- d="M 45.375,44.8125 C 45.375,46.57291 36.30877,48 25.125,48 13.94123,48 4.875,46.57291 4.875,44.8125 c 0,-1.76041 9.06623,-3.1875 20.25,-3.1875 11.18377,0 20.25,1.42709 20.25,3.1875 z"
+ d="M 45.375,44.8125 C 45.375,46.572908 36.308766,48 25.125,48 13.941234,48 4.875,46.572908 4.875,44.8125 c 0,-1.760408 9.066234,-3.1875 20.25,-3.1875 11.183766,0 20.25,1.427092 20.25,3.1875 z"
sodipodi:ry="3.1875"
sodipodi:rx="20.25"
sodipodi:cy="44.8125"
@@ -43807,7 +43793,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.473481,0,0,0.7454766,1152.4075,452.07758)"
- d="m 44.54773,32.0901 c 0,6.2972 -8.98303,11.40209 -20.06416,11.40209 -11.08113,0 -20.064154,-5.10489 -20.064154,-11.40209 0,-6.29721 8.983024,-11.4021 20.064154,-11.4021 11.08113,0 20.06416,5.10489 20.06416,11.4021 z"
+ d="m 44.547728,32.090096 c 0,6.297204 -8.983029,11.402096 -20.064156,11.402096 -11.081127,0 -20.0641556,-5.104892 -20.0641556,-11.402096 0,-6.297205 8.9830286,-11.402097 20.0641556,-11.402097 11.081127,0 20.064156,5.104892 20.064156,11.402097 z"
sodipodi:ry="11.402097"
sodipodi:rx="20.064156"
sodipodi:cy="32.090096"
@@ -43817,7 +43803,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.4236411,0,0,0.6577731,1153.6278,454.89199)"
- d="m 44.54773,32.0901 c 0,6.2972 -8.98303,11.40209 -20.06416,11.40209 -11.08113,0 -20.064154,-5.10489 -20.064154,-11.40209 0,-6.29721 8.983024,-11.4021 20.064154,-11.4021 11.08113,0 20.06416,5.10489 20.06416,11.4021 z"
+ d="m 44.547728,32.090096 c 0,6.297204 -8.983029,11.402096 -20.064156,11.402096 -11.081127,0 -20.0641556,-5.104892 -20.0641556,-11.402096 0,-6.297205 8.9830286,-11.402097 20.0641556,-11.402097 11.081127,0 20.064156,5.104892 20.064156,11.402097 z"
sodipodi:ry="11.402097"
sodipodi:rx="20.064156"
sodipodi:cy="32.090096"
@@ -43827,7 +43813,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(1.2,0,0,1.2857171,-232.8,-134.28708)"
- d="m 1169,473.5 c 0,1.933 -2.239,3.5 -5,3.5 -2.761,0 -5,-1.567 -5,-3.5 0,-1.933 2.239,-3.5 5,-3.5 2.761,0 5,1.567 5,3.5 z"
+ d="m 1169,473.5 c 0,1.933 -2.2386,3.5 -5,3.5 -2.7614,0 -5,-1.567 -5,-3.5 0,-1.933 2.2386,-3.5 5,-3.5 2.7614,0 5,1.567 5,3.5 z"
sodipodi:ry="3.5"
sodipodi:rx="5"
sodipodi:cy="473.5"
@@ -44952,7 +44938,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="423.01562"
sodipodi:rx="1.421875"
sodipodi:ry="1.421875"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
transform="matrix(-0.7459647,0.7459647,-0.7459566,-0.7459566,2152.4621,367.64101)" />
</g>
<g
@@ -44965,7 +44951,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#3465a4;fill-opacity:0.75;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="matrix(-0.7459647,0.7459647,-0.7459566,-0.7459566,2152.4621,367.64101)"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
sodipodi:ry="1.421875"
sodipodi:rx="1.421875"
sodipodi:cy="423.01562"
@@ -45649,7 +45635,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#3465a4;fill-opacity:0.75;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="matrix(1.0549534,0,0,1.0549419,1263.53,-243.96372)"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
sodipodi:ry="1.421875"
sodipodi:rx="1.421875"
sodipodi:cy="423.01562"
@@ -45659,7 +45645,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(1.0549408,0,0,1.0549419,1276.26,-243.96404)"
- d="m 193,423.0156 c 0,0.7853 -0.6366,1.4219 -1.4219,1.4219 -0.7853,0 -1.4219,-0.6366 -1.4219,-1.4219 0,-0.7853 0.6366,-1.4219 1.4219,-1.4219 0.7853,0 1.4219,0.6366 1.4219,1.4219 z"
+ d="m 193,423.01562 c 0,0.78528 -0.6366,1.42188 -1.42188,1.42188 -0.78527,0 -1.42187,-0.6366 -1.42187,-1.42188 0,-0.78527 0.6366,-1.42187 1.42187,-1.42187 0.78528,0 1.42188,0.6366 1.42188,1.42187 z"
sodipodi:ry="1.421875"
sodipodi:rx="1.421875"
sodipodi:cy="423.01562"
@@ -45679,11 +45665,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.56261"
sodipodi:rx="3.4374998"
sodipodi:ry="3.4374998"
- d="m 1495.625,201.5626 c 0,1.8985 -1.539,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.899,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6249,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(1.0145563,0,0,1.0145645,-21.595591,-3.0607514)" />
<path
transform="matrix(0.6675604,0,0,0.667561,496.16897,66.900548)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.539,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.899,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6249,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4374998"
sodipodi:rx="3.4374998"
sodipodi:cy="201.56261"
@@ -46428,7 +46414,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;fill-rule:evenodd;stroke:#525655;stroke-width:1.00000036px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
<path
transform="matrix(1.088272,0,0,1.2002989,303.91067,134.25989)"
- d="m 12.48709,5.615332 c 0,2.990797 -2.674107,5.415318 -5.972781,5.415318 -3.298674,0 -5.972777,-2.424521 -5.972777,-5.415318 0,-2.990798 2.674103,-5.4153184 5.972777,-5.4153184 3.298674,0 5.972781,2.4245204 5.972781,5.4153184 z"
+ d="m 12.487086,5.6153316 c 0,2.9907976 -2.6741035,5.4153184 -5.9727771,5.4153184 -3.2986736,0 -5.97277686,-2.4245208 -5.97277686,-5.4153184 0,-2.9907975 2.67410326,-5.41531796 5.97277686,-5.41531796 3.2986736,0 5.9727771,2.42452046 5.9727771,5.41531796 z"
sodipodi:ry="5.415318"
sodipodi:rx="5.9727769"
sodipodi:cy="5.6153316"
@@ -46438,7 +46424,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:type="arc" />
<path
transform="matrix(0.920843,0,0,1.015635,305.00135,135.29686)"
- d="m 12.48709,5.615332 c 0,2.990797 -2.674107,5.415318 -5.972781,5.415318 -3.298674,0 -5.972777,-2.424521 -5.972777,-5.415318 0,-2.990798 2.674103,-5.4153184 5.972777,-5.4153184 3.298674,0 5.972781,2.4245204 5.972781,5.4153184 z"
+ d="m 12.487086,5.6153316 c 0,2.9907976 -2.6741035,5.4153184 -5.9727771,5.4153184 -3.2986736,0 -5.97277686,-2.4245208 -5.97277686,-5.4153184 0,-2.9907975 2.67410326,-5.41531796 5.97277686,-5.41531796 3.2986736,0 5.9727771,2.42452046 5.9727771,5.41531796 z"
sodipodi:ry="5.415318"
sodipodi:rx="5.9727769"
sodipodi:cy="5.6153316"
@@ -47014,7 +47000,7 @@ http://www.inkscape.org/</dc:description>
style="fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(0.8749999,0,0,0.875,112.6876,9.126711)"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="33"
@@ -47075,7 +47061,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="33"
sodipodi:rx="2"
sodipodi:ry="2"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
transform="matrix(0.8749999,0,0,0.875,130.6876,9.127)" />
</g>
</g>
@@ -47153,7 +47139,7 @@ http://www.inkscape.org/</dc:description>
style="fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#0065ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(0.8749999,0,0,0.875,185.0073,8.125)"
- d="m 755.5,33 c 0,1.10457 -0.8954,2 -2,2 -1.1046,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954,-2 2,-2 1.1046,0 2,0.89543 2,2 z"
+ d="m 755.5,33 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="33"
@@ -47450,7 +47436,7 @@ http://www.inkscape.org/</dc:description>
id="g20584">
<path
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47466,7 +47452,7 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)" />
</g>
</g>
@@ -47532,11 +47518,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)" />
<path
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47734,11 +47720,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)" />
<path
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47780,11 +47766,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)" />
<path
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47848,11 +47834,11 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)" />
<path
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47897,7 +47883,7 @@ http://www.inkscape.org/</dc:description>
style="display:inline">
<path
transform="matrix(1.014556,0,0,1.014565,-21.59559,-3.060751)"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
sodipodi:ry="3.4375"
sodipodi:rx="3.4375"
sodipodi:cy="201.5626"
@@ -47913,61 +47899,22 @@ http://www.inkscape.org/</dc:description>
sodipodi:cy="201.5626"
sodipodi:rx="3.4375"
sodipodi:ry="3.4375"
- d="m 1495.625,201.5626 c 0,1.8985 -1.54,3.4375 -3.438,3.4375 -1.898,0 -3.437,-1.539 -3.437,-3.4375 0,-1.8985 1.539,-3.4375 3.437,-3.4375 1.898,0 3.438,1.539 3.438,3.4375 z"
+ d="m 1495.6245,201.56261 c 0,1.89848 -1.539,3.4375 -3.4375,3.4375 -1.8985,0 -3.4375,-1.53902 -3.4375,-3.4375 0,-1.89848 1.539,-3.4375 3.4375,-3.4375 1.8985,0 3.4375,1.53902 3.4375,3.4375 z"
transform="matrix(0.6278689,0,0,0.6290944,555.4028,74.61518)" />
</g>
</g>
<g
- id="ink_bspline_mode"
- inkscape:label="#ink_bspline_mode"
- transform="translate(882.60731,112.07641)">
- <path
- inkscape:label="#spiro_splines_mode"
- sodipodi:nodetypes="csc"
- id="path-mode-spiro-3"
- d="m 947.71032,68.297825 c 0,0 -0.19425,-4.204156 1.72052,-6.468471 1.94548,-2.300627 5.57499,-2.293308 5.57499,-2.293308"
- style="color:#000000;fill:none;stroke:#0000ff;stroke-width:1.88989151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#646464;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 945.03712,67.77092 0.0137,-10.388953 9.98731,0"
- id="path6177"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <rect
- y="56"
- x="954.00323"
- height="1.9975978"
- width="1.9967738"
- id="rect6184"
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
- <rect
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
- id="rect6186"
- width="1.9967738"
- height="1.9975978"
- x="944"
- y="56" />
- <rect
- y="66.921463"
- x="944"
- height="1.9975978"
- width="1.9967738"
- id="rect6188"
- style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.49943903;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
- </g>
- <g
- transform="matrix(0,-1,1,0,1633.7595,1982.0194)"
+ transform="matrix(-7.0328238e-4,-0.99999975,0.99999975,-7.0328238e-4,1644.9975,1983.3902)"
id="bspline_mode"
inkscape:label="#bspline_mode">
<path
id="path10092"
d="m 1776.875,195.00004 10.25,0 0,11"
- style="fill:none;stroke:#b4b4b4;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+ style="fill:none;stroke:#b4b4b4;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
- style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 1776.875,195.00004 10.25,0 0,11"
id="path10094"
inkscape:connector-curvature="0"
@@ -47979,8 +47926,7 @@ http://www.inkscape.org/</dc:description>
id="use10096"
transform="translate(329,-4.9999996)"
width="2000"
- height="2000"
- style="opacity:1" />
+ height="2000" />
<use
x="0"
y="0"
@@ -47988,8 +47934,7 @@ http://www.inkscape.org/</dc:description>
id="use10098"
transform="translate(339,-4.9999996)"
width="2000"
- height="2000"
- style="opacity:1" />
+ height="2000" />
<use
height="2000"
width="2000"
@@ -47997,8 +47942,63 @@ http://www.inkscape.org/</dc:description>
id="use10100"
xlink:href="#node_b"
y="0"
- x="0"
- style="opacity:1" />
+ x="0" />
+ <path
+ inkscape:label="#spiro_splines_mode"
+ sodipodi:nodetypes="csc"
+ id="path-mode-spiro-3-5"
+ d="m 1775.2137,200.26244 c 0,0 3.122,-0.7142 5.3863,1.2005 2.3006,1.9455 1.1455,5.7842 1.1455,5.7842"
+ style="color:#000000;fill:none;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:none;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
+ d="m 1775.2137,200.26244 c 0,0 3.122,-0.7142 5.3863,1.2005 2.3006,1.9455 1.1455,5.7842 1.1455,5.7842"
+ id="path10160"
+ sodipodi:nodetypes="csc"
+ inkscape:label="#spiro_splines_mode" />
+ </g>
+ <g
+ id="ink_bspline_mode"
+ transform="matrix(1.3950659,-1.3663987,1.3663987,1.3950659,422.25373,1418.3569)"
+ inkscape:label="#ink_bspline_mode">
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:none;stroke:#0000ff;stroke-width:0.99609488;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline"
+ d="m 961.86036,56.036072 c 0,0 1.37815,-1.49823 3.26044,-1.760578 1.88229,-0.262349 3.58408,1.78013 3.58408,1.78013"
+ id="path-mode-spiro-3-8-8-3"
+ sodipodi:nodetypes="czc"
+ inkscape:label="#spiro_splines_mode" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc"
+ id="path6177-8-2-3"
+ d="m 960.66889,54.876493 4.48905,-4.557718 4.81244,4.713556"
+ style="fill:none;stroke:#646464;stroke-width:0.76814532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ <rect
+ y="-639.91193"
+ x="724.22583"
+ height="1.0229635"
+ width="1.0225416"
+ id="rect8372-9-8-6"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)" />
+ <rect
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ id="rect6941-0"
+ width="1.0225416"
+ height="1.0229635"
+ x="724.2002"
+ y="-633.33978" />
+ <rect
+ y="-639.91193"
+ x="731.08893"
+ height="1.0229635"
+ width="1.0225416"
+ id="rect6954-7"
+ style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.25576118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+ transform="matrix(0.71440887,0.69972849,-0.69972849,0.71440887,0,0)" />
</g>
</g>
</svg>
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index be25b6a7f..6d35d0897 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -58,6 +58,11 @@
#include "helper/geom-nodetype.h"
#include "helper/geom-curves.h"
+// For handling un-continuous paths:
+#include "message-stack.h"
+#include "inkscape.h"
+#include "desktop.h"
+
#include "live_effects/spiro.h"
#define INKSCAPE_LPE_BSPLINE_C
@@ -87,20 +92,16 @@ static void spdc_pen_set_initial_point(SPPenContext *pc, Geom::Point const p);
static void sp_pen_context_set_mode(SPPenContext *const pc, guint mode);
//Esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
static void spiro_color(SPPenContext *const pc);
-//Combierte el el último nodo a CUSP
-static void spiro_node_cusp (SPPenContext *const pc);
-//Combierte el el último nodo a SYMM
-static void spiro_node_symm (SPPenContext *const pc);
-//preparates the curves for its trasformation into spiro curves.
-static void spiro_build(SPPenContext *const pc, bool Shift);
+//Preparamos la curva roja para que se muestre según esté pulsada la tecla SHIFT
+static void spiro_prepare(SPPenContext *const pc, bool Shift);
+//Unimos todas las curvas en juego y llamamos a la función doEffect.
+static void spiro_build(SPPenContext *const pc);
//function spiro cloned from lpe-spiro.cpp
static void spiro_doEffect(SPCurve * curve);
-//Combierte el el último nodo a CUSP
-static void bspline_node_cusp (SPPenContext *const pc);
-//Combierte el el último nodo a BSpline
-static void bspline_node (SPPenContext *const pc);
-//preparates the curves for its trasformation into bspline curves.
-static void bspline_build(SPPenContext *const pc, bool Shift);
+//Preparamos la curva roja para que se muestre según esté pulsada la tecla SHIFT
+static void bspline_prepare(SPPenContext *const pc,bool Shift);
+//Unimos todas las curvas en juego y llamamos a la función doEffect.
+static void bspline_build(SPPenContext *const pc);
//function bspline cloned from lpe-bspline.cpp
static void bspline_doEffect(SPCurve * curve);
//BSpline end
@@ -476,7 +477,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const
SPDrawAnchor * const anchor = spdc_test_inside(pc, event_w);
//BSpline
//with this we avoid creating a new point over the existing one
- if((pc->spiro || pc->bspline) && (!anchor || pc->p[0] == pc->p[3]) && pc->p[0] == pc->desktop->w2d(event_w)){
+ if((pc->spiro || pc->bspline) && pc->npoints > 0 && pc->p[0] == pc->p[3]){
return FALSE;
}
//BSpline end
@@ -669,7 +670,7 @@ static gint pen_handle_motion_notify(SPPenContext *const pc, GdkEventMotion cons
//"spiro_color" lo ejecutamos siempre sea o no spiro
spiro_color(pc);
if (pen_within_tolerance) {
- if ( Geom::LInfty( event_w - pen_drag_origin_w ) < tolerance && mevent.time != 0) {
+ if ( Geom::LInfty( event_w - pen_drag_origin_w ) < tolerance) {
return FALSE; // Do not drag if we're within tolerance from origin.
}
}
@@ -766,8 +767,9 @@ static gint pen_handle_motion_notify(SPPenContext *const pc, GdkEventMotion cons
// snap the handle
spdc_endpoint_snap_handle(pc, p, mevent.state);
-
- if (!pc->polylines_only) {
+ //BSpline
+ if (!pc->polylines_only && !pc->bspline && !pc->spiro) {
+ //BSpline End
spdc_pen_set_ctrl(pc, p, mevent.state);
} else {
spdc_pen_set_ctrl(pc, pc->p[1], mevent.state);
@@ -792,39 +794,14 @@ static gint pen_handle_motion_notify(SPPenContext *const pc, GdkEventMotion cons
break;
}
//BSpline
- if(pc->spiro){
- //Here we redraw the Spiro curve when the cursor is moved
- //and the tolerance distance is exceeded.
- //the tolerance value can be multiplied to improve the performance
- //but it would lost fluency.
- //If the cursor stops the curve is also redrawed.
- if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
- //and we redraw the spiro
- if ((mevent.state & GDK_SHIFT_MASK)){
- spiro_build(pc,true);
- }else{
- spiro_build(pc,false);
- }
- //we update the distance and the tolerance
- pen_drag_origin_w = event_w;
+ if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
+ if(pc->spiro){
+ spiro_prepare(pc,(mevent.state & GDK_SHIFT_MASK));
}
- }
- if(pc->bspline){
- //Here we redraw the Bspline curve when the cursor is moved
- //and the tolerance distance is exceeded.
- //the tolerance value can be multiplied to improve the performance
- //but it would lost fluency.
- //If the cursor stops the curve is also redrawed.
- if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
- //and we redraw the spiro
- if ((mevent.state & GDK_SHIFT_MASK)){
- bspline_build(pc,true);
- }else{
- bspline_build(pc,false);
- }
- //we update the distance and the tolerance
- pen_drag_origin_w = event_w;
+ if(pc->bspline){
+ bspline_prepare(pc,(mevent.state & GDK_SHIFT_MASK));
}
+ pen_drag_origin_w = event_w;
}
//BSpline End
return ret;
@@ -841,7 +818,6 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
}
gint ret = FALSE;
-
SPEventContext *event_context = SP_EVENT_CONTEXT(pc);
if ( revent.button == 1 && !event_context->space_panning ) {
SPDrawContext *dc = SP_DRAW_CONTEXT (pc);
@@ -856,7 +832,7 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
//BSpline
if(pc->spiro || pc->bspline){
//Si intentamos crear un nodo en el mismo sitio que el origen, paramos.
- if((!anchor || pc->p[0] == pc->p[3]) && pc->p[0] == p){
+ if(pc->npoints > 0 && pc->p[0] == pc->p[3]){
return FALSE;
}
}
@@ -879,6 +855,14 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
p = anchor->dp;
}
}
+ //BSpline
+ if(pc->spiro){
+ spiro_prepare(pc,(revent.state & GDK_SHIFT_MASK));
+ }
+ if(pc->bspline){
+ bspline_prepare(pc,(revent.state & GDK_SHIFT_MASK));
+ }
+ //BSpline End
pc->state = SP_PEN_CONTEXT_CONTROL;
ret = TRUE;
break;
@@ -895,13 +879,13 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
spdc_endpoint_snap(pc, p, revent.state);
}
spdc_pen_finish_segment(pc, p, revent.state);
- spdc_pen_finish(pc, TRUE);
//BSpline
//Ocultamos la guia del penultimo nodo al cerrar la curva
if(pc->spiro){
sp_canvas_item_hide(pc->c1);
}
//BSpline End
+ spdc_pen_finish(pc, TRUE);
pc->state = SP_PEN_CONTEXT_POINT;
ret = TRUE;
break;
@@ -924,6 +908,12 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
case SP_PEN_CONTEXT_CLOSE:
spdc_endpoint_snap(pc, p, revent.state);
spdc_pen_finish_segment(pc, p, revent.state);
+ //BSpline
+ //Ocultamos la guia del penultimo nodo al cerrar la curva
+ if(pc->spiro){
+ sp_canvas_item_hide(pc->c1);
+ }
+ //BSpline End
if (pc->green_closed) {
// finishing at the start anchor, close curve
spdc_pen_finish(pc, TRUE);
@@ -931,12 +921,6 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
// finishing at some other anchor, finish curve but not close
spdc_pen_finish(pc, FALSE);
}
- //BSpline
- if(pc->spiro){
- //Ocultamos la guia del penultimo nodo al cerrar la curva
- sp_canvas_item_hide(pc->c1);
- }
- //BSpline End
break;
case SP_PEN_CONTEXT_STOP:
// This is allowed, if we just cancelled curve
@@ -960,28 +944,6 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
dc->green_closed = FALSE;
}
- //BSpline
- if(pc->spiro){
- //Ejecutamos la función tipo de nodo segun tengamos la mayuscula presionada
- if ((revent.state & GDK_SHIFT_MASK)){
- spiro_node_cusp(pc);
- spiro_build(pc,true);
- }else{
- spiro_node_symm(pc);
- spiro_build(pc,false);
- }
- }
- if(pc->bspline){
- //Ejecutamos la función tipo de nodo segun tengamos la mayuscula presionada
- if ((revent.state & GDK_SHIFT_MASK)){
- bspline_node_cusp(pc);
- bspline_build(pc, true);
- }else{
- bspline_node(pc);
- bspline_build(pc, false);
- }
- }
- //BSpline End
// TODO: can we be sure that the path was created correctly?
// TODO: should we offer an option to collect the clicks in a list?
@@ -1070,11 +1032,11 @@ static void pen_redraw_all (SPPenContext *const pc)
//sino al final de esta
if(pc->spiro){
//we redraw spiro
- spiro_build(pc, true);
+ spiro_build(pc);
}
if(pc->bspline){
//we redraw bspline
- bspline_build(pc, false);
+ bspline_build(pc);
}
//BSpline End
}
@@ -1160,10 +1122,15 @@ static void pen_lastpoint_tocurve (SPPenContext *const pc)
B = pc->green_curve->last_segment()->finalPoint();
previous->moveto(A);
previous->lineto(B);
- //we eliminate the last segment
- pc->green_curve->backspace();
- //and we add it again with the recreation
- pc->green_curve->append_continuous(previous, 0.0625);
+ if( pc->green_curve->get_segment_count() == 1){
+ pc->green_curve = previous;
+ }else{
+ //we eliminate the last segment
+ pc->green_curve->backspace();
+ //and we add it again with the recreation
+ pc->green_curve->append_continuous(previous, 0.0625);
+ }
+
}
//Spiro Live
pen_redraw_all(pc);
@@ -1181,7 +1148,7 @@ static void pen_lastpoint_toline (SPPenContext *const pc)
//BSpline
//Para formar una recta necesitamos un nodo con manejador en el "lastpoint"
//de esta manera modificamos el final de la "curva_verde" para que tenga manejador
- if(pc->bspline){
+ if(pc->bspline && !pc->green_curve->is_empty()){
Geom::Point A(0,0);
Geom::Point B(0,0);
Geom::Point C(0,0);
@@ -1190,14 +1157,19 @@ static void pen_lastpoint_toline (SPPenContext *const pc)
//We obtain the last segment 4 points in the previous curve
A = pc->green_curve->last_segment()->initialPoint();
B = pc->green_curve->last_segment()->initialPoint();
- C = pc->p[0] + (Geom::Point)(pc->p[0] - pc->p[1]);
+ C = pc->green_curve->last_segment()->finalPoint() + (1./3)* (Geom::Point)(pc->green_curve->last_segment()->initialPoint() - pc->green_curve->last_segment()->finalPoint());
D = pc->green_curve->last_segment()->finalPoint();
previous->moveto(A);
previous->curveto(B, C, D);
- //we eliminate the last segment
- pc->green_curve->backspace();
- //and we add it again with the recreation
- pc->green_curve->append_continuous(previous, 0.0625);
+
+ if( pc->green_curve->get_segment_count() == 1){
+ pc->green_curve = previous;
+ }else{
+ //we eliminate the last segment
+ pc->green_curve->backspace();
+ //and we add it again with the recreation
+ pc->green_curve->append_continuous(previous, 0.0625);
+ }
}
pen_redraw_all(pc);
@@ -1514,103 +1486,114 @@ static void spiro_color(SPPenContext *const pc)
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(pc->red_bpath), pc->red_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
}
-//Combierte el el último nodo a CUSP
-static void spiro_node_cusp (SPPenContext *const pc)
-{
- if(pc->green_curve->is_empty())
- return;
- Geom::Point P0(0,0);
- Geom::Point P1(0,0);
- Geom::Point P2(0,0);
- Geom::Point P3(0,0);
- Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->last_segment());
- if(cubic){
- P0 = (*cubic)[0];
- P1 = (*cubic)[1];
- P2 = (*cubic)[3];
- P3 = (*cubic)[3];
- }
- pc->p[0] + P3;
- pc->p[1] = P3 - (1./3)*(Geom::Point)( P0 - P3 );
- SPCurve * last = new SPCurve();
- last->moveto(P0);
- last->curveto(P1,P2,P3);
- if( pc->green_curve->get_segment_count() == 1){
- pc->green_curve = last;
- }else{
- pc->green_curve->backspace();
- pc->green_curve->append_continuous(last, 0.0625);
- }
-}
-//Combierte el el último nodo a SYMM
-//Solo se ejecuta al final de el evento release button
-static void spiro_node_symm(SPPenContext *const pc)
+//Preparamos la curva roja para que se muestre según esté pulsada la tecla SHIFT
+static void spiro_prepare(SPPenContext *const pc, bool Shift)
{
- //Si empezamos sobre una curva ya existente
- if(pc->green_curve->is_empty() && pc->sa && !pc->sa->curve->is_empty()){
- Geom::CubicBezier const * cubic;
- if (pc->sa->start) {
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->first_segment() );
- if ( cubic ) {
- pc->p[1] = (pc->p[0]-(*cubic)[1]) + pc->p[0];
+ if(Shift){
+ //Creamos un nodo CUSP
+ pc->npoints = 5;
+ pc->p[2] = pc->p[3];
+ //Si empezamos sobre otra curva en modo cusp la alteramos para que no tenga manejador final
+ //recreando la curva e igualando el punto del manejador al punto fiinal de la curva
+ if(pc->anchor_statusbar && pc->sa && !pc->sa->curve->is_empty() && !pc->ea && pc->green_curve->is_empty()){
+ bool reverse = false;
+ Geom::CubicBezier const * cubic;
+ if(pc->sa->start){
+ reverse = true;
+ pc->sa->curve = reverse_then_reset(pc->sa->curve);
}
- }else{
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->last_segment() );
- if ( cubic ) {
- pc->p[1] = (pc->p[0]-(*cubic)[2]) + pc->p[0];
+ Geom::Point P0(0,0);
+ Geom::Point P1(0,0);
+ Geom::Point P2(0,0);
+ Geom::Point P3(0,0);
+ Geom::Point P4(0,0);
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->last_segment());
+ if(cubic){
+ P0 = pc->sa->curve->last_segment()->initialPoint();
+ P1 = (*cubic)[1];
+ P3 = pc->sa->curve->last_segment()->finalPoint();
+ P2 = P3;
+ }else{
+ P0 = pc->sa->curve->last_segment()->initialPoint();
+ P1 = P0;
+ P3 = pc->sa->curve->last_segment()->finalPoint();
+ P2 = P3;
+ }
+ SPCurve * last = new SPCurve();
+ last->moveto(P0);
+ last->curveto(P1,P2,P3);
+ if( pc->sa->curve->get_segment_count() == 1){
+ pc->sa->curve = last;
+ }else{
+ pc->sa->curve->backspace();
+ pc->sa->curve->append_continuous(last, 0.0625);
+ }
+ if(reverse){
+ pc->sa->curve = reverse_then_reset(pc->sa->curve);
}
+ delete last;
}
- }
- //Cuando cerramos el segmento
- if (!pc->green_curve->is_empty()){
- Geom::Point P0(0,0);
- Geom::Point P1(0,0);
- Geom::Point P2(0,0);
- Geom::Point P3(0,0);
- Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->last_segment());
- if(cubic){
- P0 = (*cubic)[0];
- P1 = (*cubic)[1];
- P2 = (*cubic)[3] + (1./3)*((*cubic)[0] - (*cubic)[3]);
- P3 = (*cubic)[3];
- }else{
- P0 = pc->green_curve->last_segment()->initialPoint();
- P1 = P0;
- P3 = pc->green_curve->last_segment()->finalPoint();
- P2 = P3 + (1./3)*(P0 - P3);
+
+ }else{
+ //Symm nodo
+ using Geom::X;
+ using Geom::Y;
+ Geom::CubicBezier const * cubic;
+
+ //Damos valores a los puntos de la curva roja para que generen un nodo SYMM
+ if(!pc->red_curve->is_empty()){
+ pc->npoints = 5;
+ //Les damos valor
+ pc->p[0] = pc->red_curve->first_segment()->initialPoint();
+ pc->p[3] = pc->red_curve->first_segment()->finalPoint();
+ pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+ pc->p[4] = pc->p[3] + (Geom::Point)( pc->p[3] - pc->p[2] );
+ pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
}
- pc->p[1] = pc->p[0] + (Geom::Point)( pc->p[0] - P2 );
- SPCurve * last = new SPCurve();
- last->moveto(P0);
- last->curveto(P1,P2,P3);
- if( pc->green_curve->get_segment_count() == 1){
- pc->green_curve = last;
- }else{
- pc->green_curve->backspace();
- pc->green_curve->append_continuous(last, 0.0625);
+ //Continuamos la curva en modo SPIRO
+ if(pc->anchor_statusbar && pc->sa && !pc->sa->curve->is_empty() && !pc->ea && pc->green_curve->is_empty()){
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->last_segment());
+ if (pc->sa->start) {
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->create_reverse()->last_segment() );
+ }
+ if(cubic){
+ pc->p[1] = (pc->p[0] - (*cubic)[2]) + pc->p[0];
+ }
}
- }
- //por si cerramos la curva
- if(pc->ea && !pc->ea->curve->is_empty()){
- Geom::CubicBezier const * cubic;
- if(pc->ea->start){
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->first_segment());
+ //Nos aseguramos que el primer nodo sea SYMM con el ultimo segmento de la curva verde
+ if(!pc->green_curve->is_empty()){
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->last_segment());
+ if(cubic && (*cubic)[2] != (*cubic)[3]){
+ pc->p[1] = (pc->p[0] - (*cubic)[2]) + pc->p[0];
+ }
+ }
+
+ //Si cerramos sobre otra curva ponemos simetrico a esta el manejador del punto de cierre
+ if(pc->ea && !pc->ea->curve->is_empty()){
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->last_segment() );
+ if (pc->ea->start) {
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->create_reverse()->last_segment() );
+ }
if(cubic){
- pc->p[2] = pc->p[3] + (Geom::Point)( pc->p[3] - (*cubic)[1] );
+ pc->p[2] = (pc->p[3]-(*cubic)[2]) + pc->p[3];
}
- }else{
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->last_segment());
+ }
+ //Lo mismpo pero cerrando sobre la curva inicial
+ if(pc->green_anchor && pc->green_anchor->active){
+ cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->first_segment() );
if(cubic){
- pc->p[2] = pc->p[3] + (Geom::Point)( pc->p[3] - (*cubic)[2] );
+ pc->p[2] = (pc->p[3]-(*cubic)[1]) + pc->p[3];
}
}
+
}
+ spiro_build(pc);
}
-//preparates the curves for its trasformation into spiro curves.
-//Parámetro opcional que indica si la curva se cierra en que modo lo hace Cusp o Symm
-static void spiro_build(SPPenContext *const pc, bool Shift)
+
+//Unimos todas las curvas en juego y llamamos a la función doEffect.
+static void spiro_build(SPPenContext *const pc)
{
//We create the base curve
SPCurve *curve = new SPCurve();
@@ -1622,49 +1605,23 @@ static void spiro_build(SPPenContext *const pc, bool Shift)
}
}
//We add also the green curve
- if (!pc->green_curve->is_empty()) {
+ if (!pc->green_curve->is_empty())
curve->append_continuous(pc->green_curve, 0.0625);
- }
+
//and the red one
- if (!pc->red_curve->is_empty()) {
- //we add the curve to the modified values
- if(!Shift){
- if(pc->ea && !pc->ea->curve->is_empty()){
- Geom::CubicBezier const * cubic;
- if(pc->ea->start){
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->first_segment());
- if(cubic){
- pc->p[2] = pc->p[3] + (Geom::Point)( pc->p[3] - (*cubic)[1] );
- }
- }else{
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->ea->curve->last_segment());
- if(cubic){
- pc->p[2] = pc->p[3] + (Geom::Point)( pc->p[3] - (*cubic)[2] );
- }
- }
- } else if(pc->green_anchor && pc->green_anchor->active){
- Geom::CubicBezier const * cubic;
- cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->first_segment());
- if(cubic){
- pc->p[2] = pc->p[3] + (Geom::Point)( pc->p[3] - (*cubic)[1] );
- }
- }
- if(pc->p[2] != pc->p[3]){
- pc->red_curve->reset();
- pc->npoints = 5;
- pc->red_curve->moveto(pc->p[0]);
- pc->red_curve->curveto(pc->p[1],pc->p[2],pc->p[3]);
- }
+ if (!pc->red_curve->is_empty()){
+ pc->red_curve->reset();
+ pc->red_curve->moveto(pc->p[0]);
+ pc->red_curve->curveto(pc->p[1],pc->p[2],pc->p[3]);
+ curve->append_continuous(pc->red_curve, 0.0625);
+ }
+
+ if(!pc->sa && pc->ea && !pc->ea->curve->is_empty()){
+ if (pc->ea->start) {
+ curve->append_continuous(pc->ea->curve, 0.0625);
}else{
- if((pc->ea && !pc->ea->curve->is_empty()) || (pc->green_anchor && pc->green_anchor->active)){
- pc->p[2] == pc->p[3];
- pc->red_curve->reset();
- pc->npoints = 5;
- pc->red_curve->moveto(pc->p[0]);
- pc->red_curve->curveto(pc->p[1],pc->p[2],pc->p[3]);
- }
+ curve->append_continuous(pc->ea->curve->create_reverse(), 0.0625);
}
- curve->append_continuous(pc->red_curve, 0.0625);
}
if(!curve->is_empty()){
//cerramos la curva si estan cerca los puntos finales de la curva spiro
@@ -1675,7 +1632,7 @@ static void spiro_build(SPPenContext *const pc, bool Shift)
//For example
//using namespace Inkscape::LivePathEffect;
//LivePathEffectObject *lpeobj = static_cast<LivePathEffectObject*> (curve);
- //Effect *spr = static_cast<Effect*> ( new LPESpiro(lpeobj) );
+ //Effect *spr = static_cast<Effect*> ( new LPEspiro(lpeobj) );
//spr->doEffect(curve);
spiro_doEffect(curve);
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), curve);
@@ -1805,95 +1762,70 @@ static void spiro_doEffect(SPCurve * curve)
g_free (path);
}
-//Combierte el el último nodo a CUSP
-//Crea una curva en el punto final de la green_curve
-static void bspline_node_cusp(SPPenContext *const pc)
+//Unimos todas las curvas en juego y llamamos a la función doEffect.
+static void bspline_prepare(SPPenContext *const pc, bool Shift)
{
-
- if (!pc->green_curve->is_empty()){
- using Geom::X;
- using Geom::Y;
- Geom::Point P0(0,0);
- Geom::Point P1(0,0);
- Geom::Point P2(0,0);
- Geom::Point P3(0,0);
- P0 = pc->green_curve->last_segment()->initialPoint();
- P1 = P0;
- P3 = pc->green_curve->last_segment()->finalPoint();
- P2 = P3 + (1./3)*(P0 - P3);
- P2 = Geom::Point(P2[X]+1,P2[Y]+1);
- pc->p[0] = P3;
- pc->p[1] = P3;
- SPCurve * last = new SPCurve();
- last->moveto(P0);
- last->curveto(P1, P2,P3);
- if( pc->green_curve->get_segment_count() == 1){
- pc->green_curve = last;
- }else{
- pc->green_curve->backspace();
- pc->green_curve->append_continuous(last, 0.0625);
+ if(!Shift){
+ //Modo Bspline formado por nodos CUSP
+ if (pc->npoints == 5){
+ pc->npoints = 2;
+ pc->p[1]= pc->p[3];
}
- }
- if (pc->sa && !pc->sa->curve->is_empty() && pc->green_curve->get_segment_count() == 1){
+ }else{
+ //NODO CUSP formado por nodo SMOOTH
+ //solo mobemos el manejador del nodo final de cada segmento
+ //Es suficiente para mostrar el nodo como CUSP
using Geom::X;
using Geom::Y;
- if(pc->sa->start){
- pc->sa->curve = reverse_then_reset(pc->sa->curve);
+ bool reverse = false;
+ //Usamos 5 puntos
+ if(pc->npoints == 2){
+ pc->npoints = 5;
}
- Geom::Point P0(0,0);
- Geom::Point P1(0,0);
- Geom::Point P2(0,0);
- Geom::Point P3(0,0);
- P0 = pc->sa->curve->last_segment()->initialPoint();
- P1 = P0;
- P3 = pc->sa->curve->last_segment()->finalPoint();
- P2 = P3 + (1./3)*(P0 - P3);
- P2 = Geom::Point(P2[X]+1,P2[Y]+1);
- pc->p[0] = P3;
- pc->p[1] = P3;
- SPCurve * last = new SPCurve();
- last->moveto(P0);
- last->curveto(P1,P2,P3);
- if( pc->sa->curve->get_segment_count() == 1){
- pc->sa->curve = last;
- }else{
- pc->sa->curve->backspace();
- pc->sa->curve->append_continuous(last, 0.0625);
+ pc->p[1] = pc->p[0];
+ //Les damos valor
+ pc->p[3] = pc->red_curve->first_segment()->finalPoint();
+ pc->p[4] = pc->p[3];
+ pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+
+ //Si empezamos sobre otra curva hay que modificarla para que tenga manejador en el último nodo
+ if(pc->anchor_statusbar && pc->sa && !pc->sa->curve->is_empty() && !pc->ea && pc->green_curve->is_empty()){
+ if(pc->sa->start){
+ reverse = true;
+ pc->sa->curve = reverse_then_reset(pc->sa->curve);
+ }
+ Geom::Point P0(0,0);
+ Geom::Point P1(0,0);
+ Geom::Point P2(0,0);
+ Geom::Point P3(0,0);
+ Geom::Point P4(0,0);
+ P0 = pc->sa->curve->last_segment()->initialPoint();
+ P1 = P0;
+ P3 = pc->sa->curve->last_segment()->finalPoint();
+ P2 = P3 + (1./3)*(P0 - P3);
+ SPCurve * last = new SPCurve();
+ last->moveto(P0);
+ last->curveto(P1,P2,P3);
+ if( pc->sa->curve->get_segment_count() == 1){
+ pc->sa->curve = last;
+ }else{
+ pc->sa->curve->backspace();
+ pc->sa->curve->append_continuous(last, 0.0625);
+ }
+ if(reverse){
+ pc->sa->curve = reverse_then_reset(pc->sa->curve);
+ }
+ delete last;
}
}
- //Lo ejacutamos para que se actualize tosa la curva por un fallo de redibujo
- bspline_build(pc,true);
+bspline_build(pc);
}
-//Combierte el el último nodo a SYMM
-//crea lineas rectas
-static void bspline_node(SPPenContext *const pc)
-{
- if (!pc->green_curve->is_empty()){
- Geom::Point P0(0,0);
- Geom::Point P1(0,0);
- P0 = pc->green_curve->last_segment()->initialPoint();
- P1 = pc->green_curve->last_segment()->finalPoint();
- pc->p[1] = P1;
- pc->p[0] = P1;
- SPCurve * last = new SPCurve();
- last->moveto(P0);
- last->lineto(P1);
- if( pc->green_curve->get_segment_count() == 1){
- pc->green_curve = last;
- }else{
- pc->green_curve->backspace();
- pc->green_curve->append_continuous(last, 0.0625);
- }
- }
-}
//preparates the curves for its trasformation into BSline curves.
-static void bspline_build(SPPenContext *const pc, bool Shift)
+static void bspline_build(SPPenContext *const pc)
{
- if (pc->green_curve->is_empty() && !pc->sa)
- return;
//We create the base curve
SPCurve *curve = new SPCurve();
//If we continuate the existing curve we add it at the start
@@ -1904,31 +1836,28 @@ static void bspline_build(SPPenContext *const pc, bool Shift)
}
}
//We add also the green curve
- if (!pc->green_curve->is_empty()) {
+ if (!pc->green_curve->is_empty())
curve->append_continuous(pc->green_curve, 0.0625);
- }
+
//and the red one
- if (!pc->red_curve->is_empty()) {
- //we add the curve to the modified values
- if((pc->ea && !pc->ea->curve->is_empty()) || (pc->green_anchor && pc->green_anchor->active)){
- if(Shift){
- using Geom::X;
- using Geom::Y;
- pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
- pc->p[2] = Geom::Point(pc->p[2][X]+1,pc->p[2][Y]+1);
- pc->red_curve->reset();
- pc->npoints = 5;
- pc->red_curve->moveto(pc->p[0]);
- pc->red_curve->curveto(pc->p[1],pc->p[2],pc->p[3]);
- }else{
- pc->red_curve->reset();
- pc->npoints = 2;
- pc->red_curve->moveto(pc->p[0]);
- pc->red_curve->lineto(pc->red_curve->first_segment()->finalPoint());
- }
+ if (!pc->red_curve->is_empty()){
+ pc->red_curve->reset();
+ pc->red_curve->moveto(pc->p[0]);
+ if(pc->npoints == 2){
+ pc->red_curve->lineto(pc->p[1]);
+ }else{
+ pc->red_curve->curveto(pc->p[1],pc->p[2],pc->p[3]);
}
curve->append_continuous(pc->red_curve, 0.0625);
}
+
+ if(!pc->sa && pc->ea && !pc->ea->curve->is_empty()){
+ if (pc->ea->start) {
+ curve->append_continuous(pc->ea->curve, 0.0625);
+ }else{
+ curve->append_continuous(pc->ea->curve->create_reverse(), 0.0625);
+ }
+ }
if(curve->get_segment_count() > 1 ){
//cerramos la curva si estan cerca los puntos finales de la curva spiro
if(Geom::are_near(curve->first_path()->initialPoint(), curve->last_path()->finalPoint())){
@@ -1938,7 +1867,7 @@ static void bspline_build(SPPenContext *const pc, bool Shift)
//For example
//using namespace Inkscape::LivePathEffect;
//LivePathEffectObject *lpeobj = static_cast<LivePathEffectObject*> (curve);
- //Effect *spr = static_cast<Effect*> ( new LPEBspline(lpeobj) );
+ //Effect *spr = static_cast<Effect*> ( new LPEbspline_prepare(lpeobj) );
//spr->doEffect(curve);
bspline_doEffect(curve);
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), curve);
@@ -1951,7 +1880,7 @@ static void bspline_build(SPPenContext *const pc, bool Shift)
sp_canvas_item_hide(pc->cl1);
sp_canvas_item_hide(pc->c0);
sp_canvas_item_hide(pc->cl0);
- }else {
+ }else{
//if the curve is empty
sp_canvas_item_hide(pc->blue_bpath);
}
@@ -1965,167 +1894,174 @@ static void bspline_doEffect(SPCurve * curve)
// Make copy of old path as it is changed during processing
Geom::PathVector const original_pathv = curve->get_pathvector();
curve->reset();
- int ip = 0;
//Sbasis
- Geom::D2< Geom::SBasis > curveIn;
- Geom::D2< Geom::SBasis > curveOut;
- Geom::D2< Geom::SBasis > rectCurve;
- Geom::D2< Geom::SBasis > rectCurveExtra;
- //Puntos a usar. Ponemos todos los posibles para hacer más inteligible el código
- Geom::Point startAnchor(0,0);
- Geom::Point previousAnchor(0,0);
- Geom::Point anchor(0,0);
- Geom::Point previousSBasis0(0,0);
- Geom::Point previousSBasis1(0,0);
- Geom::Point previousSBasis2(0,0);
- //Geom::Point previousSBasis3(0,0);
- Geom::Point SBasis0(0,0);
- Geom::Point SBasis1(0,0);
- Geom::Point SBasis2(0,0);
- Geom::Point SBasis3(0,0);
- //Geom::Point nextSBasis0(0,0);
- Geom::Point nextSBasis1(0,0);
- Geom::Point nextSBasis2(0,0);
- Geom::Point nextSBasis3(0,0);
+ Geom::D2< Geom::SBasis > SBasisIn;
+ Geom::D2< Geom::SBasis > SBasisOut;
+ Geom::D2< Geom::SBasis > SBasisEnd;
+ Geom::D2< Geom::SBasis > SBasisHelper;
+ //curves
+ SPCurve * in = new SPCurve();
+ SPCurve * out = new SPCurve();
+ SPCurve * end = new SPCurve();
//Curvas temporales
- SPCurve *BSplineRectTemp = new SPCurve();
- SPCurve *BSplineCurveTemp = new SPCurve();
- SPCurve *BSplinePreviousCurveTemp = new SPCurve();
+ SPCurve *lineHelper = new SPCurve();
+ SPCurve *curveHelper = new SPCurve();
+ SPCurve *nCurve = new SPCurve();
+ //Puntos a usar. Ponemos todos los posibles para hacer más inteligible el código
+ Geom::Point startNode(0,0);
+ Geom::Point previousNode(0,0);
+ Geom::Point node(0,0);
+ Geom::Point previousPointAt0(0,0);
+ Geom::Point previousPointAt1(0,0);
+ Geom::Point previousPointAt2(0,0);
+ //Geom::Point previousPointAt3(0,0);
+ Geom::Point pointAt0(0,0);
+ Geom::Point pointAt1(0,0);
+ Geom::Point pointAt2(0,0);
+ Geom::Point pointAt3(0,0);
+ //Geom::Point nextPointAt0(0,0);
+ Geom::Point nextPointAt1(0,0);
+ Geom::Point nextPointAt2(0,0);
+ Geom::Point nextPointAt3(0,0);
+
//Recorremos todos los paths a los que queremos aplicar el efecto, hasta el penúltimo
for(Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) {
//Si está vacío...
if (path_it->empty())
continue;
- //Declaramos las variables
- //Itreador
+ //Itreadores
Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
- Geom::Path::const_iterator curve_end = path_it->end(); // last curve
+ Geom::Path::const_iterator curve_end = path_it->end(); // end curve
Geom::Path::const_iterator curve_endit = path_it->end_default(); // this determines when the loop has to stop
- //por defecto la linea es recta.
- //Para formar las bsplines contamos que si el nodo es cusp -sin manejadores
- //se calcula el nodo resultante como BSpline. Si por el contrario tiene un manejador
- //en el últimp punto de la cuva (pc->p[2]) calculamos la curva resultante para que forme un nodo cusp
- bool is_line = true;
- bool previous_is_line = true;
- if (path_it->closed()) {
- SBasis2 = curve_it1->toSBasis().valueAt(0.3334);
- nextSBasis1 = curve_end->toSBasis().valueAt(0.6664);
- BSplineRectTemp->moveto(nextSBasis1);
- BSplineRectTemp->lineto(SBasis2);
- startAnchor = BSplineRectTemp->first_segment()->toSBasis().valueAt(0.5);
- anchor = startAnchor;
- BSplineRectTemp->reset();
+ //Las lineas rectas forman nodos BSpline
+ //Las curvas forman nodos CUSP
+ bool isBSpline = true;
+ //Creamos las lineas rectas que unen todos los puntos del trazado y donde se calcularán
+ //los puntos clave para los manejadores.
+ //Esto hace que la curva BSpline no pierda su condición aunque se trasladen
+ //dichos manejadores
+ in->moveto(curve_it1->initialPoint());
+ in->lineto(curve_it1->finalPoint());
+ out->moveto(curve_it2->initialPoint());
+ out->lineto(curve_it2->finalPoint());
+ //este no cambia.
+ end->moveto(curve_end->initialPoint());
+ end->lineto(curve_end->finalPoint());
+ //Si la curva está cerrada calculamos el punto donde
+ //deveria estar el nodo BSpline de cierre/inicio de la curva
+ //en posible caso de que se cierre con una linea recta creando un nodo BSPline
+ if (path_it->closed() && is_straight_curve(*curve_end)) {
+ //Calculamos el nodo de inicio BSpline
+ SBasisIn = in->first_segment()->toSBasis();
+ SBasisEnd = end->first_segment()->toSBasis();
+ lineHelper->moveto(SBasisIn.valueAt(0.3334));
+ lineHelper->lineto(SBasisEnd.valueAt(0.6664));
+ SBasisHelper = lineHelper->first_segment()->toSBasis();
+ lineHelper->reset();
+ //Guardamos el principio de la curva
+ startNode = SBasisHelper.valueAt(0.5);
+ //Definimos el punto de inicio original de la curva resultante
+ node = startNode;
+ }else{
+ //Guardamos el principio de la curva
+ startNode = in->first_segment()->initialPoint();
+ //Definimos el punto de inicio original de la curva resultante
+ node = startNode;
}
+ //Recorremos todos los segmentos menos el último
while ( curve_it2 != curve_endit )
{
- //Calculamos los dos puntos para seleccional el punto central de la línea que los une
- curveIn = curve_it1->toSBasis();
- curveOut = curve_it2->toSBasis();
- previousSBasis0 = SBasis0;
- previousSBasis1 = SBasis1;
- previousSBasis2 = SBasis2;
- //previousSBasis3 = SBasis3;
- SBasis0 = curveIn.valueAt(0);
- SBasis1 = curveIn.valueAt(0.3334);
- SBasis2 = curveIn.valueAt(0.6667);
- SBasis3 = curveIn.valueAt(1);
- //nextSBasis0 = curveOut.valueAt(0);
- nextSBasis1 = curveOut.valueAt(0.3334);
- nextSBasis2 = curveOut.valueAt(0.6667);;
- nextSBasis3 = curveOut.valueAt(1);
- //Se forma con la union de dos puntos, el primero está en la curva entrante
- // y se conoce dividiendo por tres la curva y seleccionado el
- //punto mas cercano de los dos al nodo de union con la curva saliente.
- //El otro punto es el puntio más cercano al nodo de union
- //de la curva saliente dividida por tres.
- BSplineRectTemp->moveto(SBasis2);
- BSplineRectTemp->lineto(nextSBasis1);
- previousAnchor = anchor;
- anchor = BSplineRectTemp->first_segment()->toSBasis().valueAt(0.5);
- BSplineRectTemp->reset();
- //Vemos si el nodo es curva
- previous_is_line = is_line;
- is_line = is_straight_curve(*curve_it1);
- if(!is_line && curve->get_segment_count() > 1){
- //Si no es curva convertimos la curva resultante a un nodo cusp
- //aberiguamos el punto en donde deveria estar de manera fija
- //independientemente de el manejador y movemos
- BSplineRectTemp->moveto(SBasis0);
- BSplineRectTemp->lineto(SBasis3);
- SBasis1 = BSplineRectTemp->first_segment()->toSBasis().valueAt(0.3334);
- SBasis2 = BSplineRectTemp->first_segment()->toSBasis().valueAt(0.6667);
- BSplineRectTemp->reset();
- BSplineRectTemp->moveto(SBasis1);
- BSplineRectTemp->lineto(previousSBasis2);
- previousAnchor = BSplineRectTemp->first_segment()->toSBasis().valueAt(0.5);
- anchor = SBasis3;
- BSplineRectTemp->reset();
- //averiguamos el nuevo vinal de curva entrante recreando de nuevo
- //una linea y seleccionando su centro como origen
- if(previous_is_line){
- BSplineCurveTemp->moveto(previousAnchor);
- BSplineCurveTemp->curveto(SBasis1, SBasis2, anchor);
- }else{
- BSplineCurveTemp->moveto(SBasis0);
- BSplineCurveTemp->lineto(anchor);
- }
- BSplineRectTemp->reset();
-
- //Como el origen ha cambiado, seleccionamos el ultimo punto
- //de la curva ya creada y lo movemos al nuevo origen/final
- Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( curve->last_segment());
- if(cubic){
- BSplinePreviousCurveTemp->moveto((*cubic)[0]);
- if(previous_is_line){
- BSplinePreviousCurveTemp->curveto((*cubic)[1],(*cubic)[2],previousAnchor);
- } else {
- BSplinePreviousCurveTemp->curveto((*cubic)[1],(*cubic)[2],curve->last_segment()->finalPoint());
- }
- }else{
- BSplinePreviousCurveTemp->moveto(curve->last_segment()->initialPoint());
- BSplinePreviousCurveTemp->lineto(curve->last_segment()->finalPoint());
- }
- if( curve->get_segment_count() == 1){
- curve = BSplinePreviousCurveTemp;
- }else{
- curve->backspace();
- curve->append_continuous(BSplinePreviousCurveTemp, 0.0625);
- }
- BSplinePreviousCurveTemp->reset();
- }else{
- //Creamos la curva correspondiente a la posición actual del
- //Iterador, para anexarla a la curva de salida
- //almacena la SPCurve de un solo segmento que se va añadir al resiultado final
- //en la itineración
- if (ip == 0 && !path_it->closed()){
- BSplineCurveTemp->moveto(SBasis0);
- }else{
- //Empezamos la curva el el final de la anterior curva
- BSplineCurveTemp->moveto(previousAnchor);
- }
- BSplineCurveTemp->curveto(SBasis1, SBasis2, anchor);
+ //Damos valor a el objeto SBasis para el path de entrada y el de salida
+ SBasisIn = in->first_segment()->toSBasis();
+ SBasisOut = out->first_segment()->toSBasis();
+ //Damos valor a los puntos calculados en el anterior paso del bucle
+ previousPointAt0 = pointAt0;
+ previousPointAt1 = pointAt1;
+ previousPointAt2 = pointAt2;
+ //previousPointAt3 = pointAt3;
+ //Calculamos los puntos que dividirían en tres segmentos iguales el path recto de entrada y de salida
+ pointAt0 = SBasisIn.valueAt(0);
+ pointAt1 = SBasisIn.valueAt(0.3334);
+ pointAt2 = SBasisIn.valueAt(0.6667);
+ pointAt3 = SBasisIn.valueAt(1);
+ //Y hacemos lo propio con el path de salida
+ //nextPointAt0 = curveOut.valueAt(0);
+ nextPointAt1 = SBasisOut.valueAt(0.3334);
+ nextPointAt2 = SBasisOut.valueAt(0.6667);;
+ nextPointAt3 = SBasisOut.valueAt(1);
+ //La curva BSpline se forma calculando el centro del segmanto de unión
+ //de el punto situado en las 2/3 partes de el segmento de entrada
+ //con el punto situado en la posición 1/3 del segmento de salida
+ //Estos dos puntos ademas estan posicionados en el lugas correspondiente de
+ //los manejadores de la curva
+ lineHelper->moveto(pointAt2);
+ lineHelper->lineto(nextPointAt1);
+ SBasisHelper = lineHelper->first_segment()->toSBasis();
+ lineHelper->reset();
+ //almacenamos el punto del anterior bucle -o el de cierre- que nos hara de principio de curva
+ previousNode = node;
+ //Y este hará de final de curva
+ node = SBasisHelper.valueAt(0.5);
+ //Vemos si el nodo es BSpline o CUSP
+ //Averiguamos si el path de entrada es recto o tiene manejadores
+ isBSpline = is_straight_curve(*curve_it1);
+ //Si no es recto, tenemos que generar la curva con nodo final CUSP
+ if(!isBSpline ){
+ //Definimos como nodo el final del segmento de entrada
+ node = pointAt3;
}
- curve->append_continuous(BSplineCurveTemp, 0.0625);
- BSplineCurveTemp->reset();
+ curveHelper->moveto(previousNode);
+ curveHelper->curveto(pointAt1, pointAt2, node);
+ //añadimos la curva generada a la curva pricipal
+ nCurve->append_continuous(curveHelper, 0.0625);
+ curveHelper->reset();
+ //aumentamos los valores para el siguiente paso en el bucle
++curve_it1;
++curve_it2;
- ip++;
+ in->reset();
+ in->moveto(curve_it1->initialPoint());
+ in->lineto(curve_it1->finalPoint());
+ out->reset();
+ if(curve_it1 != curve_end){
+ out->moveto(curve_it2->initialPoint());
+ out->lineto(curve_it2->finalPoint());
+ }
}
- //terminamos el trazado
- BSplineCurveTemp->moveto(anchor);
- is_line = is_straight_curve(*curve_it1);
- if (path_it->closed() && is_line) {
- BSplineCurveTemp->curveto(nextSBasis1, nextSBasis2, startAnchor);
+ //Aberiguamos la ultima parte de la curva correspondiente al último segmento
+ curveHelper->moveto(node);
+ //Si está cerrada la curva, la cerramos sobre el valor guardado previamente
+ //Si no finalizamos en el punto final
+ if (path_it->closed()) {
+ curveHelper->curveto(nextPointAt1, nextPointAt2, startNode);
}else{
- BSplineCurveTemp->curveto(nextSBasis1, nextSBasis2, nextSBasis3);
+ curveHelper->curveto(nextPointAt1, nextPointAt2, nextPointAt3);
}
- curve->append_continuous(BSplineCurveTemp, 0.0625);
- BSplineCurveTemp->reset();
+ //añadimos este último segmento
+ nCurve->append_continuous(curveHelper, 0.0625);
+ //y cerramos la curva
if (path_it->closed()) {
- curve->closepath_current();
+ nCurve->closepath_current();
}
- }
+ curve->append(nCurve,false);
+ nCurve->reset();
+ //Limpiamos
+ in->reset();
+ out->reset();
+ end->reset();
+ lineHelper->reset();
+ curveHelper->reset();
+ }
+ delete in;
+ delete out;
+ delete end;
+ delete lineHelper;
+ delete curveHelper;
+ //Todo: remove?
+ //delete SBasisIn;
+ //delete SBasisOut;
+ //delete SBasisEnd;
+ //delete SBasisHelper;
}
//BSpline end
@@ -2235,6 +2171,14 @@ static void spdc_pen_finish_segment(SPPenContext *const pc, Geom::Point const p,
++pc->num_clicks;
if (!pc->red_curve->is_empty()) {
+ //BSpline
+ if(pc->spiro){
+ spiro_prepare(pc, (state & GDK_SHIFT_MASK));
+ }
+ if(pc->bspline){
+ bspline_prepare(pc, (state & GDK_SHIFT_MASK));
+ }
+ //BSpline End
pc->green_curve->append_continuous(pc->red_curve, 0.0625);
SPCurve *curve = pc->red_curve->copy();
/// \todo fixme:
diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 19a040b24..32248d9b6 100644
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -780,7 +780,14 @@ interpolate(SPPencilContext *pc)
/* Fit and draw and reset state */
pc->green_curve->moveto(b[0]);
for (int c = 0; c < n_segs; c++) {
- pc->green_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]);
+ //BSpline
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
+ if(mode == 2){
+ pc->green_curve->lineto(b[4*c+3]);
+ }else{
+ pc->green_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]);
+ }
}
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->green_curve);
@@ -920,7 +927,15 @@ fit_and_split(SPPencilContext *pc)
/* Fit and draw and reset state */
pc->red_curve->reset();
pc->red_curve->moveto(b[0]);
- pc->red_curve->curveto(b[1], b[2], b[3]);
+ //BSpline
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
+ if(mode == 2){
+ pc->red_curve->lineto(b[3]);
+ }else{
+ pc->red_curve->curveto(b[1], b[2], b[3]);
+ }
+ //BSpline End
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
pc->red_curve_is_valid = true;
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-07 10:07:13 +0000