From: Matthias Kramm <kramm@quiss.org>
Date: Sun, 6 Jun 2010 00:18:41 +0000 (-0700)
Subject: Merge branch 'horizontals'
X-Git-Tag: version-0-9-1~5
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=a9634f803811f39e67114955c3e9c30ae247a669;hp=98370d6c69a85a6b148939956d8edfb324a0740a

Merge branch 'horizontals'

Conflicts:
	lib/gfxpoly/Makefile
	lib/gfxpoly/poly.h
---

diff --git a/config.h.in b/config.h.in
index 7f99da5..9f122a0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -282,4 +282,13 @@
 #define calloc rfx_calloc_replacement
 #endif
 
+//#ifdef HAVE_BUILTIN_EXPECT
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+# define likely(x)      __builtin_expect((x), 1)
+# define unlikely(x)    __builtin_expect((x), 0)
+#else
+# define likely(x)      (x)
+# define unlikely(x)    (x)
+#endif
+
 #endif
diff --git a/lib/gfxpoly/Makefile b/lib/gfxpoly/Makefile
index 542839c..6faca66 100644
--- a/lib/gfxpoly/Makefile
+++ b/lib/gfxpoly/Makefile
@@ -16,25 +16,25 @@ testheap: ../libbase.a testheap.c
 SRC = active.c convert.c poly.c wind.c renderpoly.c xrow.c stroke.c
 OBJS = active.o convert.o poly.o wind.o renderpoly.o xrow.o stroke.o
 
-active.o: active.c active.h poly.h
+active.o: active.c active.h poly.h Makefile
 	$(CC) -c active.c -o active.o
 
-convert.o: convert.c convert.h poly.h
+convert.o: convert.c convert.h poly.h Makefile
 	$(CC) -c convert.c -o convert.o
 
-poly.o: poly.c poly.h active.h heap.h ../q.h
+poly.o: poly.c poly.h active.h heap.h ../q.h Makefile
 	$(CC) -c poly.c -o poly.o
 
-wind.o: wind.c wind.h poly.h
+wind.o: wind.c wind.h poly.h Makefile
 	$(CC) -c wind.c -o wind.o
 
-renderpoly.o: renderpoly.c wind.h poly.h renderpoly.h
+renderpoly.o: renderpoly.c wind.h poly.h renderpoly.h Makefile
 	$(CC) -c renderpoly.c -o renderpoly.o
 
-xrow.o: xrow.c xrow.h ../q.h ../mem.h
+xrow.o: xrow.c xrow.h ../q.h ../mem.h Makefile
 	$(CC) -c xrow.c -o xrow.o
 
-stroke.o: stroke.c poly.h convert.h wind.h
+stroke.o: stroke.c poly.h convert.h wind.h Makefile
 	$(CC) -c stroke.c -o stroke.o
 
 GFX=../gfxfont.o ../gfxtools.o ../gfximage.o ../devices/ops.o ../devices/polyops.o ../devices/text.o ../devices/bbox.o ../devices/render.o ../devices/rescale.o ../devices/record.o
@@ -42,7 +42,7 @@ stroke: test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a ../libbase.a
 	$(CC) test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a $(GFX) ../libbase.a -o stroke $(LIBS)
 
 SWF = ../librfxswf.a ../libgfxpdf.a -lstdc++
-test: ../libbase.a test.c $(OBJS) poly.h convert.h $(GFX) 
+test: ../libbase.a test.c $(OBJS) poly.h convert.h $(GFX)  Makefile
 	$(CC) test.c $(OBJS) $(SWF) $(GFX) ../libbase.a -o test $(LIBS)
 
 speedtest: ../libbase.a speedtest.c $(SRC) poly.h convert.h $(GFX) 
diff --git a/lib/gfxpoly/active.c b/lib/gfxpoly/active.c
index b723185..c5f9c02 100644
--- a/lib/gfxpoly/active.c
+++ b/lib/gfxpoly/active.c
@@ -16,7 +16,7 @@ void actlist_destroy(actlist_t*a)
     free(a);
 }
 
-void actlist_dump(actlist_t*a, int32_t y)
+void actlist_dump(actlist_t*a, int32_t y, double gridsize)
 {
     segment_t*s = a->list;
     double lastx;
@@ -27,14 +27,14 @@ void actlist_dump(actlist_t*a, int32_t y)
             double x = ((double)s->delta.x*(y-s->a.y)/s->delta.y)+s->a.x;
             if(s!=a->list) {
                 if(lastx>x) 
-                    fprintf(stderr, "?%f<->%f? ", lastx, x);
+                    fprintf(stderr, "?%.2f<->%.2f? ", lastx * gridsize, x * gridsize);
             }
             lastx = x;
         }
-        fprintf(stderr, "[%d]", s->nr);
+        fprintf(stderr, "[%d]", (int)s->nr);
         s = s->right;
         if(s) fprintf(stderr, " ");
-        else fprintf(stderr, " y=%d\n", y);
+        else fprintf(stderr, " y=%.2f\n", y * gridsize);
     }
 }
 void actlist_verify(actlist_t*a, int32_t y)
@@ -97,10 +97,10 @@ segment_t* actlist_find(actlist_t*a, point_t p1, point_t p2)
 	//double d = cmp(t, p1, p2);
 	double d = single_cmp(t, p1);
 	if(d>=0 && to_the_left) {
-	    actlist_dump(a, p1.y);
+	    actlist_dump(a, p1.y, 1);
 	    segment_t*s = a->list;
 	    while(s) {
-		fprintf(stderr, "[%d] %f/%f (%d,%d) -> (%d,%d)\n", s->nr,
+		fprintf(stderr, "[%d] %f/%f (%d,%d) -> (%d,%d)\n", SEGNR(s),
 			single_cmp(s,p1), cmp(s,p1,p2),
 			s->a.x, s->a.y, s->b.x, s->b.y);
 		s = s->right;
diff --git a/lib/gfxpoly/active.h b/lib/gfxpoly/active.h
index 02073b0..2dc09fa 100644
--- a/lib/gfxpoly/active.h
+++ b/lib/gfxpoly/active.h
@@ -19,7 +19,7 @@ actlist_t* actlist_new();
 void actlist_destroy(actlist_t*a);
 int actlist_size(actlist_t*a);
 void actlist_verify(actlist_t*a, int32_t y);
-void actlist_dump(actlist_t*a, int32_t y);
+void actlist_dump(actlist_t*a, int32_t y, double gridsize);
 segment_t* actlist_find(actlist_t*a, point_t p1, point_t p2);  // finds segment immediately to the left of p1 (breaking ties w/ p2)
 void actlist_insert(actlist_t*a, point_t p1, point_t p2, segment_t*s);
 void actlist_delete(actlist_t*a, segment_t*s);
diff --git a/lib/gfxpoly/convert.c b/lib/gfxpoly/convert.c
index 0a2cc93..bb01942 100644
--- a/lib/gfxpoly/convert.c
+++ b/lib/gfxpoly/convert.c
@@ -133,6 +133,7 @@ void finish_segment(compactpoly_t*data)
 	return;
     point_t*p = malloc(sizeof(point_t)*data->num_points);
     gfxpolystroke_t*s = rfx_calloc(sizeof(gfxpolystroke_t));
+    s->fs = &edgestyle_default;
     s->next = data->poly->strokes;
     data->poly->strokes = s;
     s->num_points = s->points_size = data->num_points;
@@ -166,19 +167,29 @@ static void compactmoveto(polywriter_t*w, int32_t x, int32_t y)
     }
     data->last = p;
 }
+
+static inline int direction(point_t p1, point_t p2)
+{
+    int diff = p1.y - p2.y;
+    if(diff) return diff;
+    return p1.x - p2.x;
+}
+
 static void compactlineto(polywriter_t*w, int32_t x, int32_t y)
 {
     compactpoly_t*data = (compactpoly_t*)w->internal;
     point_t p;
     p.x = x;
     p.y = y;
-    if(p.x == data->last.x && p.y == data->last.y)
+
+    int diff = direction(p, data->last);
+    if(!diff)
 	return;
+    segment_dir_t dir = diff<0?DIR_UP:DIR_DOWN;
 
-    if((p.y < data->last.y && data->dir != DIR_UP) ||
-       (p.y > data->last.y && data->dir != DIR_DOWN) || data->new) {
+    if(dir!=data->dir || data->new) {
 	finish_segment(data);
-	data->dir = p.y > data->last.y ? DIR_DOWN : DIR_UP;
+	data->dir = dir;
 	data->points[0] = data->last;
 	data->num_points = 1;
     }
diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c
index eb1b6b1..cc383b8 100644
--- a/lib/gfxpoly/poly.c
+++ b/lib/gfxpoly/poly.c
@@ -127,8 +127,25 @@ static inline int compare_events(const void*_a,const void*_b)
 HEAP_DEFINE(queue,event_t,COMPARE_EVENTS);
 HEAP_DEFINE(hqueue,event_t,COMPARE_EVENTS_SIMPLE);
 
+typedef struct _horizontal {
+    int32_t y;
+    int32_t x1, x2;
+    edgestyle_t*fs;
+    segment_dir_t dir;
+    int polygon_nr;
+    int xpos;
+    int pos;
+} horizontal_t;
+
+typedef struct _horizdata {
+    horizontal_t*data;
+    int num;
+    int size;
+} horizdata_t;
+
 typedef struct _status {
     int32_t y;
+    double gridsize;
     actlist_t*actlist;
     queue_t queue;
     xrow_t*xrow;
@@ -136,6 +153,8 @@ typedef struct _status {
     windcontext_t*context;
     segment_t*ending_segments;
 
+    horizdata_t horiz;
+
     gfxpolystroke_t*strokes;
 #ifdef CHECKS
     dict_t*seen_crossings; //list of crossing we saw so far
@@ -165,35 +184,87 @@ int gfxpoly_size(gfxpoly_t*poly)
     return edges;
 }
 
-char gfxpoly_check(gfxpoly_t*poly)
+char gfxpoly_check(gfxpoly_t*poly, char updown)
 {
-    current_polygon = poly;
-    dict_t*d = dict_new2(&point_type);
+    dict_t*d1 = dict_new2(&point_type);
+    dict_t*d2 = dict_new2(&point_type);
     int s,t;
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {
+	/* In order to not confuse the fill/wind logic, existing segments must have
+	   a non-zero edge style */
+	assert(stroke->fs);
+
+	/* put all the segments into dictionaries so that we can check
+	   that the endpoint multiplicity is two */
 	for(s=0;s<stroke->num_points;s++) {
 	    point_t p = stroke->points[s];
-	    int num = (s>=1 && s<stroke->num_points-1)?2:1; // mid points are two points (start+end)
-	    if(!dict_contains(d, &p)) {
-		dict_put(d, &p, (void*)(ptroff_t)num);
+	    int num_xor = (s>=1 && s<stroke->num_points-1)?2:1; // mid points are two points (start+end)
+	    int num_circ = (s>=1 && s<stroke->num_points-1)?0:(s==0?1:-1);
+	    if(stroke->dir==DIR_UP)
+		num_circ=-num_circ;
+
+	    if(!dict_contains(d1, &p)) {
+		dict_put(d1, &p, (void*)(ptroff_t)num_xor);
+		if(updown) {
+		    assert(!dict_contains(d2, &p));
+		    dict_put(d2, &p, (void*)(ptroff_t)num_circ);
+		}
 	    } else {
-		int count = (ptroff_t)dict_lookup(d, &p);
-		dict_del(d, &p);
-		count+=num;
-		dict_put(d, &p, (void*)(ptroff_t)count);
+		int count = (ptroff_t)dict_lookup(d1, &p);
+		dict_del(d1, &p);
+		count+=num_xor;
+		dict_put(d1, &p, (void*)(ptroff_t)count);
+
+		if(updown) {
+		    assert(dict_contains(d2, &p));
+		    count = (ptroff_t)dict_lookup(d2, &p);
+		    dict_del(d2, &p);
+		    count+=num_circ;
+		    dict_put(d2, &p, (void*)(ptroff_t)count);
+		}
 	    }
 	}
     }
-    DICT_ITERATE_ITEMS(d, point_t*, p, void*, c) {
-        int count = (ptroff_t)c;
+    DICT_ITERATE_ITEMS(d1, point_t*, p1, void*, c1) {
+        int count = (ptroff_t)c1;
         if(count&1) {
-            fprintf(stderr, "Point (%f,%f) occurs %d times\n", p->x*poly->gridsize, p->y*poly->gridsize, count);
-            dict_destroy(d);
-            return 0;
+            fprintf(stderr, "Error: Point (%.2f,%.2f) occurs %d times\n", p1->x * poly->gridsize, p1->y * poly->gridsize, count);
+            dict_destroy(d1);
+            dict_destroy(d2);
+	    return 0;
         }
     }
-    dict_destroy(d);
+    if(updown) {
+	DICT_ITERATE_ITEMS(d2, point_t*, p2, void*, c2) {
+	    int count = (ptroff_t)c2;
+	    assert(dict_contains(d1, p2));
+	    int ocount = (ptroff_t)dict_lookup(d1, p2);
+	    if(count!=0) {
+		if(count>0) fprintf(stderr, "Error: Point (%.2f,%.2f) has %d more incoming than outgoing segments (%d incoming, %d outgoing)\n", p2->x * poly->gridsize, p2->y * poly->gridsize, count, (ocount+count)/2, (ocount-count)/2);
+		if(count<0) fprintf(stderr, "Error: Point (%.2f,%.2f) has %d more outgoing than incoming segments (%d incoming, %d outgoing)\n", p2->x * poly->gridsize, p2->y * poly->gridsize, -count, (ocount+count)/2, (ocount-count)/2);
+		gfxpolystroke_t*stroke = poly->strokes;
+		for(;stroke;stroke=stroke->next) {
+		    for(s=0;s<stroke->num_points-1;s++) {
+			point_t a = stroke->points[s];
+			point_t b = stroke->points[s+1];
+			if(a.x == p2->x && a.y == p2->y ||
+			   b.x == p2->x && b.y == p2->y) {
+			    fprintf(stderr, "%.2f,%.2f -> %.2f,%.2f\n", 
+				    a.x * poly->gridsize, 
+				    a.y * poly->gridsize, 
+				    b.x * poly->gridsize, 
+				    b.y * poly->gridsize);
+			}
+		    }
+		}
+		dict_destroy(d2);
+		return 0;
+	    }
+	}
+    }
+    dict_destroy(d1);
+    dict_destroy(d2);
     return 1;
 }
 
@@ -201,15 +272,24 @@ void gfxpoly_dump(gfxpoly_t*poly)
 {
     int s,t;
     double g = poly->gridsize;
-    fprintf(stderr, "polyon %08x (gridsize: %f)\n", (int)poly, poly->gridsize);
+    fprintf(stderr, "polyon %p (gridsize: %.2f)\n", poly, poly->gridsize);
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {
-	fprintf(stderr, "%08x", (int)stroke);
-	for(s=0;s<stroke->num_points-1;s++) {
-	    point_t a = stroke->points[s];
-	    point_t b = stroke->points[s+1];
-	    fprintf(stderr, "%s (%f,%f) -> (%f,%f)%s\n", s?"        ":"", a.x*g, a.y*g, b.x*g, b.y*g,
-		                                        s==stroke->num_points-2?"]":"");
+	fprintf(stderr, "%11p", stroke);
+	if(stroke->dir==DIR_UP) {
+	    for(s=stroke->num_points-1;s>=1;s--) {
+		point_t a = stroke->points[s];
+		point_t b = stroke->points[s-1];
+		fprintf(stderr, "%s (%.2f,%.2f) -> (%.2f,%.2f)%s%s\n", s!=stroke->num_points-1?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+							    s==1?"]":"", a.y==b.y?"H":"");
+	    }
+	} else {
+	    for(s=0;s<stroke->num_points-1;s++) {
+		point_t a = stroke->points[s];
+		point_t b = stroke->points[s+1];
+		fprintf(stderr, "%s (%.2f,%.2f) -> (%.2f,%.2f)%s%s\n", s?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+							    s==stroke->num_points-2?"]":"", a.y==b.y?"H":"");
+	    }
 	}
     }
 }
@@ -235,6 +315,50 @@ void gfxpoly_save(gfxpoly_t*poly, const char*filename)
     fclose(fi);
 }
 
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename)
+{
+    FILE*fi = fopen(filename, "wb");
+    fprintf(fi, "%% gridsize %f\n", poly->gridsize);
+    fprintf(fi, "%% begin\n");
+    int t;
+    double l = 5.0 / poly->gridsize;
+    double g = poly->gridsize;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+	fprintf(fi, "%g setgray\n", 0);
+
+	int s = stroke->dir==DIR_UP?stroke->num_points-1:0;
+	int end = stroke->dir==DIR_UP?-1:stroke->num_points;
+	int dir = stroke->dir==DIR_UP?-1:1;
+
+	point_t p = stroke->points[s];
+	s+=dir;
+	point_t o = p;
+	fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+	for(;s!=end;s+=dir) {
+	    p = stroke->points[s];
+	    int lx = p.x - o.x;
+	    int ly = p.y - o.y;
+	    double d = sqrt(lx*lx+ly*ly);
+	    if(!d) d=1;
+	    else   d = l / d;
+	    double d2 = d*1.5;
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 + (ly*d))*g,
+		                          (p.y - ly*d2 - (lx*d))*g);
+	    fprintf(fi, "%f %f lineto\n", p.x * g, p.y * g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 - (ly*d))*g, 
+		                          (p.y - ly*d2 + (lx*d))*g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+	    fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+	    o = p;
+	}
+	fprintf(fi, "stroke\n");
+    }
+    fprintf(fi, "showpage\n");
+    fclose(fi);
+}
+
 inline static event_t* event_new()
 {
     event_t*e = rfx_calloc(sizeof(event_t));
@@ -245,16 +369,20 @@ inline static void event_free(event_t*e)
     free(e);
 }
 
-static void event_dump(event_t*e)
+static void event_dump(status_t*status, event_t*e)
 {
     if(e->type == EVENT_HORIZONTAL) {
-        fprintf(stderr, "Horizontal [%d] (%d,%d) -> (%d,%d)\n", e->s1->nr, e->s1->a.x, e->s1->a.y, e->s1->b.x, e->s1->b.y);
+        fprintf(stderr, "Horizontal [%d] (%.2f,%.2f) -> (%.2f,%.2f)\n", (int)e->s1->nr, 
+		e->s1->a.x * status->gridsize, e->s1->a.y * status->gridsize, e->s1->b.x * status->gridsize, e->s1->b.y * status->gridsize);
     } else if(e->type == EVENT_START) {
-        fprintf(stderr, "event: segment [%d] starts at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] starts at (%.2f,%.2f)\n", (int)e->s1->nr, 
+		e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else if(e->type == EVENT_END) {
-        fprintf(stderr, "event: segment [%d] ends at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] ends at (%.2f,%.2f)\n", (int)e->s1->nr, 
+		e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else if(e->type == EVENT_CROSS) {
-        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%d,%d)\n", e->s1->nr, e->s2->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%.2f,%.2f)\n", (int)e->s1->nr, (int)e->s2->nr, 
+		e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else {
         assert(0);
     }
@@ -265,28 +393,35 @@ static inline int32_t min32(int32_t v1, int32_t v2) {return v1<v2?v1:v2;}
 
 static void segment_dump(segment_t*s)
 {
-    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
-    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f\n", s->delta.x, s->delta.y, s->k,
-            (double)s->delta.x / s->delta.y);
+    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", (int)s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
+    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f fs=%p\n", s->delta.x, s->delta.y, s->k,
+            (double)s->delta.x / s->delta.y, s->fs);
 }
 
 static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int polygon_nr, segment_dir_t dir)
 {
+    static int segment_count=0;
+    s->nr = segment_count++;
     s->dir = dir;
     if(y1!=y2) {
 	assert(y1<y2);
     } else {
         /* We need to make sure horizontal segments always go from left to right.
 	   "up/down" for horizontal segments is handled by "rotating"
-           them 90° anticlockwise in screen coordinates (tilt your head to
-           the right).
+           them 90° counterclockwise in screen coordinates (tilt your head to
+           the right). In other words, the "normal" direction (what's positive dy for
+	   vertical segments) is positive dx for horizontal segments ("down" is right).
 	 */
-        s->dir = DIR_UP;
         if(x1>x2) {
-            s->dir = DIR_DOWN;
+            s->dir = DIR_INVERT(s->dir);
             int32_t x = x1;x1=x2;x2=x;
             int32_t y = y1;y1=y2;y2=y;
         }
+#ifdef DEBUG
+	fprintf(stderr, "Scheduling horizontal segment [%d] (%.2f,%.2f) -> (%.2f,%.2f) %s\n",
+		segment_count,
+		x1 * 0.05, y1 * 0.05, x2 * 0.05, y2 * 0.05, s->dir==DIR_UP?"up":"down");
+#endif
     }
     s->a.x = x1;
     s->a.y = y1;
@@ -301,8 +436,6 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_
 
     s->pos = s->a;
     s->polygon_nr = polygon_nr;
-    static int segment_count=0;
-    s->nr = segment_count++;
 
 #ifdef CHECKS
     /* notice: on some systems (with some compilers), for the line 
@@ -351,7 +484,7 @@ static void segment_destroy(segment_t*s)
     free(s);
 }
 
-static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos)
+static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos, double gridsize)
 {
     if(!stroke) 
 	return;
@@ -361,14 +494,16 @@ static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*strok
     while(pos < stroke->num_points-1) {
 	assert(stroke->points[pos].y <= stroke->points[pos+1].y);
 	s = segment_new(stroke->points[pos], stroke->points[pos+1], polygon_nr, stroke->dir);
+	s->fs = stroke->fs;
 	pos++;
 	s->stroke = 0;
 	s->stroke_pos = 0;
 #ifdef DEBUG
 	/*if(l->tmp)
 	    s->nr = l->tmp;*/
-	fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s (stroke %08x, %d more to come)\n",
-		s->nr, s->a.x, s->a.y, s->b.x, s->b.y,
+	fprintf(stderr, "[%d] (%.2f,%.2f) -> (%.2f,%.2f) %s (stroke %p, %d more to come)\n",
+		s->nr, s->a.x * gridsize, s->a.y * gridsize, 
+		s->b.x * gridsize, s->b.y * gridsize,
 		s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos);
 #endif
 	event_t* e = event_new();
@@ -403,7 +538,7 @@ static void gfxpoly_enqueue(gfxpoly_t*p, queue_t*queue, hqueue_t*hqueue, int pol
 	    assert(stroke->points[s].y <= stroke->points[s+1].y);
 	}
 #endif
-	advance_stroke(queue, hqueue, stroke, polygon_nr, 0);
+	advance_stroke(queue, hqueue, stroke, polygon_nr, 0, p->gridsize);
     }
 }
 
@@ -643,6 +778,37 @@ static inline box_t box_new(int32_t x, int32_t y)
     return box;
 }
 
+static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr);
+
+static void append_stroke(status_t*status, point_t a, point_t b, segment_dir_t dir, edgestyle_t*fs)
+{
+    gfxpolystroke_t*stroke = status->strokes;
+    /* find a stoke to attach this segment to. It has to have an endpoint
+       matching our start point, and a matching edgestyle */
+    while(stroke) {
+	point_t p = stroke->points[stroke->num_points-1];
+	if(p.x == a.x && p.y == a.y && stroke->fs == fs && stroke->dir == dir)
+	    break;
+	stroke = stroke->next;
+    }
+    if(!stroke) {
+	stroke = rfx_calloc(sizeof(gfxpolystroke_t));
+	stroke->dir = dir;
+	stroke->fs = fs;
+	stroke->next = status->strokes;
+	status->strokes = stroke;
+	stroke->points_size = 2;
+	stroke->points = rfx_calloc(sizeof(point_t)*stroke->points_size);
+	stroke->points[0] = a;
+	stroke->num_points = 1;
+    } else if(stroke->num_points == stroke->points_size) {
+	assert(stroke->fs);
+	stroke->points_size *= 2;
+	stroke->points = rfx_realloc(stroke->points, sizeof(point_t)*stroke->points_size);
+    }
+    stroke->points[stroke->num_points++] = b;
+}
+
 static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
 {
     assert(s->pos.x != p.x || s->pos.y != p.y);
@@ -653,49 +819,32 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
     assert(s->fs_out_ok);
 #endif
 
-    if(s->fs_out) {
+    if(s->pos.y != p.y) {
+	/* non horizontal line- copy to output */
+	if(s->fs_out) {
+	    segment_dir_t dir = s->wind.is_filled?DIR_DOWN:DIR_UP;
 #ifdef DEBUG
-        fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr,
-                s->pos.x, s->pos.y, p.x, p.y);
+	    fprintf(stderr, "[%d] receives next point (%.2f,%.2f)->(%.2f,%.2f) (drawing (%s))\n", s->nr,
+		    s->pos.x * status->gridsize, s->pos.y * status->gridsize, 
+		    p.x * status->gridsize, p.y * status->gridsize,
+		    dir==DIR_UP?"up":"down"
+		    );
 #endif
-	/* XXX we probably will never output circular/anticircular polygons, but if
-	   we do, we would need to set the segment direction here */
-	fillstyle_t*fs = s->fs_out;
-
-        // omit horizontal lines
-        if(s->pos.y != p.y) {
-            point_t a = s->pos;
-            point_t b = p;
-            assert(a.y != b.y);
-
-            gfxpolystroke_t*stroke = status->strokes;
-	    while(stroke) {
-		point_t p = stroke->points[stroke->num_points-1];
-		if(p.x == a.x && p.y == a.y && stroke->fs == fs)
-		    break;
-		stroke = stroke->next;
-	    }
-	    if(!stroke) {
-		stroke = rfx_calloc(sizeof(gfxpolystroke_t));
-		stroke->dir = DIR_DOWN;
-		stroke->fs = fs;
-		stroke->next = status->strokes;
-		status->strokes = stroke;
-		stroke->points_size = 2;
-		stroke->points = rfx_calloc(sizeof(point_t)*stroke->points_size);
-		stroke->points[0] = a;
-		stroke->num_points = 1;
-	    } else if(stroke->num_points == stroke->points_size) {
-		stroke->points_size *= 2;
-		stroke->points = rfx_realloc(stroke->points, sizeof(point_t)*stroke->points_size);
-	    }
-	    stroke->points[stroke->num_points++] = b;
-        }
-    } else {
+	    assert(s->pos.y != p.y);
+	    append_stroke(status, s->pos, p, dir, s->fs_out);
+	} else {
 #ifdef DEBUG
-        fprintf(stderr, "[%d] receives next point (%d,%d) (omitting)\n", s->nr, p.x, p.y);
+	    fprintf(stderr, "[%d] receives next point (%.2f,%.2f) (omitting)\n", s->nr, 
+		    p.x * status->gridsize, 
+		    p.y * status->gridsize);
 #endif
+	}
+    } else {
+	/* horizontal line. we need to look at this more closely at the end of this
+	   scanline */
+	store_horizontal(status, s->pos, p, s->fs, s->dir, s->polygon_nr);
     }
+
     s->pos = p;
 }
 
@@ -864,6 +1013,9 @@ static void add_points_to_ending_segments(status_t*status, int32_t y)
                 start = status->xrow->num-1;
                 end = dir = -1;
             }
+#ifdef CHECKS
+	    char ok = 0;
+#endif
             for(t=start;t!=end;t+=dir) {
                 box_t box = box_new(status->xrow->x[t], y);
                 double d0 = LINE_EQ(box.left1, seg);
@@ -873,14 +1025,17 @@ static void add_points_to_ending_segments(status_t*status, int32_t y)
                 if(!(d0>=0 && d1>=0 && d2>=0 && d3>0 ||
                      d0<=0 && d1<=0 && d2<=0 && d3<0)) {
                     insert_point_into_segment(status, seg, box.right2);
-                    break;
+                    //break;
+#ifdef CHECKS
+		    ok = 1;
+#endif
                 }
             }
 
 #ifdef CHECKS
             /* we *need* to find a point to insert. the segment's own end point
                is in that list, for Pete's sake. */
-            assert(t!=end);
+            assert(ok);
 #endif
         }
         // now that this is done, too, we can also finally free this segment
@@ -913,7 +1068,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
     s = range->segmin;
 #endif
 #ifdef CHECKS
-    /* test sanity: check that we don't have changed segments
+    /* test sanity: verify that we don't have changed segments
        outside of the given range */
     s = actlist_leftmost(status->actlist);
     while(s && s!=range->segmin) {
@@ -926,7 +1081,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
         s = s->left;
     }
     /* in check mode, go through the whole interval so we can test
-       that all polygons where the fillstyle changed also have seg->changed=1 */
+       that all polygons where the edgestyle changed also have seg->changed=1 */
     s = actlist_leftmost(status->actlist);
     end = 0;
 #endif
@@ -941,7 +1096,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
             segment_t* left = actlist_left(status->actlist, s);
             windstate_t wind = left?left->wind:status->windrule->start(status->context);
             s->wind = status->windrule->add(status->context, wind, s->fs, s->dir, s->polygon_nr);
-            fillstyle_t*fs_old = s->fs_out;
+            edgestyle_t*fs_old = s->fs_out;
             s->fs_out = status->windrule->diff(&wind, &s->wind);
 
 #ifdef DEBUG
@@ -967,9 +1122,9 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
     segment_t* left = actlist_find(status->actlist, h->a, h->a);
     segment_t* right = actlist_find(status->actlist, h->b, h->b);
 
-    /* not strictly necessary, also done by the event */
+    /* h->a.x is not strictly necessary, as it's also done by the event */
     xrow_add(status->xrow, h->a.x);
-    point_t o = h->a;
+    xrow_add(status->xrow, h->b.x);
 
     if(!right) {
         assert(!left);
@@ -980,14 +1135,17 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
     right = right->right; //first seg to the right of h->b
     segment_t* s = left;
 
+    point_t o = h->a;
     while(s!=right) {
         assert(s);
         int32_t x = XPOS_INT(s, status->y);
+	point_t p = {x, status->y};
 #ifdef DEBUG
-        fprintf(stderr, "...into [%d] (%d,%d) -> (%d,%d) at (%d,%d)\n", s->nr,
-                s->a.x, s->a.y,
-                s->b.x, s->b.y,
-                x, status->y
+        fprintf(stderr, "...intersecting with [%d] (%.2f,%.2f) -> (%.2f,%.2f) at (%.2f,%.2f)\n", 
+		s->nr,
+                s->a.x * status->gridsize, s->a.y * status->gridsize,
+                s->b.x * status->gridsize, s->b.y * status->gridsize,
+                x * status->gridsize, status->y * status->gridsize
                 );
 #endif
         assert(x >= h->a.x);
@@ -996,29 +1154,263 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
         assert(s->delta.x > 0 && x <= s->b.x || s->delta.x <= 0 && x >= s->b.x);
         xrow_add(status->xrow, x);
 
+	o = p;
         s = s->right;
     }
 }
 
+/* while, for a scanline, we need both starting as well as ending segments in order
+   to *reconstruct* horizontal lines, we only need one or the other to *process*
+   horizontal lines from the input data.
+
+   So horizontal lines are processed twice: first they create hotpixels by intersecting
+   all segments on the scanline (EVENT_HORIZTONAL). Secondly, they are processed for
+   their actual content. The second also happens for all segments that received more than
+   one point in this scanline.
+*/
+void horiz_reset(horizdata_t*horiz)
+{
+    horiz->num = 0;
+}
+
+void horiz_destroy(horizdata_t*horiz)
+{
+    if(horiz->data) rfx_free(horiz->data);
+    horiz->data = 0;
+}
+
+static windstate_t get_horizontal_first_windstate(status_t*status, int x1, int x2)
+{
+    point_t p1 = {x1,status->y};
+    point_t p2 = {x2,status->y};
+    segment_t*left = actlist_find(status->actlist, p1, p2);
+
+    segment_t*a = actlist_right(status->actlist, left);
+    while(a) {
+	if(a->pos.y == status->y) {
+	    /* we need to iterate through all segments that received a point in this
+	       scanline, as actlist_find above will miss (positively sloped) segments 
+	       that are to the right of (x1,y) only as long as we don't take the 
+	       hotpixel re-routing into account 
+               TODO: this is inefficient, we should probably be iterating through the
+	       hotpixels on this scanline.
+	     */
+	    if(a->pos.x == x1)
+		left = a;
+	    if(a->pos.x > x1)
+		break;
+	}
+	a = a->right;
+    }
+
+    assert(!left || left->fs_out_ok);
+#ifdef DEBUG
+    fprintf(stderr, "  fragment %.2f..%.2f\n", 
+	    x1 * status->gridsize,
+	    x2 * status->gridsize);
+    if(left) {
+	fprintf(stderr, "    segment [%d] (%.2f,%.2f -> %.2f,%2f, at %.2f,%.2f) is to the left\n", 
+		SEGNR(left), 
+		left->a.x * status->gridsize,
+		left->a.y * status->gridsize,
+		left->b.x * status->gridsize,
+		left->b.y * status->gridsize,
+		left->pos.x * status->gridsize,
+		left->pos.y * status->gridsize
+		);
+	/* this segment might be a distance away from the left point
+	   of the horizontal line if the horizontal line belongs to a stroke
+	   with segments that just ended (so this horizontal line appears to
+	   be "floating in space" from our current point of view)
+	assert(left->pos.y == h->y && left->pos.x == h->x1);
+	*/
+    }
+#endif
+    return left?left->wind:status->windrule->start(status->context);
+}
+
+static windstate_t process_horizontal_fragment(status_t*status, horizontal_t*h, int x1, int x2, windstate_t below)
+{
+    windstate_t above = status->windrule->add(status->context, below, h->fs, h->dir, h->polygon_nr);
+    edgestyle_t*fs = status->windrule->diff(&above, &below);
+	
+    segment_dir_t dir = above.is_filled?DIR_DOWN:DIR_UP;
+    point_t p1 = {x1,h->y};
+    point_t p2 = {x2,h->y};
+
+    if(fs) {
+	//append_stroke(status, p1, p2, DIR_INVERT(h->dir), fs);
+	append_stroke(status, p1, p2, dir, fs);
+    }
+#ifdef DEBUG
+    fprintf(stderr, "    ...%s (below: (wind_nr=%d, filled=%d), above: (wind_nr=%d, filled=%d) %s %d-%d\n",
+	    fs?"storing":"ignoring",
+	    below.wind_nr, below.is_filled,
+	    above.wind_nr, above.is_filled, 
+	    dir==DIR_UP?"up":"down", x1, x2);
+#endif
+    return above;
+}
+
+typedef enum {hevent_hotpixel,hevent_end,hevent_start} horizontal_event_type_t;
+typedef struct _hevent {
+    int32_t x;
+    horizontal_t*h;
+    horizontal_event_type_t type;
+} hevent_t;
+
+typedef struct _hevents {
+    hevent_t*events;
+    int num;
+} hevents_t;
+
+static int compare_hevents(const void *_e1, const void *_e2)
+{
+    hevent_t*e1 = (hevent_t*)_e1;
+    hevent_t*e2 = (hevent_t*)_e2;
+    int diff = e1->x - e2->x;
+    if(diff) return diff;
+    return e1->type - e2->type; //schedule hotpixel before hend
+}
+
+static hevents_t hevents_fill(status_t*status)
+{
+    horizdata_t*horiz = &status->horiz;
+    xrow_t*xrow = status->xrow;
+
+    hevents_t e;
+    e.events = malloc(sizeof(hevent_t)*(horiz->num*2 + xrow->num));
+    e.num = 0;
+
+    int t;
+    for(t=0;t<horiz->num;t++) {
+	assert(horiz->data[t].x1 != horiz->data[t].x2);
+	e.events[e.num].x = horiz->data[t].x1;
+	e.events[e.num].h = &horiz->data[t];
+	e.events[e.num].type = hevent_start;
+	e.num++;
+	e.events[e.num].x = horiz->data[t].x2;
+	e.events[e.num].h = &horiz->data[t];
+	e.events[e.num].type = hevent_end;
+	e.num++;
+    }
+    for(t=0;t<xrow->num;t++) {
+	e.events[e.num].x = status->xrow->x[t];
+	e.events[e.num].h = 0;
+	e.events[e.num].type = hevent_hotpixel;
+	e.num++;
+    }
+    qsort(e.events, e.num, sizeof(hevent_t), compare_hevents);
+    return e;
+
+}
+
+static void process_horizontals(status_t*status)
+{
+    horizdata_t*horiz = &status->horiz;
+
+    if(!horiz->num)
+	return;
+
+    hevents_t events = hevents_fill(status);
+    int num_open = 0;
+    horizontal_t**open = malloc(sizeof(horizontal_t*)*horiz->num);
+
+    int s,t;
+    for(t=0;t<events.num;t++) {
+	hevent_t*e = &events.events[t];
+	switch(e->type) {
+	    case hevent_start:
+		e->h->pos = num_open;
+		open[num_open++] = e->h;
+#ifdef DEBUG
+		fprintf(stderr, "horizontal (y=%.2f): %.2f -> %.2f dir=%s fs=%p\n", 
+			e->h->y * status->gridsize,
+			e->h->x1 * status->gridsize,
+			e->h->x2 * status->gridsize,
+			e->h->dir==DIR_UP?"up":"down", e->h->fs);
+#endif
+		assert(e->h->y == status->y);
+		assert(xrow_contains(status->xrow, e->h->x1));
+		assert(xrow_contains(status->xrow, e->h->x2));
+	    break;
+	    case hevent_end:
+		num_open--;
+		if(num_open) {
+		    open[num_open]->pos = e->h->pos;
+		    open[e->h->pos] = open[num_open];
+		}
+	    break;
+	    case hevent_hotpixel:
+	        {
+		    windstate_t	below;
+		    for(s=0;s<num_open;s++) {
+			int x1 = open[s]->xpos;
+			int x2 = e->x;
+			assert(status->y == open[s]->y);
+			if(!s)
+			    below = get_horizontal_first_windstate(status, x1, x2);
+			open[s]->xpos = e->x;
+			assert(x1 < x2);
+			below = process_horizontal_fragment(status, open[s], x1, x2, below);
+		    }
+		}
+	    break;
+	}
+    }
+    free(open);
+    free(events.events);
+}
+
+static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)
+{
+    assert(p1.y == p2.y);
+    assert(p1.x != p2.x); // TODO: can this happen?
+
+    if(p1.x > p2.x) {
+	dir = DIR_INVERT(dir);
+	point_t p_1 = p1;
+	point_t p_2 = p2;
+	p1 = p_2;
+	p2 = p_1;
+    }
+
+    /* TODO: convert this into a linked list */
+    if(status->horiz.size == status->horiz.num) {
+	if(!status->horiz.size)
+	    status->horiz.size = 16;
+	status->horiz.size *= 2;
+	status->horiz.data = rfx_realloc(status->horiz.data, sizeof(status->horiz.data[0])*status->horiz.size);
+    }
+    horizontal_t*h = &status->horiz.data[status->horiz.num++];
+    h->y = p1.y;
+    h->xpos = p1.x;
+    h->x1 = p1.x;
+    h->x2 = p2.x;
+    h->fs = fs;
+    h->dir = dir;
+    h->polygon_nr = polygon_nr;
+}
+
+
 static void event_apply(status_t*status, event_t*e)
 {
+#ifdef DEBUG
+    event_dump(status, e);
+#endif
+
     switch(e->type) {
         case EVENT_HORIZONTAL: {
             segment_t*s = e->s1;
-#ifdef DEBUG
-            event_dump(e);
-#endif
             intersect_with_horizontal(status, s);
-	    advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos);
+	    store_horizontal(status, s->a, s->b, s->fs, s->dir, s->polygon_nr);
+	    advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);
             segment_destroy(s);e->s1=0;
             break;
         }
         case EVENT_END: {
             //delete segment from list
             segment_t*s = e->s1;
-#ifdef DEBUG
-            event_dump(e);
-#endif
 #ifdef CHECKS
             dict_del(status->intersecting_segs, s);
             dict_del(status->segs_with_point, s);
@@ -1034,14 +1426,11 @@ static void event_apply(status_t*status, event_t*e)
 	    /* schedule segment for xrow handling */
             s->left = 0; s->right = status->ending_segments;
             status->ending_segments = s;
-	    advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos);
+	    advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);
             break;
         }
         case EVENT_START: {
             //insert segment into list
-#ifdef DEBUG
-            event_dump(e);
-#endif
             segment_t*s = e->s1;
 	    assert(e->p.x == s->a.x && e->p.y == s->a.y);
             actlist_insert(status->actlist, s->a, s->b, s);
@@ -1056,9 +1445,6 @@ static void event_apply(status_t*status, event_t*e)
         }
         case EVENT_CROSS: {
             // exchange two segments
-#ifdef DEBUG
-            event_dump(e);
-#endif
             if(e->s1->right == e->s2) {
 		assert(e->s2->left == e->s1);
                 exchange_two(status, e);
@@ -1096,7 +1482,7 @@ static void check_status(status_t*status)
             s->pos.y != s->b.y) &&
            !dict_contains(status->segs_with_point, s)) {
             fprintf(stderr, "Error: segment [%d] (%sslope) intersects in scanline %d, but it didn't receive a point\n",
-                    s->nr,
+                    SEGNR(s),
                     s->delta.x<0?"-":"+",
                     status->y);
             assert(0);
@@ -1105,130 +1491,14 @@ static void check_status(status_t*status)
 }
 #endif
 
-static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context)
-{
-    /*
-          |..|        |...........|                 |           |
-          |..|        |...........|                 |           |
-          |..+        +        +..|                 +--+     +--+
-          |...........|        |..|                    |     |
-          |...........|        |..|                    |     |
-     */
-
-#ifdef DEBUG
-    fprintf(stderr, "========================================================================\n");
-#endif
-    hqueue_t hqueue;
-    hqueue_init(&hqueue);
-    gfxpoly_enqueue(poly, 0, &hqueue, 0);
-
-    actlist_t* actlist = actlist_new();
-	
-    event_t*e = hqueue_get(&hqueue);
-    while(e) {
-        int32_t y = e->p.y;
-        int32_t x = 0;
-        char fill = 0;
-#ifdef DEBUG
-        fprintf(stderr, "HORIZONTALS ----------------------------------- %d\n", y);
-        actlist_dump(actlist, y-1);
-#endif
-#ifdef CHECKS
-        actlist_verify(actlist, y-1);
-#endif
-        do {
-            if(fill && x != e->p.x) {
-#ifdef DEBUG
-                fprintf(stderr, "%d) draw horizontal line from %d to %d\n", y, x, e->p.x);
-#endif
-		assert(x<e->p.x);
-
-                gfxpolystroke_t*stroke = rfx_calloc(sizeof(gfxpolystroke_t));
-		stroke->next = poly->strokes;
-		poly->strokes = stroke;
-
-		stroke->num_points = 2;
-		stroke->points = malloc(sizeof(point_t)*2);
-		stroke->dir = DIR_UP; // FIXME
-		stroke->fs = 0;
-		point_t a,b;
-                a.y = b.y = y;
-		/* we draw from low x to high x so that left/right fillstyles add up
-                   (because the horizontal line's fill style controls the area *below* the line)
-		 */
-                a.x = e->p.x;
-                b.x = x;
-		stroke->points[0] = a;
-		stroke->points[1] = b;
-#ifdef CHECKS
-		/* the output should always be intersection free polygons, so check this horizontal
-		   line isn't hacking through any segments in the active list */
-		segment_t* start = actlist_find(actlist, b, b);
-		segment_t* s = actlist_find(actlist, a, a);
-		while(s!=start) {
-		    assert(s->a.y == y || s->b.y == y);
-		    s = s->left;
-		}
-#endif
-            }
-            segment_t*left = 0;
-            segment_t*s = e->s1;
-    
-            switch(e->type) {
-                case EVENT_START: {
-		    assert(e->p.x == s->a.x && e->p.y == s->a.y);
-                    actlist_insert(actlist, s->a, s->b, s);
-                    event_t* e = event_new();
-                    e->type = EVENT_END;
-                    e->p = s->b;
-                    e->s1 = s;
-                    e->s2 = 0;
-                    hqueue_put(&hqueue, e);
-                    left = actlist_left(actlist, s);
-                    break;
-                }
-                case EVENT_END: {
-                    left = actlist_left(actlist, s);
-                    actlist_delete(actlist, s);
-		    advance_stroke(0, &hqueue, s->stroke, s->polygon_nr, s->stroke_pos);
-                    break;
-                }
-                default: assert(0);
-            }
-
-            x = e->p.x;
-            fill ^= 1;//(before.is_filled != after.is_filled);
-#ifdef DEBUG
-            fprintf(stderr, "%d) event=%s[%d] left:[%d] x:%d\n",
-                    y, e->type==EVENT_START?"start":"end",
-                    s->nr,
-                    left?left->nr:-1,
-                    x);
-#endif
-
-            if(e->type == EVENT_END)
-                segment_destroy(s);
-
-	    event_free(e);
-            e = hqueue_get(&hqueue);
-        } while(e && y == e->p.y);
-
-#ifdef CHECKS
-	char bleeding = fill;
-        assert(!bleeding);
-#endif
-    }
-
-    actlist_destroy(actlist);
-    hqueue_destroy(&hqueue);
-}
-
 gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context)
 {
     current_polygon = poly1;
 
     status_t status;
     memset(&status, 0, sizeof(status_t));
+    status.gridsize = poly1->gridsize;
+    
     queue_init(&status.queue);
     gfxpoly_enqueue(poly1, &status.queue, 0, /*polygon nr*/0);
     if(poly2) {
@@ -1249,6 +1519,7 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
 
     event_t*e = queue_get(&status.queue);
     while(e) {
+	assert(e->s1->fs);
         status.y = e->p.y;
 #ifdef CHECKS
 	assert(status.y>=lasty);
@@ -1258,13 +1529,15 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
 #endif
 
 #ifdef DEBUG
-        fprintf(stderr, "----------------------------------- %d\n", status.y);
-        actlist_dump(status.actlist, status.y-1);
+        fprintf(stderr, "----------------------------------- %.2f\n", status.y * status.gridsize);
+        actlist_dump(status.actlist, status.y-1, status.gridsize);
 #endif
 #ifdef CHECKS
         actlist_verify(status.actlist, status.y-1);
 #endif
         xrow_reset(status.xrow);
+	horiz_reset(&status.horiz);
+
         do {
             xrow_add(status.xrow, e->p.x);
             event_apply(&status, e);
@@ -1276,13 +1549,17 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
         segrange_t range;
         memset(&range, 0, sizeof(range));
 #ifdef DEBUG
-        actlist_dump(status.actlist, status.y);
+        actlist_dump(status.actlist, status.y, status.gridsize);
+	xrow_dump(status.xrow, status.gridsize);
 #endif
         add_points_to_positively_sloped_segments(&status, status.y, &range);
         add_points_to_negatively_sloped_segments(&status, status.y, &range);
         add_points_to_ending_segments(&status, status.y);
 
         recalculate_windings(&status, &range);
+        
+	actlist_verify(status.actlist, status.y);
+	process_horizontals(&status);
 #ifdef CHECKS
         check_status(&status);
         dict_destroy(status.intersecting_segs);
@@ -1294,13 +1571,22 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
 #endif
     actlist_destroy(status.actlist);
     queue_destroy(&status.queue);
+    horiz_destroy(&status.horiz);
     xrow_destroy(status.xrow);
 
     gfxpoly_t*p = (gfxpoly_t*)malloc(sizeof(gfxpoly_t));
     p->gridsize = poly1->gridsize;
     p->strokes = status.strokes;
 
-    add_horizontals(p, &windrule_evenodd, context); // output is always even/odd
+#ifdef CHECKS
+    /* we only add segments with non-empty edgestyles to strokes in
+       recalculate_windings, but better safe than sorry */
+    gfxpolystroke_t*stroke = p->strokes;
+    while(stroke) {
+	assert(stroke->fs);
+	stroke = stroke->next;
+    }
+#endif
     return p;
 }
 
diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index 3129ee2..0017f8e 100644
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "../q.h"
 #include "../types.h"
+#include "wind.h"
 
 /* features */
 #define SPLAY
 #define DONT_REMEMBER_CROSSINGS
 
-typedef enum {DIR_UP, DIR_DOWN, DIR_UNKNOWN} segment_dir_t;
 typedef enum {EVENT_CROSS, EVENT_END, EVENT_START, EVENT_HORIZONTAL} eventtype_t;
 typedef enum {SLOPE_POSITIVE, SLOPE_NEGATIVE} slope_t;
 
@@ -20,37 +20,14 @@ typedef struct _point {
 } point_t;
 type_t point_type;
 
-typedef struct _fillstyle {
-    void*internal;
-} fillstyle_t;
-
-typedef struct _windstate
-{
-    char is_filled;
-    int wind_nr;
-} windstate_t;
-
-/* TODO: maybe we should merge windcontext and windrule */
-typedef struct _windcontext
-{
-    int num_polygons;
-} windcontext_t;
-
-typedef struct _windrule
-{
-    windstate_t (*start)(windcontext_t* num_polygons);
-    windstate_t (*add)(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int polygon_nr);
-    fillstyle_t* (*diff)(windstate_t*left, windstate_t*right);
-} windrule_t;
-
-#define SEGNR(s) ((s)?(s)->nr:-1)
+#define SEGNR(s) ((int)((s)?(s)->nr:-1))
 
 typedef struct _gfxpolystroke {
     segment_dir_t dir;
+    edgestyle_t*fs;
     int points_size;
     int num_points;
     point_t*points;
-    fillstyle_t*fs;
     struct _gfxpolystroke*next;
 } gfxpolystroke_t;
 typedef struct _gfxpoly {
@@ -66,8 +43,8 @@ typedef struct _segment {
     int32_t minx, maxx;
     
     segment_dir_t dir;
-    fillstyle_t*fs;
-    fillstyle_t*fs_out;
+    edgestyle_t*fs;
+    edgestyle_t*fs_out;
 #ifdef CHECKS
     char fs_out_ok;
 #endif
@@ -113,11 +90,12 @@ typedef struct _segment {
 
 void gfxpoly_fail(char*expr, char*file, int line, const char*function);
 
-char gfxpoly_check(gfxpoly_t*poly);
+char gfxpoly_check(gfxpoly_t*poly, char updown);
 int gfxpoly_num_segments(gfxpoly_t*poly);
 int gfxpoly_size(gfxpoly_t*poly);
 void gfxpoly_dump(gfxpoly_t*poly);
 void gfxpoly_save(gfxpoly_t*poly, const char*filename);
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename);
 gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context);
 
 gfxpoly_t* gfxpoly_intersect(gfxpoly_t*p1, gfxpoly_t*p2);
diff --git a/lib/gfxpoly/renderpoly.c b/lib/gfxpoly/renderpoly.c
index 240859d..989dfc8 100644
--- a/lib/gfxpoly/renderpoly.c
+++ b/lib/gfxpoly/renderpoly.c
@@ -7,7 +7,7 @@ typedef struct _renderpoint
 {
     double x;
     segment_dir_t dir;
-    fillstyle_t*fs;
+    edgestyle_t*fs;
     int polygon_nr;
 } renderpoint_t;
 
@@ -27,7 +27,7 @@ typedef struct _renderbuf
     renderline_t*lines;
 } renderbuf_t;
 
-static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir, fillstyle_t*fs, int polygon_nr)
+static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir, edgestyle_t*fs, int polygon_nr)
 {
     renderpoint_t p;
     p.x = x;
@@ -48,7 +48,7 @@ static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir
     l->num++;
 }
 #define CUT 0.5
-static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2, fillstyle_t*fs, int polygon_nr)
+static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)
 {
     x1 *= buf->zoom;
     y1 *= buf->zoom;
@@ -56,13 +56,14 @@ static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2
     y2 *= buf->zoom;
     double diffx, diffy;
     double ny1, ny2, stepx;
-    segment_dir_t dir = DIR_DOWN;
+
     if(y2 < y1) {
-        dir = DIR_UP;
+        dir ^= DIR_UP^DIR_DOWN;
         double x,y;
 	x = x1;x1 = x2;x2=x;
 	y = y1;y1 = y2;y2=y;
     }
+
     diffx = x2 - x1;
     diffy = y2 - y1;
     ny1 = floor(y1)+CUT;
@@ -86,6 +87,8 @@ static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2
     double posx=0;
     double startx = x1;
 
+    //printf("line %d from %f to %f dir=%s\n", polygon_nr, y1, y2, dir==DIR_UP?"up":"down");
+
     while(posy<=endy) {
         double xx = startx + posx;
         add_pixel(buf, xx, posy, dir, fs, polygon_nr);
@@ -145,7 +148,7 @@ unsigned char* render_polygon(gfxpoly_t*polygon, intbbox_t*bbox, double zoom, wi
 	for(t=0;t<stroke->num_points-1;t++) {
 	    point_t a = stroke->points[t];
 	    point_t b = stroke->points[t+1];
-	    add_line(buf, a.x, a.y, b.x, b.y, stroke->fs, polygon_nr);
+	    add_line(buf, a.x, a.y, b.x, b.y, stroke->fs, stroke->dir, polygon_nr);
 	}
     }
 
@@ -175,10 +178,12 @@ unsigned char* render_polygon(gfxpoly_t*polygon, intbbox_t*bbox, double zoom, wi
         }
         if(fill.is_filled && lastx!=buf->width) {
             /* we're bleeding, fill over padding, too. */
-            fprintf(stderr, "Polygon %08x is bleeding in line %d\n", (int)polygon, y);
+            fprintf(stderr, "Polygon %p is bleeding in line %d\n", polygon, y);
             fill_bitwise(line, lastx, width8*8);
 	    assert(line[width8-1]&0x01);
 	    bleeding = 1;
+	    exit(1);
+
         }
     }
     
diff --git a/lib/gfxpoly/stroke.c b/lib/gfxpoly/stroke.c
index 9735c1b..b9ccb10 100644
--- a/lib/gfxpoly/stroke.c
+++ b/lib/gfxpoly/stroke.c
@@ -225,7 +225,7 @@ gfxpoly_t* gfxpoly_from_stroke(gfxline_t*line, gfxcoord_t width, gfx_capType cap
     gfxdrawer_target_poly(&d, gridsize);
     draw_stroke(line, &d, width, cap_style, joint_style, miterLimit);
     gfxpoly_t*poly = (gfxpoly_t*)d.result(&d);
-    assert(gfxpoly_check(poly));
+    assert(gfxpoly_check(poly, 1));
     gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_circular, &onepolygon);
     gfxpoly_destroy(poly);
     return poly2;
diff --git a/lib/gfxpoly/test.c b/lib/gfxpoly/test.c
index b5c192a..2869470 100644
--- a/lib/gfxpoly/test.c
+++ b/lib/gfxpoly/test.c
@@ -166,6 +166,29 @@ int test_speed()
     gfxline_free(b);
 }
 
+int testbox(int argn, char*argv[])
+{
+    gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
+    gfxline_t*box2 = gfxline_makerectangle(-50,-50,150,150);
+    gfxpoly_t*poly1 = gfxpoly_from_fill(box1, 0.05);
+    gfxpoly_t*poly2 = gfxpoly_from_fill(box2, 0.05);
+    gfxline_free(box1);
+    gfxline_free(box2);
+    
+    gfxpoly_t*poly12 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
+    gfxpoly_dump(poly12);
+    assert(gfxpoly_check(poly12, 0));
+    gfxpoly_destroy(poly12);
+}
+
+int teststroke(int argn, char*argv[])
+{
+    //gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
+    gfxline_t*box1 = gfxline_makerectangle(100,100,200,200);
+    gfxpoly_t*poly = gfxpoly_from_stroke(box1, 10.0, gfx_capRound, gfx_joinMiter, 1000, 0.05);
+    assert(gfxpoly_check(poly, 1));
+}
+
 int test0(int argn, char*argv[])
 {
     gfxline_t*box1 = gfxline_makerectangle(-100,-100,100,100);
@@ -173,14 +196,12 @@ int test0(int argn, char*argv[])
     gfxline_t*box3 = gfxline_makerectangle(-100,-100,100,100);
     //gfxline_append(box2, box3);
 
-    gfxpoly_check(gfxpoly_from_stroke(box1, 2.0, gfx_capRound, gfx_joinRound, 0, 0.05));
-
     gfxmatrix_t matrix;
     memset(&matrix, 0, sizeof(gfxmatrix_t));
     double ua=M_PI/4;
     matrix.m00=cos(ua);matrix.m10=sin(ua);
     matrix.m01=-sin(ua);matrix.m11=cos(ua);
-    //gfxline_transform(box1, &matrix);
+    gfxline_transform(box1, &matrix);
     
     //gfxline_t*b = 0;
     //b = gfxline_append(b, box1);
@@ -192,9 +213,13 @@ int test0(int argn, char*argv[])
     
     gfxline_free(box1);
     gfxline_free(box2);
+    
+    //gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
     gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
     gfxpoly_dump(poly3);
+    
     gfxline_t*line = gfxline_from_gfxpoly(poly3);
+
     gfxline_dump(line, stdout, "");
     gfxline_free(line);
     gfxpoly_destroy(poly1);
@@ -207,22 +232,28 @@ int test1(int argn, char*argv[])
 {
     gfxline_t*box1 = gfxline_makerectangle(50,50,150,150);
     gfxline_t*box2 = gfxline_makerectangle(100,100,200,200);
-    gfxline_t*box3 = gfxline_makerectangle(100,100,200,200);
+    gfxline_t*box3 = gfxline_makerectangle(200,100,300,200);
+    gfxline_t*box4 = gfxline_makerectangle(300,200,400,400);
+    gfxline_t* board = mkchessboard();
     gfxline_t*star = mkstar(50,50, 150,150);
     gfxline_t*b = 0;
     b = gfxline_append(b, box1);
     b = gfxline_append(b, box2);
     b = gfxline_append(b, box3);
+    b = gfxline_append(b, box4);
 
     gfxmatrix_t matrix;
     memset(&matrix, 0, sizeof(gfxmatrix_t));
-    double ua=0.1;
-    matrix.m00=cos(ua);matrix.m10=sin(ua);
-    matrix.m01=-sin(ua);matrix.m11=cos(ua);
+    matrix.m00 = 1.0;
+    matrix.m11 = 1.0;
+    matrix.tx = 200;
+    matrix.ty = 200;
+    gfxline_transform(board, &matrix);
+    b = gfxline_append(b, board);
 
     //gfxline_transform(b, &matrix);
 
-    gfxline_dump(b, stderr, "");
+    //gfxline_dump(b, stderr, "");
     gfxpoly_t*poly = gfxpoly_from_fill(b, 0.05);
     
     gfxline_free(box1);
@@ -230,8 +261,10 @@ int test1(int argn, char*argv[])
     gfxline_free(box3);
     gfxline_free(star);
 
-    gfxpoly_dump(poly);
+    //gfxpoly_dump(poly);
     gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_evenodd, &onepolygon);
+    //gfxpoly_dump(poly2);
+    gfxpoly_save_arrows(poly2, "test.ps");
     gfxpoly_destroy(poly);
     gfxpoly_destroy(poly2);
 }
@@ -294,8 +327,8 @@ void test3(int argn, char*argv[])
 
     //gfxline_t*line = mkrandomshape(RANGE, N);
     //windrule_t*rule = &windrule_circular;
-    //gfxline_t*line = mkchessboard();
-    gfxline_t*line = make_circles(30);
+    gfxline_t*line = mkchessboard();
+    //gfxline_t*line = make_circles(30);
     windrule_t*rule = &windrule_evenodd;
     //windrule_t*rule = &windrule_circular;
 
@@ -329,6 +362,7 @@ void test3(int argn, char*argv[])
         gfxpoly_t*poly1 = gfxpoly_from_fill(l, 0.05);
 
         gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
+	assert(gfxpoly_check(poly2, 0));
 
         tag = swf_InsertTag(tag, ST_DEFINESHAPE);
         SHAPE* s;
@@ -439,18 +473,20 @@ void test4(int argn, char*argv[])
 
         double zoom = 1.0;
 
-        if(!gfxpoly_check(poly1)) {
+        if(!gfxpoly_check(poly1, 0)) {
             printf("bad polygon\n");
-            continue;
+	    goto end_of_loop;
         }
 
         gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
+	gfxpoly_dump(poly2);
+	assert(gfxpoly_check(poly2, 1));
 
 	int pass;
 	for(pass=0;pass<2;pass++) {
 	    intbbox_t bbox = intbbox_from_polygon(poly1, zoom);
 	    unsigned char*bitmap1 = render_polygon(poly1, &bbox, zoom, rule, &onepolygon);
-	    unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_evenodd, &onepolygon);
+	    unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_circular, &onepolygon);
 	    if(!bitmap_ok(&bbox, bitmap1) || !bitmap_ok(&bbox, bitmap2)) {
 		save_two_bitmaps(&bbox, bitmap1, bitmap2, "error.png");
 		assert(!"error in bitmaps");
@@ -461,7 +497,7 @@ void test4(int argn, char*argv[])
 	    }
 	    free(bitmap1);
 	    free(bitmap2);
-	    
+
 	    // second pass renders the 90° rotated version
 	    rotate90(poly1);
 	    rotate90(poly2);
@@ -469,6 +505,8 @@ void test4(int argn, char*argv[])
 
         gfxpoly_destroy(poly1);
         gfxpoly_destroy(poly2);
+	
+	end_of_loop:
         if(argn==2) 
             break;
     }
@@ -507,7 +545,7 @@ void extract_polygons_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
 	fprintf(stderr, "%d segments (max so far: %d/%d)\n", size, max_segments, max_any_segments);
     }
 
-    if(!gfxpoly_check(poly1)) {
+    if(!gfxpoly_check(poly1, 0)) {
         gfxpoly_destroy(poly1);
         fprintf(stderr, "bad polygon\n");
         return;
@@ -594,6 +632,7 @@ finish: 0,
 internal: 0
 };
 
+#if 0
 void test5(int argn, char*argv[])
 {
     gfxsource_t*driver = gfxsource_pdf_create();
@@ -629,6 +668,7 @@ void test5(int argn, char*argv[])
     closedir(_dir);
     driver->destroy(driver);
 }
+#endif
 
 int main(int argn, char*argv[])
 {
diff --git a/lib/gfxpoly/test_stroke.c b/lib/gfxpoly/test_stroke.c
index 0e292cd..06ae2b6 100644
--- a/lib/gfxpoly/test_stroke.c
+++ b/lib/gfxpoly/test_stroke.c
@@ -77,7 +77,7 @@ int test_stroke1()
 
 	//gfxpoly_t*p = gfxpoly_fromstroke(l, width, gfx_capRound, gfx_joinRound, 500);
 	gfxpoly_t*p1 = gfxpoly_from_stroke(l, width, gfx_capRound, gfx_joinRound, 500, 0.05);
-	assert(gfxpoly_check(p1));
+	assert(gfxpoly_check(p1, 1));
 	
 	//gfxpoly_t*p2 = gfxpoly_from_fill(f, 0.05);
 	gfxline_t*l2 = gfxline_clone(l);
@@ -92,10 +92,10 @@ int test_stroke1()
 	                  s, -c,  -(350+x1)*s+(350+y1)*c+350};
 	gfxline_transform(l2, &m);
 	gfxpoly_t*p2 = gfxpoly_from_stroke(l2, width, gfx_capRound, gfx_joinRound, 500, 0.05);
-	assert(gfxpoly_check(p2));
+	assert(gfxpoly_check(p2, 1));
 
 	gfxpoly_t*p3 = gfxpoly_intersect(p1, p2);
-	assert(gfxpoly_check(p3));
+	assert(gfxpoly_check(p3, 1));
 	
 	//gfxpoly_t*p4 = gfxpoly_from_fill(f, 0.05);
 	//gfxpoly_t*p5 = gfxpoly_intersect(p1, p4);
diff --git a/lib/gfxpoly/wind.c b/lib/gfxpoly/wind.c
index db92905..30a21fd 100644
--- a/lib/gfxpoly/wind.c
+++ b/lib/gfxpoly/wind.c
@@ -1,6 +1,6 @@
-#include "wind.h"
+#include "poly.h"
 
-fillstyle_t fillstyle_default;
+edgestyle_t edgestyle_default;
 
 windstate_t windstate_nonfilled = {
     is_filled: 0,
@@ -13,17 +13,18 @@ windstate_t evenodd_start(windcontext_t*context)
 {
     return windstate_nonfilled;
 }
-windstate_t evenodd_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t evenodd_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
+    assert(edge);
     left.is_filled ^= 1;
     return left;
 }
-fillstyle_t* evenodd_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* evenodd_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_evenodd = {
@@ -39,24 +40,25 @@ windstate_t circular_start(windcontext_t*context)
     return windstate_nonfilled;
 }
 
-windstate_t circular_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t circular_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
+    assert(edge);
     /* which one is + and which one - doesn't actually make any difference */
     if(dir == DIR_DOWN)
-        left.wind_nr++;
+	left.wind_nr++;
     else
-        left.wind_nr--;
+	left.wind_nr--;
 
     left.is_filled = left.wind_nr != 0;
     return left;
 }
 
-fillstyle_t* circular_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* circular_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_circular = {
@@ -72,7 +74,7 @@ windstate_t intersect_start(windcontext_t*context)
     return windstate_nonfilled;
 }
 
-windstate_t intersect_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t intersect_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
     assert(master < context->num_polygons);
 
@@ -81,12 +83,12 @@ windstate_t intersect_add(windcontext_t*context, windstate_t left, fillstyle_t*e
     return left;
 }
 
-fillstyle_t* intersect_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* intersect_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_intersect = {
@@ -102,7 +104,7 @@ windstate_t union_start(windcontext_t*context)
     return windstate_nonfilled;
 }
 
-windstate_t union_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t union_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
     assert(master<sizeof(left.wind_nr)*8); //up to 32/64 polygons max
     left.wind_nr ^= 1<<master;
@@ -110,12 +112,12 @@ windstate_t union_add(windcontext_t*context, windstate_t left, fillstyle_t*edge,
     return left;
 }
 
-fillstyle_t* union_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* union_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_union = {
diff --git a/lib/gfxpoly/wind.h b/lib/gfxpoly/wind.h
index 1dae74e..a07ed64 100644
--- a/lib/gfxpoly/wind.h
+++ b/lib/gfxpoly/wind.h
@@ -1,7 +1,37 @@
 #ifndef __wind_h__
 #define __wind_h__
 
-#include "poly.h"
+/* Every segment has an original direction, which is the direction
+   the segment had in the input data.
+   as our scanline moves from minimum y to maximum y, "DOWN" means
+   the the (original) segment's y2 is larger than its y1 */
+typedef enum {DIR_UP, DIR_DOWN, DIR_UNKNOWN} segment_dir_t;
+
+#define DIR_INVERT(d) ((d)^(DIR_UP^DIR_DOWN))
+
+typedef struct _edgestyle {
+    void*internal;
+} edgestyle_t;
+
+extern edgestyle_t edgestyle_default;
+
+typedef struct _windstate
+{
+    char is_filled;
+    int wind_nr;
+} windstate_t;
+
+typedef struct _windcontext
+{
+    int num_polygons;
+} windcontext_t;
+
+typedef struct _windrule
+{
+    windstate_t (*start)(windcontext_t* num_polygons);
+    windstate_t (*add)(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int polygon_nr);
+    edgestyle_t* (*diff)(windstate_t*left, windstate_t*right);
+} windrule_t;
 
 extern windrule_t windrule_evenodd;
 extern windrule_t windrule_circular;
diff --git a/lib/gfxpoly/xrow.c b/lib/gfxpoly/xrow.c
index 29dad7a..7987ac1 100644
--- a/lib/gfxpoly/xrow.c
+++ b/lib/gfxpoly/xrow.c
@@ -3,6 +3,7 @@
 #include <memory.h>
 #include "../mem.h"
 #include "xrow.h"
+#include "poly.h"
 
 xrow_t* xrow_new()
 {
@@ -47,19 +48,46 @@ void xrow_sort(xrow_t*r)
     r->num = pos;
 }
 
+int xrow_find(xrow_t*r, int32_t x)
+{
+    int min, max, i, l;
+
+    for(min=0, max=r->num, i=r->num/2, l=r->num; i != l; l=i, i=(min+max)/2) {
+        if(x < r->x[i]) max=i;
+        else min=i;
+    }
+
+#ifdef CHECKS
+    int t;
+    for(t=0;t<r->num;t++) {
+	if(x < r->x[t]) 
+	    break;
+    }
+    assert(max == t);
+#endif
+
+    return max;
+}
+
+char xrow_contains(xrow_t*r, int32_t x)
+{
+    int pos = xrow_find(r,x) - 1;
+    return (pos>=0 && r->x[pos]==x);
+}
+
 void xrow_reset(xrow_t*r)
 {
     r->num = 0;
 }
 
-void xrow_dump(xrow_t*xrow)
+void xrow_dump(xrow_t*xrow, double gridsize)
 {
     fprintf(stderr, "x: ");
     int t;
     for(t=0;t<xrow->num;t++) {
         if(t)
             fprintf(stderr, ", ");
-        fprintf(stderr, "%d", xrow->x[t]);
+        fprintf(stderr, "%.2f", xrow->x[t] * gridsize);
     }
     fprintf(stderr, "\n");
 }
diff --git a/lib/gfxpoly/xrow.h b/lib/gfxpoly/xrow.h
index e172920..5de10d4 100644
--- a/lib/gfxpoly/xrow.h
+++ b/lib/gfxpoly/xrow.h
@@ -14,29 +14,11 @@ typedef struct _xrow {
 
 xrow_t* xrow_new();
 
-/* so the idea is this:
-   Before processing any events for a given y, store the list+tree of the current active
-   list (that might be useful anyway for adding xrow points to segments).
-   Then, for every starting segment and for every segment that receives a point, add a (x,segment)
-   tuple to a list which we later sort.
-   These segments will at that point have their *old* fill styles set.
-   Then, order that list, and also merge identical x values using left<->right comparisons on
-   the *old* active list, so that for every x coordinate we have the rightmost (old) segment. (For
-   small active lists, it might be faster to just mark the segments (and store the x in them), and
-   then walk the active list from left to right, collecting marked segments)
-   This list now gives us the information about what the fill areas look like above the scanline and to
-   the right of segments which received a point.
-   Now, apply fill style changes and resort the list, this time using the *new* active
-   list for merging identical x values. That gives us the information on what fill areas look like
-   *below* the scanline and to the right of segments which received a point.
-   Every time an "above" fillstyle differs from a "below" fillstyle, we need to draw a horizontal
-   line (from right to left, using the below fillstyle).
-*/
-
 void xrow_add(xrow_t*xrow, int32_t x);
-
 void xrow_sort(xrow_t*xrow);
-void xrow_dump(xrow_t*xrow);
+int xrow_find(xrow_t*r, int32_t x);
+char xrow_contains(xrow_t*xrow, int32_t x);
+void xrow_dump(xrow_t*xrow, double gridsize);
 void xrow_reset(xrow_t*xrow);
 void xrow_destroy(xrow_t*xrow);
 
diff --git a/wx/Makefile b/wx/Makefile
index 9a690d2..e5cde64 100644
--- a/wx/Makefile
+++ b/wx/Makefile
@@ -15,5 +15,6 @@ pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py
 	#ln -f gpdf2swf.exe ../win32_gui/
 	ln -f gpdf2swf.exe ../win32/
 	cp -R viewers/* ../win32/viewers/
+	rm -rf ../win32/viewers/flexpaper* # we're not distributing flexpaper
 
 .PHONY: exe
diff --git a/wx/gui/dialogs.py b/wx/gui/dialogs.py
index b5387c1..906afd4 100644
--- a/wx/gui/dialogs.py
+++ b/wx/gui/dialogs.py
@@ -113,7 +113,7 @@ class InfoDialog(wx.Dialog):
 class AboutDialog:
     def __init__(self, parent):
         appname = wx.GetApp().GetAppName()
-        version = u"0.9.0"
+        version = u"0.10.0"
         copyright = (u"Copyright (c) 2008,2009,2010\n"
                      u"Matthias Kramm <kramm@quiss.org>")
         description = u"A graphical user interface for pdf2swf"