From eff798e50eb467402ddcce0e36dbbede42485d66 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 7 Jun 2015 16:24:24 +0200 Subject: [PATCH] Logo can be drawn as a fixed object now, no need for special hacks in leo.c --- icons/logo.svg | 151 ++++++++++++++++++++++++++++++++----------------- leo.c | 21 +------ map.cf | 4 +- poskole.css | 6 ++ 4 files changed, 109 insertions(+), 73 deletions(-) diff --git a/icons/logo.svg b/icons/logo.svg index 10b0164..c34ea45 100644 --- 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"> @@ -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"> + spacingy="1mm" + originx="-38.620421mm" + originy="-14.896334mm" /> @@ -93,7 +99,8 @@ + id="layer1" + transform="translate(-136.84401,-960.76389)"> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)" + inkscape:connector-curvature="0" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + 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" /> + transform="matrix(0.8979592,0,0,0.8979592,-153.12491,819.07358)" + inkscape:connector-curvature="0" /> diff --git a/leo.c b/leo.c index b309965..c884ae7 100644 --- a/leo.c +++ b/leo.c @@ -1,7 +1,7 @@ /* * Hic Est Leo -- Main Program * - * (c) 2014 Martin Mares + * (c) 2014--2015 Martin Mares */ #include @@ -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 809f77f..3998e02 100644 --- 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 30631f5..a60f563 100644 --- 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; +} -- 2.39.2