X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=leo.c;h=003a2c55024af9b1787ca739283a19ad60c4fb49;hb=refs%2Fheads%2Flabelling;hp=75df2e7a4f3b85b4e24ee476da3f1116fd5c5ae1;hpb=27a0c4be8375ad51adf0a55696f83859625b8d47;p=leo.git diff --git a/leo.c b/leo.c index 75df2e7..003a2c5 100644 --- a/leo.c +++ b/leo.c @@ -17,7 +17,6 @@ #include "css.h" #include "sym.h" #include "map.h" - #include "labeller.h" uns debug_dump_source, debug_dump_after_proj, debug_dump_after_scaling; @@ -57,7 +56,7 @@ static void draw_scale(struct svg *svg) svg_push_element(svg, "g"); svg_set_attr(svg, "id", "scale"); - svg_set_attr_format(svg, "transform", "translate(%.6g,%.6g)", x * svg->scale, y * svg->scale); + svg_set_attr_format(svg, "transform", "translate(%s,%s)", svg_format_dimen(svg, x), svg_format_dimen(svg, y)); for (int outline=1; outline>=0; outline--) { @@ -118,6 +117,9 @@ int main(int argc UNUSED, char **argv) // HACKING cf_def_file = argv[1]; cf_declare_section("Debug", &debug_cf, 0); + + labeller_conf(); + opt_parse(&options, argv+2); // TILL HERE