Index: HTMLtree.c
===================================================================
RCS file: /cvs/gnome/libxml2/HTMLtree.c,v
retrieving revision 1.99
diff -c -r1.99 HTMLtree.c
*** HTMLtree.c	8 Aug 2005 13:46:45 -0000	1.99
--- HTMLtree.c	3 Sep 2005 14:35:00 -0000
***************
*** 748,753 ****
--- 748,754 ----
  htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
  	                 xmlNodePtr cur, const char *encoding, int format) {
      const htmlElemDesc * info;
+ 	int addmeta = 0;
  
      xmlInitParser();
  
***************
*** 848,860 ****
  	}
  	return;
      }
      if (((cur->type == XML_ELEMENT_NODE) || (cur->content == NULL)) &&
  	(cur->children == NULL)) {
!         if ((info != NULL) && (info->saveEndTag != 0) &&
  	    (xmlStrcmp(BAD_CAST info->name, BAD_CAST "html")) &&
  	    (xmlStrcmp(BAD_CAST info->name, BAD_CAST "body"))) {
  	    xmlOutputBufferWriteString(buf, ">");
  	} else {
  	    xmlOutputBufferWriteString(buf, "></");
              if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
                  xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
--- 849,900 ----
  	}
  	return;
      }
+ 
+ 	if ((cur->type == XML_ELEMENT_NODE) && 
+ 		(cur->parent != NULL) && 
+ 		(cur->parent->parent == (xmlNodePtr) cur->doc) && 
+ 		xmlStrEqual(BAD_CAST info->name, BAD_CAST "head") && 
+ 		xmlStrEqual(cur->parent->name, BAD_CAST"html")) {
+ 
+ 		xmlNodePtr tmp = cur->children;
+ 		while (tmp != NULL) {
+ 			if (xmlStrEqual(tmp->name, BAD_CAST"meta")) {
+ 				xmlChar *httpequiv;
+ 
+ 				httpequiv = xmlGetProp(tmp, BAD_CAST"http-equiv");
+ 				if (httpequiv != NULL) {
+ 					if (xmlStrcasecmp(httpequiv, BAD_CAST"Content-Type") == 0) {
+ 						xmlFree(httpequiv);
+ 						break;
+ 					}
+ 					xmlFree(httpequiv);
+ 				}
+ 			}
+ 			tmp = tmp->next;
+ 		}
+ 		if (tmp == NULL)
+ 			addmeta = 1;
+ 	}
+ 
      if (((cur->type == XML_ELEMENT_NODE) || (cur->content == NULL)) &&
  	(cur->children == NULL)) {
!         if ((info != NULL) && (info->saveEndTag != 0) && (addmeta == 0) && 
  	    (xmlStrcmp(BAD_CAST info->name, BAD_CAST "html")) &&
  	    (xmlStrcmp(BAD_CAST info->name, BAD_CAST "body"))) {
  	    xmlOutputBufferWriteString(buf, ">");
  	} else {
+ 		if (addmeta == 1) {
+ 			xmlOutputBufferWrite(buf, 1, ">");
+ 			xmlOutputBufferWriteString(buf,
+ 				"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
+ 			if (encoding) {
+ 				xmlOutputBufferWriteString(buf, encoding);
+ 			} else {
+ 				xmlOutputBufferWrite(buf, 5, "UTF-8");
+ 			}
+ 			xmlOutputBufferWrite(buf, 1, "\"");
+ 		}
+ 
  	    xmlOutputBufferWriteString(buf, "></");
              if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
                  xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
***************
*** 875,880 ****
--- 915,935 ----
  	return;
      }
      xmlOutputBufferWriteString(buf, ">");
+ 	if (addmeta == 1) {
+         if ((cur->children != NULL) && (format) && 
+ 			(info != NULL) && (!info->isinline) &&
+ 			(cur->children->type != HTML_TEXT_NODE) && 
+ 			(cur->children->type != HTML_ENTITY_REF_NODE))
+ 			xmlOutputBufferWriteString(buf, "\n");
+ 		xmlOutputBufferWriteString(buf,
+ 			"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
+ 		if (encoding) {
+ 			xmlOutputBufferWriteString(buf, encoding);
+ 		} else {
+ 			xmlOutputBufferWrite(buf, 5, "UTF-8");
+ 		}
+ 		xmlOutputBufferWrite(buf, 2, "\">");
+ 	}
      if ((cur->type != XML_ELEMENT_NODE) &&
  	(cur->content != NULL)) {
  	    /*
***************
*** 888,894 ****
          if ((format) && (info != NULL) && (!info->isinline) &&
  	    (cur->children->type != HTML_TEXT_NODE) &&
  	    (cur->children->type != HTML_ENTITY_REF_NODE) &&
! 	    (cur->children != cur->last) &&
  	    (cur->name != NULL) &&
  	    (cur->name[0] != 'p')) /* p, pre, param */
  	    xmlOutputBufferWriteString(buf, "\n");
--- 943,949 ----
          if ((format) && (info != NULL) && (!info->isinline) &&
  	    (cur->children->type != HTML_TEXT_NODE) &&
  	    (cur->children->type != HTML_ENTITY_REF_NODE) &&
! 	    ((cur->children != cur->last) || (addmeta == 1)) &&
  	    (cur->name != NULL) &&
  	    (cur->name[0] != 'p')) /* p, pre, param */
  	    xmlOutputBufferWriteString(buf, "\n");
***************
*** 896,902 ****
          if ((format) && (info != NULL) && (!info->isinline) &&
  	    (cur->last->type != HTML_TEXT_NODE) &&
  	    (cur->last->type != HTML_ENTITY_REF_NODE) &&
! 	    (cur->children != cur->last) &&
  	    (cur->name != NULL) &&
  	    (cur->name[0] != 'p')) /* p, pre, param */
  	    xmlOutputBufferWriteString(buf, "\n");
--- 951,957 ----
          if ((format) && (info != NULL) && (!info->isinline) &&
  	    (cur->last->type != HTML_TEXT_NODE) &&
  	    (cur->last->type != HTML_ENTITY_REF_NODE) &&
! 	    ((cur->children != cur->last) || (addmeta == 1)) &&
  	    (cur->name != NULL) &&
  	    (cur->name[0] != 'p')) /* p, pre, param */
  	    xmlOutputBufferWriteString(buf, "\n");
***************
*** 1148,1157 ****
  	    handler = xmlFindCharEncodingHandler(encoding);
  	    if (handler == NULL)
  		return(-1);
-             htmlSetMetaEncoding(cur, (const xmlChar *) encoding);
  	}
-     } else {
- 	htmlSetMetaEncoding(cur, (const xmlChar *) "UTF-8");
      }
  
      /*
--- 1203,1209 ----
Index: xmlsave.c
===================================================================
RCS file: /cvs/gnome/libxml2/xmlsave.c,v
retrieving revision 1.27
diff -c -r1.27 xmlsave.c
*** xmlsave.c	3 Sep 2005 14:56:36 -0000	1.27
--- xmlsave.c	3 Sep 2005 17:58:24 -0000
***************
*** 1240,1245 ****
--- 1240,1252 ----
  	} else {
  		if (addmeta == 1) {
  			xmlOutputBufferWrite(buf, 1, ">");
+ 			if (ctxt->format) {
+ 				xmlOutputBufferWrite(buf, 1, "\n");
+ 				if (xmlIndentTreeOutput)
+ 					xmlOutputBufferWrite(buf, ctxt->indent_size *
+ 					(ctxt->level + 1 > ctxt->indent_nr ? 
+ 					ctxt->indent_nr : ctxt->level + 1), ctxt->indent);
+ 			}
  			xmlOutputBufferWriteString(buf,
  				"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
  			if (ctxt->encoding) {
***************
*** 1247,1258 ****
  			} else {
  				xmlOutputBufferWrite(buf, 5, "UTF-8");
  			}
! 			xmlOutputBufferWrite(buf, 3, "\" /");
  		}
  	    /*
  	     * C.3. Element Minimization and Empty Element Content
  	     */
! 	    xmlOutputBufferWrite(buf, 3, "></");
  	    if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
  		xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
  		xmlOutputBufferWrite(buf, 1, ":");
--- 1254,1269 ----
  			} else {
  				xmlOutputBufferWrite(buf, 5, "UTF-8");
  			}
! 			xmlOutputBufferWrite(buf, 4, "\" />");
! 			if (ctxt->format)
! 				xmlOutputBufferWrite(buf, 1, "\n");
! 		} else {
! 			xmlOutputBufferWrite(buf, 1, ">");
  		}
  	    /*
  	     * C.3. Element Minimization and Empty Element Content
  	     */
! 	    xmlOutputBufferWrite(buf, 2, "</");
  	    if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
  		xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
  		xmlOutputBufferWrite(buf, 1, ":");
***************
*** 1264,1269 ****
--- 1275,1287 ----
      }
      xmlOutputBufferWrite(buf, 1, ">");
  	if (addmeta == 1) {
+ 		if (ctxt->format) {
+ 			xmlOutputBufferWrite(buf, 1, "\n");
+ 			if (xmlIndentTreeOutput)
+ 				xmlOutputBufferWrite(buf, ctxt->indent_size *
+ 				(ctxt->level + 1 > ctxt->indent_nr ? 
+ 				ctxt->indent_nr : ctxt->level + 1), ctxt->indent);
+ 		}
  		xmlOutputBufferWriteString(buf,
  			"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
  		if (ctxt->encoding) {
Index: result/HTML/Down.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/Down.html,v
retrieving revision 1.6
diff -c -r1.6 Down.html
*** result/HTML/Down.html	1 Sep 2005 09:52:30 -0000	1.6
--- result/HTML/Down.html	3 Sep 2005 14:14:15 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>This service is temporary down</title></head>
  <body bgcolor="#FFFFFF">
  <h1 align="center">Sorry, this service is temporary down</h1>
  We are doing our best to get it back on-line,
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>This service is temporary down</title>
! </head>
  <body bgcolor="#FFFFFF">
  <h1 align="center">Sorry, this service is temporary down</h1>
  We are doing our best to get it back on-line,
Index: result/HTML/cf_128.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/cf_128.html,v
retrieving revision 1.4
diff -c -r1.4 cf_128.html
*** result/HTML/cf_128.html	1 Sep 2005 09:52:30 -0000	1.4
--- result/HTML/cf_128.html	3 Sep 2005 13:50:17 -0000
***************
*** 1,6 ****
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
  <html>
! <head><title>gnome-xml push mode bug</title></head>
  <body>
  
  <table border="4"><tr>
--- 1,9 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>gnome-xml push mode bug</title>
! </head>
  <body>
  
  <table border="4"><tr>
Index: result/HTML/liclose.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/liclose.html,v
retrieving revision 1.4
diff -c -r1.4 liclose.html
*** result/HTML/liclose.html	1 Sep 2005 09:52:30 -0000	1.4
--- result/HTML/liclose.html	3 Sep 2005 14:15:30 -0000
***************
*** 1,6 ****
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title></title></head>
  <body>
  <ul>
  <li>First item
--- 1,9 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title></title>
! </head>
  <body>
  <ul>
  <li>First item
Index: result/HTML/lt.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/lt.html,v
retrieving revision 1.2
diff -c -r1.2 lt.html
*** result/HTML/lt.html	3 Sep 2003 13:10:35 -0000	1.2
--- result/HTML/lt.html	3 Sep 2005 15:03:27 -0000
***************
*** 1,2 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
! <html><head><meta name="Author" content="Root &lt;root@aol.com&gt;"></head></html>
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
! <html><head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <meta name="Author" content="Root &lt;root@aol.com&gt;">
! </head></html>
Index: result/HTML/reg1.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/reg1.html,v
retrieving revision 1.5
diff -c -r1.5 reg1.html
*** result/HTML/reg1.html	3 Sep 2003 13:10:35 -0000	1.5
--- result/HTML/reg1.html	3 Sep 2005 14:16:54 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Regression test 1</title></head>
  <body>
  <h1>Regression test 1</h1>
  <p>
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Regression test 1</title>
! </head>
  <body>
  <h1>Regression test 1</h1>
  <p>
Index: result/HTML/reg2.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/reg2.html,v
retrieving revision 1.5
diff -c -r1.5 reg2.html
*** result/HTML/reg2.html	3 Sep 2003 13:10:35 -0000	1.5
--- result/HTML/reg2.html	3 Sep 2005 14:17:18 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Regression test 2</title></head>
  <body>
  <h1>Regression test 2</h1>
  <p>
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Regression test 2</title>
! </head>
  <body>
  <h1>Regression test 2</h1>
  <p>
Index: result/HTML/reg3.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/reg3.html,v
retrieving revision 1.5
diff -c -r1.5 reg3.html
*** result/HTML/reg3.html	3 Sep 2003 13:10:35 -0000	1.5
--- result/HTML/reg3.html	3 Sep 2005 14:17:26 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Regression test 3</title></head>
  <body>
  <h1>Regression test 3</h1>
  <p>
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Regression test 3</title>
! </head>
  <body>
  <h1>Regression test 3</h1>
  <p>
Index: result/HTML/reg4.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/reg4.html,v
retrieving revision 1.5
diff -c -r1.5 reg4.html
*** result/HTML/reg4.html	3 Sep 2003 13:10:35 -0000	1.5
--- result/HTML/reg4.html	3 Sep 2005 14:17:48 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Regression test 4</title></head>
  <body>
  <h1>Regression test 4</h1>
  <p>
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Regression test 4</title>
! </head>
  <body>
  <h1>Regression test 4</h1>
  <p>
Index: result/HTML/script.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/script.html,v
retrieving revision 1.3
diff -c -r1.3 script.html
*** result/HTML/script.html	3 Sep 2003 13:10:35 -0000	1.3
--- result/HTML/script.html	3 Sep 2005 14:17:56 -0000
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Script tests</title></head>
  <body>
  <script language="javascript">
      if (window.open<max) ;
--- 1,9 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Script tests</title>
! </head>
  <body>
  <script language="javascript">
      if (window.open<max) ;
Index: result/HTML/test2.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/test2.html,v
retrieving revision 1.8
diff -c -r1.8 test2.html
*** result/HTML/test2.html	1 Sep 2005 09:52:30 -0000	1.8
--- result/HTML/test2.html	3 Sep 2005 14:18:39 -0000
***************
*** 1,6 ****
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><title>Linux Today</title></head>
  <body bgcolor="White" link="Blue" text="Black" vlink="Black" alink="Red">
  
  <center>
--- 1,9 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <title>Linux Today</title>
! </head>
  <body bgcolor="White" link="Blue" text="Black" vlink="Black" alink="Red">
  
  <center>
Index: result/HTML/test3.html
===================================================================
RCS file: /cvs/gnome/libxml2/result/HTML/test3.html,v
retrieving revision 1.13
diff -c -r1.13 test3.html
*** result/HTML/test3.html	1 Sep 2005 09:52:30 -0000	1.13
--- result/HTML/test3.html	3 Sep 2005 14:18:30 -0000
***************
*** 1,18 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head><base target="contents"></head>
  <body>
! <a name="ProblemDomain.Package"><h2>Component Package diagram ProblemDomain</h2>  </a><p></p>
  <hr>
  <dl>
  <dt>
! <b>Stereotype </b>problem domain</dt>  <dt>
! <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>
  </dl>
--- 1,21 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
  <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
! <base target="contents">
! </head>
  <body>
! <a name="ProblemDomain.Package"><h2>Component Package diagram ProblemDomain</h2>
  </a><p></p>
  <hr>
  <dl>
  <dt>
! <b>Stereotype </b>problem domain</dt>
  <dt>
! <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>
  </dl>
***************
*** 20,44 ****
  <hr>
  <dl>
  <dt><h4>Class <a href="HumanInterface.FamilyFrame.html#HumanInterface.FamilyFrame">HumanInterface.FamilyFrame</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Birth.html#ProblemDomain.Birth">ProblemDomain.Birth</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Death.html#ProblemDomain.Death">ProblemDomain.Death</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Divorce.html#ProblemDomain.Divorce">ProblemDomain.Divorce</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Family.html#ProblemDomain.Family">ProblemDomain.Family</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Individual.html#ProblemDomain.Individual">ProblemDomain.Individual</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.LifeEvent.html#ProblemDomain.LifeEvent">ProblemDomain.LifeEvent</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Marriage.html#ProblemDomain.Marriage">ProblemDomain.Marriage</a>
! </h4></dt>  <dt><h4>Class <a href="ProblemDomain.Note.html#ProblemDomain.Note">ProblemDomain.Note</a>
! </h4></dt>  </dl>
! <h4><b>Links</b></h4>  <ul><li>
  <b>Link to </b><a href="HumanInterface.Package.html#HumanInterface.Package">HumanInterface</a>
  </li></ul>
--- 23,47 ----
  <hr>
  <dl>
  <dt><h4>Class <a href="HumanInterface.FamilyFrame.html#HumanInterface.FamilyFrame">HumanInterface.FamilyFrame</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Birth.html#ProblemDomain.Birth">ProblemDomain.Birth</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Death.html#ProblemDomain.Death">ProblemDomain.Death</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Divorce.html#ProblemDomain.Divorce">ProblemDomain.Divorce</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Family.html#ProblemDomain.Family">ProblemDomain.Family</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Individual.html#ProblemDomain.Individual">ProblemDomain.Individual</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.LifeEvent.html#ProblemDomain.LifeEvent">ProblemDomain.LifeEvent</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Marriage.html#ProblemDomain.Marriage">ProblemDomain.Marriage</a>
! </h4></dt>
  <dt><h4>Class <a href="ProblemDomain.Note.html#ProblemDomain.Note">ProblemDomain.Note</a>
! </h4></dt>
  </dl>
! <h4><b>Links</b></h4>
  <ul><li>
  <b>Link to </b><a href="HumanInterface.Package.html#HumanInterface.Package">HumanInterface</a>
  </li></ul>
Index: win32/Makefile.msvc
===================================================================
RCS file: /cvs/gnome/libxml2/win32/Makefile.msvc,v
retrieving revision 1.30
diff -c -r1.30 Makefile.msvc
*** win32/Makefile.msvc	31 Jul 2005 14:05:18 -0000	1.30
--- win32/Makefile.msvc	24 Aug 2005 00:55:43 -0000
***************
*** 320,326 ****
  
  # TESTS
  
! tests :  XPathtests
  
  XPathtests : $(BINDIR)\testXPath.exe
  	@echo. 2> .memdump
--- 320,326 ----
  
  # TESTS
  
! tests :  XMLtests XPathtests
  
  XPathtests : $(BINDIR)\testXPath.exe
  	@echo. 2> .memdump
***************
*** 376,382 ****
  			del result.%%~nxI result2.%%~nxI\
  		) \
  	)	
! 
  				
  
  
--- 376,396 ----
  			del result.%%~nxI result2.%%~nxI\
  		) \
  	)	
! 	@echo ## XML regression tests on memory
! 	-@for %%I in ($(XML_SRCDIR)\test\*) do @( \
! 		if not exist $(XML_SRCDIR)\result\%%~nxI ( \
! 			echo New test file %%~nxI &\
! 			$(BINDIR)\xmllint.exe --memory  %%I > $(XML_SRCDIR)\result\%%~nxI && \
! 			findstr /C:"MEMORY ALLOCATED" .memdump | findstr /C:"MEMORY ALLOCATED : 0" > null \
! 		) ELSE ( \
! 			$(BINDIR)\xmllint.exe --memory %%I 2>&1 > result.%%~nxI && \
! 			findstr /C:"MEMORY ALLOC" .memdump | findstr /C:"MEMORY ALLOCATED : 0" > null && \
! 			fc $(XML_SRCDIR)\result\%%~nxI result.%%~nxI > null && \
! 			$(BINDIR)\xmllint.exe result.%%~nxI 2>&1 > result2.%%~nxI | findstr /V /C:"failed to load external entity" && \
! 			fc result.%%~nxI result2.%%~nxI & \
! 			del result.%%~nxI result2.%%~nxI\
! 		) \
! 	)