From 13e335fd06789a42369d03b2cad65818014f3f79 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 2 Sep 2014 20:34:48 +0200 Subject: Improve XML parser. Add a whitespace preserving mode, for future use with XHTML. Also parse XHTML entities. This is not strictly according to spec, but for properly formed XML documents it should not matter. --- source/xps/xps-doc.c | 4 ++-- source/xps/xps-outline.c | 2 +- source/xps/xps-resource.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/xps') diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c index ee3d9736..e2058fbc 100644 --- a/source/xps/xps-doc.c +++ b/source/xps/xps-doc.c @@ -360,7 +360,7 @@ xps_parse_metadata(xps_document *doc, xps_part *part, xps_fixdoc *fixdoc) doc->base_uri = buf; doc->part_uri = part->name; - root = fz_parse_xml(doc->ctx, part->data, part->size); + root = fz_parse_xml(doc->ctx, part->data, part->size, 0); xps_parse_metadata_imp(doc, root, fixdoc); fz_free_xml(doc->ctx, root); @@ -439,7 +439,7 @@ xps_load_fixed_page(xps_document *doc, xps_page *page) part = xps_read_part(doc, page->name); fz_try(ctx) { - root = fz_parse_xml(doc->ctx, part->data, part->size); + root = fz_parse_xml(doc->ctx, part->data, part->size, 0); } fz_always(ctx) { diff --git a/source/xps/xps-outline.c b/source/xps/xps-outline.c index d8b573a9..3a10ff41 100644 --- a/source/xps/xps-outline.c +++ b/source/xps/xps-outline.c @@ -86,7 +86,7 @@ xps_load_document_structure(xps_document *doc, xps_fixdoc *fixdoc) part = xps_read_part(doc, fixdoc->outline); fz_try(doc->ctx) { - root = fz_parse_xml(doc->ctx, part->data, part->size); + root = fz_parse_xml(doc->ctx, part->data, part->size, 0); } fz_always(doc->ctx) { diff --git a/source/xps/xps-resource.c b/source/xps/xps-resource.c index ef699619..85fd7c49 100644 --- a/source/xps/xps-resource.c +++ b/source/xps/xps-resource.c @@ -67,7 +67,7 @@ xps_parse_remote_resource_dictionary(xps_document *doc, char *base_uri, char *so part = xps_read_part(doc, part_name); fz_try(ctx) { - xml = fz_parse_xml(doc->ctx, part->data, part->size); + xml = fz_parse_xml(doc->ctx, part->data, part->size, 0); } fz_always(ctx) { -- cgit v1.2.3