From 7f69791dd7e5fd047253ed337f004ab1bfc0bb5b Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Wed, 28 Sep 2011 15:01:44 +0200
Subject: Improve trace formatting of text objects.

Print CTM and TRM separately.
---
 fitz/dev_trace.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c
index 03e05f91..a98eb898 100644
--- a/fitz/dev_trace.c
+++ b/fitz/dev_trace.c
@@ -7,6 +7,13 @@ fz_trace_matrix(fz_matrix ctm)
 		ctm.a, ctm.b, ctm.c, ctm.d, ctm.e, ctm.f);
 }
 
+static void
+fz_trace_trm(fz_matrix trm)
+{
+	printf("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)
 {
@@ -135,7 +142,8 @@ fz_trace_fill_text(void *user, fz_text *text, fz_matrix ctm,
 {
 	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));
+	fz_trace_matrix(ctm);
+	fz_trace_trm(text->trm);
 	printf(">\n");
 	fz_debug_text(text, 0);
 	printf("</fill_text>\n");
@@ -147,7 +155,8 @@ fz_trace_stroke_text(void *user, fz_text *text, fz_stroke_state *stroke, fz_matr
 {
 	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));
+	fz_trace_matrix(ctm);
+	fz_trace_trm(text->trm);
 	printf(">\n");
 	fz_debug_text(text, 0);
 	printf("</stroke_text>\n");
@@ -158,7 +167,8 @@ fz_trace_clip_text(void *user, fz_text *text, fz_matrix ctm, int accumulate)
 {
 	printf("<clip_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
 	printf("accumulate=\"%d\" ", accumulate);
-	fz_trace_matrix(fz_concat(ctm, text->trm));
+	fz_trace_matrix(ctm);
+	fz_trace_trm(text->trm);
 	printf(">\n");
 	fz_debug_text(text, 0);
 	printf("</clip_text>\n");
@@ -168,7 +178,8 @@ static void
 fz_trace_clip_stroke_text(void *user, fz_text *text, fz_stroke_state *stroke, fz_matrix ctm)
 {
 	printf("<clip_stroke_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_trace_matrix(fz_concat(ctm, text->trm));
+	fz_trace_matrix(ctm);
+	fz_trace_trm(text->trm);
 	printf(">\n");
 	fz_debug_text(text, 0);
 	printf("</clip_stroke_text>\n");
@@ -178,7 +189,8 @@ static void
 fz_trace_ignore_text(void *user, fz_text *text, fz_matrix ctm)
 {
 	printf("<ignore_text font=\"%s\" wmode=\"%d\" ", text->font->name, text->wmode);
-	fz_trace_matrix(fz_concat(ctm, text->trm));
+	fz_trace_matrix(ctm);
+	fz_trace_trm(text->trm);
 	printf(">\n");
 	fz_debug_text(text, 0);
 	printf("</ignore_text>\n");
-- 
cgit v1.2.3