X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdrawer.c;h=801ff38b318c3441d29f51b91ee4c6f57950d935;hb=f85f15bfe0ead8d5eb4490df5747c49c46e661ea;hp=15879fc36b27903a68c083b6650b7ddef3312538;hpb=a4aa49ce248a0546568abb5c6b62f6700d2d4b89;p=swftools.git

diff --git a/lib/drawer.c b/lib/drawer.c
index 15879fc..801ff38 100644
--- a/lib/drawer.c
+++ b/lib/drawer.c
@@ -25,17 +25,29 @@
 #include <string.h>
 #include <memory.h>
 #include <math.h>
+#include <ctype.h>
 #include "drawer.h"
 
 static char* getToken(const char**p)
 {
     const char*start;
     char*result;
-    while(**p && strchr(" ,\t\n\r", **p)) {
+    while(**p && strchr(" ,()\t\n\r", **p)) {
 	(*p)++;
     } 
     start = *p;
-    while(**p && !strchr(" ,\t\n\r", **p)) {
+
+     /*
+        SVF pathdata can exclude whitespace after L and M commands.
+        Ref:  http://www.w3.org/TR/SVG11/paths.html#PathDataGeneralInformation
+        This allows us to use svg files output from gnuplot.
+        Also checks for relative MoveTo and LineTo (m and l).
+        051106 Magnus Lundin, lundin@mlu.mine.nu
+     */
+    if (strchr("LMlm", **p) && (isdigit(*(*p+1))||strchr("+-", *(*p+1)))) {
+	(*p)++;
+    }
+    else while(**p && !strchr(" ,()\t\n\r", **p)) {
 	(*p)++;
     }
     result = malloc((*p)-start+1);
@@ -94,40 +106,41 @@ void draw_string(drawer_t*draw, const char*string)
 	   !strncmp(token, "M", 1) //svg
 	   ) {
 	    FPOINT to;
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
+	    to.x = atof(getToken(&p));
+	    to.y = atof(getToken(&p));
 	    draw->moveTo(draw, &to);
 	}
 	else if(!strncmp(token, "lineTo", 6) ||
 	        !strncmp(token, "L", 1) //svg
 	     ) {
 	    FPOINT to;
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
+	    to.x = atof(getToken(&p));
+	    to.y = atof(getToken(&p));
 	    draw->lineTo(draw, &to);
 	}
 	else if(!strncmp(token, "curveTo", 7) || !strncmp(token, "splineTo", 8)) {
 	    FPOINT mid,to;
-	    mid.x = atoi(getToken(&p));
-	    mid.y = atoi(getToken(&p));
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
+	    mid.x = atof(getToken(&p));
+	    mid.y = atof(getToken(&p));
+	    to.x = atof(getToken(&p));
+	    to.y = atof(getToken(&p));
 	    draw->splineTo(draw, &mid, &to);
 	}
 	else if(!strncmp(token, "conicTo", 5)) {
 	    FPOINT mid,to;
-	    mid.x = atoi(getToken(&p));
-	    mid.y = atoi(getToken(&p));
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
+	    mid.x = atof(getToken(&p));
+	    mid.y = atof(getToken(&p));
+	    to.x = atof(getToken(&p));
+	    to.y = atof(getToken(&p));
 	    draw_conicTo(draw, &mid, &to);
 	}
 	else if(!strncmp(token, "circle", 6)) {
 	    int mx,my,r;
-	    double r2 = 0.70710678118654757*r;
-	    mx = atoi(getToken(&p));
-	    my = atoi(getToken(&p));
-	    r = atoi(getToken(&p));
+	    double r2;
+	    mx = atof(getToken(&p));
+	    my = atof(getToken(&p));
+	    r = atof(getToken(&p));
+	    r2 = 0.70710678118654757*r;
 	    draw_moveTo2(draw, mx, my-r);
 	    draw_conicTo2(draw, mx+r2, my-r2, mx+r, my);
 	    draw_conicTo2(draw, mx+r2, my+r2, mx, my+r);
@@ -136,10 +149,10 @@ void draw_string(drawer_t*draw, const char*string)
 	}
 	else if(!strncmp(token, "box", 3)) {
 	    int x1,y1,x2,y2;
-	    x1 = atoi(getToken(&p));
-	    y1 = atoi(getToken(&p));
-	    x2 = atoi(getToken(&p));
-	    y2 = atoi(getToken(&p));
+	    x1 = atof(getToken(&p));
+	    y1 = atof(getToken(&p));
+	    x2 = atof(getToken(&p));
+	    y2 = atof(getToken(&p));
 	    draw_moveTo2(draw, x1, y1);
 	    draw_lineTo2(draw, x1, y2);
 	    draw_lineTo2(draw, x2, y2);
@@ -150,12 +163,12 @@ void draw_string(drawer_t*draw, const char*string)
 	        !strncmp(token, "C", 1) //svg
 		) {
 	    FPOINT mid1,mid2,to;
-	    mid1.x = atoi(getToken(&p));
-	    mid1.y = atoi(getToken(&p));
-	    mid2.x = atoi(getToken(&p));
-	    mid2.y = atoi(getToken(&p));
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
+	    mid1.x = atof(getToken(&p));
+	    mid1.y = atof(getToken(&p));
+	    mid2.x = atof(getToken(&p));
+	    mid2.y = atof(getToken(&p));
+	    to.x = atof(getToken(&p));
+	    to.y = atof(getToken(&p));
 	    draw_cubicTo(draw, &mid1, &mid2, &to);
 	}
 	else if(!strncmp(token, "z", 1) //svg
@@ -297,12 +310,18 @@ static int approximate3(const struct cspline*s, struct qspline*q, int size, doub
 
 	/* convert control point representation to 
 	   d*x^3 + c*x^2 + b*x + a */
-
-	/* FIXME: we need to do this for the subspline between [start,end],
-	   not [0,1] */
 	dx= s->end.x  - s->control2.x*3 + s->control1.x*3 - s->start.x;
 	dy= s->end.y  - s->control2.y*3 + s->control1.y*3 - s->start.y;
 	
+	/* we need to do this for the subspline between [start,end], not [0,1] 
+	   as a transformation of t->a*t+b does nothing to highest coefficient
+	   of the spline except multiply it with a^3, we just need to modify
+	   d here. */
+	{double m = end-start;
+	 dx*=m*m*m;
+	 dy*=m*m*m;
+	}
+	
 	/* use the integral over (f(x)-g(x))^2 between 0 and 1
 	   to measure the approximation quality. 
 	   (it boils down to const*d^2)
@@ -330,8 +349,8 @@ void draw_cubicTo(drawer_t*draw, FPOINT*  control1, FPOINT* control2, FPOINT*  t
 {
     struct qspline q[128];
     struct cspline c;
-    double quality = 80;
-    double maxerror = (500-(quality*5)>1?500-(quality*5):1)/20.0;
+    //double quality = 80;
+    double maxerror = 1;//(500-(quality*5)>1?500-(quality*5):1)/20.0;
     int t,num;
 
     c.start.x = draw->pos.x;