From d09ab089457ae3c20cc98f9afa03379c6ebf9598 Mon Sep 17 00:00:00 2001
From: Mike Hommey
Date: Thu, 25 Mar 2004 06:59:32 +0000
Subject: [svn-inject] Installing original source version
---
testRegexp.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 158 insertions(+)
create mode 100644 testRegexp.c
(limited to 'testRegexp.c')
diff --git a/testRegexp.c b/testRegexp.c
new file mode 100644
index 0000000..7f34414
--- /dev/null
+++ b/testRegexp.c
@@ -0,0 +1,158 @@
+/*
+ * testRegexp.c: simple module for testing regular expressions
+ *
+ * See Copyright for the status of this software.
+ *
+ * Daniel Veillard
+ */
+
+#include
+#include "libxml.h"
+#ifdef LIBXML_REGEXP_ENABLED
+#include
+#include
+
+int repeat = 0;
+int debug = 0;
+
+static void testRegexp(xmlRegexpPtr comp, const char *value) {
+ int ret;
+
+ ret = xmlRegexpExec(comp, (const xmlChar *) value);
+ if (ret == 1)
+ printf("%s: Ok\n", value);
+ else if (ret == 0)
+ printf("%s: Fail\n", value);
+ else
+ printf("%s: Error: %d\n", value, ret);
+ if (repeat) {
+ int j;
+ for (j = 0;j < 999999;j++)
+ xmlRegexpExec(comp, (const xmlChar *) value);
+ }
+}
+
+static void
+testRegexpFile(const char *filename) {
+ xmlRegexpPtr comp = NULL;
+ FILE *input;
+ char expression[5000];
+ int len;
+
+ input = fopen(filename, "r");
+ if (input == NULL) {
+ xmlGenericError(xmlGenericErrorContext,
+ "Cannot open %s for reading\n", filename);
+ return;
+ }
+ while (fgets(expression, 4500, input) != NULL) {
+ len = strlen(expression);
+ len--;
+ while ((len >= 0) &&
+ ((expression[len] == '\n') || (expression[len] == '\t') ||
+ (expression[len] == '\r') || (expression[len] == ' '))) len--;
+ expression[len + 1] = 0;
+ if (len >= 0) {
+ if (expression[0] == '#')
+ continue;
+ if ((expression[0] == '=') && (expression[1] == '>')) {
+ char *pattern = &expression[2];
+
+ if (comp != NULL) {
+ xmlRegFreeRegexp(comp);
+ comp = NULL;
+ }
+ printf("Regexp: %s\n", pattern) ;
+ comp = xmlRegexpCompile((const xmlChar *) pattern);
+ if (comp == NULL) {
+ printf(" failed to compile\n");
+ break;
+ }
+ } else if (comp == NULL) {
+ printf("Regexp: %s\n", expression) ;
+ comp = xmlRegexpCompile((const xmlChar *) expression);
+ if (comp == NULL) {
+ printf(" failed to compile\n");
+ break;
+ }
+ } else if (comp != NULL) {
+ testRegexp(comp, expression);
+ }
+ }
+ }
+ fclose(input);
+ if (comp != NULL)
+ xmlRegFreeRegexp(comp);
+}
+
+
+static void usage(const char *name) {
+ fprintf(stderr, "Usage: %s\n", name);
+}
+
+int main(int argc, char **argv) {
+ xmlRegexpPtr comp = NULL;
+ const char *pattern = NULL;
+ char *filename = NULL;
+ int i;
+
+ xmlInitMemory();
+
+ if (argc <= 1) {
+ usage(argv[0]);
+ return(1);
+ }
+ for (i = 1; i < argc ; i++) {
+ if (!strcmp(argv[i], "-"))
+ break;
+
+ if (argv[i][0] != '-')
+ continue;
+ if ((!strcmp(argv[i], "-debug")) || (!strcmp(argv[i], "--debug"))) {
+ debug++;
+ } else if ((!strcmp(argv[i], "-repeat")) ||
+ (!strcmp(argv[i], "--repeat"))) {
+ repeat++;
+ } else if ((!strcmp(argv[i], "-i")) || (!strcmp(argv[i], "--input")))
+ filename = argv[++i];
+ else {
+ fprintf(stderr, "Unknown option %s\n", argv[i]);
+ usage(argv[0]);
+ }
+ }
+ if (filename != NULL) {
+ testRegexpFile(filename);
+ } else {
+ for (i = 1; i < argc ; i++) {
+ if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0)) {
+ if (pattern == NULL) {
+ pattern = argv[i];
+ printf("Testing %s:\n", pattern);
+ comp = xmlRegexpCompile((const xmlChar *) pattern);
+ if (comp == NULL) {
+ printf(" failed to compile\n");
+ break;
+ }
+ if (debug)
+ xmlRegexpPrint(stdout, comp);
+ } else {
+ testRegexp(comp, argv[i]);
+ }
+ }
+ }
+ xmlMemoryDump();
+ if (comp != NULL)
+ xmlRegFreeRegexp(comp);
+ }
+ xmlCleanupParser();
+ /* xmlMemoryDump(); */
+ return(0);
+}
+
+#else
+#include
+int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
+ printf("%s : Regexp support not compiled in\n", argv[0]);
+ return(0);
+}
+#endif /* LIBXML_REGEXP_ENABLED */
--
cgit v1.2.3
From a464d9993e2acd5b8e1089b218ba74c6fcf215c5 Mon Sep 17 00:00:00 2001
From: Mike Hommey
Date: Mon, 5 Sep 2005 17:10:35 +0000
Subject: Load /usr/tmp/tmp.CMoFff/libxml2-2.6.21 into
packages/libxml2/branches/upstream/current.
---
ChangeLog | 613 +++++++++
HTMLparser.c | 102 +-
HTMLtree.c | 4 +
Makefile.am | 56 +-
Makefile.in | 66 +-
NEWS | 39 +
SAX2.c | 69 +-
configure | 246 +++-
configure.in | 98 +-
debugXML.c | 24 +-
doc/APIchunk0.html | 5 +-
doc/APIchunk1.html | 1 +
doc/APIchunk10.html | 21 +-
doc/APIchunk11.html | 4 +
doc/APIchunk12.html | 36 +-
doc/APIchunk13.html | 39 +-
doc/APIchunk14.html | 53 +-
doc/APIchunk15.html | 46 +-
doc/APIchunk16.html | 2 +-
doc/APIchunk17.html | 9 +
doc/APIchunk18.html | 30 +-
doc/APIchunk19.html | 19 +-
doc/APIchunk2.html | 9 +-
doc/APIchunk20.html | 5 +-
doc/APIchunk21.html | 13 +-
doc/APIchunk22.html | 9 +
doc/APIchunk23.html | 16 +
doc/APIchunk24.html | 34 +-
doc/APIchunk25.html | 19 +-
doc/APIchunk26.html | 20 +-
doc/APIchunk27.html | 4 +
doc/APIchunk28.html | 9 +
doc/APIchunk29.html | 2 +-
doc/APIchunk3.html | 7 +-
doc/APIchunk4.html | 5 +
doc/APIchunk5.html | 1 +
doc/APIchunk6.html | 2 +
doc/APIchunk7.html | 39 +-
doc/APIchunk8.html | 3 +-
doc/APIchunk9.html | 4 +-
doc/APIconstructors.html | 15 +
doc/APIfiles.html | 114 +-
doc/APIfunctions.html | 60 +-
doc/APIsymbols.html | 110 ++
doc/Makefile.in | 2 +
doc/XSLT.html | 3 +-
doc/apibuild.py | 1 +
doc/downloads.html | 1 +
doc/elfgcchack.xsl | 1 +
doc/examples/Makefile.in | 2 +
doc/html/book1.html | 2 +-
doc/html/index.html | 2 +-
doc/html/libxml-HTMLparser.html | 2 +
doc/html/libxml-lib.html | 2 +-
doc/html/libxml-parser.html | 46 +-
doc/html/libxml-pattern.html | 11 +-
doc/html/libxml-relaxng.html | 5 +-
doc/html/libxml-schemasInternals.html | 2 +-
doc/html/libxml-schematron.html | 77 ++
doc/html/libxml-threads.html | 2 +-
doc/html/libxml-tree.html | 2 +-
doc/html/libxml-uri.html | 5 +-
doc/html/libxml-xmlautomata.html | 5 +-
doc/html/libxml-xmlerror.html | 11 +-
doc/html/libxml-xmlexports.html | 3 +-
doc/html/libxml-xmlregexp.html | 84 +-
doc/html/libxml-xmlsave.html | 1 +
doc/html/libxml-xmlschemas.html | 5 +-
doc/html/libxml-xmlversion.html | 6 +-
doc/html/libxml-xpath.html | 5 +-
doc/index.html | 3 +-
doc/libxml2-api.xml | 545 +++++++-
doc/libxml2.xsa | 60 +-
doc/news.html | 38 +-
doc/xml.html | 47 +-
doc/xmllint.1 | 4 -
doc/xmllint.xml | 9 -
elfgcchack.h | 473 ++++++-
encoding.c | 101 +-
error.c | 32 +-
example/Makefile.in | 2 +
globals.c | 10 +-
include/Makefile.in | 2 +
include/libxml/HTMLparser.h | 4 +-
include/libxml/Makefile.am | 3 +-
include/libxml/Makefile.in | 5 +-
include/libxml/SAX2.h | 2 +-
include/libxml/parser.h | 55 +-
include/libxml/pattern.h | 4 +-
include/libxml/relaxng.h | 7 +-
include/libxml/schematron.h | 124 ++
include/libxml/threads.h | 1 -
include/libxml/tree.h | 54 +-
include/libxml/uri.h | 9 +-
include/libxml/valid.h | 4 +-
include/libxml/xmlIO.h | 16 +-
include/libxml/xmlautomata.h | 8 +
include/libxml/xmlerror.h | 23 +-
include/libxml/xmlexports.h | 21 +-
include/libxml/xmlregexp.h | 108 ++
include/libxml/xmlsave.h | 3 +-
include/libxml/xmlschemas.h | 7 +-
include/libxml/xmlversion.h | 33 +-
include/libxml/xmlversion.h.in | 23 +
include/libxml/xpath.h | 19 +
libxml.spec.in | 53 +-
libxml2.spec | 59 +-
nanoftp.c | 8 +-
nanohttp.c | 33 +-
parser.c | 287 ++++-
parserInternals.c | 4 +-
pattern.c | 129 +-
python/Makefile.in | 2 +
python/generator.py | 2 +-
python/libxml.c | 7 +-
python/libxml2-py.c | 369 +++---
python/setup.py | 2 +-
python/tests/Makefile.in | 2 +
python/tests/tstLastError.py | 12 +-
relaxng.c | 70 +-
result/HTML/Down.html | 2 -
result/HTML/Down.html.sax | 6 +-
result/HTML/attrents.html | 4 +-
result/HTML/attrents.html.sax | 4 +-
result/HTML/cf_128.html | 7 +-
result/HTML/cf_128.html.sax | 4 +-
result/HTML/doc2.htm | 4 +-
result/HTML/doc2.htm.sax | 4 +-
result/HTML/doc3.htm | 4 +-
result/HTML/doc3.htm.sax | 6 +-
result/HTML/fp40.htm | 3 +-
result/HTML/fp40.htm.sax | 8 +-
result/HTML/liclose.html | 6 +-
result/HTML/liclose.html.sax | 4 +-
result/HTML/pre.html | 4 +-
result/HTML/pre.html.sax | 4 +-
result/HTML/python.html | 3 +-
result/HTML/python.html.sax | 2 +-
result/HTML/reg1.html.sax | 4 +-
result/HTML/reg2.html.sax | 4 +-
result/HTML/reg3.html.sax | 6 +-
result/HTML/reg4.html.sax | 8 +-
result/HTML/script.html.sax | 6 +-
result/HTML/script2.html | 16 +
result/HTML/script2.html.err | 0
result/HTML/script2.html.sax | 50 +
result/HTML/test2.html | 1 +
result/HTML/test2.html.sax | 4 +-
result/HTML/test3.html | 2 +-
result/HTML/test3.html.sax | 22 +-
result/HTML/wired.html | 4 +-
result/HTML/wired.html.sax | 26 +-
result/ent2.sax | 1 +
result/ent2.sax2 | 1 +
result/ent7.sax | 1 +
result/ent7.sax2 | 1 +
result/expr/base | 85 ++
result/regexp/* | 1 +
result/relaxng/307377_0 | 0
result/relaxng/307377_0.err | 2 +
result/relaxng/307377_1 | 0
result/relaxng/307377_1.err | 3 +
result/relaxng/307377_2 | 0
result/relaxng/307377_2.err | 1 +
result/relaxng/307377_err | 1 +
result/relaxng/307377_valid | 0
result/schemas/allsg_0_0 | 1 +
result/schemas/allsg_0_0.err | 0
result/schemas/allsg_0_1 | 1 +
result/schemas/allsg_0_1.err | 0
result/schemas/allsg_0_2 | 1 +
result/schemas/allsg_0_2.err | 0
result/schemas/allsg_0_3 | 1 +
result/schemas/allsg_0_3.err | 1 +
result/schemas/allsg_0_4 | 1 +
result/schemas/allsg_0_4.err | 1 +
result/schemas/allsg_0_5 | 1 +
result/schemas/allsg_0_5.err | 1 +
result/schemas/any3_0_0.err | 2 +-
result/schemas/any5_0_0 | 1 +
result/schemas/any5_0_0.err | 1 +
result/schemas/any5_0_1 | 1 +
result/schemas/any5_0_1.err | 1 +
result/schemas/any5_0_2 | 1 +
result/schemas/any5_0_2.err | 1 +
result/schemas/any5_0_3 | 1 +
result/schemas/any5_0_3.err | 0
result/schemas/any5_0_4 | 1 +
result/schemas/any5_0_4.err | 1 +
result/schemas/any5_0_5 | 1 +
result/schemas/any5_0_5.err | 1 +
result/schemas/any5_0_6 | 1 +
result/schemas/any5_0_6.err | 1 +
result/schemas/any5_1_0 | 1 +
result/schemas/any5_1_0.err | 1 +
result/schemas/any5_1_1 | 1 +
result/schemas/any5_1_1.err | 1 +
result/schemas/any5_1_2 | 1 +
result/schemas/any5_1_2.err | 0
result/schemas/any5_1_3 | 1 +
result/schemas/any5_1_3.err | 1 +
result/schemas/any5_1_4 | 1 +
result/schemas/any5_1_4.err | 1 +
result/schemas/any5_1_5 | 1 +
result/schemas/any5_1_5.err | 0
result/schemas/any5_1_6 | 1 +
result/schemas/any5_1_6.err | 1 +
result/schemas/any6_1_0 | 1 +
result/schemas/any6_1_0.err | 0
result/schemas/any6_2_0 | 1 +
result/schemas/any6_2_0.err | 0
result/schemas/any7_1_0 | 1 +
result/schemas/any7_1_0.err | 1 +
result/schemas/any7_1_1 | 1 +
result/schemas/any7_1_1.err | 1 +
result/schemas/any7_1_2 | 1 +
result/schemas/any7_1_2.err | 0
result/schemas/any7_2_0 | 1 +
result/schemas/any7_2_0.err | 1 +
result/schemas/any7_2_1 | 1 +
result/schemas/any7_2_1.err | 1 +
result/schemas/any7_2_2 | 1 +
result/schemas/any7_2_2.err | 0
result/schemas/any8_1_0 | 1 +
result/schemas/any8_1_0.err | 0
result/schemas/bug303566_1_1.err | 2 +-
result/schemas/bug310264_0_0 | 1 +
result/schemas/bug310264_0_0.err | 0
result/schemas/bug312957_1_0 | 1 +
result/schemas/bug312957_1_0.err | 1 +
result/schemas/bug313982_0_0 | 1 +
result/schemas/bug313982_0_0.err | 0
result/schemas/extension2_1_0 | 1 +
result/schemas/extension2_1_0.err | 0
result/schematron/zvon10_0 | 4 +
result/schematron/zvon10_0.err | 5 +
result/schematron/zvon10_1 | 5 +
result/schematron/zvon10_1.err | 6 +
result/schematron/zvon11_0 | 4 +
result/schematron/zvon11_0.err | 2 +
result/schematron/zvon11_1 | 4 +
result/schematron/zvon11_1.err | 3 +
result/schematron/zvon11_2 | 4 +
result/schematron/zvon11_2.err | 3 +
result/schematron/zvon11_3 | 4 +
result/schematron/zvon11_3.err | 2 +
result/schematron/zvon12_0 | 4 +
result/schematron/zvon12_0.err | 3 +
result/schematron/zvon12_1 | 4 +
result/schematron/zvon12_1.err | 2 +
result/schematron/zvon12_2 | 4 +
result/schematron/zvon12_2.err | 3 +
result/schematron/zvon13_0 | 7 +
result/schematron/zvon13_0.err | 3 +
result/schematron/zvon13_1 | 6 +
result/schematron/zvon13_1.err | 3 +
result/schematron/zvon13_2 | 6 +
result/schematron/zvon13_2.err | 2 +
result/schematron/zvon14_0 | 13 +
result/schematron/zvon14_0.err | 4 +
result/schematron/zvon15_0 | 5 +
result/schematron/zvon15_0.err | 4 +
result/schematron/zvon16_0 | 18 +
result/schematron/zvon16_0.err | 3 +
result/schematron/zvon1_0 | 4 +
result/schematron/zvon1_0.err | 8 +
result/schematron/zvon1_1 | 4 +
result/schematron/zvon1_1.err | 8 +
result/schematron/zvon2_0 | 5 +
result/schematron/zvon2_0.err | 2 +
result/schematron/zvon2_1 | 5 +
result/schematron/zvon2_1.err | 5 +
result/schematron/zvon2_2 | 6 +
result/schematron/zvon2_2.err | 3 +
result/schematron/zvon3_0 | 9 +
result/schematron/zvon3_0.err | 6 +
result/schematron/zvon4_0 | 7 +
result/schematron/zvon4_0.err | 3 +
result/schematron/zvon4_1 | 7 +
result/schematron/zvon4_1.err | 3 +
result/schematron/zvon5_0 | 6 +
result/schematron/zvon5_0.err | 7 +
result/schematron/zvon5_1 | 6 +
result/schematron/zvon5_1.err | 5 +
result/schematron/zvon5_2 | 8 +
result/schematron/zvon5_2.err | 5 +
result/schematron/zvon6_0 | 4 +
result/schematron/zvon6_0.err | 3 +
result/schematron/zvon6_1 | 4 +
result/schematron/zvon6_1.err | 3 +
result/schematron/zvon6_2 | 4 +
result/schematron/zvon6_2.err | 3 +
result/schematron/zvon7_0 | 4 +
result/schematron/zvon7_0.err | 3 +
result/schematron/zvon7_1 | 4 +
result/schematron/zvon7_1.err | 3 +
result/schematron/zvon7_2 | 4 +
result/schematron/zvon7_2.err | 3 +
result/schematron/zvon7_3 | 4 +
result/schematron/zvon7_3.err | 3 +
result/schematron/zvon7_4 | 4 +
result/schematron/zvon7_4.err | 3 +
result/schematron/zvon8_0 | 9 +
result/schematron/zvon8_0.err | 3 +
result/schematron/zvon8_1 | 8 +
result/schematron/zvon8_1.err | 3 +
result/schematron/zvon8_2 | 8 +
result/schematron/zvon8_2.err | 3 +
result/schematron/zvon9_0 | 8 +
result/schematron/zvon9_0.err | 2 +
result/schematron/zvon9_1 | 8 +
result/schematron/zvon9_1.err | 3 +
result/schematron/zvon9_2 | 8 +
result/schematron/zvon9_2.err | 3 +
result/valid/objednavka.xml | 39 +
result/valid/objednavka.xml.err | 0
result/xml2.sax | 1 +
result/xml2.sax2 | 1 +
runsuite.c | 12 +-
runtest.c | 295 ++++-
schematron.c | 1729 +++++++++++++++++++++++++
test/HTML/script2.html | 19 +
test/expr/base | 86 ++
test/relaxng/307377.rng | 14 +
test/relaxng/307377_0.xml | 1 +
test/relaxng/307377_1.xml | 1 +
test/relaxng/307377_2.xml | 1 +
test/relaxng/docbook_0.xml | 3 +-
test/schemas/.memdump | 4 +-
test/schemas/allsg_0.xml | 7 +
test/schemas/allsg_0.xsd | 26 +
test/schemas/allsg_1.xml | 8 +
test/schemas/allsg_2.xml | 8 +
test/schemas/allsg_3.xml | 7 +
test/schemas/allsg_4.xml | 7 +
test/schemas/allsg_5.xml | 8 +
test/schemas/any5_0.xml | 7 +
test/schemas/any5_0.xsd | 13 +
test/schemas/any5_1.xml | 12 +
test/schemas/any5_1.xsd | 14 +
test/schemas/any5_2.xml | 8 +
test/schemas/any5_3.xml | 11 +
test/schemas/any5_4.xml | 12 +
test/schemas/any5_5.xml | 12 +
test/schemas/any5_6.xml | 13 +
test/schemas/any6_0.xml | 8 +
test/schemas/any6_1.xsd | 36 +
test/schemas/any6_2.xsd | 19 +
test/schemas/any7_0.xml | 19 +
test/schemas/any7_1.xml | 18 +
test/schemas/any7_1.xsd | 13 +
test/schemas/any7_2.xml | 20 +
test/schemas/any7_2.xsd | 13 +
test/schemas/any8_0.xml | 9 +
test/schemas/any8_1.xsd | 20 +
test/schemas/bug310264_0.xml | 41 +
test/schemas/bug310264_0.xsd | 18 +
test/schemas/bug312957_0.xml | 14 +
test/schemas/bug312957_1.xsd | 39 +
test/schemas/bug313982_0.xml | 4 +
test/schemas/bug313982_0.xsd | 11 +
test/schemas/extension2_0.xml | 4 +
test/schemas/extension2_1.xsd | 17 +
test/schematron/.memdump | 4 +
test/schematron/zvon1.sct | 23 +
test/schematron/zvon10.sct | 15 +
test/schematron/zvon10_0.xml | 3 +
test/schematron/zvon10_1.xml | 4 +
test/schematron/zvon11.sct | 8 +
test/schematron/zvon11_0.xml | 3 +
test/schematron/zvon11_1.xml | 3 +
test/schematron/zvon11_2.xml | 3 +
test/schematron/zvon11_3.xml | 3 +
test/schematron/zvon12.sct | 8 +
test/schematron/zvon12_0.xml | 3 +
test/schematron/zvon12_1.xml | 3 +
test/schematron/zvon12_2.xml | 3 +
test/schematron/zvon13.sct | 7 +
test/schematron/zvon13_0.xml | 6 +
test/schematron/zvon13_1.xml | 5 +
test/schematron/zvon13_2.xml | 5 +
test/schematron/zvon14.sct | 10 +
test/schematron/zvon14_0.xml | 12 +
test/schematron/zvon15.sct | 11 +
test/schematron/zvon15_0.xml | 4 +
test/schematron/zvon16.sct | 30 +
test/schematron/zvon16_0.xml | 19 +
test/schematron/zvon1_0.xml | 3 +
test/schematron/zvon1_1.xml | 3 +
test/schematron/zvon2.sct | 9 +
test/schematron/zvon2_0.xml | 4 +
test/schematron/zvon2_1.xml | 4 +
test/schematron/zvon2_2.xml | 5 +
test/schematron/zvon3.sct | 8 +
test/schematron/zvon3_0.xml | 8 +
test/schematron/zvon4.sct | 10 +
test/schematron/zvon4_0.xml | 6 +
test/schematron/zvon4_1.xml | 6 +
test/schematron/zvon5.sct | 12 +
test/schematron/zvon5_0.xml | 5 +
test/schematron/zvon5_1.xml | 5 +
test/schematron/zvon5_2.xml | 7 +
test/schematron/zvon6.sct | 8 +
test/schematron/zvon6_0.xml | 3 +
test/schematron/zvon6_1.xml | 3 +
test/schematron/zvon6_2.xml | 3 +
test/schematron/zvon7.sct | 9 +
test/schematron/zvon7_0.xml | 3 +
test/schematron/zvon7_1.xml | 3 +
test/schematron/zvon7_2.xml | 3 +
test/schematron/zvon7_3.xml | 3 +
test/schematron/zvon7_4.xml | 3 +
test/schematron/zvon8.sct | 10 +
test/schematron/zvon8_0.xml | 8 +
test/schematron/zvon8_1.xml | 7 +
test/schematron/zvon8_2.xml | 7 +
test/schematron/zvon9.sct | 9 +
test/schematron/zvon9_0.xml | 7 +
test/schematron/zvon9_1.xml | 7 +
test/schematron/zvon9_2.xml | 7 +
test/valid/dtds/objednavka.dtd | 23 +
test/valid/objednavka.xml | 39 +
testC14N.c | 4 +-
testHTML.c | 12 +-
testReader.c | 12 +-
testRegexp.c | 276 +++-
testSAX.c | 22 +-
testThreads.c | 6 +-
testXPath.c | 4 +-
testapi.c | 766 ++++++++++-
threads.c | 2 +-
tree.c | 210 ++-
uri.c | 175 ++-
valid.c | 109 +-
win32/Makefile.msvc | 2 +
win32/configure.js | 10 +
win32/libxml2.def.src | 95 ++
xinclude.c | 14 +-
xml2-config.in | 1 -
xmlIO.c | 3 +-
xmllint.c | 218 +++-
xmlmodule.c | 4 +-
xmlreader.c | 284 ++++-
xmlregexp.c | 2243 ++++++++++++++++++++++++++++++++-
xmlsave.c | 116 +-
xmlschemas.c | 1917 ++++++++++++++++++----------
xmlschemastypes.c | 138 +-
xmlstring.c | 2 +-
xmlunicode.c | 4 +-
xmlwriter.c | 38 +-
xpath.c | 94 +-
xpointer.c | 2 +-
xstc/Makefile.in | 2 +
453 files changed, 13807 insertions(+), 2172 deletions(-)
create mode 100644 doc/html/libxml-schematron.html
create mode 100644 include/libxml/schematron.h
create mode 100644 result/HTML/script2.html
create mode 100644 result/HTML/script2.html.err
create mode 100644 result/HTML/script2.html.sax
create mode 100644 result/expr/base
create mode 100644 result/regexp/*
create mode 100644 result/relaxng/307377_0
create mode 100644 result/relaxng/307377_0.err
create mode 100644 result/relaxng/307377_1
create mode 100644 result/relaxng/307377_1.err
create mode 100644 result/relaxng/307377_2
create mode 100644 result/relaxng/307377_2.err
create mode 100644 result/relaxng/307377_err
create mode 100644 result/relaxng/307377_valid
create mode 100644 result/schemas/allsg_0_0
create mode 100644 result/schemas/allsg_0_0.err
create mode 100644 result/schemas/allsg_0_1
create mode 100644 result/schemas/allsg_0_1.err
create mode 100644 result/schemas/allsg_0_2
create mode 100644 result/schemas/allsg_0_2.err
create mode 100644 result/schemas/allsg_0_3
create mode 100644 result/schemas/allsg_0_3.err
create mode 100644 result/schemas/allsg_0_4
create mode 100644 result/schemas/allsg_0_4.err
create mode 100644 result/schemas/allsg_0_5
create mode 100644 result/schemas/allsg_0_5.err
create mode 100644 result/schemas/any5_0_0
create mode 100644 result/schemas/any5_0_0.err
create mode 100644 result/schemas/any5_0_1
create mode 100644 result/schemas/any5_0_1.err
create mode 100644 result/schemas/any5_0_2
create mode 100644 result/schemas/any5_0_2.err
create mode 100644 result/schemas/any5_0_3
create mode 100644 result/schemas/any5_0_3.err
create mode 100644 result/schemas/any5_0_4
create mode 100644 result/schemas/any5_0_4.err
create mode 100644 result/schemas/any5_0_5
create mode 100644 result/schemas/any5_0_5.err
create mode 100644 result/schemas/any5_0_6
create mode 100644 result/schemas/any5_0_6.err
create mode 100644 result/schemas/any5_1_0
create mode 100644 result/schemas/any5_1_0.err
create mode 100644 result/schemas/any5_1_1
create mode 100644 result/schemas/any5_1_1.err
create mode 100644 result/schemas/any5_1_2
create mode 100644 result/schemas/any5_1_2.err
create mode 100644 result/schemas/any5_1_3
create mode 100644 result/schemas/any5_1_3.err
create mode 100644 result/schemas/any5_1_4
create mode 100644 result/schemas/any5_1_4.err
create mode 100644 result/schemas/any5_1_5
create mode 100644 result/schemas/any5_1_5.err
create mode 100644 result/schemas/any5_1_6
create mode 100644 result/schemas/any5_1_6.err
create mode 100644 result/schemas/any6_1_0
create mode 100644 result/schemas/any6_1_0.err
create mode 100644 result/schemas/any6_2_0
create mode 100644 result/schemas/any6_2_0.err
create mode 100644 result/schemas/any7_1_0
create mode 100644 result/schemas/any7_1_0.err
create mode 100644 result/schemas/any7_1_1
create mode 100644 result/schemas/any7_1_1.err
create mode 100644 result/schemas/any7_1_2
create mode 100644 result/schemas/any7_1_2.err
create mode 100644 result/schemas/any7_2_0
create mode 100644 result/schemas/any7_2_0.err
create mode 100644 result/schemas/any7_2_1
create mode 100644 result/schemas/any7_2_1.err
create mode 100644 result/schemas/any7_2_2
create mode 100644 result/schemas/any7_2_2.err
create mode 100644 result/schemas/any8_1_0
create mode 100644 result/schemas/any8_1_0.err
create mode 100644 result/schemas/bug310264_0_0
create mode 100644 result/schemas/bug310264_0_0.err
create mode 100644 result/schemas/bug312957_1_0
create mode 100644 result/schemas/bug312957_1_0.err
create mode 100644 result/schemas/bug313982_0_0
create mode 100644 result/schemas/bug313982_0_0.err
create mode 100644 result/schemas/extension2_1_0
create mode 100644 result/schemas/extension2_1_0.err
create mode 100644 result/schematron/zvon10_0
create mode 100644 result/schematron/zvon10_0.err
create mode 100644 result/schematron/zvon10_1
create mode 100644 result/schematron/zvon10_1.err
create mode 100644 result/schematron/zvon11_0
create mode 100644 result/schematron/zvon11_0.err
create mode 100644 result/schematron/zvon11_1
create mode 100644 result/schematron/zvon11_1.err
create mode 100644 result/schematron/zvon11_2
create mode 100644 result/schematron/zvon11_2.err
create mode 100644 result/schematron/zvon11_3
create mode 100644 result/schematron/zvon11_3.err
create mode 100644 result/schematron/zvon12_0
create mode 100644 result/schematron/zvon12_0.err
create mode 100644 result/schematron/zvon12_1
create mode 100644 result/schematron/zvon12_1.err
create mode 100644 result/schematron/zvon12_2
create mode 100644 result/schematron/zvon12_2.err
create mode 100644 result/schematron/zvon13_0
create mode 100644 result/schematron/zvon13_0.err
create mode 100644 result/schematron/zvon13_1
create mode 100644 result/schematron/zvon13_1.err
create mode 100644 result/schematron/zvon13_2
create mode 100644 result/schematron/zvon13_2.err
create mode 100644 result/schematron/zvon14_0
create mode 100644 result/schematron/zvon14_0.err
create mode 100644 result/schematron/zvon15_0
create mode 100644 result/schematron/zvon15_0.err
create mode 100644 result/schematron/zvon16_0
create mode 100644 result/schematron/zvon16_0.err
create mode 100644 result/schematron/zvon1_0
create mode 100644 result/schematron/zvon1_0.err
create mode 100644 result/schematron/zvon1_1
create mode 100644 result/schematron/zvon1_1.err
create mode 100644 result/schematron/zvon2_0
create mode 100644 result/schematron/zvon2_0.err
create mode 100644 result/schematron/zvon2_1
create mode 100644 result/schematron/zvon2_1.err
create mode 100644 result/schematron/zvon2_2
create mode 100644 result/schematron/zvon2_2.err
create mode 100644 result/schematron/zvon3_0
create mode 100644 result/schematron/zvon3_0.err
create mode 100644 result/schematron/zvon4_0
create mode 100644 result/schematron/zvon4_0.err
create mode 100644 result/schematron/zvon4_1
create mode 100644 result/schematron/zvon4_1.err
create mode 100644 result/schematron/zvon5_0
create mode 100644 result/schematron/zvon5_0.err
create mode 100644 result/schematron/zvon5_1
create mode 100644 result/schematron/zvon5_1.err
create mode 100644 result/schematron/zvon5_2
create mode 100644 result/schematron/zvon5_2.err
create mode 100644 result/schematron/zvon6_0
create mode 100644 result/schematron/zvon6_0.err
create mode 100644 result/schematron/zvon6_1
create mode 100644 result/schematron/zvon6_1.err
create mode 100644 result/schematron/zvon6_2
create mode 100644 result/schematron/zvon6_2.err
create mode 100644 result/schematron/zvon7_0
create mode 100644 result/schematron/zvon7_0.err
create mode 100644 result/schematron/zvon7_1
create mode 100644 result/schematron/zvon7_1.err
create mode 100644 result/schematron/zvon7_2
create mode 100644 result/schematron/zvon7_2.err
create mode 100644 result/schematron/zvon7_3
create mode 100644 result/schematron/zvon7_3.err
create mode 100644 result/schematron/zvon7_4
create mode 100644 result/schematron/zvon7_4.err
create mode 100644 result/schematron/zvon8_0
create mode 100644 result/schematron/zvon8_0.err
create mode 100644 result/schematron/zvon8_1
create mode 100644 result/schematron/zvon8_1.err
create mode 100644 result/schematron/zvon8_2
create mode 100644 result/schematron/zvon8_2.err
create mode 100644 result/schematron/zvon9_0
create mode 100644 result/schematron/zvon9_0.err
create mode 100644 result/schematron/zvon9_1
create mode 100644 result/schematron/zvon9_1.err
create mode 100644 result/schematron/zvon9_2
create mode 100644 result/schematron/zvon9_2.err
create mode 100644 result/valid/objednavka.xml
create mode 100644 result/valid/objednavka.xml.err
create mode 100644 schematron.c
create mode 100644 test/HTML/script2.html
create mode 100644 test/expr/base
create mode 100644 test/relaxng/307377.rng
create mode 100644 test/relaxng/307377_0.xml
create mode 100644 test/relaxng/307377_1.xml
create mode 100644 test/relaxng/307377_2.xml
create mode 100644 test/schemas/allsg_0.xml
create mode 100644 test/schemas/allsg_0.xsd
create mode 100644 test/schemas/allsg_1.xml
create mode 100644 test/schemas/allsg_2.xml
create mode 100644 test/schemas/allsg_3.xml
create mode 100644 test/schemas/allsg_4.xml
create mode 100644 test/schemas/allsg_5.xml
create mode 100644 test/schemas/any5_0.xml
create mode 100644 test/schemas/any5_0.xsd
create mode 100644 test/schemas/any5_1.xml
create mode 100644 test/schemas/any5_1.xsd
create mode 100644 test/schemas/any5_2.xml
create mode 100644 test/schemas/any5_3.xml
create mode 100644 test/schemas/any5_4.xml
create mode 100644 test/schemas/any5_5.xml
create mode 100644 test/schemas/any5_6.xml
create mode 100755 test/schemas/any6_0.xml
create mode 100644 test/schemas/any6_1.xsd
create mode 100644 test/schemas/any6_2.xsd
create mode 100755 test/schemas/any7_0.xml
create mode 100755 test/schemas/any7_1.xml
create mode 100755 test/schemas/any7_1.xsd
create mode 100644 test/schemas/any7_2.xml
create mode 100755 test/schemas/any7_2.xsd
create mode 100644 test/schemas/any8_0.xml
create mode 100644 test/schemas/any8_1.xsd
create mode 100644 test/schemas/bug310264_0.xml
create mode 100644 test/schemas/bug310264_0.xsd
create mode 100644 test/schemas/bug312957_0.xml
create mode 100644 test/schemas/bug312957_1.xsd
create mode 100644 test/schemas/bug313982_0.xml
create mode 100644 test/schemas/bug313982_0.xsd
create mode 100644 test/schemas/extension2_0.xml
create mode 100644 test/schemas/extension2_1.xsd
create mode 100644 test/schematron/.memdump
create mode 100644 test/schematron/zvon1.sct
create mode 100644 test/schematron/zvon10.sct
create mode 100644 test/schematron/zvon10_0.xml
create mode 100644 test/schematron/zvon10_1.xml
create mode 100644 test/schematron/zvon11.sct
create mode 100644 test/schematron/zvon11_0.xml
create mode 100644 test/schematron/zvon11_1.xml
create mode 100644 test/schematron/zvon11_2.xml
create mode 100644 test/schematron/zvon11_3.xml
create mode 100644 test/schematron/zvon12.sct
create mode 100644 test/schematron/zvon12_0.xml
create mode 100644 test/schematron/zvon12_1.xml
create mode 100644 test/schematron/zvon12_2.xml
create mode 100644 test/schematron/zvon13.sct
create mode 100644 test/schematron/zvon13_0.xml
create mode 100644 test/schematron/zvon13_1.xml
create mode 100644 test/schematron/zvon13_2.xml
create mode 100644 test/schematron/zvon14.sct
create mode 100644 test/schematron/zvon14_0.xml
create mode 100644 test/schematron/zvon15.sct
create mode 100644 test/schematron/zvon15_0.xml
create mode 100644 test/schematron/zvon16.sct
create mode 100644 test/schematron/zvon16_0.xml
create mode 100644 test/schematron/zvon1_0.xml
create mode 100644 test/schematron/zvon1_1.xml
create mode 100644 test/schematron/zvon2.sct
create mode 100644 test/schematron/zvon2_0.xml
create mode 100644 test/schematron/zvon2_1.xml
create mode 100644 test/schematron/zvon2_2.xml
create mode 100644 test/schematron/zvon3.sct
create mode 100644 test/schematron/zvon3_0.xml
create mode 100644 test/schematron/zvon4.sct
create mode 100644 test/schematron/zvon4_0.xml
create mode 100644 test/schematron/zvon4_1.xml
create mode 100644 test/schematron/zvon5.sct
create mode 100644 test/schematron/zvon5_0.xml
create mode 100644 test/schematron/zvon5_1.xml
create mode 100644 test/schematron/zvon5_2.xml
create mode 100644 test/schematron/zvon6.sct
create mode 100644 test/schematron/zvon6_0.xml
create mode 100644 test/schematron/zvon6_1.xml
create mode 100644 test/schematron/zvon6_2.xml
create mode 100644 test/schematron/zvon7.sct
create mode 100644 test/schematron/zvon7_0.xml
create mode 100644 test/schematron/zvon7_1.xml
create mode 100644 test/schematron/zvon7_2.xml
create mode 100644 test/schematron/zvon7_3.xml
create mode 100644 test/schematron/zvon7_4.xml
create mode 100644 test/schematron/zvon8.sct
create mode 100644 test/schematron/zvon8_0.xml
create mode 100644 test/schematron/zvon8_1.xml
create mode 100644 test/schematron/zvon8_2.xml
create mode 100644 test/schematron/zvon9.sct
create mode 100644 test/schematron/zvon9_0.xml
create mode 100644 test/schematron/zvon9_1.xml
create mode 100644 test/schematron/zvon9_2.xml
create mode 100644 test/valid/dtds/objednavka.dtd
create mode 100644 test/valid/objednavka.xml
(limited to 'testRegexp.c')
diff --git a/ChangeLog b/ChangeLog
index 3ff031e..6b29e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,616 @@
+Sun Sep 4 23:36:45 CEST 2005 Daniel Veillard
+
+ * NEWS elfgcchack.h testapi.c doc/*: updated the docs and rebuild
+ releasing 2.6.21
+ * include/libxml/threads.h threads.c: removed xmlIsThreadsEnabled()
+ * threads.c include/libxml/threads.h xmllint.c: added the more
+ generic xmlHasFeature() as suggested by Bjorn Reese, xmllint uses it.
+
+Sun Sep 4 22:45:49 CEST 2005 Daniel Veillard
+
+ * configure.in doc/* configure.in: prepare for release
+ * xpath.c: work for #303289, fix a formatting bug for MIN_INT
+
+Sun Sep 4 15:48:57 CEST 2005 Daniel Veillard
+
+ * relaxng.c: real fix for #314881 and #314759 is was a bit more complex
+ than initially expected as ctxt->error == NULL had behaviour side
+ effects at the compilation level itself.
+
+Sun Sep 4 14:01:00 CEST 2005 Daniel Veillard
+
+ * pattern.c xpath.c include/libxml/pattern.h: fixing yet another
+ pattern induced XPath bug #314282
+ * relaxng.c: reverted back last change it was seriously broken
+
+Sat Sep 3 16:51:55 CEST 2005 Rob Richards
+
+ * xmlsave.c: check for NULL to prevent crash with meta elements
+
+Sat Sep 3 16:26:55 CEST 2005 Daniel Veillard
+
+ * relaxng.c: structured error reporting problem with Relax-NG
+ should fix #314881 and #314759
+
+Sat Sep 3 15:42:29 CEST 2005 Daniel Veillard
+
+ * pattern.c: fixes a portability problem raised by C370 on Z/OS
+
+Sat Sep 3 15:26:31 CEST 2005 Daniel Veillard
+
+ * SAX2.c tree.c valid.c: fixing a number of issues raised by xml:id
+ but more generally related to attributes and ID handling, fixes
+ #314358 among other things
+
+Fri Sep 2 14:26:43 CEST 2005 Daniel Veillard
+
+ * encoding.c parserInternals.c: avoid passing a char[] as snprintf
+ first argument.
+ * threads.c include/libxml/threads.h: implemented xmlIsThreadsEnabled()
+ based on Andrew W. Nosenko idea.
+ * doc/* elfgcchack.h: regenerated the API
+
+Thu Sep 1 14:44:42 CEST 2005 Daniel Veillard
+
+ * configure.in: the use of AM_PATH_PYTHON is not portable enough
+ reverting back to AM_PATH_PROG
+
+Thu Sep 1 11:42:39 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c: Applied the last patch from Gary Coady for #304637
+ changing the behaviour when text nodes are found in body
+ * result/HTML/*: this changes the output of some tests
+
+Thu Sep 1 11:22:37 CEST 2005 Daniel Veillard
+
+ * doc/downloads.html doc/xml.html: adding reference to Bull AIX rpms
+ c.f. #160598
+
+Wed Aug 31 11:39:02 CEST 2005 Daniel Veillard
+
+ * xml2-config.in: removed the obsolete --libtool-libs option, c.f.
+ bug #314853
+
+Fri Aug 26 17:33:26 CEST 2005 Rob Richards
+
+ * xmlsave.c: move handling of meta element for http-equiv in XHTML docs
+ to serialization and no longer modify internal tree.
+
+Fri Aug 26 00:51:58 CEST 2005 Daniel Veillard
+
+ * libxml.spec.in: the profiling usually don't work, disabled
+ * doc/*: rebuilt
+
+Thu Aug 25 23:47:55 CEST 2005 Daniel Veillard
+
+ * configure.in: trying to fix the first part of #310033 by
+ detecting gcc <= 3.2
+
+Thu Aug 25 22:13:37 CEST 2005 Daniel Veillard
+
+ * error.c: fixed bug #310033, the URI extraction code given a
+ node is a bit twisted and broke in the last months.
+
+Thu Aug 25 16:18:15 CEST 2005 Daniel Veillard
+
+ * debugXML.c result/XPath/xptr/strrange2: uninitialized field and
+ fix on test.
+
+Thu Aug 25 16:03:05 CEST 2005 Daniel Veillard
+
+ * debugXML.c: change verbosity depending on API
+ * result/XPath/tests/* result/XPath/xptr/* result/xmlid/*: get back
+ to previous outputs
+
+Thu Aug 25 15:14:56 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c parser.c SAX2.c debugXML.c tree.c valid.c xmlreader.c
+ xmllint.c include/libxml/HTMLparser.h include/libxml/parser.h:
+ added a parser XML_PARSE_COMPACT option to allocate small
+ text nodes (less than 8 bytes on 32bits, less than 16bytes on 64bits)
+ directly within the node, various changes to cope with this.
+ * result/XPath/tests/* result/XPath/xptr/* result/xmlid/*: this
+ slightly change the output
+
+Thu Aug 25 12:16:26 CEST 2005 Daniel Veillard
+
+ * configure.in: patch from Andrew W. Nosenko, use se $GCC = 'yes'
+ instead of $CC = 'gcc' because GCC may have a different name
+
+Thu Aug 25 00:18:20 CEST 2005 Daniel Veillard
+
+ * configure.in: changes the way the python binary is found, should
+ also fix bug #308004
+
+Wed Aug 24 16:44:41 CEST 2005 Daniel Veillard
+
+ * parser.c: found another bug while looking at #309616 on missing
+ entities.
+ * result/ent2.sax* result/ent7.sax* result/xml2.sax*: this changed the
+ SAX stream in missing conditions for a few tests
+
+Wed Aug 24 16:19:00 CEST 2005 Daniel Veillard
+
+ * encoding.c: applied the patch suggested #309565 which can avoid
+ looping in error conditions.
+
+Wed Aug 24 16:04:17 CEST 2005 Daniel Veillard
+
+ * SAX2.c tree.c: line numbers are now carried by most nodes, fixing
+ xmlGetLineNo() c.f. bug #309205
+
+Wed Aug 24 14:43:34 CEST 2005 Daniel Veillard
+
+ * encoding.c error.c include/libxml/xmlerror.h: finally converted
+ the encoding module to the common error reporting mechanism
+ * doc/* doc/html/libxml-xmlerror.html: rebuilt
+
+Wed Aug 24 11:35:26 CEST 2005 Daniel Veillard
+
+ * xpath.c: removed a potentially uninitialized variable error
+ * python/generator.py: fixed a deprecation warning
+ * python/tests/tstLastError.py: silent the damn test when Okay !
+
+Wed Aug 24 00:11:16 CEST 2005 Daniel Veillard
+
+ * SAX2.c globals.c runtest.c testC14N.c testapi.c tree.c
+ include/libxml/SAX2.h include/libxml/xmlregexp.h: fixed compilation
+ when configured --without-sax1 and other cleanups fixes bug #172683
+ * doc/* elfgcchack.h: regenerated
+
+Tue Aug 23 20:05:05 CEST 2005 Daniel Veillard
+
+ * parser.c: fixed bug #170489 reported by Jirka Kosek
+ * test/valid/objednavka.xml test/valid/dtds/objednavka.dtd
+ result/valid/objednavka*: added the test to the regression suite.
+
+Tue Aug 23 18:04:08 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c include/libxml/HTMLparser.h: added a recovery mode
+ for the HTML parser based on the suggestions of bug #169834 by
+ Paul Loberg
+
+Tue Aug 23 15:38:46 CEST 2005 Daniel Veillard
+
+ * elfgcchack.h testapi.c doc/*: regenerated
+ * schematron.c: fixed a compilation problem
+ * xmlregexp.c include/libxml/xmlregexp.h: some cleanups and one bug fix
+ * result/expr/base: slightly changes the number of Cons.
+
+Mon Aug 22 23:19:50 CEST 2005 Daniel Veillard
+
+ * elfgcchack.h testapi.c doc/*: rescanned code and rebuilt
+ * xmlregexp.c: small cleanup
+ * include/libxml/schematron.h include/libxml/xmlexports.h
+ include/libxml/xmlversion.h.in: cleanup problems from code scanner
+
+Mon Aug 22 18:00:18 CEST 2005 Daniel Veillard
+
+ * xmlschemastypes.c: applied patch from Kuba Nowakowski fixing bug
+ #313982
+ * result/schemas/bug313982* test/schemas/bug313982*: also added
+ the test case to the regression suite.
+
+Mon Aug 22 17:50:20 CEST 2005 Daniel Veillard
+
+ * testRegexp.c: printed the wrong string
+
+Mon Aug 22 16:42:07 CEST 2005 Daniel Veillard
+
+ * testRegexp.c xmlregexp.c include/libxml/xmlregexp.h: exported
+ xmlExpExpDerive(), added it to the testRegexp command line
+ tool when providing multiple expressions.
+
+Mon Aug 22 14:57:13 CEST 2005 Daniel Veillard
+
+ * Makefile.am result/expr/base test/expr/base: added the first
+ regression test suite set for the new expression support
+
+Mon Aug 22 13:49:18 CEST 2005 Daniel Veillard
+
+ * valid.c: fixed an uninitialized variable
+ * xmlregexp.c include/libxml/xmlregexp.h: extended the API to
+ add the parser, serializer and some debugging
+ * include/libxml/xmlversion.h.in: made the new support compiled
+ by default if Schemas is included
+ * testRegexp.c: cleanup and integration of the first part of the
+ new code with a special switch
+ * xmllint.c: show up Expr in --version if compiled in
+ * include/libxml/tree.h: moved the xmlBuffer definition up
+
+Mon Aug 22 12:11:10 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Some preparation for the creation of a graph
+ of imported/included/redefined schemas; this is needed for
+ at least the redefinitions.
+ Centralized the creation of the parser context in one function.
+
+Mon Aug 22 02:19:33 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c include/libxml/xmlregexp.h: pushing the formal expression
+ handling code to have it in CVs from now. Not plugged, and misses
+ APIs it's not compiled in yet.
+
+Sat Aug 20 23:13:27 CEST 2005 Daniel Veillard
+
+ * xmlreader.c: applied another patch from Rob Richards to fix
+ xmlTextReaderGetAttributeNs and xmlTextReaderMoveToAttributeNs
+
+Wed Aug 17 09:06:33 CEST 2005 Daniel Veillard
+
+ * xmlreader.c: applied patch from Rob Richards to fix
+ xmlTextReaderGetAttribute behaviour with namespace declarations
+
+Fri Aug 12 14:12:56 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c include/libxml/xmlerror.h:
+ Changed output for keyref-match errors; the target-node will
+ be now reported rather than the scope-node of the keyref
+ definition - allowing easier chasing of instance errors.
+ This was reported by Guy Fabrice to the mailing list.
+ Some initial parsing code for schema redefinitions.
+ * result/schemas/bug303566_1_1.err
+ result/schemas/bug312957_1_0.err: Adapted test results due
+ to the keyref changes.
+
+Fri Aug 12 12:17:52 CEST 2005 Daniel Veillard
+
+ * valid.c: applied patch from Derek Poon fixing bug #310692
+
+Wed Aug 10 23:39:02 CEST 2005 Daniel Veillard
+
+ * xmlschemas.c: fix for bug #312945 as pointed by Dean Hill, the
+ context type was not always properly initialized.
+
+Wed Aug 10 18:21:41 CEST 2005 Daniel Veillard
+
+ * relaxng.c: fixed bug #307377 about validation of choices in
+ list values.
+ * test/relaxng/307377* result/relaxng/307377* Makefile.am runtest.c:
+ added examples to the regression tests, problem is that streaming
+ version gives slightly more informations.
+
+Wed Aug 10 15:25:53 CEST 2005 Daniel Veillard
+
+ * xinclude.c: fixed bug #302302, nasty but the fix is rather simple.
+
+Wed Aug 10 11:59:46 CEST 2005 Kasimier Buchcik
+
+ * result/schemas/any6_1_0*: Added missing test results.
+
+Tue Aug 9 23:37:22 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c: fixed a determinism detection problem exposed by
+ ##other tests commited by Kasimier, also added a small speedup
+ of determinism detection.
+ * test/results/any6_2_0* any8_1_0* any7_1_2* any7_2_2*: added
+ the results to the regression tests now
+
+Tue Aug 9 15:54:09 CEST 2005 Kasimier Buchcik
+
+ * test/schemas/any7_2.xml test/schemas/any6_2.xsd
+ test/schemas/any8_1.xsd test/schemas/any8_0.xml:
+ Added some more tests for element wildcards.
+
+Tue Aug 9 14:22:47 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Fixed #312957 reported by Carol Hunter:
+ streaming XPath states were not popped in every case,
+ thus failed to resolve correctly for subsequent input.
+ * test/schemas/bug312957* result/schemas/bug312957*:
+ Added the test submitted by Carol Hunter.
+
+Tue Aug 9 13:07:27 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c xmlschemas.c: trying to nail down the remaining
+ ##other issues
+ * result/schemas/any7* test/schemas/any7: completed the tests
+ and added the results
+ * result/schemas/any3_0_0.err result/schemas/any5_0_0.err
+ result/schemas/any5_1_0.err: this slightly chnages the output
+ from 3 existing tests
+
+Mon Aug 8 22:33:08 CEST 2005 Daniel Veillard
+
+ * nanoftp.c nanohttp.c xmlschemastypes.c: applied patch from
+ Marcus Boerger to remove warnings on Windows.
+
+Mon Aug 8 16:43:04 CEST 2005 Daniel Veillard
+
+ * xmlsave.c include/libxml/xmlsave.h: fixed #145092 by adding
+ an xmlSaveOption to omit XML declaration
+
+Mon Aug 8 15:44:54 CEST 2005 Daniel Veillard
+
+ * HTMLtree.c: fixed bug #310333 with a patch close to the provided
+ patch for HTML UTF-8 serialization
+ * result/HTML/script2.html: this changed the output of that test
+
+Mon Aug 8 15:01:51 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c: fixed bug #310264, basically it's about reentrancy
+ of count based transition, when going though the counter must
+ be reset to 0
+ * test/schemas/bug310264* result/schemas/bug310264*: added the
+ regression test.
+
+Mon Aug 8 14:40:52 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Fixed a memory leak: xmlSchemaFreeAnnot() was
+ only freeing the first annotation in the list.
+
+Mon Aug 8 09:44:34 CEST 2005 Daniel Veillard
+
+ * xmlreader.c: applied patch from Rob Richards fixing
+ xmlTextReaderGetAttribute
+
+Mon Aug 8 01:41:53 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c: fixed an uninitialized memory access spotted by
+ valgrind
+
+Sun Aug 7 12:39:35 CEST 2005 Daniel Veillard
+
+ * test/relaxng/docbook_0.xml: get rid of the dependancy on a locally
+ installed DTD
+ * uri.c include/libxml/uri.h xmlIO.c nanoftp.c nanohttp.c: try to
+ cleanup the Path/URI conversion mess, needed fixing in various
+ layers and a new API to the uri module which also fixes #306861
+ * runtest.c: integrated a regression test specific to check the
+ URI conversions done before calling the I/O handlers.
+
+Sat Aug 6 11:06:24 CEST 2005 Daniel Veillard
+
+ * doc/XSLT.html doc/xml.html: small doc fix for #312647
+
+Tue Aug 2 13:26:42 CEST 2005 Daniel Veillard
+
+ * win32/configure.js: applied patch from Rob Richards to allow
+ disabling modules in win32, fixes #304071
+
+Mon Aug 1 07:18:53 CEST 2005 Daniel Veillard
+
+ * python/libxml.c: applied fix from Jakub Piotr Clapa for
+ xmlAttr.parent(), closing #312181
+
+Sun Jul 31 18:48:55 CEST 2005 Daniel Veillard
+
+ * schematron.c: report improvement
+ * test/schematron/zvon* result/schematron/zvon*: more tests
+
+Sun Jul 31 16:02:59 CEST 2005 Daniel Veillard
+
+ * win32/Makefile.msvc win32/configure.js: applied patch from Rob
+ Richards to add schematron to the build on Windows
+ * test/schematron/zvon3* result/schematron/zvon3*: second test
+ * test/schematron/zvon10* result/schematron/zvon10*: this is the
+ real second test 10 and 2 are swapped.
+
+Sun Jul 31 15:42:31 CEST 2005 Daniel Veillard
+
+ * schematron.c: more bug fixes, improve the error reporting.
+ * test/schematron/zvon2* result/schematron/zvon2*: second test
+
+Sun Jul 31 14:15:31 CEST 2005 Daniel Veillard
+
+ * schematron.c xmllint.c: fixing the loop bug, fixing schematron
+ text error rendering
+ * Makefile.am result/schematron/* test/schematron/zvon1*.sct:
+ started integrating within "make tests"
+
+Sat Jul 30 17:26:58 EDT 2005 Daniel Veillard
+
+ * test/schematron/*: a few first tests from Zvon unfortunately
+ with the old syntax
+
+Sat Jul 30 17:08:07 EDT 2005 Daniel Veillard
+
+ * schematron.c xmllint.c include/libxml/schematron.h: commiting
+ work done on the plane last week-end
+
+Sat Jul 30 15:16:29 CEST 2005 Daniel Veillard
+
+ * runtest.c: allows an extra argument to subset the tests
+ * xmlregexp.c: big speedup for validation, basically avoided
+ transition creation explosion when removing epsilon transition
+
+Sat Jul 30 00:00:46 CEST 2005 Daniel Veillard
+
+ * Makefile.am globals.c parserInternals.c xmlreader.c xmlunicode.c
+ xmlwriter.c: more cleanups based on sparse reports, added
+ "make sparse"
+
+Fri Jul 29 12:11:25 CEST 2005 Daniel Veillard
+
+ * python/libxml.c: don't output any message on failed resolver lookups,
+ better done by the python user provided resolver layer.
+
+Fri Jul 29 01:48:02 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c SAX2.c encoding.c globals.c parser.c relaxng.c
+ runsuite.c runtest.c schematron.c testHTML.c testReader.c
+ testRegexp.c testSAX.c testThreads.c valid.c xinclude.c xmlIO.c
+ xmllint.c xmlmodule.c xmlschemas.c xpath.c xpointer.c: a lot of
+ small cleanups based on Linus' sparse check output.
+
+Thu Jul 28 21:28:33 CEST 2005 Daniel Veillard
+
+ * include/libxml/Makefile.am: added schematron.h, oops ...
+
+Thu Jul 28 02:38:21 CEST 2005 Kasimier Buchcik
+
+ * xmlschemastypes.c: Added creation of the content type of
+ xs:anyType. This is needed when trying to extend xs:anyType
+ (although it makes no sense to extend it; IMHO the schema
+ people should have ruled this out). This was reported
+ by Yong Chen to the mailing list.
+ * xmlschemas.c: Fixed handling of xs:anyType in
+ xmlSchemaCheckCOSCTExtends() (reported by Young Chen). Tiny
+ adjustment to an error report output.
+ * test/schemas/extension2* result/schemas/extension2*:
+ Added a test case provided by Young Chen.
+
+Mon Jul 25 11:41:18 PDT 2005 William Brack
+
+ * uri.c: enhanced xmlBuildRelativeURI to allow the URI and the
+ base to be in "relative" form
+
+Sun Jul 24 10:25:41 EDT 2005 Daniel Veillard
+
+ * schematron.c xmllint.c: started adding schematron to the xmllint
+ tool, the report infrastructure is gonna be fun.
+
+Sat Jul 23 23:23:51 CEST 2005 Kasimier Buchcik
+
+ * test/schemas/any6* test/schemas/any7*: Added regression tests
+ (they fail currently), but did not added results yet.
+
+Sat Jul 23 23:07:05 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Removed the workaround code in
+ xmlSchemaValidateElemWildcard() for the wildcard
+ with namespace == ##other. Support for such wildcards was
+ implemented by Daniel at the automaton level recently, and
+ the workaround code iterfered with it.
+
+Sat Jul 23 10:55:50 EDT 2005 Daniel Veillard
+
+ * pattern.c include/libxml/pattern.h: changed xmlPatterncompile
+ signature to pass an int and not an enum since it can generate
+ ABI compat troubles.
+ * include/libxml/schematron.h schematron.c: adding the new
+ schematron code, work in progress lots to be left and needing
+ testing
+ * include/libxml/xmlversion.h.in include/libxml/xmlwin32version.h.in
+ Makefile.am configure.in: integration of schematron into the
+ build
+ * xpath.c include/libxml/xpath.h: adding flags to control compilation
+ options right now just XML_XPATH_CHECKNS.
+
+Sat Jul 23 16:39:35 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Removed an "internal error" message from
+ xmlSchemaBuildAContentModel() when an empty model group
+ definition is hit.
+
+Sat Jul 23 00:34:07 CEST 2005 Kasimier Buchcik
+
+ * pattern.c: Changed xmlCompileStepPattern() and
+ xmlCompileAttributeTest() to handle the "xml" prefix without
+ caring if the XML namespace was supplied by the user.
+
+Fri Jul 22 00:08:43 CEST 2005 Kasimier Buchcik
+
+ * xmlschemas.c: Fixed xmlSchemaPSimpleTypeErr(), which did not
+ output the given string arguments correctly.
+
+Thu Jul 21 09:21:00 EDT 2005 Daniel Veillard
+
+ * error.c globals.c parser.c runtest.c testHTML.c testSAX.c
+ threads.c valid.c xmllint.c xmlreader.c xmlschemas.c xmlstring.c
+ xmlwriter.c include/libxml/parser.h include/libxml/relaxng.h
+ include/libxml/valid.h include/libxml/xmlIO.h
+ include/libxml/xmlerror.h include/libxml/xmlexports.h
+ include/libxml/xmlschemas.h: applied a patch from Marcus Boerger
+ to fix problems with calling conventions on Windows this should
+ fix #309757
+
+Wed Jul 20 14:45:39 CEST 2005 Daniel Veillard
+
+ * parser.c: an optimization of the char data inner loop,
+ can gain up to 10% in pure SAX2 parsing speed
+ * xmlschemas.c: applied patch from Kupriyanov Anatolij fixing
+ a bug in XML Schemas facet comparison #310893
+
+Tue Jul 19 17:27:26 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c xmlschemas.c: fixed the error reporting for
+ not transitions
+ * result/schemas/any5_0_0* result/schemas/any5_0_2*
+ result/schemas/any5_1_0*: fixed output
+
+Tue Jul 19 15:34:12 CEST 2005 Daniel Veillard
+
+ * xmlregexp.c xmlschemas.c include/libxml/xmlautomata.h: fixing
+ bug #172215 about foreign namespaces by adding support for
+ negated string transitions. Error messages still need to be
+ improved.
+ * test/schemas/any5* result/schemas/any5*: adding regression
+ tests for this.
+
+Tue Jul 19 12:33:31 CEST 2005 Daniel Veillard
+
+ * tree.c: applied patch from Alexander Pohoyda fixing xmlGetNodePath
+ on namespaced attributes #310417.
+
+Mon Jul 18 23:01:15 CEST 2005 Daniel Veillard
+
+ * doc/xmllint.1 doc/xmllint.html doc/xmllint.xml: --nonet was
+ ducplicated
+
+Mon Jul 18 20:49:28 CEST 2005 Daniel Veillard
+
+ * xmlschemas.c: fixed xsd:all when used in conjunction with
+ substitution groups
+ * test/schemas/allsg_* result/schemas/allsg_*: adding specific
+ regression tests, strangely missing from NIST/Sun/Microsoft
+ testsuites
+
+Sun Jul 17 07:11:27 CEST 2005 Daniel Veillard
+
+ * xmlschemas.c: fixed bug #307508, a bad automata was built but
+ this showed as an indeterminist result
+
+Thu Jul 14 17:53:02 CEST 2005 Daniel Veillard
+
+ * xmlschemastypes.c: found the last bug raised by NIST tests in
+ comparing base64 strings, result from runsuite:
+ ## NIST test suite for Schemas version NIST2004-01-14
+ Ran 23170 tests (3953 schemata), no errors
+
+Thu Jul 14 14:57:36 CEST 2005 Daniel Veillard
+
+ * testRegexp.c: fixed where xmlMemoryDump() should be called.
+ * xmlregexp.c: fixed handling of {0}, \n, \r and \t, two bugs
+ affecting NIST regression tests
+
+Thu Jul 14 11:30:24 CEST 2005 Daniel Veillard
+
+ * configure.in: applied a patch from Gerrit P. Haase to add
+ module support on cygwin
+
+Thu Jul 14 10:56:42 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c: fixed a potential buffer overrun error introduced
+ on last commit to htmlParseScript() c.f. #310229
+
+Thu Jul 14 23:48:17 PDT 2005 William Brack
+
+ * xpath.c: Changed the behaviour of xmlXPathEqualNodeSetFloat to
+ return TRUE if a nodeset with a numeric value of NaN is compared
+ for inequality with any numeric value (bug 309914).
+
+Thu Jul 14 01:03:03 CEST 2005 Daniel Veillard
+
+ * error.c relaxng.c xmlreader.c xmlschemas.c include/libxml/relaxng.h
+ include/libxml/xmlschemas.h: applied patch from Marcus Boerger
+ to route relaxng and schemas error messages when using the reader
+ through the structured interface if activated.
+ * elfgcchack.h doc/* testapi.c: rebuilt since this add new APIs
+ to test.
+
+Wed Jul 13 18:35:47 CEST 2005 Daniel Veillard
+
+ * HTMLparser.c: applied UTF-8 script parsing bug #310229 fix from
+ Jiri Netolicky
+ * result/HTML/script2.html* test/HTML/script2.html: added the test
+ case from the regression suite
+
+Tue Jul 12 17:08:11 CEST 2005 Daniel Veillard
+
+ * nanohttp.c: fixed bug #310105 with http_proxy environments with
+ patch provided by Peter Breitenlohner
+
Mon Jul 11 00:28:10 CEST 2005 Daniel Veillard
* Makefile.am NEWS configure.in doc/*: preparing release 2.6.20
diff --git a/HTMLparser.c b/HTMLparser.c
index c6115d0..d11ae08 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -192,16 +192,16 @@ htmlnamePop(htmlParserCtxtPtr ctxt)
const xmlChar *ret;
if (ctxt->nameNr <= 0)
- return (0);
+ return (NULL);
ctxt->nameNr--;
if (ctxt->nameNr < 0)
- return (0);
+ return (NULL);
if (ctxt->nameNr > 0)
ctxt->name = ctxt->nameTab[ctxt->nameNr - 1];
else
ctxt->name = NULL;
ret = ctxt->nameTab[ctxt->nameNr];
- ctxt->nameTab[ctxt->nameNr] = 0;
+ ctxt->nameTab[ctxt->nameNr] = NULL;
return (ret);
}
@@ -964,7 +964,6 @@ NULL
static const char *htmlNoContentElements[] = {
"html",
"head",
- "body",
NULL
};
@@ -2042,6 +2041,7 @@ static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
unsigned int i;
int j;
xmlNodePtr lastChild;
+ xmlDtdPtr dtd;
for (j = 0;j < len;j++)
if (!(IS_BLANK_CH(str[j]))) return(0);
@@ -2054,8 +2054,17 @@ static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
return(1);
if (xmlStrEqual(ctxt->name, BAD_CAST"head"))
return(1);
- if (xmlStrEqual(ctxt->name, BAD_CAST"body"))
- return(1);
+
+ /* Only strip CDATA children of the body tag for strict HTML DTDs */
+ if (xmlStrEqual(ctxt->name, BAD_CAST "body") && ctxt->myDoc != NULL) {
+ dtd = xmlGetIntSubset(ctxt->myDoc);
+ if (dtd != NULL && dtd->ExternalID != NULL) {
+ if (!xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4.01//EN") ||
+ !xmlStrcasecmp(dtd->ExternalID, BAD_CAST "-//W3C//DTD HTML 4//EN"))
+ return(1);
+ }
+ }
+
if (ctxt->node == NULL) return(0);
lastChild = xmlGetLastChild(ctxt->node);
while ((lastChild) && (lastChild->type == XML_COMMENT_NODE))
@@ -2627,12 +2636,12 @@ htmlParsePubidLiteral(htmlParserCtxtPtr ctxt) {
*/
static void
htmlParseScript(htmlParserCtxtPtr ctxt) {
- xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 1];
+ xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 5];
int nbchar = 0;
- xmlChar cur;
+ int cur,l;
SHRINK;
- cur = CUR;
+ cur = CUR_CHAR(l);
while (IS_CHAR_CH(cur)) {
if ((cur == '<') && (NXT(1) == '!') && (NXT(2) == '-') &&
(NXT(3) == '-')) {
@@ -2648,20 +2657,39 @@ htmlParseScript(htmlParserCtxtPtr ctxt) {
}
nbchar = 0;
htmlParseComment(ctxt);
- cur = CUR;
+ cur = CUR_CHAR(l);
continue;
} else if ((cur == '<') && (NXT(1) == '/')) {
- /*
- * One should break here, the specification is clear:
- * Authors should therefore escape "" within the content.
- * Escape mechanisms are specific to each scripting or
- * style sheet language.
- */
- if (((NXT(2) >= 'A') && (NXT(2) <= 'Z')) ||
- ((NXT(2) >= 'a') && (NXT(2) <= 'z')))
- break; /* while */
+ /*
+ * One should break here, the specification is clear:
+ * Authors should therefore escape "" within the content.
+ * Escape mechanisms are specific to each scripting or
+ * style sheet language.
+ *
+ * In recovery mode, only break if end tag match the
+ * current tag, effectively ignoring all tags inside the
+ * script/style block and treating the entire block as
+ * CDATA.
+ */
+ if (ctxt->recovery) {
+ if (xmlStrncasecmp(ctxt->name, ctxt->input->cur+2,
+ xmlStrlen(ctxt->name)) == 0)
+ {
+ break; /* while */
+ } else {
+ htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
+ "Element %s embbeds close tag\n",
+ ctxt->name, NULL);
+ }
+ } else {
+ if (((NXT(2) >= 'A') && (NXT(2) <= 'Z')) ||
+ ((NXT(2) >= 'a') && (NXT(2) <= 'z')))
+ {
+ break; /* while */
+ }
+ }
}
- buf[nbchar++] = cur;
+ COPY_BUF(l,buf,nbchar,cur);
if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) {
if (ctxt->sax->cdataBlock!= NULL) {
/*
@@ -2673,9 +2701,10 @@ htmlParseScript(htmlParserCtxtPtr ctxt) {
}
nbchar = 0;
}
- NEXT;
- cur = CUR;
+ NEXTL(l);
+ cur = CUR_CHAR(l);
}
+
if (!(IS_CHAR_CH(cur))) {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in CDATA 0x%X\n", cur);
@@ -2743,6 +2772,8 @@ htmlParseCharData(htmlParserCtxtPtr ctxt) {
}
}
if (nbchar != 0) {
+ buf[nbchar] = 0;
+
/*
* Ok the segment is to be consumed as chars.
*/
@@ -3578,6 +3609,15 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
if ((!IS_CHAR_CH(CUR)) || (CUR != '>')) {
htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
"End tag : expected '>'\n", NULL, NULL);
+ if (ctxt->recovery) {
+ /*
+ * We're not at the ending > !!
+ * Error, unless in recover mode where we search forwards
+ * until we find a >
+ */
+ while (CUR != '\0' && CUR != '>') NEXT;
+ NEXT;
+ }
} else
NEXT;
@@ -5176,10 +5216,18 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
(ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF)) {
int base = ctxt->input->base - ctxt->input->buf->buffer->content;
int cur = ctxt->input->cur - ctxt->input->base;
+ int res;
- xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+ res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+ if (res < 0) {
+ ctxt->errNo = XML_PARSER_EOF;
+ ctxt->disableSAX = 1;
+ return (XML_PARSER_EOF);
+ }
ctxt->input->base = ctxt->input->buf->buffer->content + base;
ctxt->input->cur = ctxt->input->base + cur;
+ ctxt->input->end =
+ &ctxt->input->buf->buffer->content[ctxt->input->buf->buffer->use];
#ifdef DEBUG_PUSH
xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
#endif
@@ -5777,6 +5825,14 @@ htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options)
ctxt->options |= XML_PARSE_NOBLANKS;
} else
ctxt->keepBlanks = 1;
+ if (options & HTML_PARSE_RECOVER) {
+ ctxt->recovery = 1;
+ } else
+ ctxt->recovery = 0;
+ if (options & HTML_PARSE_COMPACT) {
+ ctxt->options |= HTML_PARSE_COMPACT;
+ options -= HTML_PARSE_COMPACT;
+ }
ctxt->dictNames = 0;
return (options);
}
diff --git a/HTMLtree.c b/HTMLtree.c
index de086db..e77ee65 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -552,6 +552,8 @@ htmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size) {
*size = 0;
return;
}
+ } else {
+ handler = xmlFindCharEncodingHandler(encoding);
}
}
@@ -1026,6 +1028,8 @@ htmlDocDump(FILE *f, xmlDocPtr cur) {
handler = xmlFindCharEncodingHandler(encoding);
if (handler == NULL)
return(-1);
+ } else {
+ handler = xmlFindCharEncodingHandler(encoding);
}
}
diff --git a/Makefile.am b/Makefile.am
index 69dba11..ee09a7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,8 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
catalog.c globals.c threads.c c14n.c xmlstring.c \
xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
triostr.c trio.c xmlreader.c relaxng.c dict.c SAX2.c \
- xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c xmlmodule.c
+ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
+ xmlmodule.c schematron.c
else
libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \
@@ -37,7 +38,7 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
xmlreader.c relaxng.c dict.c SAX2.c \
xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
- xmlmodule.c
+ xmlmodule.c schematron.c
endif
DEPS = $(top_builddir)/libxml2.la
@@ -158,7 +159,7 @@ check-local: all tests
testall : tests SVGtests SAXtests
-tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_PATTERN@ @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@ @TEST_MODULES@
+tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_PATTERN@ @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_SCHEMATRON@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@ @TEST_MODULES@
@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
$(MAKE) MAKEFLAGS+=--silent tests ; fi)
@(cd doc/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
@@ -821,6 +822,21 @@ Regexptests: testRegexp$(EXEEXT)
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
rm result.$$name ; \
fi ; fi ; done)
+ @echo "## Formal expresssions regression tests"
+ -@(for i in $(srcdir)/test/expr/* ; do \
+ name=`basename $$i`; \
+ if [ ! -d $$i ] ; then \
+ if [ ! -f $(srcdir)/result/expr/$$name ] ; then \
+ echo New test file $$name ; \
+ $(CHECKER) $(top_builddir)/testRegexp --expr -i $$i > $(srcdir)/result/expr/$$name; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ else \
+ log=`$(CHECKER) $(top_builddir)/testRegexp --expr -i $$i 2>&1 > result.$$name ; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ diff $(srcdir)/result/expr/$$name result.$$name` ; \
+ if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+ rm result.$$name ; \
+ fi ; fi ; done)
Automatatests: testAutomata$(EXEEXT)
@(echo > .memdump)
@@ -997,7 +1013,7 @@ Relaxtests: xmllint$(EXEEXT)
> res.$$name 2> err.$$name;\
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
diff $(srcdir)/result/relaxng/"$$name"_"$$xno" res.$$name;\
- if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" ] ; then \
+ if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" -a "$$name" != "307377" ] ; then \
diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \
err.$$name | grep -v "error detected at";\
fi ; grep Unimplemented err.$$name`; \
@@ -1006,6 +1022,35 @@ Relaxtests: xmllint$(EXEEXT)
fi ; fi ; \
done; done)
+Schematrontests: xmllint$(EXEEXT)
+ @(echo > .memdump)
+ @echo "## Schematron regression tests"
+ -@(for i in $(srcdir)/test/schematron/*.sct ; do \
+ name=`basename $$i | sed 's+\.sct++'`; \
+ for j in $(srcdir)/test/schematron/"$$name"_*.xml ; do \
+ if [ -f $$j ] ; then \
+ xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+ if [ ! -f $(srcdir)/result/schematron/"$$name"_"$$xno" ]; \
+ then \
+ echo New test file "$$name"_"$$xno" ; \
+ $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+ > $(srcdir)/result/schematron/"$$name"_"$$xno" \
+ 2> $(srcdir)/result/schematron/"$$name"_"$$xno".err; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ else \
+ log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+ > res.$$name 2> err.$$name;\
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ diff $(srcdir)/result/schematron/"$$name"_"$$xno" \
+ res.$$name;\
+ diff $(srcdir)/result/schematron/"$$name"_"$$xno".err \
+ err.$$name | grep -v "error detected at";\
+ grep Unimplemented err.$$name`; \
+ if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
+ rm res.$$name err.$$name ; \
+ fi ; fi ; \
+ done; done)
+
RelaxNGPythonTests:
@(if [ -x $(PYTHON) ] ; then \
PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH ; \
@@ -1134,3 +1179,6 @@ install-data-local:
tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
+
+sparse: clean
+ $(MAKE) CC=cgcc
diff --git a/Makefile.in b/Makefile.in
index 5c831ad..3e66d17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,8 @@ am__libxml2_la_SOURCES_DIST = SAX.c entities.c encoding.c error.c \
DOCBparser.c catalog.c globals.c threads.c c14n.c xmlstring.c \
xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
xmlreader.c relaxng.c dict.c SAX2.c xmlwriter.c legacy.c \
- chvalid.c pattern.c xmlsave.c xmlmodule.c triostr.c trio.c
+ chvalid.c pattern.c xmlsave.c xmlmodule.c schematron.c \
+ triostr.c trio.c
@WITH_TRIO_SOURCES_FALSE@am_libxml2_la_OBJECTS = SAX.lo entities.lo \
@WITH_TRIO_SOURCES_FALSE@ encoding.lo error.lo \
@WITH_TRIO_SOURCES_FALSE@ parserInternals.lo parser.lo tree.lo \
@@ -103,7 +104,7 @@ am__libxml2_la_SOURCES_DIST = SAX.c entities.c encoding.c error.c \
@WITH_TRIO_SOURCES_FALSE@ xmlunicode.lo xmlreader.lo relaxng.lo \
@WITH_TRIO_SOURCES_FALSE@ dict.lo SAX2.lo xmlwriter.lo \
@WITH_TRIO_SOURCES_FALSE@ legacy.lo chvalid.lo pattern.lo \
-@WITH_TRIO_SOURCES_FALSE@ xmlsave.lo xmlmodule.lo
+@WITH_TRIO_SOURCES_FALSE@ xmlsave.lo xmlmodule.lo schematron.lo
@WITH_TRIO_SOURCES_TRUE@am_libxml2_la_OBJECTS = SAX.lo entities.lo \
@WITH_TRIO_SOURCES_TRUE@ encoding.lo error.lo \
@WITH_TRIO_SOURCES_TRUE@ parserInternals.lo parser.lo tree.lo \
@@ -119,7 +120,7 @@ am__libxml2_la_SOURCES_DIST = SAX.c entities.c encoding.c error.c \
@WITH_TRIO_SOURCES_TRUE@ xmlreader.lo relaxng.lo dict.lo \
@WITH_TRIO_SOURCES_TRUE@ SAX2.lo xmlwriter.lo legacy.lo \
@WITH_TRIO_SOURCES_TRUE@ chvalid.lo pattern.lo xmlsave.lo \
-@WITH_TRIO_SOURCES_TRUE@ xmlmodule.lo
+@WITH_TRIO_SOURCES_TRUE@ xmlmodule.lo schematron.lo
libxml2_la_OBJECTS = $(am_libxml2_la_OBJECTS)
testdso_la_LIBADD =
am_testdso_la_OBJECTS = testdso.lo
@@ -319,6 +320,7 @@ TEST_PUSH = @TEST_PUSH@
TEST_REGEXPS = @TEST_REGEXPS@
TEST_SAX = @TEST_SAX@
TEST_SCHEMAS = @TEST_SCHEMAS@
+TEST_SCHEMATRON = @TEST_SCHEMATRON@
TEST_THREADS = @TEST_THREADS@
TEST_VALID = @TEST_VALID@
TEST_VTIME = @TEST_VTIME@
@@ -354,6 +356,7 @@ WITH_REGEXPS = @WITH_REGEXPS@
WITH_RUN_DEBUG = @WITH_RUN_DEBUG@
WITH_SAX1 = @WITH_SAX1@
WITH_SCHEMAS = @WITH_SCHEMAS@
+WITH_SCHEMATRON = @WITH_SCHEMATRON@
WITH_THREADS = @WITH_THREADS@
WITH_TREE = @WITH_TREE@
WITH_TRIO = @WITH_TRIO@
@@ -438,7 +441,7 @@ libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info
@WITH_TRIO_SOURCES_FALSE@ xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
@WITH_TRIO_SOURCES_FALSE@ xmlreader.c relaxng.c dict.c SAX2.c \
@WITH_TRIO_SOURCES_FALSE@ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
-@WITH_TRIO_SOURCES_FALSE@ xmlmodule.c
+@WITH_TRIO_SOURCES_FALSE@ xmlmodule.c schematron.c
@WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
@WITH_TRIO_SOURCES_TRUE@ parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \
@@ -447,7 +450,8 @@ libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info
@WITH_TRIO_SOURCES_TRUE@ catalog.c globals.c threads.c c14n.c xmlstring.c \
@WITH_TRIO_SOURCES_TRUE@ xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \
@WITH_TRIO_SOURCES_TRUE@ triostr.c trio.c xmlreader.c relaxng.c dict.c SAX2.c \
-@WITH_TRIO_SOURCES_TRUE@ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c xmlmodule.c
+@WITH_TRIO_SOURCES_TRUE@ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
+@WITH_TRIO_SOURCES_TRUE@ xmlmodule.c schematron.c
DEPS = $(top_builddir)/libxml2.la
LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
@@ -791,6 +795,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relaxng.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runsuite.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schematron.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testAutomata.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testC14N.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testHTML.Po@am__quote@
@@ -1412,7 +1417,7 @@ check-local: all tests
testall : tests SVGtests SAXtests
-tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_PATTERN@ @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@ @TEST_MODULES@
+tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_PATTERN@ @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_SCHEMATRON@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@ @TEST_MODULES@
@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
$(MAKE) MAKEFLAGS+=--silent tests ; fi)
@(cd doc/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
@@ -2075,6 +2080,21 @@ Regexptests: testRegexp$(EXEEXT)
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
rm result.$$name ; \
fi ; fi ; done)
+ @echo "## Formal expresssions regression tests"
+ -@(for i in $(srcdir)/test/expr/* ; do \
+ name=`basename $$i`; \
+ if [ ! -d $$i ] ; then \
+ if [ ! -f $(srcdir)/result/expr/$$name ] ; then \
+ echo New test file $$name ; \
+ $(CHECKER) $(top_builddir)/testRegexp --expr -i $$i > $(srcdir)/result/expr/$$name; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ else \
+ log=`$(CHECKER) $(top_builddir)/testRegexp --expr -i $$i 2>&1 > result.$$name ; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ diff $(srcdir)/result/expr/$$name result.$$name` ; \
+ if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+ rm result.$$name ; \
+ fi ; fi ; done)
Automatatests: testAutomata$(EXEEXT)
@(echo > .memdump)
@@ -2251,7 +2271,7 @@ Relaxtests: xmllint$(EXEEXT)
> res.$$name 2> err.$$name;\
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
diff $(srcdir)/result/relaxng/"$$name"_"$$xno" res.$$name;\
- if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" ] ; then \
+ if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" -a "$$name" != "307377" ] ; then \
diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \
err.$$name | grep -v "error detected at";\
fi ; grep Unimplemented err.$$name`; \
@@ -2260,6 +2280,35 @@ Relaxtests: xmllint$(EXEEXT)
fi ; fi ; \
done; done)
+Schematrontests: xmllint$(EXEEXT)
+ @(echo > .memdump)
+ @echo "## Schematron regression tests"
+ -@(for i in $(srcdir)/test/schematron/*.sct ; do \
+ name=`basename $$i | sed 's+\.sct++'`; \
+ for j in $(srcdir)/test/schematron/"$$name"_*.xml ; do \
+ if [ -f $$j ] ; then \
+ xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+ if [ ! -f $(srcdir)/result/schematron/"$$name"_"$$xno" ]; \
+ then \
+ echo New test file "$$name"_"$$xno" ; \
+ $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+ > $(srcdir)/result/schematron/"$$name"_"$$xno" \
+ 2> $(srcdir)/result/schematron/"$$name"_"$$xno".err; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ else \
+ log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+ > res.$$name 2> err.$$name;\
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
+ diff $(srcdir)/result/schematron/"$$name"_"$$xno" \
+ res.$$name;\
+ diff $(srcdir)/result/schematron/"$$name"_"$$xno".err \
+ err.$$name | grep -v "error detected at";\
+ grep Unimplemented err.$$name`; \
+ if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
+ rm res.$$name err.$$name ; \
+ fi ; fi ; \
+ done; done)
+
RelaxNGPythonTests:
@(if [ -x $(PYTHON) ] ; then \
PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH ; \
@@ -2353,6 +2402,9 @@ install-data-local:
tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
+
+sparse: clean
+ $(MAKE) CC=cgcc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/NEWS b/NEWS
index a8f28ea..5187931 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,45 @@ ChangeLog.html
to the CVS at
http://cvs.gnome.org/viewcvs/libxml2/
code base.There is the list of public releases:
+2.6.21: Sep 4 2005:
+ - build fixes: Cygwin portability fixes (Gerrit P. Haase), calling
+ convention problems on Windows (Marcus Boerger), cleanups based on
+ Linus' sparse tool, update of win32/configure.js (Rob Richards),
+ remove warnings on Windows(Marcus Boerger), compilation without SAX1,
+ detection of the Python binary, use $GCC inestad of $CC = 'gcc' (Andrew
+ W. Nosenko), compilation/link with threads and old gcc, compile
+ problem by C370 on Z/OS,
+ - bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8
+ bug (Jiri Netolicky), XPath NaN compare bug (William Brack),
+ htmlParseScript potential bug, Schemas regexp handling of spaces,
+ Base64 Schemas comparisons NIST passes, automata build error xsd:all,
+ xmlGetNodePath for namespaced attributes (Alexander Pohoyda),
+ xmlSchemas foreign namespaces handling, XML Schemas facet comparison
+ (Kupriyanov Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier
+ Buchcik), xml: namespace ahndling in Schemas (Kasimier), empty model
+ group in Schemas (Kasimier), wilcard in Schemas (Kasimier), URI
+ composition (William), xs:anyType in Schemas (Kasimier), Python resolver
+ emmitting error messages directly, Python xmlAttr.parent (Jakub Piotr
+ Clapa), trying to fix the file path/URI conversion,
+ xmlTextReaderGetAttribute fix (Rob Richards), xmlSchemaFreeAnnot memleak
+ (Kasimier), HTML UTF-8 serialization, streaming XPath, Schemas determinism
+ detection problem, XInclude bug, Schemas context type (Dean Hill),
+ validation fix (Derek Poon), xmlTextReaderGetAttribute[Ns] namespaces
+ (Rob Richards), Schemas type fix (Kuba Nowakowski), UTF-8 parser bug,
+ error in encoding handling, xmlGetLineNo fixes, bug on entities handling,
+ entity name extraction in error handling with XInclude, text nodes
+ in HTML body tags (Gary Coady), xml:id and IDness at the treee level
+ fixes, XPath streaming patterns bugs.
+ - improvements: structured interfaces for schemas and RNG error reports
+ (Marcus Boerger), optimization of the char data inner loop parsing
+ (thanks to Behdad Esfahbod for the idea), schematron validation
+ though not finished yet, xmlSaveOption to omit XML declaration,
+ keyref match error reports (Kasimier), formal expression handling
+ code not plugged yet, more lax mode for the HTML parser,
+ parser XML_PARSE_COMPACT option for text nodes allocation.
+ - documentation: xmllint man page had --nonet duplicated
+
+
2.6.20: Jul 10 2005:
- build fixes: Windows build (Rob Richards), Mingw compilation (Igor
Zlatkovic), Windows Makefile (Igor), gcc warnings (Kasimier and
diff --git a/SAX2.c b/SAX2.c
index 16e361f..9f7edf6 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -227,7 +227,7 @@ const xmlChar *
xmlSAX2GetSystemId(void *ctx)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
- if ((ctx == NULL) || (ctxt->input == NULL)) return(0);
+ if ((ctx == NULL) || (ctxt->input == NULL)) return(NULL);
return((const xmlChar *) ctxt->input->filename);
}
@@ -1022,7 +1022,7 @@ xmlSAX2EndDocument(void *ctx)
}
}
-#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED)
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
/**
* xmlSAX2AttributeInternal:
* @ctx: the user data (XML parser context)
@@ -1316,11 +1316,7 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
* when validating, the ID registration is done at the attribute
* validation level. Otherwise we have to do specific handling here.
*/
- if (xmlIsID(ctxt->myDoc, ctxt->node, ret))
- xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret);
- else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret))
- xmlAddRef(&ctxt->vctxt, ctxt->myDoc, value, ret);
- else if (xmlStrEqual(fullname, BAD_CAST "xml:id")) {
+ if (xmlStrEqual(fullname, BAD_CAST "xml:id")) {
/*
* Add the xml:id value
*
@@ -1332,7 +1328,10 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
(const char *) value, NULL);
}
xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret);
- }
+ } else if (xmlIsID(ctxt->myDoc, ctxt->node, ret))
+ xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret);
+ else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret))
+ xmlAddRef(&ctxt->vctxt, ctxt->myDoc, value, ret);
}
error:
@@ -1777,6 +1776,7 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
xmlErrMemory(ctxt, "xmlSAX2Characters");
return(NULL);
}
+ memset(ret, 0, sizeof(xmlNode));
/*
* intern the formatting blanks found between tags, or the
* very short strings
@@ -1784,7 +1784,14 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
if (ctxt->dictNames) {
xmlChar cur = str[len];
- if ((len <= 3) && ((cur == '"') || (cur == '\'') ||
+ if ((len < (int) (2 * sizeof(void *))) &&
+ (ctxt->options & XML_PARSE_COMPACT)) {
+ /* store the string in the node overrithing properties and nsDef */
+ xmlChar *tmp = (xmlChar *) &(ret->properties);
+ memcpy(tmp, str, len);
+ tmp[len] = 0;
+ intern = tmp;
+ } else if ((len <= 3) && ((cur == '"') || (cur == '\'') ||
((cur == '<') && (str[len + 1] != '!')))) {
intern = xmlDictLookup(ctxt->dict, str, len);
} else if (IS_BLANK_CH(*str) && (len < 60) && (cur == '<') &&
@@ -1798,7 +1805,6 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
}
}
skip:
- memset(ret, 0, sizeof(xmlNode));
ret->type = XML_TEXT_NODE;
ret->name = xmlStringText;
@@ -2040,16 +2046,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
* when validating, the ID registration is done at the attribute
* validation level. Otherwise we have to do specific handling here.
*/
- if (xmlIsID(ctxt->myDoc, ctxt->node, ret)) {
- /* might be worth duplicate entry points and not copy */
- if (dup == NULL)
- dup = xmlStrndup(value, valueend - value);
- xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret);
- } else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret)) {
- if (dup == NULL)
- dup = xmlStrndup(value, valueend - value);
- xmlAddRef(&ctxt->vctxt, ctxt->myDoc, dup, ret);
- } else if ((prefix == ctxt->str_xml) &&
+ if ((prefix == ctxt->str_xml) &&
(localname[0] == 'i') && (localname[1] == 'd') &&
(localname[2] == 0)) {
/*
@@ -2067,6 +2064,15 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
}
#endif
xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret);
+ } else if (xmlIsID(ctxt->myDoc, ctxt->node, ret)) {
+ /* might be worth duplicate entry points and not copy */
+ if (dup == NULL)
+ dup = xmlStrndup(value, valueend - value);
+ xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret);
+ } else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret)) {
+ if (dup == NULL)
+ dup = xmlStrndup(value, valueend - value);
+ xmlAddRef(&ctxt->vctxt, ctxt->myDoc, dup, ret);
}
}
if (dup != NULL)
@@ -2407,8 +2413,11 @@ xmlSAX2Characters(void *ctx, const xmlChar *ch, int len)
* We try to minimaze realloc() uses and avoid copying
* and recomputing length over and over.
*/
- if ((ctxt->nodemem == ctxt->nodelen + 1) &&
- (xmlDictOwns(ctxt->dict, lastChild->content))) {
+ if (lastChild->content == (xmlChar *)&(lastChild->properties)) {
+ lastChild->content = xmlStrdup(lastChild->content);
+ lastChild->properties = NULL;
+ } else if ((ctxt->nodemem == ctxt->nodelen + 1) &&
+ (xmlDictOwns(ctxt->dict, lastChild->content))) {
lastChild->content = xmlStrdup(lastChild->content);
}
if (ctxt->nodelen + len >= ctxt->nodemem) {
@@ -2496,6 +2505,14 @@ xmlSAX2ProcessingInstruction(void *ctx, const xmlChar *target,
if (ret == NULL) return;
parent = ctxt->node;
+ if (ctxt->linenumbers) {
+ if (ctxt->input != NULL) {
+ if (ctxt->input->line < 65535)
+ ret->line = (short) ctxt->input->line;
+ else
+ ret->line = 65535;
+ }
+ }
if (ctxt->inSubset == 1) {
xmlAddChild((xmlNodePtr) ctxt->myDoc->intSubset, ret);
return;
@@ -2548,6 +2565,14 @@ xmlSAX2Comment(void *ctx, const xmlChar *value)
#endif
ret = xmlNewDocComment(ctxt->myDoc, value);
if (ret == NULL) return;
+ if (ctxt->linenumbers) {
+ if (ctxt->input != NULL) {
+ if (ctxt->input->line < 65535)
+ ret->line = (short) ctxt->input->line;
+ else
+ ret->line = 65535;
+ }
+ }
if (ctxt->inSubset == 1) {
xmlAddChild((xmlNodePtr) ctxt->myDoc->intSubset, ret);
diff --git a/configure b/configure
index b5ac4f1..fc6f2f8 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXML_MAJOR_VERSION LIBXML_MINOR_VERSION LIBXML_MICRO_VERSION LIBXML_VERSION LIBXML_VERSION_INFO LIBXML_VERSION_NUMBER LIBXML_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR PERL XMLLINT XSLTPROC EGREP U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HTML_DIR Z_CFLAGS Z_LIBS PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR WITH_MODULES MODULE_PLATFORM_LIBS MODULE_EXTENSION TEST_MODULES STATIC_BINARIES WITH_TRIO_SOURCES_TRUE WITH_TRIO_SOURCES_FALSE WITH_TRIO THREAD_LIBS BASE_THREAD_LIBS WITH_THREADS THREAD_CFLAGS TEST_THREADS THREADS_W32 WITH_TREE WITH_FTP FTP_OBJ WITH_HTTP HTTP_OBJ WITH_LEGACY WITH_READER READER_TEST WITH_WRITER WITH_PATTERN TEST_PATTERN WITH_SAX1 TEST_SAX WITH_PUSH TEST_PUSH WITH_HTML HTML_OBJ TEST_HTML TEST_PHTML WITH_VALID TEST_VALID TEST_VTIME WITH_CATALOG CATALOG_OBJ TEST_CATALOG WITH_DOCB DOCB_OBJ WITH_XPTR XPTR_OBJ TEST_XPTR WITH_C14N C14N_OBJ TEST_C14N WITH_XINCLUDE XINCLUDE_OBJ TEST_XINCLUDE WITH_XPATH XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV WITH_ISO8859X WITH_SCHEMAS TEST_SCHEMAS WITH_REGEXPS TEST_REGEXPS WITH_DEBUG DEBUG_OBJ TEST_DEBUG WITH_MEM_DEBUG WITH_RUN_DEBUG WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS CYGWIN_EXTRA_LDFLAGS CYGWIN_EXTRA_PYTHON_LIBADD XML_CFLAGS XML_LIBDIR XML_LIBS XML_LIBTOOLLIBS ICONV_LIBS XML_INCLUDEDIR HAVE_ISNAN HAVE_ISINF PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES M_LIBS RDL_LIBS RELDATE PYTHON_TESTS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXML_MAJOR_VERSION LIBXML_MINOR_VERSION LIBXML_MICRO_VERSION LIBXML_VERSION LIBXML_VERSION_INFO LIBXML_VERSION_NUMBER LIBXML_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR PERL XMLLINT XSLTPROC EGREP U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HTML_DIR Z_CFLAGS Z_LIBS PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR WITH_MODULES MODULE_PLATFORM_LIBS MODULE_EXTENSION TEST_MODULES STATIC_BINARIES WITH_TRIO_SOURCES_TRUE WITH_TRIO_SOURCES_FALSE WITH_TRIO THREAD_LIBS BASE_THREAD_LIBS WITH_THREADS THREAD_CFLAGS TEST_THREADS THREADS_W32 WITH_TREE WITH_FTP FTP_OBJ WITH_HTTP HTTP_OBJ WITH_LEGACY WITH_READER READER_TEST WITH_WRITER WITH_PATTERN TEST_PATTERN WITH_SAX1 TEST_SAX WITH_PUSH TEST_PUSH WITH_HTML HTML_OBJ TEST_HTML TEST_PHTML WITH_VALID TEST_VALID TEST_VTIME WITH_CATALOG CATALOG_OBJ TEST_CATALOG WITH_DOCB DOCB_OBJ WITH_XPTR XPTR_OBJ TEST_XPTR WITH_C14N C14N_OBJ TEST_C14N WITH_XINCLUDE XINCLUDE_OBJ TEST_XINCLUDE WITH_XPATH XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV WITH_ISO8859X WITH_SCHEMATRON TEST_SCHEMATRON WITH_SCHEMAS TEST_SCHEMAS WITH_REGEXPS TEST_REGEXPS WITH_DEBUG DEBUG_OBJ TEST_DEBUG WITH_MEM_DEBUG WITH_RUN_DEBUG WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS CYGWIN_EXTRA_LDFLAGS CYGWIN_EXTRA_PYTHON_LIBADD XML_CFLAGS XML_LIBDIR XML_LIBS XML_LIBTOOLLIBS ICONV_LIBS XML_INCLUDEDIR HAVE_ISNAN HAVE_ISINF PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES M_LIBS RDL_LIBS RELDATE PYTHON_TESTS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1070,6 +1070,7 @@ Optional Packages:
--with-run-debug add the runtime debugging module (off)
--with-sax1 add the older SAX1 interface (on)
--with-schemas add Relax-NG and Schemas support (on)
+ --with-schematron add Schematron support (on)
--with-threads add multithread support(on)
--with-thread-alloc add per-thread memory(off)
--with-tree add the DOM like tree manipulation APIs (on)
@@ -1617,7 +1618,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=20
+LIBXML_MICRO_VERSION=21
LIBXML_MICRO_VERSION_SUFFIX=
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -4691,7 +4692,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4694 "configure"' > conftest.$ac_ext
+ echo '#line 4695 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6032,7 +6033,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:6035:" \
+echo "$as_me:6036:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -7066,11 +7067,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7070: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7073: \$? = $ac_status" >&5
+ echo "$as_me:7074: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7299,11 +7300,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7302: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7303: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7306: \$? = $ac_status" >&5
+ echo "$as_me:7307: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7359,11 +7360,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7362: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7366: \$? = $ac_status" >&5
+ echo "$as_me:7367: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8693,7 +8694,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8696 "configure"' > conftest.$ac_ext
+ echo '#line 8697 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9564,7 +9565,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11845: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11848: \$? = $ac_status" >&5
+ echo "$as_me:11849: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11901,11 +11902,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11904: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11905: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11908: \$? = $ac_status" >&5
+ echo "$as_me:11909: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12412,7 +12413,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12415 "configure"' > conftest.$ac_ext
+ echo '#line 12416 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13283,7 +13284,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:14212: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14215: \$? = $ac_status" >&5
+ echo "$as_me:14216: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14268,11 +14269,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14271: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14272: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14275: \$? = $ac_status" >&5
+ echo "$as_me:14276: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15582,7 +15583,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15585 "configure"' > conftest.$ac_ext
+ echo '#line 15586 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16323,11 +16324,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16326: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16327: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16330: \$? = $ac_status" >&5
+ echo "$as_me:16331: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16556,11 +16557,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16559: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16560: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16563: \$? = $ac_status" >&5
+ echo "$as_me:16564: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16616,11 +16617,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16623: \$? = $ac_status" >&5
+ echo "$as_me:16624: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17950,7 +17951,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17953 "configure"' > conftest.$ac_ext
+ echo '#line 17954 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18821,7 +18822,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5
echo $ECHO_N "checking for type of socket length (socklen_t)... $ECHO_C" >&6
cat > conftest.$ac_ext <
@@ -26703,7 +26719,7 @@ int main(void) {
(void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)
; return 0; }
EOF
-if { (eval echo configure:26706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
rm -rf conftest*
echo "$as_me:$LINENO: result: socklen_t *" >&5
@@ -26715,7 +26731,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -26726,7 +26742,7 @@ int main(void) {
(void)getsockopt (1, 1, 1, NULL, (size_t *)NULL)
; return 0; }
EOF
-if { (eval echo configure:26729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
rm -rf conftest*
echo "$as_me:$LINENO: result: size_t *" >&5
@@ -26738,7 +26754,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -26749,7 +26765,7 @@ int main(void) {
(void)getsockopt (1, 1, 1, NULL, (int *)NULL)
; return 0; }
EOF
-if { (eval echo configure:26752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
+if { (eval echo configure:26768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
rm -rf conftest*
echo "$as_me:$LINENO: result: int *" >&5
@@ -27554,7 +27570,6 @@ esac
-PYTHON=
PYTHON_VERSION=
PYTHON_INCLUDES=
PYTHON_SITE_PACKAGES=
@@ -27571,8 +27586,12 @@ if test "$with_python" != "no" ; then
echo Found python in $with_python
PYTHON="$with_python"
else
- # Extract the first word of "python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
-set dummy python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
+ if test -x "$PYTHON"
+ then
+ echo Found python in environment PYTHON=$PYTHON
+ else
+ # Extract the first word of "python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
+set dummy python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PYTHON+set}" = set; then
@@ -27610,6 +27629,7 @@ else
echo "${ECHO_T}no" >&6
fi
+ fi
fi
fi
if test "$PYTHON" != ""
@@ -27650,6 +27670,8 @@ fi
else
pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages'
fi
+else
+ PYTHON=
fi
@@ -27671,11 +27693,92 @@ fi
WITH_MODULES=0
-MODULE_EXTENSION=".so"
TEST_MODULES=
if test "$with_modules" != "no" ; then
-echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+ case "$host" in
+ *-*-cygwin*)
+ MODULE_EXTENSION=".dll"
+ echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
+echo $ECHO_N "checking for dlopen in -lcygwin... $ECHO_C" >&6
+if test "${ac_cv_lib_cygwin_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcygwin $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_cygwin_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_cygwin_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_cygwin_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_cygwin_dlopen" >&6
+if test $ac_cv_lib_cygwin_dlopen = yes; then
+
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS=
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLOPEN
+_ACEOF
+
+
+fi
+
+ ;;
+ *)
+ MODULE_EXTENSION=".so"
+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27741,8 +27844,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
if test $ac_cv_lib_dld_shl_load = yes; then
- WITH_MODULES=1
- MODULE_PLATFORM_LIBS="-ldld"
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS="-ldld"
cat >>confdefs.h <<\_ACEOF
#define HAVE_SHLLOAD
@@ -27752,7 +27855,7 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27818,8 +27921,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
if test $ac_cv_lib_dl_dlopen = yes; then
- WITH_MODULES=1
- MODULE_PLATFORM_LIBS="-ldl"
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS="-ldl"
cat >>confdefs.h <<\_ACEOF
#define HAVE_DLOPEN
@@ -27828,6 +27931,8 @@ _ACEOF
fi
+ ;;
+ esac
fi
if test "${WITH_MODULES}" = "1"; then
@@ -27848,6 +27953,7 @@ if [ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ] || \
if test "$with_minimum" != "yes"
then
if test "${with_mem_debug}" = "" ; then
+ echo Activating memory debugging
with_mem_debug="yes"
with_run_debug="yes"
fi
@@ -27855,7 +27961,7 @@ if [ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ] || \
with_docbook="yes"
fi
fi
- if test "${CC}" = "gcc" ; then
+ if test "${GCC}" = "yes" ; then
CFLAGS="-g -O -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
fi
STATIC_BINARIES="-static"
@@ -28129,9 +28235,25 @@ fi
THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
;;
*linux*)
- if test "${CC}" = "gcc" -a "${THREAD_LIBS}" = "-lpthread" ; then
- THREAD_LIBS=""
- BASE_THREAD_LIBS="-lpthread"
+ if test "${GCC}" = "yes" ; then
+ GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
+ GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
+ GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
+ if test "${THREAD_LIBS}" = "-lpthread" ; then
+ if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
+ then
+ THREAD_LIBS=""
+ BASE_THREAD_LIBS="-lpthread"
+ else
+ if expr ${GCC_MAJOR} \> 3 > /dev/null
+ then
+ THREAD_LIBS=""
+ BASE_THREAD_LIBS="-lpthread"
+ else
+ echo old GCC disabling weak symbols for pthread
+ fi
+ fi
+ fi
fi
;;
esac
@@ -29202,6 +29324,20 @@ fi
fi
+if test "$with_schematron" = "no" ; then
+ echo "Disabling Schematron support"
+ WITH_SCHEMATRON=0
+ TEST_SCHEMATRON=
+else
+ echo "Enabled Schematron support"
+ WITH_SCHEMATRON=1
+ TEST_SCHEMATRON="Schematrontests"
+ with_xpath=yes
+ with_pattern=yes
+fi
+
+
+
if test "$with_schemas" = "no" ; then
echo "Disabling Schemas/Relax-NG support"
WITH_SCHEMAS=0
@@ -30153,6 +30289,8 @@ s,@TEST_XPATH@,$TEST_XPATH,;t t
s,@WITH_OUTPUT@,$WITH_OUTPUT,;t t
s,@WITH_ICONV@,$WITH_ICONV,;t t
s,@WITH_ISO8859X@,$WITH_ISO8859X,;t t
+s,@WITH_SCHEMATRON@,$WITH_SCHEMATRON,;t t
+s,@TEST_SCHEMATRON@,$TEST_SCHEMATRON,;t t
s,@WITH_SCHEMAS@,$WITH_SCHEMAS,;t t
s,@TEST_SCHEMAS@,$TEST_SCHEMAS,;t t
s,@WITH_REGEXPS@,$WITH_REGEXPS,;t t
diff --git a/configure.in b/configure.in
index 6777c94..ad902eb 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=20
+LIBXML_MICRO_VERSION=21
LIBXML_MICRO_VERSION_SUFFIX=
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -128,6 +128,8 @@ AC_ARG_WITH(sax1,
[ --with-sax1 add the older SAX1 interface (on)])
AC_ARG_WITH(schemas,
[ --with-schemas add Relax-NG and Schemas support (on)])
+AC_ARG_WITH(schematron,
+[ --with-schematron add Schematron support (on)])
AC_ARG_WITH(threads,
[ --with-threads add multithread support(on)])
AC_ARG_WITH(thread-alloc,
@@ -163,6 +165,11 @@ then
with_pattern=yes
with_regexp=yes
fi
+if test "$with_schematron" = "yes"
+then
+ with_pattern=yes
+ with_xpath=yes
+fi
if test "$with_reader" = "yes"
then
with_push=yes
@@ -270,6 +277,10 @@ then
then
with_schemas=no
fi
+ if test "$with_schematron" = ""
+ then
+ with_schematron=no
+ fi
if test "$with_threads" = ""
then
with_threads=no
@@ -602,7 +613,6 @@ dnl
dnl check for python
dnl
-PYTHON=
PYTHON_VERSION=
PYTHON_INCLUDES=
PYTHON_SITE_PACKAGES=
@@ -619,7 +629,12 @@ if test "$with_python" != "no" ; then
echo Found python in $with_python
PYTHON="$with_python"
else
- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+ if test -x "$PYTHON"
+ then
+ echo Found python in environment PYTHON=$PYTHON
+ else
+ AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+ fi
fi
fi
if test "$PYTHON" != ""
@@ -660,6 +675,8 @@ if test "$with_python" != "no" ; then
else
pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages'
fi
+else
+ PYTHON=
fi
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
if test "$PYTHON_INCLUDES" != ""
@@ -673,21 +690,33 @@ AC_SUBST(PYTHON_SUBDIR)
dnl check for dso support
WITH_MODULES=0
-MODULE_EXTENSION=".so"
TEST_MODULES=
if test "$with_modules" != "no" ; then
-AC_CHECK_LIB(dld, shl_load, [
- WITH_MODULES=1
- MODULE_PLATFORM_LIBS="-ldld"
- AC_DEFINE([HAVE_SHLLOAD], [], [Have shl_load based dso])
-])
-
-AC_CHECK_LIB(dl, dlopen, [
- WITH_MODULES=1
- MODULE_PLATFORM_LIBS="-ldl"
- AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
-])
+ case "$host" in
+ *-*-cygwin*)
+ MODULE_EXTENSION=".dll"
+ AC_CHECK_LIB(cygwin, dlopen, [
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS=
+ AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
+ ])
+ ;;
+ *)
+ MODULE_EXTENSION=".so"
+ AC_CHECK_LIB(dld, shl_load, [
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS="-ldld"
+ AC_DEFINE([HAVE_SHLLOAD], [], [Have shl_load based dso])
+ ])
+
+ AC_CHECK_LIB(dl, dlopen, [
+ WITH_MODULES=1
+ MODULE_PLATFORM_LIBS="-ldl"
+ AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
+ ])
+ ;;
+ esac
fi
if test "${WITH_MODULES}" = "1"; then
@@ -715,6 +744,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \
if test "$with_minimum" != "yes"
then
if test "${with_mem_debug}" = "" ; then
+ echo Activating memory debugging
with_mem_debug="yes"
with_run_debug="yes"
fi
@@ -722,7 +752,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \
with_docbook="yes"
fi
fi
- if test "${CC}" = "gcc" ; then
+ if test "${GCC}" = "yes" ; then
CFLAGS="-g -O -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
fi
STATIC_BINARIES="-static"
@@ -782,9 +812,25 @@ else
THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
;;
*linux*)
- if test "${CC}" = "gcc" -a "${THREAD_LIBS}" = "-lpthread" ; then
- THREAD_LIBS=""
- BASE_THREAD_LIBS="-lpthread"
+ if test "${GCC}" = "yes" ; then
+ GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
+ GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
+ GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\..*++'`
+ if test "${THREAD_LIBS}" = "-lpthread" ; then
+ if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
+ then
+ THREAD_LIBS=""
+ BASE_THREAD_LIBS="-lpthread"
+ else
+ if expr ${GCC_MAJOR} \> 3 > /dev/null
+ then
+ THREAD_LIBS=""
+ BASE_THREAD_LIBS="-lpthread"
+ else
+ echo old GCC disabling weak symbols for pthread
+ fi
+ fi
+ fi
fi
;;
esac
@@ -1140,6 +1186,20 @@ fi
fi
AC_SUBST(WITH_ISO8859X)
+if test "$with_schematron" = "no" ; then
+ echo "Disabling Schematron support"
+ WITH_SCHEMATRON=0
+ TEST_SCHEMATRON=
+else
+ echo "Enabled Schematron support"
+ WITH_SCHEMATRON=1
+ TEST_SCHEMATRON="Schematrontests"
+ with_xpath=yes
+ with_pattern=yes
+fi
+AC_SUBST(WITH_SCHEMATRON)
+AC_SUBST(TEST_SCHEMATRON)
+
if test "$with_schemas" = "no" ; then
echo "Disabling Schemas/Relax-NG support"
WITH_SCHEMAS=0
diff --git a/debugXML.c b/debugXML.c
index 3cb2848..59529d6 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -34,6 +34,8 @@
#include
#endif
+#define DUMP_TEXT_TYPE 1
+
typedef struct _xmlDebugCtxt xmlDebugCtxt;
typedef xmlDebugCtxt *xmlDebugCtxtPtr;
struct _xmlDebugCtxt {
@@ -46,6 +48,7 @@ struct _xmlDebugCtxt {
int check; /* do just checkings */
int errors; /* number of errors found */
int nodict; /* if the document has no dictionnary */
+ int options; /* options */
};
static void xmlCtxtDumpNodeList(xmlDebugCtxtPtr ctxt, xmlNodePtr node);
@@ -63,6 +66,7 @@ xmlCtxtDumpInitCtxt(xmlDebugCtxtPtr ctxt)
ctxt->node = NULL;
ctxt->dict = NULL;
ctxt->nodict = 0;
+ ctxt->options = 0;
for (i = 0; i < 100; i++)
ctxt->shift[i] = ' ';
ctxt->shift[100] = 0;
@@ -902,9 +906,18 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
if (!ctxt->check) {
xmlCtxtDumpSpaces(ctxt);
if (node->name == (const xmlChar *) xmlStringTextNoenc)
- fprintf(ctxt->output, "TEXT no enc\n");
+ fprintf(ctxt->output, "TEXT no enc");
else
- fprintf(ctxt->output, "TEXT\n");
+ fprintf(ctxt->output, "TEXT");
+ if (ctxt->options & DUMP_TEXT_TYPE) {
+ if (node->content == (xmlChar *) &(node->properties))
+ fprintf(ctxt->output, " compact\n");
+ else if (xmlDictOwns(ctxt->dict, node->content) == 1)
+ fprintf(ctxt->output, " interned\n");
+ else
+ fprintf(ctxt->output, "\n");
+ } else
+ fprintf(ctxt->output, "\n");
}
break;
case XML_CDATA_SECTION_NODE:
@@ -1005,9 +1018,9 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
fprintf(ctxt->output, "PBM: doc == NULL !!!\n");
}
ctxt->depth++;
- if (node->nsDef != NULL)
+ if ((node->type == XML_ELEMENT_NODE) && (node->nsDef != NULL))
xmlCtxtDumpNamespaceList(ctxt, node->nsDef);
- if (node->properties != NULL)
+ if ((node->type == XML_ELEMENT_NODE) && (node->properties != NULL))
xmlCtxtDumpAttrList(ctxt, node->properties);
if (node->type != XML_ENTITY_REF_NODE) {
if ((node->type != XML_ELEMENT_NODE) && (node->content != NULL)) {
@@ -1489,6 +1502,7 @@ xmlDebugDumpDocumentHead(FILE * output, xmlDocPtr doc)
if (output == NULL)
output = stdout;
xmlCtxtDumpInitCtxt(&ctxt);
+ ctxt.options |= DUMP_TEXT_TYPE;
ctxt.output = output;
xmlCtxtDumpDocumentHead(&ctxt, doc);
xmlCtxtDumpCleanCtxt(&ctxt);
@@ -1509,6 +1523,7 @@ xmlDebugDumpDocument(FILE * output, xmlDocPtr doc)
if (output == NULL)
output = stdout;
xmlCtxtDumpInitCtxt(&ctxt);
+ ctxt.options |= DUMP_TEXT_TYPE;
ctxt.output = output;
xmlCtxtDumpDocument(&ctxt, doc);
xmlCtxtDumpCleanCtxt(&ctxt);
@@ -1529,6 +1544,7 @@ xmlDebugDumpDTD(FILE * output, xmlDtdPtr dtd)
if (output == NULL)
output = stdout;
xmlCtxtDumpInitCtxt(&ctxt);
+ ctxt.options |= DUMP_TEXT_TYPE;
ctxt.output = output;
xmlCtxtDumpDTD(&ctxt, dtd);
xmlCtxtDumpCleanCtxt(&ctxt);
diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html
index 31a028e..36b401b 100644
--- a/doc/APIchunk0.html
+++ b/doc/APIchunk0.html
@@ -207,7 +207,8 @@ A:link, A:visited, A:active { text-decoration: underline }
BaseCharIS_BASECHAR
IS_LETTER
xmlIsLetter
-BasedxmlXPathIsInf
+BasedxmlExpExpDerive
+xmlXPathIsInf
xmlXPathIsNaN
BasicLatinxmlUCSIsBasicLatin
BasicallyxmlValidateDtd
@@ -231,6 +232,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlStreamPushAttr
BoxDrawingxmlUCSIsBoxDrawing
BraillePatternsxmlUCSIsBraillePatterns
+BrzozowskixmlExpExpDerive
+xmlExpStringDerive
BufferxmlIOParseDTD
Bugs:_htmlElemDesc
BuhidxmlUCSIsBuhid
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index 51c034a..668482d 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -305,6 +305,7 @@ A:link, A:visited, A:active { text-decoration: underline }
CreateshtmlNewDoc
htmlNewDocNoDtD
xmlCreateDocParserCtxt
+xmlExpNewCtxt
xmlNewDoc
xmlXIncludeNewContext
CreationxmlNewCDataBlock
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index 249723b..161b4ef 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -61,10 +61,12 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_SCHEMAS_ELEM_FINAL_ABSENT
XML_SCHEMAS_TYPE_VARIETY_ABSENT
absoluteURIxmlParseURI
+xmlParseURIRaw
xmlParseURIReference
abstractXML_SCHEMAS_ELEM_ABSTRACT
XML_SCHEMAS_TYPE_ABSTRACT
-acceptxmlGetNoNsProp
+acceptxmlExpMaxToken
+xmlGetNoNsProp
xmlIsMixedElement
acceptablexmlRegExecErrInfo
xmlRegExecNextValues
@@ -72,10 +74,13 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlCatalogGetDefaults
xmlCatalogSetDefaultPrefer
xmlCatalogSetDefaults
+xmlExpGetStart
xmlRegExecErrInfo
xmlRegExecNextValues
xmlTextReaderNormalization
acceptingxmlTextReaderNormalization
+acceptsxmlExpIsNillable
+xmlExpSubsume
accessxmlGcMemGet
xmlGcMemSetup
xmlMemGet
@@ -86,6 +91,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlTextReaderCurrentNode
accessesxmlCreateURLParserCtxt
xmlNoNetExternalEntityLoader
+accexptedxmlExpSubsume
accommodatexmlBufferResize
accordingxmlBuildURI
xmlDetectCharEncoding
@@ -105,6 +111,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewAllTrans
xmlAutomataNewCountTrans
xmlAutomataNewCountTrans2
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -197,6 +204,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCountedTrans
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -240,10 +248,12 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaValidateLengthFacet
xmlSchemaValidateLengthFacetWhtsp
xmlSchemaValidateListSimpleTypeFacet
+xmlSchematronValidateDoc
xmlShellValidate
xmlValidateDtd
aggregatexmlNodeBufGetContent
xmlNodeGetContent
+algebraicxmlExpExpDerive
aliasxmlAddEncodingAlias
xmlDelEncodingAlias
xmlGetEncodingAlias
@@ -323,6 +333,7 @@ A:link, A:visited, A:active { text-decoration: underline }
htmlIsAutoClosed
xmlCatalogAdd
xmlNewChild
+xmlParseURIRaw
xmlTextReaderConstString
alreadyXML_SCHEMAS_ATTRGROUP_GLOBAL
XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
@@ -378,6 +389,7 @@ A:link, A:visited, A:active { text-decoration: underline }
analysis_xmlParserCtxt
_xmlValidCtxt
analyzexmlParseURI
+xmlParseURIRaw
xmlParseURIReference
analyzed_xmlParserInput
ancestorxmlNodeGetLang
@@ -423,7 +435,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParserHandlePEReference
appearingxmlValidatePopElement
xmlValidatePushElement
-appearsxmlParseCharData
+appearsxmlExpGetStart
+xmlParseCharData
xmlParseElementChildrenContentDecl
xmlParseEntityRef
xmlParseSDDecl
@@ -504,6 +517,10 @@ A:link, A:visited, A:active { text-decoration: underline }
assumingxmlSaveFileTo
xmlSaveFormatFileTo
assurexmlGetUTF8Char
+atomxmlExpNewAtom
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
atomicxmlGcMemGet
xmlGcMemSetup
attachedxmlTextReaderGetRemainder
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html
index 754df2d..763623f 100644
--- a/doc/APIchunk11.html
+++ b/doc/APIchunk11.html
@@ -62,6 +62,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaSAXPlug
xmlSchemaSAXUnplug
xmlSchemaValidateStream
+xmlSchematronNewValidCtxt
xmlSetCompressMode
xmlSetDocCompressMode
xmlStrcat
@@ -186,6 +187,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlStrEqual
xmlXPathCompareValues
xmlXPathIntersection
+boundxmlExpNewRange
boundaries_xmlParserCtxt
xmlSearchNs
boundaryxmlParseElementChildrenContentDecl
@@ -251,6 +253,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseEnumerationType
xmlParseNotationType
xmlParseURI
+xmlParseURIRaw
xmlRecoverDoc
xmlRecoverFile
xmlRecoverMemory
@@ -259,6 +262,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaGetCanonValue
xmlSchemaGetCanonValueWhtsp
xmlSchemaParse
+xmlSchematronParse
xmlTextReaderNextSibling
built-inxmlSchemaGetBuiltInListSimpleTypeItemType
xmlSchemaGetBuiltInType
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index b548fe2..9d1944e 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -77,6 +77,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlC14NExecute
capablexmlCheckUTF8
caractersxmlOutputBufferWriteEscape
+cardinalityxmlExpParse
carriedxmlNewDocProp
xmlNewNsProp
xmlNewNsPropEatName
@@ -198,9 +199,11 @@ A:link, A:visited, A:active { text-decoration: underline }
checkingxlinkIsLink
xmlBufferWriteQuotedString
xmlBuildURI
+xmlExpParse
xmlMemFree
xmlUTF8Strlen
-checkingsxmlValidateOneElement
+checkingsxmlExpParse
+xmlValidateOneElement
checksXML_SCHEMAS_ATTRGROUP_MARKED
XML_SCHEMAS_TYPE_MARKED
htmlAutoCloseTag
@@ -234,7 +237,9 @@ A:link, A:visited, A:active { text-decoration: underline }
childs_xmlNode
xmlIsMixedElement
xmlValidGetValidElements
-choicexmlParseElementChildrenContentDecl
+choicexmlExpNewOr
+xmlExpParse
+xmlParseElementChildrenContentDecl
choicesxmlParseElementMixedContentDecl
choices:xmlParseNotationDecl
chunkdocbParseChunk
@@ -380,6 +385,8 @@ A:link, A:visited, A:active { text-decoration: underline }
compatibleLIBXML_TEST_VERSION
xmlShellPwd
compilationLIBXML_VERSION_EXTRA
+XML_XPATH_CHECKNS
+_xmlXPathContext
xmlPatterncompile
xmlXPathCompile
xmlXPathCtxtCompile
@@ -400,15 +407,20 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSAXParseFile
xmlSAXParseFileWithData
compiledLIBXML_AUTOMATA_ENABLED
+LIBXML_EXPR_ENABLED
LIBXML_LEGACY_ENABLED
LIBXML_MODULES_ENABLED
LIBXML_REGEXP_ENABLED
LIBXML_SCHEMAS_ENABLED
+LIBXML_SCHEMATRON_ENABLED
LIBXML_TEST_VERSION
LIBXML_UNICODE_ENABLED
xmlAutomataCompile
xmlCheckVersion
+xmlExpDump
+xmlExpMaxToken
xmlGetLastError
+xmlHasFeature
xmlPatterncompile
xmlRegexpCompile
xmlRegexpExec
@@ -578,7 +590,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlValidGetValidElements
constructxmlParseElementChildrenContentDecl
constructionxmlCanonicPath
-constructsxmlParseNamespace
+constructsxmlExpParse
+xmlParseNamespace
consumedUTF8ToHtml
UTF8Toisolat1
_xmlParserInput
@@ -588,12 +601,16 @@ A:link, A:visited, A:active { text-decoration: underline }
isolat1ToUTF8
xmlCharEncodingInputFunc
xmlCharEncodingOutputFunc
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
xmlGetUTF8Char
xmlParserInputBufferRead
xmlSchemaNewNOTATIONValue
xmlSchemaNewQNameValue
xmlSchemaNewStringValue
-consumingxmlScanName
+consumingxmlExpExpDerive
+xmlScanName
containxmlNewTextChild
xmlParseAttribute
xmlParseEntityRef
@@ -607,6 +624,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRelaxNGNewParserCtxt
xmlSchemaNewMemParserCtxt
xmlSchemaNewParserCtxt
+xmlSchematronNewMemParserCtxt
+xmlSchematronNewParserCtxt
xmlXPathLeading
xmlXPathLeadingSorted
xmlXPathNodeLeading
@@ -676,7 +695,8 @@ A:link, A:visited, A:active { text-decoration: underline }
continuingxmlXPathSubstringFunction
contraryxmlNodeListGetRawString
xmlXPathFreeNodeSetList
-controlresolveEntity
+control_xmlXPathContext
+resolveEntity
resolveEntitySAXFunc
xmlNanoFTPClose
xmlNanoFTPConnect
@@ -765,9 +785,11 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlTextReaderSetSchema
xmlValidateDtd
countftpListCallback
+xmlExpRef
xmlLsCountNode
xmlSaveDoc
xmlSaveTree
+xmlSchematronValidateDoc
xmlTextReaderAttributeCount
xmlXPathCountFunction
counterxmlAutomataNewCountedTrans
@@ -793,6 +815,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCountedTrans
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -810,6 +833,9 @@ A:link, A:visited, A:active { text-decoration: underline }
cshemaXML_SCHEMAS_FINAL_DEFAULT_LIST
ctrioxmlXPathIsInf
xmlXPathIsNaN
+ctxtxmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
ctxt-docbFreeParserCtxt
htmlFreeParserCtxt
xmlFreeParserCtxt
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index cfab9a4..a44fa80 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -239,10 +239,13 @@ A:link, A:visited, A:active { text-decoration: underline }
depth_xmlParserCtxt
_xmlValidCtxt
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlTextReaderDepth
deregistrationxmlDeregisterNodeDefault
derivationXML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
+xmlExpExpDerive
+xmlExpStringDerive
desxmlTextReaderRelaxNGSetSchema
xmlTextReaderRelaxNGValidate
xmlTextReaderSchemaValidate
@@ -303,7 +306,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSaveToFd
xmlSaveToIO
designedxmlCharEncodingOutputFunc
-xmlLoadExternalEntity
desiredxmlBufferResize
xmlIOHTTPOpenW
xmlUTF8Strloc
@@ -387,6 +389,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlDictQLookup
xmlDictReference
xmlDictSize
+xmlExpNewCtxt
didXML_SCHEMAS_TYPE_BLOCK_DEFAULT
xmlTextReaderGetRemainder
xmlTextReaderStandalone
@@ -405,6 +408,7 @@ A:link, A:visited, A:active { text-decoration: underline }
directhtmlElementAllowedHere
htmlElementAllowedHereDesc
htmlElementStatusHere
+xmlExpExpDerive
xmlParseAttribute
xmlURIUnescapeString
directionxmlXPathNextAncestor
@@ -445,6 +449,7 @@ A:link, A:visited, A:active { text-decoration: underline }
disablexmlCatalogSetDebug
disabledXML_CAST_FPTR
_xmlParserCtxt
+xmlParseURIRaw
disablingxmlNoNetExternalEntityLoader
disallowedXML_SCHEMAS_ELEM_BLOCK_EXTENSION
XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
@@ -491,36 +496,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSAXParseMemory
xmlSAXParseMemoryWithData
xmlXPathOrderDocElems
-does_xmlEntity
-xmlCheckUTF8
-xmlCtxtResetLastError
-xmlGetNoNsProp
-xmlGetNsProp
-xmlGetProp
-xmlHasNsProp
-xmlModuleFree
-xmlNodeGetBase
-xmlParseMarkupDecl
-xmlResetLastError
-xmlSaveDoc
-xmlSaveTree
-xmlSchemaGetCanonValue
-xmlSchemaValPredefTypeNodeNoNorm
-xmlURIEscape
-xmlURIUnescapeString
-xmlValidateAttributeDecl
-xmlValidateDocument
-xmlValidateDocumentFinal
-xmlValidateDtd
-xmlValidateDtdFinal
-xmlValidateElementDecl
-xmlValidateNotationDecl
-xmlValidateOneAttribute
-xmlValidateOneElement
-xmlValidateOneNamespace
-xmlValidateRoot
-xmlXPathSubstringAfterFunction
-xmlXPathSubstringBeforeFunction
doesn_htmlElemDesc
htmlElementAllowedHere
xmlCleanupParser
@@ -614,6 +589,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaIsValid
xmlSchemaNewDocParserCtxt
xmlSchemaSetValidOptions
+xmlSchematronNewDocParserCtxt
+dynamicLIBXML_MODULE_EXTENSION
Type xmlErrorPtr:
xmlCtxtGetLastError
xmlGetLastError
+
Type xmlExpCtxtPtr:
xmlExpNewCtxt
+
Type xmlExpNodePtr:
xmlExpExpDerive
+xmlExpNewAtom
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
+xmlExpParse
+xmlExpStringDerive
Type xmlExternalEntityLoader:
xmlGetExternalEntityLoader
Type xmlGlobalStatePtr:
xmlGetGlobalState
Type xmlHashTablePtr:
xmlHashCopy
@@ -491,6 +500,11 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaValueGetNext
Type xmlSchemaValType:
xmlSchemaGetValType
Type xmlSchemaValidCtxtPtr:
xmlSchemaNewValidCtxt
+
Type xmlSchematronParserCtxtPtr:
xmlSchematronNewDocParserCtxt
+xmlSchematronNewMemParserCtxt
+xmlSchematronNewParserCtxt
+
Type xmlSchematronPtr:
xmlSchematronParse
+
Type xmlSchematronValidCtxtPtr:
xmlSchematronNewValidCtxt
Type xmlStreamCtxtPtr:
xmlPatternGetStreamCtxt
Type xmlTextReaderPtr:
xmlNewTextReader
xmlNewTextReaderFilename
@@ -508,6 +522,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNewTextWriterTree
Type xmlURIPtr:
xmlCreateURI
xmlParseURI
+xmlParseURIRaw
Type xmlValidCtxtPtr:
xmlNewValidCtxt
Type xmlXIncludeCtxtPtr:
xmlXIncludeNewContext
Type xmlXPathCompExprPtr:
xmlXPathCompile
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 94d55f0..b275cf7 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -27,11 +27,13 @@ A:link, A:visited, A:active { text-decoration: underline }
Module HTMLparser:
HTML_DEPRECATED
HTML_INVALID
HTML_NA
+HTML_PARSE_COMPACT
HTML_PARSE_NOBLANKS
HTML_PARSE_NOERROR
HTML_PARSE_NONET
HTML_PARSE_NOWARNING
HTML_PARSE_PEDANTIC
+HTML_PARSE_RECOVER
HTML_REQUIRED
HTML_VALID
UTF8ToHtml
@@ -574,6 +576,37 @@ A:link, A:visited, A:active { text-decoration: underline }
Module parser:
XML_COMPLETE_ATTRS
XML_DEFAULT_VERSION
XML_DETECT_IDS
+XML_FEATURE_AUTOMATA
+XML_FEATURE_C14N
+XML_FEATURE_CATALOG
+XML_FEATURE_DEBUG
+XML_FEATURE_DEBUG_MEM
+XML_FEATURE_DEBUG_RUN
+XML_FEATURE_EXPR
+XML_FEATURE_FTP
+XML_FEATURE_HTML
+XML_FEATURE_HTTP
+XML_FEATURE_ICONV
+XML_FEATURE_ISO8859X
+XML_FEATURE_LEGACY
+XML_FEATURE_MODULES
+XML_FEATURE_NONE
+XML_FEATURE_OUTPUT
+XML_FEATURE_PATTERN
+XML_FEATURE_PUSH
+XML_FEATURE_READER
+XML_FEATURE_REGEXP
+XML_FEATURE_SAX1
+XML_FEATURE_SCHEMAS
+XML_FEATURE_SCHEMATRON
+XML_FEATURE_THREAD
+XML_FEATURE_TREE
+XML_FEATURE_UNICODE
+XML_FEATURE_VALID
+XML_FEATURE_WRITER
+XML_FEATURE_XINCLUDE
+XML_FEATURE_XPATH
+XML_FEATURE_XPTR
XML_PARSER_ATTRIBUTE_VALUE
XML_PARSER_CDATA_SECTION
XML_PARSER_COMMENT
@@ -592,6 +625,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_PARSER_START
XML_PARSER_START_TAG
XML_PARSER_SYSTEM_LITERAL
+XML_PARSE_COMPACT
XML_PARSE_DOM
XML_PARSE_DTDATTR
XML_PARSE_DTDLOAD
@@ -669,10 +703,12 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlCtxtResetPush
xmlCtxtUseOptions
xmlExternalEntityLoader
+xmlFeature
xmlFreeParserCtxt
xmlGetExternalEntityLoader
xmlGetFeature
xmlGetFeaturesList
+xmlHasFeature
xmlIOParseDTD
xmlInitNodeInfoSeq
xmlInitParser
@@ -869,6 +905,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternPtr
xmlPatternStreamable
xmlPatterncompile
@@ -941,6 +978,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRelaxNGPtr
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
+xmlRelaxNGSetValidStructuredErrors
xmlRelaxNGValidCtxt
xmlRelaxNGValidCtxtPtr
xmlRelaxNGValidErr
@@ -1167,6 +1205,30 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaWildcardNs
xmlSchemaWildcardNsPtr
xmlSchemaWildcardPtr
+
Module schematron:
XML_SCHEMATRON_OUT_BUFFER
+XML_SCHEMATRON_OUT_FILE
+XML_SCHEMATRON_OUT_IO
+XML_SCHEMATRON_OUT_QUIET
+XML_SCHEMATRON_OUT_TEXT
+XML_SCHEMATRON_OUT_XML
+xmlSchematron
+xmlSchematronFree
+xmlSchematronFreeParserCtxt
+xmlSchematronFreeValidCtxt
+xmlSchematronNewDocParserCtxt
+xmlSchematronNewMemParserCtxt
+xmlSchematronNewParserCtxt
+xmlSchematronNewValidCtxt
+xmlSchematronParse
+xmlSchematronParserCtxt
+xmlSchematronParserCtxtPtr
+xmlSchematronPtr
+xmlSchematronValidCtxt
+xmlSchematronValidCtxtPtr
+xmlSchematronValidOptions
+xmlSchematronValidateDoc
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
Module threads:
xmlCleanupThreads
xmlFreeMutex
xmlFreeRMutex
@@ -1468,6 +1530,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlFreeURI
xmlNormalizeURIPath
xmlParseURI
+xmlParseURIRaw
xmlParseURIReference
xmlPrintURI
xmlSaveUri
@@ -1682,6 +1745,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCounter
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewState
@@ -1896,6 +1960,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_FROM_FTP
XML_FROM_HTML
XML_FROM_HTTP
+XML_FROM_I18N
XML_FROM_IO
XML_FROM_MEMORY
XML_FROM_MODULE
@@ -1924,6 +1989,11 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_HTTP_UNKNOWN_HOST
XML_HTTP_URL_SYNTAX
XML_HTTP_USE_IP
+XML_I18N_CONV_FAILED
+XML_I18N_EXCESS_HANDLER
+XML_I18N_NO_HANDLER
+XML_I18N_NO_NAME
+XML_I18N_NO_OUTPUT
XML_IO_BUFFER_FULL
XML_IO_EACCES
XML_IO_EADDRINUSE
@@ -2255,6 +2325,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_SCHEMAP_SRC_IMPORT_3_2
XML_SCHEMAP_SRC_INCLUDE
XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE
+XML_SCHEMAP_SRC_REDEFINE
XML_SCHEMAP_SRC_RESOLVE
XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE
XML_SCHEMAP_SRC_SIMPLE_TYPE_1
@@ -2458,6 +2529,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlStructuredErrorFunc
Module xmlexports:
LIBXML_DLL_IMPORT
XMLCALL
+XMLCDECL
XMLPUBFUN
XMLPUBVAR
_REENTRANT
@@ -2621,7 +2693,39 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlTextReaderStandalone
xmlTextReaderValue
xmlTextReaderXmlLang
-
Module xmlregexp:
xmlRegExecCallbacks
+
Module xmlregexp:
XML_EXP_ATOM
+XML_EXP_COUNT
+XML_EXP_EMPTY
+XML_EXP_FORBID
+XML_EXP_OR
+XML_EXP_SEQ
+emptyExp
+forbiddenExp
+xmlExpCtxt
+xmlExpCtxtNbCons
+xmlExpCtxtNbNodes
+xmlExpCtxtPtr
+xmlExpDump
+xmlExpExpDerive
+xmlExpFree
+xmlExpFreeCtxt
+xmlExpGetLanguage
+xmlExpGetStart
+xmlExpIsNillable
+xmlExpMaxToken
+xmlExpNewAtom
+xmlExpNewCtxt
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
+xmlExpNode
+xmlExpNodePtr
+xmlExpNodeType
+xmlExpParse
+xmlExpRef
+xmlExpStringDerive
+xmlExpSubsume
+xmlRegExecCallbacks
xmlRegExecCtxt
xmlRegExecCtxtPtr
xmlRegExecErrInfo
@@ -2638,6 +2742,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRegexpPrint
xmlRegexpPtr
Module xmlsave:
XML_SAVE_FORMAT
+XML_SAVE_NO_DECL
xmlSaveClose
xmlSaveCtxt
xmlSaveCtxtPtr
@@ -2700,6 +2805,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaSetParserErrors
xmlSchemaSetValidErrors
xmlSchemaSetValidOptions
+xmlSchemaSetValidStructuredErrors
xmlSchemaValidCtxt
xmlSchemaValidCtxtGetOptions
xmlSchemaValidCtxtPtr
@@ -2957,6 +3063,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_DEBUG_RUNTIME
LIBXML_DOCB_ENABLED
LIBXML_DOTTED_VERSION
+LIBXML_EXPR_ENABLED
LIBXML_FTP_ENABLED
LIBXML_HTML_ENABLED
LIBXML_HTTP_ENABLED
@@ -2972,6 +3079,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_REGEXP_ENABLED
LIBXML_SAX1_ENABLED
LIBXML_SCHEMAS_ENABLED
+LIBXML_SCHEMATRON_ENABLED
LIBXML_TEST_VERSION
LIBXML_THREAD_ENABLED
LIBXML_TREE_ENABLED
@@ -3070,7 +3178,9 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlTextWriterWriteVFormatPI
xmlTextWriterWriteVFormatRaw
xmlTextWriterWriteVFormatString
-
Module xpath:
XPATH_BOOLEAN
+
Module xpath:
XML_XPATH_CHECKNS
+XML_XPATH_NOVAR
+XPATH_BOOLEAN
XPATH_ENCODING_ERROR
XPATH_EXPRESSION_OK
XPATH_EXPR_ERROR
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index ce0d0c5..3d660c4 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -19,6 +19,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRelaxNGValidityWarningFunc
xmlSchemaValidityErrorFunc
xmlSchemaValidityWarningFunc
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
xmlStrPrintf
xmlTextWriterWriteFormatAttribute
xmlTextWriterWriteFormatAttributeNS
@@ -180,6 +182,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAttrSerializeTxtContent
xmlAutomataNewCountTrans
xmlAutomataNewCountTrans2
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -218,6 +221,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlEncodeEntities
xmlEncodeEntitiesReentrant
xmlEncodeSpecialChars
+xmlExpNewAtom
+xmlExpStringDerive
xmlGetDocEntity
xmlGetDtdAttrDesc
xmlGetDtdElementDesc
@@ -491,6 +496,8 @@ A:link, A:visited, A:active { text-decoration: underline }
startElementSAXFunc
xlinkExtendedLinkFunk
xlinkExtendedLinkSetFunk
+xmlExpGetLanguage
+xmlExpGetStart
xmlPatterncompile
xmlRegExecErrInfo
xmlSAX2StartElement
@@ -694,6 +701,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xlinkSimpleLinkFunk
xmlAutomataNewCountTrans
xmlAutomataNewCountTrans2
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -792,6 +800,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRegNewExecCtxt
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
+xmlRelaxNGSetValidStructuredErrors
xmlRelaxNGValidityErrorFunc
xmlRelaxNGValidityWarningFunc
xmlSAX2AttributeDecl
@@ -831,9 +840,12 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSaveToIO
xmlSchemaSetParserErrors
xmlSchemaSetValidErrors
+xmlSchemaSetValidStructuredErrors
xmlSchemaValidateStream
xmlSchemaValidityErrorFunc
xmlSchemaValidityWarningFunc
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
xmlSetFeature
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
@@ -894,6 +906,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCounter
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewState
@@ -907,6 +920,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCountedTrans
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewTransition
@@ -942,6 +956,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlDumpEntityDecl
xmlDumpNotationDecl
xmlDumpNotationTable
+xmlExpDump
xmlNewTextWriterMemory
xmlNodeBufGetContent
xmlNodeDump
@@ -1055,6 +1070,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlDictQLookup
xmlDictReference
xmlDictSize
+xmlExpNewCtxt
xmlHashCreateDict
Type xmlDocPtr:
htmlDocContentDumpFormatOutput
htmlDocContentDumpOutput
@@ -1157,6 +1173,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSaveFormatFileTo
xmlSchemaNewDocParserCtxt
xmlSchemaValidateDoc
+xmlSchematronNewDocParserCtxt
+xmlSchematronValidateDoc
xmlSearchNs
xmlSearchNsByHref
xmlSetDocCompressMode
@@ -1241,7 +1259,35 @@ A:link, A:visited, A:active { text-decoration: underline }
Type xmlErrorPtr:
xmlCopyError
xmlResetError
xmlStructuredErrorFunc
+
Type xmlExpCtxtPtr:
xmlExpCtxtNbCons
+xmlExpCtxtNbNodes
+xmlExpExpDerive
+xmlExpFree
+xmlExpFreeCtxt
+xmlExpGetLanguage
+xmlExpGetStart
+xmlExpNewAtom
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
+xmlExpParse
+xmlExpStringDerive
+xmlExpSubsume
+
Type xmlExpNodePtr:
xmlExpDump
+xmlExpExpDerive
+xmlExpFree
+xmlExpGetLanguage
+xmlExpGetStart
+xmlExpIsNillable
+xmlExpMaxToken
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
+xmlExpRef
+xmlExpStringDerive
+xmlExpSubsume
Type xmlExternalEntityLoader:
xmlSetExternalEntityLoader
+
Type xmlFeature:
xmlHasFeature
Type xmlFreeFunc:
xmlGcMemSetup
xmlMemSetup
Type xmlFreeFunc *:
xmlGcMemGet
@@ -1716,13 +1762,13 @@ A:link, A:visited, A:active { text-decoration: underline }
Type xmlParserNodeInfoSeqPtr:
xmlClearNodeInfoSeq
xmlInitNodeInfoSeq
Type xmlParserSeverities:
xmlTextReaderErrorFunc
-
Type xmlPatternFlags:
xmlPatterncompile
Type xmlPatternPtr:
xmlFreePattern
xmlFreePatternList
xmlPatternFromRoot
xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternStreamable
Type xmlRMutexPtr:
xmlFreeRMutex
xmlRMutexLock
@@ -1759,6 +1805,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Type xmlRelaxNGValidCtxtPtr:
xmlRelaxNGFreeValidCtxt
xmlRelaxNGGetValidErrors
xmlRelaxNGSetValidErrors
+xmlRelaxNGSetValidStructuredErrors
xmlRelaxNGValidateDoc
xmlRelaxNGValidateFullElement
xmlRelaxNGValidatePopElement
@@ -1860,6 +1907,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaSAXPlug
xmlSchemaSetValidErrors
xmlSchemaSetValidOptions
+xmlSchemaSetValidStructuredErrors
xmlSchemaValidCtxtGetOptions
xmlSchemaValidateDoc
xmlSchemaValidateFile
@@ -1878,6 +1926,12 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaValidateFacetWhtsp
xmlSchemaValidateLengthFacetWhtsp
Type xmlSchemaWildcardPtr:
xmlSchemaFreeWildcard
+
Type xmlSchematronParserCtxtPtr:
xmlSchematronFreeParserCtxt
+xmlSchematronParse
+
Type xmlSchematronPtr:
xmlSchematronFree
+xmlSchematronNewValidCtxt
+
Type xmlSchematronValidCtxtPtr:
xmlSchematronFreeValidCtxt
+xmlSchematronValidateDoc
Type xmlShellCtxtPtr:
xmlShellBase
xmlShellCat
xmlShellCmd
@@ -1898,7 +1952,9 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlStreamPop
xmlStreamPush
xmlStreamPushAttr
-
Type xmlStructuredErrorFunc:
xmlSetStructuredErrorFunc
+
Type xmlStructuredErrorFunc:
xmlRelaxNGSetValidStructuredErrors
+xmlSchemaSetValidStructuredErrors
+xmlSetStructuredErrorFunc
xmlTextReaderSetStructuredErrorHandler
xmlThrDefSetStructuredErrorFunc
Type xmlTextReaderErrorFunc:
xmlTextReaderSetErrorHandler
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 756863f..d0fe11d 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -25,11 +25,13 @@ A:link, A:visited, A:active { text-decoration: underline }
HTML_ENTITY_REF_NODE
HTML_INVALID
HTML_NA
+HTML_PARSE_COMPACT
HTML_PARSE_NOBLANKS
HTML_PARSE_NOERROR
HTML_PARSE_NONET
HTML_PARSE_NOWARNING
HTML_PARSE_PEDANTIC
+HTML_PARSE_RECOVER
HTML_PI_NODE
HTML_PRESERVE_NODE
HTML_REQUIRED
@@ -63,6 +65,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_DLL_IMPORT
LIBXML_DOCB_ENABLED
LIBXML_DOTTED_VERSION
+LIBXML_EXPR_ENABLED
LIBXML_FTP_ENABLED
LIBXML_HTML_ENABLED
LIBXML_HTTP_ENABLED
@@ -78,6 +81,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_REGEXP_ENABLED
LIBXML_SAX1_ENABLED
LIBXML_SCHEMAS_ENABLED
+LIBXML_SCHEMATRON_ENABLED
LIBXML_TEST_VERSION
LIBXML_THREAD_ENABLED
LIBXML_TREE_ENABLED
@@ -119,6 +123,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XLINK_TYPE_NONE
XLINK_TYPE_SIMPLE
XMLCALL
+XMLCDECL
XMLPUBFUN
XMLPUBVAR
XML_ATTRIBUTE_CDATA
@@ -399,9 +404,46 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_ERR_WARNING
XML_ERR_XMLDECL_NOT_FINISHED
XML_ERR_XMLDECL_NOT_STARTED
+XML_EXP_ATOM
+XML_EXP_COUNT
+XML_EXP_EMPTY
+XML_EXP_FORBID
+XML_EXP_OR
+XML_EXP_SEQ
XML_EXTERNAL_GENERAL_PARSED_ENTITY
XML_EXTERNAL_GENERAL_UNPARSED_ENTITY
XML_EXTERNAL_PARAMETER_ENTITY
+XML_FEATURE_AUTOMATA
+XML_FEATURE_C14N
+XML_FEATURE_CATALOG
+XML_FEATURE_DEBUG
+XML_FEATURE_DEBUG_MEM
+XML_FEATURE_DEBUG_RUN
+XML_FEATURE_EXPR
+XML_FEATURE_FTP
+XML_FEATURE_HTML
+XML_FEATURE_HTTP
+XML_FEATURE_ICONV
+XML_FEATURE_ISO8859X
+XML_FEATURE_LEGACY
+XML_FEATURE_MODULES
+XML_FEATURE_NONE
+XML_FEATURE_OUTPUT
+XML_FEATURE_PATTERN
+XML_FEATURE_PUSH
+XML_FEATURE_READER
+XML_FEATURE_REGEXP
+XML_FEATURE_SAX1
+XML_FEATURE_SCHEMAS
+XML_FEATURE_SCHEMATRON
+XML_FEATURE_THREAD
+XML_FEATURE_TREE
+XML_FEATURE_UNICODE
+XML_FEATURE_VALID
+XML_FEATURE_WRITER
+XML_FEATURE_XINCLUDE
+XML_FEATURE_XPATH
+XML_FEATURE_XPTR
XML_FROM_C14N
XML_FROM_CATALOG
XML_FROM_CHECK
@@ -410,6 +452,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_FROM_FTP
XML_FROM_HTML
XML_FROM_HTTP
+XML_FROM_I18N
XML_FROM_IO
XML_FROM_MEMORY
XML_FROM_MODULE
@@ -441,6 +484,11 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_HTTP_UNKNOWN_HOST
XML_HTTP_URL_SYNTAX
XML_HTTP_USE_IP
+XML_I18N_CONV_FAILED
+XML_I18N_EXCESS_HANDLER
+XML_I18N_NO_HANDLER
+XML_I18N_NO_NAME
+XML_I18N_NO_OUTPUT
XML_INTERNAL_GENERAL_ENTITY
XML_INTERNAL_PARAMETER_ENTITY
XML_INTERNAL_PREDEFINED_ENTITY
@@ -540,6 +588,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_PARSER_SUBST_ENTITIES
XML_PARSER_SYSTEM_LITERAL
XML_PARSER_VALIDATE
+XML_PARSE_COMPACT
XML_PARSE_DOM
XML_PARSE_DTDATTR
XML_PARSE_DTDLOAD
@@ -755,6 +804,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_SAVE_CHAR_INVALID
XML_SAVE_FORMAT
XML_SAVE_NOT_UTF8
+XML_SAVE_NO_DECL
XML_SAVE_NO_DOCTYPE
XML_SAVE_UNKNOWN_ENCODING
XML_SAX2_MAGIC
@@ -897,6 +947,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_SCHEMAP_SRC_IMPORT_3_2
XML_SCHEMAP_SRC_INCLUDE
XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE
+XML_SCHEMAP_SRC_REDEFINE
XML_SCHEMAP_SRC_RESOLVE
XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE
XML_SCHEMAP_SRC_SIMPLE_TYPE_1
@@ -1091,6 +1142,12 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_SCHEMAS_UNKNOWN
XML_SCHEMAS_USHORT
XML_SCHEMAS_WILDCARD_COMPLETE
+XML_SCHEMATRON_OUT_BUFFER
+XML_SCHEMATRON_OUT_FILE
+XML_SCHEMATRON_OUT_IO
+XML_SCHEMATRON_OUT_QUIET
+XML_SCHEMATRON_OUT_TEXT
+XML_SCHEMATRON_OUT_XML
XML_SCHEMAV_ATTRINVALID
XML_SCHEMAV_ATTRUNKNOWN
XML_SCHEMAV_CONSTRUCT
@@ -1267,6 +1324,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_XINCLUDE_XPTR_RESULT
XML_XML_ID
XML_XML_NAMESPACE
+XML_XPATH_CHECKNS
XML_XPATH_ENCODING_ERROR
XML_XPATH_EXPRESSION_OK
XML_XPATH_EXPR_ERROR
@@ -1278,6 +1336,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_XPATH_INVALID_PREDICATE_ERROR
XML_XPATH_INVALID_TYPE
XML_XPATH_MEMORY_ERROR
+XML_XPATH_NOVAR
XML_XPATH_NUMBER_ERROR
XML_XPATH_START_LITERAL_ERROR
XML_XPATH_UNCLOSED_ERROR
@@ -1419,6 +1478,7 @@ A:link, A:visited, A:active { text-decoration: underline }
docbSAXParseFile
Letter e:
elementDecl
elementDeclSAXFunc
+emptyExp
endDocument
endDocumentSAXFunc
endElement
@@ -1430,6 +1490,7 @@ A:link, A:visited, A:active { text-decoration: underline }
externalSubset
externalSubsetSAXFunc
Letter f:
fatalErrorSAXFunc
+forbiddenExp
ftpDataCallback
ftpListCallback
Letter g:
getColumnNumber
@@ -1620,6 +1681,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlAutomataNewCounter
xmlAutomataNewCounterTrans
xmlAutomataNewEpsilon
+xmlAutomataNewNegTrans
xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
xmlAutomataNewState
@@ -1854,7 +1916,32 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlErrorDomain
xmlErrorLevel
xmlErrorPtr
+xmlExpCtxt
+xmlExpCtxtNbCons
+xmlExpCtxtNbNodes
+xmlExpCtxtPtr
+xmlExpDump
+xmlExpExpDerive
+xmlExpFree
+xmlExpFreeCtxt
+xmlExpGetLanguage
+xmlExpGetStart
+xmlExpIsNillable
+xmlExpMaxToken
+xmlExpNewAtom
+xmlExpNewCtxt
+xmlExpNewOr
+xmlExpNewRange
+xmlExpNewSeq
+xmlExpNode
+xmlExpNodePtr
+xmlExpNodeType
+xmlExpParse
+xmlExpRef
+xmlExpStringDerive
+xmlExpSubsume
xmlExternalEntityLoader
+xmlFeature
xmlFileClose
xmlFileMatch
xmlFileOpen
@@ -1934,6 +2021,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlGlobalState
xmlGlobalStatePtr
xmlHandleEntity
+xmlHasFeature
xmlHasNsProp
xmlHasProp
xmlHashAddEntry
@@ -2310,6 +2398,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseSystemLiteral
xmlParseTextDecl
xmlParseURI
+xmlParseURIRaw
xmlParseURIReference
xmlParseVersionInfo
xmlParseVersionNum
@@ -2367,6 +2456,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlPatternGetStreamCtxt
xmlPatternMatch
xmlPatternMaxDepth
+xmlPatternMinDepth
xmlPatternPtr
xmlPatternStreamable
xmlPatterncompile
@@ -2455,6 +2545,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRelaxNGPtr
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
+xmlRelaxNGSetValidStructuredErrors
xmlRelaxNGValidCtxt
xmlRelaxNGValidCtxtPtr
xmlRelaxNGValidErr
@@ -2607,6 +2698,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaSetParserErrors
xmlSchemaSetValidErrors
xmlSchemaSetValidOptions
+xmlSchemaSetValidStructuredErrors
xmlSchemaType
xmlSchemaTypeLink
xmlSchemaTypeLinkPtr
@@ -2644,6 +2736,24 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaWildcardNs
xmlSchemaWildcardNsPtr
xmlSchemaWildcardPtr
+xmlSchematron
+xmlSchematronFree
+xmlSchematronFreeParserCtxt
+xmlSchematronFreeValidCtxt
+xmlSchematronNewDocParserCtxt
+xmlSchematronNewMemParserCtxt
+xmlSchematronNewParserCtxt
+xmlSchematronNewValidCtxt
+xmlSchematronParse
+xmlSchematronParserCtxt
+xmlSchematronParserCtxtPtr
+xmlSchematronPtr
+xmlSchematronValidCtxt
+xmlSchematronValidCtxtPtr
+xmlSchematronValidOptions
+xmlSchematronValidateDoc
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
xmlSearchNs
xmlSearchNsByHref
xmlSetBufferAllocationScheme
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 03b74ae..c504fce 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -165,6 +165,7 @@ TEST_PUSH = @TEST_PUSH@
TEST_REGEXPS = @TEST_REGEXPS@
TEST_SAX = @TEST_SAX@
TEST_SCHEMAS = @TEST_SCHEMAS@
+TEST_SCHEMATRON = @TEST_SCHEMATRON@
TEST_THREADS = @TEST_THREADS@
TEST_VALID = @TEST_VALID@
TEST_VTIME = @TEST_VTIME@
@@ -200,6 +201,7 @@ WITH_REGEXPS = @WITH_REGEXPS@
WITH_RUN_DEBUG = @WITH_RUN_DEBUG@
WITH_SAX1 = @WITH_SAX1@
WITH_SCHEMAS = @WITH_SCHEMAS@
+WITH_SCHEMATRON = @WITH_SCHEMATRON@
WITH_THREADS = @WITH_THREADS@
WITH_TREE = @WITH_TREE@
WITH_TRIO = @WITH_TRIO@
diff --git a/doc/XSLT.html b/doc/XSLT.html
index 893dadb..7212cb6 100644
--- a/doc/XSLT.html
+++ b/doc/XSLT.html
@@ -10,5 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline }
XSLT |    | The XML C parser and toolkit of GnomeXSLT |
|
|
| Check the separate libxslt page XSL Transformations, is a
language for transforming XML documents into other XML documents (or
HTML/textual output). A separate library called libxslt is available implementing XSLT-1.0 for
-libxml2. This module "libxslt" too can be found in the Gnome CVS base. You can check the features
-supported and the progresses on the Changelog. Daniel Veillard |
|
|
|
|