c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG FIXED #2784 HTML parsing/output improvements Rebuilt, updated the docs

Browse Source 
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
This commit is contained in:
Daniel Veillard 1999-10-25 13:15:52 +00:00
parent 7c1206fc06
commit 3500838f65
31 changed files with 4287 additions and 1348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -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

38
HTMLparser.c
View File

@ -318,8 +318,10 @@ char *htmlStartClose[] = {
"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 @@ htmlParseComment(htmlParserCtxtPtr ctxt, int create) {
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 @@ htmlParseContent(htmlParserCtxtPtr ctxt) {
}
if (test == CUR_PTR) {
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 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
/*
* 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;
}
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 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
/*
* Time to start parsing the tree itself
*/
htmlParseElement(ctxt);
htmlParseContent(ctxt);
/*
* SAX: end of the document processing.
@ -2538,6 +2539,9 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
{
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 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
ctxt->replaceEntities = 0;
ctxt->html = 1;
ctxt->record_info = 0;
ctxt->validate = 0;
xmlInitNodeInfoSeq(&ctxt->node_seq);
}
@ -2758,6 +2763,7 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
inputStream->line = 1;
inputStream->col = 1;
inputStream->buf = buf;
inputStream->directory = NULL;
inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content;

2
HTMLtree.c
View File

@ -250,7 +250,7 @@ htmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur) {
if (cur->intSubset != NULL)
htmlDtdDump(buf, cur);
if (cur->root != NULL) {
htmlNodeDump(buf, cur, cur->root);
htmlNodeListDump(buf, cur, cur->root);
}
xmlBufferWriteChar(buf, "\n");
}

15
Makefile.am
View File

@ -85,14 +85,13 @@ HTMLtests : testHTML
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 ; \
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 @@ Validtests : tester
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 @@ EXTRA_DIST = xmlConf.sh.in
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' \

6
SAX.c
View File

@ -811,6 +811,12 @@ characters(void *ctx, const xmlChar *ch, int len)
* 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);

37
SAXresult/ent8 Normal file
View File

@ -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

2
configure.in
View File

@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
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

80
doc/html/book1.html
View File

@ -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 @@ NAME="AEN2"
></TH
></TR
></TABLE
><H3
CLASS="AUTHOR"
>Daniel Veillard</H3
><DIV
CLASS="AFFILIATION"
><DIV
CLASS="ADDRESS"
><P
CLASS="LITERALLAYOUT"
> &nbsp;&nbsp;&nbsp;&nbsp;Daniel.Veillard@w3.org<br>
&nbsp;&nbsp;</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 @@ CLASS="TOC"
></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 @@ HREF="gnome-xml-xpath.html"
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanohttp.html"
>nanohttp</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-parserinternals.html"
>parserInternals</A
> &#8212; </DT
@ -103,11 +166,6 @@ HREF="gnome-xml-parserinternals.html"
HREF="gnome-xml-xmlmemory.html"
>xmlmemory</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanohttp.html"
>nanohttp</A
> &#8212; </DT
></DL
></DD
></DL
@ -155,7 +213,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="libxml.html"
HREF="libxml-notes.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -177,7 +235,7 @@ ALIGN="right"
COLOR="#FFFFFF"
SIZE="3"
><B
>Gnome XML Library</B
>Libxml Programming Notes</B
></FONT
></TD
></TR

168
doc/html/gnome-xml-entities.html
View File

@ -9,8 +9,8 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN4122"
NAME="AEN4236"
></A
><H2
>Name</H2
@ -123,7 +123,7 @@ NAME="AEN4122"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN4125"
NAME="AEN4239"
></A
><H2
>Synopsis</H2
@ -344,7 +344,7 @@ HREF="gnome-xml-entities.html#XMLENTITIESTABLEPTR"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN4182"
NAME="AEN4296"
></A
><H2
>Description</H2
@ -354,14 +354,14 @@ NAME="AEN4182"
><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 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XML_INTERNAL_GENERAL_ENTITY</PRE
>#define XML_INTERNAL_GENERAL_ENTITY 1</PRE
></TD
></TR
></TABLE
@ -387,7 +387,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4192"
NAME="AEN4306"
></A
><H3
><A
@ -403,7 +403,7 @@ CELLPADDING="6"
><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 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4197"
NAME="AEN4311"
></A
><H3
><A
@ -429,7 +429,7 @@ CELLPADDING="6"
><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 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4202"
NAME="AEN4316"
></A
><H3
><A
@ -455,7 +455,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XML_INTERNAL_PARAMETER_ENTITY</PRE
>#define XML_INTERNAL_PARAMETER_ENTITY 4</PRE
></TD
></TR
></TABLE
@ -465,7 +465,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4207"
NAME="AEN4321"
></A
><H3
><A
@ -481,7 +481,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XML_EXTERNAL_PARAMETER_ENTITY</PRE
>#define XML_EXTERNAL_PARAMETER_ENTITY 5</PRE
></TD
></TR
></TABLE
@ -491,7 +491,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4212"
NAME="AEN4326"
></A
><H3
><A
@ -507,7 +507,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XML_INTERNAL_PREDEFINED_ENTITY</PRE
>#define XML_INTERNAL_PREDEFINED_ENTITY 6</PRE
></TD
></TR
></TABLE
@ -517,20 +517,33 @@ CLASS="PROGRAMLISTING"
><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 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XML_MIN_ENTITIES_TABLE</PRE
>#define XML_MIN_ENTITIES_TABLE 32</PRE
></TD
></TR
></TABLE
@ -556,20 +569,33 @@ CLASS="PROGRAMLISTING"
><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 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document</TD
></TR
><TR
><TD
@ -656,7 +682,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -673,7 +699,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity type XML_xxx_yyy_ENTITY</TD
></TR
><TR
><TD
@ -690,7 +716,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity external ID if available</TD
></TR
><TR
><TD
@ -707,7 +733,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity system ID if available</TD
></TR
><TR
><TD
@ -724,7 +750,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity content</TD
></TR
></TABLE
><P
@ -734,7 +760,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4270"
NAME="AEN4386"
></A
><H3
><A
@ -804,7 +830,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document</TD
></TR
><TR
><TD
@ -821,7 +847,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -838,7 +864,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity type XML_xxx_yyy_ENTITY</TD
></TR
><TR
><TD
@ -855,7 +881,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity external ID if available</TD
></TR
><TR
><TD
@ -872,7 +898,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity system ID if available</TD
></TR
><TR
><TD
@ -889,7 +915,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity content</TD
></TR
></TABLE
><P
@ -899,7 +925,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4310"
NAME="AEN4426"
></A
><H3
><A
@ -955,7 +981,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -970,7 +996,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>NULL if not, othervise the entity</TD
></TR
></TABLE
><P
@ -980,7 +1006,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4331"
NAME="AEN4447"
></A
><H3
><A
@ -1042,7 +1068,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document referencing the entity</TD
></TR
><TR
><TD
@ -1059,7 +1085,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -1074,7 +1100,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@ -1084,7 +1110,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4357"
NAME="AEN4473"
></A
><H3
><A
@ -1145,7 +1171,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document referencing the entity</TD
></TR
><TR
><TD
@ -1162,7 +1188,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -1177,7 +1203,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@ -1187,7 +1213,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4383"
NAME="AEN4499"
></A
><H3
><A
@ -1248,7 +1274,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document referencing the entity</TD
></TR
><TR
><TD
@ -1265,7 +1291,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -1280,7 +1306,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>A pointer to the entity structure or NULL if not found.</TD
></TR
></TABLE
><P
@ -1290,7 +1316,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4409"
NAME="AEN4525"
></A
><H3
><A
@ -1357,7 +1383,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document containing the string</TD
></TR
><TR
><TD
@ -1374,7 +1400,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> A string to convert to XML.</TD
></TR
><TR
><TD
@ -1389,7 +1415,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>A newly allocated string with the substitution done.</TD
></TR
></TABLE
><P
@ -1399,7 +1425,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4437"
NAME="AEN4553"
></A
><H3
><A
@ -1465,7 +1491,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document containing the string</TD
></TR
><TR
><TD
@ -1482,7 +1508,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> A string to convert to XML.</TD
></TR
><TR
><TD
@ -1497,7 +1523,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>A newly allocated string with the substitution done.</TD
></TR
></TABLE
><P
@ -1507,7 +1533,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4464"
NAME="AEN4580"
></A
><H3
><A
@ -1558,7 +1584,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the xmlEntitiesTablePtr just created or NULL in case of error.</TD
></TR
></TABLE
><P
@ -1568,7 +1594,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4480"
NAME="AEN4596"
></A
><H3
><A
@ -1624,7 +1650,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> An entity table</TD
></TR
><TR
><TD
@ -1639,7 +1665,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the new xmlEntitiesTablePtr or NULL in case of error.</TD
></TR
></TABLE
><P
@ -1649,7 +1675,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4501"
NAME="AEN4617"
></A
><H3
><A
@ -1702,7 +1728,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> An entity table</TD
></TR
></TABLE
><P
@ -1712,7 +1738,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN4517"
NAME="AEN4633"
></A
><H3
><A
@ -1769,7 +1795,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> An XML buffer.</TD
></TR
><TR
><TD
@ -1786,7 +1812,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> An entity table</TD
></TR
></TABLE
><P
@ -1847,7 +1873,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"

222
doc/html/gnome-xml-htmlparser.html
View File

@ -9,8 +9,8 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN6107"
NAME="AEN6306"
></A
><H2
>Name</H2
@ -123,7 +123,7 @@ NAME="AEN6107"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN6110"
NAME="AEN6309"
></A
><H2
>Synopsis</H2
@ -277,7 +277,7 @@ HREF="gnome-xml-htmlparser.html#HTMLPARSEFILE"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6148"
NAME="AEN6347"
></A
><H2
>Description</H2
@ -287,131 +287,248 @@ NAME="AEN6148"
><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 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> The tag name</TD
></TR
><TR
><TD
@ -482,7 +599,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the related htmlElemDescPtr or NULL if not found.</TD
></TR
></TABLE
><P
@ -492,7 +609,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6210"
NAME="AEN6418"
></A
><H3
><A
@ -550,7 +667,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the entity name</TD
></TR
><TR
><TD
@ -565,7 +682,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
></TR
></TABLE
><P
@ -575,7 +692,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6232"
NAME="AEN6440"
></A
><H3
><A
@ -637,7 +754,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an HTML parser context</TD
></TR
><TR
><TD
@ -654,7 +771,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> location to store the entity name</TD
></TR
><TR
><TD
@ -669,7 +786,8 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</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 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6259"
NAME="AEN6467"
></A
><H3
><A
@ -738,7 +856,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an HTML parser context</TD
></TR
><TR
><TD
@ -753,7 +871,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the value parsed (as an int)</TD
></TR
></TABLE
><P
@ -763,7 +881,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6281"
NAME="AEN6489"
></A
><H3
><A
@ -820,7 +938,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an HTML parser context</TD
></TR
></TABLE
><P
@ -830,7 +948,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6299"
NAME="AEN6507"
></A
><H3
><A
@ -894,7 +1012,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@ -911,7 +1029,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@ -928,7 +1046,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the SAX handler block</TD
></TR
><TR
><TD
@ -945,7 +1063,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> if using SAX, this pointer will be provided on callbacks. </TD
></TR
><TR
><TD
@ -960,7 +1078,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the resulting document tree</TD
></TR
></TABLE
><P
@ -970,7 +1088,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6333"
NAME="AEN6541"
></A
><H3
><A
@ -1027,7 +1145,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a pointer to an array of xmlChar</TD
></TR
><TR
><TD
@ -1044,7 +1162,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@ -1059,7 +1177,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the resulting document tree</TD
></TR
></TABLE
><P
@ -1069,7 +1187,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6358"
NAME="AEN6566"
></A
><H3
><A
@ -1131,7 +1249,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the filename</TD
></TR
><TR
><TD
@ -1148,7 +1266,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@ -1165,7 +1283,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the SAX handler block</TD
></TR
><TR
><TD
@ -1182,7 +1300,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> if using SAX, this pointer will be provided on callbacks. </TD
></TR
><TR
><TD
@ -1197,7 +1315,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the resulting document tree</TD
></TR
></TABLE
><P
@ -1207,7 +1325,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6391"
NAME="AEN6599"
></A
><H3
><A
@ -1262,7 +1380,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the filename</TD
></TR
><TR
><TD
@ -1279,7 +1397,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> a free form C string describing the HTML document encoding, or NULL</TD
></TR
><TR
><TD
@ -1294,7 +1412,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the resulting document tree</TD
></TR
></TABLE
><P
@ -1355,7 +1473,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"

50
doc/html/gnome-xml-htmltree.html
View File

@ -9,8 +9,8 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN6420"
NAME="AEN6628"
></A
><H2
>Name</H2
@ -123,7 +123,7 @@ NAME="AEN6420"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN6423"
NAME="AEN6631"
></A
><H2
>Synopsis</H2
@ -188,7 +188,7 @@ HREF="gnome-xml-tree.html#XMLDOCPTR"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6437"
NAME="AEN6645"
></A
><H2
>Description</H2
@ -198,14 +198,14 @@ NAME="AEN6437"
><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 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define HTML_TEXT_NODE</PRE
>#define HTML_TEXT_NODE XML_TEXT_NODE</PRE
></TD
></TR
></TABLE
@ -231,7 +231,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6447"
NAME="AEN6655"
></A
><H3
><A
@ -247,7 +247,7 @@ CELLPADDING="6"
><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 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6452"
NAME="AEN6660"
></A
><H3
><A
@ -273,7 +273,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define HTML_COMMENT_NODE</PRE
>#define HTML_COMMENT_NODE XML_COMMENT_NODE</PRE
></TD
></TR
></TABLE
@ -283,7 +283,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6457"
NAME="AEN6665"
></A
><H3
><A
@ -342,7 +342,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document</TD
></TR
><TR
><TD
@ -359,7 +359,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> OUT: the memory pointer</TD
></TR
><TR
><TD
@ -376,7 +376,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> OUT: the memory lenght</TD
></TR
></TABLE
><P
@ -386,7 +386,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6482"
NAME="AEN6690"
></A
><H3
><A
@ -443,7 +443,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the FILE*</TD
></TR
><TR
><TD
@ -460,7 +460,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document</TD
></TR
></TABLE
><P
@ -470,7 +470,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6503"
NAME="AEN6711"
></A
><H3
><A
@ -524,7 +524,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the filename</TD
></TR
><TR
><TD
@ -541,7 +541,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the document</TD
></TR
><TR
><TD
@ -556,7 +556,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the number of byte written or -1 in case of failure.</TD
></TR
></TABLE
><P
@ -617,7 +617,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"

99
doc/html/gnome-xml-nanohttp.html
View File

@ -9,11 +9,14 @@ REL="HOME"
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 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="left"
><A
HREF="gnome-xml-xmlmemory.html"
HREF="gnome-xml-xpath.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -79,7 +82,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -94,7 +97,16 @@ SIZE="3"
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
>&nbsp;</TD
><A
HREF="gnome-xml-parserinternals.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>Next Page &#62;&#62;&#62;</B
></FONT
></A
></TD
></TR
></TABLE
></DIV
@ -103,7 +115,7 @@ ALIGN="right"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN9064"
NAME="AEN7008"
></A
><H2
>Name</H2
@ -111,7 +123,7 @@ NAME="AEN9064"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN9067"
NAME="AEN7011"
></A
><H2
>Synopsis</H2
@ -130,7 +142,8 @@ int <A
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 @@ HREF="gnome-xml-nanohttp.html#XMLNANOHTTPCLOSE"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN9077"
NAME="AEN7021"
></A
><H2
>Description</H2
@ -180,14 +193,14 @@ NAME="AEN9077"
><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 @@ CELLPADDING="6"
><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 @@ VALIGN="TOP"
WIDTH="20%"
ALIGN="RIGHT"
VALIGN="TOP"
><TT
CLASS="PARAMETER"
><I
>contentType</I
></TT
>&nbsp;:</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 @@ if provided must be freed by the caller</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9105"
NAME="AEN7053"
></A
><H3
><A
@ -421,7 +453,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9137"
NAME="AEN7085"
></A
><H3
><A
@ -501,7 +533,7 @@ returned at that location</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9156"
NAME="AEN7104"
></A
><H3
><A
@ -576,7 +608,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9175"
NAME="AEN7123"
></A
><H3
><A
@ -699,7 +731,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9204"
NAME="AEN7152"
></A
><H3
><A
@ -751,7 +783,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the HTTP context</TD
></TR
><TR
><TD
@ -793,7 +825,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9227"
NAME="AEN7175"
></A
><H3
><A
@ -867,7 +899,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="left"
><A
HREF="gnome-xml-xmlmemory.html"
HREF="gnome-xml-xpath.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -905,7 +937,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -920,7 +952,16 @@ SIZE="3"
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
>&nbsp;</TD
><A
HREF="gnome-xml-parserinternals.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>Next Page &#62;&#62;&#62;</B
></FONT
></A
></TD
></TR
><TR
><TD
@ -930,13 +971,19 @@ ALIGN="left"
COLOR="#FFFFFF"
SIZE="3"
><B
>xmlmemory</B
>xpath</B
></FONT
></TD
><TD
COLSPAN="2"
ALIGN="right"
>&nbsp;</TD
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>parserInternals</B
></FONT
></TD
></TR
></TABLE
></DIV

774
doc/html/gnome-xml-parser.html
View File

File diff suppressed because it is too large Load Diff

476
doc/html/gnome-xml-parserinternals.html
View File

File diff suppressed because it is too large Load Diff

864
doc/html/gnome-xml-tree.html
View File

File diff suppressed because it is too large Load Diff

793
doc/html/gnome-xml-valid.html
View File

File diff suppressed because it is too large Load Diff

58
doc/html/gnome-xml-xml-error.html
View File

@ -9,8 +9,8 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN5953"
NAME="AEN6152"
></A
><H2
>Name</H2
@ -123,7 +123,7 @@ NAME="AEN5953"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN5956"
NAME="AEN6155"
></A
><H2
>Synopsis</H2
@ -187,7 +187,7 @@ HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN5968"
NAME="AEN6167"
></A
><H2
>Description</H2
@ -197,14 +197,14 @@ NAME="AEN5968"
><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 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN5978"
NAME="AEN6177"
></A
><H3
><A
@ -394,7 +394,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an XML parser context</TD
></TR
><TR
><TD
@ -411,7 +411,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the message to display/transmit</TD
></TR
><TR
><TD
@ -428,7 +428,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> extra parameters for the message display</TD
></TR
></TABLE
><P
@ -438,7 +438,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6001"
NAME="AEN6200"
></A
><H3
><A
@ -491,7 +491,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an XML parser context</TD
></TR
><TR
><TD
@ -508,7 +508,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the message to display/transmit</TD
></TR
><TR
><TD
@ -525,7 +525,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> extra parameters for the message display</TD
></TR
></TABLE
><P
@ -535,7 +535,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6024"
NAME="AEN6223"
></A
><H3
><A
@ -588,7 +588,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an XML parser context</TD
></TR
><TR
><TD
@ -605,7 +605,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the message to display/transmit</TD
></TR
><TR
><TD
@ -622,7 +622,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> extra parameters for the message display</TD
></TR
></TABLE
><P
@ -632,7 +632,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6047"
NAME="AEN6246"
></A
><H3
><A
@ -685,7 +685,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an XML parser context</TD
></TR
><TR
><TD
@ -702,7 +702,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the message to display/transmit</TD
></TR
><TR
><TD
@ -719,7 +719,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> extra parameters for the message display</TD
></TR
></TABLE
><P
@ -729,7 +729,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6070"
NAME="AEN6269"
></A
><H3
><A
@ -782,7 +782,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an xmlParserInputPtr input</TD
></TR
></TABLE
><P
@ -792,7 +792,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6086"
NAME="AEN6285"
></A
><H3
><A
@ -845,7 +845,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an xmlParserInputPtr input</TD
></TR
></TABLE
><P
@ -906,7 +906,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"

140
doc/html/gnome-xml-xmlmemory.html
View File

@ -9,14 +9,11 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -97,16 +94,7 @@ SIZE="3"
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>Next Page &#62;&#62;&#62;</B
></FONT
></A
></TD
>&nbsp;</TD
></TR
></TABLE
></DIV
@ -115,7 +103,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN8804"
NAME="AEN9199"
></A
><H2
>Name</H2
@ -123,7 +111,7 @@ NAME="AEN8804"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN8807"
NAME="AEN9202"
></A
><H2
>Synopsis</H2
@ -138,10 +126,6 @@ CELLPADDING="6"
CLASS="SYNOPSIS"
>&#13;
#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 @@ HREF="gnome-xml-xmlmemory.html#XMLMEMSTRDUPLOC"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN8828"
NAME="AEN9222"
></A
><H2
>Description</H2
@ -232,40 +216,14 @@ NAME="AEN8828"
><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 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8854"
NAME="AEN9243"
></A
><H3
><A
@ -394,7 +352,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8871"
NAME="AEN9260"
></A
><H3
><A
@ -478,7 +436,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8892"
NAME="AEN9281"
></A
><H3
><A
@ -546,7 +504,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>a pointer to the new string or NULL if allocation error occured.</TD
></TR
></TABLE
><P
@ -556,7 +514,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8912"
NAME="AEN9301"
></A
><H3
><A
@ -604,7 +562,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>0 on success</TD
></TR
></TABLE
><P
@ -614,7 +572,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8927"
NAME="AEN9316"
></A
><H3
><A
@ -662,7 +620,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>an int representing the amount of memory allocated.</TD
></TR
></TABLE
><P
@ -672,7 +630,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8942"
NAME="AEN9331"
></A
><H3
><A
@ -700,7 +658,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8948"
NAME="AEN9337"
></A
><H3
><A
@ -753,7 +711,8 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</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 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8964"
NAME="AEN9353"
></A
><H3
><A
@ -789,7 +748,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8969"
NAME="AEN9358"
></A
><H3
><A
@ -815,7 +774,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8974"
NAME="AEN9363"
></A
><H3
><A
@ -831,7 +790,7 @@ CELLPADDING="6"
><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 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN8979"
NAME="AEN9368"
></A
><H3
><A
@ -896,7 +855,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an int specifying the size in byte to allocate.</TD
></TR
><TR
><TD
@ -913,7 +872,13 @@ CLASS="PARAMETER"
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 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9003"
NAME="AEN9393"
></A
><H3
><A
@ -996,7 +961,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the initial memory block pointer</TD
></TR
><TR
><TD
@ -1013,7 +978,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> an int specifying the size in byte to allocate.</TD
></TR
><TR
><TD
@ -1030,7 +995,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the line number</TD
> the file name or NULL</TD
></TR
><TR
><TD
@ -1057,7 +1022,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN9031"
NAME="AEN9421"
></A
><H3
><A
@ -1129,7 +1094,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the line number</TD
> the file name or NULL</TD
></TR
><TR
><TD
@ -1161,7 +1126,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>a pointer to the new string or NULL if allocation error occured.</TD
></TR
></TABLE
><P
@ -1222,7 +1187,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -1237,16 +1202,7 @@ SIZE="3"
WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>Next Page &#62;&#62;&#62;</B
></FONT
></A
></TD
>&nbsp;</TD
></TR
><TR
><TD
@ -1262,13 +1218,7 @@ SIZE="3"
><TD
COLSPAN="2"
ALIGN="right"
><FONT
COLOR="#FFFFFF"
SIZE="3"
><B
>nanohttp</B
></FONT
></TD
>&nbsp;</TD
></TR
></TABLE
></DIV

90
doc/html/gnome-xml-xpath.html
View File

@ -9,14 +9,14 @@ REL="HOME"
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 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -98,7 +98,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-parserinternals.html"
HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN6532"
NAME="AEN6740"
></A
><H2
>Name</H2
@ -123,7 +123,7 @@ NAME="AEN6532"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN6535"
NAME="AEN6743"
></A
><H2
>Synopsis</H2
@ -259,7 +259,7 @@ HREF="XMLXPATHCONTEXTPTR"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6569"
NAME="AEN6777"
></A
><H2
>Description</H2
@ -269,14 +269,14 @@ NAME="AEN6569"
><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 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_UNDEFINED</PRE
>#define XPATH_UNDEFINED 0</PRE
></TD
></TR
></TABLE
@ -302,7 +302,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6579"
NAME="AEN6787"
></A
><H3
><A
@ -318,7 +318,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_NODESET</PRE
>#define XPATH_NODESET 1</PRE
></TD
></TR
></TABLE
@ -328,7 +328,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6584"
NAME="AEN6792"
></A
><H3
><A
@ -344,7 +344,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_BOOLEAN</PRE
>#define XPATH_BOOLEAN 2</PRE
></TD
></TR
></TABLE
@ -354,7 +354,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6589"
NAME="AEN6797"
></A
><H3
><A
@ -370,7 +370,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_NUMBER</PRE
>#define XPATH_NUMBER 3</PRE
></TD
></TR
></TABLE
@ -380,7 +380,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6594"
NAME="AEN6802"
></A
><H3
><A
@ -396,7 +396,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_STRING</PRE
>#define XPATH_STRING 4</PRE
></TD
></TR
></TABLE
@ -406,7 +406,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6599"
NAME="AEN6807"
></A
><H3
><A
@ -422,7 +422,7 @@ CELLPADDING="6"
><TD
><PRE
CLASS="PROGRAMLISTING"
>#define XPATH_USERS</PRE
>#define XPATH_USERS 5</PRE
></TD
></TR
></TABLE
@ -432,7 +432,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6604"
NAME="AEN6812"
></A
><H3
><A
@ -526,7 +526,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6627"
NAME="AEN6835"
></A
><H3
><A
@ -605,7 +605,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6646"
NAME="AEN6854"
></A
><H3
><A
@ -705,7 +705,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6671"
NAME="AEN6879"
></A
><H3
><A
@ -784,7 +784,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6690"
NAME="AEN6898"
></A
><H3
><A
@ -840,7 +840,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the XML document</TD
></TR
><TR
><TD
@ -855,7 +855,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the xmlXPathContext just allocated.</TD
></TR
></TABLE
><P
@ -865,7 +865,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6711"
NAME="AEN6919"
></A
><H3
><A
@ -918,7 +918,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the context to free</TD
></TR
></TABLE
><P
@ -928,7 +928,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6727"
NAME="AEN6935"
></A
><H3
><A
@ -988,7 +988,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the XPath expression</TD
></TR
><TR
><TD
@ -1005,7 +1005,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the XPath context</TD
></TR
><TR
><TD
@ -1020,7 +1020,8 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the xmlXPathObjectPtr resulting from the eveluation or NULL.
the caller has to free the object.</TD
></TR
></TABLE
><P
@ -1030,7 +1031,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6753"
NAME="AEN6961"
></A
><H3
><A
@ -1083,7 +1084,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the object to free</TD
></TR
></TABLE
><P
@ -1093,7 +1094,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN6769"
NAME="AEN6977"
></A
><H3
><A
@ -1153,7 +1154,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the XPath expression</TD
></TR
><TR
><TD
@ -1170,7 +1171,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
> the XPath context</TD
></TR
><TR
><TD
@ -1185,7 +1186,8 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>&nbsp;</TD
>the xmlXPathObjectPtr resulting from the evaluation or NULL.
the caller has to free the object.</TD
></TR
></TABLE
><P
@ -1246,7 +1248,7 @@ COLOR="#FFFFFF"
SIZE="3"
><B
><A
HREF="libxml.html"
HREF="libxml-lib.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -1262,7 +1264,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-parserinternals.html"
HREF="gnome-xml-nanohttp.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
@ -1290,7 +1292,7 @@ ALIGN="right"
COLOR="#FFFFFF"
SIZE="3"
><B
>parserInternals</B
>nanohttp</B
></FONT
></TD
></TR

21
doc/html/index.sgml
View File

@ -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">

22
doc/xml.html
View File

@ -82,7 +82,7 @@ addition to SGML Docbook and HTML.</p>
<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,7 +90,18 @@ archive</a> or <a href="ftp://ftp.gnome.org/pub/GNOME/contrib/rpms/">RPMs
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>
</ul>
@ -443,8 +454,7 @@ the beginning). Example:</p>
4 ]>
5 &lt;EXAMPLE>
6 &amp;xml;
7 &lt;/EXAMPLE>
</pre>
7 &lt;/EXAMPLE></pre>
<p>Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing
it's name with '&amp;' and following it by ';' without any spaces added. There
@ -587,7 +597,7 @@ core.</p>
<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 @@ Levien</a>.</p>
<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 @@ base under gnome-xml/example</p>
<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>

2
include/libxml/xmlmemory.h
View File

@ -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

15
parser.c
View File

@ -744,6 +744,7 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
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 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
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 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
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 @@ xmlParserHandleReference(xmlParserCtxtPtr ctxt) {
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 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
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:

2
result/HTML/test3.html
View File

@ -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>

1077
result/HTML/wired.html Normal file
View File

File diff suppressed because it is too large Load Diff

11
result/ent8
View File

@ -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&#231;&#227;o</Content>
<Content>&lt;&gt;</Content>
<Content>&test1;&test2;</Content>
</doc>

10
result/noent/ent8 Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE doc [
<!ENTITY test1 "test 1">
<!ENTITY test2 "test 2">
]>
<doc>
<Content>Reten&#231;&#227;o</Content>
<Content>&lt;&gt;</Content>
<Content>test 1test 2</Content>
</doc>

516
test/HTML/wired.html Normal file
View File

File diff suppressed because one or more lines are too long

9
test/ent8 Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE doc [
<!ENTITY test1 "test 1">
<!ENTITY test2 "test 2">
]>
<doc>
<Content>Reten&#231;&#227;o</Content>
<Content>&lt;&gt;</Content>
<Content>&test1;&test2;</Content>
</doc>

2
tree.c
View File

@ -684,7 +684,7 @@ xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list, int inLine) {
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;

2
xmlmemory.h
View File

@ -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