Logo can be drawn as a fixed object now, no need for special hacks in leo.c

diff --git a/icons/logo.svg b/icons/logo.svg
index 10b0164af03cfb6ff4e95ef0df8d81ba1bc2bd39..c34ea45b9a194de30f96824fa9a5b07c53e6cd97 100644 (file)
--- a/icons/logo.svg
+++ b/icons/logo.svg
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="35.479759"
+   height="38.816013"
    id="svg2"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="logo.svg">
   <defs
      id="defs4">
@@ -53,9 +53,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="174.39239"
-     inkscape:cy="40.188039"
+     inkscape:zoom="2.8"
+     inkscape:cx="37.548379"
+     inkscape:cy="-12.594246"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -66,7 +66,11 @@
      inkscape:window-height="1004"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <inkscape:grid
        type="xygrid"
        id="grid2816"
@@ -76,7 +80,9 @@
        snapvisiblegridlinesonly="true"
        units="mm"
        spacingx="1mm"
-       spacingy="1mm" />
+       spacingy="1mm"
+       originx="-38.620421mm"
+       originy="-14.896334mm" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -93,7 +99,8 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-136.84401,-960.76389)">
     <g
        transform="matrix(0.09452091,0,0,0.09452091,156.91602,888.30189)"
        id="g2916-1"
@@ -101,93 +108,114 @@
       <path
          id="path2425-4"
          d="m -106.87586,794.79497 c 0,0 1.91986,55.86792 1.91986,55.86792"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccc"
          id="path2423-5"
          d="m -176.18279,810.92179 c 0.40525,-0.39416 32.8296,-21.31044 67.0031,-25.9181 57.019835,-7.10348 64.50729,3.07177 65.083247,8.44738 3.83972,26.68605 -63.739347,29.75783 -63.931327,29.75783"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2421-8"
          d="m -115.51523,867.04697 c 0,0 8.70465,27.64598 8.70465,27.64598"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2419-0"
          d="m -113.21139,880.35544 c 0,0 -66.30044,13.05505 -63.73935,48.12705 0.76795,17.14818 34.81474,9.98327 44.28349,7.16491 20.99174,-5.11835 41.983492,-9.46875 46.844575,4.35424 5.375609,15.10162 -33.532275,23.549 -33.532275,23.80627 0,0 -63.9966,11.26189 -63.9966,11.26189"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2416-0"
          d="m -174.13622,860.3889 c 0,0 22.78489,16.12682 22.78489,16.12682 0,0 14.07641,-27.8994 14.07641,-27.8994"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2414-8"
          d="m -192.30962,950.23834 c 0,0 13.31231,38.91171 13.31231,38.91171"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2412-2"
          d="m -90.941022,867.55766 c 5.37561,13.24703 12.671076,42.04492 14.206965,58.36373"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2410-2"
          d="m -44.096443,864.29389 c 0,0 -35.517406,38.20521 -35.517406,38.01323 0,-0.19199 41.468972,16.51079 41.468972,16.51079"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2408-3"
          d="m 89.783052,878.30887 c 0,0 43.772808,-8.19012 43.772808,-8.19012"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2406-0"
          d="m 93.365512,903.14034 c 0,0 46.587318,-6.40081 46.587318,-6.40081"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2404-3"
          d="m 95.669344,925.15345 c 0,0 47.101836,-6.9115 47.101836,-6.9115"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2402-1"
          d="m 28.474255,834.66278 c 0,0 16.768056,58.621 16.768056,58.621 0,0 28.413922,-6.9115 28.413922,-6.9115"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccccc"
          id="path2400-5"
          d="m -153.91242,1054.936 c 12.54436,3.8397 74.233297,51.1949 74.233297,51.1949 0.144238,-0.09 147.70249,3.8398 147.70249,3.8398 0,0 -5.118346,-110.58395 -5.118346,-110.58395 0,0 -142.069621,1.79315 -142.069621,1.79315 0,0 -68.34701,44.798 -74.74782,53.7561 z"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="ccc"
          id="path2398-0"
          d="m -113.97934,1157.8405 c 0.1806,-0.2266 35.836105,-43.0049 36.477337,-51.4523 0,0 28.797897,49.4057 34.684186,54.0133"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="ccc"
          id="path2396-6"
          d="m 27.065078,1161.4229 c 0.323587,-0.3493 39.806372,-51.195 39.806372,-51.195 0,0 43.38883,48.1232 43.38883,48.1232"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2394-1"
          d="m -77.885975,1103.8924 c 0,0 -0.767942,-102.4552 -0.767942,-102.4552"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2392-4"
          d="m 62.905021,999.64401 c 0,0 7.422178,-16.12682 27.899396,-18.1734 6.143552,-1.79315 32.000223,4.35041 31.742963,23.54899 0,0.2573 1.0252,13.823 -14.33368,16.1268 -8.19396,-0.7679 -15.358871,-4.8649 -14.848188,-15.8695 0,0 0.510683,-23.80629 30.207068,-20.99177 12.02984,0.51068 13.82299,2.81451 23.549,12.54436"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccccc"
          id="path2390-8"
          d="m -196.14933,1009.6273 c 0,0 198.8974655,-49.91638 285.29115,-52.60418 0,0 -113.271721,34.94145 -148.981113,57.59578 0,0 37.245278,3.4558 49.14841,8.8314 0,0 -11.135187,8.0634 -16.126821,19.5825 0.295123,0.071 23.4222875,1.9199 28.7978936,9.5993"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2388-3"
          d="m 21.946731,898.65938 c 0,0 -51.260256,-10.17525 -54.524016,22.65435 -1.727874,20.35051 31.1017287,19.58257 36.2853491,19.00661 12.8630609,-0.95993 39.9330839,-4.99163 41.0849979,-24.5742 1.535889,-16.5108 -36.6693204,-12.67108 -36.6693204,-12.67108"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2418-9"
          d="m -2.6274736,808.80995 c 0,0 -19.1985964,-7.87143 -34.1735034,0.76794 0,0 -14.398947,11.71115 -12.863061,22.27038 1.535889,11.32717 21.694416,14.78291 31.4857,13.82299 19.9665419,-0.38398 24.7661909,-6.52753 28.605911,-11.13519 4.799649,-10.36724 1.727875,-13.05505 -1.3439028,-16.12682 -4.799649,-6.52753 -23.4222882,-10.17526 -23.4222882,-10.17526"
-         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#ffffff;stroke-width:31.73900795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2429-4"
          d="m 57.578694,247.35558 c 0,3.41532 -2.771858,6.18718 -6.187184,6.18718 -3.415326,0 -6.187184,-2.77186 -6.187184,-6.18718 0,-3.41533 2.771858,-6.18719 6.187184,-6.18719 3.415326,0 6.187184,2.77186 6.187184,6.18719 z"
          style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:35.34571457;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)" />
+         transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        transform="matrix(0.09452091,0,0,0.09452091,156.91602,888.30189)"
@@ -195,93 +223,114 @@
       <path
          id="path2425"
          d="m -106.87586,794.79497 c 0,0 1.91986,55.86792 1.91986,55.86792"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccc"
          id="path2423"
          d="m -176.18279,810.92179 c 0.40525,-0.39416 32.8296,-21.31044 67.0031,-25.9181 57.019835,-7.10348 64.50729,3.07177 65.083247,8.44738 3.83972,26.68605 -63.739347,29.75783 -63.931327,29.75783"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2421"
          d="m -115.51523,867.04697 c 0,0 8.70465,27.64598 8.70465,27.64598"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2419"
          d="m -113.21139,880.35544 c 0,0 -66.30044,13.05505 -63.73935,48.12705 0.76795,17.14818 34.81474,9.98327 44.28349,7.16491 20.99174,-5.11835 41.983492,-9.46875 46.844575,4.35424 5.375609,15.10162 -33.532275,23.549 -33.532275,23.80627 0,0 -63.9966,11.26189 -63.9966,11.26189"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2416"
          d="m -174.13622,860.3889 c 0,0 22.78489,16.12682 22.78489,16.12682 0,0 14.07641,-27.8994 14.07641,-27.8994"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2414"
          d="m -192.30962,950.23834 c 0,0 13.31231,38.91171 13.31231,38.91171"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2412"
          d="m -90.941022,867.55766 c 5.37561,13.24703 12.671076,42.04492 14.206965,58.36373"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2410"
          d="m -44.096443,864.29389 c 0,0 -35.517406,38.20521 -35.517406,38.01323 0,-0.19199 41.468972,16.51079 41.468972,16.51079"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2408"
          d="m 89.783052,878.30887 c 0,0 43.772808,-8.19012 43.772808,-8.19012"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2406"
          d="m 93.365512,903.14034 c 0,0 46.587318,-6.40081 46.587318,-6.40081"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2404"
          d="m 95.669344,925.15345 c 0,0 47.101836,-6.9115 47.101836,-6.9115"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2402"
          d="m 28.474255,834.66278 c 0,0 16.768056,58.621 16.768056,58.621 0,0 28.413922,-6.9115 28.413922,-6.9115"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccccc"
          id="path2400"
          d="m -153.91242,1054.936 c 12.54436,3.8397 74.233297,51.1949 74.233297,51.1949 0.144238,-0.09 147.70249,3.8398 147.70249,3.8398 0,0 -5.118346,-110.58395 -5.118346,-110.58395 0,0 -142.069621,1.79315 -142.069621,1.79315 0,0 -68.34701,44.798 -74.74782,53.7561 z"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="ccc"
          id="path2398"
          d="m -113.97934,1157.8405 c 0.1806,-0.2266 35.836105,-43.0049 36.477337,-51.4523 0,0 28.797897,49.4057 34.684186,54.0133"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="ccc"
          id="path2396"
          d="m 27.065078,1161.4229 c 0.323587,-0.3493 39.806372,-51.195 39.806372,-51.195 0,0 43.38883,48.1232 43.38883,48.1232"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2394"
          d="m -77.885975,1103.8924 c 0,0 -0.767942,-102.4552 -0.767942,-102.4552"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2392"
          d="m 62.905021,999.64401 c 0,0 7.422178,-16.12682 27.899396,-18.1734 6.143552,-1.79315 32.000223,4.35041 31.742963,23.54899 0,0.2573 1.0252,13.823 -14.33368,16.1268 -8.19396,-0.7679 -15.358871,-4.8649 -14.848188,-15.8695 0,0 0.510683,-23.80629 30.207068,-20.99177 12.02984,0.51068 13.82299,2.81451 23.549,12.54436"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="cccccc"
          id="path2390"
          d="m -196.14933,1009.6273 c 0,0 198.8974655,-49.91638 285.29115,-52.60418 0,0 -113.271721,34.94145 -148.981113,57.59578 0,0 37.245278,3.4558 49.14841,8.8314 0,0 -11.135187,8.0634 -16.126821,19.5825 0.295123,0.071 23.4222875,1.9199 28.7978936,9.5993"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2388"
          d="m 21.946731,898.65938 c 0,0 -51.260256,-10.17525 -54.524016,22.65435 -1.727874,20.35051 31.1017287,19.58257 36.2853491,19.00661 12.8630609,-0.95993 39.9330839,-4.99163 41.0849979,-24.5742 1.535889,-16.5108 -36.6693204,-12.67108 -36.6693204,-12.67108"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2418"
          d="m -2.6274736,808.80995 c 0,0 -19.1985964,-7.87143 -34.1735034,0.76794 0,0 -14.398947,11.71115 -12.863061,22.27038 1.535889,11.32717 21.694416,14.78291 31.4857,13.82299 19.9665419,-0.38398 24.7661909,-6.52753 28.605911,-11.13519 4.799649,-10.36724 1.727875,-13.05505 -1.3439028,-16.12682 -4.799649,-6.52753 -23.4222882,-10.17526 -23.4222882,-10.17526"
-         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:11.05979252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path2429"
          d="m 57.578694,247.35558 c 0,3.41532 -2.771858,6.18718 -6.187184,6.18718 -3.415326,0 -6.187184,-2.77186 -6.187184,-6.18718 0,-3.41533 2.771858,-6.18719 6.187184,-6.18719 3.415326,0 6.187184,2.77186 6.187184,6.18719 z"
          style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)" />
+         transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>

diff --git a/leo.c b/leo.c
index b30996581f424d104a7775d91494fd0430810209..c884ae75777be65c9f7c1a8fdbecfd3ad9e8144c 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -1,7 +1,7 @@
 /*
  *     Hic Est Leo -- Main Program
  *
- *     (c) 2014 Martin Mares <mj@ucw.cz>
+ *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
 #include <ucw/lib.h>
@@ -160,27 +160,8 @@ int main(int argc UNUSED, char **argv)
        svg_set_attr_format(svg, "transform", "translate(%.6g,0) rotate(90)", page_height * svg->scale);
     }
 
-  // FIXME: Replace by generic logo drawing facility
-#if 0
-  struct svg_icon *logo = svg_icon_load(svg, "../logo/kocka-s-okrajem.svg");
-#endif
-
   sym_draw_all(svg);
 
-  // Draw logo
-#if 0
-  double logo_width = 36.12;
-  double logo_height = 36.12 / logo->width * logo->height;
-  struct svg_icon_request sir = {
-    .icon = logo,
-    .x = page_width - 12 - logo_width / 2,
-    .y = 10 + logo_height / 2,
-    .width = logo_width,
-    .height = logo_height,
-  };
-  svg_icon_put(svg, &sir);
-#endif
-
   draw_scale(svg);
 
   if (map_clip)

diff --git a/map.cf b/map.cf
index 809f77f50f31db1b66f3a410b38e73bbc5b423d9..3998e02ef5325c25e86b6af6229f03837c80808a 100644 (file)
--- a/map.cf
+++ b/map.cf
@@ -53,8 +53,8 @@ FixedObjects {
        # Fixed objects may be placed at specific positions on the paper
        # with specific tags. Remember to enable the "fixed" data source.
        Object {
-               X 100
-               Y 100
+               X 374
+               Y 25
                Tag legend logo
        }
 }

diff --git a/poskole.css b/poskole.css
index 30631f5ae39eff668a51fbc5984c1bc4e9d1a105..a60f5633ffc87945b524dd3f30e523c4f51a460c 100644 (file)
--- a/poskole.css
+++ b/poskole.css
@@ -705,3 +705,9 @@ node[hack=raisetext],
 way[hack=raisetext] {
        text-offset: 3;
 }
+
+node[legend=logo] {
+       icon-image: "icons/logo.svg";
+       icon-width: 36;
+       z-index: 99;
+}