BUG FIXED #2784 HTML parsing/output improvements Rebuilt, updated the docs
BUG FIXED #2784
HTML parsing/output improvements
Rebuilt, updated the docs
Improvement of regression scripts, make testall should look clean
Released as 1.7.4
diff --git a/ChangeLog b/ChangeLog
index 6649f2b..d5fb3ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon Oct 25 12:13:25 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * parser.c: closed bug #2784 a one line fix, but worth pushing
+ a new release out
+ * HTMLparser.c: fixed auto-close bugs on list items, zeroing
+ some structures, comments before and after the
+ main element, and other nastyness
+ * HTMLtree.c tree.c: accomodate the extended HTML supported
+ * configure.in: pushing 1.7.4
+ * test/ent8 and related outputs : added a new test for bug #2784
+ * test/HTML/wired.html and related output: a nasty HTML example
+ * Makefile.am: improved the test scripts
+ * docs/* : reran the documentation extractor, updated xml.html
+
Thu Oct 14 10:29:56 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.c, HTMLtree.c, tree.h: completely revamped the
diff --git a/HTMLparser.c b/HTMLparser.c
index 33b42b7..736dfb0 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -318,8 +318,10 @@
"BLOCKQUOTE", "P", "HEAD", NULL,
"DL", "P", "DT", "MENU", "DIR", "ADDRESS", "PRE", "LISTING",
"XMP", "HEAD", NULL,
-"DT", "P", "MENU", "DIR", "ADDRESS", "PRE", "LISTING", "XMP", "HEAD", NULL,
-"DD", "P", "MENU", "DIR", "ADDRESS", "PRE", "LISTING", "XMP", "HEAD", NULL,
+"DT", "P", "MENU", "DIR", "ADDRESS", "PRE", "LISTING", "XMP",
+ "HEAD", "DD", NULL,
+"DD", "P", "MENU", "DIR", "ADDRESS", "PRE", "LISTING", "XMP",
+ "HEAD", "DT", NULL,
"UL", "P", "HEAD", "OL", "MENU", "DIR", "ADDRESS", "PRE",
"LISTING", "XMP", NULL,
"OL", "P", "HEAD", "UL", NULL,
@@ -1687,12 +1689,6 @@
while (IS_CHAR(CUR) &&
((CUR == ':') || (CUR != '>') ||
(*r != '-') || (*q != '-'))) {
- if ((*r == '-') && (*q == '-')) {
- if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
- ctxt->sax->error(ctxt->userData,
- "Comment must not contain '--' (double-hyphen)`\n");
- ctxt->wellFormed = 0;
- }
NEXT;r++;q++;
}
if (!IS_CHAR(CUR)) {
@@ -2259,10 +2255,12 @@
}
if (test == CUR_PTR) {
- if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
- ctxt->sax->error(ctxt->userData,
- "detected an error in element content\n");
- ctxt->wellFormed = 0;
+ if (ctxt->node != NULL) {
+ if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+ ctxt->sax->error(ctxt->userData,
+ "detected an error in element content\n");
+ ctxt->wellFormed = 0;
+ }
break;
}
@@ -2470,20 +2468,23 @@
/*
* Wipe out everything which is before the first '<'
*/
- if (IS_BLANK(CUR)) {
- if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
- ctxt->sax->error(ctxt->userData,
- "Extra spaces at the beginning of the document are not allowed\n");
- ctxt->wellFormed = 0;
- SKIP_BLANKS;
- }
-
+ SKIP_BLANKS;
if (CUR == 0) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData, "Document is empty\n");
ctxt->wellFormed = 0;
}
+ /*
+ * Parse possible comments before any content
+ */
+ while ((CUR == '<') && (NXT(1) == '!') &&
+ (NXT(2) == '-') && (NXT(3) == '-')) {
+ ctxt->myDoc = htmlNewDoc(NULL, NULL);
+ htmlParseComment(ctxt, 1);
+ SKIP_BLANKS;
+ }
+
/*
* Then possibly doc type declaration(s) and more Misc
@@ -2508,7 +2509,7 @@
/*
* Time to start parsing the tree itself
*/
- htmlParseElement(ctxt);
+ htmlParseContent(ctxt);
/*
* SAX: end of the document processing.
@@ -2538,6 +2539,9 @@
{
htmlSAXHandler *sax;
+ if (ctxt == NULL) return;
+ memset(ctxt, 0, sizeof(htmlParserCtxt));
+
sax = (htmlSAXHandler *) xmlMalloc(sizeof(htmlSAXHandler));
if (sax == NULL) {
fprintf(stderr, "htmlInitParserCtxt: out of memory\n");
@@ -2580,6 +2584,7 @@
ctxt->replaceEntities = 0;
ctxt->html = 1;
ctxt->record_info = 0;
+ ctxt->validate = 0;
xmlInitNodeInfoSeq(&ctxt->node_seq);
}
@@ -2758,6 +2763,7 @@
inputStream->line = 1;
inputStream->col = 1;
inputStream->buf = buf;
+ inputStream->directory = NULL;
inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content;
diff --git a/HTMLtree.c b/HTMLtree.c
index 90e1c7d..53d9389 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -250,7 +250,7 @@
if (cur->intSubset != NULL)
htmlDtdDump(buf, cur);
if (cur->root != NULL) {
- htmlNodeDump(buf, cur, cur->root);
+ htmlNodeListDump(buf, cur, cur->root);
}
xmlBufferWriteChar(buf, "\n");
}
diff --git a/Makefile.am b/Makefile.am
index 71860ce..cb88ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,14 +85,13 @@
if [ ! -d $$i ] ; then \
if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \
echo New test file $$name ; \
- $(top_builddir)/testHTML $$i > $(srcdir)/result/HTML/$$name ; \
$(top_builddir)/testHTML $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \
else \
echo Testing $$name ; \
- $(top_builddir)/testHTML $$i > result.$$name 2>error.$$name ; \
+ $(top_builddir)/testHTML $$i > result.$$name 2> error.$$name ; \
diff $(srcdir)/result/HTML/$$name result.$$name ; \
diff $(srcdir)/result/HTML/$$name.err error.$$name ; \
- $(top_builddir)/testHTML result.$$name > result2.$$name ; \
+ $(top_builddir)/testHTML result.$$name > result2.$$name 2>error.$$name ; \
diff result.$$name result2.$$name ; \
rm result.$$name result2.$$name error.$$name ; \
fi ; fi ; done)
@@ -228,12 +227,13 @@
if [ ! -d $$i ] ; then \
if [ ! -f $(srcdir)/result/valid/$$name ] ; then \
echo New test file $$name ; \
- $(top_builddir)/tester --valid $$i > $(srcdir)/result/valid/$$name ; \
+ $(top_builddir)/tester --valid $$i > $(srcdir)/result/valid/$$name 2>$(srcdir)/result/valid/$$name.err ; \
else \
echo Testing $$name ; \
- $(top_builddir)/tester --valid $$i > result.$$name ; \
+ $(top_builddir)/tester --valid $$i > result.$$name 2>error.$$name ; \
diff $(srcdir)/result/valid/$$name result.$$name ; \
- rm result.$$name ; \
+ diff $(srcdir)/result/valid/$$name.err error.$$name ; \
+ rm result.$$name error.$$name ; \
fi ; fi ; done)
dist-hook: libxml.spec
@@ -253,9 +253,12 @@
confexecdir=$(libdir)
confexec_DATA = xmlConf.sh
-EXTRA_DIST = xmlConf.sh.in libxml.spec.in test result SAXresult \
+EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec \
example/Makefile.am example/gjobread.c example/gjobs.xml
+dist-hook:
+ (cd $(srcdir) ; tar -cf - --exclude CVS test result SAXresult ) | (cd $(distdir); tar xf -)
+
xmlConf.sh: xmlConf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
diff --git a/SAX.c b/SAX.c
index 3461fbb..cfc23f1 100644
--- a/SAX.c
+++ b/SAX.c
@@ -811,6 +811,12 @@
* concatenate it, else create a new node of type text.
*/
+ if (ctxt->node == NULL) {
+#ifdef DEBUG_SAX_TREE
+ fprintf(stderr, "add chars: ctxt->node == NULL !\n");
+#endif
+ return;
+ }
lastChild = xmlGetLastChild(ctxt->node);
#ifdef DEBUG_SAX_TREE
fprintf(stderr, "add chars to %s \n", ctxt->node->name);
diff --git a/SAXresult/ent8 b/SAXresult/ent8
new file mode 100644
index 0000000..84c1915
--- /dev/null
+++ b/SAXresult/ent8
@@ -0,0 +1,37 @@
+xmlSAXUserParseFile returned error 26
+SAX.setDocumentLocator()
+SAX.startDocument()
+SAX.internalSubset(doc, (null), (null))
+SAX.entityDecl(test1, 1, (null), (null), test 1)
+SAX.getEntity(test1)
+SAX.entityDecl(test2, 1, (null), (null), test 2)
+SAX.getEntity(test2)
+SAX.startElement(doc)
+SAX.characters(
+ , 4)
+SAX.startElement(Content)
+SAX.characters(Retenç, 6)
+SAX.characters(ã, 1)
+SAX.characters(o, 1)
+SAX.endElement(Content)
+SAX.characters(
+ , 4)
+SAX.startElement(Content)
+SAX.getEntity(lt)
+SAX.characters(<, 1)
+SAX.getEntity(gt)
+SAX.characters(>, 1)
+SAX.endElement(Content)
+SAX.characters(
+ , 4)
+SAX.startElement(Content)
+SAX.getEntity(test1)
+SAX.error: Entity 'test1' not defined
+SAX.getEntity(test2)
+SAX.error: Entity 'test2' not defined
+SAX.endElement(Content)
+SAX.characters(
+, 1)
+SAX.endElement(doc)
+SAX.endDocument()
+xmlSAXUserParseFile returned error 26
diff --git a/configure.in b/configure.in
index 0384a20..5ac800e 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@
LIBXML_MAJOR_VERSION=1
LIBXML_MINOR_VERSION=7
-LIBXML_MICRO_VERSION=3
+LIBXML_MICRO_VERSION=4
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/html/book1.html b/doc/html/book1.html
index 08f4515..1e12874 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -6,8 +6,8 @@
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
REL="NEXT"
-TITLE="Gnome XML Library"
-HREF="libxml.html"></HEAD
+TITLE="Libxml Programming Notes"
+HREF="libxml-notes.html"></HEAD
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
@@ -38,6 +38,59 @@
></TH
></TR
></TABLE
+><H3
+CLASS="AUTHOR"
+>Daniel Veillard</H3
+><DIV
+CLASS="AFFILIATION"
+><DIV
+CLASS="ADDRESS"
+><P
+CLASS="LITERALLAYOUT"
+> Daniel.Veillard@w3.org<br>
+ </P
+></DIV
+></DIV
+><P
+CLASS="COPYRIGHT"
+>Copyright © 1999 by <SPAN
+CLASS="HOLDER"
+>Daniel Veillard</SPAN
+></P
+><DIV
+><DIV
+CLASS="ABSTRACT"
+><P
+></P
+><P
+>This manual documents the interfaces of the libglade
+ library and has some short notes to help get you up to speed
+ with using the library.</P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="LEGALNOTICE"
+><P
+></P
+><P
+>Permission is granted to make and distribute verbatim
+ copies of this manual provided the copyright notice and this
+ permission notice are preserved on all copies.</P
+><P
+>Permission is granted to copy and distribute modified
+ versions of this manual under the conditions for verbatim
+ copying, provided also that the entire resulting derived work is
+ distributed under the terms of a permission notice identical to
+ this one.</P
+><P
+>Permission is granted to copy and distribute translations
+ of this manual into another language, under the above conditions
+ for modified versions.</P
+><P
+></P
+></DIV
></DIV
><DIV
CLASS="TOC"
@@ -48,8 +101,13 @@
></DT
><DT
><A
-HREF="libxml.html"
->Gnome XML Library</A
+HREF="libxml-notes.html"
+>Libxml Programming Notes</A
+></DT
+><DT
+><A
+HREF="libxml-lib.html"
+>Libxml Library Reference</A
></DT
><DD
><DL
@@ -95,6 +153,11 @@
> — </DT
><DT
><A
+HREF="gnome-xml-nanohttp.html"
+>nanohttp</A
+> — </DT
+><DT
+><A
HREF="gnome-xml-parserinternals.html"
>parserInternals</A
> — </DT
@@ -103,11 +166,6 @@
HREF="gnome-xml-xmlmemory.html"
>xmlmemory</A
> — </DT
-><DT
-><A
-HREF="gnome-xml-nanohttp.html"
->nanohttp</A
-> — </DT
></DL
></DD
></DL
@@ -155,7 +213,7 @@
BGCOLOR="#C00000"
ALIGN="right"
><A
-HREF="libxml.html"
+HREF="libxml-notes.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -177,7 +235,7 @@
COLOR="#FFFFFF"
SIZE="3"
><B
->Gnome XML Library</B
+>Libxml Programming Notes</B
></FONT
></TD
></TR
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index 3ef6390..0621785 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="tree"
HREF="gnome-xml-tree.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4122"
+NAME="AEN4236"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4125"
+NAME="AEN4239"
></A
><H2
>Synopsis</H2
@@ -344,7 +344,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4182"
+NAME="AEN4296"
></A
><H2
>Description</H2
@@ -354,14 +354,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4185"
+NAME="AEN4299"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4187"
+NAME="AEN4301"
></A
><H3
><A
@@ -377,7 +377,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_INTERNAL_GENERAL_ENTITY</PRE
+>#define XML_INTERNAL_GENERAL_ENTITY 1</PRE
></TD
></TR
></TABLE
@@ -387,7 +387,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4192"
+NAME="AEN4306"
></A
><H3
><A
@@ -403,7 +403,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_EXTERNAL_GENERAL_PARSED_ENTITY</PRE
+>#define XML_EXTERNAL_GENERAL_PARSED_ENTITY 2</PRE
></TD
></TR
></TABLE
@@ -413,7 +413,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4197"
+NAME="AEN4311"
></A
><H3
><A
@@ -429,7 +429,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</PRE
+>#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY 3</PRE
></TD
></TR
></TABLE
@@ -439,7 +439,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4202"
+NAME="AEN4316"
></A
><H3
><A
@@ -455,7 +455,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_INTERNAL_PARAMETER_ENTITY</PRE
+>#define XML_INTERNAL_PARAMETER_ENTITY 4</PRE
></TD
></TR
></TABLE
@@ -465,7 +465,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4207"
+NAME="AEN4321"
></A
><H3
><A
@@ -481,7 +481,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_EXTERNAL_PARAMETER_ENTITY</PRE
+>#define XML_EXTERNAL_PARAMETER_ENTITY 5</PRE
></TD
></TR
></TABLE
@@ -491,7 +491,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4212"
+NAME="AEN4326"
></A
><H3
><A
@@ -507,7 +507,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_INTERNAL_PREDEFINED_ENTITY</PRE
+>#define XML_INTERNAL_PREDEFINED_ENTITY 6</PRE
></TD
></TR
></TABLE
@@ -517,20 +517,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4217"
+NAME="AEN4331"
></A
><H3
><A
NAME="XMLENTITYPTR"
></A
>xmlEntityPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntity *xmlEntityPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4221"
+NAME="AEN4336"
></A
><H3
><A
@@ -546,7 +559,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_ENTITIES_TABLE</PRE
+>#define XML_MIN_ENTITIES_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -556,20 +569,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4226"
+NAME="AEN4341"
></A
><H3
><A
NAME="XMLENTITIESTABLEPTR"
></A
>xmlEntitiesTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntitiesTable *xmlEntitiesTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4230"
+NAME="AEN4346"
></A
><H3
><A
@@ -639,7 +665,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -656,7 +682,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -673,7 +699,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity type XML_xxx_yyy_ENTITY</TD
></TR
><TR
><TD
@@ -690,7 +716,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity external ID if available</TD
></TR
><TR
><TD
@@ -707,7 +733,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity system ID if available</TD
></TR
><TR
><TD
@@ -724,7 +750,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity content</TD
></TR
></TABLE
><P
@@ -734,7 +760,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4270"
+NAME="AEN4386"
></A
><H3
><A
@@ -804,7 +830,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -821,7 +847,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -838,7 +864,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity type XML_xxx_yyy_ENTITY</TD
></TR
><TR
><TD
@@ -855,7 +881,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity external ID if available</TD
></TR
><TR
><TD
@@ -872,7 +898,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity system ID if available</TD
></TR
><TR
><TD
@@ -889,7 +915,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity content</TD
></TR
></TABLE
><P
@@ -899,7 +925,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4310"
+NAME="AEN4426"
></A
><H3
><A
@@ -955,7 +981,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -970,7 +996,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the entity</TD
></TR
></TABLE
><P
@@ -980,7 +1006,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4331"
+NAME="AEN4447"
></A
><H3
><A
@@ -1042,7 +1068,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document referencing the entity</TD
></TR
><TR
><TD
@@ -1059,7 +1085,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -1074,7 +1100,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@@ -1084,7 +1110,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4357"
+NAME="AEN4473"
></A
><H3
><A
@@ -1145,7 +1171,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document referencing the entity</TD
></TR
><TR
><TD
@@ -1162,7 +1188,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -1177,7 +1203,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@@ -1187,7 +1213,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4383"
+NAME="AEN4499"
></A
><H3
><A
@@ -1248,7 +1274,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document referencing the entity</TD
></TR
><TR
><TD
@@ -1265,7 +1291,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -1280,7 +1306,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@@ -1290,7 +1316,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4409"
+NAME="AEN4525"
></A
><H3
><A
@@ -1357,7 +1383,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document containing the string</TD
></TR
><TR
><TD
@@ -1374,7 +1400,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> A string to convert to XML.</TD
></TR
><TR
><TD
@@ -1389,7 +1415,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A newly allocated string with the substitution done.</TD
></TR
></TABLE
><P
@@ -1399,7 +1425,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4437"
+NAME="AEN4553"
></A
><H3
><A
@@ -1465,7 +1491,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document containing the string</TD
></TR
><TR
><TD
@@ -1482,7 +1508,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> A string to convert to XML.</TD
></TR
><TR
><TD
@@ -1497,7 +1523,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A newly allocated string with the substitution done.</TD
></TR
></TABLE
><P
@@ -1507,7 +1533,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4464"
+NAME="AEN4580"
></A
><H3
><A
@@ -1558,7 +1584,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlEntitiesTablePtr just created or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -1568,7 +1594,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4480"
+NAME="AEN4596"
></A
><H3
><A
@@ -1624,7 +1650,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An entity table</TD
></TR
><TR
><TD
@@ -1639,7 +1665,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new xmlEntitiesTablePtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -1649,7 +1675,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4501"
+NAME="AEN4617"
></A
><H3
><A
@@ -1702,7 +1728,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An entity table</TD
></TR
></TABLE
><P
@@ -1712,7 +1738,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4517"
+NAME="AEN4633"
></A
><H3
><A
@@ -1769,7 +1795,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An XML buffer.</TD
></TR
><TR
><TD
@@ -1786,7 +1812,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An entity table</TD
></TR
></TABLE
><P
@@ -1847,7 +1873,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 11c9922..a0b6373 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="xml-error"
HREF="gnome-xml-xml-error.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN6107"
+NAME="AEN6306"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN6110"
+NAME="AEN6309"
></A
><H2
>Synopsis</H2
@@ -277,7 +277,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6148"
+NAME="AEN6347"
></A
><H2
>Description</H2
@@ -287,131 +287,248 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6151"
+NAME="AEN6350"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6153"
+NAME="AEN6352"
></A
><H3
><A
NAME="HTMLPARSERCTXT"
></A
>htmlParserCtxt</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxt htmlParserCtxt;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6157"
+NAME="AEN6357"
></A
><H3
><A
NAME="HTMLPARSERCTXTPTR"
></A
>htmlParserCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxtPtr htmlParserCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6161"
+NAME="AEN6362"
></A
><H3
><A
NAME="HTMLPARSERNODEINFO"
></A
>htmlParserNodeInfo</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfo htmlParserNodeInfo;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6165"
+NAME="AEN6367"
></A
><H3
><A
NAME="HTMLSAXHANDLER"
></A
>htmlSAXHandler</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler htmlSAXHandler;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6169"
+NAME="AEN6372"
></A
><H3
><A
NAME="HTMLSAXHANDLERPTR"
></A
>htmlSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6173"
+NAME="AEN6377"
></A
><H3
><A
NAME="HTMLPARSERINPUT"
></A
>htmlParserInput</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput htmlParserInput;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6177"
+NAME="AEN6382"
></A
><H3
><A
NAME="HTMLPARSERINPUTPTR"
></A
>htmlParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInputPtr htmlParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6181"
+NAME="AEN6387"
></A
><H3
><A
NAME="HTMLDOCPTR"
></A
>htmlDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDocPtr htmlDocPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6185"
+NAME="AEN6392"
></A
><H3
><A
NAME="HTMLNODEPTR"
></A
>htmlNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNodePtr htmlNodePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6189"
+NAME="AEN6397"
></A
><H3
><A
@@ -467,7 +584,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> The tag name</TD
></TR
><TR
><TD
@@ -482,7 +599,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the related htmlElemDescPtr or NULL if not found.</TD
></TR
></TABLE
><P
@@ -492,7 +609,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6210"
+NAME="AEN6418"
></A
><H3
><A
@@ -550,7 +667,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -565,7 +682,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
></TR
></TABLE
><P
@@ -575,7 +692,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6232"
+NAME="AEN6440"
></A
><H3
><A
@@ -637,7 +754,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an HTML parser context</TD
></TR
><TR
><TD
@@ -654,7 +771,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> location to store the entity name</TD
></TR
><TR
><TD
@@ -669,7 +786,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the associated htmlEntityDescPtr if found, or NULL otherwise,
+if non-NULL *str will have to be freed by the caller.</TD
></TR
></TABLE
><P
@@ -679,7 +797,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6259"
+NAME="AEN6467"
></A
><H3
><A
@@ -738,7 +856,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an HTML parser context</TD
></TR
><TR
><TD
@@ -753,7 +871,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the value parsed (as an int)</TD
></TR
></TABLE
><P
@@ -763,7 +881,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6281"
+NAME="AEN6489"
></A
><H3
><A
@@ -820,7 +938,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an HTML parser context</TD
></TR
></TABLE
><P
@@ -830,7 +948,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6299"
+NAME="AEN6507"
></A
><H3
><A
@@ -894,7 +1012,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -911,7 +1029,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@@ -928,7 +1046,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -945,7 +1063,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if using SAX, this pointer will be provided on callbacks. </TD
></TR
><TR
><TD
@@ -960,7 +1078,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -970,7 +1088,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6333"
+NAME="AEN6541"
></A
><H3
><A
@@ -1027,7 +1145,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -1044,7 +1162,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@@ -1059,7 +1177,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -1069,7 +1187,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6358"
+NAME="AEN6566"
></A
><H3
><A
@@ -1131,7 +1249,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -1148,7 +1266,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@@ -1165,7 +1283,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -1182,7 +1300,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if using SAX, this pointer will be provided on callbacks. </TD
></TR
><TR
><TD
@@ -1197,7 +1315,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -1207,7 +1325,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6391"
+NAME="AEN6599"
></A
><H3
><A
@@ -1262,7 +1380,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -1279,7 +1397,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@@ -1294,7 +1412,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -1355,7 +1473,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index dc59bb6..249e4ac 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="HTMLparser"
HREF="gnome-xml-htmlparser.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN6420"
+NAME="AEN6628"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN6423"
+NAME="AEN6631"
></A
><H2
>Synopsis</H2
@@ -188,7 +188,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6437"
+NAME="AEN6645"
></A
><H2
>Description</H2
@@ -198,14 +198,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6440"
+NAME="AEN6648"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6442"
+NAME="AEN6650"
></A
><H3
><A
@@ -221,7 +221,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define HTML_TEXT_NODE</PRE
+>#define HTML_TEXT_NODE XML_TEXT_NODE</PRE
></TD
></TR
></TABLE
@@ -231,7 +231,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6447"
+NAME="AEN6655"
></A
><H3
><A
@@ -247,7 +247,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define HTML_ENTITY_REF_NODE</PRE
+>#define HTML_ENTITY_REF_NODE XML_ENTITY_REF_NODE</PRE
></TD
></TR
></TABLE
@@ -257,7 +257,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6452"
+NAME="AEN6660"
></A
><H3
><A
@@ -273,7 +273,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define HTML_COMMENT_NODE</PRE
+>#define HTML_COMMENT_NODE XML_COMMENT_NODE</PRE
></TD
></TR
></TABLE
@@ -283,7 +283,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6457"
+NAME="AEN6665"
></A
><H3
><A
@@ -342,7 +342,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -359,7 +359,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> OUT: the memory pointer</TD
></TR
><TR
><TD
@@ -376,7 +376,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> OUT: the memory lenght</TD
></TR
></TABLE
><P
@@ -386,7 +386,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6482"
+NAME="AEN6690"
></A
><H3
><A
@@ -443,7 +443,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the FILE*</TD
></TR
><TR
><TD
@@ -460,7 +460,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
></TABLE
><P
@@ -470,7 +470,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6503"
+NAME="AEN6711"
></A
><H3
><A
@@ -524,7 +524,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -541,7 +541,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -556,7 +556,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the number of byte written or -1 in case of failure.</TD
></TR
></TABLE
><P
@@ -617,7 +617,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 14244a9..b692911 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -9,11 +9,14 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
-TITLE="xmlmemory"
-HREF="gnome-xml-xmlmemory.html"></HEAD
+TITLE="xpath"
+HREF="gnome-xml-xpath.html"><LINK
+REL="NEXT"
+TITLE="parserInternals"
+HREF="gnome-xml-parserinternals.html"></HEAD
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
@@ -41,7 +44,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="gnome-xml-xmlmemory.html"
+HREF="gnome-xml-xpath.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -79,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -94,7 +97,16 @@
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
-> </TD
+><A
+HREF="gnome-xml-parserinternals.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page >>></B
+></FONT
+></A
+></TD
></TR
></TABLE
></DIV
@@ -103,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN9064"
+NAME="AEN7008"
></A
><H2
>Name</H2
@@ -111,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN9067"
+NAME="AEN7011"
></A
><H2
>Synopsis</H2
@@ -130,7 +142,8 @@
HREF="gnome-xml-nanohttp.html#XMLNANOHTTPFETCH"
>xmlNanoHTTPFetch</A
> (const char *URL,
- const char *filename);
+ const char *filename,
+ char **contentType);
void* <A
HREF="gnome-xml-nanohttp.html#XMLNANOHTTPMETHOD"
>xmlNanoHTTPMethod</A
@@ -170,7 +183,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN9077"
+NAME="AEN7021"
></A
><H2
>Description</H2
@@ -180,14 +193,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN9080"
+NAME="AEN7024"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9082"
+NAME="AEN7026"
></A
><H3
><A
@@ -204,7 +217,8 @@
><PRE
CLASS="PROGRAMLISTING"
>int xmlNanoHTTPFetch (const char *URL,
- const char *filename);</PRE
+ const char *filename,
+ char **contentType);</PRE
></TD
></TR
></TABLE
@@ -263,6 +277,24 @@
WIDTH="20%"
ALIGN="RIGHT"
VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>contentType</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> if available the Content-Type information will be
+returned at that location</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
><I
CLASS="EMPHASIS"
>Returns</I
@@ -282,7 +314,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9105"
+NAME="AEN7053"
></A
><H3
><A
@@ -421,7 +453,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9137"
+NAME="AEN7085"
></A
><H3
><A
@@ -501,7 +533,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9156"
+NAME="AEN7104"
></A
><H3
><A
@@ -576,7 +608,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9175"
+NAME="AEN7123"
></A
><H3
><A
@@ -699,7 +731,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9204"
+NAME="AEN7152"
></A
><H3
><A
@@ -751,7 +783,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the HTTP context</TD
></TR
><TR
><TD
@@ -793,7 +825,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9227"
+NAME="AEN7175"
></A
><H3
><A
@@ -867,7 +899,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="gnome-xml-xmlmemory.html"
+HREF="gnome-xml-xpath.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -905,7 +937,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -920,7 +952,16 @@
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
-> </TD
+><A
+HREF="gnome-xml-parserinternals.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page >>></B
+></FONT
+></A
+></TD
></TR
><TR
><TD
@@ -930,13 +971,19 @@
COLOR="#FFFFFF"
SIZE="3"
><B
->xmlmemory</B
+>xpath</B
></FONT
></TD
><TD
COLSPAN="2"
ALIGN="right"
-> </TD
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>parserInternals</B
+></FONT
+></TD
></TR
></TABLE
></DIV
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index a31cfe5..393b88c 100644
--- a/doc/html/gnome-xml-parser.html
+++ b/doc/html/gnome-xml-parser.html
@@ -9,11 +9,11 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="NEXT"
TITLE="tree"
HREF="gnome-xml-tree.html"></HEAD
@@ -44,7 +44,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN11"
+NAME="AEN31"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN14"
+NAME="AEN34"
></A
><H2
>Synopsis</H2
@@ -712,6 +712,25 @@
>xmlChar</A
> *cur,
int recovery);
+int <A
+HREF="gnome-xml-parser.html#XMLSAXUSERPARSEFILE"
+>xmlSAXUserParseFile</A
+> (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+ void *user_data,
+ const char *filename);
+int <A
+HREF="gnome-xml-parser.html#XMLSAXUSERPARSEMEMORY"
+>xmlSAXUserParseMemory</A
+> (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+ void *user_data,
+ char *buffer,
+ int size);
<A
HREF="gnome-xml-tree.html#XMLDOCPTR"
>xmlDocPtr</A
@@ -891,7 +910,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN209"
+NAME="AEN233"
></A
><H2
>Description</H2
@@ -901,14 +920,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN212"
+NAME="AEN236"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN214"
+NAME="AEN238"
></A
><H3
><A
@@ -924,7 +943,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_DEFAULT_VERSION</PRE
+>#define XML_DEFAULT_VERSION "1.0"</PRE
></TD
></TR
></TABLE
@@ -934,7 +953,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN219"
+NAME="AEN243"
></A
><H3
><A
@@ -995,20 +1014,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN234"
+NAME="AEN258"
></A
><H3
><A
NAME="XMLPARSERINPUTPTR"
></A
>xmlParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput *xmlParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN238"
+NAME="AEN263"
></A
><H3
><A
@@ -1124,46 +1156,85 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN266"
+NAME="AEN291"
></A
><H3
><A
NAME="XMLPARSERNODEINFO"
></A
>xmlParserNodeInfo</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlParserNodeInfo xmlParserNodeInfo;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN270"
+NAME="AEN296"
></A
><H3
><A
NAME="XMLPARSERNODEINFOSEQ"
></A
>xmlParserNodeInfoSeq</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlParserNodeInfoSeq xmlParserNodeInfoSeq;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN274"
+NAME="AEN301"
></A
><H3
><A
NAME="XMLPARSERNODEINFOSEQPTR"
></A
>xmlParserNodeInfoSeqPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN278"
+NAME="AEN306"
></A
><H3
><A
@@ -1200,59 +1271,111 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN283"
+NAME="AEN311"
></A
><H3
><A
NAME="XMLPARSERCTXT"
></A
>xmlParserCtxt</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlParserCtxt xmlParserCtxt;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN287"
+NAME="AEN316"
></A
><H3
><A
NAME="XMLPARSERCTXTPTR"
></A
>xmlParserCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxt *xmlParserCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN291"
+NAME="AEN321"
></A
><H3
><A
NAME="XMLSAXLOCATOR"
></A
>xmlSAXLocator</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlSAXLocator xmlSAXLocator;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN295"
+NAME="AEN326"
></A
><H3
><A
NAME="XMLSAXLOCATORPTR"
></A
>xmlSAXLocatorPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN299"
+NAME="AEN331"
></A
><H3
><A
@@ -1370,7 +1493,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN328"
+NAME="AEN360"
></A
><H3
><A
@@ -1491,7 +1614,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN357"
+NAME="AEN389"
></A
><H3
><A
@@ -1588,7 +1711,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN381"
+NAME="AEN413"
></A
><H3
><A
@@ -1685,7 +1808,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN405"
+NAME="AEN437"
></A
><H3
><A
@@ -1845,7 +1968,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN443"
+NAME="AEN475"
></A
><H3
><A
@@ -1966,7 +2089,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN472"
+NAME="AEN504"
></A
><H3
><A
@@ -2144,7 +2267,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN514"
+NAME="AEN546"
></A
><H3
><A
@@ -2262,7 +2385,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN542"
+NAME="AEN574"
></A
><H3
><A
@@ -2404,7 +2527,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN576"
+NAME="AEN608"
></A
><H3
><A
@@ -2483,7 +2606,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN595"
+NAME="AEN627"
></A
><H3
><A
@@ -2541,7 +2664,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN609"
+NAME="AEN641"
></A
><H3
><A
@@ -2599,7 +2722,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN623"
+NAME="AEN655"
></A
><H3
><A
@@ -2699,7 +2822,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN647"
+NAME="AEN679"
></A
><H3
><A
@@ -2778,7 +2901,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN666"
+NAME="AEN698"
></A
><H3
><A
@@ -2878,7 +3001,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN690"
+NAME="AEN722"
></A
><H3
><A
@@ -2957,7 +3080,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN709"
+NAME="AEN741"
></A
><H3
><A
@@ -3054,7 +3177,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN732"
+NAME="AEN764"
></A
><H3
><A
@@ -3151,7 +3274,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN755"
+NAME="AEN787"
></A
><H3
><A
@@ -3251,7 +3374,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN779"
+NAME="AEN811"
></A
><H3
><A
@@ -3330,7 +3453,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN798"
+NAME="AEN830"
></A
><H3
><A
@@ -3427,7 +3550,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN821"
+NAME="AEN853"
></A
><H3
><A
@@ -3521,7 +3644,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN843"
+NAME="AEN875"
></A
><H3
><A
@@ -3615,7 +3738,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN865"
+NAME="AEN897"
></A
><H3
><A
@@ -3709,7 +3832,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN887"
+NAME="AEN919"
></A
><H3
><A
@@ -3782,7 +3905,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN905"
+NAME="AEN937"
></A
><H3
><A
@@ -3855,7 +3978,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN923"
+NAME="AEN955"
></A
><H3
><A
@@ -3928,20 +4051,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN941"
+NAME="AEN973"
></A
><H3
><A
NAME="XMLSAXHANDLERPTR"
></A
>xmlSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN945"
+NAME="AEN978"
></A
><H3
><A
@@ -3967,7 +4103,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN950"
+NAME="AEN983"
></A
><H3
><A
@@ -3993,7 +4129,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN955"
+NAME="AEN988"
></A
><H3
><A
@@ -4019,7 +4155,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN960"
+NAME="AEN993"
></A
><H3
><A
@@ -4045,7 +4181,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN965"
+NAME="AEN998"
></A
><H3
><A
@@ -4071,7 +4207,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN970"
+NAME="AEN1003"
></A
><H3
><A
@@ -4126,7 +4262,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser input</TD
></TR
><TR
><TD
@@ -4143,7 +4279,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an indicative size for the lookahead</TD
></TR
><TR
><TD
@@ -4158,7 +4294,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
></TR
></TABLE
><P
@@ -4168,7 +4305,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN994"
+NAME="AEN1027"
></A
><H3
><A
@@ -4223,7 +4360,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser input</TD
></TR
><TR
><TD
@@ -4240,7 +4377,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an indicative size for the lookahead</TD
></TR
><TR
><TD
@@ -4255,7 +4392,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
></TR
></TABLE
><P
@@ -4265,7 +4403,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1018"
+NAME="AEN1051"
></A
><H3
><A
@@ -4321,7 +4459,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the input xmlChar *</TD
></TR
><TR
><TD
@@ -4336,7 +4474,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new xmlChar * or NULL</TD
></TR
></TABLE
><P
@@ -4346,7 +4484,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1039"
+NAME="AEN1072"
></A
><H3
><A
@@ -4403,7 +4541,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the input xmlChar *</TD
></TR
><TR
><TD
@@ -4420,7 +4558,12 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the len of <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+></TD
></TR
><TR
><TD
@@ -4435,7 +4578,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new xmlChar * or NULL</TD
></TR
></TABLE
><P
@@ -4445,7 +4588,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1064"
+NAME="AEN1098"
></A
><H3
><A
@@ -4503,7 +4646,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array (haystack)</TD
></TR
><TR
><TD
@@ -4520,7 +4663,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the index of the first char (zero based)</TD
></TR
><TR
><TD
@@ -4537,7 +4680,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the length of the substring</TD
></TR
><TR
><TD
@@ -4552,7 +4695,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlChar * for the first occurence or NULL.</TD
></TR
></TABLE
><P
@@ -4562,7 +4705,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1093"
+NAME="AEN1127"
></A
><H3
><A
@@ -4622,7 +4765,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array</TD
></TR
><TR
><TD
@@ -4639,7 +4782,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar to search</TD
></TR
><TR
><TD
@@ -4654,7 +4797,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlChar * for the first occurence or NULL.</TD
></TR
></TABLE
><P
@@ -4664,7 +4807,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1119"
+NAME="AEN1153"
></A
><H3
><A
@@ -4724,7 +4867,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array (haystack)</TD
></TR
><TR
><TD
@@ -4741,7 +4884,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar to search (needle)</TD
></TR
><TR
><TD
@@ -4756,7 +4899,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlChar * for the first occurence or NULL.</TD
></TR
></TABLE
><P
@@ -4766,7 +4909,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1145"
+NAME="AEN1179"
></A
><H3
><A
@@ -4823,7 +4966,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first xmlChar *</TD
></TR
><TR
><TD
@@ -4840,7 +4983,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the second xmlChar *</TD
></TR
><TR
><TD
@@ -4855,7 +4998,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the integer result of the comparison</TD
></TR
></TABLE
><P
@@ -4865,7 +5008,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1170"
+NAME="AEN1204"
></A
><H3
><A
@@ -4923,7 +5066,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first xmlChar *</TD
></TR
><TR
><TD
@@ -4940,7 +5083,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the second xmlChar *</TD
></TR
><TR
><TD
@@ -4957,7 +5100,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the max comparison length</TD
></TR
><TR
><TD
@@ -4972,7 +5115,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the integer result of the comparison</TD
></TR
></TABLE
><P
@@ -4982,7 +5125,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1199"
+NAME="AEN1233"
></A
><H3
><A
@@ -5035,7 +5178,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array</TD
></TR
><TR
><TD
@@ -5050,7 +5193,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the number of xmlChar contained in the ARRAY.</TD
></TR
></TABLE
><P
@@ -5060,7 +5203,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1219"
+NAME="AEN1253"
></A
><H3
><A
@@ -5120,7 +5263,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the original xmlChar * array</TD
></TR
><TR
><TD
@@ -5137,7 +5280,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array added</TD
></TR
><TR
><TD
@@ -5152,7 +5295,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new xmlChar * containing the concatenated string.</TD
></TR
></TABLE
><P
@@ -5162,7 +5305,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1245"
+NAME="AEN1279"
></A
><H3
><A
@@ -5223,7 +5366,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the original xmlChar * array</TD
></TR
><TR
><TD
@@ -5240,7 +5383,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar * array added</TD
></TR
><TR
><TD
@@ -5257,7 +5400,12 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the length of <TT
+CLASS="PARAMETER"
+><I
+>add</I
+></TT
+></TD
></TR
><TR
><TD
@@ -5272,7 +5420,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new xmlChar * containing the concatenated string.</TD
></TR
></TABLE
><P
@@ -5282,7 +5430,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1275"
+NAME="AEN1310"
></A
><H3
><A
@@ -5338,7 +5486,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -5353,7 +5501,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5363,7 +5511,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1296"
+NAME="AEN1331"
></A
><H3
><A
@@ -5417,7 +5565,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an pointer to a char array</TD
></TR
><TR
><TD
@@ -5434,7 +5582,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the size of the array</TD
></TR
><TR
><TD
@@ -5449,7 +5597,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5459,7 +5607,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1320"
+NAME="AEN1355"
></A
><H3
><A
@@ -5513,7 +5661,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -5528,7 +5676,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5538,7 +5686,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1340"
+NAME="AEN1375"
></A
><H3
><A
@@ -5596,7 +5744,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> int 0 or 1 </TD
></TR
><TR
><TD
@@ -5611,7 +5759,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
></TR
></TABLE
><P
@@ -5621,7 +5769,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1360"
+NAME="AEN1395"
></A
><H3
><A
@@ -5678,7 +5826,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -5693,7 +5841,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5703,7 +5851,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1381"
+NAME="AEN1416"
></A
><H3
><A
@@ -5758,7 +5906,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an pointer to a char array</TD
></TR
><TR
><TD
@@ -5775,7 +5923,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the size of the array</TD
></TR
><TR
><TD
@@ -5790,7 +5938,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5800,7 +5948,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1405"
+NAME="AEN1440"
></A
><H3
><A
@@ -5855,7 +6003,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -5870,7 +6018,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -5880,7 +6028,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1425"
+NAME="AEN1460"
></A
><H3
><A
@@ -5938,7 +6086,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5953,7 +6101,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
></TR
></TABLE
><P
@@ -5963,7 +6112,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1447"
+NAME="AEN1482"
></A
><H3
><A
@@ -6026,7 +6175,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -6043,7 +6192,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -6060,7 +6209,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
></TR
><TR
><TD
@@ -6075,7 +6225,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -6085,7 +6235,255 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1477"
+NAME="AEN1512"
+></A
+><H3
+><A
+NAME="XMLSAXUSERPARSEFILE"
+></A
+>xmlSAXUserParseFile ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int xmlSAXUserParseFile (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+ void *user_data,
+ const char *filename);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse an XML file and call the given SAX handler routines.
+Automatic support for ZLIB/Compress compressed document is provided</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sax</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a SAX handler</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>user_data</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> The user data returned on SAX callbacks</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a file name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 in case of success or a error number otherwise</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1540"
+></A
+><H3
+><A
+NAME="XMLSAXUSERPARSEMEMORY"
+></A
+>xmlSAXUserParseMemory ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int xmlSAXUserParseMemory (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+ void *user_data,
+ char *buffer,
+ int size);</PRE
+></TD
+></TR
+></TABLE
+><P
+>A better SAX parsing routine.
+parse an XML in-memory buffer and call the given SAX handler routines.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sax</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a SAX handler</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>user_data</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> The user data returned on SAX callbacks</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>buffer</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an in-memory XML document input</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the lenght of the XML document in bytes</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 in case of success or a error number otherwise</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1572"
></A
><H3
><A
@@ -6146,7 +6544,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -6163,7 +6561,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an pointer to a char array</TD
></TR
><TR
><TD
@@ -6180,7 +6578,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the siwe of the array</TD
></TR
><TR
><TD
@@ -6197,7 +6595,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
></TR
><TR
><TD
@@ -6212,7 +6611,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -6222,7 +6621,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1510"
+NAME="AEN1605"
></A
><H3
><A
@@ -6283,7 +6682,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -6300,7 +6699,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -6317,7 +6716,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
></TR
><TR
><TD
@@ -6332,7 +6732,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting document tree</TD
></TR
></TABLE
><P
@@ -6342,7 +6742,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1539"
+NAME="AEN1634"
></A
><H3
><A
@@ -6402,7 +6802,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a NAME* containing the External ID of the DTD</TD
></TR
><TR
><TD
@@ -6419,7 +6819,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a NAME* containing the URL to the DTD</TD
></TR
><TR
><TD
@@ -6434,7 +6834,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -6444,7 +6844,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1565"
+NAME="AEN1660"
></A
><H3
><A
@@ -6508,7 +6908,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the SAX handler block</TD
></TR
><TR
><TD
@@ -6525,7 +6925,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a NAME* containing the External ID of the DTD</TD
></TR
><TR
><TD
@@ -6542,7 +6942,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a NAME* containing the URL to the DTD</TD
></TR
><TR
><TD
@@ -6557,7 +6957,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -6567,7 +6967,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1596"
+NAME="AEN1691"
></A
><H3
><A
@@ -6620,7 +7020,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an HTML parser context</TD
></TR
></TABLE
><P
@@ -6630,7 +7030,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1612"
+NAME="AEN1707"
></A
><H3
><A
@@ -6683,7 +7083,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -6693,7 +7093,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1628"
+NAME="AEN1723"
></A
><H3
><A
@@ -6753,7 +7153,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6770,7 +7170,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a xmlChar * buffer</TD
></TR
><TR
><TD
@@ -6787,7 +7187,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a file name</TD
></TR
></TABLE
><P
@@ -6797,7 +7197,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1653"
+NAME="AEN1748"
></A
><H3
><A
@@ -6825,7 +7225,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1659"
+NAME="AEN1754"
></A
><H3
><A
@@ -6853,7 +7253,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1665"
+NAME="AEN1760"
></A
><H3
><A
@@ -6914,7 +7314,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6931,7 +7331,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML node within the tree</TD
></TR
><TR
><TD
@@ -6946,7 +7346,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>an xmlParserNodeInfo block pointer or NULL</TD
></TR
></TABLE
><P
@@ -6956,7 +7356,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1691"
+NAME="AEN1786"
></A
><H3
><A
@@ -7009,7 +7409,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a node info sequence pointer</TD
></TR
></TABLE
><P
@@ -7019,7 +7419,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1707"
+NAME="AEN1802"
></A
><H3
><A
@@ -7073,7 +7473,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a node info sequence pointer</TD
></TR
></TABLE
><P
@@ -7083,7 +7483,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1723"
+NAME="AEN1818"
></A
><H3
><A
@@ -7144,7 +7544,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a node info sequence pointer</TD
></TR
><TR
><TD
@@ -7161,7 +7561,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML node pointer</TD
></TR
><TR
><TD
@@ -7176,7 +7576,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a long indicating the position of the record</TD
></TR
></TABLE
><P
@@ -7186,7 +7586,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1749"
+NAME="AEN1844"
></A
><H3
><A
@@ -7243,7 +7643,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -7260,7 +7660,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a node info sequence pointer</TD
></TR
></TABLE
><P
@@ -7270,7 +7670,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1770"
+NAME="AEN1865"
></A
><H3
><A
@@ -7331,7 +7731,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1785"
+NAME="AEN1880"
></A
><H3
><A
@@ -7391,7 +7791,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN1800"
+NAME="AEN1895"
></A
><H3
><A
@@ -7519,7 +7919,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -7557,7 +7957,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -7591,7 +7991,7 @@
COLOR="#FFFFFF"
SIZE="3"
><B
->Gnome XML Library</B
+>Libxml Library Reference</B
></FONT
></TD
><TD
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index f85c208..2f2bd1e 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -9,11 +9,11 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
-TITLE="xpath"
-HREF="gnome-xml-xpath.html"><LINK
+TITLE="nanohttp"
+HREF="gnome-xml-nanohttp.html"><LINK
REL="NEXT"
TITLE="xmlmemory"
HREF="gnome-xml-xmlmemory.html"></HEAD
@@ -44,7 +44,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="gnome-xml-xpath.html"
+HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN6800"
+NAME="AEN7195"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN6803"
+NAME="AEN7198"
></A
><H2
>Synopsis</H2
@@ -886,7 +886,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN7014"
+NAME="AEN7409"
></A
><H2
>Description</H2
@@ -896,14 +896,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN7017"
+NAME="AEN7412"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7019"
+NAME="AEN7414"
></A
><H3
><A
@@ -919,7 +919,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MAX_NAMELEN</PRE
+>#define XML_MAX_NAMELEN 1000</PRE
></TD
></TR
></TABLE
@@ -929,7 +929,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7024"
+NAME="AEN7419"
></A
><H3
><A
@@ -942,7 +942,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7028"
+NAME="AEN7423"
></A
><H3
><A
@@ -1000,7 +1000,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7042"
+NAME="AEN7437"
></A
><H3
><A
@@ -1016,7 +1016,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define SKIPCHARVAL(p)</PRE
+>#define SKIPCHARVAL(p) (p)++;</PRE
></TD
></TR
></TABLE
@@ -1058,7 +1058,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7056"
+NAME="AEN7451"
></A
><H3
><A
@@ -1116,7 +1116,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7070"
+NAME="AEN7465"
></A
><H3
><A
@@ -1174,7 +1174,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7084"
+NAME="AEN7479"
></A
><H3
><A
@@ -1232,7 +1232,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7098"
+NAME="AEN7493"
></A
><H3
><A
@@ -1290,7 +1290,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7112"
+NAME="AEN7507"
></A
><H3
><A
@@ -1348,7 +1348,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7126"
+NAME="AEN7521"
></A
><H3
><A
@@ -1406,7 +1406,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7140"
+NAME="AEN7535"
></A
><H3
><A
@@ -1464,7 +1464,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7154"
+NAME="AEN7549"
></A
><H3
><A
@@ -1522,7 +1522,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7168"
+NAME="AEN7563"
></A
><H3
><A
@@ -1580,7 +1580,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7182"
+NAME="AEN7577"
></A
><H3
><A
@@ -1638,7 +1638,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7196"
+NAME="AEN7591"
></A
><H3
><A
@@ -1696,7 +1696,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7210"
+NAME="AEN7605"
></A
><H3
><A
@@ -1754,7 +1754,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7224"
+NAME="AEN7619"
></A
><H3
><A
@@ -1810,7 +1810,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@@ -1825,7 +1825,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new parser context or NULL</TD
></TR
></TABLE
><P
@@ -1835,7 +1835,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7245"
+NAME="AEN7640"
></A
><H3
><A
@@ -1890,7 +1890,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -1905,7 +1905,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new parser context or NULL</TD
></TR
></TABLE
><P
@@ -1915,7 +1915,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7265"
+NAME="AEN7660"
></A
><H3
><A
@@ -1969,7 +1969,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an pointer to a char array</TD
></TR
><TR
><TD
@@ -1986,7 +1986,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the siwe of the array</TD
></TR
><TR
><TD
@@ -2001,7 +2001,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new parser context or NULL</TD
></TR
></TABLE
><P
@@ -2011,7 +2011,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7289"
+NAME="AEN7684"
></A
><H3
><A
@@ -2065,7 +2065,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -2075,7 +2075,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7305"
+NAME="AEN7700"
></A
><H3
><A
@@ -2126,7 +2126,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlParserCtxtPtr or NULL</TD
></TR
></TABLE
><P
@@ -2136,7 +2136,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7321"
+NAME="AEN7716"
></A
><H3
><A
@@ -2194,7 +2194,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the parser context</TD
></TR
><TR
><TD
@@ -2211,7 +2211,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the encoding value (number)</TD
></TR
></TABLE
><P
@@ -2221,7 +2221,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7342"
+NAME="AEN7737"
></A
><H3
><A
@@ -2281,7 +2281,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2298,7 +2298,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML entity pointer.</TD
></TR
></TABLE
><P
@@ -2308,7 +2308,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7364"
+NAME="AEN7759"
></A
><H3
><A
@@ -2368,7 +2368,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2385,7 +2385,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an Entity pointer</TD
></TR
><TR
><TD
@@ -2400,7 +2400,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new input stream or NULL</TD
></TR
></TABLE
><P
@@ -2410,7 +2410,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7390"
+NAME="AEN7785"
></A
><H3
><A
@@ -2468,7 +2468,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2485,7 +2485,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser input fragment (entity, XML fragment ...).</TD
></TR
></TABLE
><P
@@ -2495,7 +2495,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7411"
+NAME="AEN7806"
></A
><H3
><A
@@ -2552,7 +2552,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2567,7 +2567,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the current xmlChar in the parser context</TD
></TR
></TABLE
><P
@@ -2577,7 +2577,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7432"
+NAME="AEN7827"
></A
><H3
><A
@@ -2630,7 +2630,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an xmlP arserInputPtr</TD
></TR
></TABLE
><P
@@ -2640,7 +2640,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7448"
+NAME="AEN7843"
></A
><H3
><A
@@ -2697,7 +2697,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2714,7 +2714,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename to use as entity</TD
></TR
><TR
><TD
@@ -2729,7 +2729,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new input stream or NULL in case of error</TD
></TR
></TABLE
><P
@@ -2739,7 +2739,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7473"
+NAME="AEN7868"
></A
><H3
><A
@@ -2805,7 +2805,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2822,7 +2822,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a xmlChar ** </TD
></TR
><TR
><TD
@@ -2837,7 +2837,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the function returns the local part, and prefix is updated
+to get the Prefix if any.</TD
></TR
></TABLE
><P
@@ -2847,7 +2848,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7502"
+NAME="AEN7897"
></A
><H3
><A
@@ -2908,7 +2909,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -2923,7 +2924,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the namespace name or NULL</TD
></TR
></TABLE
><P
@@ -2933,7 +2934,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7525"
+NAME="AEN7920"
></A
><H3
><A
@@ -2999,7 +3000,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3016,7 +3017,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a xmlChar ** </TD
></TR
><TR
><TD
@@ -3031,7 +3032,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the function returns the local part, and prefix is updated
+to get the Prefix if any.</TD
></TR
></TABLE
><P
@@ -3041,7 +3043,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7554"
+NAME="AEN7949"
></A
><H3
><A
@@ -3101,7 +3103,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3116,7 +3118,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the namespace name</TD
></TR
></TABLE
><P
@@ -3126,7 +3128,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7577"
+NAME="AEN7972"
></A
><H3
><A
@@ -3183,7 +3185,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3198,7 +3200,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the string parser or NULL.</TD
></TR
></TABLE
><P
@@ -3208,7 +3210,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7598"
+NAME="AEN7993"
></A
><H3
><A
@@ -3267,7 +3269,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -3277,7 +3279,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7616"
+NAME="AEN8011"
></A
><H3
><A
@@ -3341,7 +3343,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3356,7 +3358,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the Name parsed or NULL</TD
></TR
></TABLE
><P
@@ -3366,7 +3368,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7640"
+NAME="AEN8035"
></A
><H3
><A
@@ -3429,7 +3431,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3444,7 +3446,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the Name parsed or NULL</TD
></TR
></TABLE
><P
@@ -3454,7 +3456,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7664"
+NAME="AEN8059"
></A
><H3
><A
@@ -3514,7 +3516,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3529,7 +3531,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the Nmtoken parsed or NULL</TD
></TR
></TABLE
><P
@@ -3539,7 +3541,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7687"
+NAME="AEN8082"
></A
><H3
><A
@@ -3602,7 +3604,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3619,7 +3621,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if non-NULL store a copy of the original entity value</TD
></TR
><TR
><TD
@@ -3634,7 +3636,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the EntityValue parsed with reference substitued or NULL</TD
></TR
></TABLE
><P
@@ -3644,7 +3646,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7714"
+NAME="AEN8109"
></A
><H3
><A
@@ -3705,7 +3707,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3720,7 +3722,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the AttValue parsed or NULL.</TD
></TR
></TABLE
><P
@@ -3730,7 +3732,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7736"
+NAME="AEN8131"
></A
><H3
><A
@@ -3788,7 +3790,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3803,7 +3805,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the SystemLiteral parsed or NULL</TD
></TR
></TABLE
><P
@@ -3813,7 +3815,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7758"
+NAME="AEN8153"
></A
><H3
><A
@@ -3871,7 +3873,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3886,7 +3888,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the PubidLiteral parsed or NULL.</TD
></TR
></TABLE
><P
@@ -3896,7 +3898,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7780"
+NAME="AEN8175"
></A
><H3
><A
@@ -3953,7 +3955,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -3970,7 +3972,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> int indicating whether we are within a CDATA section</TD
></TR
></TABLE
><P
@@ -3980,7 +3982,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7801"
+NAME="AEN8196"
></A
><H3
><A
@@ -4049,7 +4051,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4066,7 +4068,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a xmlChar** receiving PubidLiteral</TD
></TR
><TR
><TD
@@ -4083,7 +4085,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> indicate whether we should restrict parsing to only
+production [75], see NOTE below</TD
></TR
><TR
><TD
@@ -4098,7 +4101,9 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the function returns SystemLiteral and in the second
+case publicID receives PubidLiteral, is strict is off
+it is possible to return NULL and have publicID set.</TD
></TR
></TABLE
><P
@@ -4108,7 +4113,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7834"
+NAME="AEN8229"
></A
><H3
><A
@@ -4165,7 +4170,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -4175,7 +4180,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7851"
+NAME="AEN8246"
></A
><H3
><A
@@ -4233,7 +4238,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4248,7 +4253,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the PITarget name or NULL</TD
></TR
></TABLE
><P
@@ -4258,7 +4263,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7873"
+NAME="AEN8268"
></A
><H3
><A
@@ -4315,7 +4320,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -4325,7 +4330,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7891"
+NAME="AEN8286"
></A
><H3
><A
@@ -4390,7 +4395,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -4400,7 +4405,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7911"
+NAME="AEN8306"
></A
><H3
><A
@@ -4468,7 +4473,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -4478,7 +4483,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7934"
+NAME="AEN8329"
></A
><H3
><A
@@ -4574,7 +4579,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4591,7 +4596,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> Receive a possible fixed default value for the attribute</TD
></TR
><TR
><TD
@@ -4606,7 +4611,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
+or XML_ATTRIBUTE_FIXED. </TD
></TR
></TABLE
><P
@@ -4616,7 +4622,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7971"
+NAME="AEN8366"
></A
><H3
><A
@@ -4680,7 +4686,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4695,7 +4701,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the notation attribute tree built while parsing</TD
></TR
></TABLE
><P
@@ -4705,7 +4711,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN7995"
+NAME="AEN8390"
></A
><H3
><A
@@ -4767,7 +4773,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4782,7 +4788,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the enumeration attribute tree built while parsing</TD
></TR
></TABLE
><P
@@ -4792,7 +4798,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8018"
+NAME="AEN8413"
></A
><H3
><A
@@ -4853,7 +4859,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -4870,7 +4876,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the enumeration tree built while parsing</TD
></TR
><TR
><TD
@@ -4885,7 +4891,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
></TR
></TABLE
><P
@@ -4895,7 +4901,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8045"
+NAME="AEN8440"
></A
><H3
><A
@@ -4997,7 +5003,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5014,7 +5020,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the enumeration tree built while parsing</TD
></TR
><TR
><TD
@@ -5029,7 +5035,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the attribute type</TD
></TR
></TABLE
><P
@@ -5039,7 +5045,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8083"
+NAME="AEN8478"
></A
><H3
><A
@@ -5096,7 +5102,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -5106,7 +5112,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8101"
+NAME="AEN8496"
></A
><H3
><A
@@ -5179,7 +5185,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5194,7 +5200,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the list of the xmlElementContentPtr describing the element choices</TD
></TR
></TABLE
><P
@@ -5204,7 +5210,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8127"
+NAME="AEN8522"
></A
><H3
><A
@@ -5281,7 +5287,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5296,7 +5302,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the tree of xmlElementContentPtr describing the element
+hierarchy.</TD
></TR
></TABLE
><P
@@ -5306,7 +5313,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8153"
+NAME="AEN8548"
></A
><H3
><A
@@ -5370,7 +5377,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5387,7 +5394,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the name of the element being defined.</TD
></TR
><TR
><TD
@@ -5404,7 +5411,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the Element Content pointer will be stored here if any</TD
></TR
><TR
><TD
@@ -5419,7 +5426,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the type of element content XML_ELEMENT_TYPE_xxx</TD
></TR
></TABLE
><P
@@ -5429,7 +5436,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8184"
+NAME="AEN8579"
></A
><H3
><A
@@ -5487,7 +5494,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5502,7 +5509,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the type of the element, or -1 in case of error</TD
></TR
></TABLE
><P
@@ -5512,7 +5519,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8206"
+NAME="AEN8601"
></A
><H3
><A
@@ -5581,7 +5588,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -5591,7 +5598,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8225"
+NAME="AEN8620"
></A
><H3
><A
@@ -5654,7 +5661,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5669,7 +5676,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the value parsed (as an int)</TD
></TR
></TABLE
><P
@@ -5679,7 +5686,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8248"
+NAME="AEN8643"
></A
><H3
><A
@@ -5755,7 +5762,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -5770,7 +5777,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlEntityPtr if found, or NULL otherwise.</TD
></TR
></TABLE
><P
@@ -5780,7 +5787,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8272"
+NAME="AEN8667"
></A
><H3
><A
@@ -5844,7 +5851,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -5854,7 +5861,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8291"
+NAME="AEN8686"
></A
><H3
><A
@@ -5930,7 +5937,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -5940,7 +5947,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8312"
+NAME="AEN8707"
></A
><H3
><A
@@ -6000,7 +6007,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -6010,7 +6017,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8330"
+NAME="AEN8725"
></A
><H3
><A
@@ -6093,7 +6100,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6110,7 +6117,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a xmlChar ** used to store the value of the attribute</TD
></TR
><TR
><TD
@@ -6125,7 +6132,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the attribute name, and the value in *value.</TD
></TR
></TABLE
><P
@@ -6135,7 +6142,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8364"
+NAME="AEN8759"
></A
><H3
><A
@@ -6210,7 +6217,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6225,7 +6232,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the element name parsed</TD
></TR
></TABLE
><P
@@ -6235,7 +6242,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8392"
+NAME="AEN8787"
></A
><H3
><A
@@ -6298,7 +6305,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6315,7 +6322,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the tag name as parsed in the opening tag.</TD
></TR
></TABLE
><P
@@ -6325,7 +6332,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8416"
+NAME="AEN8811"
></A
><H3
><A
@@ -6386,7 +6393,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -6396,7 +6403,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8436"
+NAME="AEN8831"
></A
><H3
><A
@@ -6451,7 +6458,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -6461,7 +6468,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8453"
+NAME="AEN8848"
></A
><H3
><A
@@ -6533,7 +6540,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -6543,7 +6550,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8472"
+NAME="AEN8867"
></A
><H3
><A
@@ -6601,7 +6608,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6616,7 +6623,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the string giving the XML version number, or NULL</TD
></TR
></TABLE
><P
@@ -6626,7 +6633,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8494"
+NAME="AEN8889"
></A
><H3
><A
@@ -6686,7 +6693,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6701,7 +6708,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the version string, e.g. "1.0"</TD
></TR
></TABLE
><P
@@ -6711,7 +6718,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8517"
+NAME="AEN8912"
></A
><H3
><A
@@ -6769,7 +6776,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6784,7 +6791,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the encoding name value or NULL</TD
></TR
></TABLE
><P
@@ -6794,7 +6801,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8539"
+NAME="AEN8934"
></A
><H3
><A
@@ -6854,7 +6861,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6869,7 +6876,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the encoding value or NULL</TD
></TR
></TABLE
><P
@@ -6879,7 +6886,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8562"
+NAME="AEN8957"
></A
><H3
><A
@@ -6949,7 +6956,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -6964,7 +6971,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if standalone, 0 otherwise</TD
></TR
></TABLE
><P
@@ -6974,7 +6981,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8584"
+NAME="AEN8979"
></A
><H3
><A
@@ -7029,7 +7036,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -7039,7 +7046,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8601"
+NAME="AEN8996"
></A
><H3
><A
@@ -7094,7 +7101,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
></TABLE
><P
@@ -7104,7 +7111,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8618"
+NAME="AEN9013"
></A
><H3
><A
@@ -7169,7 +7176,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -7186,7 +7193,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the external identifier</TD
></TR
><TR
><TD
@@ -7203,7 +7210,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the system identifier (or URL)</TD
></TR
></TABLE
><P
@@ -7213,7 +7220,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8646"
+NAME="AEN9041"
></A
><H3
><A
@@ -7229,7 +7236,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_NONE</PRE
+>#define XML_SUBSTITUTE_NONE 0</PRE
></TD
></TR
></TABLE
@@ -7239,7 +7246,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8651"
+NAME="AEN9046"
></A
><H3
><A
@@ -7255,7 +7262,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_REF</PRE
+>#define XML_SUBSTITUTE_REF 1</PRE
></TD
></TR
></TABLE
@@ -7265,7 +7272,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8656"
+NAME="AEN9051"
></A
><H3
><A
@@ -7281,7 +7288,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_PEREF</PRE
+>#define XML_SUBSTITUTE_PEREF 2</PRE
></TD
></TR
></TABLE
@@ -7291,7 +7298,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8661"
+NAME="AEN9056"
></A
><H3
><A
@@ -7307,7 +7314,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_BOTH</PRE
+>#define XML_SUBSTITUTE_BOTH 3</PRE
></TD
></TR
></TABLE
@@ -7317,7 +7324,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8666"
+NAME="AEN9061"
></A
><H3
><A
@@ -7389,7 +7396,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the parser context</TD
></TR
><TR
><TD
@@ -7406,7 +7413,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the len to decode (in bytes !), -1 for no size limit</TD
></TR
><TR
><TD
@@ -7423,7 +7430,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
></TR
><TR
><TD
@@ -7440,7 +7447,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an end marker xmlChar, 0 if none</TD
></TR
><TR
><TD
@@ -7457,7 +7464,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an end marker xmlChar, 0 if none</TD
></TR
><TR
><TD
@@ -7474,7 +7481,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an end marker xmlChar, 0 if none</TD
></TR
><TR
><TD
@@ -7489,7 +7496,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>A newly allocated string with the substitution done. The caller
+must deallocate it !</TD
></TR
></TABLE
><P
@@ -7499,7 +7507,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8711"
+NAME="AEN9106"
></A
><H3
><A
@@ -7596,7 +7604,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8735"
+NAME="AEN9130"
></A
><H3
><A
@@ -7675,7 +7683,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8755"
+NAME="AEN9150"
></A
><H3
><A
@@ -7772,7 +7780,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8779"
+NAME="AEN9174"
></A
><H3
><A
@@ -7864,7 +7872,7 @@
BGCOLOR="#C00000"
ALIGN="left"
><A
-HREF="gnome-xml-xpath.html"
+HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -7902,7 +7910,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -7936,7 +7944,7 @@
COLOR="#FFFFFF"
SIZE="3"
><B
->xpath</B
+>nanohttp</B
></FONT
></TD
><TD
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index 93e8bb6..10c8d6a 100644
--- a/doc/html/gnome-xml-tree.html
+++ b/doc/html/gnome-xml-tree.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="parser"
HREF="gnome-xml-parser.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1833"
+NAME="AEN1928"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1836"
+NAME="AEN1931"
></A
><H2
>Synopsis</H2
@@ -1184,7 +1184,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2124"
+NAME="AEN2219"
></A
><H2
>Description</H2
@@ -1194,14 +1194,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2127"
+NAME="AEN2222"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2129"
+NAME="AEN2224"
></A
><H3
><A
@@ -1229,7 +1229,8 @@
XML_DOCUMENT_NODE= 9,
XML_DOCUMENT_TYPE_NODE= 10,
XML_DOCUMENT_FRAG_NODE= 11,
- XML_NOTATION_NODE= 12
+ XML_NOTATION_NODE= 12,
+ XML_HTML_DOCUMENT_NODE= 13
} xmlElementType;</PRE
></TD
></TR
@@ -1240,7 +1241,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2134"
+NAME="AEN2229"
></A
><H3
><A
@@ -1253,7 +1254,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2138"
+NAME="AEN2233"
></A
><H3
><A
@@ -1269,7 +1270,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define CHAR</PRE
+>#define CHAR xmlChar</PRE
></TD
></TR
></TABLE
@@ -1279,7 +1280,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2143"
+NAME="AEN2238"
></A
><H3
><A
@@ -1295,7 +1296,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define BAD_CAST</PRE
+>#define BAD_CAST (xmlChar *)</PRE
></TD
></TR
></TABLE
@@ -1305,20 +1306,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2148"
+NAME="AEN2243"
></A
><H3
><A
NAME="XMLNOTATIONPTR"
></A
>xmlNotationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNotation *xmlNotationPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2152"
+NAME="AEN2248"
></A
><H3
><A
@@ -1355,7 +1369,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2157"
+NAME="AEN2253"
></A
><H3
><A
@@ -1386,33 +1400,59 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2162"
+NAME="AEN2258"
></A
><H3
><A
NAME="XMLENUMERATIONPTR"
></A
>xmlEnumerationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEnumeration *xmlEnumerationPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2166"
+NAME="AEN2263"
></A
><H3
><A
NAME="XMLATTRIBUTEPTR"
></A
>xmlAttributePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttribute *xmlAttributePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2170"
+NAME="AEN2268"
></A
><H3
><A
@@ -1443,7 +1483,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2175"
+NAME="AEN2273"
></A
><H3
><A
@@ -1474,20 +1514,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2180"
+NAME="AEN2278"
></A
><H3
><A
NAME="XMLELEMENTCONTENTPTR"
></A
>xmlElementContentPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementContent *xmlElementContentPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2184"
+NAME="AEN2283"
></A
><H3
><A
@@ -1518,20 +1571,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2189"
+NAME="AEN2288"
></A
><H3
><A
NAME="XMLELEMENTPTR"
></A
>xmlElementPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElement *xmlElementPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2193"
+NAME="AEN2293"
></A
><H3
><A
@@ -1560,150 +1626,293 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2198"
+NAME="AEN2298"
></A
><H3
><A
NAME="XMLNSPTR"
></A
>xmlNsPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNs *xmlNsPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2202"
+NAME="AEN2303"
></A
><H3
><A
NAME="XMLDTDPTR"
></A
>xmlDtdPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDtd *xmlDtdPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2206"
+NAME="AEN2308"
></A
><H3
><A
NAME="XMLATTRPTR"
></A
>xmlAttrPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttr *xmlAttrPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2210"
+NAME="AEN2313"
></A
><H3
><A
NAME="XMLIDPTR"
></A
>xmlIDPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlID *xmlIDPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2214"
+NAME="AEN2318"
></A
><H3
><A
NAME="XMLREFPTR"
></A
>xmlRefPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRef *xmlRefPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2218"
+NAME="AEN2323"
></A
><H3
><A
NAME="XMLNODE"
></A
>xmlNode</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlNode xmlNode;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2222"
+NAME="AEN2328"
></A
><H3
><A
NAME="XMLNODEPTR"
></A
>xmlNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlNode *xmlNodePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2226"
+NAME="AEN2333"
></A
><H3
><A
NAME="XMLDOC"
></A
>xmlDoc</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlDoc xmlDoc;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2230"
+NAME="AEN2338"
></A
><H3
><A
NAME="XMLDOCPTR"
></A
>xmlDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDoc *xmlDocPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2234"
+NAME="AEN2343"
></A
><H3
><A
NAME="XMLBUFFER"
></A
>xmlBuffer</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef _xmlBuffer xmlBuffer;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2238"
+NAME="AEN2348"
></A
><H3
><A
NAME="XMLBUFFERPTR"
></A
>xmlBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlBuffer *xmlBufferPtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2242"
+NAME="AEN2353"
></A
><H3
><A
@@ -1729,7 +1938,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2247"
+NAME="AEN2358"
></A
><H3
><A
@@ -1755,7 +1964,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2252"
+NAME="AEN2363"
></A
><H3
><A
@@ -1781,7 +1990,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2257"
+NAME="AEN2368"
></A
><H3
><A
@@ -1832,7 +2041,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new structure.</TD
></TR
></TABLE
><P
@@ -1842,7 +2051,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2273"
+NAME="AEN2384"
></A
><H3
><A
@@ -1895,7 +2104,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to free</TD
></TR
></TABLE
><P
@@ -1905,7 +2114,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2289"
+NAME="AEN2400"
></A
><H3
><A
@@ -1962,7 +2171,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the file output</TD
></TR
><TR
><TD
@@ -1979,7 +2188,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to dump</TD
></TR
><TR
><TD
@@ -1994,7 +2203,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the number of xmlChar written</TD
></TR
></TABLE
><P
@@ -2004,7 +2213,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2314"
+NAME="AEN2425"
></A
><H3
><A
@@ -2062,7 +2271,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to dump</TD
></TR
><TR
><TD
@@ -2079,7 +2288,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar string</TD
></TR
><TR
><TD
@@ -2096,7 +2305,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the number of xmlChar to add</TD
></TR
></TABLE
><P
@@ -2106,7 +2315,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2339"
+NAME="AEN2450"
></A
><H3
><A
@@ -2163,7 +2372,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to dump</TD
></TR
><TR
><TD
@@ -2180,7 +2389,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the xmlChar string</TD
></TR
></TABLE
><P
@@ -2190,7 +2399,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2360"
+NAME="AEN2471"
></A
><H3
><A
@@ -2244,7 +2453,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to dump</TD
></TR
><TR
><TD
@@ -2261,7 +2470,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the C char string</TD
></TR
></TABLE
><P
@@ -2271,7 +2480,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2380"
+NAME="AEN2491"
></A
><H3
><A
@@ -2325,7 +2534,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer to dump</TD
></TR
><TR
><TD
@@ -2342,7 +2551,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the number of xmlChar to remove</TD
></TR
><TR
><TD
@@ -2357,7 +2566,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the number of xmlChar removed, or -1 in case of failure.</TD
></TR
></TABLE
><P
@@ -2367,7 +2576,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2404"
+NAME="AEN2515"
></A
><H3
><A
@@ -2420,7 +2629,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the buffer</TD
></TR
></TABLE
><P
@@ -2430,7 +2639,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2420"
+NAME="AEN2531"
></A
><H3
><A
@@ -2498,7 +2707,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document pointer</TD
></TR
><TR
><TD
@@ -2515,7 +2724,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the DTD name</TD
></TR
><TR
><TD
@@ -2532,7 +2741,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the external ID</TD
></TR
><TR
><TD
@@ -2549,7 +2758,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the system ID</TD
></TR
><TR
><TD
@@ -2564,7 +2773,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new DTD structure</TD
></TR
></TABLE
><P
@@ -2574,7 +2783,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2456"
+NAME="AEN2567"
></A
><H3
><A
@@ -2642,7 +2851,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document pointer</TD
></TR
><TR
><TD
@@ -2659,7 +2868,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the DTD name</TD
></TR
><TR
><TD
@@ -2676,7 +2885,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the external ID</TD
></TR
><TR
><TD
@@ -2693,7 +2902,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the system ID</TD
></TR
><TR
><TD
@@ -2708,7 +2917,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new DTD structure</TD
></TR
></TABLE
><P
@@ -2718,7 +2927,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2492"
+NAME="AEN2603"
></A
><H3
><A
@@ -2771,7 +2980,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the DTD structure to free up</TD
></TR
></TABLE
><P
@@ -2781,7 +2990,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2508"
+NAME="AEN2619"
></A
><H3
><A
@@ -2845,7 +3054,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document carrying the namespace</TD
></TR
><TR
><TD
@@ -2862,7 +3071,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the URI associated</TD
></TR
><TR
><TD
@@ -2879,7 +3088,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the prefix for the namespace</TD
></TR
><TR
><TD
@@ -2894,7 +3103,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>returns a new namespace pointer</TD
></TR
></TABLE
><P
@@ -2904,7 +3113,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2539"
+NAME="AEN2650"
></A
><H3
><A
@@ -2968,7 +3177,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element carrying the namespace</TD
></TR
><TR
><TD
@@ -2985,7 +3194,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the URI associated</TD
></TR
><TR
><TD
@@ -3002,7 +3211,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the prefix for the namespace</TD
></TR
><TR
><TD
@@ -3017,7 +3226,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>returns a new namespace pointer</TD
></TR
></TABLE
><P
@@ -3027,7 +3236,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2570"
+NAME="AEN2681"
></A
><H3
><A
@@ -3080,7 +3289,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the namespace pointer</TD
></TR
></TABLE
><P
@@ -3090,7 +3299,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2586"
+NAME="AEN2697"
></A
><H3
><A
@@ -3146,7 +3355,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> xmlChar string giving the version of XML "1.0"</TD
></TR
><TR
><TD
@@ -3161,7 +3370,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new document</TD
></TR
></TABLE
><P
@@ -3171,7 +3380,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2607"
+NAME="AEN2718"
></A
><H3
><A
@@ -3224,7 +3433,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the document
+@: </TD
></TR
></TABLE
><P
@@ -3234,7 +3444,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2623"
+NAME="AEN2734"
></A
><H3
><A
@@ -3298,7 +3508,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -3315,7 +3525,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the name of the attribute</TD
></TR
><TR
><TD
@@ -3332,7 +3542,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value of the attribute</TD
></TR
><TR
><TD
@@ -3347,7 +3557,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the attribute</TD
></TR
></TABLE
><P
@@ -3357,7 +3567,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2654"
+NAME="AEN2765"
></A
><H3
><A
@@ -3421,7 +3631,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the holding node</TD
></TR
><TR
><TD
@@ -3438,7 +3648,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the name of the attribute</TD
></TR
><TR
><TD
@@ -3455,7 +3665,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value of the attribute</TD
></TR
><TR
><TD
@@ -3470,7 +3680,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the attribute</TD
></TR
></TABLE
><P
@@ -3480,7 +3690,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2685"
+NAME="AEN2796"
></A
><H3
><A
@@ -3548,7 +3758,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the holding node</TD
></TR
><TR
><TD
@@ -3565,7 +3775,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the namespace</TD
></TR
><TR
><TD
@@ -3582,7 +3792,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the name of the attribute</TD
></TR
><TR
><TD
@@ -3599,7 +3809,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value of the attribute</TD
></TR
><TR
><TD
@@ -3614,7 +3824,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the attribute</TD
></TR
></TABLE
><P
@@ -3624,7 +3834,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2721"
+NAME="AEN2832"
></A
><H3
><A
@@ -3677,7 +3887,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first property in the list</TD
></TR
></TABLE
><P
@@ -3687,7 +3897,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2737"
+NAME="AEN2848"
></A
><H3
><A
@@ -3740,7 +3950,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first property in the list</TD
></TR
></TABLE
><P
@@ -3750,7 +3960,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2753"
+NAME="AEN2864"
></A
><H3
><A
@@ -3810,7 +4020,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element where the attribute will be grafted</TD
></TR
><TR
><TD
@@ -3827,7 +4037,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute</TD
></TR
><TR
><TD
@@ -3842,7 +4052,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -3852,7 +4062,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2779"
+NAME="AEN2890"
></A
><H3
><A
@@ -3912,7 +4122,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element where the attributes will be grafted</TD
></TR
><TR
><TD
@@ -3929,7 +4139,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first attribute</TD
></TR
><TR
><TD
@@ -3944,7 +4154,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -3954,7 +4164,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2805"
+NAME="AEN2916"
></A
><H3
><A
@@ -4010,7 +4220,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the dtd</TD
></TR
><TR
><TD
@@ -4025,7 +4235,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlDtdPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -4035,7 +4245,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2826"
+NAME="AEN2937"
></A
><H3
><A
@@ -4093,7 +4303,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -4110,7 +4320,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if 1 do a recursive copy.</TD
></TR
><TR
><TD
@@ -4125,7 +4335,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlDocPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -4135,7 +4345,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2851"
+NAME="AEN2962"
></A
><H3
><A
@@ -4214,7 +4424,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -4231,7 +4441,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> namespace if any</TD
></TR
><TR
><TD
@@ -4248,7 +4458,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node name</TD
></TR
><TR
><TD
@@ -4265,7 +4475,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text content if any</TD
></TR
><TR
><TD
@@ -4280,7 +4490,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4290,7 +4500,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2889"
+NAME="AEN3000"
></A
><H3
><A
@@ -4362,7 +4572,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> namespace if any</TD
></TR
><TR
><TD
@@ -4379,7 +4589,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node name</TD
></TR
><TR
><TD
@@ -4394,7 +4604,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4404,7 +4614,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2917"
+NAME="AEN3028"
></A
><H3
><A
@@ -4489,7 +4699,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the parent node</TD
></TR
><TR
><TD
@@ -4506,7 +4716,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a namespace if any</TD
></TR
><TR
><TD
@@ -4523,7 +4733,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the name of the child</TD
></TR
><TR
><TD
@@ -4540,7 +4750,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the content of the child if any.</TD
></TR
><TR
><TD
@@ -4555,7 +4765,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4565,7 +4775,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2956"
+NAME="AEN3067"
></A
><H3
><A
@@ -4625,7 +4835,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -4642,7 +4852,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text content</TD
></TR
><TR
><TD
@@ -4657,7 +4867,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4667,7 +4877,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN2982"
+NAME="AEN3093"
></A
><H3
><A
@@ -4723,7 +4933,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text content</TD
></TR
><TR
><TD
@@ -4738,7 +4948,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4748,7 +4958,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3003"
+NAME="AEN3114"
></A
><H3
><A
@@ -4808,7 +5018,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the processing instruction name</TD
></TR
><TR
><TD
@@ -4825,7 +5035,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the PI content</TD
></TR
><TR
><TD
@@ -4840,7 +5050,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4850,7 +5060,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3029"
+NAME="AEN3140"
></A
><H3
><A
@@ -4912,7 +5122,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -4929,7 +5139,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text content</TD
></TR
><TR
><TD
@@ -4946,7 +5156,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text len.</TD
></TR
><TR
><TD
@@ -4961,7 +5171,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -4971,7 +5181,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3059"
+NAME="AEN3170"
></A
><H3
><A
@@ -5028,7 +5238,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text content</TD
></TR
><TR
><TD
@@ -5045,7 +5255,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the text len.</TD
></TR
><TR
><TD
@@ -5060,7 +5270,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -5070,7 +5280,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3084"
+NAME="AEN3195"
></A
><H3
><A
@@ -5130,7 +5340,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -5147,7 +5357,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the comment content</TD
></TR
><TR
><TD
@@ -5162,7 +5372,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -5172,7 +5382,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3110"
+NAME="AEN3221"
></A
><H3
><A
@@ -5228,7 +5438,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the comment content</TD
></TR
><TR
><TD
@@ -5243,7 +5453,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -5253,7 +5463,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3131"
+NAME="AEN3242"
></A
><H3
><A
@@ -5314,7 +5524,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -5331,7 +5541,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the CData block content content</TD
></TR
><TR
><TD
@@ -5348,7 +5558,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the length of the block</TD
></TR
><TR
><TD
@@ -5363,7 +5573,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -5373,7 +5583,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3161"
+NAME="AEN3272"
></A
><H3
><A
@@ -5433,7 +5643,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -5450,7 +5660,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the reference name, or the reference string with & and ;</TD
></TR
><TR
><TD
@@ -5465,7 +5675,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new node object.</TD
></TR
></TABLE
><P
@@ -5475,7 +5685,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3187"
+NAME="AEN3298"
></A
><H3
><A
@@ -5532,7 +5742,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
><TR
><TD
@@ -5549,7 +5759,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if 1 do a recursive copy.</TD
></TR
><TR
><TD
@@ -5564,7 +5774,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlNodePtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -5574,7 +5784,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3212"
+NAME="AEN3323"
></A
><H3
><A
@@ -5630,7 +5840,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first node in the list.</TD
></TR
><TR
><TD
@@ -5645,7 +5855,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlNodePtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -5655,7 +5865,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3233"
+NAME="AEN3344"
></A
><H3
><A
@@ -5711,7 +5921,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the parent node</TD
></TR
><TR
><TD
@@ -5726,7 +5936,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the last child or NULL if none.</TD
></TR
></TABLE
><P
@@ -5736,7 +5946,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3254"
+NAME="AEN3365"
></A
><H3
><A
@@ -5789,7 +5999,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
><TR
><TD
@@ -5804,7 +6014,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 yes, 0 no</TD
></TR
></TABLE
><P
@@ -5814,7 +6024,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3274"
+NAME="AEN3385"
></A
><H3
><A
@@ -5879,7 +6089,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the parent node</TD
></TR
><TR
><TD
@@ -5896,7 +6106,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the child node</TD
></TR
><TR
><TD
@@ -5911,7 +6121,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the child or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -5921,7 +6131,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3301"
+NAME="AEN3412"
></A
><H3
><A
@@ -5986,7 +6196,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the child node</TD
></TR
><TR
><TD
@@ -6003,7 +6213,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the new node</TD
></TR
><TR
><TD
@@ -6018,7 +6228,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the element or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -6028,7 +6238,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3328"
+NAME="AEN3439"
></A
><H3
><A
@@ -6081,7 +6291,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
></TABLE
><P
@@ -6091,7 +6301,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3344"
+NAME="AEN3455"
></A
><H3
><A
@@ -6151,7 +6361,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first text node</TD
></TR
><TR
><TD
@@ -6168,7 +6378,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the second text node being merged</TD
></TR
><TR
><TD
@@ -6183,7 +6393,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the first text node augmented</TD
></TR
></TABLE
><P
@@ -6193,7 +6403,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3370"
+NAME="AEN3481"
></A
><H3
><A
@@ -6251,7 +6461,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
><TR
><TD
@@ -6268,7 +6478,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the content</TD
></TR
><TR
><TD
@@ -6285,7 +6495,12 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+> lenght</TD
></TR
></TABLE
><P
@@ -6295,7 +6510,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3395"
+NAME="AEN3507"
></A
><H3
><A
@@ -6349,7 +6564,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first node in the list</TD
></TR
></TABLE
><P
@@ -6359,7 +6574,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3411"
+NAME="AEN3523"
></A
><H3
><A
@@ -6412,7 +6627,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
></TABLE
><P
@@ -6422,7 +6637,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3427"
+NAME="AEN3539"
></A
><H3
><A
@@ -6494,7 +6709,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -6511,7 +6726,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the current node</TD
></TR
><TR
><TD
@@ -6528,7 +6743,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the namespace string</TD
></TR
><TR
><TD
@@ -6543,7 +6758,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the namespace pointer or NULL.</TD
></TR
></TABLE
><P
@@ -6553,7 +6768,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3459"
+NAME="AEN3571"
></A
><H3
><A
@@ -6618,7 +6833,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -6635,7 +6850,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the current node</TD
></TR
><TR
><TD
@@ -6652,7 +6867,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the namespace value</TD
></TR
><TR
><TD
@@ -6667,7 +6882,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the namespace pointer or NULL.</TD
></TR
></TABLE
><P
@@ -6677,7 +6892,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3490"
+NAME="AEN3602"
></A
><H3
><A
@@ -6737,7 +6952,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -6754,7 +6969,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the current node</TD
></TR
><TR
><TD
@@ -6769,7 +6984,9 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>an NULL terminated array of all the xmlNsPtr found
+that need to be freed by the caller or NULL if no
+namespace if defined</TD
></TR
></TABLE
><P
@@ -6779,7 +6996,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3516"
+NAME="AEN3628"
></A
><H3
><A
@@ -6836,7 +7053,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a node in the document</TD
></TR
><TR
><TD
@@ -6853,7 +7070,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a namespace pointer</TD
></TR
></TABLE
><P
@@ -6863,7 +7080,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3537"
+NAME="AEN3649"
></A
><H3
><A
@@ -6919,7 +7136,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the namespace</TD
></TR
><TR
><TD
@@ -6934,7 +7151,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlNsPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -6944,7 +7161,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3558"
+NAME="AEN3670"
></A
><H3
><A
@@ -7000,7 +7217,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the first namespace</TD
></TR
><TR
><TD
@@ -7015,7 +7232,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a new xmlNsPtr, or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -7025,7 +7242,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3579"
+NAME="AEN3691"
></A
><H3
><A
@@ -7089,7 +7306,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
><TR
><TD
@@ -7106,7 +7323,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute name</TD
></TR
><TR
><TD
@@ -7123,7 +7340,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute value</TD
></TR
><TR
><TD
@@ -7138,7 +7355,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the attribute pointer.</TD
></TR
></TABLE
><P
@@ -7148,7 +7365,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3610"
+NAME="AEN3722"
></A
><H3
><A
@@ -7209,7 +7426,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node</TD
></TR
><TR
><TD
@@ -7226,7 +7443,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute name</TD
></TR
><TR
><TD
@@ -7241,7 +7458,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the attribute value or NULL if not found.</TD
></TR
></TABLE
><P
@@ -7251,7 +7468,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3636"
+NAME="AEN3748"
></A
><H3
><A
@@ -7312,7 +7529,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -7329,7 +7546,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value of the attribute</TD
></TR
><TR
><TD
@@ -7344,7 +7561,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the first child</TD
></TR
></TABLE
><P
@@ -7354,7 +7571,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3662"
+NAME="AEN3774"
></A
><H3
><A
@@ -7416,7 +7633,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -7433,7 +7650,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value of the text</TD
></TR
><TR
><TD
@@ -7450,7 +7667,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the length of the string value</TD
></TR
><TR
><TD
@@ -7465,7 +7682,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the first child</TD
></TR
></TABLE
><P
@@ -7475,7 +7692,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3692"
+NAME="AEN3804"
></A
><H3
><A
@@ -7537,7 +7754,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -7554,7 +7771,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a Node list</TD
></TR
><TR
><TD
@@ -7571,7 +7788,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> should we replace entity contents or show their external form</TD
></TR
><TR
><TD
@@ -7586,7 +7803,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the string copy, the calller must free it.</TD
></TR
></TABLE
><P
@@ -7596,7 +7813,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3722"
+NAME="AEN3834"
></A
><H3
><A
@@ -7653,7 +7870,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being modified</TD
></TR
><TR
><TD
@@ -7670,7 +7887,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the new value of the content</TD
></TR
></TABLE
><P
@@ -7680,7 +7897,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3743"
+NAME="AEN3855"
></A
><H3
><A
@@ -7738,7 +7955,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being modified</TD
></TR
><TR
><TD
@@ -7755,7 +7972,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the new value of the content</TD
></TR
><TR
><TD
@@ -7772,7 +7989,12 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
></TR
></TABLE
><P
@@ -7782,7 +8004,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3768"
+NAME="AEN3881"
></A
><H3
><A
@@ -7839,7 +8061,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being modified</TD
></TR
><TR
><TD
@@ -7856,7 +8078,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra content</TD
></TR
></TABLE
><P
@@ -7866,7 +8088,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3789"
+NAME="AEN3902"
></A
><H3
><A
@@ -7924,7 +8146,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being modified</TD
></TR
><TR
><TD
@@ -7941,7 +8163,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra content</TD
></TR
><TR
><TD
@@ -7958,7 +8180,12 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
></TR
></TABLE
><P
@@ -7968,7 +8195,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3814"
+NAME="AEN3928"
></A
><H3
><A
@@ -8027,7 +8254,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being read</TD
></TR
><TR
><TD
@@ -8042,7 +8269,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a new xmlChar * or NULL if no content is available.
+It's up to the caller to free the memory.</TD
></TR
></TABLE
><P
@@ -8052,7 +8280,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3835"
+NAME="AEN3949"
></A
><H3
><A
@@ -8109,7 +8337,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being checked</TD
></TR
><TR
><TD
@@ -8124,7 +8352,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the lang value, or NULL if not found</TD
></TR
></TABLE
><P
@@ -8134,7 +8362,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3856"
+NAME="AEN3970"
></A
><H3
><A
@@ -8192,7 +8420,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the node being changed</TD
></TR
><TR
><TD
@@ -8209,7 +8437,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the langage description</TD
></TR
></TABLE
><P
@@ -8219,7 +8447,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3877"
+NAME="AEN3991"
></A
><H3
><A
@@ -8295,7 +8523,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3896"
+NAME="AEN4010"
></A
><H3
><A
@@ -8371,7 +8599,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3915"
+NAME="AEN4029"
></A
><H3
><A
@@ -8429,7 +8657,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer</TD
></TR
><TR
><TD
@@ -8446,7 +8674,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the string to add</TD
></TR
></TABLE
><P
@@ -8456,7 +8684,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3936"
+NAME="AEN4050"
></A
><H3
><A
@@ -8511,7 +8739,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer output</TD
></TR
><TR
><TD
@@ -8528,7 +8756,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the string to add</TD
></TR
></TABLE
><P
@@ -8538,7 +8766,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3956"
+NAME="AEN4070"
></A
><H3
><A
@@ -8597,7 +8825,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer output</TD
></TR
><TR
><TD
@@ -8614,7 +8842,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the string to add</TD
></TR
></TABLE
><P
@@ -8624,7 +8852,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN3977"
+NAME="AEN4091"
></A
><H3
><A
@@ -8683,7 +8911,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -8700,7 +8928,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> OUT: the memory pointer</TD
></TR
><TR
><TD
@@ -8717,7 +8945,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> OUT: the memory lenght</TD
></TR
></TABLE
><P
@@ -8727,7 +8955,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4002"
+NAME="AEN4116"
></A
><H3
><A
@@ -8784,7 +9012,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the FILE*</TD
></TR
><TR
><TD
@@ -8801,7 +9029,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
></TABLE
><P
@@ -8811,7 +9039,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4023"
+NAME="AEN4137"
></A
><H3
><A
@@ -8866,7 +9094,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the filename</TD
></TR
><TR
><TD
@@ -8883,7 +9111,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -8898,7 +9126,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the number of file written or -1 in case of failure.</TD
></TR
></TABLE
><P
@@ -8908,7 +9136,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4047"
+NAME="AEN4161"
></A
><H3
><A
@@ -8961,7 +9189,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -8976,7 +9204,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 (uncompressed) to 9 (max compression)</TD
></TR
></TABLE
><P
@@ -8986,7 +9214,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4067"
+NAME="AEN4181"
></A
><H3
><A
@@ -9041,7 +9269,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -9058,7 +9286,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the compression ratio</TD
></TR
></TABLE
><P
@@ -9068,7 +9296,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4087"
+NAME="AEN4201"
></A
><H3
><A
@@ -9116,7 +9344,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 (uncompressed) to 9 (max compression)</TD
></TR
></TABLE
><P
@@ -9126,7 +9354,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4102"
+NAME="AEN4216"
></A
><H3
><A
@@ -9177,7 +9405,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the compression ratio</TD
></TR
></TABLE
><P
@@ -9238,7 +9466,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index 64ae9e7..75ef4ce 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="entities"
HREF="gnome-xml-entities.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4543"
+NAME="AEN4659"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4546"
+NAME="AEN4662"
></A
><H2
>Synopsis</H2
@@ -772,7 +772,36 @@
const <A
HREF="gnome-xml-tree.html#XMLCHAR"
>xmlChar</A
-> *name);</PRE
+> *name);
+int <A
+HREF="gnome-xml-valid.html#XMLVALIDGETVALIDELEMENTS"
+>xmlValidGetValidElements</A
+> (<A
+HREF="gnome-xml-tree.html#XMLNODE"
+>xmlNode</A
+> *prev,
+ <A
+HREF="gnome-xml-tree.html#XMLNODE"
+>xmlNode</A
+> *next,
+ const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> **list,
+ int max);
+int <A
+HREF="gnome-xml-valid.html#XMLVALIDGETPOTENTIALCHILDREN"
+>xmlValidGetPotentialChildren</A
+> (<GTKDOCLINK
+HREF="XMLELEMENTCONTENT"
+>xmlElementContent</GTKDOCLINK
+> *ctree,
+ const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> **list,
+ int *len,
+ int max);</PRE
></TD
></TR
></TABLE
@@ -780,7 +809,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4722"
+NAME="AEN4845"
></A
><H2
>Description</H2
@@ -790,14 +819,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4725"
+NAME="AEN4848"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4727"
+NAME="AEN4850"
></A
><H3
><A
@@ -891,7 +920,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4749"
+NAME="AEN4872"
></A
><H3
><A
@@ -985,7 +1014,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4771"
+NAME="AEN4894"
></A
><H3
><A
@@ -1001,7 +1030,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_NOTATION_TABLE</PRE
+>#define XML_MIN_NOTATION_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -1011,20 +1040,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4776"
+NAME="AEN4899"
></A
><H3
><A
NAME="XMLNOTATIONTABLEPTR"
></A
>xmlNotationTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNotationTable *xmlNotationTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4780"
+NAME="AEN4904"
></A
><H3
><A
@@ -1040,7 +1082,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_ELEMENT_TABLE</PRE
+>#define XML_MIN_ELEMENT_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -1050,20 +1092,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4785"
+NAME="AEN4909"
></A
><H3
><A
NAME="XMLELEMENTTABLEPTR"
></A
>xmlElementTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementTable *xmlElementTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4789"
+NAME="AEN4914"
></A
><H3
><A
@@ -1079,7 +1134,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_ATTRIBUTE_TABLE</PRE
+>#define XML_MIN_ATTRIBUTE_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -1089,20 +1144,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4794"
+NAME="AEN4919"
></A
><H3
><A
NAME="XMLATTRIBUTETABLEPTR"
></A
>xmlAttributeTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttributeTable *xmlAttributeTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4798"
+NAME="AEN4924"
></A
><H3
><A
@@ -1118,7 +1186,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_ID_TABLE</PRE
+>#define XML_MIN_ID_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -1128,20 +1196,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4803"
+NAME="AEN4929"
></A
><H3
><A
NAME="XMLIDTABLEPTR"
></A
>xmlIDTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlIDTable *xmlIDTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4807"
+NAME="AEN4934"
></A
><H3
><A
@@ -1157,7 +1238,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XML_MIN_REF_TABLE</PRE
+>#define XML_MIN_REF_TABLE 32</PRE
></TD
></TR
></TABLE
@@ -1167,20 +1248,33 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4812"
+NAME="AEN4939"
></A
><H3
><A
NAME="XMLREFTABLEPTR"
></A
>xmlRefTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRefTable *xmlRefTablePtr;</PRE
+></TD
+></TR
+></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4816"
+NAME="AEN4944"
></A
><H3
><A
@@ -1252,7 +1346,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -1269,7 +1363,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the DTD</TD
></TR
><TR
><TD
@@ -1286,7 +1380,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -1303,7 +1397,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the public identifier or NULL</TD
></TR
><TR
><TD
@@ -1320,7 +1414,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the system identifier or NULL</TD
></TR
><TR
><TD
@@ -1335,7 +1429,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the entity</TD
></TR
></TABLE
><P
@@ -1345,7 +1439,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4857"
+NAME="AEN4985"
></A
><H3
><A
@@ -1401,7 +1495,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> A notation table</TD
></TR
><TR
><TD
@@ -1416,7 +1510,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new xmlNotationTablePtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -1426,7 +1520,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4878"
+NAME="AEN5006"
></A
><H3
><A
@@ -1479,7 +1573,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An notation table</TD
></TR
></TABLE
><P
@@ -1489,7 +1583,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4894"
+NAME="AEN5022"
></A
><H3
><A
@@ -1546,7 +1640,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer output</TD
></TR
><TR
><TD
@@ -1563,7 +1657,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> A notation table</TD
></TR
></TABLE
><P
@@ -1573,7 +1667,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4915"
+NAME="AEN5043"
></A
><H3
><A
@@ -1633,7 +1727,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the subelement name or NULL</TD
></TR
><TR
><TD
@@ -1650,7 +1744,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the type of element content decl</TD
></TR
><TR
><TD
@@ -1665,7 +1759,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the new element content structure</TD
></TR
></TABLE
><P
@@ -1675,7 +1769,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4941"
+NAME="AEN5069"
></A
><H3
><A
@@ -1731,7 +1825,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An element content pointer.</TD
></TR
><TR
><TD
@@ -1746,7 +1840,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new xmlElementContentPtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -1756,7 +1850,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4962"
+NAME="AEN5090"
></A
><H3
><A
@@ -1809,7 +1903,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element content tree to free</TD
></TR
></TABLE
><P
@@ -1819,7 +1913,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN4978"
+NAME="AEN5106"
></A
><H3
><A
@@ -1891,7 +1985,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -1908,7 +2002,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the DTD</TD
></TR
><TR
><TD
@@ -1925,7 +2019,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the entity name</TD
></TR
><TR
><TD
@@ -1942,7 +2036,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element type</TD
></TR
><TR
><TD
@@ -1959,7 +2053,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element content tree or NULL</TD
></TR
><TR
><TD
@@ -1974,7 +2068,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the entity</TD
></TR
></TABLE
><P
@@ -1984,7 +2078,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5019"
+NAME="AEN5147"
></A
><H3
><A
@@ -2040,7 +2134,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An element table</TD
></TR
><TR
><TD
@@ -2055,7 +2149,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new xmlElementTablePtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -2065,7 +2159,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5040"
+NAME="AEN5168"
></A
><H3
><A
@@ -2118,7 +2212,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An element table</TD
></TR
></TABLE
><P
@@ -2128,7 +2222,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5056"
+NAME="AEN5184"
></A
><H3
><A
@@ -2185,7 +2279,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer output</TD
></TR
><TR
><TD
@@ -2202,7 +2296,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An element table</TD
></TR
></TABLE
><P
@@ -2212,7 +2306,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5077"
+NAME="AEN5205"
></A
><H3
><A
@@ -2268,7 +2362,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the enumeration name or NULL</TD
></TR
><TR
><TD
@@ -2283,7 +2377,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
></TR
></TABLE
><P
@@ -2293,7 +2388,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5098"
+NAME="AEN5226"
></A
><H3
><A
@@ -2346,7 +2441,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the tree to free.</TD
></TR
></TABLE
><P
@@ -2356,7 +2451,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5114"
+NAME="AEN5242"
></A
><H3
><A
@@ -2412,7 +2507,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the tree to copy.</TD
></TR
><TR
><TD
@@ -2427,7 +2522,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
></TR
></TABLE
><P
@@ -2437,7 +2533,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5135"
+NAME="AEN5263"
></A
><H3
><A
@@ -2521,7 +2617,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -2538,7 +2634,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the DTD</TD
></TR
><TR
><TD
@@ -2555,7 +2651,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element name</TD
></TR
><TR
><TD
@@ -2572,7 +2668,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute name</TD
></TR
><TR
><TD
@@ -2589,7 +2685,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute type</TD
></TR
><TR
><TD
@@ -2606,7 +2702,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute default type</TD
></TR
><TR
><TD
@@ -2623,7 +2719,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute default value</TD
></TR
><TR
><TD
@@ -2640,7 +2736,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> if it's an enumeration, the associated list</TD
></TR
><TR
><TD
@@ -2655,7 +2751,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the entity</TD
></TR
></TABLE
><P
@@ -2665,7 +2761,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5191"
+NAME="AEN5319"
></A
><H3
><A
@@ -2721,7 +2817,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An attribute table</TD
></TR
><TR
><TD
@@ -2736,7 +2832,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the new xmlAttributeTablePtr or NULL in case of error.</TD
></TR
></TABLE
><P
@@ -2746,7 +2842,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5212"
+NAME="AEN5340"
></A
><H3
><A
@@ -2799,7 +2895,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An attribute table</TD
></TR
></TABLE
><P
@@ -2809,7 +2905,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5228"
+NAME="AEN5356"
></A
><H3
><A
@@ -2866,7 +2962,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML buffer output</TD
></TR
><TR
><TD
@@ -2883,7 +2979,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An attribute table</TD
></TR
></TABLE
><P
@@ -2893,7 +2989,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5249"
+NAME="AEN5377"
></A
><H3
><A
@@ -2961,7 +3057,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -2978,7 +3074,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the document</TD
></TR
><TR
><TD
@@ -2995,7 +3091,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value name</TD
></TR
><TR
><TD
@@ -3012,7 +3108,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute holding the ID</TD
></TR
><TR
><TD
@@ -3027,7 +3123,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the new xmlIDPtr</TD
></TR
></TABLE
><P
@@ -3037,7 +3133,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5285"
+NAME="AEN5413"
></A
><H3
><A
@@ -3116,7 +3212,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5305"
+NAME="AEN5433"
></A
><H3
><A
@@ -3169,7 +3265,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An id table</TD
></TR
></TABLE
><P
@@ -3179,7 +3275,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5321"
+NAME="AEN5449"
></A
><H3
><A
@@ -3239,7 +3335,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the document</TD
></TR
><TR
><TD
@@ -3256,7 +3352,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the ID value</TD
></TR
><TR
><TD
@@ -3271,7 +3367,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
></TR
></TABLE
><P
@@ -3281,7 +3377,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5347"
+NAME="AEN5475"
></A
><H3
><A
@@ -3344,7 +3440,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -3361,7 +3457,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element carrying the attribute</TD
></TR
><TR
><TD
@@ -3378,7 +3474,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute</TD
></TR
><TR
><TD
@@ -3393,7 +3489,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 or 1 depending on the lookup result</TD
></TR
></TABLE
><P
@@ -3403,7 +3499,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5377"
+NAME="AEN5505"
></A
><H3
><A
@@ -3471,7 +3567,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -3488,7 +3584,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> pointer to the document</TD
></TR
><TR
><TD
@@ -3505,7 +3601,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the value name</TD
></TR
><TR
><TD
@@ -3522,7 +3618,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute holding the Ref</TD
></TR
><TR
><TD
@@ -3537,7 +3633,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>NULL if not, othervise the new xmlRefPtr</TD
></TR
></TABLE
><P
@@ -3547,7 +3643,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5413"
+NAME="AEN5541"
></A
><H3
><A
@@ -3626,7 +3722,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5433"
+NAME="AEN5561"
></A
><H3
><A
@@ -3679,7 +3775,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> An ref table</TD
></TR
></TABLE
><P
@@ -3689,7 +3785,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5449"
+NAME="AEN5577"
></A
><H3
><A
@@ -3752,7 +3848,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -3769,7 +3865,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element carrying the attribute</TD
></TR
><TR
><TD
@@ -3786,7 +3882,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute</TD
></TR
><TR
><TD
@@ -3801,7 +3897,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 or 1 depending on the lookup result</TD
></TR
></TABLE
><P
@@ -3811,7 +3907,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5479"
+NAME="AEN5607"
></A
><H3
><A
@@ -3872,7 +3968,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -3889,7 +3985,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -3904,7 +4000,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -3914,7 +4010,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5504"
+NAME="AEN5632"
></A
><H3
><A
@@ -3980,7 +4076,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -3997,7 +4093,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4014,7 +4110,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an element definition</TD
></TR
><TR
><TD
@@ -4029,7 +4125,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4039,7 +4135,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5534"
+NAME="AEN5662"
></A
><H3
><A
@@ -4107,7 +4203,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4124,7 +4220,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4141,7 +4237,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an attribute definition</TD
></TR
><TR
><TD
@@ -4156,7 +4252,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4166,7 +4262,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5565"
+NAME="AEN5693"
></A
><H3
><A
@@ -4238,7 +4334,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an attribute type</TD
></TR
><TR
><TD
@@ -4255,7 +4351,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an attribute value</TD
></TR
><TR
><TD
@@ -4270,7 +4366,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4280,7 +4376,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5594"
+NAME="AEN5722"
></A
><H3
><A
@@ -4345,7 +4441,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4362,7 +4458,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4379,7 +4475,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a notation definition</TD
></TR
><TR
><TD
@@ -4394,7 +4490,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4404,7 +4500,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5624"
+NAME="AEN5752"
></A
><H3
><A
@@ -4467,7 +4563,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4484,7 +4580,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4501,7 +4597,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a dtd instance</TD
></TR
><TR
><TD
@@ -4516,7 +4612,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4526,7 +4622,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5655"
+NAME="AEN5783"
></A
><H3
><A
@@ -4587,7 +4683,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4604,7 +4700,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4619,7 +4715,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4629,7 +4725,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5681"
+NAME="AEN5809"
></A
><H3
><A
@@ -4690,7 +4786,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4707,7 +4803,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4724,7 +4820,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an element instance</TD
></TR
><TR
><TD
@@ -4739,7 +4835,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4749,7 +4845,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5711"
+NAME="AEN5839"
></A
><H3
><A
@@ -4820,7 +4916,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4837,7 +4933,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4854,7 +4950,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an element instance</TD
></TR
><TR
><TD
@@ -4869,7 +4965,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -4879,7 +4975,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5743"
+NAME="AEN5871"
></A
><H3
><A
@@ -4960,7 +5056,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -4977,7 +5073,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -4994,7 +5090,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an element instance</TD
></TR
><TR
><TD
@@ -5011,7 +5107,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an attribute instance</TD
></TR
><TR
><TD
@@ -5028,7 +5124,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute value (without entities processing)</TD
></TR
><TR
><TD
@@ -5043,7 +5139,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -5053,7 +5149,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5784"
+NAME="AEN5912"
></A
><H3
><A
@@ -5113,7 +5209,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -5130,7 +5226,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a document instance</TD
></TR
><TR
><TD
@@ -5145,7 +5241,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -5155,7 +5251,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5810"
+NAME="AEN5938"
></A
><H3
><A
@@ -5217,7 +5313,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the validation context</TD
></TR
><TR
><TD
@@ -5234,7 +5330,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -5251,7 +5347,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the notation name to check</TD
></TR
><TR
><TD
@@ -5266,7 +5362,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>1 if valid or 0 otherwise</TD
></TR
></TABLE
><P
@@ -5276,7 +5372,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5840"
+NAME="AEN5968"
></A
><H3
><A
@@ -5334,7 +5430,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the document</TD
></TR
><TR
><TD
@@ -5351,7 +5447,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element name</TD
></TR
><TR
><TD
@@ -5366,7 +5462,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 if no, 1 if yes, and -1 if no element description is available</TD
></TR
></TABLE
><P
@@ -5376,7 +5472,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5865"
+NAME="AEN5993"
></A
><H3
><A
@@ -5441,7 +5537,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to the DtD to search</TD
></TR
><TR
><TD
@@ -5458,7 +5554,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element name</TD
></TR
><TR
><TD
@@ -5475,7 +5571,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the attribute name</TD
></TR
><TR
><TD
@@ -5490,7 +5586,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlAttributePtr if found or NULL</TD
></TR
></TABLE
><P
@@ -5500,7 +5596,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5896"
+NAME="AEN6024"
></A
><H3
><A
@@ -5560,7 +5656,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to the DtD to search</TD
></TR
><TR
><TD
@@ -5577,7 +5673,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the notation name</TD
></TR
><TR
><TD
@@ -5592,7 +5688,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlNotationPtr if found or NULL</TD
></TR
></TABLE
><P
@@ -5602,7 +5698,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5922"
+NAME="AEN6050"
></A
><H3
><A
@@ -5662,7 +5758,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a pointer to the DtD to search</TD
></TR
><TR
><TD
@@ -5679,7 +5775,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the element name</TD
></TR
><TR
><TD
@@ -5694,7 +5790,308 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlElementPtr if found or NULL</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN6076"
+></A
+><H3
+><A
+NAME="XMLVALIDGETVALIDELEMENTS"
+></A
+>xmlValidGetValidElements ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int xmlValidGetValidElements (<A
+HREF="gnome-xml-tree.html#XMLNODE"
+>xmlNode</A
+> *prev,
+ <A
+HREF="gnome-xml-tree.html#XMLNODE"
+>xmlNode</A
+> *next,
+ const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> **list,
+ int max);</PRE
+></TD
+></TR
+></TABLE
+><P
+>This function returns the list of authorized children to insert
+within an existing tree while respecting the validity constraints
+forced by the Dtd. The insertion point is defined using <TT
+CLASS="PARAMETER"
+><I
+>prev</I
+></TT
+> and
+<TT
+CLASS="PARAMETER"
+><I
+>next</I
+></TT
+> in the following ways:
+to insert before 'node': xmlValidGetValidElements(node->prev, node, ...
+to insert next 'node': xmlValidGetValidElements(node, node->next, ...
+to replace 'node': xmlValidGetValidElements(node->prev, node->next, ...
+to prepend a child to 'node': xmlValidGetValidElements(NULL, node->childs,
+to append a child to 'node': xmlValidGetValidElements(node->last, NULL, ...</P
+><P
+>pointers to the element names are inserted at the beginning of the array
+and do not need to be freed.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>prev</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an element to insert after</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>next</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an element to insert next</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>list</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an array to store the list of child names</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>max</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the size of the array</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the number of element in the list, or -1 in case of error. If
+the function returns the value <TT
+CLASS="PARAMETER"
+><I
+>max</I
+></TT
+> the caller is invited to grow the
+receiving array and retry.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN6114"
+></A
+><H3
+><A
+NAME="XMLVALIDGETPOTENTIALCHILDREN"
+></A
+>xmlValidGetPotentialChildren ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int xmlValidGetPotentialChildren (<GTKDOCLINK
+HREF="XMLELEMENTCONTENT"
+>xmlElementContent</GTKDOCLINK
+> *ctree,
+ const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> **list,
+ int *len,
+ int max);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Build/extend a list of potential children allowed by the content tree</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctree</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an element content tree</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>list</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> an array to store the list of child names</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a pointer to the number of element in the list</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>max</I
+></TT
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the size of the array</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the number of element in the list, or -1 in case of error.</TD
></TR
></TABLE
><P
@@ -5755,7 +6152,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index acc247e..9440c27 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -9,8 +9,8 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="valid"
HREF="gnome-xml-valid.html"><LINK
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5953"
+NAME="AEN6152"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5956"
+NAME="AEN6155"
></A
><H2
>Synopsis</H2
@@ -187,7 +187,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5968"
+NAME="AEN6167"
></A
><H2
>Description</H2
@@ -197,14 +197,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5971"
+NAME="AEN6170"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5973"
+NAME="AEN6172"
></A
><H3
><A
@@ -341,7 +341,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN5978"
+NAME="AEN6177"
></A
><H3
><A
@@ -394,7 +394,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -411,7 +411,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the message to display/transmit</TD
></TR
><TR
><TD
@@ -428,7 +428,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra parameters for the message display</TD
></TR
></TABLE
><P
@@ -438,7 +438,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6001"
+NAME="AEN6200"
></A
><H3
><A
@@ -491,7 +491,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -508,7 +508,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the message to display/transmit</TD
></TR
><TR
><TD
@@ -525,7 +525,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra parameters for the message display</TD
></TR
></TABLE
><P
@@ -535,7 +535,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6024"
+NAME="AEN6223"
></A
><H3
><A
@@ -588,7 +588,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -605,7 +605,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the message to display/transmit</TD
></TR
><TR
><TD
@@ -622,7 +622,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra parameters for the message display</TD
></TR
></TABLE
><P
@@ -632,7 +632,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6047"
+NAME="AEN6246"
></A
><H3
><A
@@ -685,7 +685,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an XML parser context</TD
></TR
><TR
><TD
@@ -702,7 +702,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the message to display/transmit</TD
></TR
><TR
><TD
@@ -719,7 +719,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> extra parameters for the message display</TD
></TR
></TABLE
><P
@@ -729,7 +729,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6070"
+NAME="AEN6269"
></A
><H3
><A
@@ -782,7 +782,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an xmlParserInputPtr input</TD
></TR
></TABLE
><P
@@ -792,7 +792,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6086"
+NAME="AEN6285"
></A
><H3
><A
@@ -845,7 +845,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an xmlParserInputPtr input</TD
></TR
></TABLE
><P
@@ -906,7 +906,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index 44ecc56..78e72ee 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -9,14 +9,11 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="parserInternals"
-HREF="gnome-xml-parserinternals.html"><LINK
-REL="NEXT"
-TITLE="nanohttp"
-HREF="gnome-xml-nanohttp.html"></HEAD
+HREF="gnome-xml-parserinternals.html"></HEAD
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
@@ -82,7 +79,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -97,16 +94,7 @@
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
-><A
-HREF="gnome-xml-nanohttp.html"
-><FONT
-COLOR="#FFFFFF"
-SIZE="3"
-><B
->Next Page >>></B
-></FONT
-></A
-></TD
+> </TD
></TR
></TABLE
></DIV
@@ -115,7 +103,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN8804"
+NAME="AEN9199"
></A
><H2
>Name</H2
@@ -123,7 +111,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN8807"
+NAME="AEN9202"
></A
><H2
>Synopsis</H2
@@ -138,10 +126,6 @@
CLASS="SYNOPSIS"
>
-#define <A
-HREF="gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY"
->NO_DEBUG_MEMORY</A
->
void <A
HREF="gnome-xml-xmlmemory.html#XMLFREE"
>xmlFree</A
@@ -222,7 +206,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN8828"
+NAME="AEN9222"
></A
><H2
>Description</H2
@@ -232,40 +216,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN8831"
+NAME="AEN9225"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8833"
-></A
-><H3
-><A
-NAME="NO-DEBUG-MEMORY"
-></A
->NO_DEBUG_MEMORY</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define NO_DEBUG_MEMORY</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8838"
+NAME="AEN9227"
></A
><H3
><A
@@ -328,7 +286,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8854"
+NAME="AEN9243"
></A
><H3
><A
@@ -394,7 +352,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8871"
+NAME="AEN9260"
></A
><H3
><A
@@ -478,7 +436,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8892"
+NAME="AEN9281"
></A
><H3
><A
@@ -546,7 +504,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new string or NULL if allocation error occured.</TD
></TR
></TABLE
><P
@@ -556,7 +514,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8912"
+NAME="AEN9301"
></A
><H3
><A
@@ -604,7 +562,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>0 on success</TD
></TR
></TABLE
><P
@@ -614,7 +572,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8927"
+NAME="AEN9316"
></A
><H3
><A
@@ -662,7 +620,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>an int representing the amount of memory allocated.</TD
></TR
></TABLE
><P
@@ -672,7 +630,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8942"
+NAME="AEN9331"
></A
><H3
><A
@@ -700,7 +658,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8948"
+NAME="AEN9337"
></A
><H3
><A
@@ -753,7 +711,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> a FILE descriptor used as the output file, if NULL, the result is
+ 8 written to the file .memorylist</TD
></TR
></TABLE
><P
@@ -763,7 +722,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8964"
+NAME="AEN9353"
></A
><H3
><A
@@ -779,7 +738,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY_LOCATION</PRE
+>#define DEBUG_MEMORY_LOCATION</PRE
></TD
></TR
></TABLE
@@ -789,7 +748,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8969"
+NAME="AEN9358"
></A
><H3
><A
@@ -805,7 +764,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY</PRE
+>#define DEBUG_MEMORY</PRE
></TD
></TR
></TABLE
@@ -815,7 +774,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8974"
+NAME="AEN9363"
></A
><H3
><A
@@ -831,7 +790,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define MEM_LIST</PRE
+>#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
></TD
></TR
></TABLE
@@ -841,7 +800,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN8979"
+NAME="AEN9368"
></A
><H3
><A
@@ -896,7 +855,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an int specifying the size in byte to allocate.</TD
></TR
><TR
><TD
@@ -913,7 +872,13 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the line number</TD
+> the file name or NULL
+ <TT
+CLASS="PARAMETER"
+><I
+>file</I
+></TT
+>: the line number</TD
></TR
><TR
><TD
@@ -940,7 +905,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9003"
+NAME="AEN9393"
></A
><H3
><A
@@ -996,7 +961,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the initial memory block pointer</TD
></TR
><TR
><TD
@@ -1013,7 +978,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> an int specifying the size in byte to allocate.</TD
></TR
><TR
><TD
@@ -1030,7 +995,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the line number</TD
+> the file name or NULL</TD
></TR
><TR
><TD
@@ -1057,7 +1022,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN9031"
+NAME="AEN9421"
></A
><H3
><A
@@ -1129,7 +1094,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> the line number</TD
+> the file name or NULL</TD
></TR
><TR
><TD
@@ -1161,7 +1126,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>a pointer to the new string or NULL if allocation error occured.</TD
></TR
></TABLE
><P
@@ -1222,7 +1187,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -1237,16 +1202,7 @@
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
-><A
-HREF="gnome-xml-nanohttp.html"
-><FONT
-COLOR="#FFFFFF"
-SIZE="3"
-><B
->Next Page >>></B
-></FONT
-></A
-></TD
+> </TD
></TR
><TR
><TD
@@ -1262,13 +1218,7 @@
><TD
COLSPAN="2"
ALIGN="right"
-><FONT
-COLOR="#FFFFFF"
-SIZE="3"
-><B
->nanohttp</B
-></FONT
-></TD
+> </TD
></TR
></TABLE
></DIV
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index fc7dab4..ffd5aa7 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -9,14 +9,14 @@
TITLE="Gnome XML Library Reference Manual"
HREF="book1.html"><LINK
REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
REL="PREVIOUS"
TITLE="HTMLtree"
HREF="gnome-xml-htmltree.html"><LINK
REL="NEXT"
-TITLE="parserInternals"
-HREF="gnome-xml-parserinternals.html"></HEAD
+TITLE="nanohttp"
+HREF="gnome-xml-nanohttp.html"></HEAD
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
@@ -82,7 +82,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -98,7 +98,7 @@
BGCOLOR="#C00000"
ALIGN="right"
><A
-HREF="gnome-xml-parserinternals.html"
+HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -115,7 +115,7 @@
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN6532"
+NAME="AEN6740"
></A
><H2
>Name</H2
@@ -123,7 +123,7 @@
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN6535"
+NAME="AEN6743"
></A
><H2
>Synopsis</H2
@@ -259,7 +259,7 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6569"
+NAME="AEN6777"
></A
><H2
>Description</H2
@@ -269,14 +269,14 @@
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN6572"
+NAME="AEN6780"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6574"
+NAME="AEN6782"
></A
><H3
><A
@@ -292,7 +292,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_UNDEFINED</PRE
+>#define XPATH_UNDEFINED 0</PRE
></TD
></TR
></TABLE
@@ -302,7 +302,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6579"
+NAME="AEN6787"
></A
><H3
><A
@@ -318,7 +318,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_NODESET</PRE
+>#define XPATH_NODESET 1</PRE
></TD
></TR
></TABLE
@@ -328,7 +328,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6584"
+NAME="AEN6792"
></A
><H3
><A
@@ -344,7 +344,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_BOOLEAN</PRE
+>#define XPATH_BOOLEAN 2</PRE
></TD
></TR
></TABLE
@@ -354,7 +354,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6589"
+NAME="AEN6797"
></A
><H3
><A
@@ -370,7 +370,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_NUMBER</PRE
+>#define XPATH_NUMBER 3</PRE
></TD
></TR
></TABLE
@@ -380,7 +380,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6594"
+NAME="AEN6802"
></A
><H3
><A
@@ -396,7 +396,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_STRING</PRE
+>#define XPATH_STRING 4</PRE
></TD
></TR
></TABLE
@@ -406,7 +406,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6599"
+NAME="AEN6807"
></A
><H3
><A
@@ -422,7 +422,7 @@
><TD
><PRE
CLASS="PROGRAMLISTING"
->#define XPATH_USERS</PRE
+>#define XPATH_USERS 5</PRE
></TD
></TR
></TABLE
@@ -432,7 +432,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6604"
+NAME="AEN6812"
></A
><H3
><A
@@ -526,7 +526,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6627"
+NAME="AEN6835"
></A
><H3
><A
@@ -605,7 +605,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6646"
+NAME="AEN6854"
></A
><H3
><A
@@ -705,7 +705,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6671"
+NAME="AEN6879"
></A
><H3
><A
@@ -784,7 +784,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6690"
+NAME="AEN6898"
></A
><H3
><A
@@ -840,7 +840,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XML document</TD
></TR
><TR
><TD
@@ -855,7 +855,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlXPathContext just allocated.</TD
></TR
></TABLE
><P
@@ -865,7 +865,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6711"
+NAME="AEN6919"
></A
><H3
><A
@@ -918,7 +918,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the context to free</TD
></TR
></TABLE
><P
@@ -928,7 +928,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6727"
+NAME="AEN6935"
></A
><H3
><A
@@ -988,7 +988,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XPath expression</TD
></TR
><TR
><TD
@@ -1005,7 +1005,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XPath context</TD
></TR
><TR
><TD
@@ -1020,7 +1020,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
></TR
></TABLE
><P
@@ -1030,7 +1031,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6753"
+NAME="AEN6961"
></A
><H3
><A
@@ -1083,7 +1084,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the object to free</TD
></TR
></TABLE
><P
@@ -1093,7 +1094,7 @@
><HR><DIV
CLASS="REFSECT2"
><A
-NAME="AEN6769"
+NAME="AEN6977"
></A
><H3
><A
@@ -1153,7 +1154,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XPath expression</TD
></TR
><TR
><TD
@@ -1170,7 +1171,7 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+> the XPath context</TD
></TR
><TR
><TD
@@ -1185,7 +1186,8 @@
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
-> </TD
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
+the caller has to free the object.</TD
></TR
></TABLE
><P
@@ -1246,7 +1248,7 @@
SIZE="3"
><B
><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -1262,7 +1264,7 @@
BGCOLOR="#C00000"
ALIGN="right"
><A
-HREF="gnome-xml-parserinternals.html"
+HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@@ -1290,7 +1292,7 @@
COLOR="#FFFFFF"
SIZE="3"
><B
->parserInternals</B
+>nanohttp</B
></FONT
></TD
></TR
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 393a079..9410f3d 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -65,6 +65,8 @@
<ANCHOR id ="XMLRECOVERFILE" href="gnome-xml/gnome-xml-parser.html#XMLRECOVERFILE">
<ANCHOR id ="XMLPARSEDOCUMENT" href="gnome-xml/gnome-xml-parser.html#XMLPARSEDOCUMENT">
<ANCHOR id ="XMLSAXPARSEDOC" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEDOC">
+<ANCHOR id ="XMLSAXUSERPARSEFILE" href="gnome-xml/gnome-xml-parser.html#XMLSAXUSERPARSEFILE">
+<ANCHOR id ="XMLSAXUSERPARSEMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLSAXUSERPARSEMEMORY">
<ANCHOR id ="XMLSAXPARSEMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEMEMORY">
<ANCHOR id ="XMLSAXPARSEFILE" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEFILE">
<ANCHOR id ="XMLPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLPARSEDTD">
@@ -268,6 +270,8 @@
<ANCHOR id ="XMLGETDTDATTRDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDATTRDESC">
<ANCHOR id ="XMLGETDTDNOTATIONDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDNOTATIONDESC">
<ANCHOR id ="XMLGETDTDELEMENTDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDELEMENTDESC">
+<ANCHOR id ="XMLVALIDGETVALIDELEMENTS" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETVALIDELEMENTS">
+<ANCHOR id ="XMLVALIDGETPOTENTIALCHILDREN" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">
<ANCHOR id ="GNOME-XML-XML-ERROR" href="gnome-xml/gnome-xml-xml-error.html">
<ANCHOR id ="XMLPARSERERRORS" href="gnome-xml/gnome-xml-xml-error.html#XMLPARSERERRORS">
<ANCHOR id ="XMLPARSERERROR" href="gnome-xml/gnome-xml-xml-error.html#XMLPARSERERROR">
@@ -318,6 +322,14 @@
<ANCHOR id ="XMLXPATHEVAL" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVAL">
<ANCHOR id ="XMLXPATHFREEOBJECT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREEOBJECT">
<ANCHOR id ="XMLXPATHEVALEXPRESSION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALEXPRESSION">
+<ANCHOR id ="GNOME-XML-NANOHTTP" href="gnome-xml/gnome-xml-nanohttp.html">
+<ANCHOR id ="XMLNANOHTTPFETCH" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPFETCH">
+<ANCHOR id ="XMLNANOHTTPMETHOD" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPMETHOD">
+<ANCHOR id ="XMLNANOHTTPOPEN" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPOPEN">
+<ANCHOR id ="XMLNANOHTTPRETURNCODE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPRETURNCODE">
+<ANCHOR id ="XMLNANOHTTPREAD" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPREAD">
+<ANCHOR id ="XMLNANOHTTPSAVE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPSAVE">
+<ANCHOR id ="XMLNANOHTTPCLOSE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPCLOSE">
<ANCHOR id ="GNOME-XML-PARSERINTERNALS" href="gnome-xml/gnome-xml-parserinternals.html">
<ANCHOR id ="XML-MAX-NAMELEN" href="gnome-xml/gnome-xml-parserinternals.html#XML-MAX-NAMELEN">
<ANCHOR id ="CHARVAL" href="gnome-xml/gnome-xml-parserinternals.html#CHARVAL">
@@ -407,7 +419,6 @@
<ANCHOR id ="INPUTPUSH" href="gnome-xml/gnome-xml-parserinternals.html#INPUTPUSH">
<ANCHOR id ="INPUTPOP" href="gnome-xml/gnome-xml-parserinternals.html#INPUTPOP">
<ANCHOR id ="GNOME-XML-XMLMEMORY" href="gnome-xml/gnome-xml-xmlmemory.html">
-<ANCHOR id ="NO-DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY">
<ANCHOR id ="XMLFREE" href="gnome-xml/gnome-xml-xmlmemory.html#XMLFREE">
<ANCHOR id ="XMLMALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOC">
<ANCHOR id ="XMLREALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOC">
@@ -422,11 +433,3 @@
<ANCHOR id ="XMLMALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOCLOC">
<ANCHOR id ="XMLREALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOCLOC">
<ANCHOR id ="XMLMEMSTRDUPLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSTRDUPLOC">
-<ANCHOR id ="GNOME-XML-NANOHTTP" href="gnome-xml/gnome-xml-nanohttp.html">
-<ANCHOR id ="XMLNANOHTTPFETCH" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPFETCH">
-<ANCHOR id ="XMLNANOHTTPMETHOD" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPMETHOD">
-<ANCHOR id ="XMLNANOHTTPOPEN" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPOPEN">
-<ANCHOR id ="XMLNANOHTTPRETURNCODE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPRETURNCODE">
-<ANCHOR id ="XMLNANOHTTPREAD" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPREAD">
-<ANCHOR id ="XMLNANOHTTPSAVE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPSAVE">
-<ANCHOR id ="XMLNANOHTTPCLOSE" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPCLOSE">
diff --git a/doc/xml.html b/doc/xml.html
index df5a019..e212a1f 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -82,7 +82,7 @@
<h2><a name="News">News</a></h2>
-<p>Latest version is 1.7.1, you can find it on <a
+<p>Latest version is 1.7.3, you can find it on <a
href="ftp://rpmfind.net/pub/veillard/">rpmfind.net</a> or on the <a
href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a> either
as a <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml/">source
@@ -90,9 +90,20 @@
packages</a>.</p>
<h3>CVS only</h3>
+
+<h3>1.7.4: Oct 25 1999</h3>
<ul>
+ <li>Lots of HTML improvement</li>
+ <li>Fixed some errors when saving both XML and HTML</li>
+ <li>More examples, the regression tests should now look clean</li>
+ <li>Fixed a bug with contiguous charref</li>
+</ul>
+
+<h3>1.7.3: Sep 29 1999</h3>
+<ul>
+ <li>portability problems fixed</li>
<li>snprintf was used unconditionnally, leading to link problems on system
- were it's not available, fixed </li>
+ were it's not available, fixed</li>
</ul>
<h3>1.7.1: Sep 24 1999</h3>
@@ -443,8 +454,7 @@
4 ]>
5 <EXAMPLE>
6 &xml;
-7 </EXAMPLE>
-</pre>
+7 </EXAMPLE></pre>
<p>Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing
it's name with '&' and following it by ';' without any spaces added. There
@@ -587,7 +597,7 @@
<p>@@interfaces@@</p>
-<h2><a name="DOM"><a name="Principles">DOM Principles</a></a></h2>
+<h2><a name="DOM"></a><a name="Principles">DOM Principles</a></h2>
<p><a href="http://www.w3.org/DOM/">DOM</a> stands for the <em>Document Object
Model</em> this is an API for accessing XML or HTML structured documents.
@@ -610,7 +620,7 @@
<p>The gnome-dom module in the Gnome CVS base is obsolete</p>
-<h2><a name="Example"><a name="real">A real example</a></a></h2>
+<h2><a name="Example"></a><a name="real">A real example</a></h2>
<p>Here is a real size example, where the actual content of the application
data is not kept in the DOM tree but uses internal structures. It is based on
@@ -811,6 +821,6 @@
<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
-<p>$Id: xml.html,v 1.9 1999/09/23 22:19:20 veillard Exp $</p>
+<p>$Id: xml.html,v 1.10 1999/09/24 14:03:48 veillard Exp $</p>
</body>
</html>
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index d28b526..78ff392 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -8,7 +8,7 @@
#ifndef _DEBUG_MEMORY_ALLOC_
#define _DEBUG_MEMORY_ALLOC_
-#define NO_DEBUG_MEMORY
+/* #define NO_DEBUG_MEMORY */
#ifdef NO_DEBUG_MEMORY
#ifdef HAVE_MALLOC_H
diff --git a/parser.c b/parser.c
index ce1d1fa..83151fe 100644
--- a/parser.c
+++ b/parser.c
@@ -744,6 +744,7 @@
int val = 0;
if (ctxt->token != 0) {
+fprintf(stderr, "xmlParseCharRef : ctxt->token != 0\n");
val = ctxt->token;
ctxt->token = 0;
return(val);
@@ -770,7 +771,7 @@
NEXT;
}
if (CUR == ';')
- NEXT;
+ SKIP(1); /* on purpose to avoid reentrancy problems with NEXT */
} else if ((CUR == '&') && (NXT(1) == '#')) {
SKIP(2);
while (CUR != ';') {
@@ -788,7 +789,7 @@
NEXT;
}
if (CUR == ';')
- NEXT;
+ SKIP(1); /* on purpose to avoid reentrancy problems with NEXT */
} else {
ctxt->errNo = XML_ERR_INVALID_CHARREF;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@@ -843,7 +844,10 @@
xmlChar *name;
xmlEntityPtr ent = NULL;
- if (ctxt->token != 0) return;
+ if (ctxt->token != 0) {
+fprintf(stderr, "xmlParserHandleReference : ctxt->token != 0\n");
+ return;
+ }
if (CUR != '&') return;
GROW;
if ((CUR == '&') && (NXT(1) == '#')) {
@@ -1063,7 +1067,10 @@
xmlEntityPtr entity = NULL;
xmlParserInputPtr input;
- if (ctxt->token != 0) return;
+ if (ctxt->token != 0) {
+fprintf(stderr, "xmlParserHandlePEReference : ctxt->token != 0\n");
+ return;
+ }
if (CUR != '%') return;
switch(ctxt->instate) {
case XML_PARSER_CDATA_SECTION:
diff --git a/result/HTML/test3.html b/result/HTML/test3.html
index 0c47a2e..6634a0e 100644
--- a/result/HTML/test3.html
+++ b/result/HTML/test3.html
@@ -15,11 +15,11 @@
<B>Alias </B>Problem Domain</DT>
<DT>
<B>Note </B>
+</DT>
<DD>The Problem Domain package is the model behind the Human
<DD>Interface, thats stores and manipulates the Family Tree.
</DD>
</DD>
-</DT>
</DL>
<P>
<HR>
diff --git a/result/HTML/wired.html b/result/HTML/wired.html
new file mode 100644
index 0000000..af13e17
--- /dev/null
+++ b/result/HTML/wired.html
@@ -0,0 +1,1077 @@
+<!DOCTYPE HTML>
+<!-- Vignette StoryServer 4 Fri Oct 15 11:37:12 1999 --><HTML>
+<HEAD>
+<TITLE>Top Stories News from Wired News</TITLE>
+</HEAD>
+<BODY bgcolor="#FFFFFF" text="#000000" link="#333399" vlink="#660066" alink="#666699">
+<TABLE border="0" width="600" cellspacing="0" cellpadding="0">
+<TR>
+<TD valign="top" align="LEFT">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="468" HEIGHT="60" BGCOLOR="#FFFFFF">
+<FORM METHOD="GET" ACTION="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=9688&RunID=14074&AdID=22584&GroupID=1&FamilyID=2684&TagValues=8.25.156.159.166.171.172.174.179.180.181.182.183.196.197.199.208.389.412.436.2041.6750.78456.79630.81880&Redirect=http://www.springstreet.com/aa/citysearch.htm" id="form1" name="form1">
+<TR>
+<TD BGCOLOR="#330099">
+<INPUT NAME="city" TYPE="text" SIZE="7" MAXLENGTH="20" VALUE="Seattle">
+</TD>
+<TD ROWSPAN="2" ALIGN="LEFT" BGCOLOR="FFFFFF">
+<INPUT TYPE="IMAGE" SRC="http://static.wired.com/advertising/blipverts/allapartments/990625jpa_ssthome.gif" WIDTH="375" HEIGHT="60" BORDER="0" VALUE="search" HSPACE="0" alt="Search over 6,000,000 Apts with SpringStreet">
+</TD>
+</TR>
+<TR>
+<TD BGCOLOR="#330099">
+<SELECT NAME="state">
+<OPTION VALUE="WA">WA
+<OPTION VALUE="AL">AL</OPTION>
+<OPTION VALUE="AK">AK</OPTION>
+<OPTION VALUE="AZ">AZ</OPTION>
+<OPTION VALUE="AR">AR</OPTION>
+<OPTION VALUE="CA">CA</OPTION>
+<OPTION VALUE="CO">CO</OPTION>
+<OPTION VALUE="CT">CT</OPTION>
+<OPTION VALUE="DE">DE</OPTION>
+<OPTION VALUE="DC">DC</OPTION>
+<OPTION VALUE="FL">FL</OPTION>
+<OPTION VALUE="GA">GA</OPTION>
+<OPTION VALUE="HI">HI</OPTION>
+<OPTION VALUE="ID">ID</OPTION>
+<OPTION VALUE="IL">IL</OPTION>
+<OPTION VALUE="IN">IN</OPTION>
+<OPTION VALUE="IA">IA</OPTION>
+<OPTION VALUE="KS">KS</OPTION>
+<OPTION VALUE="KY">KY</OPTION>
+<OPTION VALUE="LA">LA</OPTION>
+<OPTION VALUE="ME">ME</OPTION>
+<OPTION VALUE="MD">MD</OPTION>
+<OPTION VALUE="MA">MA</OPTION>
+<OPTION VALUE="MI">MI</OPTION>
+<OPTION VALUE="MN">MN</OPTION>
+<OPTION VALUE="MS">MS</OPTION>
+<OPTION VALUE="MO">MO</OPTION>
+<OPTION VALUE="MT">MT</OPTION>
+<OPTION VALUE="NE">NE</OPTION>
+<OPTION VALUE="NV">NV</OPTION>
+<OPTION VALUE="NH">NH</OPTION>
+<OPTION VALUE="NJ">NJ</OPTION>
+<OPTION VALUE="NM">NM</OPTION>
+<OPTION VALUE="NY">NY</OPTION>
+<OPTION VALUE="NC">NC</OPTION>
+<OPTION VALUE="ND">ND</OPTION>
+<OPTION VALUE="OH">OH</OPTION>
+<OPTION VALUE="OK">OK</OPTION>
+<OPTION VALUE="OR">OR</OPTION>
+<OPTION VALUE="PA">PA</OPTION>
+<OPTION VALUE="PR">PR</OPTION>
+<OPTION VALUE="RI">RI</OPTION>
+<OPTION VALUE="SC">SC</OPTION>
+<OPTION VALUE="SD">SD</OPTION>
+<OPTION VALUE="TN">TN</OPTION>
+<OPTION VALUE="TX">TX</OPTION>
+<OPTION VALUE="UT">UT</OPTION>
+<OPTION VALUE="VT">VT</OPTION>
+<OPTION VALUE="VA">VA</OPTION>
+<OPTION VALUE="WA">WA</OPTION>
+<OPTION VALUE="WV">WV</OPTION>
+<OPTION VALUE="WI">WI</OPTION>
+<OPTION VALUE="WY">WY</OPTION>
+</OPTION>
+</SELECT>
+<INPUT TYPE="hidden" NAME="source" VALUE="2hb8bhc059">
+</TD>
+</TR>
+</FORM>
+</TABLE>
+</TD>
+<TD valign="top" align="RIGHT">
+<A href="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=5597&RunID=17167&AdID=22588&GroupID=1&FamilyID=3228&TagValues=8.25.159.171.172.174.179.180.181.182.183.196.197.199.208.241.389.412.436.2035.6749.6750.70367.78456.79630.81880&Redirect=http:%2F%2Fwww.hp.com%2Fgo%2Foriginal%20" TARGET="_top">
+<IMG src="http://static.wired.com/advertising/blipverts/hp_colorinkjet/hp_970c_120x60_6.gif" BORDER="1" height="60" width="120" alt="True to the Original">
+</A>
+</TD>
+</TR>
+</TABLE>
+<!-- WIRED NEWS header --><!-- CMD_HOST = scoop.hotwired.com --><A name="#"></A>
+<TABLE border="0" width="600" cellspacing="0" cellpadding="0">
+<TR>
+<TD>
+<TD colspan="2">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="5" width="447" alt="">
+</TD>
+</TR>
+<TR>
+<TD valign="BOTTOM" align="RIGHT" class="wired" bgcolor="#FFFFFF">
+<A href="/news/0,1287,,00.html">
+<IMG src="http://static.wired.com/news/images/wired_000000.gif" width="153" height="30" border="0">
+</A>
+</TD>
+<TD bgcolor="#FF0000" valign="BOTTOM" align="LEFT" width="97">
+<A href="/news/0,1287,,00.html">
+<IMG src="http://static.wired.com/news/images/news_ffffff.gif" width="103" height="30" border="0">
+</A>
+</TD>
+<TD bgcolor="#FF0000" align="left" valign="center">
+<NOBR>
+<IMG src="http://static.wired.com/news/images/spacer.gif" width="344" height="1">
+<BR>
+<FONT size="1" face="Verdana, Arial, Geneva, sans-serif" color="#FFFFFF">   <B>updated 10:15 a.m.  15.Oct.99.PDT</B>
+</FONT>
+</NOBR>
+</TD>
+</TR>
+<TR>
+<TD valign="MIDDLE" align="RIGHT" bgcolor="#FFFFFF">
+<IMG src="http://static.wired.com/news/images/spacer.gif" width="1" height="30">
+</TD>
+<TD colspan="2" bgcolor="#999999">
+<TABLE border="0" cellspacing="0" cellpadding="5">
+<FORM name="RedirectSearch" action="http://redirect.wired.com/search">
+<TR>
+<TD>
+<FONT face="courier" size="1">
+<INPUT type="TEXT" name="query" size="20" value="">
+</FONT>
+</TD>
+<TD>
+<SELECT name="url">
+<OPTION value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode=Internet&Query=">Wired News</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=webmonkey.hts&Collection=webmonkey&QueryMode=Internet&Query=">Webmonkey</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?collection=webmonkey_guides&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=webmonkey_guides.hts&QueryMode=Internet&Query=">Webmonkey Guides</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?collection=hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=hotwired_archive.hts&QueryMode=Internet&Query=">HotWired Archives</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=magazine.hts&Collection=magazine&QueryMode=Internet&Query=">Wired Magazine</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=animation.hts&Collection=animation&QueryMode=Internet&Query=">Animation Express</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?collection=suck&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=suck.hts&QueryMode=Internet&Query=">Suck.com</OPTION>
+<OPTION value="http://search.hotwired.com/search97/s97.vts?collection=uber_hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=uber_hotwired.hts&QueryMode=Internet&Query=">All of HotWired</OPTION>
+<OPTION value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&OPs=MDRTP&MT=">The Web -> HotBot</OPTION>
+</SELECT>
+</TD>
+<TD>
+<INPUT type="SUBMIT" name="SUBMIT" value="SEARCH">
+</TD>
+</TR>
+</FORM>
+</TABLE>
+</TD>
+</TR>
+<!--
+<TR>
+<td></td>
+<TD valign="TOP" align="LEFT" colspan="3" bgcolor="#F0F0F0"><img src="http://static.wired.com/news/images/spacer.gif" height=1 width=15 alt=""><br>
+<i><font face="Verdana, Arial, Geneva, sans-serif" size="2">Sponsored by<a href="#">Sun Microsystems.</a> We're the dot in .com</font></i><i></i></TD>
+</TR>
+-->
+</TABLE>
+<!-- end WIRED NEWS header --><!-- begin upper left side Navigation --><TABLE border="0" cellpadding="3" cellspacing="0" align="LEFT" bgcolor="#FFFFFF">
+<TR>
+<TD bgcolor="#FF0000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<IMG src="http://static.wired.com/news/images/spacer.gif" width="147" height="1" border="0">
+<BR>
+<B>SECTIONS</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#CCFFCC">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/business/0,1367,,00.html">Business</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/culture/0,1284,,00.html">Culture</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#CCFFCC">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/technology/0,1282,,00.html">Technology</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/politics/0,1283,,00.html">Politics</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FF0000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>WIRE SERVICE NEWS</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/news/reuters/">Top Headlines</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#CCFFCC">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/news/reuters/sports/">Sports</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="/news/news/reuters/business/">Finance</A>
+</FONT>
+</TD>
+</TR>
+<!-- End upper left nav --><!-- Begin lower Left Nav --><TR>
+<TD bgcolor="#FF0000">
+<FONT face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>
+<FONT size="1">FREE DELIVERY</FONT>
+</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<TABLE cellspacing="0" cellpadding="0" border="0">
+<TR>
+<TD bgcolor="#99FF99">
+<FORM action="http://r.hotwired.com/r/hw_wm_r_nav_nwsltr/http://perl.hotwired.com/massmail/cgiParser.cgi" method="get" target="_top">
+<INPUT type="hidden" name="success_page" value="http://www.hotwired.com/email/signup/wirednews-ascii.html">
+<INPUT type="hidden" name="failure_page" value="http://www.hotwired.com/email/signup/wirednews-ascii.html">
+<INPUT type="hidden" name="LIST" value="wn_ascii">
+<INPUT type="hidden" name="SOURCE" value="other">
+<INPUT type="hidden" name="ACTION" value="subscribe">
+<INPUT type="TEXT" name="from" size="10" value="enter email"> 
+</FORM>
+</TD>
+<TD valign="top" bgcolor="#99FF99">
+<INPUT type="SUBMIT" name="SUBMIT" value="GO">
+</TD>
+</TR>
+</TABLE>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FF0000">
+<FONT face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>
+<FONT size="1">STOCKS</FONT>
+</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">Get Quote:</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99" marginwidth="0" marginheight="0">
+<FORM method="get" action="http://r.wired.com/r/10020/http://stocks.wired.com/stocks_quotes.asp">
+<INPUT type="TEXT" name="Symbol" size="12"> <INPUT type="SUBMIT" name="submit" value="GO">
+</FORM>
+</TD>
+</TR>
+<!-- BEGIN BUTTON ADS --><TR>
+<TD bgcolor="#CCFFCC">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">Financial Services</FONT>
+<BR>
+<CENTER>
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="3" width="5" alt="">
+<BR>
+<IMG src="http://static.wired.com/news/images/button_ads_news10.gif" width="143" height="56" border="0" ALT="" USEMAP="#buttons" hspace="0" vspace="0">
+</CENTER>
+<MAP NAME="buttons">
+<AREA SHAPE="RECT" ALT="Datek" COORDS="0,0,69,24" HREF="http://r.wired.com/r/1649/http://ads16.focalink.com/SmartBanner/page/1266.631">
+<AREA SHAPE="RECT" ALT="Wired Index Fund" COORDS="73,0,142,24" HREF="http://r.wired.com/r/227/http://www.gffunds.com/wired">
+<AREA SHAPE="RECT" ALT="internet.com Index Fund" COORDS="73,31,142,55" HREF="http://r.wired.com/r/298/http://www.gffunds.com/isdex/">
+<AREA SHAPE="RECT" ALT="GetSmart's MortgageFinder" COORDS="0,31,69,55" HREF="http://r.wired.com/r/294/http://www.getsmartinc.com/mortgage/HomeBanner?BANNERNAME=www.getsmartinc.com/mwired001m6075x25">
+</MAP>
+</TD>
+</TR>
+<!-- END BUTTON ADS --><TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="http://redirect.wired.com/redir/51/http://stocks.wired.com/">Today's Summary</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#CCFFCC">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="http://r.wired.com/r/hb_fin_r_wn_top/http://stocks.wired.com/stocks_indexes_detail.asp?Symbol=$WIRED">Wired Index</A> | <A href="http://redirect.wired.com/redir/52/http://stocks.wired.com/stocks_indexes.asp ">All Indexes</A>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#99FF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="http://redirect.wired.com/redir/53/http://stocks.wired.com/stocks_portfolios.asp">Portfolios</A>
+</FONT>
+</TD>
+</TR>
+<!-- BEGIN B&N spot --><TR>
+<TD bgcolor="#FF0000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>FIND A BOOK</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#CCFFCC">
+<TABLE cellspacing="0" cellpadding="0" border="0" width="145">
+<TR>
+<TD bgcolor="#CCFFCC">
+<FORM action="http://r.wired.com/r/wn_nav_c_bn/http://barnesandnoble.bfast.com/booklink/click">
+<INPUT type="hidden" name="sourceid" value="383471">
+<INPUT type="hidden" name="categoryid" value="categorydropdown">
+<FONT size="2">
+<SELECT name="Subjects" size="4">
+<OPTION value="301">Business Top 20
+<OPTION value="500">Computers
+<OPTION value="503">Computer Games
+<OPTION value="1604">Current Affairs
+<OPTION value="511">Cyberculture
+<OPTION value="510">Internet/Web
+<OPTION value="303">Investing
+<OPTION value="1606">Law
+<OPTION value="513">Multimedia
+
+<OPTION value="1605">Newsmakers
+<OPTION value="1607">Politics/Govt.
+
+ <OPTION value="315"> Web Business
+ <OPTION value="2800"> Bargain Books
+
+<OPTION value="4">Other
+
+
+
+
+
+ </OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</OPTION>
+</SELECT>
+</FONT>
+</FORM>
+</TD>
+</TR>
+<TR align="left" valign="top">
+<TD valign="top" bgcolor="#CCFFCC">
+<INPUT type="submit" value="GO">
+<IMG SRC="http://barnesandnoble.bfast.com/booklink/serve?sourceid=383471&is_search=Y" border="0" align="top">
+<!--
+<IMG SRC="http://www.wired.com/partner/bn/trackingimg/ot_wn_nav_c_bn.gif" border=0 width=1 height=1 align=top>
+-->
+</TD>
+</TR>
+<TR align="left" valign="top">
+<TD align="left" valign="top" colspan="2" rowspan="1" bgcolor="#CCFFCC">
+<P>
+<FONT size="1" face="Verdana, Arial, Helvetica, " color="#000000">Powered by <A href="http://r.wired.com/r/wn_nav_c_bn/http://barnesandnoble.bfast.com/booklink/click?sourceid=383471">barnesandnoble.com</A>
+</FONT>
+<BR clear="all">
+</P>
+</TD>
+</TR>
+</TABLE>
+</TD>
+</TR>
+<!-- END B&N spot --><!-- BEGIN MAGAZINE SPOT --><TR>
+<TD bgcolor="#000000">
+<FONT color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<B>WIRED
+ MAGAZINE </B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FFFF99" align="CENTER">
+<FONT face="verdana, arial, helvetica, sans-serif" size="1">
+<B>
+<BR>
+<A href="http://www.wired.com/wired/">
+<IMG src="http://static.wired.com/news/images/wiredcover.gif" width="91" height="109" border="0" alt="Wired Magazine">
+</A>
+<BR>
+</B>
+
+Issue 7.11
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FFFF99" align="center">
+<FONT face="verdana, arial, helvetica, sans-serif" size="1">
+<A href="http://www.wired.com/wired/subscribe/special/79WN">Subscribe to Wired.<BR>Special offer!</A>
+</FONT>
+</TD>
+</TR>
+<!-- END MAGAZINE SPOT --><TR>
+<TD bgcolor="#000000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>HOTWIRED</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FFFF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="http://www.hotwired.com/">Frontdoor</A>
+<BR>
+<A href="http://www.hotwired.com/webmonkey/">Webmonkey</A>
+<BR>
+<A href="http://www.hotwired.com/webmonkey/guides/index.html">Webmonkey Guides</A>
+<BR>
+<A href="http://www.hotwired.com/rgb/">RGB Gallery</A>
+<BR>
+<A href="http://www.hotwired.com/animation/">Animation Express</A>
+<BR>
+<A href="http://go.suck.com/su_wnfd">Suck.com</A>
+<BR>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#000000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>HOTBOT</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD bgcolor="#FFFF99">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<A href="http://redirect.wired.com/redir/54/http://www.hotbot.com/">Search</A>
+<BR>
+<A href="http://shop.hotbot.com/">Shopping</A>
+<BR>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+ Wired News <A href="/news/who/0,1362,,00.html">staff</A>
+<BR>
+<BR>
+<!-- Wired News is <a href="http://www.wired.com/news/jobs.html">hiring</a><br><br> --><B>
+<A href="/news/feedback/0,1364,,00.html">Contact us</A>
+</B>
+</FONT>
+<BR>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">Wired News delivered<BR>by <A href="/news/palmpilot/0,1365,,00.html">PalmPilot</A>,<BR>
+<A href="http://www.hotwired.com/email/signup/wn_outlook.html">Outlook Express</A>,<BR>
+<A href="http://redirect.wired.com/redir/55/http://form.netscape.com/ibd/html/ibd_frameset.html">In-Box Direct</A>,<BR>
+or <A href="/news/pointcast/0,1366,,00.html">PointCast</A>
+</FONT>
+<BR>
+<!-- TRACKING --><IMG src="http://www.wired.com/special/modx/news.gif" height="1" width="1" alt="">
+</FONT>
+</TD>
+</TR>
+</TABLE>
+<!-- end lower left side Navigation --><!-- CONTENT TABLE --><TABLE border="0" width="447" cellspacing="0" cellpadding="0" bordercolor="#66FF00">
+<TR>
+<TD valign="TOP" align="LEFT" rowspan="2">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="1" width="15" alt="">
+<BR>
+</TD>
+<TD colspan="3" valign="TOP" align="LEFT">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="7" width="432" alt="">
+<BR>
+<!-- SQL query for Package here --><FONT face="Verdana, Arial, Geneva, sans-serif" size="2">
+<B>
+<I>Nomad's Land</I>
+</B>
+</FONT>
+<BR>
+<IMG src="http://static.wired.com/news/images/pix155.gif" height="10" width="155" alt="">
+<BR>
+<!-- IBD_SUBJECT: Homeless, but ID'd, in Seattle --><FONT face="Arial, Helvetica, sans-serif" size="5">
+<B>
+<A href="/news/politics/0,1283,31911,00.html">Homeless, but ID'd, in Seattle</A>
+</B>
+</FONT>
+<BR>
+<FONT size="1" face="Verdana, Arial, Geneva, sans-serif" color="#FF0000">8:15 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The city council approves a plan to track the homeless by a numbering system, saying it'll improve services. The implications worry privacy advocates, naturally. By Craig Bicknell.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/politics/0,1283,,00.html">in Politics</A>
+</I>
+</FONT>
+<BR>
+<TABLE bgcolor="#F0F0F0" cellpadding="0" cellspacing="0" border="0" width="147" align="RIGHT">
+<!-- Commentary Frag Begin --><TR>
+<TD bgcolor="#000000"> </TD>
+<TD bgcolor="#000000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>HITS & MISC.</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD> </TD>
+<TD>
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="5" width="5" alt="">
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/commentarySection/0,1292,31664,00.html">Calendar of E-Vents</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Ongoing goings-on. </FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/commentarySection/0,1292,31926,00.html">Rants Raves</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</FONT>
+<BR>
+<BR>
+</FONT>
+</FONT>
+</TD>
+</TR>
+<!-- Commentary Frag End --><TR>
+<TD align="left" bgcolor="#000000"> </TD>
+<TD bgcolor="#000000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>CURRENT HOO-HA</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD> </TD>
+<TD>
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="5" width="5" alt="">
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/mp3/0,1285,,00.html">MP3 Rocks the Web</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Download the sound. <BR>
+<I>Sponsored by <A href="http://r.hotwired.com/r/wn_fd_mp3_r_mscm_txt/http://webfarm.mediaplex.com/click_thru_request/164-1361b-1052" style="text-decoration:none">
+<FONT color="#000000">Musicmaker</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/wireless/0,1382,,00.html">The Wireless World</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Networking gets unplugged. <BR>
+<I>Sponsored by <A href="http://www.ericsson.se/get/internet/default.shtml" style="text-decoration:none">
+<FONT color="#000000">Ericsson</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/digiwood/0,1412,,00.html">Digital Hollywood</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">The buzz of tech.</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/ipo/0,1350,,00.html">IPO Outlook</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Deals in the pipeline. <BR>
+<I>Sponsored by <A href="http://r.hotwired.com/r/wn_ipo_r_sun_txt/http://sun.com/ads/smi/brand/hotwired.html" style="text-decoration:none">
+<FONT color="#000000">Sun</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/ebiz/0,1272,,00.html">E-Biz</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Business unusual. <BR>
+<I>Sponsored by <A href="http://r.wired.com/r/wn_fd_r_ebiz_ibm_txt/http://www.ibm.com" style="text-decoration:none">
+<FONT color="#000000">IBM</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/medtech/0,1286,,00.html">Med-Tech Center</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">From the bleeding edge.<BR>
+<I>Sponsored by WebMD</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/linux/0,1411,,00.html">The Linux Effect</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Not just for geeks.</FONT>
+<BR>
+<BR>
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="7" width="5" alt="">
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/exec/0,1370,,00.html">Executive Summary</A>
+</B>
+</FONT>
+<BR>
+<FONT size="1" face="Arial, Helvetica, sans-serif" color="#000000">CEOs, COOs, CIOs unite. <BR>
+<I>Sponsored by <A href="http://r.wired.com/r/wn_exec_r_vign/http://www.vignette.com/" style="text-decoration:none">
+<FONT color="#000000">Vignette</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/school/0,1383,,00.html">Making the Grade</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Reading, writing, and ROM. <BR>
+<I>Sponsored by <A href="http://r.hotwired.com/r/wn_sch_r_nav_uop/http://ads25.focalink.com/SmartBanner/page?12630.53" style="text-decoration:none">
+<FONT color="#000000">U of Phoenix</FONT>
+</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/infostructure/0,1377,,00.html">Infostructure</A>
+</B>
+</FONT>
+<BR>
+<FONT size="1" face="Arial, Helvetica, sans-serif" color="#000000">An IS/IT resource <BR>
+<I>Sponsored by <A href="http://r.wired.com/r/wn_is_r_ssec/http://ad.doubleclick.net/clk;653163;3599571;s?http://www.sprintbiz.com/s
+ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE=
+wired.com&BANNER=Sprint" style="text-decoration:none">
+<FONT color="#000000">Sprint</FONT>
+</A>
+</I>
+</FONT>
+</FONT>
+<BR>
+<BR>
+<FONT size="2" face="Arial,Helvetica, sans-serif">
+<B>
+<A href="/news/y2k/0,1360,,00.html">Y2K Watch</A>
+</B>
+</FONT>
+<BR>
+<FONT size="2" face="Arial, Helvetica, sans-serif">
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">Tick... Tick... Tick...</FONT>
+<BR>
+<BR>
+<FONT face="Arial, Helvetica, sans-serif" size="2">
+<B>
+<I>
+<A href="/news/special_reports/1,1293,,00.html">More Hoo-Ha</A>
+</I>
+</B>
+</FONT>
+<BR> <BR>
+</FONT>
+</FONT>
+</FONT>
+</FONT>
+</FONT>
+</FONT>
+</FONT>
+</FONT>
+</TD>
+</TR>
+<!-- start of Gen News --><TR>
+<TD bgcolor="#000000"> </TD>
+<TD bgcolor="#000000">
+<FONT size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<B>MEANWHILE...</B>
+</FONT>
+</TD>
+</TR>
+<TR>
+<TD> </TD>
+<TD align="left" valign="top">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="5" width="5" alt="">
+<BR>
+<!-- 31942 --><FONT size="2" face="Arial, Helvetica, sans-serif" color="#000000">
+<B>Führer Furor</B>
+</FONT>
+<BR>
+<FONT size="1" face="Arial, Geneva, sans-serif" color="#000000">
+<P>
+Contruction workers in Berlin opened an old wound in the German psyche this week when they accidentally stumbled across Adolf Hitler's bunker while excavating near the Brandenburg Gate. The bunker, just south of the Gate, was where Hitler and his closest associates barricaded themselves as the Red Army approached Berlin in the waning days of World War II. It is also where the Führer and his bride, Eva Braun, committed suicide rather than fall into the hands of the Russians. Although the bunker's location has never been a mystery, it has been sealed off since the end of the war to keep neo-Nazis from turning it into a shrine.
+<BR>
+</P>
+<LI>More from <A href="http://www.lycos.com/news/flash/hitlerbunker.html?v=wn1015&lpv=1">Lycos</A>
+</LI>
+</FONT>
+<BR>
+<BR>
+</TD>
+</TR>
+<!-- end of Gen News -->
+</TABLE>
+<FONT size="1"> <BR>
+</FONT>
+<BR>
+<FONT face="Verdana, Arial, Geneva, sans-serif" size="2">
+<B>
+<I>Other Top Stories</I>
+</B>
+</FONT>
+<BR>
+<IMG src="http://static.wired.com/news/images/pix155.gif" height="10" width="155" alt="">
+<BR>
+<!-- SQL query here --><!-- IBD_SUBJECT:Wall Street Keeps Reeling --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/reuters/0,1349,31934,00.html">Wall Street Keeps Reeling</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">10:15 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The Dow and Nasdaq suffer sizeable losses during the first half of Friday trading. Why? Wholesale prices are the highest this decade, and Greenspan is concerned about stock prices.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/reuters/0,1349,,00.html">in Reuters</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:The Market's Madness --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/reuters/0,1349,31935,00.html">The Market's Madness</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">9:10 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The bulls and the bears are in the midst of a Battle Royale, and all this turbulence is not a healthy thing. So say the experts.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/reuters/0,1349,,00.html">in Reuters</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:'Want a Loan? What's Your Race?' --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/politics/0,1283,31533,00.html">'Want a Loan? What's Your Race?'</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The Federal Reserve is in the middle of changing banking regulations to let banks collect data on the race, sex, religion, and national origin of their customers. By Declan McCullagh. </FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/politics/0,1283,,00.html">in Politics</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:Music Regs: A Bagful of Noise --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/business/0,1367,31832,00.html">Music Regs: A Bagful of Noise</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The struggle to come up with a digital music standard that would minimize download piracy is pushing right up against the holiday gift-giving season. By Jennifer Sullivan.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/business/0,1367,,00.html">in Business</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:Can't Beat 'Em? Green 'Em --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/technology/0,1282,31927,00.html">Can't Beat 'Em? Green 'Em</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">High-tech companies are notoriously environmentally unfriendly, and a growing number of "Greenies" are trying to change things from the inside ... with varying results. By Chris Gaither.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/technology/0,1282,,00.html">in Technology</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:Y2K Cloud Over MS Office --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/business/0,1367,31932,00.html">Y2K Cloud Over MS Office</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">Windows NT sales remain strong, but corporate clients are wary of upgrading to MS Office 2000. Analysts say that means strong, but not stunning, Microsoft earnings. </FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/business/0,1367,,00.html">in Business</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<FONT color="#FF0000" face="Verdana, Arial, Geneva, sans-serif" size="1">Med-Tech</FONT>
+<BR>
+<!-- IBD_SUBJECT:Biochips for Custom Chemo --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/technology/0,1282,31914,00.html">Biochips for Custom Chemo</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">Different cancer patients need different medicine, but doctors can rarely determine the best match. New biochip technology promises chemotherapy tailored to a tumor's genetic make-up. By Kristen Philipkoski.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/technology/0,1282,,00.html">in Technology</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:High Stakes in Priceline Suit --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/business/0,1367,31916,00.html">High Stakes in Priceline Suit</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">It's not just another round of Redmond-bashing. A Priceline.com lawsuit against Microsoft's Expedia.com may have a big impact on how Net companies protect their business models. By Joanna Glasner.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/business/0,1367,,00.html">in Business</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- IBD_SUBJECT:Biodiversity Merges Online --><FONT face="Arial, Helvetica, sans-serif" size="3">
+<B>
+<A href="/news/technology/0,1282,31918,00.html">Biodiversity Merges Online</A>
+</B>
+</FONT>
+<BR>
+<FONT color="#ff0000" face="Verdana, Arial, Geneva, sans-serif" size="1">3:00 a.m.</FONT> <FONT face="Verdana, Arial, Geneva, sans-serif" size="2">The far-flung databases on global biodiversity get together to form one monster database. Soon the red-eyed tree frog will be eyeing those Swedish lingonberries. From the Environment News Service.</FONT>
+<BR>
+<FONT face="Verdana, Arial, Helvetica, sans-serif" size="1">
+<I>
+<A href="/news/technology/0,1282,,00.html">in Technology</A>
+</I>
+</FONT>
+<BR>
+<BR>
+<!-- SQL above --><!------TRADES---------><BR>
+<FONT face="Verdana, Arial, Geneva, sans-serif" size="2">
+<B>
+<I>Elsewhere Today</I>
+</B>
+</FONT>
+<BR>
+<IMG src="http://static.wired.com/news/images/pix155.gif" height="10" width="155" alt="">
+<BR>
+<!-- SQL query here --><FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.thestandard.com/articles/display/0,1449,6975,00.html?home.tf">FCC: Hands-Off on Broadband</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">
+<CITE>The Industry Standard</CITE>
+</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://news.lycos.com/stories/TopNews/19991014RTNEWS-ARMS-TREATY.asp">White House Lashes Out on Treaty</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">Lycos</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.pathfinder.com/time/magazine/articles/0,3266,32207,00.html">Steve Jobs at 44</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">
+<CITE>Time</CITE>
+</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.zdnet.com/zdnn/stories/news/0,4586,2353608,00.html">Computers May Run on Gas</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">ZDNN</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.nytimes.com/library/tech/99/10/biztech/articles/14free.html">Much Is Free in the Wired World</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">
+<CITE>The New York Times</CITE> (Registration Required)</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.usatoday.com/life/cyber/nb/nb4.htm">Melissa: I'm Baaaack</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">
+<CITE>USA Today</CITE>
+</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.msnbc.com/news/322926.asp">Domain Owners Surrender Privacy</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">MSNBC</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.washingtonpost.com/wp-srv/business/longterm/tech/techthursday/download/download.htm">Dividing to Conquer in VC Game</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">
+<CITE>The Washington Post</CITE>
+</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://www.salon.com/tech/books/1999/10/14/redhat_book/index.html">The Red Hat Diaries</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">Salon</FONT>
+<BR>
+<BR>
+<FONT face="helvetica, arial" size="3">
+<B>
+<A href="http://news.bbc.co.uk/hi/english/sci/tech/newsid_473000/473856.stm">Screensaver to Predict Climate</A>
+</B>
+</FONT>
+<BR>
+<FONT face="geneva, arial" size="2">BBC News</FONT>
+<BR>
+<BR>
+<!-- SQL above --><!-- - - - - - - - - - - - - -->
+</TD>
+</TR>
+<TR>
+<TD valign="TOP" align="LEFT">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="1" width="280" alt="">
+<BR>
+<!-- FOOTER --><BR>
+<IMG src="http://static.wired.com/news/images/pix155.gif" height="10" width="155" border="0" usemap="#navstrip.map" alt="">
+<BR>
+<IMG src="http://static.wired.com/news/images/navstrip_off.gif" height="17" width="126" usemap="#navstrip.map" border="0" alt="">
+<BR>
+<BR>
+<P>
+<FONT face="Verdana, Arial, Geneva, sans-serif" size="1">
+<A href="http://www.wired.com/news/feedback.html">Send us feedback</A>
+ | 
+<A href="http://www.hotwired.com/jobs/">Work at Wired Digital</A>
+ | 
+<A href="http://home.wired.com/advertising/">Advertise with us</A>
+<BR>
+<A href="http://home.wired.com/">About Wired Digital</A>
+ | 
+<A href="http://www.wired.com/home/digital/privacy/">Our Privacy Policy</A>
+</FONT>
+</P>
+<P>
+<FONT face="Verdana, Arial, Geneva" size="1">
+<A href="http://www.wired.com/home/copyright.html">Copyright</A> © 1994-99 Wired Digital Inc. All rights reserved.</FONT>
+<BR>
+<!-- TRACKING --><IMG src="http://www.wired.com/special/modx/news.gif" height="1" width="1" alt="">
+<MAP NAME="navstrip.map">
+<AREA SHAPE="rect" COORDS="0,0,14,16" HREF="/news">
+<AREA SHAPE="rect" COORDS="15,0 31,16" HREF="/news/business/">
+<AREA SHAPE="rect" COORDS="32,0,48,16" HREF="/news/culture/">
+<AREA SHAPE="rect" COORDS="49,0,65,16" HREF="/news/technology/">
+<AREA SHAPE="rect" COORDS="66,0,83,16" HREF="/news/politics/">
+</MAP>
+</P>
+</TD>
+<TD valign="TOP" align="LEFT">
+<IMG src="http://static.wired.com/news/images/spacer.gif" height="1" width="5" alt="">
+</TD>
+<TD valign="TOP" align="LEFT">
+</TR>
+</TABLE>
+<BR>
+</BODY>
+</HTML>
diff --git a/result/ent8 b/result/ent8
index 4f38bd8..7b8f814 100644
--- a/result/ent8
+++ b/result/ent8
@@ -1,3 +1,10 @@
<?xml version="1.0"?>
-<!DOCTYPE a SYSTEM "a.dtd">
-<a> but Okay </a>
+<!DOCTYPE doc [
+<!ENTITY test1 "test 1">
+<!ENTITY test2 "test 2">
+]>
+<doc>
+ <Content>Retenção</Content>
+ <Content><></Content>
+ <Content>&test1;&test2;</Content>
+</doc>
diff --git a/result/noent/ent8 b/result/noent/ent8
new file mode 100644
index 0000000..0ed738a
--- /dev/null
+++ b/result/noent/ent8
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE doc [
+<!ENTITY test1 "test 1">
+<!ENTITY test2 "test 2">
+]>
+<doc>
+ <Content>Retenção</Content>
+ <Content><></Content>
+ <Content>test 1test 2</Content>
+</doc>
diff --git a/test/HTML/wired.html b/test/HTML/wired.html
new file mode 100644
index 0000000..3d00d28
--- /dev/null
+++ b/test/HTML/wired.html
@@ -0,0 +1,516 @@
+<!-- Vignette StoryServer 4 Fri Oct 15 11:37:12 1999 -->
+<html><head><title>Top Stories News from Wired News</title></head><body bgcolor="#FFFFFF" text="#000000" link="#333399" vlink="#660066" alink="#666699">
+
+<table border="0" width="600" cellspacing="0" cellpadding="0">
+ <tr>
+ <td valign="top" align="LEFT"><TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="468" HEIGHT="60" BGCOLOR="#FFFFFF"><FORM METHOD=GET ACTION="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=9688&RunID=14074&AdID=22584&GroupID=1&FamilyID=2684&TagValues=8.25.156.159.166.171.172.174.179.180.181.182.183.196.197.199.208.389.412.436.2041.6750.78456.79630.81880&Redirect=http://www.springstreet.com/aa/citysearch.htm" id=form1 name=form1>
+<TR><TD BGCOLOR="#330099"><INPUT NAME="city" TYPE="text" SIZE="7" MAXLENGTH="20" VALUE="Seattle"></TD>
+<TD ROWSPAN=2 ALIGN=LEFT BGCOLOR=FFFFFF><INPUT TYPE="IMAGE" SRC="http://static.wired.com/advertising/blipverts/allapartments/990625jpa_ssthome.gif" WIDTH="375" HEIGHT="60" BORDER="0" VALUE="search" HSPACE=0 alt="Search over 6,000,000 Apts with SpringStreet"></TD></TR>
+<TR><TD BGCOLOR="#330099">
+<SELECT NAME="state">
+<OPTION VALUE="WA" SELECTED>WA
+<OPTION VALUE="AL">AL</OPTION><OPTION VALUE="AK">AK</OPTION>
+<OPTION VALUE="AZ">AZ</OPTION>
+<OPTION VALUE="AR">AR</OPTION>
+<OPTION VALUE="CA">CA</OPTION>
+<OPTION VALUE="CO">CO</OPTION>
+<OPTION VALUE="CT">CT</OPTION>
+<OPTION VALUE="DE">DE</OPTION>
+<OPTION VALUE="DC">DC</OPTION>
+<OPTION VALUE="FL">FL</OPTION>
+<OPTION VALUE="GA">GA</OPTION><OPTION VALUE="HI">HI</OPTION>
+<OPTION VALUE="ID">ID</OPTION>
+<OPTION VALUE="IL">IL</OPTION>
+<OPTION VALUE="IN">IN</OPTION><OPTION VALUE="IA">IA</OPTION><OPTION VALUE="KS">KS</OPTION><OPTION VALUE="KY">KY</OPTION>
+<OPTION VALUE="LA">LA</OPTION>
+<OPTION VALUE="ME">ME</OPTION><OPTION VALUE="MD">MD</OPTION>
+<OPTION VALUE="MA">MA</OPTION>
+<OPTION VALUE="MI">MI</OPTION><OPTION VALUE="MN">MN</OPTION><OPTION VALUE="MS">MS</OPTION>
+<OPTION VALUE="MO">MO</OPTION>
+<OPTION VALUE="MT">MT</OPTION><OPTION VALUE="NE">NE</OPTION>
+<OPTION VALUE="NV">NV</OPTION><OPTION VALUE="NH">NH</OPTION>
+<OPTION VALUE="NJ">NJ</OPTION>
+<OPTION VALUE="NM">NM</OPTION><OPTION VALUE="NY">NY</OPTION>
+<OPTION VALUE="NC">NC</OPTION>
+<OPTION VALUE="ND">ND</OPTION>
+<OPTION VALUE="OH">OH</OPTION><OPTION VALUE="OK">OK</OPTION>
+<OPTION VALUE="OR">OR</OPTION>
+<OPTION VALUE="PA">PA</OPTION>
+<OPTION VALUE="PR">PR</OPTION><OPTION VALUE="RI">RI</OPTION>
+<OPTION VALUE="SC">SC</OPTION>
+<OPTION VALUE="SD">SD</OPTION><OPTION VALUE="TN">TN</OPTION><OPTION VALUE="TX">TX</OPTION>
+<OPTION VALUE="UT">UT</OPTION>
+<OPTION VALUE="VT">VT</OPTION>
+<OPTION VALUE="VA">VA</OPTION>
+<OPTION VALUE="WA">WA</OPTION>
+<OPTION VALUE="WV">WV</OPTION>
+<OPTION VALUE="WI">WI</OPTION>
+<OPTION VALUE="WY">WY</OPTION>
+</SELECT><INPUT TYPE="hidden" NAME="source" VALUE="2hb8bhc059">
+</TD></TR></FORM>
+</TABLE></td>
+ <td valign="top" align="RIGHT"><a href="http://nsads.hotwired.com/event.ng/Type=click&ProfileID=5597&RunID=17167&AdID=22588&GroupID=1&FamilyID=3228&TagValues=8.25.159.171.172.174.179.180.181.182.183.196.197.199.208.241.389.412.436.2035.6749.6750.70367.78456.79630.81880&Redirect=http:%2F%2Fwww.hp.com%2Fgo%2Foriginal%20" TARGET="_top"><img src="http://static.wired.com/advertising/blipverts/hp_colorinkjet/hp_970c_120x60_6.gif" BORDER=1 height=60 width=120 alt="True to the Original"></a></td>
+ </tr>
+</table>
+
+<!-- WIRED NEWS header -->
+<!-- CMD_HOST = scoop.hotwired.com -->
+
+<a name="#"></a>
+<table border="0" width="600" cellspacing="0" cellpadding="0">
+
+ <tr><td></td><td colspan="2"><img src="http://static.wired.com/news/images/spacer.gif" height="5" width="447" alt=""></td>
+</tr>
+
+ <tr>
+ <td valign="BOTTOM" align="RIGHT" class="wired" bgcolor="#FFFFFF"><a href="/news/0,1287,,00.html"><img src="http://static.wired.com/news/images/wired_000000.gif" width="153" height="30" border="0"></a></td>
+ <td bgcolor="#FF0000" valign="BOTTOM" align="LEFT" width="97"><a href="/news/0,1287,,00.html"><img src="http://static.wired.com/news/images/news_ffffff.gif" width="103" height="30" border="0"></a></td>
+
+
+<td bgcolor="#FF0000" align="left" valign="center"><nobr><img src="http://static.wired.com/news/images/spacer.gif" width="344" height="1"><br><font size="1" face="Verdana, Arial, Geneva, sans-serif" color="#FFFFFF"> <b>updated 10:15 a.m. 15.Oct.99.PDT</b></font></nobr></td>
+
+
+ </tr>
+ <tr>
+ <td valign="MIDDLE" align="RIGHT" bgcolor="#FFFFFF"><img src="http://static.wired.com/news/images/spacer.gif" width=1 height="30"></td>
+
+ <td colspan="2" bgcolor="#999999">
+
+ <TABLE border="0" cellspacing="0" cellpadding="5">
+<form name="RedirectSearch" action="http://redirect.wired.com/search">
+ <tr>
+ <td>
+<font face="courier" size="1"><input type="TEXT" name="query" size="20" value=""></font>
+ </td>
+
+ <td>
+<select name="url">
+
+ <option value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode=Internet&Query=" selected>Wired News</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=webmonkey.hts&Collection=webmonkey&QueryMode=Internet&Query=">Webmonkey</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?collection=webmonkey_guides&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=webmonkey_guides.hts&QueryMode=Internet&Query=">Webmonkey Guides</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?collection=hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=hotwired_archive.hts&QueryMode=Internet&Query=">HotWired Archives</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=magazine.hts&Collection=magazine&QueryMode=Internet&Query=">Wired Magazine</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=animation.hts&Collection=animation&QueryMode=Internet&Query=">Animation Express</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?collection=suck&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=suck.hts&QueryMode=Internet&Query=">Suck.com</option>
+ <option value="http://search.hotwired.com/search97/s97.vts?collection=uber_hotwired&Action=FilterSearch&filter=docs_filter.hts&ResultTemplate=uber_hotwired.hts&QueryMode=Internet&Query=">All of HotWired</option>
+ <option value="http://www.hotbot.com/?SM=MC&DV=0&LG=any&RD=RG&DC=10&DE=2&_v=2&OPs=MDRTP&MT=">The Web -> HotBot</option>
+</select>
+
+
+
+ </td>
+ <td>
+ <input type="SUBMIT" name="SUBMIT" value="SEARCH">
+ </td>
+ </tr>
+ </form>
+ </TABLE>
+ </td>
+ </tr>
+<!--
+<TR>
+<td></td>
+<TD valign="TOP" align="LEFT" colspan="3" bgcolor="#F0F0F0"><img src="http://static.wired.com/news/images/spacer.gif" height=1 width=15 alt=""><br>
+<i><font face="Verdana, Arial, Geneva, sans-serif" size="2">Sponsored by<a href="#">Sun Microsystems.</a> We're the dot in .com</font></i><i></i></TD>
+</TR>
+-->
+</table>
+<!-- end WIRED NEWS header -->
+
+<!-- begin upper left side Navigation -->
+
+<table border="0" cellpadding="3" cellspacing="0" align="LEFT" bgcolor="#FFFFFF">
+ <tr>
+ <td bgcolor="#FF0000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+ <img src="http://static.wired.com/news/images/spacer.gif" width=147 height=1 border=0><br><b>SECTIONS</b></font></td>
+ </tr>
+
+<tr><td bgcolor="#CCFFCC"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/business/0,1367,,00.html">Business</a></font></td></tr><tr><td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/culture/0,1284,,00.html">Culture</a></font></td></tr><tr><td bgcolor="#CCFFCC"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/technology/0,1282,,00.html">Technology</a></font></td></tr><tr><td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/politics/0,1283,,00.html">Politics</a></font></td></tr><tr>
+<td bgcolor="#FF0000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+<b>WIRE SERVICE NEWS</b></font></td>
+</tr>
+
+<tr>
+<td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/news/reuters/">Top Headlines</a></font></td>
+</tr>
+
+<tr>
+<td bgcolor="#CCFFCC"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/news/reuters/sports/">Sports</a></font></td>
+</tr>
+
+<tr>
+<td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="/news/news/reuters/business/">Finance</a></font></td>
+</tr>
+<!-- End upper left nav --><!-- Begin lower Left Nav -->
+ <tr>
+ <td bgcolor="#FF0000"><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+ <b><font size="1">FREE DELIVERY</font></b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#99FF99">
+<table cellspacing="0" cellpadding="0" border=0 >
+ <tr><td bgcolor="#99FF99">
+ <form action="http://r.hotwired.com/r/hw_wm_r_nav_nwsltr/http://perl.hotwired.com/massmail/cgiParser.cgi" method="get" target="_top">
+
+ <input type="hidden" name="success_page" value="http://www.hotwired.com/email/signup/wirednews-ascii.html">
+
+<input type="hidden" name="failure_page" value="http://www.hotwired.com/email/signup/wirednews-ascii.html">
+
+<input type="hidden" name="LIST" value="wn_ascii">
+<input type="hidden" name="SOURCE" value="other">
+ <input type="hidden" name="ACTION" value="subscribe">
+
+<input type="TEXT" name="from" size="10" value="enter email">
+</td>
+ <td valign="top" bgcolor="#99FF99">
+ <input type="SUBMIT" name="SUBMIT" value="GO">
+
+ </td>
+ </tr> </form>
+</table></td>
+ </tr>
+ <tr>
+ <td bgcolor="#FF0000"><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">
+ <b><font size="1">STOCKS</font></b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#99FF99"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">Get Quote:</font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#99FF99" marginwidth=0 marginheight=0><form method=get action="http://r.wired.com/r/10020/http://stocks.wired.com/stocks_quotes.asp"><input type="TEXT" name="Symbol" size="12"> <input type="SUBMIT" name="submit" value="GO"></form></td>
+ </tr>
+<!-- BEGIN BUTTON ADS -->
+
+ <tr><td bgcolor="#CCFFCC">
+<font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">Financial Services</font><br>
+<center>
+<img src="http://static.wired.com/news/images/spacer.gif" height=3 width=5 alt=""><BR><img src="http://static.wired.com/news/images/button_ads_news10.gif" width="143" height="56" border="0" ALT="" USEMAP="#buttons" hspace=0 vspace=0>
+</center>
+
+<MAP NAME="buttons">
+ <AREA SHAPE="RECT" ALT="Datek" COORDS="0,0,69,24" HREF="http://r.wired.com/r/1649/http://ads16.focalink.com/SmartBanner/page/1266.631">
+ <AREA SHAPE="RECT" ALT="Wired Index Fund" COORDS="73,0,142,24" HREF="http://r.wired.com/r/227/http://www.gffunds.com/wired">
+ <AREA SHAPE="RECT" ALT="internet.com Index Fund" COORDS="73,31,142,55" HREF="http://r.wired.com/r/298/http://www.gffunds.com/isdex/">
+ <AREA SHAPE="RECT" ALT="GetSmart's MortgageFinder" COORDS="0,31,69,55" HREF="http://r.wired.com/r/294/http://www.getsmartinc.com/mortgage/HomeBanner?BANNERNAME=www.getsmartinc.com/mwired001m6075x25"></MAP>
+ </td>
+ </tr> <!-- END BUTTON ADS -->
+
+ <tr>
+ <td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="http://redirect.wired.com/redir/51/http://stocks.wired.com/">Today's Summary</a></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#CCFFCC"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="http://r.wired.com/r/hb_fin_r_wn_top/http://stocks.wired.com/stocks_indexes_detail.asp?Symbol=$WIRED">Wired Index</a> | <a href="http://redirect.wired.com/redir/52/http://stocks.wired.com/stocks_indexes.asp ">All Indexes</a></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#99FF99"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000"><a href="http://redirect.wired.com/redir/53/http://stocks.wired.com/stocks_portfolios.asp">Portfolios</a></font></td>
+ </tr>
+
+<!-- BEGIN B&N spot -->
+
+<tr>
+ <td bgcolor="#FF0000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>FIND A BOOK</b></font></td>
+</tr>
+<tr><td bgcolor="#CCFFCC">
+<table cellspacing="0" cellpadding="0" border=0 width=145>
+ <tr><td bgcolor="#CCFFCC">
+ <form action="http://r.wired.com/r/wn_nav_c_bn/http://barnesandnoble.bfast.com/booklink/click">
+<input type="hidden" name="sourceid" value="383471">
+<input type=hidden name="categoryid" value="categorydropdown">
+ <font size="2">
+ <select name="Subjects" size=4>
+<option value="301">Business Top 20
+<option value="500">Computers
+<option value="503">Computer Games
+<option value="1604">Current Affairs
+<option value="511">Cyberculture
+<option value="510">Internet/Web
+<option value="303">Investing
+<option value="1606">Law
+<option value="513">Multimedia
+
+<option value="1605">Newsmakers
+<option value="1607">Politics/Govt.
+
+ <option value="315"> Web Business
+ <option value="2800"> Bargain Books
+
+<option value="4">Other
+
+
+
+
+
+ </select></font></td></tr>
+ <tr align=left valign=top>
+ <td valign="top" bgcolor="#CCFFCC"> <input type="submit" value="GO">
+
+<IMG SRC="http://barnesandnoble.bfast.com/booklink/serve?sourceid=383471&is_search=Y" border=0 align=top>
+<!--
+<IMG SRC="http://www.wired.com/partner/bn/trackingimg/ot_wn_nav_c_bn.gif" border=0 width=1 height=1 align=top>
+-->
+</td>
+
+ </tr>
+ <tr align=left valign=top>
+
+ <td align=left valign=top colspan="2" rowspan="1" bgcolor="#CCFFCC">
+<p>
+ <font size="1" face="Verdana, Arial, Helvetica, " color="#000000">Powered by <a href="http://r.wired.com/r/wn_nav_c_bn/http://barnesandnoble.bfast.com/booklink/click?sourceid=383471">barnesandnoble.com</a>
+ </font>
+<br clear=all>
+
+
+</td>
+ </tr> </form>
+ </table>
+
+</td></tr>
+ <!-- END B&N spot -->
+
+<!-- BEGIN MAGAZINE SPOT -->
+
+ <tr>
+ <td bgcolor="#000000"><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="1"><b>WIRED
+ MAGAZINE </b></font></td>
+ </tr>
+<tr>
+<td bgcolor="#FFFF99" align="CENTER">
+<font face="verdana, arial, helvetica, sans-serif" size="1">
+<b>
+<br>
+
+<a href="http://www.wired.com/wired/"><img src="http://static.wired.com/news/images/wiredcover.gif" width="91" height="109" border="0" alt="Wired Magazine"></a><br></b>
+
+Issue 7.11
+</font>
+</td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFF99" align="center">
+<font face="verdana, arial, helvetica, sans-serif" size="1">
+
+<a href="http://www.wired.com/wired/subscribe/special/79WN">Subscribe to Wired.<br>Special offer!</a>
+
+
+</font>
+</td>
+</tr>
+<!-- END MAGAZINE SPOT -->
+
+ <tr>
+ <td bgcolor="#000000">
+ <font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>HOTWIRED</b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#FFFF99"> <font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<a href="http://www.hotwired.com/">Frontdoor</a><br>
+<a href="http://www.hotwired.com/webmonkey/">Webmonkey</a><br>
+<a href="http://www.hotwired.com/webmonkey/guides/index.html">Webmonkey Guides</a><br>
+<a href="http://www.hotwired.com/rgb/">RGB Gallery</a><br>
+<a href="http://www.hotwired.com/animation/">Animation Express</a><br>
+<a href="http://go.suck.com/su_wnfd">Suck.com</a><br>
+</font></td>
+ </tr>
+
+ <tr>
+ <td bgcolor="#000000">
+ <font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>HOTBOT</b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#FFFF99"> <font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#000000">
+<a href="http://redirect.wired.com/redir/54/http://www.hotbot.com/">Search</a><br>
+<a href="http://shop.hotbot.com/">Shopping</a><br>
+</font></td>
+ </tr>
+
+ <tr><td>
+ <br>
+ <font face="Verdana, Arial, Helvetica, sans-serif" size="1">
+ <font face="Verdana, Arial, Helvetica, sans-serif" size="1">
+ Wired News <a href="/news/who/0,1362,,00.html">staff</a><br><br>
+
+ <!-- Wired News is <a href="http://www.wired.com/news/jobs.html">hiring</a><br><br> -->
+
+ <b><a href="/news/feedback/0,1364,,00.html">Contact us</a></b></font>
+
+
+ <br><br>
+
+ <font face="Verdana, Arial, Helvetica, sans-serif" size="1">Wired News delivered<br>by <a href="/news/palmpilot/0,1365,,00.html">PalmPilot</a>,<br><a href="http://www.hotwired.com/email/signup/wn_outlook.html">Outlook Express</a>,<br><a href="http://redirect.wired.com/redir/55/http://form.netscape.com/ibd/html/ibd_frameset.html">In-Box Direct</a>,<br>
+or <a href="/news/pointcast/0,1366,,00.html">PointCast</a></font><br>
+
+<!-- TRACKING -->
+<img src="http://www.wired.com/special/modx/news.gif" height=1 width=1 alt="">
+</td>
+ </tr>
+
+</table>
+
+<!-- end lower left side Navigation -->
+<!-- CONTENT TABLE -->
+
+<TABLE border="0" width="447" cellspacing="0" cellpadding="0" bordercolor="#66FF00">
+ <TR>
+ <TD valign="TOP" align="LEFT" rowspan="2">
+ <img src="http://static.wired.com/news/images/spacer.gif" height=1 width=15 alt=""><BR>
+ </TD>
+ <TD colspan="3" valign="TOP" align="LEFT"><img src="http://static.wired.com/news/images/spacer.gif" height=7 width=432 alt=""><BR>
+
+
+<!-- SQL query for Package here -->
+
+<font face="Verdana, Arial, Geneva, sans-serif" size=2><b><i>Nomad's Land</i></b></font><br><img src="http://static.wired.com/news/images/pix155.gif" height=10 width=155 alt=""><br><!-- IBD_SUBJECT: Homeless, but ID'd, in Seattle --><font face="Arial, Helvetica, sans-serif" size=5><b><a href="/news/politics/0,1283,31911,00.html">Homeless, but ID'd, in Seattle</a></b></font><br><font size=1 face="Verdana, Arial, Geneva, sans-serif" color=#FF0000>8:15 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The city council approves a plan to track the homeless by a numbering system, saying it'll improve services. The implications worry privacy advocates, naturally. By Craig Bicknell.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/politics/0,1283,,00.html">in Politics</a></i></font><br><table bgcolor="#F0F0F0" cellpadding="0" cellspacing="0" border="0" width="147" align="RIGHT">
+ <!-- Commentary Frag Begin -->
+ <TR>
+ <TD bgcolor="#000000"> </TD>
+ <TD bgcolor="#000000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>HITS & MISC.</b></font></TD>
+ </TR>
+ <tr>
+ <TD> </TD>
+ <td><img src="http://static.wired.com/news/images/spacer.gif" height=5 width=5 alt=""><br>
+
+ <font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/commentarySection/0,1292,31664,00.html">Calendar of E-Vents</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Ongoing goings-on. </font><br><br><font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/commentarySection/0,1292,31926,00.html">Rants & Raves</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br> </td>
+ </tr>
+<!-- Commentary Frag End -->
+<tr>
+<td align="left" bgcolor="#000000"> </td>
+<td bgcolor="#000000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>CURRENT HOO-HA</b></font></td>
+</tr>
+
+<tr>
+<td> </td>
+<td>
+<img src="http://static.wired.com/news/images/spacer.gif" height=5 width=5 alt="">
+<br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/mp3/0,1285,,00.html">MP3 Rocks the Web</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Download the sound. <br><i>Sponsored by <a href="http://r.hotwired.com/r/wn_fd_mp3_r_mscm_txt/http://webfarm.mediaplex.com/click_thru_request/164-1361b-1052" style="text-decoration:none"><font color="#000000">Musicmaker</font></a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/wireless/0,1382,,00.html">The Wireless World</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Networking gets unplugged. <br><i>Sponsored by <a href="http://www.ericsson.se/get/internet/default.shtml" style="text-decoration:none"><font color="#000000">Ericsson</font></a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/digiwood/0,1412,,00.html">Digital Hollywood</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">The buzz of tech.</font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/ipo/0,1350,,00.html">IPO Outlook</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Deals in the pipeline. <br><i>Sponsored by <a href="http://r.hotwired.com/r/wn_ipo_r_sun_txt/http://sun.com/ads/smi/brand/hotwired.html" style="text-decoration:none"><font color="#000000">Sun</font></a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/ebiz/0,1272,,00.html">E-Biz</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Business unusual. <br><i>Sponsored by <a href="http://r.wired.com/r/wn_fd_r_ebiz_ibm_txt/http://www.ibm.com" style="text-decoration:none"><font color="#000000">IBM</font></a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/medtech/0,1286,,00.html">Med-Tech Center</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">From the bleeding edge.<br><i>Sponsored by WebMD</i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/linux/0,1411,,00.html">The Linux Effect</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Not just for geeks.</font><br><br> <img src="http://static.wired.com/news/images/spacer.gif" height=7 width=5 alt=""><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/exec/0,1370,,00.html">Executive Summary</a></b></font><br><font size=1 face="Arial, Helvetica, sans-serif" color="#000000">CEOs, COOs, CIOs unite. <br><i>Sponsored by <a href="http://r.wired.com/r/wn_exec_r_vign/http://www.vignette.com/" style="text-decoration:none"><font color="#000000">Vignette</a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/school/0,1383,,00.html">Making the Grade</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Reading, writing, and ROM. <br><i>Sponsored by <a href="http://r.hotwired.com/r/wn_sch_r_nav_uop/http://ads25.focalink.com/SmartBanner/page?12630.53" style="text-decoration:none"><font color="#000000">U of Phoenix</font></a></i></font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/infostructure/0,1377,,00.html">Infostructure</a></b></font><br><font size=1 face="Arial, Helvetica, sans-serif" color="#000000">An IS/IT resource <br><i>Sponsored by <a href="http://r.wired.com/r/wn_is_r_ssec/http://ad.doubleclick.net/clk;653163;3599571;s?http://www.sprintbiz.com/s
+ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE=
+wired.com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a></i></font</font><br><br>
+
+<font size=2 face="Arial,Helvetica, sans-serif"><b><a href="/news/y2k/0,1360,,00.html">Y2K Watch</a></b></font><br><font size=2 face="Arial, Helvetica, sans-serif"><font size=1 face="Arial, Geneva, sans-serif" color="#000000">Tick... Tick... Tick...</font><br><br>
+
+<font face="Arial, Helvetica, sans-serif" size=2><b><i><a href="/news/special_reports/1,1293,,00.html">More Hoo-Ha</a></i></b></font><br> <br>
+
+</td>
+</tr>
+<!-- start of Gen News -->
+ <tr>
+ <td bgcolor="#000000"> </td>
+ <td bgcolor="#000000"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF"><b>MEANWHILE...</b></font></td>
+ </tr>
+
+ <tr>
+ <td> </td>
+ <td align="left" valign="top">
+ <img src="http://static.wired.com/news/images/spacer.gif" height=5 width=5 alt=""><br>
+
+
+<!-- 31942 -->
+<font size="2" face="Arial, Helvetica, sans-serif" color="#000000"><b>Führer Furor</b></font><br><font size="1" face="Arial, Geneva, sans-serif" color="#000000"><p>
+Contruction workers in Berlin opened an old wound in the German psyche this week when they accidentally stumbled across Adolf Hitler's bunker while excavating near the Brandenburg Gate. The bunker, just south of the Gate, was where Hitler and his closest associates barricaded themselves as the Red Army approached Berlin in the waning days of World War II. It is also where the Führer and his bride, Eva Braun, committed suicide rather than fall into the hands of the Russians. Although the bunker's location has never been a mystery, it has been sealed off since the end of the war to keep neo-Nazis from turning it into a shrine.
+<br><li>More from <a
+href="http://www.lycos.com/news/flash/hitlerbunker.html?v=wn1015&lpv=1">Lycos</a></font><br><br>
+ </td>
+ </tr>
+<!-- end of Gen News -->
+</table>
+
+
+<font size="1"> <br></font>
+
+<br>
+
+<font face="Verdana, Arial, Geneva, sans-serif" size=2><b><i>Other Top Stories</i></b></font><br>
+<img src="http://static.wired.com/news/images/pix155.gif" height=10 width=155 alt=""><br>
+
+<!-- SQL query here -->
+<!-- IBD_SUBJECT:Wall Street Keeps Reeling --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/reuters/0,1349,31934,00.html">Wall Street Keeps Reeling</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>10:15 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The Dow and Nasdaq suffer sizeable losses during the first half of Friday trading. Why? Wholesale prices are the highest this decade, and Greenspan is concerned about stock prices.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/reuters/0,1349,,00.html">in Reuters</a></i></font><br><br><!-- IBD_SUBJECT:The Market's Madness --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/reuters/0,1349,31935,00.html">The Market's Madness</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>9:10 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The bulls and the bears are in the midst of a Battle Royale, and all this turbulence is not a healthy thing. So say the experts.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/reuters/0,1349,,00.html">in Reuters</a></i></font><br><br><!-- IBD_SUBJECT:'Want a Loan? What's Your Race?' --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/politics/0,1283,31533,00.html">'Want a Loan? What's Your Race?'</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The Federal Reserve is in the middle of changing banking regulations to let banks collect data on the race, sex, religion, and national origin of their customers. By Declan McCullagh. </font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/politics/0,1283,,00.html">in Politics</a></i></font><br><br><!-- IBD_SUBJECT:Music Regs: A Bagful of Noise --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/business/0,1367,31832,00.html">Music Regs: A Bagful of Noise</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The struggle to come up with a digital music standard that would minimize download piracy is pushing right up against the holiday gift-giving season. By Jennifer Sullivan.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/business/0,1367,,00.html">in Business</a></i></font><br><br><!-- IBD_SUBJECT:Can't Beat 'Em? Green 'Em --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/technology/0,1282,31927,00.html">Can't Beat 'Em? Green 'Em</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>High-tech companies are notoriously environmentally unfriendly, and a growing number of "Greenies" are trying to change things from the inside ... with varying results. By Chris Gaither.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/technology/0,1282,,00.html">in Technology</a></i></font><br><br><!-- IBD_SUBJECT:Y2K Cloud Over MS Office --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/business/0,1367,31932,00.html">Y2K Cloud Over MS Office</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>Windows NT sales remain strong, but corporate clients are wary of upgrading to MS Office 2000. Analysts say that means strong, but not stunning, Microsoft earnings. </font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/business/0,1367,,00.html">in Business</a></i></font><br><br><font color=#FF0000 face="Verdana, Arial, Geneva, sans-serif" size=1>Med-Tech</font><br><!-- IBD_SUBJECT:Biochips for Custom Chemo --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/technology/0,1282,31914,00.html">Biochips for Custom Chemo</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>Different cancer patients need different medicine, but doctors can rarely determine the best match. New biochip technology promises chemotherapy tailored to a tumor's genetic make-up. By Kristen Philipkoski.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/technology/0,1282,,00.html">in Technology</a></i></font><br><br><!-- IBD_SUBJECT:High Stakes in Priceline Suit --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/business/0,1367,31916,00.html">High Stakes in Priceline Suit</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>It's not just another round of Redmond-bashing. A Priceline.com lawsuit against Microsoft's Expedia.com may have a big impact on how Net companies protect their business models. By Joanna Glasner.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/business/0,1367,,00.html">in Business</a></i></font><br><br><!-- IBD_SUBJECT:Biodiversity Merges Online --><font face="Arial, Helvetica, sans-serif" size=3><b><a href="/news/technology/0,1282,31918,00.html">Biodiversity Merges Online</a></b></font><br><font color=#ff0000 face="Verdana, Arial, Geneva, sans-serif" size=1>3:00 a.m.</font> <font face="Verdana, Arial, Geneva, sans-serif" size=2>The far-flung databases on global biodiversity get together to form one monster database. Soon the red-eyed tree frog will be eyeing those Swedish lingonberries. From the Environment News Service.</font><br><font face="Verdana, Arial, Helvetica, sans-serif" size=1><i><a href="/news/technology/0,1282,,00.html">in Technology</a></i></font><br><br><!-- SQL above -->
+
+
+
+<!------TRADES--------->
+<br>
+<font face= "Verdana, Arial, Geneva, sans-serif" size=2><b><i>Elsewhere Today</i></b></font><br>
+<img src="http://static.wired.com/news/images/pix155.gif" height=10 width=155 alt=""><br>
+
+<!-- SQL query here -->
+<font face="helvetica, arial" size=3><b><a href="http://www.thestandard.com/articles/display/0,1449,6975,00.html?home.tf">FCC: Hands-Off on Broadband</a></b></font><br><font face="geneva, arial" size=2><cite>The Industry Standard</cite></font><br><br><font face="helvetica, arial" size=3><b><a href="http://news.lycos.com/stories/TopNews/19991014RTNEWS-ARMS-TREATY.asp">White House Lashes Out on Treaty</a></b></font><br><font face="geneva, arial" size=2>Lycos</font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.pathfinder.com/time/magazine/articles/0,3266,32207,00.html">Steve Jobs at 44</a></b></font><br><font face="geneva, arial" size=2><cite>Time</cite></font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.zdnet.com/zdnn/stories/news/0,4586,2353608,00.html">Computers May Run on Gas</a></b></font><br><font face="geneva, arial" size=2>ZDNN</font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.nytimes.com/library/tech/99/10/biztech/articles/14free.html">Much Is Free in the Wired World</a></b></font><br><font face="geneva, arial" size=2><cite>The New York Times</cite> (Registration Required)</font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.usatoday.com/life/cyber/nb/nb4.htm">Melissa: I'm Baaaack</a></b></font><br><font face="geneva, arial" size=2><cite>USA Today</cite></font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.msnbc.com/news/322926.asp">Domain Owners Surrender Privacy</a></b></font><br><font face="geneva, arial" size=2>MSNBC</font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.washingtonpost.com/wp-srv/business/longterm/tech/techthursday/download/download.htm">Dividing to Conquer in VC Game</a></b></font><br><font face="geneva, arial" size=2><cite>The Washington Post</cite></font><br><br><font face="helvetica, arial" size=3><b><a href="http://www.salon.com/tech/books/1999/10/14/redhat_book/index.html">The Red Hat Diaries</a></b></font><br><font face="geneva, arial" size=2>Salon</font><br><br><font face="helvetica, arial" size=3><b><a href="http://news.bbc.co.uk/hi/english/sci/tech/newsid_473000/473856.stm">Screensaver to Predict Climate</a></b></font><br><font face="geneva, arial" size=2>BBC News</font><br><br><!-- SQL above -->
+
+
+
+<!-- - - - - - - - - - - - - -->
+
+ </TD>
+ </TR>
+
+ <TR>
+ <TD valign="TOP" align="LEFT">
+
+ <img src="http://static.wired.com/news/images/spacer.gif" height=1 width=280 alt=""><BR>
+
+ <!-- FOOTER -->
+
+<br><img src="http://static.wired.com/news/images/pix155.gif" height=10 width=155 border=0 usemap="#navstrip.map" alt="">
+<br>
+
+<img src="http://static.wired.com/news/images/navstrip_off.gif" height=17 width=126 usemap="#navstrip.map" border=0 alt=""><br><br>
+
+<p><font face="Verdana, Arial, Geneva, sans-serif" size=1>
+<a href="http://www.wired.com/news/feedback.html">Send us feedback</a>
+ |
+<a href="http://www.hotwired.com/jobs/">Work at Wired Digital</a>
+ |
+<a href="http://home.wired.com/advertising/">Advertise with us</a>
+<br>
+<a href="http://home.wired.com/">About Wired Digital</a>
+ |
+<a href="http://www.wired.com/home/digital/privacy/">Our Privacy Policy</a></font>
+
+
+<p><font face="Verdana, Arial, Geneva" size=1><a href="http://www.wired.com/home/copyright.html">Copyright</a> © 1994-99 Wired Digital Inc. All rights reserved.</font>
+
+<br>
+<!-- TRACKING -->
+<img src="http://www.wired.com/special/modx/news.gif" height=1 width=1 alt="">
+
+<MAP NAME="navstrip.map">
+<AREA SHAPE=rect COORDS="0,0,14,16" HREF="/news">
+<AREA SHAPE=rect COORDS="15,0 31,16" HREF="/news/business/">
+<AREA SHAPE=rect COORDS="32,0,48,16" HREF="/news/culture/">
+<AREA SHAPE=rect COORDS="49,0,65,16" HREF="/news/technology/">
+<AREA SHAPE=rect COORDS="66,0,83,16" HREF="/news/politics/">
+</MAP>
+ </TD>
+ <TD valign="TOP" align="LEFT">
+ <img src="http://static.wired.com/news/images/spacer.gif" height=1 width=5 alt="">
+ </TD>
+ <TD valign="TOP" align="LEFT">
+ </TD>
+ </TR>
+</TABLE>
+
+
+<br>
+</body>
+</html>
+
diff --git a/test/ent8 b/test/ent8
new file mode 100644
index 0000000..5eeccf2
--- /dev/null
+++ b/test/ent8
@@ -0,0 +1,9 @@
+<!DOCTYPE doc [
+<!ENTITY test1 "test 1">
+<!ENTITY test2 "test 2">
+]>
+<doc>
+ <Content>Retenção</Content>
+ <Content><></Content>
+ <Content>&test1;&test2;</Content>
+</doc>
diff --git a/tree.c b/tree.c
index 3a06dfa..b5d9155 100644
--- a/tree.c
+++ b/tree.c
@@ -684,7 +684,7 @@
while (node != NULL) {
if (node->type == XML_TEXT_NODE) {
- if (inLine)
+ if ((inLine) || (doc->type == XML_HTML_DOCUMENT_NODE))
ret = xmlStrcat(ret, node->content);
else {
xmlChar *buffer;
diff --git a/xmlmemory.h b/xmlmemory.h
index d28b526..78ff392 100644
--- a/xmlmemory.h
+++ b/xmlmemory.h
@@ -8,7 +8,7 @@
#ifndef _DEBUG_MEMORY_ALLOC_
#define _DEBUG_MEMORY_ALLOC_
-#define NO_DEBUG_MEMORY
+/* #define NO_DEBUG_MEMORY */
#ifdef NO_DEBUG_MEMORY
#ifdef HAVE_MALLOC_H