1 files changed, 116 insertions, 116 deletions

diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c
index f8a94b43..2bc171de 100644
--- a/fitz/dev_trace.c
+++ b/fitz/dev_trace.c
@@ -1,14 +1,14 @@
 #include "fitz.h"
 
 static void
-fz_tracematrix(fz_matrix ctm)
+fz_trace_matrix(fz_matrix ctm)
 {
 	printf("matrix=\"%g %g %g %g %g %g\" ",
 		ctm.a, ctm.b, ctm.c, ctm.d, ctm.e, ctm.f);
 }
 
 static void
-fz_tracecolor(fz_colorspace *colorspace, float *color, float alpha)
+fz_trace_color(fz_colorspace *colorspace, float *color, float alpha)
 {
 	int i;
 	printf("colorspace=\"%s\" color=\"", colorspace->name);
@@ -20,7 +20,7 @@ fz_tracecolor(fz_colorspace *colorspace, float *color, float alpha)
 }
 
 static void
-fz_tracepath(fz_path *path, int indent)
+fz_trace_path(fz_path *path, int indent)
 {
 	float x, y;
 	int i = 0;
@@ -29,30 +29,30 @@ fz_tracepath(fz_path *path, int indent)
 	{
 		for (n = 0; n < indent; n++)
 			putchar(' ');
-		switch (path->els[i++].k)
+		switch (path->items[i++].k)
 		{
 		case FZ_MOVETO:
-			x = path->els[i++].v;
-			y = path->els[i++].v;
+			x = path->items[i++].v;
+			y = path->items[i++].v;
 			printf("<moveto x=\"%g\" y=\"%g\" />\n", x, y);
 			break;
 		case FZ_LINETO:
-			x = path->els[i++].v;
-			y = path->els[i++].v;
+			x = path->items[i++].v;
+			y = path->items[i++].v;
 			printf("<lineto x=\"%g\" y=\"%g\" />\n", x, y);
 			break;
 		case FZ_CURVETO:
-			x = path->els[i++].v;
-			y = path->els[i++].v;
+			x = path->items[i++].v;
+			y = path->items[i++].v;
 			printf("<curveto x1=\"%g\" y1=\"%g\" ", x, y);
-			x = path->els[i++].v;
-			y = path->els[i++].v;
+			x = path->items[i++].v;
+			y = path->items[i++].v;
 			printf("x2=\"%g\" y2=\"%g\" ", x, y);
-			x = path->els[i++].v;
-			y = path->els[i++].v;
+			x = path->items[i++].v;
+			y = path->items[i++].v;
 			printf("x3=\"%g\" y3=\"%g\" />\n", x, y);
 			break;
-		case FZ_CLOSEPATH:
+		case FZ_CLOSE_PATH:
 			printf("<closepath />\n");
 			break;
 		}
@@ -60,245 +60,245 @@ fz_tracepath(fz_path *path, int indent)
 }
 
 static void
-fz_tracefillpath(void *user, fz_path *path, int evenodd, fz_matrix ctm,
+fz_trace_fill_path(void *user, fz_path *path, int even_odd, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<fillpath ");
-	if (evenodd)
+	printf("<fill_path ");
+	if (even_odd)
 		printf("winding=\"eofill\" ");
 	else
 		printf("winding=\"nonzero\" ");
-	fz_tracecolor(colorspace, color, alpha);
-	fz_tracematrix(ctm);
+	fz_trace_color(colorspace, color, alpha);
+	fz_trace_matrix(ctm);
 	printf(">\n");
-	fz_tracepath(path, 0);
-	printf("</fillpath>\n");
+	fz_trace_path(path, 0);
+	printf("</fill_path>\n");
 }
 
 static void
-fz_tracestrokepath(void *user, fz_path *path, fz_strokestate *stroke, fz_matrix ctm,
+fz_trace_stroke_path(void *user, fz_path *path, fz_stroke_state *stroke, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
 	int i;
 
-	printf("<strokepath ");
+	printf("<stroke_path ");
 	printf("linewidth=\"%g\" ", stroke->linewidth);
 	printf("miterlimit=\"%g\" ", stroke->miterlimit);
 	printf("linecap=\"%d\" ", stroke->linecap);
 	printf("linejoin=\"%d\" ", stroke->linejoin);
 
-	if (stroke->dashlen)
+	if (stroke->dash_len)
 	{
-		printf("dashphase=\"%g\" dash=\"", stroke->dashphase);
-		for (i = 0; i < stroke->dashlen; i++)
-			printf("%g ", stroke->dashlist[i]);
+		printf("dash_phase=\"%g\" dash=\"", stroke->dash_phase);
+		for (i = 0; i < stroke->dash_len; i++)
+			printf("%g ", stroke->dash_list[i]);
 		printf("\"");
 	}
 
-	fz_tracecolor(colorspace, color, alpha);
-	fz_tracematrix(ctm);
+	fz_trace_color(colorspace, color, alpha);
+	fz_trace_matrix(ctm);
 	printf(">\n");
 
-	fz_tracepath(path, 0);
+	fz_trace_path(path, 0);
 
-	printf("</strokepath>\n");
+	printf("</stroke_path>\n");
 }
 
 static void
-fz_traceclippath(void *user, fz_path *path, int evenodd, fz_matrix ctm)
+fz_trace_clip_path(void *user, fz_path *path, int even_odd, fz_matrix ctm)
 {
-	printf("<clippath ");
-	if (evenodd)
+	printf("<clip_path ");
+	if (even_odd)
 		printf("winding=\"eofill\" ");
 	else
 		printf("winding=\"nonzero\" ");
-	fz_tracematrix(ctm);
+	fz_trace_matrix(ctm);
 	printf(">\n");
-	fz_tracepath(path, 0);
-	printf("</clippath>\n");
+	fz_trace_path(path, 0);
+	printf("</clip_path>\n");
 }
 
 static void
-fz_traceclipstrokepath(void *user, fz_path *path, fz_strokestate *stroke, fz_matrix ctm)
+fz_trace_clip_stroke_path(void *user, fz_path *path, fz_stroke_state *stroke, fz_matrix ctm)
 {
-	printf("<clipstrokepath ");
-	fz_tracematrix(ctm);
+	printf("<clip_stroke_path ");
+	fz_trace_matrix(ctm);
 	printf(">\n");
-	fz_tracepath(path, 0);
-	printf("</clipstrokepath>\n");
+	fz_trace_path(path, 0);
+	printf("</clip_stroke_path>\n");
 }
 
 static void
-fz_tracefilltext(void *user, fz_text *text, fz_matrix ctm,
+fz_trace_fill_text(void *user, fz_text *text, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<filltext font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_tracecolor(colorspace, color, alpha);
-	fz_tracematrix(fz_concat(ctm, text->trm));
+	printf("<fill_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
+	fz_trace_color(colorspace, color, alpha);
+	fz_trace_matrix(fz_concat(ctm, text->trm));
 	printf(">\n");
-	fz_debugtext(text, 0);
-	printf("</filltext>\n");
+	fz_debug_text(text, 0);
+	printf("</fill_text>\n");
 }
 
 static void
-fz_tracestroketext(void *user, fz_text *text, fz_strokestate *stroke, fz_matrix ctm,
+fz_trace_stroke_text(void *user, fz_text *text, fz_stroke_state *stroke, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<stroketext font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_tracecolor(colorspace, color, alpha);
-	fz_tracematrix(fz_concat(ctm, text->trm));
+	printf("<stroke_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
+	fz_trace_color(colorspace, color, alpha);
+	fz_trace_matrix(fz_concat(ctm, text->trm));
 	printf(">\n");
-	fz_debugtext(text, 0);
-	printf("</stroketext>\n");
+	fz_debug_text(text, 0);
+	printf("</stroke_text>\n");
 }
 
 static void
-fz_tracecliptext(void *user, fz_text *text, fz_matrix ctm, int accumulate)
+fz_trace_clip_text(void *user, fz_text *text, fz_matrix ctm, int accumulate)
 {
-	printf("<cliptext font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
+	printf("<clip_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
 	printf("accumulate=\"%d\" ", accumulate);
-	fz_tracematrix(fz_concat(ctm, text->trm));
+	fz_trace_matrix(fz_concat(ctm, text->trm));
 	printf(">\n");
-	fz_debugtext(text, 0);
-	printf("</cliptext>\n");
+	fz_debug_text(text, 0);
+	printf("</clip_text>\n");
 }
 
 static void
-fz_traceclipstroketext(void *user, fz_text *text, fz_strokestate *stroke, fz_matrix ctm)
+fz_trace_clip_stroke_text(void *user, fz_text *text, fz_stroke_state *stroke, fz_matrix ctm)
 {
-	printf("<clipstroketext font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_tracematrix(fz_concat(ctm, text->trm));
+	printf("<clip_stroke_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
+	fz_trace_matrix(fz_concat(ctm, text->trm));
 	printf(">\n");
-	fz_debugtext(text, 0);
-	printf("</clipstroketext>\n");
+	fz_debug_text(text, 0);
+	printf("</clip_stroke_text>\n");
 }
 
 static void
-fz_traceignoretext(void *user, fz_text *text, fz_matrix ctm)
+fz_trace_ignore_text(void *user, fz_text *text, fz_matrix ctm)
 {
-	printf("<ignoretext font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_tracematrix(fz_concat(ctm, text->trm));
+	printf("<ignore_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
+	fz_trace_matrix(fz_concat(ctm, text->trm));
 	printf(">\n");
-	fz_debugtext(text, 0);
-	printf("</ignoretext>\n");
+	fz_debug_text(text, 0);
+	printf("</ignore_text>\n");
 }
 
 static void
-fz_tracefillimage(void *user, fz_pixmap *image, fz_matrix ctm, float alpha)
+fz_trace_fill_image(void *user, fz_pixmap *image, fz_matrix ctm, float alpha)
 {
-	printf("<fillimage alpha=\"%g\" ", alpha);
-	fz_tracematrix(ctm);
+	printf("<fill_image alpha=\"%g\" ", alpha);
+	fz_trace_matrix(ctm);
 	printf("/>\n");
 }
 
 static void
-fz_tracefillshade(void *user, fz_shade *shade, fz_matrix ctm, float alpha)
+fz_trace_fill_shade(void *user, fz_shade *shade, fz_matrix ctm, float alpha)
 {
-	printf("<fillshade alpha=\"%g\" ", alpha);
-	fz_tracematrix(ctm);
+	printf("<fill_shade alpha=\"%g\" ", alpha);
+	fz_trace_matrix(ctm);
 	printf("/>\n");
 }
 
 static void
-fz_tracefillimagemask(void *user, fz_pixmap *image, fz_matrix ctm,
+fz_trace_fill_image_mask(void *user, fz_pixmap *image, fz_matrix ctm,
 fz_colorspace *colorspace, float *color, float alpha)
 {
-	printf("<fillimagemask ");
-	fz_tracematrix(ctm);
-	fz_tracecolor(colorspace, color, alpha);
+	printf("<fill_image_mask ");
+	fz_trace_matrix(ctm);
+	fz_trace_color(colorspace, color, alpha);
 	printf("/>\n");
 }
 
 static void
-fz_traceclipimagemask(void *user, fz_pixmap *image, fz_matrix ctm)
+fz_trace_clip_image_mask(void *user, fz_pixmap *image, fz_matrix ctm)
 {
-	printf("<clipimagemask ");
-	fz_tracematrix(ctm);
+	printf("<clip_image_mask ");
+	fz_trace_matrix(ctm);
 	printf("/>\n");
 }
 
 static void
-fz_tracepopclip(void *user)
+fz_trace_pop_clip(void *user)
 {
-	printf("<popclip />\n");
+	printf("<pop_clip />\n");
 }
 
 static void
-fz_tracebeginmask(void *user, fz_rect bbox, int luminosity, fz_colorspace *colorspace, float *color)
+fz_trace_begin_mask(void *user, fz_rect bbox, int luminosity, fz_colorspace *colorspace, float *color)
 {
 	printf("<mask bbox=\"%g %g %g %g\" s=\"%s\" ",
 		bbox.x0, bbox.y0, bbox.x1, bbox.y1,
 		luminosity ? "luminosity" : "alpha");
-//	fz_tracecolor(colorspace, color, 1);
+//	fz_trace_color(colorspace, color, 1);
 	printf(">\n");
 }
 
 static void
-fz_traceendmask(void *user)
+fz_trace_end_mask(void *user)
 {
 	printf("</mask>\n");
 }
 
 static void
-fz_tracebegingroup(void *user, fz_rect bbox, int isolated, int knockout, fz_blendmode blendmode, float alpha)
+fz_trace_begin_group(void *user, fz_rect bbox, int isolated, int knockout, fz_blendmode blendmode, float alpha)
 {
 	printf("<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_blendnames[blendmode], alpha);
+		isolated, knockout, fz_blendmode_names[blendmode], alpha);
 }
 
 static void
-fz_traceendgroup(void *user)
+fz_trace_end_group(void *user)
 {
 	printf("</group>\n");
 }
 
 static void
-fz_tracebegintile(void *user, fz_rect area, fz_rect view, float xstep, float ystep, fz_matrix ctm)
+fz_trace_begin_tile(void *user, fz_rect area, fz_rect view, float xstep, float ystep, fz_matrix ctm)
 {
 	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_tracematrix(ctm);
+	fz_trace_matrix(ctm);
 	printf(">\n");
 }
 
 static void
-fz_traceendtile(void *user)
+fz_trace_end_tile(void *user)
 {
 	printf("</tile>\n");
 }
 
-fz_device *fz_newtracedevice(void)
+fz_device *fz_new_trace_device(void)
 {
-	fz_device *dev = fz_newdevice(nil);
+	fz_device *dev = fz_new_device(NULL);
 
-	dev->fillpath = fz_tracefillpath;
-	dev->strokepath = fz_tracestrokepath;
-	dev->clippath = fz_traceclippath;
-	dev->clipstrokepath = fz_traceclipstrokepath;
+	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->filltext = fz_tracefilltext;
-	dev->stroketext = fz_tracestroketext;
-	dev->cliptext = fz_tracecliptext;
-	dev->clipstroketext = fz_traceclipstroketext;
-	dev->ignoretext = fz_traceignoretext;
+	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->fillshade = fz_tracefillshade;
-	dev->fillimage = fz_tracefillimage;
-	dev->fillimagemask = fz_tracefillimagemask;
-	dev->clipimagemask = fz_traceclipimagemask;
+	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->popclip = fz_tracepopclip;
+	dev->pop_clip = fz_trace_pop_clip;
 
-	dev->beginmask = fz_tracebeginmask;
-	dev->endmask = fz_traceendmask;
-	dev->begingroup = fz_tracebegingroup;
-	dev->endgroup = fz_traceendgroup;
+	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->begintile = fz_tracebegintile;
-	dev->endtile = fz_traceendtile;
+	dev->begin_tile = fz_trace_begin_tile;
+	dev->end_tile = fz_trace_end_tile;
 
 	return dev;
 }