Index: build.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/build.xml,v
retrieving revision 1.96
diff -u -r1.96 build.xml
--- build.xml	28 Jun 2003 19:35:59 -0000	1.96
+++ build.xml	30 Jun 2003 03:27:28 -0000
@@ -1709,9 +1709,9 @@
 <target name="clean" depends="init">
 	<delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
-    <delete file="tests\level1\**\dom1.*"/>
-    <delete file="tests\level2\**\dom2.*"/>
-    <delete file="tests\level3\**\dom3.*"/>
+    <delete>
+    	<fileset dir="tests" includes="**/dom?.dtd **/dom?.xsd **/test-to-html.xsl"/>
+    </delete>
 </target>
 
 <target name="dom3-available" depends="init">
Index: tests/level2/core/hc_attrcreatedocumentfragment.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/hc_attrcreatedocumentfragment.xml,v
retrieving revision 1.1
diff -u -r1.1 hc_attrcreatedocumentfragment.xml
--- tests/level2/core/hc_attrcreatedocumentfragment.xml	27 Jun 2003 17:52:58 -0000	1.1
+++ tests/level2/core/hc_attrcreatedocumentfragment.xml	30 Jun 2003 03:27:32 -0000
@@ -11,7 +11,7 @@
 See W3C License http://www.w3.org/Consortium/Legal/ for more details.
 --><!DOCTYPE test SYSTEM "dom2.dtd">
 
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_attrcreatedocumentfragment">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="hc_attrcreatedocumentfragment">
 <metadata>
 <title>hc_attrCreateDocumentFragment</title>
 <creator>Curt Arnold</creator>
@@ -20,11 +20,9 @@
   Create a new DocumentFragment and add a newly created Element node(with one attribute).  
   Once the element is added, its attribute should be available as an attribute associated 
   with an Element within a DocumentFragment.
-
-  Unlike DOM L1 Core equivalent, this test can expect a specific case for HTML documents.
 </description>
 
-<date qualifier="created">2003-06-27</date>
+<date qualifier="created">2002-06-09</date>
 <!--  createDocumentFragment  -->
 <subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-35CB04B5"/>
 <!--  setAttribute -->
@@ -33,23 +31,29 @@
 <subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-B63ED1A3"/>
 <subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=236"/>
 <subject resource="http://lists.w3.org/Archives/Public/www-dom-ts/2003Jun/0011.html"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=184"/>
 </metadata>
 <var name="doc" type="Document"/>
 <var name="docFragment" type="DocumentFragment"/>
 <var name="newOne" type="Element"/>
 <var name="domesticNode" type="Node"/>
-<var name="domesticAttr" type="NamedNodeMap"/>
-<var name="attrs" type="Attr"/>
+<var name="attributes" type="NamedNodeMap"/>
+<var name="attribute" type="Attr"/>
 <var name="attrName" type="DOMString"/>
 <var name="appendedChild" type="Node"/>
+<var name="langAttrCount" type="int" value="0"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <createDocumentFragment obj="doc" var="docFragment"/>
 <createElement obj="doc" var="newOne" tagName='"html"'/>
 <setAttribute obj="newOne" name='"lang"' value='"EN"'/>
 <appendChild var="appendedChild" obj="docFragment" newChild="newOne"/>
 <firstChild interface="Node" obj="docFragment" var="domesticNode"/>
-<attributes obj="domesticNode" var="domesticAttr"/>
-<item interface="NamedNodeMap" obj="domesticAttr" var="attrs" index="0"/>
-<name interface="Attr" obj="attrs" var="attrName"/>
-<assertEquals actual="attrName" expected='"lang"' id="attrName" ignoreCase="auto"/>
+<attributes obj="domesticNode" var="attributes"/>
+<for-each collection="attributes" member="attribute">
+    <nodeName var="attrName" obj="attribute"/>
+    <if><equals expected='"lang"' actual="attrName" ignoreCase="auto"/>
+        <increment var="langAttrCount" value="1"/>
+    </if>
+</for-each>
+<assertEquals expected="1" actual="langAttrCount" id="hasLangAttr" ignoreCase="false"/> 
 </test>
Index: tests/level2/core/nodesetprefix09.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/nodesetprefix09.xml,v
retrieving revision 1.2
diff -u -r1.2 nodesetprefix09.xml
--- tests/level2/core/nodesetprefix09.xml	4 Dec 2002 00:42:47 -0000	1.2
+++ tests/level2/core/nodesetprefix09.xml	30 Jun 2003 03:27:32 -0000
@@ -30,7 +30,7 @@
 <subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix"/>
 </metadata>
 <var name="doc" type="Document"/>
-<var name="value" type="DOMString" value='"\&quot;#$%&amp;\&apos;()@"' />
+<var name="value" type="DOMString" value='"#$%&amp;&apos;()@"' />
 <var name="element" type="Element"/>
 <load var="doc" href="staffNS" willBeModified="false"/>
 <createElementNS var="element" obj="doc" namespaceURI='"http://www.w3.org/DOM/Test/L2"' qualifiedName='"dom:elem"'/>
Index: tests/level2/core/svg_alltests.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/svg_alltests.xml,v
retrieving revision 1.3
diff -u -r1.3 svg_alltests.xml
--- tests/level2/core/svg_alltests.xml	4 Dec 2002 00:42:47 -0000	1.3
+++ tests/level2/core/svg_alltests.xml	30 Jun 2003 03:27:32 -0000
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-<!--
-Copyright (c) 2001 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
-Intellectual Property License. This program is distributed in the
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
-See W3C License http://www.w3.org/Consortium/Legal/ for more details.
---><!DOCTYPE suite SYSTEM "dom2.dtd">
-
-<suite xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="svg_alltests" contentType="image/xml+svg">
-    <suite.member href="alltests.xml"/>
-</suite>
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+<!--
+Copyright (c) 2001 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
+Intellectual Property License. This program is distributed in the
+hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
+See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+--><!DOCTYPE suite SYSTEM "dom2.dtd">
+
+<suite xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="svg_alltests" contentType="image/svg+xml">
+    <suite.member href="alltests.xml"/>
+</suite>
Index: transforms/dom-to-xsd.xsl
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/transforms/dom-to-xsd.xsl,v
retrieving revision 1.37
diff -u -r1.37 dom-to-xsd.xsl
--- transforms/dom-to-xsd.xsl	23 Apr 2003 05:48:24 -0000	1.37
+++ transforms/dom-to-xsd.xsl	30 Jun 2003 03:27:35 -0000
@@ -1120,8 +1120,8 @@
 				</xs:annotation>
 				<xs:complexType>
 					<xs:attribute name="id" type="xs:ID" use="optional"/>
-					<xs:attribute name="feature" type="stringLiteral" use="required"/>
-					<xs:attribute name="version" type="stringLiteral" use="optional"/>
+					<xs:attribute name="feature" type="variableOrStringLiteral" use="required"/>
+					<xs:attribute name="version" type="variableOrStringLiteral" use="optional"/>
                     <xs:attribute name="value" type="xs:boolean" use="optional"/>
 					<xs:attribute name="var" type="variable" use="optional"/>
 					<xs:attribute name="obj" type="variable" use="optional"/>