Commit cbaf3995 authored by Daniel Veillard's avatar Daniel Veillard

applied 42 documentation patches from Charlie Bozeman. Regenerated the

* *.c include/libxml/*.h doc/html/*: applied 42 documentation
  patches from Charlie Bozeman. Regenerated the HTML docs.
Daniel
parent 7f9a6806
Mon Dec 31 17:13:34 CET 2001 Daniel Veillard <daniel@veillard.com>
* *.c include/libxml/*.h doc/html/*: applied 42 documentation
patches from Charlie Bozeman. Regenerated the HTML docs.
Thu Dec 20 14:59:52 CET 2001 Daniel Veillard <daniel@veillard.com>
* include/libxml/debugXML.h win32/dsp/libxml2.def.src: fixes
......
......@@ -232,7 +232,7 @@ PUSH_AND_POP(static, xmlChar*, name)
* @ctxt: the DocBook SGML parser context
* @len: pointer to the length of the char read
*
* The current char value, if using UTF-8 this may actaully span multiple
* The current char value, if using UTF-8 this may actually span multiple
* bytes in the input buffer. Implement the end of line normalization:
* 2.11 End-of-Line Handling
* If the encoding is unspecified, in the case we find an ISO-Latin-1
......@@ -321,7 +321,7 @@ docbCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
}
/*
* Assume it's a fixed length encoding (1) with
* a compatibke encoding for the ASCII set, since
* a compatible encoding for the ASCII set, since
* XML constructs only use < 128 chars
*/
*len = 1;
......@@ -835,7 +835,7 @@ NULL
#endif
/*
* acording the SGML DTD, HR should be added to the 2nd line above, as it
* according the SGML DTD, HR should be added to the 2nd line above, as it
* is not allowed within a H1, H2, H3, etc. But we should tolerate that case
* because many documents contain rules in headings...
*/
......@@ -851,7 +851,7 @@ NULL
* The list of SGML elements which are supposed not to have
* CDATA content and where a p element will be implied
*
* TODO: extend that list by reading the SGML SGML DtD on
* TODO: extend that list by reading the SGML SGML DTD on
* implied paragraph
*/
static char *docbNoContentElements[] = {
......@@ -914,7 +914,8 @@ docbTagLookup(const xmlChar *tag) {
* @newtag: The new tag name
* @oldtag: The old tag name
*
* Checks wether the new tag is one of the registered valid tags for closing old.
* Checks whether the new tag is one of the registered valid tags for
* closing old.
* Initialize the docbStartCloseIndex for fast lookup of closing tags names.
*
* Returns 0 if no, 1 if yes.
......@@ -949,7 +950,7 @@ docbCheckAutoClose(const xmlChar *newtag, const xmlChar *oldtag) {
* @ctxt: an SGML parser context
* @newtag: The new tag name
*
* The HTmL DtD allows an ending tag to implicitely close other tags.
* The DocBook DTD allows an ending tag to implicitly close other tags.
*/
static void
docbAutoCloseOnClose(docbParserCtxtPtr ctxt, const xmlChar *newtag) {
......@@ -1001,7 +1002,7 @@ docbAutoCloseOnClose(docbParserCtxtPtr ctxt, const xmlChar *newtag) {
* @ctxt: an SGML parser context
* @newtag: The new tag name or NULL
*
* The HTmL DtD allows a tag to implicitely close other tags.
* The DocBook DTD allows a tag to implicitly close other tags.
* The list is kept in docbStartClose array. This function is
* called when a new tag has been detected and generates the
* appropriates closes if possible/needed.
......@@ -1034,7 +1035,7 @@ docbAutoClose(docbParserCtxtPtr ctxt, const xmlChar *newtag) {
* @name: The tag name
* @elem: the SGML element
*
* The HTmL DtD allows a tag to implicitely close other tags.
* The DocBook DTD allows a tag to implicitly close other tags.
* The list is kept in docbStartClose array. This function checks
* if the element or one of it's children would autoclose the
* given tag.
......@@ -2211,7 +2212,7 @@ docbEntityValueLookup(int value) {
*
* Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
* The value of @inlen after return is the number of octets consumed
* as the return value is positive, else unpredictiable.
* as the return value is positive, else unpredictable.
* The value of @outlen after return is the number of octets consumed.
*/
int
......@@ -2313,7 +2314,7 @@ UTF8ToSgml(unsigned char* out, int *outlen,
*
* Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
* The value of @inlen after return is the number of octets consumed
* as the return value is positive, else unpredictiable.
* as the return value is positive, else unpredictable.
* The value of @outlen after return is the number of octets consumed.
*/
int
......@@ -2689,7 +2690,7 @@ docbParseSGMLName(docbParserCtxtPtr ctxt) {
* docbParseName:
* @ctxt: an SGML parser context
*
* parse an SGML name, this routine is case sensistive.
* parse an SGML name, this routine is case sensitive.
*
* Returns the Name parsed or NULL
*/
......@@ -4328,7 +4329,7 @@ docbParseElement(docbParserCtxtPtr ctxt) {
}
/*
* Check for an Empty Element labelled the XML/SGML way
* Check for an Empty Element labeled the XML/SGML way
*/
if ((CUR == '/') && (NXT(1) == '>')) {
SKIP(2);
......@@ -4765,7 +4766,7 @@ docbParseMarkupDecl(xmlParserCtxtPtr ctxt) {
}
/**
* docbParseInternalsubset:
* docbParseInternalSubset:
* @ctxt: an SGML parser context
*
* parse the internal subset declaration
......@@ -4833,7 +4834,7 @@ docbParseInternalSubset(xmlParserCtxtPtr ctxt) {
* docbParseMisc:
* @ctxt: an XML parser context
*
* parse an XML Misc* optionnal field.
* parse an XML Misc* optional field.
*
* [27] Misc ::= Comment | PI | S
*/
......@@ -5525,7 +5526,7 @@ docbParseTryOrFinish(docbParserCtxtPtr ctxt, int terminate) {
}
/*
* Check for an Empty Element labelled the XML/SGML way
* Check for an Empty Element labeled the XML/SGML way
*/
if ((CUR == '/') && (NXT(1) == '>')) {
SKIP(2);
......
......@@ -180,7 +180,7 @@ PUSH_AND_POP(static, xmlChar*, name)
* @ctxt: the HTML parser context
* @len: pointer to the length of the char read
*
* The current char value, if using UTF-8 this may actaully span multiple
* The current char value, if using UTF-8 this may actually span multiple
* bytes in the input buffer. Implement the end of line normalization:
* 2.11 End-of-Line Handling
* If the encoding is unspecified, in the case we find an ISO-Latin-1
......@@ -269,7 +269,7 @@ htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
}
/*
* Assume it's a fixed length encoding (1) with
* a compatibke encoding for the ASCII set, since
* a compatible encoding for the ASCII set, since
* XML constructs only use < 128 chars
*/
*len = 1;
......@@ -348,7 +348,7 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
* Start Tag: 1 means the start tag can be ommited
* End Tag: 1 means the end tag can be ommited
* 2 means it's forbidden (empty elements)
* 3 means the tag is stylistic and should be closed easilly
* 3 means the tag is stylistic and should be closed easily
* Depr: this element is deprecated
* DTD: 1 means that this element is valid only in the Loose DTD
* 2 means that this element is valid only in the Frameset DTD
......@@ -514,7 +514,7 @@ NULL
* The list of HTML elements which are supposed not to have
* CDATA content and where a p element will be implied
*
* TODO: extend that list by reading the HTML SGML DtD on
* TODO: extend that list by reading the HTML SGML DTD on
* implied paragraph
*/
static const char *htmlNoContentElements[] = {
......@@ -652,7 +652,8 @@ htmlGetEndPriority (const xmlChar *name) {
* @newtag: The new tag name
* @oldtag: The old tag name
*
* Checks wether the new tag is one of the registered valid tags for closing old.
* Checks whether the new tag is one of the registered valid tags for
* closing old.
* Initialize the htmlStartCloseIndex for fast lookup of closing tags names.
*
* Returns 0 if no, 1 if yes.
......@@ -688,7 +689,7 @@ htmlCheckAutoClose(const xmlChar *newtag, const xmlChar *oldtag) {
* @newtag: The new tag name
* @force: force the tag closure
*
* The HTmL DtD allows an ending tag to implicitely close other tags.
* The HTML DTD allows an ending tag to implicitly close other tags.
*/
static void
htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
......@@ -708,7 +709,7 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
if (xmlStrEqual(newtag, ctxt->nameTab[i])) break;
/*
* A missplaced endtagad can only close elements with lower
* A missplaced endtag can only close elements with lower
* or equal priority, so if we find an element with higher
* priority before we find an element with
* matching name, we just ignore this endtag
......@@ -784,7 +785,7 @@ htmlAutoCloseOnEnd(htmlParserCtxtPtr ctxt) {
* @ctxt: an HTML parser context
* @newtag: The new tag name or NULL
*
* The HTmL DtD allows a tag to implicitely close other tags.
* The HTML DTD allows a tag to implicitly close other tags.
* The list is kept in htmlStartClose array. This function is
* called when a new tag has been detected and generates the
* appropriates closes if possible/needed.
......@@ -839,7 +840,7 @@ htmlAutoClose(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
* @name: The tag name
* @elem: the HTML element
*
* The HTmL DtD allows a tag to implicitely close other tags.
* The HTML DTD allows a tag to implicitly close other tags.
* The list is kept in htmlStartClose array. This function checks
* if the element or one of it's children would autoclose the
* given tag.
......@@ -866,7 +867,7 @@ htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) {
* @doc: the HTML document
* @elem: the HTML element
*
* The HTmL DtD allows a tag to implicitely close other tags.
* The HTML DTD allows a tag to implicitly close other tags.
* The list is kept in htmlStartClose array. This function checks
* if a tag is autoclosed by one of it's child
*
......@@ -890,7 +891,7 @@ htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem) {
* @ctxt: an HTML parser context
* @newtag: The new tag name
*
* The HTML DtD allows a tag to exists only implicitely
* The HTML DTD allows a tag to exists only implicitly
* called when a new tag has been detected and generates the
* appropriates implicit tags if missing
*/
......@@ -1268,7 +1269,7 @@ static const htmlEntityDesc html40EntitiesTable[] = {
{ 8713, "notin","not an element of, U+2209 ISOtech" },
{ 8715, "ni", "contains as member, U+220B ISOtech" },
{ 8719, "prod", "n-ary product = product sign, U+220F ISOamsb" },
{ 8721, "sum", "n-ary sumation, U+2211 ISOamsb" },
{ 8721, "sum", "n-ary summation, U+2211 ISOamsb" },
{ 8722, "minus","minus sign, U+2212 ISOtech" },
{ 8727, "lowast","asterisk operator, U+2217 ISOtech" },
{ 8730, "radic","square root = radical sign, U+221A ISOtech" },
......@@ -1407,7 +1408,7 @@ htmlEntityValueLookup(unsigned int value) {
*
* Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
* The value of @inlen after return is the number of octets consumed
* as the return value is positive, else unpredictiable.
* as the return value is positive, else unpredictable.
* The value of @outlen after return is the number of octets consumed.
*/
int
......@@ -1508,7 +1509,7 @@ UTF8ToHtml(unsigned char* out, int *outlen,
*
* Returns 0 if success, -2 if the transcoding fails, or -1 otherwise
* The value of @inlen after return is the number of octets consumed
* as the return value is positive, else unpredictiable.
* as the return value is positive, else unpredictable.
* The value of @outlen after return is the number of octets consumed.
*/
int
......@@ -1598,7 +1599,7 @@ htmlEncodeEntities(unsigned char* out, int *outlen,
* @end2: an end marker xmlChar, 0 if none
* @end3: an end marker xmlChar, 0 if none
*
* Subtitute the HTML entities by their value
* Substitute the HTML entities by their value
*
* DEPRECATED !!!!
*
......@@ -1791,7 +1792,7 @@ static int areBlanks(htmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
* Creates a new HTML document without a DTD node if @URI and @ExternalID
* are NULL
*
* Returns a new document, do not intialize the DTD if not provided
* Returns a new document, do not initialize the DTD if not provided
*/
htmlDocPtr
htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
......@@ -1803,7 +1804,7 @@ htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
cur = (xmlDocPtr) xmlMalloc(sizeof(xmlDoc));
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"xmlNewDoc : malloc failed\n");
"htmlNewDocNoDtD : malloc failed\n");
return(NULL);
}
memset(cur, 0, sizeof(xmlDoc));
......@@ -1899,7 +1900,7 @@ htmlParseHTMLName(htmlParserCtxtPtr ctxt) {
* htmlParseName:
* @ctxt: an HTML parser context
*
* parse an HTML name, this routine is case sensistive.
* parse an HTML name, this routine is case sensitive.
*
* Returns the Name parsed or NULL
*/
......@@ -3470,7 +3471,7 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
}
/*
* Check for an Empty Element labelled the XML/SGML way
* Check for an Empty Element labeled the XML/SGML way
*/
if ((CUR == '/') && (NXT(1) == '>')) {
SKIP(2);
......@@ -4275,7 +4276,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
}
/*
* Check for an Empty Element labelled the XML/SGML way
* Check for an Empty Element labeled the XML/SGML way
*/
if ((CUR == '/') && (NXT(1) == '>')) {
SKIP(2);
......
/*
* HTMLtree.c : implemetation of access function for an HTML tree.
* HTMLtree.c : implementation of access function for an HTML tree.
*
* See Copyright for the status of this software.
*
......@@ -223,7 +223,7 @@ found_head:
found_meta:
if (encoding != NULL) {
/*
* Create a new Meta element with the right aatributes
* Create a new Meta element with the right attributes
*/
meta = xmlNewDocNode(doc, NULL, BAD_CAST"meta", NULL);
......@@ -435,7 +435,7 @@ htmlNodeDumpFormat(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur,
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlNodeDump : node == NULL\n");
"htmlNodeDumpFormat : node == NULL\n");
return;
}
/*
......@@ -517,7 +517,7 @@ htmlNodeDumpFormat(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur,
}
/*
* Get specific HTML info for taht node.
* Get specific HTML info for that node.
*/
info = htmlTagLookup(cur->name);
......@@ -693,7 +693,7 @@ htmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur, int format) {
if (cur->intSubset != NULL)
htmlDtdDump(buf, cur);
else {
/* Default to HTML-4.0 transitionnal @@@@ */
/* Default to HTML-4.0 transitional @@@@ */
xmlBufferWriteChar(buf, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">");
}
......@@ -808,7 +808,7 @@ htmlDtdDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlDtdDump : no internal subset\n");
"htmlDtdDumpOutput : no internal subset\n");
return;
}
xmlOutputBufferWriteString(buf, "<!DOCTYPE ");
......@@ -849,7 +849,7 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur,
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAttrDump : property == NULL\n");
"htmlAttrDumpOutput : property == NULL\n");
return;
}
xmlOutputBufferWriteString(buf, " ");
......@@ -879,7 +879,7 @@ static void
htmlAttrListDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur, const char *encoding) {
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlAttrListDump : property == NULL\n");
"htmlAttrListDumpOutput : property == NULL\n");
return;
}
while (cur != NULL) {
......@@ -907,7 +907,7 @@ htmlNodeListDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
xmlNodePtr cur, const char *encoding, int format) {
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlNodeListDump : node == NULL\n");
"htmlNodeListDumpOutput : node == NULL\n");
return;
}
while (cur != NULL) {
......@@ -933,7 +933,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
"htmlNodeDump : node == NULL\n");
"htmlNodeDumpFormatOutput : node == NULL\n");
return;
}
/*
......@@ -1018,7 +1018,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
}
/*
* Get specific HTML info for taht node.
* Get specific HTML info for that node.
*/
info = htmlTagLookup(cur->name);
......
......@@ -1052,7 +1052,7 @@ startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
while (attr != NULL) {
if (attr->defaultValue != NULL) {
/*
* the element should be instanciated in the tree if:
* the element should be instantiated in the tree if:
* - this is a namespace prefix
* - the user required for completion in the tree
* like XSLT
......@@ -1163,7 +1163,7 @@ startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
}
/*
* If it's the Document root, finish the Dtd validation and
* If it's the Document root, finish the DTD validation and
* check the document root element for validity
*/
if ((ctxt->validate) && (ctxt->vctxt.finishDtd == 0)) {
......@@ -1662,8 +1662,10 @@ cdataBlock(void *ctx, const xmlChar *value, int len)
/**
* xmlDefaultSAXHandlerInit:
* @hdlr: the SAX handler
* @warning: flag if non-zero sets the handler warning procedure
*
* Initialize the default SAX handler
* Initialize the default XML SAX handler
*/
void
initxmlDefaultSAXHandler(xmlSAXHandler *hdlr, int warning)
......@@ -1720,9 +1722,11 @@ xmlDefaultSAXHandlerInit(void)
#ifdef LIBXML_HTML_ENABLED
/**
* htmlDefaultSAXHandlerInit:
* inithtmlDefaultSAXHandlerInit:
* @hdlr: the SAX handler
* @warning: flag if non-zero sets the handler warning procedure
*
* Initialize the default SAX handler
* Initialize the default HTML SAX handler
*/
void
inithtmlDefaultSAXHandler(xmlSAXHandler *hdlr)
......@@ -1776,6 +1780,13 @@ htmlDefaultSAXHandlerInit(void)
#ifdef LIBXML_DOCB_ENABLED
/**
* initdocbDefaultSAXHandlerInit:
* @hdlr: the SAX handler
* @warning: flag if non-zero sets the handler warning procedure
*
* Initialize the default DocBook SAX handler
*/
void
initdocbDefaultSAXHandler(xmlSAXHandler *hdlr)
{
......
......@@ -241,7 +241,7 @@ xmlFreeCatalogEntry(xmlCatalogEntryPtr ret) {
if (ret == NULL)
return;
/*
* Entries stored in the file hash must be dealloacted
* Entries stored in the file hash must be deallocated
* only by the file hash cleaner !
*/
if (ret->dealloc == 1)
......@@ -681,7 +681,7 @@ xmlConvertSGMLCatalog(xmlCatalogPtr catal) {
/**
* xmlCatalogUnWrapURN:
* @urn: an "urn:publicid:" to unwrapp
* @urn: an "urn:publicid:" to unwrap
*
* Expand the URN into the equivalent Public Identifier
*
......@@ -1252,7 +1252,7 @@ xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal) {
/*
* Fetch and parse. Note that xmlParseXMLCatalogFile does not
* use the existing catalog, there is no recusivity allowed at
* use the existing catalog, there is no recursion allowed at
* that level.
*/
doc = xmlParseXMLCatalogFile(catal->prefer, catal->URL);
......@@ -2613,7 +2613,7 @@ xmlACatalogResolve(xmlCatalogPtr catal, const xmlChar * pubID,
/**
* xmlACatalogResolveURI:
* @catal: a Catalog
* @pubId: the URI
* @URI: the URI
*
* Do a complete resolution lookup of an URI
*
......@@ -3019,7 +3019,7 @@ xmlCatalogResolve(const xmlChar *pubID, const xmlChar *sysID) {
/**
* xmlCatalogResolveURI:
* @pubId: the URI
* @URI: the URI
*
* Do a complete resolution lookup of an URI
*
......@@ -3062,7 +3062,7 @@ xmlCatalogDump(FILE *out) {
*
* Add an entry in the catalog, it may overwrite existing but
* different entries.
* If called before any other catalo routine, allows to override the
* If called before any other catalog routine, allows to override the
* default shared catalog put in place by xmlInitializeCatalog();
*
* Returns 0 if successful, -1 otherwise
......@@ -3157,6 +3157,7 @@ xmlCatalogGetDefaults(void) {
/**
* xmlCatalogSetDefaults:
* @allow: what catalogs should be accepted
*
* Used to set the user preference w.r.t. to what catalogs should
* be accepted
......@@ -3350,7 +3351,7 @@ xmlCatalogLocalResolve(void *catalogs, const xmlChar *pubID,
/**
* xmlCatalogLocalResolveURI:
* @catalogs: a document's list of catalogs
* @pubId: the URI
* @URI: the URI
*
* Do a complete resolution lookup of an URI using a
* document's private catalog list
......@@ -3389,7 +3390,7 @@ xmlCatalogLocalResolveURI(void *catalogs, const xmlChar *URI) {
************************************************************************/
/**
* xmlCatalogGetSystem:
* @pubId: the public ID string
* @sysId: the system ID string
*
* Try to lookup the system ID associated to a public ID
* DEPRECATED, use xmlCatalogResolveSystem()
......
......@@ -256,7 +256,7 @@ if test "$with_threads" = "yes" ; then
echo Enabling multithreaded support
AC_CHECK_HEADER(pthread.h,
AC_CHECK_LIB(pthread, pthread_mutex_lock,[
AC_CHECK_LIB(pthread, pthread_join,[
THREAD_LIBS="-lpthread"
AC_DEFINE(HAVE_LIBPTHREAD)
AC_DEFINE(HAVE_PTHREAD_H)
......
......@@ -84,24 +84,24 @@ xmlDebugDumpDtdNode(FILE *output, xmlDtdPtr dtd, int depth) {
* Do a bit of checking
*/
if (dtd->parent == NULL)
fprintf(output, "PBM: Dtd has no parent\n");
fprintf(output, "PBM: DTD has no parent\n");
if (dtd->doc == NULL)
fprintf(output, "PBM: Dtd has no doc\n");
fprintf(output, "PBM: DTD has no doc\n");
if ((dtd->parent != NULL) && (dtd->doc != dtd->parent->doc))
fprintf(output, "PBM: Dtd doc differs from parent's one\n");
fprintf(output, "PBM: DTD doc differs from parent's one\n");
if (dtd->prev == NULL) {
if ((dtd->parent != NULL) && (dtd->parent->children != (xmlNodePtr)dtd))
fprintf(output, "PBM: Dtd has no prev and not first of list\n");
fprintf(output, "PBM: DTD has no prev and not first of list\n");
} else {
if (dtd->prev->next != (xmlNodePtr) dtd)
fprintf(output, "PBM: Dtd prev->next : back link wrong\n");
fprintf(output, "PBM: DTD prev->next : back link wrong\n");
}
if (dtd->next == NULL) {
if ((dtd->parent != NULL) && (dtd->parent->last != (xmlNodePtr) dtd))
fprintf(output, "PBM: Dtd has no next and not last of list\n");
fprintf(output, "PBM: DTD has no next and not last of list\n");
} else {
if (dtd->next->prev != (xmlNodePtr) dtd)
fprintf(output, "PBM: Dtd next->prev : forward link wrong\n");
fprintf(output, "PBM: DTD next->prev : forward link wrong\n");
}
}
......@@ -864,23 +864,23 @@ xmlDebugDumpDTD(FILE * output, xmlDtdPtr dtd)
* Do a bit of checking
*/
if ((dtd->parent != NULL) && (dtd->doc != dtd->parent->doc))
fprintf(output, "PBM: Dtd doc differs from parent's one\n");
fprintf(output, "PBM: DTD doc differs from parent's one\n");
if (dtd->prev == NULL) {
if ((dtd->parent != NULL)
&& (dtd->parent->children != (xmlNodePtr) dtd))
fprintf(output,
"PBM: Dtd has no prev and not first of list\n");
"PBM: DTD has no prev and not first of list\n");
} else {
if (dtd->prev->next != (xmlNodePtr) dtd)
fprintf(output, "PBM: Dtd prev->next : back link wrong\n");
fprintf(output, "PBM: DTD prev->next : back link wrong\n");
}
if (dtd->next == NULL) {
if ((dtd->parent != NULL)
&& (dtd->parent->last != (xmlNodePtr) dtd))
fprintf(output, "PBM: Dtd has no next and not last of list\n");
fprintf(output, "PBM: DTD has no next and not last of list\n");
} else {
if (dtd->next->prev != (xmlNodePtr) dtd)
fprintf(output, "PBM: Dtd next->prev : forward link wrong\n");
fprintf(output, "PBM: DTD next->prev : forward link wrong\n");
}
if (dtd->children == NULL)
fprintf(output, " DTD is empty\n");
......@@ -1003,7 +1003,16 @@ xmlDebugDumpEntities(FILE * output, xmlDocPtr doc)
fprintf(output, "No entities in external subset\n");
}
int xmlLsCountNode(xmlNodePtr node) {
/**
* xmlLsCountNode:
* @node: the node to count
*
* Count the children of @node.
*
* Returns the number of children of @node.
*/
int
xmlLsCountNode(xmlNodePtr node) {
int ret = 0;
xmlNodePtr list = NULL;
......@@ -1053,6 +1062,13 @@ int xmlLsCountNode(xmlNodePtr node) {
return(ret);
}
/**
* xmlLsOneNode:
* @output: the FILE * for the output
* @node: the node to dump
*
* Dump to @output the type and name of @node.
*/
void
xmlLsOneNode(FILE *output, xmlNodePtr node) {
switch (node->type) {
......@@ -1162,10 +1178,12 @@ xmlLsOneNode(FILE *output, xmlNodePtr node) {
/**
* xmlBoolToText:
* @boolval : a bool to turn into text
* @boolval: a bool to turn into text
*
* Convenient way to turn bool into text
*/
*
* Returns a pointer to either "True" or "False"
*/
const char *
xmlBoolToText(int boolval)
{
......@@ -1191,9 +1209,9 @@ xmlBoolToText(int boolval)
*/
/**
* xmlShellPrintXpathError:
* xmlShellPrintXPathError:
* @errorType: valid xpath error id
* @arg : the argument that cause xpath to fail
* @arg: the argument that cause xpath to fail
*
* Print the xpath error to libxml default error channel
*/
......@@ -1275,7 +1293,7 @@ xmlShellPrintNode(xmlNodePtr node)
/**
* xmlShellPrintXPathResult:
* list : a valid result generated by an xpath evaluation
* list: a valid result generated by an xpath evaluation
*
* Prints result to stdout
*/
......@@ -1515,7 +1533,7 @@ xmlShellLoad(xmlShellCtxtPtr ctxt, char *filename,
* @node2: unused
*
* Implements the XML shell function "write"
* Write the current node to the filename, it saves the serailization
* Write the current node to the filename, it saves the serialization
* of the subtree under the @node specified
*
* Returns 0 or -1 in case of error
......@@ -1580,7 +1598,7 @@ xmlShellWrite(xmlShellCtxtPtr ctxt, char *filename, xmlNodePtr node,
/**
* xmlShellSave:
* @ctxt: the shell context
* @filename: the file name (optionnal)
* @filename: the file name (optional)
* @node: unused
* @node2: unused
*
......@@ -1637,7 +1655,7 @@ xmlShellSave(xmlShellCtxtPtr ctxt, char *filename,
/**
* xmlShellValidate:
* @ctxt: the shell context
* @dtd: the DTD URI (optionnal)
* @dtd: the DTD URI (optional)
* @node: unused
* @node2: unused
*
......
......@@ -1120,7 +1120,6 @@
<ANCHOR id ="XMLDEBUGDUMPENTITIES" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPENTITIES">
<ANCHOR id ="XMLLSONENODE" href="libxml/libxml-debugxml.html#XMLLSONENODE">
<ANCHOR id ="XMLLSCOUNTNODE" href="libxml/libxml-debugxml.html#XMLLSCOUNTNODE">
<ANCHOR id ="XMLBOOLTOTEXT" href="libxml/libxml-debugxml.html#XMLBOOLTOTEXT">
<ANCHOR id ="XMLSHELLREADLINEFUNC" href="libxml/libxml-debugxml.html#XMLSHELLREADLINEFUNC">
<ANCHOR id ="XMLSHELLCTXT" href="libxml/libxml-debugxml.html#XMLSHELLCTXT">
<ANCHOR id ="XMLSHELLCTXTPTR" href="libxml/libxml-debugxml.html#XMLSHELLCTXTPTR">
......
This diff is collapsed.
This diff is collapsed.
......@@ -123,7 +123,7 @@ NAME="LIBXML-DOCBPARSER"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN20408"
NAME="AEN20432"
></A
><H2
>Name</H2
......@@ -131,7 +131,7 @@ NAME="AEN20408"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN20411"
NAME="AEN20435"
></A
><H2
>Synopsis</H2
......@@ -295,7 +295,7 @@ HREF="libxml-docbparser.html#DOCBPARSERCTXTPTR"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN20448"
NAME="AEN20472"
></A
><H2
>Description</H2
......@@ -305,14 +305,14 @@ NAME="AEN20448"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN20451"
NAME="AEN20475"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN20453"
NAME="AEN20477"
></A
><H3
><A
......@@ -338,7 +338,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN20458"
NAME="AEN20482"