diff options
author | Sebastian Rasmussen <sebras@gmail.com> | 2012-02-17 01:55:57 +0100 |
---|---|---|
committer | Sebastian Rasmussen <sebras@gmail.com> | 2012-03-10 01:27:11 +0100 |
commit | 5e31bc05a0299033dad386ea346c6c8503125113 (patch) | |
tree | 4153146b36b1f99ac3173c424784761fa57de6db | |
parent | 2c4cf00383752127bc27164b491f31ac17bd2478 (diff) | |
download | mupdf-5e31bc05a0299033dad386ea346c6c8503125113.tar.xz |
Make mudraw and the trace device print well-formed XML.
-rw-r--r-- | apps/mudraw.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/mudraw.c b/apps/mudraw.c index ce59a4e3..ecade0a0 100644 --- a/apps/mudraw.c +++ b/apps/mudraw.c @@ -166,11 +166,17 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) fz_run_page(doc, page, dev, fz_identity, NULL); fz_free_device(dev); dev = NULL; - printf("[Page %d]\n", pagenum); if (showtext > 1) + { + printf("<page number=\"%d\">\n", pagenum); fz_debug_text_span_xml(text); + printf("</page>\n"); + } else + { + printf("[Page %d]\n", pagenum); fz_debug_text_span(text); + } printf("\n"); } fz_catch(ctx) @@ -428,7 +434,7 @@ int main(int argc, char **argv) timing.minpage = 0; timing.maxpage = 0; - if (showxml) + if (showxml || showtext > 1) printf("<?xml version=\"1.0\"?>\n"); fz_try(ctx) @@ -450,7 +456,7 @@ int main(int argc, char **argv) if (!fz_authenticate_password(doc, password)) fz_throw(ctx, "cannot authenticate password: %s", filename); - if (showxml) + if (showxml || showtext > 1) printf("<document name=\"%s\">\n", filename); if (showoutline) @@ -464,7 +470,7 @@ int main(int argc, char **argv) drawrange(ctx, doc, argv[fz_optind++]); } - if (showxml) + if (showxml || showtext > 1) printf("</document>\n"); fz_close_document(doc); |