XML/HTMLparser.c - diff

Return to HTMLparser.c CVS log

Up to [Public] / XML

Diff for /XML/HTMLparser.c between versions 1.27 and 1.28

-version 1.27, 1999/12/18 14:58:00
+version 1.28, 1999/12/21 13:33:05
  Line 467  htmlAutoClose(htmlParserCtxtPtr ctxt, co
  }
  /**
+  * htmlAutoCloseTag:
+  * @doc:  the HTML document
+  * @name:  The tag name
+  * @elem:  the HTML element
+  *
+  * The HTmL DtD allows a tag to implicitely 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.
+  *
+  * Returns 1 if autoclose, 0 otherwise
+  */
+ int
+ htmlAutoCloseTag(htmlDocPtr doc, const xmlChar *name, htmlNodePtr elem) {
+     htmlNodePtr child;
+     if (elem == NULL) return(1);
+     if (!xmlStrcmp(name, elem->name)) return(0);
+     if (htmlCheckAutoClose(elem->name, name)) return(1);
+     child = elem->childs;
+     while (child != NULL) {
+         if (htmlAutoCloseTag(doc, name, child)) return(1);
+         child = child->next;
+     }
+     return(0);
+ }
+ /**
+  * htmlIsAutoClosed:
+  * @doc:  the HTML document
+  * @elem:  the HTML element
+  *
+  * The HTmL DtD allows a tag to implicitely close other tags.
+  * The list is kept in htmlStartClose array. This function checks
+  * if a tag is autoclosed by one of it's child
+  *
+  * Returns 1 if autoclosed, 0 otherwise
+  */
+ int
+ htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem) {
+     htmlNodePtr child;
+     if (elem == NULL) return(1);
+     child = elem->childs;
+     while (child != NULL) {
+         if (htmlAutoCloseTag(doc, elem->name, child)) return(1);
+         child = child->next;
+     }
+     return(0);
+ }
+ /**
   * htmlAutoCloseOnClose:
   * @ctxt:  an HTML parser context
   * @new:  The new tag name
- Line 528  htmlEntityDesc  html40EntitiesTable[] =
+ Line 580  htmlEntityDesc  html40EntitiesTable[] =
   */
  { 34,   "quot", "quotation mark = APL quote, U+0022 ISOnum" },
  { 38,   "amp",  "ampersand, U+0026 ISOnum" },
- { 39,   "apos", "single quote" },
  { 60,   "lt",   "less-than sign, U+003C ISOnum" },
  { 62,   "gt",   "greater-than sign, U+003E ISOnum" },
- Line 536  htmlEntityDesc  html40EntitiesTable[] =
+ Line 587  htmlEntityDesc  html40EntitiesTable[] =
   * A bunch still in the 128-255 range
   * Replacing them depend really on the charset used.
   */
+ { 39,   "apos", "single quote" },
  { 160,  "nbsp", "no-break space = non-breaking space, U+00A0 ISOnum" },
  { 161,  "iexcl","inverted exclamation mark, U+00A1 ISOnum" },
  { 162,  "cent", "cent sign, U+00A2 ISOnum" },
- Line 1166  htmlNewDoc(const xmlChar *URI, const xml
+ Line 1218  htmlNewDoc(const xmlChar *URI, const xml
      cur->type = XML_HTML_DOCUMENT_NODE;
      cur->version = NULL;
      cur->intSubset = NULL;
-     xmlCreateIntSubset(cur, BAD_CAST "HTML", ExternalID, URI);
+     if ((ExternalID == NULL) &&
+         (URI == NULL))
+         xmlCreateIntSubset(cur, BAD_CAST "HTML",
+                     BAD_CAST "-//W3C//DTD HTML 4.0 Transitional//EN",
+                     BAD_CAST "http://www.w3.org/TR/REC-html40/loose.dtd");
+     else
+         xmlCreateIntSubset(cur, BAD_CAST "HTML", ExternalID, URI);
      cur->name = NULL;
      cur->root = NULL;
      cur->extSubset = NULL;

Webmaster

Removed from v.1.27
changed lines
	Added in v.1.28