1 files changed, 195 insertions, 160 deletions

diff --git a/source/fitz/trace-device.c b/source/fitz/trace-device.c
index 5ea716b4..59ea8ad8 100644
--- a/source/fitz/trace-device.c
+++ b/source/fitz/trace-device.c
@@ -1,73 +1,63 @@
 #include "mupdf/fitz.h"
 
+typedef struct fz_trace_device_s
+{
+	fz_device super;
+	fz_output *out;
+} fz_trace_device;
+
 static void
-fz_trace_matrix(const fz_matrix *ctm)
+fz_trace_matrix(fz_context *ctx, fz_output *out, const fz_matrix *ctm)
 {
-	printf(" matrix=\"%g %g %g %g %g %g\"",
+	fz_printf(ctx, out, " matrix=\"%g %g %g %g %g %g\"",
 		ctm->a, ctm->b, ctm->c, ctm->d, ctm->e, ctm->f);
 }
 
 static void
-fz_trace_trm(const fz_matrix *trm)
+fz_trace_trm(fz_context *ctx, fz_output *out, const fz_matrix *trm)
 {
-	printf(" trm=\"%g %g %g %g\"",
+	fz_printf(ctx, out, " trm=\"%g %g %g %g\"",
 		trm->a, trm->b, trm->c, trm->d);
 }
 
 static void
-fz_trace_color(fz_colorspace *colorspace, float *color, float alpha)
+fz_trace_color(fz_context *ctx, fz_output *out, fz_colorspace *colorspace, float *color, float alpha)
 {
 	int i;
-	printf(" colorspace=\"%s\" color=\"", colorspace->name);
+	fz_printf(ctx, out, " colorspace=\"%s\" color=\"", colorspace->name);
 	for (i = 0; i < colorspace->n; i++)
-		printf("%s%g", i == 0 ? "" : " ", color[i]);
-	printf("\"");
+		fz_printf(ctx, out, "%s%g", i == 0 ? "" : " ", color[i]);
+	fz_printf(ctx, out, "\"");
 	if (alpha < 1)
-		printf(" alpha=\"%g\"", alpha);
+		fz_printf(ctx, out, " alpha=\"%g\"", alpha);
 }
 
 static void
 trace_moveto(fz_context *ctx, void *arg, float x, float y)
 {
-	int indent = (int)(intptr_t)arg;
-	int n;
-
-	for (n = 0; n < indent; n++)
-		putchar(' ');
-	printf("<moveto x=\"%g\" y=\"%g\"/>\n", x, y);
+	fz_output *out = arg;
+	fz_printf(ctx, out, "<moveto x=\"%g\" y=\"%g\"/>\n", x, y);
 }
 
 static void
 trace_lineto(fz_context *ctx, void *arg, float x, float y)
 {
-	int indent = (int)(intptr_t)arg;
-	int n;
-
-	for (n = 0; n < indent; n++)
-		putchar(' ');
-	printf("<lineto x=\"%g\" y=\"%g\"/>\n", x, y);
+	fz_output *out = arg;
+	fz_printf(ctx, out, "<lineto x=\"%g\" y=\"%g\"/>\n", x, y);
 }
 
 static void
 trace_curveto(fz_context *ctx, void *arg, float x1, float y1, float x2, float y2, float x3, float y3)
 {
-	int indent = (int)(intptr_t)arg;
-	int n;
-
-	for (n = 0; n < indent; n++)
-		putchar(' ');
-	printf("<curveto x1=\"%g\" y1=\"%g\" x2=\"%g\" y2=\"%g\" x3=\"%g\" y3=\"%g\"/>\n", x1, y1, x2, y2, x3, y3);
+	fz_output *out = arg;
+	fz_printf(ctx, out, "<curveto x1=\"%g\" y1=\"%g\" x2=\"%g\" y2=\"%g\" x3=\"%g\" y3=\"%g\"/>\n", x1, y1, x2, y2, x3, y3);
 }
 
 static void
 trace_close(fz_context *ctx, void *arg)
 {
-	int indent = (int)(intptr_t)arg;
-	int n;
-
-	for (n = 0; n < indent; n++)
-		putchar(' ');
-	printf("<closepath/>\n");
+	fz_output *out = arg;
+	fz_printf(ctx, out, "<closepath/>\n");
 }
 
 static const fz_path_processor trace_path_proc =
@@ -79,219 +69,259 @@ static const fz_path_processor trace_path_proc =
 };
 
 static void
-fz_trace_path(fz_context *ctx, fz_path *path, int indent)
+fz_trace_path(fz_context *ctx, fz_output *out, fz_path *path)
 {
-	fz_process_path(ctx, &trace_path_proc, (void *)(intptr_t)indent, path);
+	fz_process_path(ctx, &trace_path_proc, out, path);
 }
 
 static void
 fz_trace_begin_page(fz_context *ctx, fz_device *dev, const fz_rect *rect, const fz_matrix *ctm)
 {
-	printf("<page mediabox=\"%g %g %g %g\"", rect->x0, rect->y0, rect->x1, rect->y1);
-	fz_trace_matrix(ctm);
-	printf(">\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<page mediabox=\"%g %g %g %g\"", rect->x0, rect->y0, rect->x1, rect->y1);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, ">\n");
 }
 
 static void
 fz_trace_end_page(fz_context *ctx, fz_device *dev)
 {
-	printf("</page>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "</page>\n");
 }
 
 static void
 fz_trace_fill_path(fz_context *ctx, fz_device *dev, fz_path *path, int even_odd, const fz_matrix *ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<fill_path");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<fill_path");
 	if (even_odd)
-		printf(" winding=\"eofill\"");
+		fz_printf(ctx, out, " winding=\"eofill\"");
 	else
-		printf(" winding=\"nonzero\"");
-	fz_trace_color(colorspace, color, alpha);
-	fz_trace_matrix(ctm);
-	printf(">\n");
-	fz_trace_path(ctx, path, 0);
-	printf("</fill_path>\n");
+		fz_printf(ctx, out, " winding=\"nonzero\"");
+	fz_trace_color(ctx, out, colorspace, color, alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_path(ctx, out, path);
+	fz_printf(ctx, out, "</fill_path>\n");
 }
 
 static void
 fz_trace_stroke_path(fz_context *ctx, fz_device *dev, fz_path *path, fz_stroke_state *stroke, const fz_matrix *ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
+	fz_output *out = ((fz_trace_device*)dev)->out;
 	int i;
 
-	printf("<stroke_path");
-	printf(" linewidth=\"%g\"", stroke->linewidth);
-	printf(" miterlimit=\"%g\"", stroke->miterlimit);
-	printf(" linecap=\"%d,%d,%d\"", stroke->start_cap, stroke->dash_cap, stroke->end_cap);
-	printf(" linejoin=\"%d\"", stroke->linejoin);
+	fz_printf(ctx, out, "<stroke_path");
+	fz_printf(ctx, out, " linewidth=\"%g\"", stroke->linewidth);
+	fz_printf(ctx, out, " miterlimit=\"%g\"", stroke->miterlimit);
+	fz_printf(ctx, out, " linecap=\"%d,%d,%d\"", stroke->start_cap, stroke->dash_cap, stroke->end_cap);
+	fz_printf(ctx, out, " linejoin=\"%d\"", stroke->linejoin);
 
 	if (stroke->dash_len)
 	{
-		printf(" dash_phase=\"%g\" dash=\"", stroke->dash_phase);
+		fz_printf(ctx, out, " dash_phase=\"%g\" dash=\"", stroke->dash_phase);
 		for (i = 0; i < stroke->dash_len; i++)
-			printf("%s%g", i > 0 ? " " : "", stroke->dash_list[i]);
-		printf("\"");
+			fz_printf(ctx, out, "%s%g", i > 0 ? " " : "", stroke->dash_list[i]);
+		fz_printf(ctx, out, "\"");
 	}
 
-	fz_trace_color(colorspace, color, alpha);
-	fz_trace_matrix(ctm);
-	printf(">\n");
+	fz_trace_color(ctx, out, colorspace, color, alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, ">\n");
 
-	fz_trace_path(ctx, path, 0);
+	fz_trace_path(ctx, out, path);
 
-	printf("</stroke_path>\n");
+	fz_printf(ctx, out, "</stroke_path>\n");
 }
 
 static void
 fz_trace_clip_path(fz_context *ctx, fz_device *dev, fz_path *path, const fz_rect *rect, int even_odd, const fz_matrix *ctm)
 {
-	printf("<clip_path");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<clip_path");
 	if (even_odd)
-		printf(" winding=\"eofill\"");
+		fz_printf(ctx, out, " winding=\"eofill\"");
 	else
-		printf(" winding=\"nonzero\"");
-	fz_trace_matrix(ctm);
+		fz_printf(ctx, out, " winding=\"nonzero\"");
+	fz_trace_matrix(ctx, out, ctm);
 	if (rect)
-		printf(" contentbbox=\"%g %g %g %g\">\n", rect->x0, rect->y0, rect->x1, rect->y1);
+		fz_printf(ctx, out, " contentbbox=\"%g %g %g %g\">\n", rect->x0, rect->y0, rect->x1, rect->y1);
 	else
-		printf(">\n");
-	fz_trace_path(ctx, path, 0);
-	printf("</clip_path>\n");
+		fz_printf(ctx, out, ">\n");
+	fz_trace_path(ctx, out, path);
+	fz_printf(ctx, out, "</clip_path>\n");
 }
 
 static void
 fz_trace_clip_stroke_path(fz_context *ctx, fz_device *dev, fz_path *path, const fz_rect *rect, fz_stroke_state *stroke, const fz_matrix *ctm)
 {
-	printf("<clip_stroke_path");
-	fz_trace_matrix(ctm);
-	printf(">\n");
-	fz_trace_path(ctx, path, 0);
-	printf("</clip_stroke_path>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<clip_stroke_path");
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_path(ctx, out, path);
+	fz_printf(ctx, out, "</clip_stroke_path>\n");
+}
+
+static int
+isxmlmeta(int c)
+{
+	return c < 32 || c >= 128 || c == '&' || c == '<' || c == '>' || c == '\'' || c == '"';
+}
+
+static void
+fz_trace_text(fz_context *ctx, fz_output *out, fz_text *text)
+{
+	int i;
+	for (i = 0; i < text->len; i++)
+	{
+		if (!isxmlmeta(text->items[i].ucs))
+			fz_printf(ctx, out, "<g ucs=\"%c\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
+				text->items[i].ucs, text->items[i].gid, text->items[i].x, text->items[i].y);
+		else
+			fz_printf(ctx, out, "<g ucs=\"U+%04X\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
+				text->items[i].ucs, text->items[i].gid, text->items[i].x, text->items[i].y);
+	}
 }
 
 static void
 fz_trace_fill_text(fz_context *ctx, fz_device *dev, fz_text *text, const fz_matrix *ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<fill_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
-	fz_trace_color(colorspace, color, alpha);
-	fz_trace_matrix(ctm);
-	fz_trace_trm(&text->trm);
-	printf(">\n");
-	fz_print_text(ctx, stdout, text);
-	printf("</fill_text>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<fill_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
+	fz_trace_color(ctx, out, colorspace, color, alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_trm(ctx, out, &text->trm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_text(ctx, out, text);
+	fz_printf(ctx, out, "</fill_text>\n");
 }
 
 static void
 fz_trace_stroke_text(fz_context *ctx, fz_device *dev, fz_text *text, fz_stroke_state *stroke, const fz_matrix *ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<stroke_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
-	fz_trace_color(colorspace, color, alpha);
-	fz_trace_matrix(ctm);
-	fz_trace_trm(&text->trm);
-	printf(">\n");
-	fz_print_text(ctx, stdout, text);
-	printf("</stroke_text>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<stroke_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
+	fz_trace_color(ctx, out, colorspace, color, alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_trm(ctx, out, &text->trm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_text(ctx, out, text);
+	fz_printf(ctx, out, "</stroke_text>\n");
 }
 
 static void
 fz_trace_clip_text(fz_context *ctx, fz_device *dev, fz_text *text, const fz_matrix *ctm, int accumulate)
 {
-	printf("<clip_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
-	printf(" accumulate=\"%d\"", accumulate);
-	fz_trace_matrix(ctm);
-	fz_trace_trm(&text->trm);
-	printf(">\n");
-	fz_print_text(ctx, stdout, text);
-	printf("</clip_text>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<clip_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
+	fz_printf(ctx, out, " accumulate=\"%d\"", accumulate);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_trm(ctx, out, &text->trm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_text(ctx, out, text);
+	fz_printf(ctx, out, "</clip_text>\n");
 }
 
 static void
 fz_trace_clip_stroke_text(fz_context *ctx, fz_device *dev, fz_text *text, fz_stroke_state *stroke, const fz_matrix *ctm)
 {
-	printf("<clip_stroke_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
-	fz_trace_matrix(ctm);
-	fz_trace_trm(&text->trm);
-	printf(">\n");
-	fz_print_text(ctx, stdout, text);
-	printf("</clip_stroke_text>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<clip_stroke_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_trm(ctx, out, &text->trm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_text(ctx, out, text);
+	fz_printf(ctx, out, "</clip_stroke_text>\n");
 }
 
 static void
 fz_trace_ignore_text(fz_context *ctx, fz_device *dev, fz_text *text, const fz_matrix *ctm)
 {
-	printf("<ignore_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
-	fz_trace_matrix(ctm);
-	fz_trace_trm(&text->trm);
-	printf(">\n");
-	fz_print_text(ctx, stdout, text);
-	printf("</ignore_text>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<ignore_text font=\"%s\" wmode=\"%d\"", text->font->name, text->wmode);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_trm(ctx, out, &text->trm);
+	fz_printf(ctx, out, ">\n");
+	fz_trace_text(ctx, out, text);
+	fz_printf(ctx, out, "</ignore_text>\n");
 }
 
 static void
 fz_trace_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha)
 {
-	printf("<fill_image alpha=\"%g\"", alpha);
-	fz_trace_matrix(ctm);
-	printf(" width=\"%d\" height=\"%d\"", image->w, image->h);
-	printf("/>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<fill_image alpha=\"%g\"", alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, " width=\"%d\" height=\"%d\"", image->w, image->h);
+	fz_printf(ctx, out, "/>\n");
 }
 
 static void
 fz_trace_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_matrix *ctm, float alpha)
 {
-	printf("<fill_shade alpha=\"%g\"", alpha);
-	fz_trace_matrix(ctm);
-	printf("/>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<fill_shade alpha=\"%g\"", alpha);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, "/>\n");
 }
 
 static void
 fz_trace_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm,
 fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<fill_image_mask");
-	fz_trace_matrix(ctm);
-	fz_trace_color(colorspace, color, alpha);
-	printf(" width=\"%d\" height=\"%d\"", image->w, image->h);
-	printf("/>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<fill_image_mask");
+	fz_trace_matrix(ctx, out, ctm);
+	fz_trace_color(ctx, out, colorspace, color, alpha);
+	fz_printf(ctx, out, " width=\"%d\" height=\"%d\"", image->w, image->h);
+	fz_printf(ctx, out, "/>\n");
 }
 
 static void
 fz_trace_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm)
 {
-	printf("<clip_image_mask");
-	fz_trace_matrix(ctm);
-	printf(" width=\"%d\" height=\"%d\"", image->w, image->h);
-	printf("/>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<clip_image_mask");
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, " width=\"%d\" height=\"%d\"", image->w, image->h);
+	fz_printf(ctx, out, "/>\n");
 }
 
 static void
 fz_trace_pop_clip(fz_context *ctx, fz_device *dev)
 {
-	printf("<pop_clip/>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<pop_clip/>\n");
 }
 
 static void
 fz_trace_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int luminosity, fz_colorspace *colorspace, float *color)
 {
-	printf("<mask bbox=\"%g %g %g %g\" s=\"%s\"",
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<mask bbox=\"%g %g %g %g\" s=\"%s\"",
 		bbox->x0, bbox->y0, bbox->x1, bbox->y1,
 		luminosity ? "luminosity" : "alpha");
-	printf(">\n");
+	fz_printf(ctx, out, ">\n");
 }
 
 static void
 fz_trace_end_mask(fz_context *ctx, fz_device *dev)
 {
-	printf("</mask>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "</mask>\n");
 }
 
 static void
 fz_trace_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int isolated, int knockout, int blendmode, float alpha)
 {
-	printf("<group bbox=\"%g %g %g %g\" isolated=\"%d\" knockout=\"%d\" blendmode=\"%s\" alpha=\"%g\">\n",
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<group bbox=\"%g %g %g %g\" isolated=\"%d\" knockout=\"%d\" blendmode=\"%s\" alpha=\"%g\">\n",
 		bbox->x0, bbox->y0, bbox->x1, bbox->y1,
 		isolated, knockout, fz_blendmode_name(blendmode), alpha);
 }
@@ -299,59 +329,64 @@ fz_trace_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int i
 static void
 fz_trace_end_group(fz_context *ctx, fz_device *dev)
 {
-	printf("</group>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "</group>\n");
 }
 
 static int
 fz_trace_begin_tile(fz_context *ctx, fz_device *dev, const fz_rect *area, const fz_rect *view, float xstep, float ystep, const fz_matrix *ctm, int id)
 {
-	printf("<tile");
-	printf(" area=\"%g %g %g %g\"", area->x0, area->y0, area->x1, area->y1);
-	printf(" view=\"%g %g %g %g\"", view->x0, view->y0, view->x1, view->y1);
-	printf(" xstep=\"%g\" ystep=\"%g\"", xstep, ystep);
-	fz_trace_matrix(ctm);
-	printf(">\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "<tile");
+	fz_printf(ctx, out, " area=\"%g %g %g %g\"", area->x0, area->y0, area->x1, area->y1);
+	fz_printf(ctx, out, " view=\"%g %g %g %g\"", view->x0, view->y0, view->x1, view->y1);
+	fz_printf(ctx, out, " xstep=\"%g\" ystep=\"%g\"", xstep, ystep);
+	fz_trace_matrix(ctx, out, ctm);
+	fz_printf(ctx, out, ">\n");
 	return 0;
 }
 
 static void
 fz_trace_end_tile(fz_context *ctx, fz_device *dev)
 {
-	printf("</tile>\n");
+	fz_output *out = ((fz_trace_device*)dev)->out;
+	fz_printf(ctx, out, "</tile>\n");
 }
 
-fz_device *fz_new_trace_device(fz_context *ctx)
+fz_device *fz_new_trace_device(fz_context *ctx, fz_output *out)
 {
-	fz_device *dev = fz_new_device(ctx, sizeof *dev);
+	fz_trace_device *dev = fz_new_device(ctx, sizeof *dev);
+
+	dev->super.begin_page = fz_trace_begin_page;
+	dev->super.end_page = fz_trace_end_page;
 
-	dev->begin_page = fz_trace_begin_page;
-	dev->end_page = fz_trace_end_page;
+	dev->super.fill_path = fz_trace_fill_path;
+	dev->super.stroke_path = fz_trace_stroke_path;
+	dev->super.clip_path = fz_trace_clip_path;
+	dev->super.clip_stroke_path = fz_trace_clip_stroke_path;
 
-	dev->fill_path = fz_trace_fill_path;
-	dev->stroke_path = fz_trace_stroke_path;
-	dev->clip_path = fz_trace_clip_path;
-	dev->clip_stroke_path = fz_trace_clip_stroke_path;
+	dev->super.fill_text = fz_trace_fill_text;
+	dev->super.stroke_text = fz_trace_stroke_text;
+	dev->super.clip_text = fz_trace_clip_text;
+	dev->super.clip_stroke_text = fz_trace_clip_stroke_text;
+	dev->super.ignore_text = fz_trace_ignore_text;
 
-	dev->fill_text = fz_trace_fill_text;
-	dev->stroke_text = fz_trace_stroke_text;
-	dev->clip_text = fz_trace_clip_text;
-	dev->clip_stroke_text = fz_trace_clip_stroke_text;
-	dev->ignore_text = fz_trace_ignore_text;
+	dev->super.fill_shade = fz_trace_fill_shade;
+	dev->super.fill_image = fz_trace_fill_image;
+	dev->super.fill_image_mask = fz_trace_fill_image_mask;
+	dev->super.clip_image_mask = fz_trace_clip_image_mask;
 
-	dev->fill_shade = fz_trace_fill_shade;
-	dev->fill_image = fz_trace_fill_image;
-	dev->fill_image_mask = fz_trace_fill_image_mask;
-	dev->clip_image_mask = fz_trace_clip_image_mask;
+	dev->super.pop_clip = fz_trace_pop_clip;
 
-	dev->pop_clip = fz_trace_pop_clip;
+	dev->super.begin_mask = fz_trace_begin_mask;
+	dev->super.end_mask = fz_trace_end_mask;
+	dev->super.begin_group = fz_trace_begin_group;
+	dev->super.end_group = fz_trace_end_group;
 
-	dev->begin_mask = fz_trace_begin_mask;
-	dev->end_mask = fz_trace_end_mask;
-	dev->begin_group = fz_trace_begin_group;
-	dev->end_group = fz_trace_end_group;
+	dev->super.begin_tile = fz_trace_begin_tile;
+	dev->super.end_tile = fz_trace_end_tile;
 
-	dev->begin_tile = fz_trace_begin_tile;
-	dev->end_tile = fz_trace_end_tile;
+	dev->out = out;
 
-	return dev;
+	return (fz_device*)dev;
 }