diff --git a/ChangeLog b/ChangeLog index 6649f2b7..d5fb3cee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Mon Oct 25 12:13:25 CEST 1999 Daniel Veillard + + * 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 * HTMLparser.c, HTMLtree.c, tree.h: completely revamped the diff --git a/HTMLparser.c b/HTMLparser.c index 33b42b7b..736dfb06 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -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->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 @@ 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; - } - + 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; diff --git a/HTMLtree.c b/HTMLtree.c index 90e1c7d1..53d93892 100644 --- a/HTMLtree.c +++ b/HTMLtree.c @@ -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"); } diff --git a/Makefile.am b/Makefile.am index 71860ce9..cb88ae8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 ; \ + $(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' \ diff --git a/SAX.c b/SAX.c index 3461fbbd..cfc23f1a 100644 --- a/SAX.c +++ b/SAX.c @@ -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); diff --git a/SAXresult/ent8 b/SAXresult/ent8 new file mode 100644 index 00000000..84c1915c --- /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 0384a203..5ac800ec 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/doc/html/book1.html b/doc/html/book1.html index 08f45155..1e128742 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">

Daniel Veillard

    Daniel.Veillard@w3.org
+   

Copyright © 1999 by Daniel Veillard

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.

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.

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.

Permission is granted to copy and distribute translations + of this manual into another language, under the above conditions + for modified versions.

Gnome XML LibraryLibxml Programming Notes
Libxml Library Reference
—
nanohttp —
parserInternals —
xmlmemory —
nanohttp —
Gnome XML LibraryLibxml Programming Notes

Name

Synopsis

Description

Details

#define     XML_INTERNAL_GENERAL_ENTITY
#define XML_INTERNAL_GENERAL_ENTITY 1

#define     XML_EXTERNAL_GENERAL_PARSED_ENTITY
#define XML_EXTERNAL_GENERAL_PARSED_ENTITY 2

#define     XML_EXTERNAL_GENERAL_UNPARSED_ENTITY
#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY 3

#define     XML_INTERNAL_PARAMETER_ENTITY
#define XML_INTERNAL_PARAMETER_ENTITY 4

#define     XML_EXTERNAL_PARAMETER_ENTITY
#define XML_EXTERNAL_PARAMETER_ENTITY 5

#define     XML_INTERNAL_PREDEFINED_ENTITY
#define XML_INTERNAL_PREDEFINED_ENTITY 6

xmlEntityPtr

typedef xmlEntity *xmlEntityPtr;

#define     XML_MIN_ENTITIES_TABLE
#define XML_MIN_ENTITIES_TABLE 32

xmlEntitiesTablePtr

typedef xmlEntitiesTable *xmlEntitiesTablePtr;

  the document  the entity name  the entity type XML_xxx_yyy_ENTITY  the entity external ID if available  the entity system ID if available  the entity content

  the document  the entity name  the entity type XML_xxx_yyy_ENTITY  the entity external ID if available  the entity system ID if available  the entity content

  the entity name NULL if not, othervise the entity

  the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found.

  the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found.

  the document referencing the entity  the entity name A pointer to the entity structure or NULL if not found.

  the document containing the string  A string to convert to XML. A newly allocated string with the substitution done.

  the document containing the string  A string to convert to XML. A newly allocated string with the substitution done.

 the xmlEntitiesTablePtr just created or NULL in case of error.

  An entity table the new xmlEntitiesTablePtr or NULL in case of error.

  An entity table

  An XML buffer.  An entity table

Name

Synopsis

Description

Details

htmlParserCtxt

typedef xmlParserCtxt htmlParserCtxt;

htmlParserCtxtPtr

typedef xmlParserCtxtPtr htmlParserCtxtPtr;

htmlParserNodeInfo

typedef xmlParserNodeInfo htmlParserNodeInfo;

htmlSAXHandler

typedef xmlSAXHandler htmlSAXHandler;

htmlSAXHandlerPtr

typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;

htmlParserInput

typedef xmlParserInput htmlParserInput;

htmlParserInputPtr

typedef xmlParserInputPtr htmlParserInputPtr;

htmlDocPtr

typedef xmlDocPtr htmlDocPtr;

htmlNodePtr

typedef xmlNodePtr htmlNodePtr;

  The tag name the related htmlElemDescPtr or NULL if not found.

  the entity name the associated htmlEntityDescPtr if found, NULL otherwise.

  an HTML parser context  location to store the entity name the associated htmlEntityDescPtr if found, or NULL otherwise, +if non-NULL *str will have to be freed by the caller.

  an HTML parser context the value parsed (as an int)

  an HTML parser context

  a pointer to an array of xmlChar  a free form C string describing the HTML document encoding, or NULL  the SAX handler block  if using SAX, this pointer will be provided on callbacks.  the resulting document tree

  a pointer to an array of xmlChar  a free form C string describing the HTML document encoding, or NULL the resulting document tree

  the filename  a free form C string describing the HTML document encoding, or NULL  the SAX handler block  if using SAX, this pointer will be provided on callbacks.  the resulting document tree

  the filename  a free form C string describing the HTML document encoding, or NULL the resulting document tree

Name

Synopsis

Description

Details

#define     HTML_TEXT_NODE
#define HTML_TEXT_NODE XML_TEXT_NODE

#define     HTML_ENTITY_REF_NODE
#define HTML_ENTITY_REF_NODE XML_ENTITY_REF_NODE

#define     HTML_COMMENT_NODE
#define HTML_COMMENT_NODE XML_COMMENT_NODE

  the document  OUT: the memory pointer  OUT: the memory lenght

  the FILE*  the document

  the filename  the document  the number of byte written or -1 in case of failure.

 Next Page >>>

Name

Synopsis

xmlNanoHTTPFetch (const char *URL, - const char *filename); + const char *filename, + char **contentType); void* xmlNanoHTTPMethod

Description

Details

int         xmlNanoHTTPFetch                (const char *URL,
-                                             const char *filename);
contentType : if available the Content-Type information will be +returned at that locationReturns

  the HTTP context

 Next Page >>>xmlmemoryxpath parserInternals

Name

Synopsis

xmlChar *cur, int recovery); +int xmlSAXUserParseFile (xmlSAXHandlerPtr sax, + void *user_data, + const char *filename); +int xmlSAXUserParseMemory (xmlSAXHandlerPtr sax, + void *user_data, + char *buffer, + int size); xmlDocPtr

Description

Details

#define     XML_DEFAULT_VERSION
#define XML_DEFAULT_VERSION "1.0"

xmlParserInputPtr

typedef xmlParserInput *xmlParserInputPtr;

xmlParserNodeInfo

typedef _xmlParserNodeInfo xmlParserNodeInfo;

xmlParserNodeInfoSeq

typedef _xmlParserNodeInfoSeq xmlParserNodeInfoSeq;

xmlParserNodeInfoSeqPtr

typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;

xmlParserCtxt

typedef _xmlParserCtxt xmlParserCtxt;

xmlParserCtxtPtr

typedef xmlParserCtxt *xmlParserCtxtPtr;

xmlSAXLocator

typedef _xmlSAXLocator xmlSAXLocator;

xmlSAXLocatorPtr

typedef xmlSAXLocator *xmlSAXLocatorPtr;

xmlSAXHandlerPtr

typedef xmlSAXHandler *xmlSAXHandlerPtr;

  an XML parser input  an indicative size for the lookahead the number of xmlChars read, or -1 in case of error, 0 indicate the +end of this entity

  an XML parser input  an indicative size for the lookahead the number of xmlChars read, or -1 in case of error, 0 indicate the +end of this entity

  the input xmlChar * a new xmlChar * or NULL

  the input xmlChar *  the len of cur a new xmlChar * or NULL

  the xmlChar * array (haystack)  the index of the first char (zero based)  the length of the substring the xmlChar * for the first occurence or NULL.

  the xmlChar * array  the xmlChar to search the xmlChar * for the first occurence or NULL.

  the xmlChar * array (haystack)  the xmlChar to search (needle) the xmlChar * for the first occurence or NULL.

  the first xmlChar *  the second xmlChar * the integer result of the comparison

  the first xmlChar *  the second xmlChar *  the max comparison length the integer result of the comparison

  the xmlChar * array the number of xmlChar contained in the ARRAY.

  the original xmlChar * array  the xmlChar * array added a new xmlChar * containing the concatenated string.

  the original xmlChar * array  the xmlChar * array added  the length of add a new xmlChar * containing the concatenated string.

  a pointer to an array of xmlChar the resulting document tree

  an pointer to a char array  the size of the array the resulting document tree

  the filename the resulting document tree

  int 0 or 1  the last value for 0 for no substitution, 1 for substitution.

  a pointer to an array of xmlChar the resulting document tree

  an pointer to a char array  the size of the array the resulting document tree

  the filename the resulting document tree

  an XML parser context 0, -1 in case of error. the parser context is augmented +as a result of the parsing.

  the SAX handler block  a pointer to an array of xmlChar  work in recovery mode, i.e. tries to read no Well Formed +documents the resulting document tree

xmlSAXUserParseFile ()

int         xmlSAXUserParseFile             (xmlSAXHandlerPtr sax,
+                                             void *user_data,
+                                             const char *filename);

parse an XML file and call the given SAX handler routines. +Automatic support for ZLIB/Compress compressed document is provided

sax : a SAX handler
user_data : The user data returned on SAX callbacks
filename : a file name
Returns :0 in case of success or a error number otherwise

xmlSAXUserParseMemory ()

int         xmlSAXUserParseMemory           (xmlSAXHandlerPtr sax,
+                                             void *user_data,
+                                             char *buffer,
+                                             int size);

A better SAX parsing routine. +parse an XML in-memory buffer and call the given SAX handler routines.

sax : a SAX handler
user_data : The user data returned on SAX callbacks
buffer : an in-memory XML document input
size : the lenght of the XML document in bytes
Returns :0 in case of success or a error number otherwise

  the SAX handler block  an pointer to a char array  the siwe of the array  work in recovery mode, i.e. tries to read no Well Formed +documents the resulting document tree

  the SAX handler block  the filename  work in recovery mode, i.e. tries to read no Well Formed +documents the resulting document tree

  a NAME* containing the External ID of the DTD  a NAME* containing the URL to the DTD the resulting xmlDtdPtr or NULL in case of error.

  the SAX handler block  a NAME* containing the External ID of the DTD  a NAME* containing the URL to the DTD the resulting xmlDtdPtr or NULL in case of error.

  an HTML parser context

  an XML parser context

  an XML parser context  a xmlChar * buffer  a file name

  an XML parser context  an XML node within the tree an xmlParserNodeInfo block pointer or NULL

  a node info sequence pointer

  a node info sequence pointer

  a node info sequence pointer  an XML node pointer a long indicating the position of the record

  an XML parser context  a node info sequence pointer

Gnome XML LibraryLibxml Library Reference

Name

Synopsis

Description

Details

#define     XML_MAX_NAMELEN
#define XML_MAX_NAMELEN 1000

#define     SKIPCHARVAL(p)
#define SKIPCHARVAL(p) (p)++;

  a pointer to an array of xmlChar the new parser context or NULL

  the filename the new parser context or NULL

  an pointer to a char array  the siwe of the array the new parser context or NULL

  an XML parser context

 the xmlParserCtxtPtr or NULL

  the parser context  the encoding value (number)

  an XML parser context  an XML entity pointer.

  an XML parser context  an Entity pointer the new input stream or NULL

  an XML parser context  an XML parser input fragment (entity, XML fragment ...).

  an XML parser context the current xmlChar in the parser context

  an xmlP arserInputPtr

  an XML parser context  the filename to use as entity the new input stream or NULL in case of error

  an XML parser context  a xmlChar **  the function returns the local part, and prefix is updated +to get the Prefix if any.

  an XML parser context the namespace name or NULL

  an XML parser context  a xmlChar **  the function returns the local part, and prefix is updated +to get the Prefix if any.

  an XML parser context the namespace name

  an XML parser context the string parser or NULL.

  an XML parser context

  an XML parser context the Name parsed or NULL

  an XML parser context the Name parsed or NULL

  an XML parser context the Nmtoken parsed or NULL

  an XML parser context  if non-NULL store a copy of the original entity value the EntityValue parsed with reference substitued or NULL

  an XML parser context the AttValue parsed or NULL.

  an XML parser context the SystemLiteral parsed or NULL

  an XML parser context the PubidLiteral parsed or NULL.

  an XML parser context  int indicating whether we are within a CDATA section

  an XML parser context  a xmlChar** receiving PubidLiteral  indicate whether we should restrict parsing to only +production [75], see NOTE below 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.

  an XML parser context

  an XML parser context the PITarget name or NULL

  an XML parser context

  an XML parser context

  an XML parser context

  an XML parser context  Receive a possible fixed default value for the attribute  XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED +or XML_ATTRIBUTE_FIXED.

  an XML parser context  the notation attribute tree built while parsing

  an XML parser context  the enumeration attribute tree built while parsing

  an XML parser context  the enumeration tree built while parsing  XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION

  an XML parser context  the enumeration tree built while parsing the attribute type

  an XML parser context

  an XML parser context  the list of the xmlElementContentPtr describing the element choices

  an XML parser context  the tree of xmlElementContentPtr describing the element +hierarchy.

  an XML parser context  the name of the element being defined.  the Element Content pointer will be stored here if any  the type of element content XML_ELEMENT_TYPE_xxx

  an XML parser context the type of the element, or -1 in case of error

  an XML parser context

  an XML parser context the value parsed (as an int)

  an XML parser context the xmlEntityPtr if found, or NULL otherwise.

  an XML parser context

  an XML parser context

  an XML parser context

  an XML parser context  a xmlChar ** used to store the value of the attribute the attribute name, and the value in *value.

  an XML parser context the element name parsed

  an XML parser context  the tag name as parsed in the opening tag.

  an XML parser context

  an XML parser context

  an XML parser context

  an XML parser context the string giving the XML version number, or NULL

  an XML parser context the version string, e.g. "1.0"

  an XML parser context the encoding name value or NULL

  an XML parser context the encoding value or NULL

  an XML parser context 1 if standalone, 0 otherwise

  an XML parser context

  an XML parser context

  an XML parser context  the external identifier  the system identifier (or URL)

#define     XML_SUBSTITUTE_NONE
#define XML_SUBSTITUTE_NONE 0

#define     XML_SUBSTITUTE_REF
#define XML_SUBSTITUTE_REF 1

#define     XML_SUBSTITUTE_PEREF
#define XML_SUBSTITUTE_PEREF 2

#define     XML_SUBSTITUTE_BOTH
#define XML_SUBSTITUTE_BOTH 3

  the parser context  the len to decode (in bytes !), -1 for no size limit  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF  an end marker xmlChar, 0 if none  an end marker xmlChar, 0 if none  an end marker xmlChar, 0 if none A newly allocated string with the substitution done. The caller +must deallocate it !

xpathnanohttp

Name

Synopsis

Description

Details

#define     CHAR
#define CHAR xmlChar

#define     BAD_CAST
#define BAD_CAST (xmlChar *)

xmlNotationPtr

typedef xmlNotation *xmlNotationPtr;

xmlEnumerationPtr

typedef xmlEnumeration *xmlEnumerationPtr;

xmlAttributePtr

typedef xmlAttribute *xmlAttributePtr;

xmlElementContentPtr

typedef xmlElementContent *xmlElementContentPtr;

xmlElementPtr

typedef xmlElement *xmlElementPtr;

xmlNsPtr

typedef xmlNs *xmlNsPtr;

xmlDtdPtr

typedef xmlDtd *xmlDtdPtr;

xmlAttrPtr

typedef xmlAttr *xmlAttrPtr;

xmlIDPtr

typedef xmlID *xmlIDPtr;

xmlRefPtr

typedef xmlRef *xmlRefPtr;

xmlNode

typedef _xmlNode xmlNode;

xmlNodePtr

typedef _xmlNode *xmlNodePtr;

xmlDoc

typedef _xmlDoc xmlDoc;

xmlDocPtr

typedef xmlDoc *xmlDocPtr;

xmlBuffer

typedef _xmlBuffer xmlBuffer;

xmlBufferPtr

typedef xmlBuffer *xmlBufferPtr;

 the new structure.

  the buffer to free

  the file output  the buffer to dump the number of xmlChar written

  the buffer to dump  the xmlChar string  the number of xmlChar to add

  the buffer to dump  the xmlChar string

  the buffer to dump  the C char string

  the buffer to dump  the number of xmlChar to remove the number of xmlChar removed, or -1 in case of failure.

  the buffer

  the document pointer  the DTD name  the external ID  the system ID a pointer to the new DTD structure

  the document pointer  the DTD name  the external ID  the system ID a pointer to the new DTD structure

  the DTD structure to free up

  the document carrying the namespace  the URI associated  the prefix for the namespace returns a new namespace pointer

  the element carrying the namespace  the URI associated  the prefix for the namespace returns a new namespace pointer

  the namespace pointer

  xmlChar string giving the version of XML "1.0" a new document

  pointer to the document +@:

  the document  the name of the attribute  the value of the attribute a pointer to the attribute

  the holding node  the name of the attribute  the value of the attribute a pointer to the attribute

  the holding node  the namespace  the name of the attribute  the value of the attribute a pointer to the attribute

  the first property in the list

  the first property in the list

  the element where the attribute will be grafted  the attribute  a new xmlAttrPtr, or NULL in case of error.

  the element where the attributes will be grafted  the first attribute  a new xmlAttrPtr, or NULL in case of error.

  the dtd  a new xmlDtdPtr, or NULL in case of error.

  the document  if 1 do a recursive copy.  a new xmlDocPtr, or NULL in case of error.

  the document  namespace if any  the node name  the text content if any a pointer to the new node object.

  namespace if any  the node name a pointer to the new node object.

  the parent node  a namespace if any  the name of the child  the content of the child if any. a pointer to the new node object.

  the document  the text content a pointer to the new node object.

  the text content a pointer to the new node object.

  the processing instruction name  the PI content a pointer to the new node object.

  the document  the text content  the text len. a pointer to the new node object.

  the text content  the text len. a pointer to the new node object.

  the document  the comment content a pointer to the new node object.

  the comment content a pointer to the new node object.

  the document  the CData block content content  the length of the block a pointer to the new node object.

  the document  the reference name, or the reference string with & and ; a pointer to the new node object.

  the node  if 1 do a recursive copy.  a new xmlNodePtr, or NULL in case of error.

  the first node in the list.  a new xmlNodePtr, or NULL in case of error.

  the parent node the last child or NULL if none.

  the node 1 yes, 0 no

  the parent node  the child node the child or NULL in case of error.

  the child node  the new node the element or NULL in case of error.

  the node

  the first text node  the second text node being merged the first text node augmented

  the node  the content  content lenght

  the first node in the list

  the node

  the document  the current node  the namespace string the namespace pointer or NULL.

  the document  the current node  the namespace value the namespace pointer or NULL.

  the document  the current node an NULL terminated array of all the xmlNsPtr found +that need to be freed by the caller or NULL if no +namespace if defined

  a node in the document  a namespace pointer

  the namespace  a new xmlNsPtr, or NULL in case of error.

  the first namespace  a new xmlNsPtr, or NULL in case of error.

  the node  the attribute name  the attribute value the attribute pointer.

  the node  the attribute name the attribute value or NULL if not found.

  the document  the value of the attribute a pointer to the first child

  the document  the value of the text  the length of the string value a pointer to the first child

  the document  a Node list  should we replace entity contents or show their external form a pointer to the string copy, the calller must free it.

  the node being modified  the new value of the content

  the node being modified  the new value of the content  the size of content

  the node being modified  extra content

  the node being modified  extra content  the size of content

  the node being read a new xmlChar * or NULL if no content is available. +It's up to the caller to free the memory.

  the node being checked a pointer to the lang value, or NULL if not found

  the node being changed  the langage description

  the XML buffer  the string to add

  the XML buffer output  the string to add

  the XML buffer output  the string to add

  the document  OUT: the memory pointer  OUT: the memory lenght

  the FILE*  the document

  the filename  the document  the number of file written or -1 in case of failure.

  the document 0 (uncompressed) to 9 (max compression)

  the document  the compression ratio

 0 (uncompressed) to 9 (max compression)

  the compression ratio

Name

Synopsis

xmlChar *name); *name); +int xmlValidGetValidElements (xmlNode *prev, + xmlNode *next, + const xmlChar **list, + int max); +int xmlValidGetPotentialChildren (xmlElementContent *ctree, + const xmlChar **list, + int *len, + int max);

Description

Details

#define     XML_MIN_NOTATION_TABLE
#define XML_MIN_NOTATION_TABLE 32

xmlNotationTablePtr

typedef xmlNotationTable *xmlNotationTablePtr;

#define     XML_MIN_ELEMENT_TABLE
#define XML_MIN_ELEMENT_TABLE 32

xmlElementTablePtr

typedef xmlElementTable *xmlElementTablePtr;

#define     XML_MIN_ATTRIBUTE_TABLE
#define XML_MIN_ATTRIBUTE_TABLE 32

xmlAttributeTablePtr

typedef xmlAttributeTable *xmlAttributeTablePtr;

#define     XML_MIN_ID_TABLE
#define XML_MIN_ID_TABLE 32

xmlIDTablePtr

typedef xmlIDTable *xmlIDTablePtr;

#define     XML_MIN_REF_TABLE
#define XML_MIN_REF_TABLE 32

xmlRefTablePtr

typedef xmlRefTable *xmlRefTablePtr;

  the validation context  pointer to the DTD  the entity name  the public identifier or NULL  the system identifier or NULL NULL if not, othervise the entity

  A notation table the new xmlNotationTablePtr or NULL in case of error.

  An notation table

  the XML buffer output  A notation table

  the subelement name or NULL  the type of element content decl NULL if not, othervise the new element content structure

  An element content pointer. the new xmlElementContentPtr or NULL in case of error.

  the element content tree to free

  the validation context  pointer to the DTD  the entity name  the element type  the element content tree or NULL NULL if not, othervise the entity

  An element table the new xmlElementTablePtr or NULL in case of error.

  An element table

  the XML buffer output  An element table

  the enumeration name or NULL the xmlEnumerationPtr just created or NULL in case +of error.

  the tree to free.

  the tree to copy. the xmlEnumerationPtr just created or NULL in case +of error.

  the validation context  pointer to the DTD  the element name  the attribute name  the attribute type  the attribute default type  the attribute default value  if it's an enumeration, the associated list NULL if not, othervise the entity

  An attribute table the new xmlAttributeTablePtr or NULL in case of error.

  An attribute table

  the XML buffer output  An attribute table

  the validation context  pointer to the document  the value name  the attribute holding the ID NULL if not, othervise the new xmlIDPtr

  An id table

  pointer to the document  the ID value NULL if not found, otherwise the xmlAttrPtr defining the ID

  the document  the element carrying the attribute  the attribute 0 or 1 depending on the lookup result

  the validation context  pointer to the document  the value name  the attribute holding the Ref NULL if not, othervise the new xmlRefPtr

  An ref table

  the document  the element carrying the attribute  the attribute 0 or 1 depending on the lookup result

  the validation context  a document instance 1 if valid or 0 otherwise

  the validation context  a document instance  an element definition 1 if valid or 0 otherwise

  the validation context  a document instance  an attribute definition 1 if valid or 0 otherwise

  an attribute type  an attribute value 1 if valid or 0 otherwise

  the validation context  a document instance  a notation definition 1 if valid or 0 otherwise

  the validation context  a document instance  a dtd instance 1 if valid or 0 otherwise

  the validation context  a document instance 1 if valid or 0 otherwise

  the validation context  a document instance  an element instance 1 if valid or 0 otherwise

  the validation context  a document instance  an element instance 1 if valid or 0 otherwise

  the validation context  a document instance  an element instance  an attribute instance  the attribute value (without entities processing) 1 if valid or 0 otherwise

  the validation context  a document instance 1 if valid or 0 otherwise

  the validation context  the document  the notation name to check 1 if valid or 0 otherwise

  the document  the element name 0 if no, 1 if yes, and -1 if no element description is available

  a pointer to the DtD to search  the element name  the attribute name the xmlAttributePtr if found or NULL

  a pointer to the DtD to search  the notation name the xmlNotationPtr if found or NULL

  a pointer to the DtD to search  the element name the xmlElementPtr if found or NULL

xmlValidGetValidElements ()

int         xmlValidGetValidElements        (xmlNode *prev,
+                                             xmlNode *next,
+                                             const xmlChar **list,
+                                             int max);

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 prev and +next 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, ...

pointers to the element names are inserted at the beginning of the array +and do not need to be freed.

prev : an element to insert after
next : an element to insert next
list : an array to store the list of child names
max : the size of the array
Returns :the number of element in the list, or -1 in case of error. If +the function returns the value max the caller is invited to grow the +receiving array and retry.

xmlValidGetPotentialChildren ()

int         xmlValidGetPotentialChildren    (xmlElementContent *ctree,
+                                             const xmlChar **list,
+                                             int *len,
+                                             int max);

Build/extend a list of potential children allowed by the content tree

ctree : an element content tree
list : an array to store the list of child names
len : a pointer to the number of element in the list
max : the size of the array
Returns :the number of element in the list, or -1 in case of error.

Name

Synopsis

Description

Details

  an XML parser context  the message to display/transmit  extra parameters for the message display

  an XML parser context  the message to display/transmit  extra parameters for the message display

  an XML parser context  the message to display/transmit  extra parameters for the message display

  an XML parser context  the message to display/transmit  extra parameters for the message display

  an xmlParserInputPtr input

  an xmlParserInputPtr input

Next Page >>> 

Name

Synopsis

-#define NO_DEBUG_MEMORY void xmlFree

Description

Details

NO_DEBUG_MEMORY

#define     NO_DEBUG_MEMORY

 a pointer to the new string or NULL if allocation error occured.

 0 on success

 an int representing the amount of memory allocated.

  a FILE descriptor used as the output file, if NULL, the result is + 8 written to the file .memorylist

#define     DEBUG_MEMORY_LOCATION
#define DEBUG_MEMORY_LOCATION

#define     DEBUG_MEMORY
#define DEBUG_MEMORY

#define     MEM_LIST
#define MEM_LIST /* keep a list of all the allocated memory blocks */

  an int specifying the size in byte to allocate. the line number the file name or NULL + file: the line number

  the initial memory block pointer  an int specifying the size in byte to allocate. the line number the file name or NULL

the line number the file name or NULL a pointer to the new string or NULL if allocation error occured.

Next Page >>> nanohttp 

Name

Synopsis

Description

Details

#define     XPATH_UNDEFINED
#define XPATH_UNDEFINED 0

#define     XPATH_NODESET
#define XPATH_NODESET 1

#define     XPATH_BOOLEAN
#define XPATH_BOOLEAN 2

#define     XPATH_NUMBER
#define XPATH_NUMBER 3

#define     XPATH_STRING
#define XPATH_STRING 4

#define     XPATH_USERS
#define XPATH_USERS 5

  the XML document the xmlXPathContext just allocated.

  the context to free

  the XPath expression  the XPath context the xmlXPathObjectPtr resulting from the eveluation or NULL. +the caller has to free the object.

  the object to free

  the XPath expression  the XPath context the xmlXPathObjectPtr resulting from the evaluation or NULL. +the caller has to free the object.

parserInternalsnanohttp + + @@ -268,6 +270,8 @@ + + @@ -318,6 +322,14 @@ + + + + + + + + @@ -407,7 +419,6 @@ - @@ -422,11 +433,3 @@ - - - - - - - - diff --git a/doc/xml.html b/doc/xml.html index df5a0199..e212a1f0 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -82,7 +82,7 @@ addition to SGML Docbook and HTML.

News

-

Latest version is 1.7.1, you can find it on Latest version is 1.7.3, you can find it on rpmfind.net or on the Gnome FTP server either as a source @@ -90,9 +90,20 @@ archive or RPMs packages.

CVS only

+ +

1.7.4: Oct 25 1999

    +
  • Lots of HTML improvement
    • +
  • Fixed some errors when saving both XML and HTML
    • +
  • More examples, the regression tests should now look clean
    • +
  • Fixed a bug with contiguous charref
    • +
+ +

1.7.3: Sep 29 1999

+
    +
  • portability problems fixed
  • snprintf was used unconditionnally, leading to link problems on system - were it's not available, fixed
    • + were it's not available, fixed

1.7.1: Sep 24 1999

@@ -443,8 +454,7 @@ the beginning). Example:

4 ]> 5 <EXAMPLE> 6 &xml; -7 </EXAMPLE> - +7 </EXAMPLE>

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

@@interfaces@@

-

DOM Principles

+

DOM Principles

DOM stands for the Document Object Model this is an API for accessing XML or HTML structured documents. @@ -610,7 +620,7 @@ Levien.

The gnome-dom module in the Gnome CVS base is obsolete

-

A real example

+

A real example

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

Daniel Veillard

-

$Id: xml.html,v 1.9 1999/09/23 22:19:20 veillard Exp $

+

$Id: xml.html,v 1.10 1999/09/24 14:03:48 veillard Exp $

diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h index d28b526c..78ff392f 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 ce1d1fa7..83151fe6 100644 --- a/parser.c +++ b/parser.c @@ -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: diff --git a/result/HTML/test3.html b/result/HTML/test3.html index 0c47a2e8..6634a0ec 100644 --- a/result/HTML/test3.html +++ b/result/HTML/test3.html @@ -15,11 +15,11 @@ Alias Problem Domain
Note +
The Problem Domain package is the model behind the Human
Interface, thats stores and manipulates the Family Tree.
-

diff --git a/result/HTML/wired.html b/result/HTML/wired.html new file mode 100644 index 00000000..af13e171 --- /dev/null +++ b/result/HTML/wired.html @@ -0,0 +1,1077 @@ + + + +Top Stories News from Wired News + + + + + + + +
+ + + + + + + + + + +
+ + + +
+ + +
+		 + +True to the Original + +
+ + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + +
+   updated 10:15 a.m.  15.Oct.99.PDT + + +
+ + + + + + + + + + +
+ + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+SECTIONS + +
+ +Business + +
+ +Culture + +
+ +Technology + +
+ +Politics + +
+ +WIRE SERVICE NEWS + +
+ +Top Headlines + +
+ +Sports + +
+ +Finance + +
+ + +FREE DELIVERY + + +
+ + + + + +
+
+ + + + + +  +
+		 + +
+
+ + +STOCKS + + +
+Get Quote: +
+
+  +
+
+Financial Services +
+
+ +
+ +
+ +Datek +Wired Index Fund +internet.com Index Fund +GetSmart's MortgageFinder + +
+ +Today's Summary + +
+ +Wired Index | All Indexes + +
+ +Portfolios + +
+ +FIND A BOOK + +
+ + + + + + + + + + +
+
+ + + + + +
+
+ + + +
+

+Powered by barnesandnoble.com + +
+

+
+
+ +WIRED + MAGAZINE + +
+ + +
+ +Wired Magazine + +
+ + +Issue 7.11 + +
+ +Subscribe to Wired.
Special offer! + +
+ +HOTWIRED + +
+ +Frontdoor +
+Webmonkey +
+Webmonkey Guides +
+RGB Gallery +
+Animation Express +
+Suck.com +
+ +
+ +HOTBOT + +
+ +Search +
+Shopping +
+ +
+
+ + + Wired News staff +
+
+ +Contact us + + +
+
+Wired News delivered
by PalmPilot,
+Outlook Express,
+In-Box Direct,
+or PointCast + +
+ + +
+ + + + + + + + + +
+ +
+		 + +
+ + +Nomad's Land + + +
+ +
+ + +Homeless, but ID'd, in Seattle + + +
+8:15 a.m. 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. +
+ + +in Politics + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
  + +HITS & MISC. + +
  + +
+ + +Calendar of E-Vents + + +
+ +Ongoing goings-on. +
+
+ + +Rants Raves + + +
+ +Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux. +
+
+ + +
  + +CURRENT HOO-HA + +
  + +
+ + +MP3 Rocks the Web + + +
+ +Download the sound.
+Sponsored by +Musicmaker + + + +
+
+ + +The Wireless World + + +
+ +Networking gets unplugged.
+Sponsored by +Ericsson + + + +
+
+ + +Digital Hollywood + + +
+ +The buzz of tech. +
+
+ + +IPO Outlook + + +
+ +Deals in the pipeline.
+Sponsored by +Sun + + + +
+
+ + +E-Biz + + +
+ +Business unusual.
+Sponsored by +IBM + + + +
+
+ + +Med-Tech Center + + +
+ +From the bleeding edge.
+Sponsored by WebMD + +
+
+ + +The Linux Effect + + +
+ +Not just for geeks. +
+
+ +
+ + +Executive Summary + + +
+CEOs, COOs, CIOs unite.
+Sponsored by +Vignette + + + +
+
+ + +Making the Grade + + +
+ +Reading, writing, and ROM.
+Sponsored by +U of Phoenix + + + +
+
+ + +Infostructure + + +
+An IS/IT resource
+Sponsored by +Sprint + + + + +
+
+ + +Y2K Watch + + +
+ +Tick... Tick... Tick... +
+
+ + + +More Hoo-Ha + + + +
 
+ + + + + + + + +
  + +MEANWHILE... + +
  + +
+ +Führer Furor + +
+ +

+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. +
+

+
  • More from Lycos +
    • +     +
    +
    +
    + 
    +     +
    + + +Other Top Stories + + +
    + +
    + + +Wall Street Keeps Reeling + + +
    +10:15 a.m. 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. +
    + + +in Reuters + + +
    +
    + + +The Market's Madness + + +
    +9:10 a.m. 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. +
    + + +in Reuters + + +
    +
    + + +'Want a Loan? What's Your Race?' + + +
    +3:00 a.m. 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. +
    + + +in Politics + + +
    +
    + + +Music Regs: A Bagful of Noise + + +
    +3:00 a.m. 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. +
    + + +in Business + + +
    +
    + + +Can't Beat 'Em? Green 'Em + + +
    +3:00 a.m. 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. +
    + + +in Technology + + +
    +
    + + +Y2K Cloud Over MS Office + + +
    +3:00 a.m. 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. +
    + + +in Business + + +
    +
    +Med-Tech +
    + + +Biochips for Custom Chemo + + +
    +3:00 a.m. 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. +
    + + +in Technology + + +
    +
    + + +High Stakes in Priceline Suit + + +
    +3:00 a.m. 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. +
    + + +in Business + + +
    +
    + + +Biodiversity Merges Online + + +
    +3:00 a.m. 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. +
    + + +in Technology + + +
    +
    +
    + + +Elsewhere Today + + +
    + +
    + + +FCC: Hands-Off on Broadband + + +
    + +The Industry Standard + +
    +
    + + +White House Lashes Out on Treaty + + +
    +Lycos +
    +
    + + +Steve Jobs at 44 + + +
    + +Time + +
    +
    + + +Computers May Run on Gas + + +
    +ZDNN +
    +
    + + +Much Is Free in the Wired World + + +
    + +The New York Times (Registration Required) +
    +
    + + +Melissa: I'm Baaaack + + +
    + +USA Today + +
    +
    + + +Domain Owners Surrender Privacy + + +
    +MSNBC +
    +
    + + +Dividing to Conquer in VC Game + + +
    + +The Washington Post + +
    +
    + + +The Red Hat Diaries + + +
    +Salon +
    +
    + + +Screensaver to Predict Climate + + +
    +BBC News +
    +
    + +
    + +
    +
    + +
    + +
    +
    +

    + +Send us feedback + |  +Work at Wired Digital + |  +Advertise with us +
    +About Wired Digital + |  +Our Privacy Policy +     +

    +

    + +Copyright © 1994-99 Wired Digital Inc. All rights reserved. +
    + + + + + + + + +

    +    		 + + +
    +
    + + diff --git a/result/ent8 b/result/ent8 index 4f38bd85..7b8f814c 100644 --- a/result/ent8 +++ b/result/ent8 @@ -1,3 +1,10 @@ - - but Okay + + +]> + + Retenção + <> + &test1;&test2; + diff --git a/result/noent/ent8 b/result/noent/ent8 new file mode 100644 index 00000000..0ed738ae --- /dev/null +++ b/result/noent/ent8 @@ -0,0 +1,10 @@ + + + +]> + + Retenção + <> + test 1test 2 + diff --git a/test/HTML/wired.html b/test/HTML/wired.html new file mode 100644 index 00000000..3d00d28d --- /dev/null +++ b/test/HTML/wired.html @@ -0,0 +1,516 @@ + +Top Stories News from Wired News + + + + + + +
    + + + +
    + +
    		True to the Original
    + + + + + + + + + + + + + + + + + + + + + + + + + +

       updated 10:15 a.m.  15.Oct.99.PDT
    + + + + + + + + + + +
    + + + + + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    SECTIONS
    Business
    Culture
    Technology
    Politics
    +WIRE SERVICE NEWS
    Top Headlines
    Sports
    Finance
    + FREE DELIVERY
    + + + + +
    +
    + + + + + + + + + +  +
    		 + + +
    + STOCKS
    Get Quote:
     
    +Financial Services
    +
    +
    +
    + + + Datek + Wired Index Fund + internet.com Index Fund + GetSmart's MortgageFinder +
    Today's Summary
    Wired Index | All Indexes
    Portfolios
    FIND A BOOK
    + + + + + + + + + + +
    +
    + + + +
    + + + +
    +

    + Powered by barnesandnoble.com + +
    + + +

    + +
    WIRED + MAGAZINE
    + + +
    + +Wired Magazine
     + +Issue 7.11 +     +
    + + +Subscribe to Wired.
    Special offer!     + + +     +
    + HOTWIRED
    +Frontdoor
    +Webmonkey
    +Webmonkey Guides
    +RGB Gallery
    +Animation Express
    +Suck.com
    +
    + HOTBOT
    +Search
    +Shopping
    +
    +
    + + + Wired News staff

    + + + + Contact us     + + +

    + + Wired News delivered
    by PalmPilot,
    Outlook Express,
    In-Box Direct,
    +or PointCast
    + + + +
    + + + + + + + + + + + + + + + +
    +
    +
    + + + + +Nomad's Land

    Homeless, but ID'd, in Seattle
    8:15 a.m. 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.
    in Politics
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     HITS & MISC.
     
    + + Calendar of E-Vents
    Ongoing goings-on.

    Rants & Raves
    Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.

     CURRENT HOO-HA
      + +
    + +MP3 Rocks the Web
    Download the sound.
    Sponsored by Musicmaker

    + +The Wireless World
    Networking gets unplugged.
    Sponsored by Ericsson

    + +Digital Hollywood
    The buzz of tech.

    + +IPO Outlook
    Deals in the pipeline.
    Sponsored by Sun

    + +E-Biz
    Business unusual.
    Sponsored by IBM

    + +Med-Tech Center
    From the bleeding edge.
    Sponsored by WebMD

    + +The Linux Effect
    Not just for geeks.


    + +Executive Summary
    CEOs, COOs, CIOs unite.
    Sponsored by Vignette

    + +Making the Grade
    Reading, writing, and ROM.
    Sponsored by U of Phoenix

    + +Infostructure
    An IS/IT resource
    Sponsored by Sprint

    + +Y2K Watch
    Tick... Tick... Tick...

    + +More Hoo-Ha
     
    + +
     MEANWHILE...
      +
    + + + +Führer Furor

    +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. +

  • More from Lycos

    +
    • + + + 
     + +
    + +Other Top Stories
    +
    + + +Wall Street Keeps Reeling
    10:15 a.m. 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.
    in Reuters

    The Market's Madness
    9:10 a.m. 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.
    in Reuters

    'Want a Loan? What's Your Race?'
    3:00 a.m. 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.
    in Politics

    Music Regs: A Bagful of Noise
    3:00 a.m. 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.
    in Business

    Can't Beat 'Em? Green 'Em
    3:00 a.m. 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.
    in Technology

    Y2K Cloud Over MS Office
    3:00 a.m. 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.
    in Business

    Med-Tech
    Biochips for Custom Chemo
    3:00 a.m. 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.
    in Technology

    High Stakes in Priceline Suit
    3:00 a.m. 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.
    in Business

    Biodiversity Merges Online
    3:00 a.m. 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.
    in Technology

    + + + + +
    +Elsewhere Today
    +
    + + +FCC: Hands-Off on Broadband
    The Industry Standard

    White House Lashes Out on Treaty
    Lycos

    Steve Jobs at 44
    Time

    Computers May Run on Gas
    ZDNN

    Much Is Free in the Wired World
    The New York Times (Registration Required)

    Melissa: I'm Baaaack
    USA Today

    Domain Owners Surrender Privacy
    MSNBC

    Dividing to Conquer in VC Game
    The Washington Post

    The Red Hat Diaries
    Salon

    Screensaver to Predict Climate
    BBC News

    + + + + + +
    + +
    + + + +
    +
    + +

    + +

    +Send us feedback + |  +Work at Wired Digital + |  +Advertise with us +
    +About Wired Digital + |  +Our Privacy Policy     + + +

    Copyright © 1994-99 Wired Digital Inc. All rights reserved. + +
    + + + + + + + + + + +

    		+ + +
    + + +
    + + + diff --git a/test/ent8 b/test/ent8 new file mode 100644 index 00000000..5eeccf2a --- /dev/null +++ b/test/ent8 @@ -0,0 +1,9 @@ + + +]> + + Retenção + <> + &test1;&test2; + diff --git a/tree.c b/tree.c index 3a06dfa9..b5d91557 100644 --- a/tree.c +++ b/tree.c @@ -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; diff --git a/xmlmemory.h b/xmlmemory.h index d28b526c..78ff392f 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