keyboard shortcut overview: add Deck1/2 labels

2 files changed, 103 insertions, 83 deletions

diff --git a/res/Mixxx-Keyboard-Shortcuts.pdf b/res/Mixxx-Keyboard-Shortcuts.pdf
index 4df2509163..472f17d688 100644
--- a/res/Mixxx-Keyboard-Shortcuts.pdf
+++ b/res/Mixxx-Keyboard-Shortcuts.pdf
diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg
index 8e12227855..79bc8dcb07 100644
--- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg
+++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg
@@ -29,13 +29,13 @@
    inkscape:window-height="1056"
    id="namedview8739"
    showgrid="false"
-   inkscape:zoom="1.1263974"
-   inkscape:cx="83.154051"
-   inkscape:cy="252.60631"
+   inkscape:zoom="2.7869995"
+   inkscape:cx="156.31793"
+   inkscape:cy="138.83797"
    inkscape:window-x="0"
    inkscape:window-y="0"
    inkscape:window-maximized="1"
-   inkscape:current-layer="g3458"
+   inkscape:current-layer="layer3"
    showguides="true"
    inkscape:guide-bbox="true"
    units="px"
@@ -430,13 +430,13 @@
          id="g32437"
          style="fill:#ffffff;fill-opacity:1"><polygon
            id="polygon32439"
-           points="91.126,412.503 67.51,378.058 57.065,378.058 80.68,412.503 "
+           points="67.51,378.058 57.065,378.058 80.68,412.503 91.126,412.503 "
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon
            id="polygon32441"
-           points="114.787,412.503 91.167,378.058 80.722,378.058 104.342,412.503 "
+           points="91.167,378.058 80.722,378.058 104.342,412.503 114.787,412.503 "
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon
            id="polygon32443"
-           points="138.443,412.503 114.823,378.058 104.378,378.058 127.999,412.503 "
+           points="114.823,378.058 104.378,378.058 127.999,412.503 138.443,412.503 "
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><rect
            id="rect32445"
            height="34.445"
@@ -445,7 +445,7 @@
            x="44.568001"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon
            id="polygon32447"
-           points="9.631,378.058 0,378.058 0,412.503 8.76,412.503 8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 40.618,412.503 40.618,378.058 30.988,378.058 20.307,395.233 "
+           points="40.618,412.503 40.618,378.058 30.988,378.058 20.307,395.233 9.631,378.058 0,378.058 0,412.503 8.76,412.503 8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 "
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /></g></g><path
        d="m 687.59179,220.76768 5.222,7.617 5.383,-7.852 -5.222,-7.615 z m -11.829,-17.253 5.223,7.619 5.382,-7.85 -5.224,-7.617 z m 53.291,-8.711 -5.976,8.714 5.221,7.614 11.195,-16.328 z m -70.937,34.445 h 10.448 l 5.973,-8.712 -5.224,-7.619 z m 53.133,-8.482 5.222,7.615 5.381,-7.848 -5.222,-7.615 z m -11.828,-17.25 5.221,7.614 5.381,-7.848 -5.221,-7.613 z"
        id="path32449"
@@ -458,13 +458,13 @@
        transform="translate(601.05478,-183.25433)"><g
          id="g28148"><polygon
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32171);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-0);enable-background:accumulate"
-           points="67.51,378.058 57.065,378.058 80.68,412.503 91.126,412.503 "
+           points="57.065,378.058 80.68,412.503 91.126,412.503 67.51,378.058 "
            id="polygon28150" /><polygon
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32173);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-75);enable-background:accumulate"
-           points="91.167,378.058 80.722,378.058 104.342,412.503 114.787,412.503 "
+           points="80.722,378.058 104.342,412.503 114.787,412.503 91.167,378.058 "
            id="polygon28152" /><polygon
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-75);enable-background:accumulate"
-           points="114.823,378.058 104.378,378.058 127.999,412.503 138.443,412.503 "
+           points="104.378,378.058 127.999,412.503 138.443,412.503 114.823,378.058 "
            id="polygon28154" /><rect
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-1);enable-background:accumulate"
            x="44.568001"
@@ -473,7 +473,7 @@
            height="34.445"
            id="rect28156" /><polygon
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837);enable-background:accumulate"
-           points="0,378.058 0,412.503 8.76,412.503 8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 40.618,412.503 40.618,378.058 30.988,378.058 20.307,395.233 9.631,378.058 "
+           points="40.618,378.058 30.988,378.058 20.307,395.233 9.631,378.058 0,378.058 0,412.503 8.76,412.503 8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 40.618,412.503 "
            id="polygon28158" /></g></g><path
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-0);enable-background:accumulate"
        inkscape:connector-curvature="0"
@@ -598,7 +598,7 @@
    style="display:inline;fill:none"
    id="polygon2002"
    transform="translate(-7.1960915,37.823562)"
-   points="807.465,828.441 0,828.441 0,560.464 807.465,560.464 " /><text
+   points="0,560.464 807.465,560.464 807.465,828.441 0,828.441 " /><text
    id="text2008"
    y="528.76453"
    x="394.76688"
@@ -15577,9 +15577,9 @@
 <path
    style="display:inline;fill:none;stroke:#00000f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.941176"
    id="path3272"
-   d="m 257.15603,799.69838 -0.35372,-29.47795 -17.85445,-0.19609 -0.0298,-32.90418 -9.25994,-0.17678 v -32.54376 l -17.02638,10e-6 0.17634,-29.59425"
+   d="m 257.15603,799.69838 -0.35372,-29.47795 -17.85445,-0.19609 -0.0298,-32.90418 -9.25994,-0.17678 v -32.54376 l -17.02638,10e-6 0.0882,-32.13085 h 10 v -46"
    inkscape:connector-curvature="0"
-   sodipodi:nodetypes="cccccccc" /><g
+   sodipodi:nodetypes="cccccccccc" /><g
    onclick="http://mixxx.org/forums/viewforum.php?f=6"
    transform="translate(-135.2406,379.22009)"
    id="g3326"
@@ -16625,7 +16625,27 @@
      id="tspan5233">  height: 393 px</tspan></text><text
    xml:space="preserve"
    id="text5207"
-   style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect5209);fill:#000000;fill-opacity:1;stroke:none;" /></g><g
+   style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect5209);fill:#000000;fill-opacity:1;stroke:none;" /><text
+   id="text2592-3"
+   y="668.97003"
+   x="131.65842"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#848484;fill-opacity:1;stroke:none"
+   xml:space="preserve"><tspan
+     id="tspan2590-5"
+     style="font-weight:bold;font-size:16px;line-height:100%;-inkscape-font-specification:'Arial Bold';text-align:center;letter-spacing:-0.25px;word-spacing:0px;text-anchor:middle;fill:#848484;fill-opacity:1"
+     y="668.97003"
+     x="131.53342"
+     sodipodi:role="line">Deck 1</tspan></text><text
+   id="text2592-3-6"
+   y="668.97003"
+   x="293.65842"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#848484;fill-opacity:1;stroke:none"
+   xml:space="preserve"><tspan
+     id="tspan2590-5-2"
+     style="font-weight:bold;font-size:16px;line-height:100%;-inkscape-font-specification:'Arial Bold';text-align:center;letter-spacing:-0.25px;word-spacing:0px;text-anchor:middle;fill:#848484;fill-opacity:1"
+     y="668.97003"
+     x="293.53342"
+     sodipodi:role="line">Deck 2</tspan></text></g><g
    inkscape:groupmode="layer"
    id="layer6"
    inkscape:label="keyboard de-de"
@@ -17166,12 +17186,12 @@
      id="path8287"
      d="m 654.012,647.319 v -5.727 h 0.637 l 2.468,4.496 v -4.496 h 0.595 v 5.727 h -0.637 l -2.466,-4.5 v 4.5 z m 6.899,0 v -0.609 c -0.133,0.234 -0.289,0.411 -0.469,0.526 -0.18,0.117 -0.383,0.176 -0.609,0.176 -0.27,0 -0.496,-0.071 -0.688,-0.216 -0.192,-0.145 -0.317,-0.328 -0.381,-0.549 -0.063,-0.222 -0.096,-0.522 -0.096,-0.907 v -2.568 h 0.574 v 2.3 c 0,0.428 0.021,0.713 0.064,0.857 0.043,0.144 0.122,0.261 0.238,0.348 0.115,0.087 0.248,0.131 0.396,0.131 0.276,0 0.503,-0.113 0.68,-0.341 0.151,-0.194 0.227,-0.553 0.227,-1.072 v -2.223 h 0.578 v 4.147 z m 1.424,0 v -4.147 h 0.517 v 0.581 c 0.114,-0.216 0.261,-0.383 0.441,-0.5 0.18,-0.117 0.375,-0.176 0.589,-0.176 0.239,0 0.442,0.063 0.608,0.187 0.165,0.122 0.282,0.304 0.353,0.54 0.136,-0.241 0.291,-0.424 0.467,-0.545 0.176,-0.121 0.37,-0.182 0.584,-0.182 0.325,0 0.583,0.11 0.77,0.331 0.188,0.222 0.281,0.576 0.281,1.063 v 2.848 h -0.573 v -2.613 c 0,-0.297 -0.021,-0.507 -0.065,-0.631 -0.042,-0.124 -0.112,-0.22 -0.208,-0.286 -0.098,-0.068 -0.205,-0.103 -0.325,-0.103 -0.247,0 -0.45,0.099 -0.605,0.296 -0.155,0.195 -0.233,0.505 -0.233,0.927 v 2.41 h -0.578 v -2.694 c 0,-0.345 -0.054,-0.587 -0.159,-0.728 -0.105,-0.141 -0.251,-0.211 -0.435,-0.211 -0.264,0 -0.471,0.106 -0.624,0.318 -0.151,0.212 -0.228,0.6 -0.228,1.162 v 2.152 h -0.577 z m -8.342,7.247 v -5.727 h 0.62 v 5.051 h 2.313 v 0.676 z m 3.384,-2.074 c 0,-0.717 0.151,-1.257 0.453,-1.62 0.3,-0.366 0.681,-0.548 1.143,-0.548 0.451,0 0.832,0.182 1.136,0.548 0.306,0.363 0.458,0.889 0.458,1.577 0,0.745 -0.15,1.3 -0.45,1.664 -0.3,0.365 -0.681,0.546 -1.144,0.546 -0.457,0 -0.836,-0.182 -1.139,-0.548 -0.304,-0.366 -0.457,-0.906 -0.457,-1.619 z m 0.592,0 c 0,0.537 0.097,0.936 0.291,1.197 0.196,0.263 0.439,0.393 0.727,0.393 0.271,0 0.504,-0.132 0.697,-0.396 0.195,-0.265 0.293,-0.662 0.293,-1.193 0,-0.533 -0.1,-0.931 -0.293,-1.194 -0.197,-0.261 -0.438,-0.392 -0.728,-0.392 -0.272,0 -0.507,0.132 -0.7,0.395 -0.191,0.261 -0.287,0.658 -0.287,1.19 z m 5.502,0.554 0.566,0.09 c -0.064,0.495 -0.228,0.872 -0.49,1.132 -0.262,0.262 -0.576,0.391 -0.943,0.391 -0.445,0 -0.811,-0.182 -1.1,-0.548 -0.287,-0.366 -0.432,-0.906 -0.432,-1.624 0,-0.721 0.145,-1.261 0.436,-1.622 0.291,-0.36 0.664,-0.541 1.119,-0.541 0.352,0 0.648,0.109 0.89,0.327 0.241,0.221 0.395,0.548 0.462,0.985 l -0.559,0.105 c -0.055,-0.281 -0.148,-0.492 -0.285,-0.631 -0.135,-0.14 -0.297,-0.209 -0.488,-0.209 -0.283,0 -0.518,0.125 -0.705,0.377 -0.186,0.251 -0.279,0.649 -0.279,1.197 0,0.564 0.09,0.974 0.27,1.228 0.176,0.252 0.406,0.378 0.685,0.378 0.219,0 0.405,-0.084 0.56,-0.252 0.154,-0.167 0.252,-0.428 0.293,-0.783 z m 1.067,1.52 v -5.727 h 0.575 v 3.266 l 1.366,-1.688 h 0.747 l -1.302,1.539 1.43,2.609 h -0.707 l -1.129,-2.121 -0.405,0.477 v 1.645 z" /><polygon
      id="polygon8289"
-     points="691.055,642.647 689.011,651.529 688.319,651.529 690.36,642.647 " /><path
+     points="689.011,651.529 688.319,651.529 690.36,642.647 691.055,642.647 " /><path
      inkscape:connector-curvature="0"
      id="path8291"
      d="m 721.122,644.369 0.224,-0.832 c 0.508,0.22 0.876,0.408 1.108,0.568 -0.061,-0.718 -0.09,-1.204 -0.095,-1.458 h 0.696 c -0.008,0.374 -0.044,0.859 -0.109,1.452 0.323,-0.198 0.699,-0.387 1.129,-0.563 l 0.223,0.832 c -0.41,0.164 -0.809,0.274 -1.194,0.328 0.194,0.208 0.47,0.576 0.826,1.107 l -0.574,0.498 c -0.18,-0.296 -0.399,-0.716 -0.661,-1.26 -0.238,0.55 -0.449,0.971 -0.629,1.26 l -0.562,-0.498 c 0.352,-0.539 0.618,-0.907 0.796,-1.107 -0.419,-0.097 -0.811,-0.205 -1.178,-0.327 z" /><polygon
      id="polygon8293"
-     points="761.757,646.786 754.031,646.786 754.031,645.963 761.757,645.963 " /><path
+     points="754.031,646.786 754.031,645.963 761.757,645.963 761.757,646.786 " /><path
      inkscape:connector-curvature="0"
      id="path8295"
      d="m 88.311,683.361 c 0.432,0.364 0.832,0.628 1.194,0.796 l -0.276,0.792 c -0.514,-0.226 -1.018,-0.578 -1.51,-1.054 -0.52,0.354 -1.094,0.532 -1.724,0.532 -1.03,0 -1.864,-0.45 -2.502,-1.354 -0.574,-0.812 -0.86,-1.838 -0.86,-3.082 0,-0.928 0.154,-1.733 0.462,-2.416 0.308,-0.682 0.714,-1.191 1.216,-1.53 0.502,-0.338 1.068,-0.506 1.696,-0.506 0.622,0 1.186,0.175 1.696,0.524 0.51,0.351 0.916,0.86 1.216,1.53 0.302,0.67 0.452,1.462 0.452,2.376 0,0.714 -0.094,1.359 -0.278,1.938 -0.186,0.58 -0.446,1.064 -0.782,1.454 z m -2.058,-1.454 c 0.536,0.181 0.978,0.454 1.33,0.822 0.548,-0.618 0.82,-1.538 0.82,-2.76 0,-0.738 -0.104,-1.366 -0.312,-1.882 -0.21,-0.517 -0.498,-0.906 -0.868,-1.172 -0.368,-0.265 -0.772,-0.398 -1.21,-0.398 -0.696,0 -1.272,0.292 -1.732,0.876 -0.458,0.584 -0.688,1.45 -0.688,2.598 0,1.134 0.231,1.994 0.698,2.582 0.464,0.588 1.038,0.882 1.722,0.882 0.328,0 0.64,-0.075 0.938,-0.228 -0.29,-0.232 -0.598,-0.396 -0.926,-0.492 z" /><path
@@ -17179,12 +17199,12 @@
      id="path8297"
      d="m 117.473,684.207 -1.87,-8.59 h 0.956 l 1.072,5.63 c 0.114,0.58 0.214,1.166 0.298,1.758 l 0.318,-1.588 1.342,-5.8 h 1.125 l 1.007,4.348 c 0.246,1.059 0.43,2.072 0.55,3.04 0.09,-0.558 0.206,-1.18 0.346,-1.868 l 1.108,-5.52 h 0.938 l -1.934,8.59 h -0.896 l -1.488,-6.544 -0.224,-1.008 c -0.066,0.374 -0.134,0.71 -0.204,1.008 l -1.494,6.544 z" /><polygon
      id="polygon8299"
-     points="154.523,679.335 154.523,680.344 150.625,680.344 150.625,683.268 154.951,683.268 154.951,684.282 149.695,684.282 149.695,675.692 154.787,675.692 154.787,676.706 150.625,676.706 150.625,679.335 " /><path
+     points="154.787,676.706 150.625,676.706 150.625,679.335 154.523,679.335 154.523,680.344 150.625,680.344 150.625,683.268 154.951,683.268 154.951,684.282 149.695,684.282 149.695,675.692 154.787,675.692 " /><path
      inkscape:connector-curvature="0"
      id="path8301"
      d="m 181.538,684.282 v -8.59 h 3.122 c 0.654,0 1.134,0.08 1.446,0.24 0.31,0.16 0.564,0.428 0.764,0.8 0.2,0.374 0.298,0.806 0.298,1.298 0,0.647 -0.168,1.174 -0.506,1.576 -0.338,0.401 -0.83,0.657 -1.474,0.768 0.262,0.156 0.462,0.314 0.598,0.475 0.278,0.328 0.522,0.693 0.732,1.096 l 1.23,2.338 h -1.172 l -0.936,-1.788 c -0.364,-0.698 -0.638,-1.17 -0.824,-1.412 -0.186,-0.242 -0.366,-0.403 -0.538,-0.487 -0.174,-0.085 -0.418,-0.127 -0.729,-0.127 h -1.078 v 3.814 h -0.933 z m 0.932,-4.798 h 2.004 c 0.436,0 0.768,-0.055 0.996,-0.16 0.226,-0.104 0.406,-0.27 0.538,-0.498 0.134,-0.226 0.2,-0.49 0.2,-0.79 0,-0.434 -0.128,-0.773 -0.382,-1.021 -0.252,-0.248 -0.63,-0.372 -1.13,-0.372 h -2.226 z" /><polygon
      id="polygon8303"
-     points="214.31,676.63 214.31,675.617 219.894,675.617 219.894,676.63 217.562,676.63 217.562,684.207 216.629,684.207 216.629,676.63 " /><path
+     points="217.562,684.207 216.629,684.207 216.629,676.63 214.31,676.63 214.31,675.617 219.894,675.617 219.894,676.63 217.562,676.63 " /><path
      inkscape:connector-curvature="0"
      id="path8305"
      d="m 250.251,684.282 v -3.638 l -2.712,-4.952 h 1.136 l 1.382,2.59 c 0.274,0.512 0.514,0.996 0.722,1.454 0.206,-0.45 0.462,-0.956 0.768,-1.518 l 1.364,-2.526 h 1.084 l -2.812,4.952 v 3.638 z" /><path
@@ -17192,7 +17212,7 @@
      id="path8307"
      d="m 285.325,675.692 h 0.936 v 4.964 c 0,0.832 -0.08,1.514 -0.242,2.046 -0.162,0.534 -0.458,0.954 -0.886,1.264 -0.426,0.309 -0.97,0.462 -1.63,0.462 -0.93,0 -1.626,-0.275 -2.09,-0.831 -0.462,-0.555 -0.694,-1.534 -0.694,-2.94 v -4.964 h 0.932 v 4.958 c 0,0.776 0.06,1.34 0.182,1.686 0.12,0.349 0.318,0.612 0.594,0.794 0.276,0.183 0.61,0.274 1.004,0.274 0.664,0 1.146,-0.188 1.446,-0.564 0.298,-0.373 0.448,-1.104 0.448,-2.189 z" /><polygon
      id="polygon8309"
-     points="315.114,675.617 315.114,684.207 314.182,684.207 314.182,675.617 " /><path
+     points="315.114,684.207 314.182,684.207 314.182,675.617 315.114,675.617 " /><path
      inkscape:connector-curvature="0"
      id="path8311"
      d="m 347.188,680.097 c 0,-1.464 0.322,-2.59 0.966,-3.378 0.646,-0.786 1.448,-1.181 2.41,-1.181 0.62,0 1.186,0.177 1.698,0.528 0.512,0.351 0.917,0.862 1.216,1.532 0.298,0.67 0.448,1.468 0.448,2.392 0,1.274 -0.288,2.313 -0.866,3.112 -0.638,0.884 -1.472,1.324 -2.502,1.324 -1.04,0 -1.876,-0.452 -2.508,-1.358 -0.574,-0.82 -0.862,-1.811 -0.862,-2.971 z m 0.962,0.018 c 0,1.059 0.232,1.881 0.7,2.465 0.466,0.584 1.034,0.876 1.702,0.876 0.682,0 1.256,-0.297 1.72,-0.885 0.462,-0.59 0.694,-1.458 0.694,-2.602 0,-0.738 -0.12,-1.398 -0.358,-1.98 -0.184,-0.445 -0.46,-0.802 -0.83,-1.069 -0.368,-0.269 -0.772,-0.402 -1.21,-0.402 -0.702,0 -1.282,0.294 -1.736,0.88 -0.456,0.585 -0.682,1.491 -0.682,2.717 z" /><path
@@ -17206,9 +17226,9 @@
      id="path8317"
      d="m 447.286,679.064 v 0.638 c -0.148,0.004 -0.275,0.052 -0.378,0.14 -0.103,0.088 -0.177,0.22 -0.219,0.392 -0.043,0.174 -0.065,0.502 -0.067,0.983 -0.003,0.472 -0.013,0.784 -0.029,0.938 -0.027,0.253 -0.093,0.464 -0.193,0.633 -0.074,0.125 -0.172,0.215 -0.294,0.27 -0.122,0.055 -0.288,0.083 -0.496,0.083 h -0.18 v -0.614 h 0.103 c 0.216,0 0.361,-0.048 0.435,-0.145 0.075,-0.097 0.112,-0.316 0.112,-0.66 0,-0.722 0.016,-1.182 0.051,-1.379 0.044,-0.257 0.117,-0.461 0.22,-0.609 0.103,-0.147 0.237,-0.264 0.401,-0.348 -0.246,-0.143 -0.419,-0.332 -0.52,-0.567 -0.102,-0.232 -0.152,-0.63 -0.152,-1.19 0,-0.575 -0.008,-0.913 -0.024,-1.012 -0.024,-0.138 -0.074,-0.234 -0.144,-0.289 -0.07,-0.055 -0.197,-0.082 -0.379,-0.082 h -0.103 v -0.613 h 0.18 c 0.224,0 0.392,0.028 0.504,0.084 0.112,0.057 0.203,0.138 0.273,0.244 0.097,0.146 0.159,0.316 0.188,0.513 0.027,0.194 0.044,0.556 0.047,1.081 0.002,0.482 0.024,0.811 0.07,0.985 0.044,0.173 0.117,0.306 0.219,0.392 0.101,0.084 0.226,0.129 0.375,0.132 z" /><polygon
      id="polygon8319"
-     points="413.57,685.871 413.57,686.454 412.87,686.454 412.87,692.606 413.57,692.606 413.57,693.187 412.296,693.187 412.296,685.871 " /><polygon
+     points="413.57,693.187 412.296,693.187 412.296,685.871 413.57,685.871 413.57,686.454 412.87,686.454 412.87,692.606 413.57,692.606 " /><polygon
      id="polygon8321"
-     points="445.424,692.681 446.122,692.681 446.122,686.529 445.424,686.529 445.424,685.946 446.7,685.946 446.7,693.262 445.424,693.262 " /><path
+     points="446.7,685.946 446.7,693.262 445.424,693.262 445.424,692.681 446.122,692.681 446.122,686.529 445.424,686.529 445.424,685.946 " /><path
      inkscape:connector-curvature="0"
      id="path8323"
      d="m 92.361,716.405 2.708,-8.59 h 1.002 l 2.882,8.59 h -1.066 l -0.82,-2.602 h -2.941 l -0.774,2.602 z m 2.033,-3.529 h 2.385 l -0.732,-2.378 c -0.226,-0.729 -0.392,-1.324 -0.498,-1.781 -0.09,0.552 -0.216,1.098 -0.382,1.642 z" /><path
@@ -17219,19 +17239,19 @@
      id="path8327"
      d="m 159.838,716.405 v -8.59 h 2.432 c 0.602,0 1.058,0.052 1.372,0.158 0.41,0.138 0.764,0.388 1.066,0.75 0.3,0.363 0.534,0.822 0.702,1.374 0.168,0.554 0.252,1.208 0.252,1.966 0,0.972 -0.142,1.798 -0.428,2.476 -0.284,0.678 -0.65,1.158 -1.098,1.442 -0.448,0.282 -1.032,0.424 -1.754,0.424 z m 0.932,-1.014 h 1.5 c 0.606,0 1.064,-0.099 1.376,-0.296 0.314,-0.196 0.554,-0.515 0.722,-0.952 0.222,-0.582 0.333,-1.28 0.333,-2.093 0,-0.869 -0.118,-1.556 -0.354,-2.054 -0.238,-0.498 -0.54,-0.83 -0.912,-0.998 -0.25,-0.114 -0.646,-0.17 -1.19,-0.17 h -1.476 v 6.563 z" /><polygon
      id="polygon8329"
-     points="192.726,712.502 192.726,716.405 191.793,716.405 191.793,707.815 196.545,707.815 196.545,708.829 192.726,708.829 192.726,711.489 196.029,711.489 196.029,712.502 " /><path
+     points="192.726,716.405 191.793,716.405 191.793,707.815 196.545,707.815 196.545,708.829 192.726,708.829 192.726,711.489 196.029,711.489 196.029,712.502 192.726,712.502 " /><path
      inkscape:connector-curvature="0"
      id="path8331"
      d="m 228.327,712.959 v -1.006 l 2.982,-0.006 v 3.186 c -0.456,0.446 -0.93,0.78 -1.418,1.007 -0.488,0.224 -0.99,0.335 -1.506,0.335 -0.686,0 -1.3,-0.172 -1.84,-0.516 -0.538,-0.342 -0.964,-0.844 -1.28,-1.506 -0.314,-0.66 -0.472,-1.452 -0.472,-2.378 0,-0.938 0.16,-1.754 0.476,-2.45 0.316,-0.693 0.73,-1.208 1.242,-1.538 0.512,-0.33 1.116,-0.493 1.816,-0.493 0.516,0 0.966,0.096 1.354,0.285 0.386,0.192 0.704,0.464 0.954,0.816 0.25,0.35 0.438,0.834 0.564,1.445 l -0.838,0.282 c -0.114,-0.483 -0.256,-0.846 -0.428,-1.088 -0.172,-0.24 -0.398,-0.428 -0.68,-0.563 -0.282,-0.139 -0.598,-0.206 -0.95,-0.206 -0.512,0 -0.952,0.124 -1.32,0.372 -0.37,0.248 -0.667,0.634 -0.892,1.157 -0.224,0.524 -0.336,1.162 -0.336,1.916 0,1.148 0.24,2.009 0.72,2.58 0.482,0.572 1.106,0.86 1.876,0.86 0.366,0 0.742,-0.088 1.128,-0.264 0.384,-0.177 0.69,-0.387 0.917,-0.628 v -1.601 h -2.069 z" /><polygon
      id="polygon8333"
-     points="263.977,707.815 263.977,716.405 263.045,716.405 263.045,712.357 259.383,712.357 259.383,716.405 258.451,716.405 258.451,707.815 259.383,707.815 259.383,711.343 263.045,711.343 263.045,707.815 " /><path
+     points="259.383,711.343 263.045,711.343 263.045,707.815 263.977,707.815 263.977,716.405 263.045,716.405 263.045,712.357 259.383,712.357 259.383,716.405 258.451,716.405 258.451,707.815 259.383,707.815 " /><path
      inkscape:connector-curvature="0"
      id="path8335"
      d="m 290.412,713.966 0.838,-0.14 c 0.023,0.656 0.124,1.105 0.304,1.348 0.18,0.243 0.428,0.362 0.744,0.362 0.224,0 0.42,-0.061 0.59,-0.185 0.17,-0.122 0.284,-0.277 0.342,-0.466 0.082,-0.254 0.124,-0.638 0.124,-1.153 v -5.918 h 0.93 v 5.854 c 0,1.054 -0.172,1.798 -0.518,2.231 -0.346,0.435 -0.832,0.65 -1.462,0.65 -0.614,0 -1.07,-0.193 -1.37,-0.586 -0.348,-0.443 -0.522,-1.109 -0.522,-1.997 z" /><polygon
      id="polygon8337"
-     points="326.892,711.219 329.98,716.33 328.75,716.33 326.242,711.982 325.088,713.353 325.088,716.33 324.156,716.33 324.156,707.74 325.088,707.74 325.088,712 328.586,707.74 329.852,707.74 " /><polygon
+     points="325.088,712 328.586,707.74 329.852,707.74 326.892,711.219 329.98,716.33 328.75,716.33 326.242,711.982 325.088,713.353 325.088,716.33 324.156,716.33 324.156,707.74 325.088,707.74 " /><polygon
      id="polygon8339"
-     points="361.979,715.391 361.979,716.405 357.58,716.405 357.58,707.815 358.509,707.815 358.509,715.391 " /><path
+     points="357.58,707.815 358.509,707.815 358.509,715.391 361.979,715.391 361.979,716.405 357.58,716.405 " /><path
      inkscape:connector-curvature="0"
      id="path8341"
      d="m 109.428,748.919 v -1.054 l 3.61,-5.502 c 0.25,-0.385 0.494,-0.725 0.732,-1.021 h -3.936 v -1.014 h 5.044 v 1.014 l -3.95,5.958 -0.426,0.604 h 4.494 v 1.014 h -5.568 z" /><path
@@ -17248,7 +17268,7 @@
      id="path8349"
      d="m 241.82,748.844 v -8.59 h 2.644 c 0.534,0 0.958,0.084 1.27,0.25 0.314,0.166 0.568,0.424 0.768,0.775 0.2,0.353 0.3,0.74 0.3,1.166 0,0.395 -0.086,0.75 -0.258,1.066 -0.172,0.316 -0.414,0.57 -0.728,0.762 0.41,0.148 0.734,0.402 0.97,0.758 0.236,0.358 0.354,0.799 0.354,1.322 0,0.521 -0.106,0.977 -0.318,1.368 -0.214,0.393 -0.498,0.678 -0.852,0.856 -0.356,0.178 -0.844,0.266 -1.466,0.266 h -2.684 z m 0.932,-4.979 h 1.524 c 0.398,0 0.682,-0.028 0.85,-0.082 0.242,-0.082 0.428,-0.221 0.558,-0.414 0.132,-0.192 0.198,-0.456 0.198,-0.788 0,-0.309 -0.06,-0.566 -0.18,-0.771 -0.118,-0.206 -0.276,-0.346 -0.474,-0.426 -0.198,-0.078 -0.552,-0.116 -1.064,-0.116 h -1.412 z m 0,3.966 h 1.752 c 0.386,0 0.672,-0.034 0.856,-0.106 0.266,-0.1 0.468,-0.268 0.606,-0.5 0.138,-0.231 0.208,-0.523 0.208,-0.876 0,-0.324 -0.066,-0.598 -0.2,-0.824 -0.132,-0.224 -0.31,-0.388 -0.536,-0.492 -0.224,-0.104 -0.576,-0.153 -1.056,-0.153 h -1.63 z" /><polygon
      id="polygon8351"
-     points="276.168,742.169 276.168,748.919 275.272,748.919 275.272,740.33 276.228,740.33 279.93,747.074 279.93,740.33 280.822,740.33 280.822,748.919 279.866,748.919 " /><path
+     points="276.168,748.919 275.272,748.919 275.272,740.33 276.228,740.33 279.93,747.074 279.93,740.33 280.822,740.33 280.822,748.919 279.866,748.919 276.168,742.169 " /><path
      inkscape:connector-curvature="0"
      id="path8353"
      d="m 307.725,748.919 v -8.59 h 1.4 l 1.67,6.082 0.334,1.271 c 0.082,-0.315 0.208,-0.775 0.375,-1.378 l 1.688,-5.976 h 1.254 v 8.59 h -0.898 v -7.19 l -2.05,7.19 h -0.838 l -2.04,-7.312 v 7.312 h -0.895 z" /><path
@@ -17262,7 +17282,7 @@
      id="path8359"
      d="m 389.479,719.887 v -1.098 h 1.099 v 1.098 z m 0,1.953 h 1.099 v 0.785 c 0,0.317 -0.028,0.568 -0.083,0.752 -0.055,0.184 -0.159,0.349 -0.311,0.494 -0.152,0.146 -0.345,0.261 -0.58,0.344 l -0.215,-0.453 c 0.221,-0.074 0.378,-0.175 0.473,-0.305 0.093,-0.131 0.143,-0.304 0.148,-0.52 h -0.532 v -1.097 z" /><polygon
      id="polygon8361"
-     points="423.294,721.713 422.659,723.573 422.224,723.573 422.495,721.713 422.895,720.05 423.696,720.05 " /><path
+     points="422.495,721.713 422.895,720.05 423.696,720.05 423.294,721.713 422.659,723.573 422.224,723.573 " /><path
      inkscape:connector-curvature="0"
      id="path8363"
      d="m 659.471,748.844 h -0.866 v -6.72 c -0.199,0.233 -0.468,0.472 -0.804,0.718 -0.336,0.244 -0.644,0.428 -0.926,0.552 v -1.018 c 0.479,-0.274 0.898,-0.608 1.264,-1.002 0.364,-0.396 0.622,-0.78 0.771,-1.156 h 0.562 v 8.626 z" /><path
@@ -17294,12 +17314,12 @@
      id="path8381"
      d="m 656.213,778.277 c 0,-1.442 0.193,-2.534 0.584,-3.275 0.389,-0.742 0.962,-1.114 1.721,-1.114 0.671,0 1.199,0.302 1.588,0.904 0.467,0.726 0.701,1.888 0.701,3.485 0,1.434 -0.193,2.522 -0.58,3.266 -0.386,0.744 -0.959,1.116 -1.722,1.116 -0.672,0 -1.222,-0.328 -1.649,-0.983 -0.429,-0.657 -0.643,-1.789 -0.643,-3.399 z m 0.886,0 c 0,1.395 0.134,2.328 0.4,2.804 0.268,0.475 0.612,0.712 1.03,0.712 0.394,0 0.724,-0.239 0.99,-0.722 0.264,-0.479 0.397,-1.412 0.397,-2.794 0,-1.397 -0.134,-2.334 -0.401,-2.806 -0.27,-0.475 -0.615,-0.71 -1.041,-0.71 -0.39,0 -0.718,0.24 -0.982,0.72 -0.261,0.482 -0.393,1.412 -0.393,2.796 z" /><polygon
      id="polygon8383"
-     points="722.891,774.077 722.891,775.723 721.54,775.723 721.54,774.077 " /><path
+     points="722.891,775.723 721.54,775.723 721.54,774.077 722.891,774.077 " /><path
      inkscape:connector-curvature="0"
      id="path8385"
      d="m 754.049,747.326 v -5.727 h 3.395 v 0.676 h -2.773 v 1.754 h 2.598 v 0.672 h -2.598 v 1.949 h 2.884 v 0.676 z m 4.277,0 v -4.147 h 0.521 v 0.589 c 0.125,-0.229 0.278,-0.4 0.459,-0.514 0.182,-0.113 0.389,-0.17 0.623,-0.17 0.182,0 0.352,0.035 0.506,0.107 0.154,0.072 0.279,0.165 0.375,0.281 0.096,0.116 0.166,0.267 0.213,0.451 0.047,0.184 0.07,0.469 0.07,0.852 v 2.551 h -0.578 v -2.524 c 0,-0.304 -0.025,-0.526 -0.078,-0.668 -0.053,-0.14 -0.135,-0.249 -0.244,-0.325 -0.111,-0.077 -0.239,-0.115 -0.385,-0.115 -0.275,0 -0.496,0.104 -0.66,0.309 -0.164,0.205 -0.246,0.559 -0.246,1.059 v 2.266 h -0.576 z m 4.933,-0.629 0.079,0.621 c -0.159,0.041 -0.303,0.063 -0.43,0.063 -0.201,0 -0.363,-0.04 -0.486,-0.119 -0.121,-0.079 -0.205,-0.188 -0.251,-0.326 -0.046,-0.138 -0.067,-0.413 -0.067,-0.824 v -2.387 h -0.422 v -0.546 h 0.422 v -1.028 l 0.574,-0.422 v 1.45 h 0.581 v 0.546 h -0.581 v 2.426 c 0,0.224 0.016,0.369 0.051,0.433 0.049,0.095 0.141,0.142 0.277,0.142 0.065,-0.002 0.149,-0.011 0.253,-0.029 z m 2.868,-0.707 0.594,0.089 c -0.1,0.443 -0.279,0.777 -0.538,1.003 -0.259,0.226 -0.58,0.337 -0.962,0.337 -0.483,0 -0.873,-0.182 -1.172,-0.548 -0.297,-0.366 -0.445,-0.895 -0.445,-1.584 0,-0.716 0.15,-1.262 0.449,-1.639 0.302,-0.377 0.684,-0.564 1.144,-0.564 0.44,0 0.808,0.185 1.101,0.555 0.295,0.37 0.441,0.904 0.441,1.604 l -0.002,0.188 h -2.54 c 0.024,0.467 0.132,0.817 0.323,1.055 0.193,0.237 0.429,0.356 0.705,0.356 0.432,0 0.733,-0.284 0.902,-0.852 z m -1.894,-1.138 h 1.896 c -0.025,-0.358 -0.102,-0.626 -0.229,-0.804 -0.186,-0.257 -0.422,-0.387 -0.709,-0.387 -0.256,0 -0.477,0.108 -0.659,0.323 -0.182,0.215 -0.282,0.505 -0.299,0.868 z m 3.213,2.474 v -4.147 h 0.52 v 0.627 c 0.134,-0.29 0.256,-0.483 0.366,-0.579 0.11,-0.095 0.234,-0.143 0.373,-0.143 0.192,0 0.39,0.075 0.589,0.227 l -0.194,0.653 c -0.144,-0.104 -0.282,-0.153 -0.419,-0.153 -0.123,0 -0.234,0.044 -0.336,0.129 -0.102,0.086 -0.173,0.205 -0.215,0.358 -0.072,0.27 -0.109,0.555 -0.109,0.856 v 2.172 z" /><polygon
      id="polygon8387"
-     points="757.403,675.948 757.403,678.286 759.319,678.286 759.319,679.27 757.403,679.27 757.403,681.625 756.583,681.625 756.583,679.27 754.667,679.27 754.667,678.286 756.583,678.286 756.583,675.948 " /><path
+     points="754.667,678.286 756.583,678.286 756.583,675.948 757.403,675.948 757.403,678.286 759.319,678.286 759.319,679.27 757.403,679.27 757.403,681.625 756.583,681.625 756.583,679.27 754.667,679.27 " /><path
      inkscape:connector-curvature="0"
      id="path8389"
      d="m 654.028,692.202 v -5.727 h 0.621 v 2.352 h 2.441 v -2.352 h 0.621 v 5.727 h -0.621 v -2.698 h -2.441 v 2.698 z m 4.437,-2.075 c 0,-0.717 0.15,-1.257 0.451,-1.62 0.301,-0.366 0.682,-0.548 1.143,-0.548 0.452,0 0.832,0.182 1.137,0.548 0.305,0.363 0.457,0.889 0.457,1.577 0,0.745 -0.149,1.3 -0.449,1.664 -0.301,0.365 -0.682,0.546 -1.145,0.546 -0.455,0 -0.836,-0.182 -1.139,-0.548 -0.303,-0.366 -0.455,-0.906 -0.455,-1.619 z m 0.59,0 c 0,0.537 0.098,0.936 0.292,1.197 0.196,0.263 0.438,0.394 0.727,0.394 0.271,0 0.505,-0.133 0.698,-0.397 0.193,-0.264 0.291,-0.662 0.291,-1.193 0,-0.533 -0.099,-0.931 -0.293,-1.193 -0.196,-0.262 -0.438,-0.393 -0.727,-0.393 -0.273,0 -0.507,0.132 -0.7,0.395 -0.192,0.262 -0.288,0.659 -0.288,1.19 z m 3.28,2.075 v -4.147 h 0.516 v 0.581 c 0.114,-0.216 0.262,-0.383 0.441,-0.5 0.181,-0.117 0.376,-0.176 0.589,-0.176 0.24,0 0.443,0.063 0.609,0.187 0.164,0.122 0.281,0.304 0.353,0.54 0.136,-0.241 0.291,-0.424 0.466,-0.545 0.177,-0.121 0.371,-0.182 0.585,-0.182 0.325,0 0.583,0.11 0.77,0.331 0.188,0.222 0.28,0.576 0.28,1.063 v 2.848 h -0.572 v -2.613 c 0,-0.297 -0.021,-0.507 -0.066,-0.631 -0.042,-0.124 -0.111,-0.22 -0.207,-0.286 -0.098,-0.068 -0.205,-0.103 -0.326,-0.103 -0.246,0 -0.449,0.099 -0.605,0.296 -0.155,0.195 -0.232,0.505 -0.232,0.927 v 2.41 h -0.578 v -2.694 c 0,-0.345 -0.055,-0.587 -0.159,-0.728 -0.105,-0.141 -0.251,-0.211 -0.435,-0.211 -0.264,0 -0.471,0.106 -0.625,0.318 -0.151,0.212 -0.227,0.6 -0.227,1.162 v 2.152 h -0.577 z m 7.787,-1.336 0.594,0.089 c -0.099,0.443 -0.279,0.777 -0.537,1.003 -0.259,0.226 -0.58,0.337 -0.963,0.337 -0.482,0 -0.872,-0.182 -1.171,-0.548 -0.298,-0.366 -0.446,-0.895 -0.446,-1.584 0,-0.716 0.15,-1.262 0.45,-1.639 0.302,-0.377 0.683,-0.564 1.144,-0.564 0.439,0 0.807,0.185 1.101,0.555 0.294,0.37 0.441,0.904 0.441,1.604 l -0.003,0.188 h -2.539 c 0.023,0.467 0.131,0.817 0.323,1.055 0.193,0.237 0.429,0.356 0.704,0.356 0.431,0 0.732,-0.284 0.902,-0.852 z m -1.895,-1.138 h 1.897 c -0.025,-0.358 -0.103,-0.626 -0.229,-0.804 -0.186,-0.257 -0.421,-0.387 -0.708,-0.387 -0.257,0 -0.478,0.108 -0.659,0.323 -0.184,0.215 -0.283,0.505 -0.301,0.868 z" /><path
@@ -17375,12 +17395,12 @@
      id="path8439"
      d="m 363.086,649.403 h -0.413 c 0.637,-1.254 0.956,-2.504 0.956,-3.755 0,-0.408 -0.031,-0.814 -0.094,-1.219 -0.064,-0.403 -0.151,-0.773 -0.26,-1.11 -0.109,-0.337 -0.311,-0.813 -0.601,-1.424 h 0.413 c 0.759,1.231 1.137,2.479 1.137,3.745 0,0.727 -0.113,1.417 -0.34,2.073 -0.227,0.656 -0.492,1.218 -0.798,1.69 z" /><polygon
      id="polygon8441"
-     points="400.318,644.654 395.073,644.654 395.073,643.906 400.318,643.906 " /><polygon
+     points="395.073,644.654 395.073,643.906 400.318,643.906 400.318,644.654 " /><polygon
      id="polygon8443"
-     points="430.006,643.008 430.006,644.567 431.284,644.567 431.284,645.223 430.006,645.223 430.006,646.793 429.459,646.793 429.459,645.223 428.182,645.223 428.182,644.567 429.459,644.567 429.459,643.008 " /><polygon
+     points="428.182,644.567 429.459,644.567 429.459,643.008 430.006,643.008 430.006,644.567 431.284,644.567 431.284,645.223 430.006,645.223 430.006,646.793 429.459,646.793 429.459,645.223 428.182,645.223 " /><polygon
      id="polygon8445"
      transform="translate(-4.0000002,65.399993)"
-     points="460.68,641.895 461.395,641.895 461.395,649.403 460.68,649.403 " /><path
+     points="461.395,641.895 461.395,649.403 460.68,649.403 460.68,641.895 " /><path
      inkscape:connector-curvature="0"
      id="path8447"
      d="m 131.114,778.497 1.805,-5.727 h 0.668 l 1.921,5.727 h -0.71 l -0.547,-1.734 h -1.961 l -0.516,1.734 z m 1.356,-2.352 h 1.589 l -0.488,-1.586 c -0.151,-0.486 -0.262,-0.883 -0.333,-1.188 -0.06,0.367 -0.144,0.731 -0.254,1.095 z m 3.433,2.352 v -5.727 h 0.573 v 5.727 z m 2.758,-0.629 0.078,0.621 c -0.159,0.041 -0.303,0.063 -0.429,0.063 -0.201,0 -0.363,-0.04 -0.485,-0.119 -0.121,-0.079 -0.205,-0.188 -0.251,-0.326 -0.045,-0.138 -0.068,-0.413 -0.068,-0.824 v -2.387 h -0.421 v -0.546 h 0.421 v -1.028 l 0.575,-0.422 v 1.45 h 0.582 v 0.546 h -0.582 v 2.426 c 0,0.224 0.016,0.369 0.051,0.433 0.049,0.095 0.141,0.142 0.277,0.142 0.063,-0.002 0.148,-0.011 0.252,-0.029 z" /><path
@@ -17427,47 +17447,47 @@
      id="path8477"
      d="m 361.684,656.596 c 0,-1.081 0.146,-1.9 0.438,-2.457 0.291,-0.557 0.722,-0.835 1.29,-0.835 0.504,0 0.9,0.226 1.191,0.678 0.351,0.544 0.526,1.416 0.526,2.614 0,1.075 -0.145,1.892 -0.435,2.449 -0.29,0.559 -0.72,0.837 -1.292,0.837 -0.504,0 -0.917,-0.246 -1.237,-0.737 -0.321,-0.492 -0.481,-1.341 -0.481,-2.549 z m 0.664,0 c 0,1.046 0.101,1.746 0.3,2.103 0.201,0.355 0.458,0.534 0.772,0.534 0.295,0 0.543,-0.18 0.742,-0.541 0.198,-0.36 0.298,-1.059 0.298,-2.096 0,-1.049 -0.1,-1.75 -0.301,-2.104 -0.201,-0.355 -0.46,-0.532 -0.78,-0.532 -0.293,0 -0.539,0.18 -0.737,0.54 -0.195,0.361 -0.294,1.058 -0.294,2.096 z" /><polygon
      id="polygon8479"
-     points="397.905,656.506 397.905,657.496 395.428,657.496 395.428,656.506 " /><path
+     points="397.905,657.496 395.428,657.496 395.428,656.506 397.905,656.506 " /><path
      inkscape:connector-curvature="0"
      id="path8481"
      d="m 432.12,656.829 h -4.508 v -0.657 h 4.508 z m 0,1.737 h -4.508 v -0.656 h 4.508 z" /><polygon
      id="polygon8483"
      transform="translate(-4.0000002,65.399993)"
-     points="461.188,654.126 462.364,660.047 461.688,660.047 460.524,654.126 " /><polygon
+     points="462.364,660.047 461.688,660.047 460.524,654.126 461.188,654.126 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8485"
-     points="495.939,643.404 498.105,642.152 498.105,644.265 504.872,644.265 504.872,645.044 498.105,645.044 498.105,647.156 495.937,645.905 493.772,644.655 "
+     points="504.872,644.265 504.872,645.044 498.105,645.044 498.105,647.156 495.937,645.905 493.772,644.655 495.939,643.404 498.105,642.152 498.105,644.265 "
      transform="translate(10)" /><polygon
      style="fill-rule:evenodd"
      id="polygon8487"
-     points="495.811,680.776 493.646,679.526 495.813,678.275 497.979,677.023 497.979,679.136 504.104,679.136 504.104,676.658 504.747,676.658 504.747,679.136 504.747,679.916 504.104,679.916 497.979,679.916 497.979,682.027 "
+     points="504.747,679.136 504.747,679.916 504.104,679.916 497.979,679.916 497.979,682.027 495.811,680.776 493.646,679.526 495.813,678.275 497.979,677.023 497.979,679.136 504.104,679.136 504.104,676.658 504.747,676.658 "
      transform="translate(10)" /><polygon
      style="fill-rule:evenodd"
      id="polygon8489"
-     points="557.758,780.985 557.758,781.764 550.991,781.764 550.991,783.875 548.823,782.625 546.657,781.375 548.825,780.124 550.991,778.872 550.991,780.985 " /><polygon
+     points="550.991,783.875 548.823,782.625 546.657,781.375 548.825,780.124 550.991,778.872 550.991,780.985 557.758,780.985 557.758,781.764 550.991,781.764 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8491"
-     points="617.696,780.985 617.696,781.764 624.462,781.764 624.462,783.875 626.63,782.625 628.795,781.375 626.628,780.124 624.462,778.872 624.462,780.985 " /><polygon
+     points="624.462,783.875 626.63,782.625 628.795,781.375 626.628,780.124 624.462,778.872 624.462,780.985 617.696,780.985 617.696,781.764 624.462,781.764 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8493"
-     points="588.77,750.883 588.77,744.116 590.881,744.116 589.63,741.948 588.38,739.783 587.129,741.95 585.877,744.116 587.991,744.116 587.991,750.883 "
+     points="589.63,741.948 588.38,739.783 587.129,741.95 585.877,744.116 587.991,744.116 587.991,750.883 588.77,750.883 588.77,744.116 590.881,744.116 "
      transform="translate(-2.0000001)" /><polygon
      style="fill-rule:evenodd"
      id="polygon8495"
-     points="588.77,779.48 588.77,786.248 590.881,786.248 589.63,788.416 588.38,790.581 587.129,788.414 585.877,786.248 587.991,786.248 587.991,779.48 "
+     points="589.63,788.416 588.38,790.581 587.129,788.414 585.877,786.248 587.991,786.248 587.991,779.48 588.77,779.48 588.77,786.248 590.881,786.248 "
      transform="translate(-2.0000001)" /><polygon
      style="fill-rule:evenodd"
      id="polygon8497"
-     points="59.8,677.817 59.8,678.596 53.033,678.596 53.033,680.708 50.865,679.457 48.7,678.207 50.867,676.956 53.033,675.704 53.033,677.817 " /><polygon
+     points="53.033,680.708 50.865,679.457 48.7,678.207 50.867,676.956 53.033,675.704 53.033,677.817 59.8,677.817 59.8,678.596 53.033,678.596 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8499"
-     points="48.758,680.455 48.117,680.455 48.117,675.958 48.758,675.958 " /><polygon
+     points="48.117,680.455 48.117,675.958 48.758,675.958 48.758,680.455 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8501"
-     points="48.116,690.023 48.116,690.802 54.883,690.802 54.883,692.914 57.051,691.663 59.217,690.413 57.049,689.162 54.883,687.91 54.883,690.023 " /><polygon
+     points="54.883,692.914 57.051,691.663 59.217,690.413 57.049,689.162 54.883,687.91 54.883,690.023 48.116,690.023 48.116,690.802 54.883,690.802 " /><polygon
      style="fill-rule:evenodd"
      id="polygon8503"
-     points="59.158,692.661 59.8,692.661 59.8,688.163 59.158,688.163 " /><polygon
+     points="59.8,692.661 59.8,688.163 59.158,688.163 59.158,692.661 " /><polygon
      id="polygon8505"
      points="342.323,744.253 342.323,744.954 339.213,743.333 339.213,742.676 342.323,741.075 342.323,741.774 339.857,743.008 " /><polygon
      id="polygon8507"
@@ -17479,9 +17499,9 @@
      id="path8511"
      d="m 339.923,754.648 h 1.097 v 0.785 c 0,0.317 -0.026,0.568 -0.081,0.752 -0.055,0.183 -0.159,0.349 -0.311,0.493 -0.152,0.147 -0.345,0.262 -0.58,0.345 l -0.215,-0.454 c 0.221,-0.073 0.378,-0.173 0.472,-0.3 0.095,-0.128 0.144,-0.303 0.149,-0.523 h -0.532 v -1.098 z" /><polygon
      id="polygon8513"
-     points="374.292,754.648 374.292,755.746 373.195,755.746 373.195,754.648 " /><polygon
+     points="374.292,755.746 373.195,755.746 373.195,754.648 374.292,754.648 " /><polygon
      id="polygon8515"
-     points="408.731,751.616 407.297,757.537 406.488,757.537 407.907,751.616 " /><path
+     points="407.297,757.537 406.488,757.537 407.907,751.616 408.731,751.616 " /><path
      inkscape:connector-curvature="0"
      id="path8517"
      d="m 32.72,598.554 v -5.727 h 3.395 v 0.676 H 33.34 v 1.754 h 2.599 v 0.672 H 33.34 v 1.949 h 2.884 v 0.676 z m 4.057,-1.238 0.57,-0.109 c 0.034,0.292 0.127,0.509 0.277,0.65 0.151,0.142 0.352,0.214 0.602,0.214 0.25,0 0.444,-0.063 0.58,-0.186 0.137,-0.124 0.205,-0.282 0.205,-0.471 0,-0.166 -0.059,-0.292 -0.176,-0.384 -0.08,-0.062 -0.276,-0.141 -0.585,-0.233 -0.448,-0.14 -0.748,-0.257 -0.898,-0.353 -0.151,-0.096 -0.268,-0.226 -0.352,-0.387 -0.083,-0.161 -0.124,-0.346 -0.124,-0.551 0,-0.354 0.113,-0.643 0.339,-0.864 0.226,-0.221 0.541,-0.331 0.942,-0.331 0.252,0 0.473,0.046 0.665,0.137 0.192,0.091 0.337,0.214 0.44,0.367 0.101,0.154 0.172,0.374 0.21,0.659 l -0.563,0.095 c -0.052,-0.453 -0.299,-0.68 -0.739,-0.68 -0.25,0 -0.436,0.051 -0.559,0.15 -0.122,0.101 -0.183,0.229 -0.183,0.384 0,0.155 0.059,0.275 0.175,0.364 0.07,0.053 0.278,0.135 0.625,0.25 0.478,0.154 0.785,0.275 0.927,0.365 0.14,0.091 0.25,0.212 0.328,0.368 0.077,0.154 0.117,0.338 0.117,0.552 0,0.396 -0.127,0.716 -0.377,0.961 -0.252,0.244 -0.595,0.367 -1.029,0.367 -0.814,0.002 -1.286,-0.443 -1.417,-1.334 z m 5.731,-0.281 0.567,0.09 c -0.065,0.495 -0.228,0.872 -0.491,1.133 -0.261,0.261 -0.576,0.39 -0.943,0.39 -0.445,0 -0.812,-0.182 -1.1,-0.548 -0.288,-0.366 -0.432,-0.906 -0.432,-1.624 0,-0.721 0.145,-1.261 0.436,-1.622 0.291,-0.36 0.664,-0.541 1.119,-0.541 0.352,0 0.648,0.109 0.889,0.327 0.241,0.221 0.395,0.548 0.463,0.985 l -0.559,0.105 c -0.055,-0.281 -0.149,-0.492 -0.286,-0.63 -0.135,-0.141 -0.297,-0.21 -0.488,-0.21 -0.284,0 -0.519,0.125 -0.706,0.377 -0.185,0.251 -0.279,0.649 -0.279,1.197 0,0.564 0.09,0.974 0.268,1.228 0.177,0.252 0.407,0.379 0.686,0.379 0.219,0 0.405,-0.085 0.56,-0.253 0.155,-0.168 0.255,-0.429 0.296,-0.783 z" /><path
@@ -17556,12 +17576,12 @@
      id="path8287-8"
      d="m 654.012,647.319 v -5.727 h 0.637 l 2.468,4.496 v -4.496 h 0.595 v 5.727 h -0.637 l -2.466,-4.5 v 4.5 z m 6.899,0 v -0.609 c -0.133,0.234 -0.289,0.411 -0.469,0.526 -0.18,0.117 -0.383,0.176 -0.609,0.176 -0.27,0 -0.496,-0.071 -0.688,-0.216 -0.192,-0.145 -0.317,-0.328 -0.381,-0.549 -0.063,-0.222 -0.096,-0.522 -0.096,-0.907 v -2.568 h 0.574 v 2.3 c 0,0.428 0.021,0.713 0.064,0.857 0.043,0.144 0.122,0.261 0.238,0.348 0.115,0.087 0.248,0.131 0.396,0.131 0.276,0 0.503,-0.113 0.68,-0.341 0.151,-0.194 0.227,-0.553 0.227,-1.072 v -2.223 h 0.578 v 4.147 z m 1.424,0 v -4.147 h 0.517 v 0.581 c 0.114,-0.216 0.261,-0.383 0.441,-0.5 0.18,-0.117 0.375,-0.176 0.589,-0.176 0.239,0 0.442,0.063 0.608,0.187 0.165,0.122 0.282,0.304 0.353,0.54 0.136,-0.241 0.291,-0.424 0.467,-0.545 0.176,-0.121 0.37,-0.182 0.584,-0.182 0.325,0 0.583,0.11 0.77,0.331 0.188,0.222 0.281,0.576 0.281,1.063 v 2.848 h -0.573 v -2.613 c 0,-0.297 -0.021,-0.507 -0.065,-0.631 -0.042,-0.124 -0.112,-0.22 -0.208,-0.286 -0.098,-0.068 -0.205,-0.103 -0.325,-0.103 -0.247,0 -0.45,0.099 -0.605,0.296 -0.155,0.195 -0.233,0.505 -0.233,0.927 v 2.41 h -0.578 v -2.694 c 0,-0.345 -0.054,-0.587 -0.159,-0.728 -0.105,-0.141 -0.251,-0.211 -0.435,-0.211 -0.264,0 -0.471,0.106 -0.624,0.318 -0.151,0.212 -0.228,0.6 -0.228,1.162 v 2.152 h -0.577 z m -8.342,7.247 v -5.727 h 0.62 v 5.051 h 2.313 v 0.676 z m 3.384,-2.074 c 0,-0.717 0.151,-1.257 0.453,-1.62 0.3,-0.366 0.681,-0.548 1.143,-0.548 0.451,0 0.832,0.182 1.136,0.548 0.306,0.363 0.458,0.889 0.458,1.577 0,0.745 -0.15,1.3 -0.45,1.664 -0.3,0.365 -0.681,0.546 -1.144,0.546 -0.457,0 -0.836,-0.182 -1.139,-0.548 -0.304,-0.366 -0.457,-0.906 -0.457,-1.619 z m 0.592,0 c 0,0.537 0.097,0.936 0.291,1.197 0.196,0.263 0.439,0.393 0.727,0.393 0.271,0 0.504,-0.132 0.697,-0.396 0.195,-0.265 0.293,-0.662 0.293,-1.193 0,-0.533 -0.1,-0.931 -0.293,-1.194 -0.197,-0.261 -0.438,-0.392 -0.728,-0.392 -0.272,0 -0.507,0.132 -0.7,0.395 -0.191,0.261 -0.287,0.658 -0.287,1.19 z m 5.502,0.554 0.566,0.09 c -0.064,0.495 -0.228,0.872 -0.49,1.132 -0.262,0.262 -0.576,0.391 -0.943,0.391 -0.445,0 -0.811,-0.182 -1.1,-0.548 -0.287,-0.366 -0.432,-0.906 -0.432,-1.624 0,-0.721 0.145,-1.261 0.436,-1.622 0.291,-0.36 0.664,-0.541 1.119,-0.541 0.352,0 0.648,0.109 0.89,0.327 0.241,0.221 0.395,0.548 0.462,0.985 l -0.559,0.105 c -0.055,-0.281 -0.148,-0.492 -0.285,-0.631 -0.135,-0.14 -0.297,-0.209 -0.488,-0.209 -0.283,0 -0.518,0.125 -0.705,0.377 -0.186,0.251 -0.279,0.649 -0.279,1.197 0,0.564 0.09,0.974 0.27,1.228 0.176,0.252 0.406,0.378 0.685,0.378 0.219,0 0.405,-0.084 0.56,-0.252 0.154,-0.167 0.252,-0.428 0.293,-0.783 z m 1.067,1.52 v -5.727 h 0.575 v 3.266 l 1.366,-1.688 h 0.747 l -1.302,1.539 1.43,2.609 h -0.707 l -1.129,-2.121 -0.405,0.477 v 1.645 z" /><polygon
      id="polygon8289-9"
-     points="690.36,642.647 691.055,642.647 689.011,651.529 688.319,651.529 " /><path
+     points="688.319,651.529 690.36,642.647 691.055,642.647 689.011,651.529 " /><path
      inkscape:connector-curvature="0"
      id="path8291-1"
      d="m 721.122,644.369 0.224,-0.832 c 0.508,0.22 0.876,0.408 1.108,0.568 -0.061,-0.718 -0.09,-1.204 -0.095,-1.458 h 0.696 c -0.008,0.374 -0.044,0.859 -0.109,1.452 0.323,-0.198 0.699,-0.387 1.129,-0.563 l 0.223,0.832 c -0.41,0.164 -0.809,0.274 -1.194,0.328 0.194,0.208 0.47,0.576 0.826,1.107 l -0.574,0.498 c -0.18,-0.296 -0.399,-0.716 -0.661,-1.26 -0.238,0.55 -0.449,0.971 -0.629,1.26 l -0.562,-0.498 c 0.352,-0.539 0.618,-0.907 0.796,-1.107 -0.419,-0.097 -0.811,-0.205 -1.178,-0.327 z" /><polygon
      id="polygon8293-5"
-     points="761.757,645.963 761.757,646.786 754.031,646.786 754.031,645.963 " /><path
+     points="754.031,645.963 761.757,645.963 761.757,646.786 754.031,646.786 " /><path
      inkscape:connector-curvature="0"
      id="path8295-4"
      d="m 88.311,683.361 c 0.432,0.364 0.832,0.628 1.194,0.796 l -0.276,0.792 c -0.514,-0.226 -1.018,-0.578 -1.51,-1.054 -0.52,0.354 -1.094,0.532 -1.724,0.532 -1.03,0 -1.864,-0.45 -2.502,-1.354 -0.574,-0.812 -0.86,-1.838 -0.86,-3.082 0,-0.928 0.154,-1.733 0.462,-2.416 0.308,-0.682 0.714,-1.191 1.216,-1.53 0.502,-0.338 1.068,-0.506 1.696,-0.506 0.622,0 1.186,0.175 1.696,0.524 0.51,0.351 0.916,0.86 1.216,1.53 0.302,0.67 0.452,1.462 0.452,2.376 0,0.714 -0.094,1.359 -0.278,1.938 -0.186,0.58 -0.446,1.064 -0.782,1.454 z m -2.058,-1.454 c 0.536,0.181 0.978,0.454 1.33,0.822 0.548,-0.618 0.82,-1.538 0.82,-2.76 0,-0.738 -0.104,-1.366 -0.312,-1.882 -0.21,-0.517 -0.498,-0.906 -0.868,-1.172 -0.368,-0.265 -0.772,-0.398 -1.21,-0.398 -0.696,0 -1.272,0.292 -1.732,0.876 -0.458,0.584 -0.688,1.45 -0.688,2.598 0,1.134 0.231,1.994 0.698,2.582 0.464,0.588 1.038,0.882 1.722,0.882 0.328,0 0.64,-0.075 0.938,-0.228 -0.29,-0.232 -0.598,-0.396 -0.926,-0.492 z" /><path
@@ -17569,12 +17589,12 @@
      id="path8297-9"
      d="m 117.473,684.207 -1.87,-8.59 h 0.956 l 1.072,5.63 c 0.114,0.58 0.214,1.166 0.298,1.758 l 0.318,-1.588 1.342,-5.8 h 1.125 l 1.007,4.348 c 0.246,1.059 0.43,2.072 0.55,3.04 0.09,-0.558 0.206,-1.18 0.346,-1.868 l 1.108,-5.52 h 0.938 l -1.934,8.59 h -0.896 l -1.488,-6.544 -0.224,-1.008 c -0.066,0.374 -0.134,0.71 -0.204,1.008 l -1.494,6.544 z" /><polygon
      id="polygon8299-2"
-     points="149.695,675.692 154.787,675.692 154.787,676.706 150.625,676.706 150.625,679.335 154.523,679.335 154.523,680.344 150.625,680.344 150.625,683.268 154.951,683.268 154.951,684.282 149.695,684.282 " /><path
+     points="150.625,676.706 150.625,679.335 154.523,679.335 154.523,680.344 150.625,680.344 150.625,683.268 154.951,683.268 154.951,684.282 149.695,684.282 149.695,675.692 154.787,675.692 154.787,676.706 " /><path
      inkscape:connector-curvature="0"
      id="path8301-5"
      d="m 181.538,684.282 v -8.59 h 3.122 c 0.654,0 1.134,0.08 1.446,0.24 0.31,0.16 0.564,0.428 0.764,0.8 0.2,0.374 0.298,0.806 0.298,1.298 0,0.647 -0.168,1.174 -0.506,1.576 -0.338,0.401 -0.83,0.657 -1.474,0.768 0.262,0.156 0.462,0.314 0.598,0.475 0.278,0.328 0.522,0.693 0.732,1.096 l 1.23,2.338 h -1.172 l -0.936,-1.788 c -0.364,-0.698 -0.638,-1.17 -0.824,-1.412 -0.186,-0.242 -0.366,-0.403 -0.538,-0.487 -0.174,-0.085 -0.418,-0.127 -0.729,-0.127 h -1.078 v 3.814 h -0.933 z m 0.932,-4.798 h 2.004 c 0.436,0 0.768,-0.055 0.996,-0.16 0.226,-0.104 0.406,-0.27 0.538,-0.498 0.134,-0.226 0.2,-0.49 0.2,-0.79 0,-0.434 -0.128,-0.773 -0.382,-1.021 -0.252,-0.248 -0.63,-0.372 -1.13,-0.372 h -2.226 z" /><polygon
      id="polygon8303-7"
-     points="216.629,676.63 214.31,676.63 214.31,675.617 219.894,675.617 219.894,676.63 217.562,676.63 217.562,684.207 216.629,684.207 " /><path
+     points="216.629,684.207 216.629,676.63 214.31,676.63 214.31,675.617 219.894,675.617 219.894,676.63 217.562,676.63 217.562,684.207 " /><path
      inkscape:connector-curvature="0"
      id="path8305-4"
      d="m 250.251,684.282 v -3.638 l -2.712,-4.952 h 1.136 l 1.382,2.59 c 0.274,0.512 0.514,0.996 0.722,1.454 0.206,-0.45 0.462,-0.956 0.768,-1.518 l 1.364,-2.526 h 1.084 l -2.812,4.952 v 3.638 z" /><path
@@ -17582,7 +17602,7 @@
      id="path8307-9"
      d="m 285.325,675.692 h 0.936 v 4.964 c 0,0.832 -0.08,1.514 -0.242,2.046 -0.162,0.534 -0.458,0.954 -0.886,1.264 -0.426,0.309 -0.97,0.462 -1.63,0.462 -0.93,0 -1.626,-0.275 -2.09,-0.831 -0.462,-0.555