Index: build.xml
===================================================================
retrieving revision 1.122
diff -u -r1.122 build.xml
--- build.xml	21 Jan 2004 17:46:03 -0000	1.122
+++ build.xml	28 Jan 2004 23:13:27 -0000
@@ -507,7 +507,7 @@
 		<fileset dir="tests/level${level}/${module}/files" excludes="*.bak"/>
     </copy>
     <!--  copy XHTML 1.0 DTD's to output directory   -->
-    <copy todir="${build.dir}/ecmascript/level${level}/${module}">
+    <copy todir="${build.dir}/ecmascript/level${level}/${module}/files">
 		<fileset dir="${lib.dir}/xhtml1-dtd"/>
     </copy>
 
@@ -871,7 +871,7 @@
 
 	<xmlvalidate lenient="no" failonerror="yes"
 	             classname="org.apache.xerces.parsers.SAXParser">
-		<fileset dir="${tests.dir}/level1/core/files" includes="*.xml *.svg" excludes="nodtdstaff.*"/>  
+		<fileset dir="${tests.dir}/level1/core/files" includes="*.xml *.svg" excludes="hc_nodtdstaff.*"/>  
 	</xmlvalidate>
 </target>
 
Index: ecmascript/DOMTestCase.js
===================================================================
retrieving revision 1.30
diff -u -r1.30 DOMTestCase.js
--- ecmascript/DOMTestCase.js	15 Dec 2003 18:36:52 -0000	1.30
+++ ecmascript/DOMTestCase.js	28 Jan 2004 23:13:27 -0000
@@ -223,9 +223,9 @@
     this.async = true;
     this.fixedAttributeNames = [
         "validating",  "expandEntityReferences", "coalescing", 
-        "signed", "hasNullString", "ignoringElementContentWhitespace", "namespaceAware" ];
+        "signed", "hasNullString", "ignoringElementContentWhitespace", "namespaceAware", "ignoringComments" ];
 
-    this.fixedAttributeValues = [false,  true, false, true, true , false, false ];
+    this.fixedAttributeValues = [false,  true, false, true, true , false, false, true ];
     this.configurableAttributeNames = [ ];
     this.configurableAttributeValues = [ ];
     this.exception = null;
@@ -239,6 +239,16 @@
     return document.implementation;
 }
 
+IFrameBuilder.prototype.setContentType = function(contentType) {
+    this.contentType = contentType;
+    if (contentType == "text/html") {
+    	this.fixedAttributeValues[this.fixedAttributeValues.length - 1] = true;
+    } else {
+    	this.fixedAttributeValues[this.fixedAttributeValues.length - 1] = false;
+    }
+}
+
+
 
 IFrameBuilder.prototype.preload = function(frame, varname, url) {
   if (this.contentType == "text/html") {
@@ -312,9 +322,9 @@
     this.async = true;
     this.fixedAttributeNames = [
         "validating",  "expandEntityReferences", "coalescing", 
-        "signed", "hasNullString", "ignoringElementContentWhitespace", "namespaceAware" ];
+        "signed", "hasNullString", "ignoringElementContentWhitespace", "namespaceAware", "ignoringComments"];
 
-    this.fixedAttributeValues = [false,  true, false, true, true , false, false ];
+    this.fixedAttributeValues = [false,  true, false, true, true , false, false, false ];
     this.configurableAttributeNames = [ ];
     this.configurableAttributeValues = [ ];
     this.exception = null;
@@ -328,6 +338,10 @@
     }
 }
 
+SVGPluginBuilder.prototype.setContentType = function(contentType) {
+    this.contentType = contentType;
+}
+
 SVGPluginBuilder.prototype.getImplementation = function() {
   var embed = document.createElement("embed");
   embed.src = fileBase + url + getSuffix(this.contentType);
@@ -447,8 +461,8 @@
         "validating", "ignoringElementContentWhitespace"];
     this.configurableAttributeValues = [ false, false ];
     this.fixedAttributeNames = [ "signed", "hasNullString", 
-        "expandEntityReferences", "coalescing", "namespaceAware" ];
-    this.fixedAttributeValues = [ true, true, false, false, false ];
+        "expandEntityReferences", "coalescing", "namespaceAware", "ignoringComments" ];
+    this.fixedAttributeValues = [ true, true, false, false, false, false ];
 
     this.contentType = "text/xml";
     this.supportedContentTypes = [ 
@@ -470,6 +484,11 @@
     parser.validateOnParse = this.configurableAttributeValues[0];
     return parser;
   }
+  
+MSXMLBuilder.prototype.setContentType = function(contentType) {
+    this.contentType = contentType;
+}
+  
 
 MSXMLBuilder.prototype.preload = function(frame, varname, url) {
   if (this.async) {
@@ -594,8 +613,8 @@
     this.configurableAttributeNames = [ ];
     this.configurableAttributeValues = [ ];
     this.fixedAttributeNames = [ "validating", "ignoringElementContentWhitespace", "signed", 
-        "hasNullString", "expandEntityReferences", "coalescing", "namespaceAware" ];
-    this.fixedAttributeValues = [ false, false, true, true, false, false, false ];
+        "hasNullString", "expandEntityReferences", "coalescing", "namespaceAware", "ignoringComments" ];
+    this.fixedAttributeValues = [ false, false, true, true, false, false, false, false ];
 
     this.contentType = "text/xml";
     this.supportedContentTypes = [ 
@@ -616,6 +635,11 @@
     return document.implementation;
 }
 
+MozillaXMLBuilder.prototype.setContentType = function(contentType) {
+    this.contentType = contentType;
+}
+
+
 
 MozillaXMLBuilder.prototype.preload = function(frame, varname, url) {
   var domimpl = document.implementation;
@@ -662,8 +686,8 @@
     this.configurableAttributeNames = [ ];
     this.configurableAttributeValues = [ ];
     this.fixedAttributeNames = [ "validating", "ignoringElementContentWhitespace", "signed", 
-        "hasNullString", "expandEntityReferences", "coalescing", "namespaceAware" ];
-    this.fixedAttributeValues = [ false, false, true, true, false, false, true ];
+        "hasNullString", "expandEntityReferences", "coalescing", "namespaceAware", "ignoringComments" ];
+    this.fixedAttributeValues = [ false, false, true, true, false, false, true, false ];
 
     this.contentType = "text/xml";
     this.supportedContentTypes = [ 
@@ -685,6 +709,10 @@
 }
 
 
+DOM3LSBuilder.prototype.setContentType = function(contentType) {
+    this.contentType = contentType;
+}
+
 DOM3LSBuilder.prototype.preload = function(frame, varname, url) {
   if (this.async) {
       var domimpl = document.implementation;
@@ -813,7 +841,7 @@
             var contentTypeSet = false;
             for (var i = 0; i < builder.supportedContentTypes.length; i++) {
                 if (builder.supportedContentTypes[i] == contentType) {
-                    builder.contentType = contentType;
+                    builder.setContentType(contentType);
                     contentTypeSet = true;
                     break;
                 }
@@ -822,6 +850,14 @@
                 builder.exception = "Builder does not support content type " + contentType;
             }
         }
+        if (top.jsUnitParmHash.ignoringcomments) {
+            if (top.jsUnitParmHash.ignoringcomments == 'true') {
+                builder.setImplementationAttribute('ignoringComments', true);
+            } else {
+                builder.setImplementationAttribute('ignoringComments', false);
+            }
+        }
+        
     }
     catch(ex) {
         builder.exception = ex;
Index: ecmascript/DOMTestSuite.js
===================================================================
retrieving revision 1.2
diff -u -r1.2 DOMTestSuite.js
--- ecmascript/DOMTestSuite.js	17 Mar 2003 06:58:32 -0000	1.2
+++ ecmascript/DOMTestSuite.js	28 Jan 2004 23:13:28 -0000
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003 World Wide Web Consortium,
+Copyright (c) 2003-2004 World Wide Web Consortium,
 (Massachusetts Institute of Technology, Institut National de
 Recherche en Informatique et en Automatique, Keio University). All
 Rights Reserved. This program is distributed under the W3C's Software
@@ -54,6 +54,7 @@
     updateImplementationAttribute(document.forms[0].validating, "validating");
     updateImplementationAttribute(document.forms[0].coalescing, "coalescing");
     updateImplementationAttribute(document.forms[0].namespaceAware, "namespaceAware");
+    updateImplementationAttribute(document.forms[0].ignoringComments, "ignoringComments");
 
     var contentTypes = document.forms[0].contentType;
     for(i = 0; i < contentTypes.length; i++) {
@@ -109,8 +110,9 @@
 function setContentType(contentType) {
     for (var i = 0; i < builder.supportedContentTypes.length; i++) {
         if (builder.supportedContentTypes[i] == contentType) {
-            builder.contentType = contentType;
+            builder.setContentType(contentType);
             updateIncompatibleTests();
+            update();
             return;
         }
     }
@@ -125,7 +127,8 @@
     var i;
     if (loadedDocs != null) {
         for (i = 0; i < loadedDocs.length; i++) {
-            if (loadedDocs[i] == "staff" && !(builder.contentType == "text/xml" || builder.contentType == "image/svg+xml")) {
+            if ((loadedDocs[i] == "staff" || loadedDocs[i] == "nodtdstaff") && 
+            	!(builder.contentType == "text/xml" || builder.contentType == "image/svg+xml")) {
                 active = false;
                 break;
             }
Index: java/org/w3c/domts/DocumentBuilderSetting.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 DocumentBuilderSetting.java
--- java/org/w3c/domts/DocumentBuilderSetting.java	6 Jan 2004 06:57:00 -0000	1.2
+++ java/org/w3c/domts/DocumentBuilderSetting.java	28 Jan 2004 23:13:28 -0000
@@ -117,6 +117,19 @@
 			"schemaValidating",
 			false,
 			DocumentBuilderSettingStrategy.schemaValidating);
+
+	public final static DocumentBuilderSetting ignoringComments =
+		new DocumentBuilderSetting(
+			"ignoringComments",
+			true,
+			DocumentBuilderSettingStrategy.ignoringComments);
+
+	public final static DocumentBuilderSetting notIgnoringComments =
+		new DocumentBuilderSetting(
+			"ignoringComments",
+			false,
+			DocumentBuilderSettingStrategy.ignoringComments);
+
 	
 	/**
 	 * Protected constructor, use static members for supported settings.
Index: java/org/w3c/domts/DocumentBuilderSettingStrategy.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 DocumentBuilderSettingStrategy.java
--- java/org/w3c/domts/DocumentBuilderSettingStrategy.java	6 Jan 2004 06:57:00 -0000	1.2
+++ java/org/w3c/domts/DocumentBuilderSettingStrategy.java	28 Jan 2004 23:13:28 -0000
@@ -74,6 +74,22 @@
 		}
 	};
 
+	public static final DocumentBuilderSettingStrategy ignoringComments =
+		new DocumentBuilderSettingStrategy() {
+		public void applySetting(DocumentBuilderFactory factory, boolean value)
+			throws DOMTestIncompatibleException {
+			if (value) {
+				throw new DOMTestIncompatibleException(
+					new Exception("ignoreComments=true not supported"),
+					DocumentBuilderSetting.ignoringComments);
+			}
+		}
+		public boolean hasSetting(DOMTestDocumentBuilderFactory factory) {
+			return false;
+		}
+	};
+
+	
 	public static final DocumentBuilderSettingStrategy namespaceAware =
 		new DocumentBuilderSettingStrategy() {
 		public void applySetting(DocumentBuilderFactory factory, boolean value)
Index: tests/level1/core/hc_commentgetcomment.xml
===================================================================
retrieving revision 1.1
diff -u -r1.1 hc_commentgetcomment.xml
--- tests/level1/core/hc_commentgetcomment.xml	10 Jun 2002 04:18:15 -0000	1.1
+++ tests/level1/core/hc_commentgetcomment.xml	28 Jan 2004 23:13:29 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001-2004 World Wide Web Consortium,
 (Massachusetts Institute of Technology, Institut National de
 Recherche en Informatique et en Automatique, Keio University). All
 Rights Reserved. This program is distributed under the W3C's Software
@@ -13,7 +13,7 @@
 
 <test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_commentgetcomment">
 <metadata>
-<title>hc_commentGetComment</title>
+<title>hc_commentgetcomment</title>
 <creator>Curt Arnold</creator>
 <description>
     A comment is all the characters between the starting
@@ -31,7 +31,10 @@
 <subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-F68D080"/>
 <!--Node.nodeType attribute -->
 <subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-111237558"/>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-111237558"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=509"/>
 </metadata>
+<implementationAttribute name="ignoringComments" value="false"/>
 <var name="doc" type="Document"/>
 <var name="elementList" type="NodeList"/>
 <var name="child" type="Node"/>
@@ -39,6 +42,7 @@
 <var name="childValue" type="DOMString"/>
 <var name="commentCount" type="int" value="0"/>
 <var name="childType" type="int"/>
+<var name="attributes" type="NamedNodeMap"/>
 <load var="doc" href="hc_staff" willBeModified="false"/>
 <childNodes obj="doc" var="elementList"/>
 <for-each collection="elementList" member="child">
@@ -49,6 +53,8 @@
 <assertEquals actual="childName" expected='"#comment"' ignoreCase="false" id="nodeName"/>
 <nodeValue obj="child" var="childValue"/>
 <assertEquals actual="childValue" expected='" This is comment number 1."' id="nodeValue" ignoreCase="false"/>
+<attributes var="attributes" obj="child"/>
+<assertNull actual="attributes" id="attributes"/>
 <plus var="commentCount" op1="commentCount" op2="1"/>
 </if>
 </for-each>
Index: tests/level1/core/files/hc_nodtdstaff.svg
===================================================================
retrieving revision 1.1
diff -u -r1.1 hc_nodtdstaff.svg
--- tests/level1/core/files/hc_nodtdstaff.svg	24 Jan 2004 06:38:05 -0000	1.1
+++ tests/level1/core/files/hc_nodtdstaff.svg	28 Jan 2004 23:13:30 -0000
@@ -1,4 +1,4 @@
-<svg xmlns='http://www.w3.org/2000/svg'><rect x="0" y="0" width="100" height="100"/><script type="text/ecmascript">&svgtest;&svgunit;</script><head xmlns='http://www.w3.org/1999/xhtml'><title>hc_staff</title></head><body xmlns='http://www.w3.org/1999/xhtml'>
+<svg xmlns='http://www.w3.org/2000/svg'><rect x="0" y="0" width="100" height="100"/><head xmlns='http://www.w3.org/1999/xhtml'><title>hc_nodtdstaff</title></head><body xmlns='http://www.w3.org/1999/xhtml'>
  <p>
   <em>EMP0001</em>
   <strong>Margaret Martin</strong>
Index: tests/level1/core/files/hc_staff.html
===================================================================
retrieving revision 1.3
diff -u -r1.3 hc_staff.html
--- tests/level1/core/files/hc_staff.html	27 Jun 2003 18:08:13 -0000	1.3
+++ tests/level1/core/files/hc_staff.html	28 Jan 2004 23:13:30 -0000
@@ -1,4 +1,3 @@
-<?TEST-STYLE PIDATA?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" 
     "http://www.w3.org/TR/html4/strict.dtd" >
 <!-- This is comment number 1.-->
Index: transforms/dom-to-dtd.xsl
===================================================================
retrieving revision 1.49
diff -u -r1.49 dom-to-dtd.xsl
--- transforms/dom-to-dtd.xsl	21 Jan 2004 17:46:03 -0000	1.49
+++ transforms/dom-to-dtd.xsl	28 Jan 2004 23:13:37 -0000
@@ -845,7 +845,7 @@
 &lt;!ATTLIST implementationAttribute
 	id ID #IMPLIED
 	value (true|false) #REQUIRED
-	name (validating|coalescing|expandEntityReferences|namespaceAware|ignoringElementContentWhitespace|signed|hasNullString|schemaValidating) #REQUIRED
+	name (validating|coalescing|expandEntityReferences|namespaceAware|ignoringElementContentWhitespace|signed|hasNullString|schemaValidating|ignoringComments) #REQUIRED
 &gt;
 
 
Index: transforms/dom-to-xsd.xsl
===================================================================
retrieving revision 1.58
diff -u -r1.58 dom-to-xsd.xsl
--- transforms/dom-to-xsd.xsl	21 Jan 2004 17:46:03 -0000	1.58
+++ transforms/dom-to-xsd.xsl	28 Jan 2004 23:13:37 -0000
@@ -1217,6 +1217,7 @@
 								<xs:enumeration value="signed"/>
 								<xs:enumeration value="hasNullString"/>
 								<xs:enumeration value="schemaValidating"/>
+								<xs:enumeration value="ignoringComments"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:attribute>
Index: transforms/test-to-jsunit.xsl
===================================================================
retrieving revision 1.16
diff -u -r1.16 test-to-jsunit.xsl
--- transforms/test-to-jsunit.xsl	15 Dec 2003 21:37:45 -0000	1.16
+++ transforms/test-to-jsunit.xsl	28 Jan 2004 23:13:37 -0000
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2001-2003 World Wide Web Consortium,
+Copyright (c) 2001-2004 World Wide Web Consortium,
 (Massachusetts Institute of Technology, Institut National de
 Recherche en Informatique et en Automatique, Keio University). All
 Rights Reserved. This program is distributed under the W3C's Software
@@ -262,6 +262,11 @@
                                 <td align="center"><input type="radio" name="namespaceAware" value="true"  disabled="disabled" onclick="setImplementationAttribute('namespaceAware', true)"></input></td>
                                 <td align="center"><input type="radio" name="namespaceAware" value="false"  disabled="disabled" checked="checked" onclick="setImplementationAttribute('namespaceAware', true)"></input></td>
                             </tr>
+                            <tr>
+                                <td>Ignoring comments</td>
+                                <td align="center"><input type="radio" name="ignoringComments" value="true" disabled="disabled" checked="checked" onclick="setImplementationAttribute('ignoringComments', true)"></input></td>
+                                <td align="center"><input type="radio" name="ignoringComments" value="false"  disabled="disabled" onclick="setImplementationAttribute('ignoringComments', false)"></input></td>
+                            </tr>
                         </table>
                     </td>
                     <td valign="top">