From 501852e21d843601d2501cfe9cb31a13f259cf50 Mon Sep 17 00:00:00 2001
From: rsk1994 <rsk1coder99@gmail.com>
Date: Thu, 15 May 2014 05:43:49 +0530
Subject: Typecasting POC to correct DOMTSHandler. A minor dupliction fixed in
 Anchor Element. Image <img> Element

---
 Makefile                                           |   1 +
 include/dom/dom.h                                  |   1 +
 include/dom/html/html_anchor_element.h             |   6 -
 include/dom/html/html_image_element.h              |  84 +++++++
 src/html/Makefile                                  |   4 +-
 src/html/TODO                                      |   2 +-
 src/html/html_document.c                           |   4 +
 src/html/html_document_strings.h                   |   2 +
 src/html/html_image_element.c                      | 245 +++++++++++++++++++++
 src/html/html_image_element.h                      |  45 ++++
 test/DOMTSHandler.pm                               |  16 +-
 .../tests/level1/html/HTMLImageElement01.xml       |  42 ++++
 .../tests/level1/html/HTMLImageElement01.xml.kfail |  42 ----
 .../tests/level1/html/HTMLImageElement02.xml       |  43 ++++
 .../tests/level1/html/HTMLImageElement02.xml.kfail |  43 ----
 .../tests/level1/html/HTMLImageElement03.xml       |  43 ++++
 .../tests/level1/html/HTMLImageElement03.xml.kfail |  43 ----
 .../tests/level1/html/HTMLImageElement04.xml       |  42 ++++
 .../tests/level1/html/HTMLImageElement04.xml.kfail |  42 ----
 .../tests/level1/html/HTMLImageElement07.xml       |  42 ++++
 .../tests/level1/html/HTMLImageElement07.xml.kfail |  42 ----
 .../tests/level1/html/HTMLImageElement08.xml       |  43 ++++
 .../tests/level1/html/HTMLImageElement08.xml.kfail |  43 ----
 .../tests/level1/html/HTMLImageElement09.xml       |  42 ++++
 .../tests/level1/html/HTMLImageElement09.xml.kfail |  42 ----
 .../tests/level1/html/HTMLImageElement10.xml       |  42 ++++
 .../tests/level1/html/HTMLImageElement10.xml.kfail |  42 ----
 .../tests/level2/html/.HTMLImageElement05.xml.swp  | Bin 0 -> 12288 bytes
 .../tests/level2/html/HTMLImageElement05.xml       |  41 ++++
 .../tests/level2/html/HTMLImageElement05.xml.kfail |  41 ----
 .../tests/level2/html/HTMLImageElement06.xml       |  42 ++++
 .../tests/level2/html/HTMLImageElement06.xml.kfail |  42 ----
 .../tests/level2/html/HTMLImageElement11.xml       |  42 ++++
 .../tests/level2/html/HTMLImageElement11.xml.kfail |  42 ----
 .../tests/level2/html/HTMLImageElement12.xml       |  41 ++++
 .../tests/level2/html/HTMLImageElement12.xml.kfail |  41 ----
 test/testcases/tests/level2/html/files/img.html    |  13 ++
 test/testcases/tests/level2/html/files/img.xhtml   |  15 ++
 test/testcases/tests/level2/html/files/img.xml     |  15 ++
 39 files changed, 945 insertions(+), 518 deletions(-)
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement01.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement02.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement03.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement04.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement07.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement08.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement09.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
 create mode 100644 test/testcases/tests/level1/html/HTMLImageElement10.xml
 delete mode 100644 test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
 create mode 100644 test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp
 create mode 100644 test/testcases/tests/level2/html/HTMLImageElement05.xml
 delete mode 100644 test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail
 create mode 100644 test/testcases/tests/level2/html/HTMLImageElement06.xml
 delete mode 100644 test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail
 create mode 100644 test/testcases/tests/level2/html/HTMLImageElement11.xml
 delete mode 100644 test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail
 create mode 100644 test/testcases/tests/level2/html/HTMLImageElement12.xml
 delete mode 100644 test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail
 create mode 100644 test/testcases/tests/level2/html/files/img.html
 create mode 100644 test/testcases/tests/level2/html/files/img.xhtml
 create mode 100644 test/testcases/tests/level2/html/files/img.xml

diff --git a/Makefile b/Makefile
index ab7d003..76441f2 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_font_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_mod_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_anchor_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_basefont_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_image_element.h
 
 INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
 INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/include/dom/dom.h b/include/dom/dom.h
index 7c788fd..ea61dfa 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -75,6 +75,7 @@
 #include <dom/html/html_mod_element.h>
 #include <dom/html/html_anchor_element.h>
 #include <dom/html/html_basefont_element.h>
+#include <dom/html/html_image_element.h>
 
 /* DOM Events header */
 #include <dom/events/events.h>
diff --git a/include/dom/html/html_anchor_element.h b/include/dom/html/html_anchor_element.h
index 5d08e75..c7bcdea 100644
--- a/include/dom/html/html_anchor_element.h
+++ b/include/dom/html/html_anchor_element.h
@@ -64,12 +64,6 @@ dom_exception dom_html_anchor_element_get_rev(
 dom_exception dom_html_anchor_element_set_rev(
 	dom_html_anchor_element *anchor, dom_string *rev);
 
-dom_exception dom_html_anchor_element_get_hreflang(
-	dom_html_anchor_element *anchor, dom_string **hreflang);
-
-dom_exception dom_html_anchor_element_set_hreflang(
-	dom_html_anchor_element *anchor, dom_string *hreflang);
-
 dom_exception dom_html_anchor_element_get_shape(
 	dom_html_anchor_element *anchor, dom_string **shape);
 
diff --git a/include/dom/html/html_image_element.h b/include/dom/html/html_image_element.h
index 2e182d5..7e3e879 100644
--- a/include/dom/html/html_image_element.h
+++ b/include/dom/html/html_image_element.h
@@ -3,5 +3,89 @@
  * Licensed under the MIT License,
  *                http://www.opensource.org/licenses/mit-license.php
  * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
  */
 
+#ifndef dom_html_image_element_h_
+#define dom_html_image_element_h_
+
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_image_element dom_html_image_element;
+
+
+dom_exception dom_html_image_element_get_name(
+	dom_html_image_element *image, dom_string **name);
+
+dom_exception dom_html_image_element_set_name(
+	dom_html_image_element *image, dom_string *name);
+
+dom_exception dom_html_image_element_get_align(
+	dom_html_image_element *image, dom_string **align);
+
+dom_exception dom_html_image_element_set_align(
+	dom_html_image_element *image, dom_string *align);
+
+dom_exception dom_html_image_element_get_alt(
+	dom_html_image_element *image, dom_string **alt);
+
+dom_exception dom_html_image_element_set_alt(
+	dom_html_image_element *image, dom_string *alt);
+
+dom_exception dom_html_image_element_get_border(
+	dom_html_image_element *image, dom_string **border);
+
+dom_exception dom_html_image_element_set_border(
+	dom_html_image_element *image, dom_string *border);
+
+dom_exception dom_html_image_element_get_long_desc(
+	dom_html_image_element *image, dom_string **long_desc);
+
+dom_exception dom_html_image_element_set_long_desc(
+	dom_html_image_element *image, dom_string *long_desc);
+
+dom_exception dom_html_image_element_get_src(
+	dom_html_image_element *image, dom_string **src);
+
+dom_exception dom_html_image_element_set_src(
+	dom_html_image_element *image, dom_string *src);
+
+dom_exception dom_html_image_element_get_use_map(
+	dom_html_image_element *image, dom_string **use_map);
+
+dom_exception dom_html_image_element_set_use_map(
+	dom_html_image_element *image, dom_string *use_map);
+
+dom_exception dom_html_image_element_get_height(
+	dom_html_image_element *image, int32_t *height);
+
+dom_exception dom_html_image_element_set_height(
+	dom_html_image_element *image, uint32_t height);
+
+dom_exception dom_html_image_element_get_hspace(
+	dom_html_image_element *image, int32_t *hspace);
+
+dom_exception dom_html_image_element_set_hspace(
+	dom_html_image_element *image, uint32_t hspace);
+
+dom_exception dom_html_image_element_get_vspace(
+	dom_html_image_element *image, int32_t *vspace);
+
+dom_exception dom_html_image_element_set_vspace(
+	dom_html_image_element *image, uint32_t vspace);
+
+dom_exception dom_html_image_element_get_width(
+	dom_html_image_element *image, int32_t *width);
+
+dom_exception dom_html_image_element_set_width(
+	dom_html_image_element *image, uint32_t width);
+
+dom_exception dom_html_image_element_get_is_map(
+	dom_html_image_element *ele, bool *is_map);
+
+dom_exception dom_html_image_element_set_is_map(
+	dom_html_image_element *ele, bool is_map);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index f988cff..b02fd54 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -13,10 +13,10 @@ DIR_SOURCES := \
 	html_pre_element.c html_br_element.c html_label_element.c \
 	html_ulist_element.c html_olist_element.c html_li_element.c \
 	html_font_element.c html_mod_element.c html_anchor_element.c \
-	html_basefont_element.c
+	html_basefont_element.c html_image_element.c 
 
 UNINMPLEMENTED_SOURCES := \
-	 html_image_element.c html_object_element.c \
+	html_object_element.c \
 	html_param_element.c html_applet_element.c html_map_element.c \
 	html_area_element.c html_script_element.c html_table_element.c \
 	html_tablecaption_element.c html_tablecol_element.c html_tablesection_element.c \
diff --git a/src/html/TODO b/src/html/TODO
index eddb871..ddca8c4 100644
--- a/src/html/TODO
+++ b/src/html/TODO
@@ -39,7 +39,7 @@ HTMLFontElement		html_font_element		DONE
 HTMLHRElement		html_hr_element			DONE
 HTMLModElement		html_mod_element		DONE
 HTMLAnchorElement	html_anchor_element		DONE
-HTMLImageElement	html_image_element		MISSING
+HTMLImageElement	html_image_element		DONE
 HTMLObjectElement	html_object_element		MISSING
 HTMLParamElement	html_param_element		MISSING
 HTMLAppletElement	html_applet_element		MISSING
diff --git a/src/html/html_document.c b/src/html/html_document.c
index 7841087..28e3ac0 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -43,6 +43,7 @@
 #include "html/html_mod_element.h"
 #include "html/html_anchor_element.h"
 #include "html/html_basefont_element.h"
+#include "html/html_image_element.h"
 
 #include "core/attr.h"
 #include "core/string.h"
@@ -303,6 +304,9 @@ _dom_html_document_create_element_internal(dom_html_document *html,
 	} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_BASEFONT])) {
 		exc = _dom_html_base_font_element_create(html, namespace, prefix,
 				(dom_html_base_font_element **) result);
+	} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_IMG])) {
+		exc = _dom_html_image_element_create(html, namespace, prefix,
+				(dom_html_image_element **) result);
 	} else {
 		exc =  _dom_html_element_create(html, tag_name, namespace,
 						prefix, result);
diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h
index 73cb64c..dae686c 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -89,9 +89,11 @@ HTML_DOCUMENT_STRINGS_ACTION1(color)
 HTML_DOCUMENT_STRINGS_ACTION1(face)
 HTML_DOCUMENT_STRINGS_ACTION1(coords)
 HTML_DOCUMENT_STRINGS_ACTION1(shape)
+HTML_DOCUMENT_STRINGS_ACTION1(border)
 HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex)
 HTML_DOCUMENT_STRINGS_ACTION(html_for,for)
 HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime)
+HTML_DOCUMENT_STRINGS_ACTION(long_desc,longdesc)
 /* HTML_DOCUMENT_STRINGS_ACTION1(type) */
 HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap)
 /* HTML_DOCUMENT_STRINGS_ACTION1(value) */
diff --git a/src/html/html_image_element.c b/src/html/html_image_element.c
index 2e182d5..77bdd27 100644
--- a/src/html/html_image_element.c
+++ b/src/html/html_image_element.c
@@ -3,5 +3,250 @@
  * Licensed under the MIT License,
  *                http://www.opensource.org/licenses/mit-license.php
  * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
  */
 
+#include <assert.h>
+#include <stdlib.h>
+
+#include <dom/html/html_image_element.h>
+
+#include "html/html_document.h"
+#include "html/html_image_element.h"
+
+#include "core/node.h"
+#include "core/attr.h"
+#include "utils/utils.h"
+
+static struct dom_element_protected_vtable _protect_vtable = {
+	{
+		DOM_NODE_PROTECT_VTABLE_HTML_IMAGE_ELEMENT
+	},
+	DOM_HTML_IMAGE_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_image_element object
+ *
+ * \param doc  The document object
+ * \param ele  The returned element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_image_element_create(struct dom_html_document *doc,
+		dom_string *namespace, dom_string *prefix,
+		struct dom_html_image_element **ele)
+{
+	struct dom_node_internal *node;
+
+	*ele = malloc(sizeof(dom_html_image_element));
+	if (*ele == NULL)
+		return DOM_NO_MEM_ERR;
+
+	/* Set up vtables */
+	node = (struct dom_node_internal *) *ele;
+	node->base.vtable = &_dom_html_element_vtable;
+	node->vtable = &_protect_vtable;
+
+	return _dom_html_image_element_initialise(doc, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_image_element object
+ *
+ * \param doc  The document object
+ * \param ele  The dom_html_image_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_image_element_initialise(struct dom_html_document *doc,
+		dom_string *namespace, dom_string *prefix,
+		struct dom_html_image_element *ele)
+{
+	return _dom_html_element_initialise(doc, &ele->base,
+					    doc->memoised[hds_IMG],
+					    namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_image_element object
+ *
+ * \param ele  The dom_html_image_element object
+ */
+void _dom_html_image_element_finalise(struct dom_html_image_element *ele)
+{
+	_dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_image_element object
+ *
+ * \param ele  The dom_html_image_element object
+ */
+void _dom_html_image_element_destroy(struct dom_html_image_element *ele)
+{
+	_dom_html_image_element_finalise(ele);
+	free(ele);
+}
+
+/*------------------------------------------------------------------------*/
+/* The protected virtual functions */
+
+/* The virtual function used to parse attribute value, see src/core/element.c
+ * for detail */
+dom_exception _dom_html_image_element_parse_attribute(dom_element *ele,
+		dom_string *name, dom_string *value,
+		dom_string **parsed)
+{
+	UNUSED(ele);
+	UNUSED(name);
+
+	dom_string_ref(value);
+	*parsed = value;
+
+	return DOM_NO_ERR;
+}
+
+/* The virtual destroy function, see src/core/node.c for detail */
+void _dom_virtual_html_image_element_destroy(dom_node_internal *node)
+{
+	_dom_html_image_element_destroy((struct dom_html_image_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_image_element_copy(dom_node_internal *old,
+		dom_node_internal **copy)
+{
+	return _dom_html_element_copy(old, copy);
+}
+
+/*-----------------------------------------------------------------------*/
+/* API functions */
+
+#define SIMPLE_GET(attr)						\
+	dom_exception dom_html_image_element_get_##attr(		\
+		dom_html_image_element *element,			\
+		dom_string **attr)					\
+	{								\
+		dom_exception ret;					\
+		dom_string *_memo_##attr;				\
+									\
+		_memo_##attr =						\
+			((struct dom_html_document *)			\
+			 ((struct dom_node_internal *)element)->owner)->\
+			memoised[hds_##attr];				\
+									\
+		ret = dom_element_get_attribute(element, _memo_##attr, attr); \
+									\
+		return ret;						\
+	}
+#define SIMPLE_SET(attr)						\
+dom_exception dom_html_image_element_set_##attr(			\
+		dom_html_image_element *element,			\
+		dom_string *attr)					\
+	{								\
+		dom_exception ret;					\
+		dom_string *_memo_##attr;				\
+									\
+		_memo_##attr =						\
+			((struct dom_html_document *)			\
+			 ((struct dom_node_internal *)element)->owner)->\
+			memoised[hds_##attr];				\
+									\
+		ret = dom_element_set_attribute(element, _memo_##attr, attr); \
+									\
+		return ret;						\
+	}
+
+#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr)
+
+SIMPLE_GET_SET(name);
+SIMPLE_GET_SET(align);
+SIMPLE_GET_SET(alt);
+SIMPLE_GET_SET(border);
+SIMPLE_GET_SET(long_desc);
+SIMPLE_GET_SET(src);
+SIMPLE_GET_SET(use_map);
+
+dom_exception dom_html_image_element_get_height(
+	dom_html_image_element *image, int32_t *height)
+{
+	return dom_html_element_get_int32_t_property(&image->base, "height",
+			SLEN("height"), height);
+}
+
+dom_exception dom_html_image_element_set_height(
+	dom_html_image_element *image, uint32_t height)
+{
+	return dom_html_element_set_int32_t_property(&image->base, "height",
+			SLEN("height"), height);
+}
+
+dom_exception dom_html_image_element_get_hspace(
+	dom_html_image_element *image, int32_t *hspace)
+{
+	return dom_html_element_get_int32_t_property(&image->base, "hspace",
+			SLEN("hspace"), hspace);
+}
+
+dom_exception dom_html_image_element_set_hspace(
+	dom_html_image_element *image, uint32_t hspace)
+{
+	return dom_html_element_set_int32_t_property(&image->base, "hspace",
+			SLEN("hspace"), hspace);
+}
+
+dom_exception dom_html_image_element_get_vspace(
+	dom_html_image_element *image, int32_t *vspace)
+{
+	return dom_html_element_get_int32_t_property(&image->base, "vspace",
+			SLEN("cspace"), vspace);
+}
+
+dom_exception dom_html_image_element_set_vspace(
+	dom_html_image_element *image, uint32_t vspace)
+{
+	return dom_html_element_set_int32_t_property(&image->base, "vspace",
+			SLEN("vsapce"), vspace);
+}
+
+dom_exception dom_html_image_element_get_width(
+	dom_html_image_element *image, int32_t *width)
+{
+	return dom_html_element_get_int32_t_property(&image->base, "width",
+			SLEN("width"), width);
+}
+
+dom_exception dom_html_image_element_set_width(
+	dom_html_image_element *image, uint32_t width)
+{
+	return dom_html_element_set_int32_t_property(&image->base, "width",
+			SLEN("width"), width);
+}
+
+/**
+ * Get the is_map property
+ *
+ * \param ele		The dom_html_image_element object
+ * \param is_map	The status
+ * \return 		DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_image_element_get_is_map(dom_html_image_element *ele,
+				                bool *is_map)
+{
+	return dom_html_element_get_bool_property(&ele->base, "ismap",
+			SLEN("ismap"), is_map);
+}
+
+/**
+ * Set the is_map property
+ *
+ * \param ele		The dom_html_image_element object
+ * \param is_map	The status
+ * \return 		DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_image_element_set_is_map(dom_html_image_element *ele,
+				                bool is_map)
+{
+	return dom_html_element_set_bool_property(&ele->base, "ismap",
+			SLEN("ismap"), is_map);
+}
+
diff --git a/src/html/html_image_element.h b/src/html/html_image_element.h
index 2e182d5..ac73a1b 100644
--- a/src/html/html_image_element.h
+++ b/src/html/html_image_element.h
@@ -3,5 +3,50 @@
  * Licensed under the MIT License,
  *                http://www.opensource.org/licenses/mit-license.php
  * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
  */
 
+#ifndef dom_internal_html_image_element_h_
+#define dom_internal_html_image_element_h_
+
+#include <dom/html/html_image_element.h>
+
+#include "html/html_element.h"
+
+struct dom_html_image_element {
+	struct dom_html_element base;
+			/**< The base class */
+};
+
+/* Create a dom_html_image_element object */
+dom_exception _dom_html_image_element_create(struct dom_html_document *doc,
+		dom_string *namespace, dom_string *prefix,
+		struct dom_html_image_element **ele);
+
+/* Initialise a dom_html_image_element object */
+dom_exception _dom_html_image_element_initialise(struct dom_html_document *doc,
+		dom_string *namespace, dom_string *prefix,
+		struct dom_html_image_element *ele);
+
+/* Finalise a dom_html_image_element object */
+void _dom_html_image_element_finalise(struct dom_html_image_element *ele);
+
+/* Destroy a dom_html_image_element object */
+void _dom_html_image_element_destroy(struct dom_html_image_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_image_element_parse_attribute(dom_element *ele,
+		dom_string *name, dom_string *value,
+		dom_string **parsed);
+void _dom_virtual_html_image_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_image_element_copy(dom_node_internal *old,
+		dom_node_internal **copy);
+
+#define DOM_HTML_IMAGE_ELEMENT_PROTECT_VTABLE \
+	_dom_html_image_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_IMAGE_ELEMENT \
+	_dom_virtual_html_image_element_destroy, \
+	_dom_html_image_element_copy
+
+#endif
diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm
index 645e841..6dfaae9 100644
--- a/test/DOMTSHandler.pm
+++ b/test/DOMTSHandler.pm
@@ -479,21 +479,29 @@ sub generate_load {
 	my ($self, $a) = @_;
 	my %ats = %$a;
 	my $doc = $ats{"var"};
-
 	$test_index ++;
+	my $var = $self->{"var"};
 	# define the test file path, use HTML if there is, otherwise using XML
 	# Attention: I intend to copy the test files to the program excuting dir
 	print "\tconst char *test$test_index = \"$ats{'href'}.html\";\n\n";
-	print "\t$doc = load_html(test$test_index, $ats{'willBeModified'});";
+	if ($var->{$doc} eq "Node") {
+		print "\t$doc = (dom_node*) load_html(test$test_index, $ats{'willBeModified'});";
+	} else {
+		print "\t$doc = load_html(test$test_index, $ats{'willBeModified'});";
+	}
 	print "\tif ($doc == NULL) {\n";
 	$test_index ++;
 	print "\t\tconst char *test$test_index = \"$ats{'href'}.xml\";\n\n";
-	print "\t\t$doc = load_xml(test$test_index, $ats{'willBeModified'});\n";
+	if ($var->{$doc} eq "Node") {
+		print "\t\t$doc = (dom_node *) load_xml(test$test_index, $ats{'willBeModified'});\n";
+	} else {
+		print "\t\t$doc = load_xml(test$test_index, $ats{'willBeModified'});\n";
+	}
 	print "\t\tif ($doc == NULL)\n";
 	print "\t\t\treturn 1;\n";
 	print "\t\t}\n";
 	print << "__EOF__";
-	exp = dom_document_get_implementation($doc, &doc_impl);
+	exp = dom_document_get_implementation((dom_document *) $doc, &doc_impl);
 	if (exp != DOM_NO_ERR)
 		return exp;
 __EOF__
diff --git a/test/testcases/tests/level1/html/HTMLImageElement01.xml b/test/testcases/tests/level1/html/HTMLImageElement01.xml
new file mode 100644
index 0000000..ca61559
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement01.xml
@@ -0,0 +1,42 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement01">
+<metadata>
+<title>HTMLImageElement01</title>
+<creator>NIST</creator>
+<description>
+    The name attribute specifies the name of the element.
+
+    Retrieve the name attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-47534097"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vname" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<name interface="HTMLImageElement" obj="testNode" var="vname"/>
+<assertEquals actual="vname" expected='"IMAGE-1"' id="nameLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
deleted file mode 100644
index ca61559..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement01">
-<metadata>
-<title>HTMLImageElement01</title>
-<creator>NIST</creator>
-<description>
-    The name attribute specifies the name of the element.
-
-    Retrieve the name attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-47534097"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vname" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<name interface="HTMLImageElement" obj="testNode" var="vname"/>
-<assertEquals actual="vname" expected='"IMAGE-1"' id="nameLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement02.xml b/test/testcases/tests/level1/html/HTMLImageElement02.xml
new file mode 100644
index 0000000..f314888
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement02.xml
@@ -0,0 +1,43 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement02">
+<metadata>
+<title>HTMLImageElement02</title>
+<creator>NIST</creator>
+<description>
+    The align attribute aligns this object with respect to its surrounding
+    text.
+
+    Retrieve the align attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3211094"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="valign" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<align interface="HTMLImageElement" obj="testNode" var="valign"/>
+<assertEquals actual="valign" expected='"middle"' id="alignLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
deleted file mode 100644
index f314888..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement02">
-<metadata>
-<title>HTMLImageElement02</title>
-<creator>NIST</creator>
-<description>
-    The align attribute aligns this object with respect to its surrounding
-    text.
-
-    Retrieve the align attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3211094"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="valign" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<align interface="HTMLImageElement" obj="testNode" var="valign"/>
-<assertEquals actual="valign" expected='"middle"' id="alignLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement03.xml b/test/testcases/tests/level1/html/HTMLImageElement03.xml
new file mode 100644
index 0000000..75716f9
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement03.xml
@@ -0,0 +1,43 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement03">
+<metadata>
+<title>HTMLImageElement03</title>
+<creator>NIST</creator>
+<description>
+    The alt attribute specifies an alternative text for user agenst not
+    rendering the normal content of this element.
+
+    Retrieve the alt attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-95636861"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="valt" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<alt interface="HTMLImageElement" obj="testNode" var="valt"/>
+<assertEquals actual="valt" expected='"DTS IMAGE LOGO"' id="altLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
deleted file mode 100644
index 75716f9..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement03">
-<metadata>
-<title>HTMLImageElement03</title>
-<creator>NIST</creator>
-<description>
-    The alt attribute specifies an alternative text for user agenst not
-    rendering the normal content of this element.
-
-    Retrieve the alt attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-95636861"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="valt" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<alt interface="HTMLImageElement" obj="testNode" var="valt"/>
-<assertEquals actual="valt" expected='"DTS IMAGE LOGO"' id="altLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement04.xml b/test/testcases/tests/level1/html/HTMLImageElement04.xml
new file mode 100644
index 0000000..80a30b0
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement04.xml
@@ -0,0 +1,42 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement04">
+<metadata>
+<title>HTMLImageElement04</title>
+<creator>NIST</creator>
+<description>
+    The border attribute specifies the width of the border around the image.
+
+    Retrieve the border attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-136671"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vborder" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<border interface="HTMLImageElement" obj="testNode" var="vborder"/>
+<assertEquals actual="vborder" expected='"0"' id="borderLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
deleted file mode 100644
index 80a30b0..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement04">
-<metadata>
-<title>HTMLImageElement04</title>
-<creator>NIST</creator>
-<description>
-    The border attribute specifies the width of the border around the image.
-
-    Retrieve the border attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-136671"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vborder" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<border interface="HTMLImageElement" obj="testNode" var="vborder"/>
-<assertEquals actual="vborder" expected='"0"' id="borderLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement07.xml b/test/testcases/tests/level1/html/HTMLImageElement07.xml
new file mode 100644
index 0000000..faca09e
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement07.xml
@@ -0,0 +1,42 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement07">
+<metadata>
+<title>HTMLImageElement07</title>
+<creator>NIST</creator>
+<description>
+    The isMap attribute indicates the use of server-side image map.
+
+    Retrieve the isMap attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-58983880"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vismap" type="boolean" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<isMap interface="HTMLImageElement" obj="testNode" var="vismap"/>
+<assertFalse actual="vismap" id="isMapLink"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
deleted file mode 100644
index faca09e..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement07">
-<metadata>
-<title>HTMLImageElement07</title>
-<creator>NIST</creator>
-<description>
-    The isMap attribute indicates the use of server-side image map.
-
-    Retrieve the isMap attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-58983880"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vismap" type="boolean" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<isMap interface="HTMLImageElement" obj="testNode" var="vismap"/>
-<assertFalse actual="vismap" id="isMapLink"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement08.xml b/test/testcases/tests/level1/html/HTMLImageElement08.xml
new file mode 100644
index 0000000..e7bedbf
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement08.xml
@@ -0,0 +1,43 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement08">
+<metadata>
+<title>HTMLImageElement08</title>
+<creator>NIST</creator>
+<description>
+    The longDesc attribute contains an URI designating a long description
+    of this image or frame.
+
+    Retrieve the longDesc attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-77376969"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vlongdesc" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<longDesc interface="HTMLImageElement" obj="testNode" var="vlongdesc"/>
+<assertURIEquals actual="vlongdesc" file='"desc.html"' id="longDescLink"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
deleted file mode 100644
index e7bedbf..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement08">
-<metadata>
-<title>HTMLImageElement08</title>
-<creator>NIST</creator>
-<description>
-    The longDesc attribute contains an URI designating a long description
-    of this image or frame.
-
-    Retrieve the longDesc attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-77376969"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vlongdesc" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<longDesc interface="HTMLImageElement" obj="testNode" var="vlongdesc"/>
-<assertURIEquals actual="vlongdesc" file='"desc.html"' id="longDescLink"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement09.xml b/test/testcases/tests/level1/html/HTMLImageElement09.xml
new file mode 100644
index 0000000..6d0f584
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement09.xml
@@ -0,0 +1,42 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement09">
+<metadata>
+<title>HTMLImageElement09</title>
+<creator>NIST</creator>
+<description>
+    The src attribute contains an URI designating the source of this image.
+
+    Retrieve the src attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-87762984"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vsrc" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<src interface="HTMLImageElement" obj="testNode" var="vsrc"/>
+<assertURIEquals actual="vsrc" file='"dts.gif"' id="srcLink"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
deleted file mode 100644
index 6d0f584..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement09">
-<metadata>
-<title>HTMLImageElement09</title>
-<creator>NIST</creator>
-<description>
-    The src attribute contains an URI designating the source of this image.
-
-    Retrieve the src attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-87762984"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vsrc" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<src interface="HTMLImageElement" obj="testNode" var="vsrc"/>
-<assertURIEquals actual="vsrc" file='"dts.gif"' id="srcLink"/>
-</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement10.xml b/test/testcases/tests/level1/html/HTMLImageElement10.xml
new file mode 100644
index 0000000..3c13080
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLImageElement10.xml
@@ -0,0 +1,42 @@
+<?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 test SYSTEM "dom1.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement10">
+<metadata>
+<title>HTMLImageElement10</title>
+<creator>NIST</creator>
+<description>
+    The useMap attribute specifies to use the client-side image map.
+
+    Retrieve the useMap attribute and examine its value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-35981181"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vusemap" type="DOMString" />
+<var name="doc" type="Document"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<useMap interface="HTMLImageElement" obj="testNode" var="vusemap"/>
+<assertEquals actual="vusemap" expected='"#DTS-MAP"' id="useMapLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
deleted file mode 100644
index 3c13080..0000000
--- a/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 test SYSTEM "dom1.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLImageElement10">
-<metadata>
-<title>HTMLImageElement10</title>
-<creator>NIST</creator>
-<description>
-    The useMap attribute specifies to use the client-side image map.
-
-    Retrieve the useMap attribute and examine its value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-35981181"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vusemap" type="DOMString" />
-<var name="doc" type="Document"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"img"'/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<useMap interface="HTMLImageElement" obj="testNode" var="vusemap"/>
-<assertEquals actual="vusemap" expected='"#DTS-MAP"' id="useMapLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp b/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp
new file mode 100644
index 0000000..6847879
Binary files /dev/null and b/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp differ
diff --git a/test/testcases/tests/level2/html/HTMLImageElement05.xml b/test/testcases/tests/level2/html/HTMLImageElement05.xml
new file mode 100644
index 0000000..92e536b
--- /dev/null
+++ b/test/testcases/tests/level2/html/HTMLImageElement05.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+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 test SYSTEM "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement05">
+<metadata>
+<title>HTMLImageElement05</title>
+<creator>NIST</creator>
+<description>
+    The height attribute overrides the natural "height" of the image.
+
+    Retrieve the height attribute and examine it's value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-12-26</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-91561496"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vheight" type="int"/>
+<var name="doc" type="Node"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<height interface="HTMLImageElement" obj="testNode" var="vheight"/>
+<assertEquals actual="vheight" expected="47" id="heightLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail
deleted file mode 100644
index 92e536b..0000000
--- a/test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-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 test SYSTEM "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement05">
-<metadata>
-<title>HTMLImageElement05</title>
-<creator>NIST</creator>
-<description>
-    The height attribute overrides the natural "height" of the image.
-
-    Retrieve the height attribute and examine it's value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-12-26</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-91561496"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vheight" type="int"/>
-<var name="doc" type="Node"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<height interface="HTMLImageElement" obj="testNode" var="vheight"/>
-<assertEquals actual="vheight" expected="47" id="heightLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement06.xml b/test/testcases/tests/level2/html/HTMLImageElement06.xml
new file mode 100644
index 0000000..19fb7b0
--- /dev/null
+++ b/test/testcases/tests/level2/html/HTMLImageElement06.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+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 test SYSTEM "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement06">
+<metadata>
+<title>HTMLImageElement06</title>
+<creator>NIST</creator>
+<description>
+    The hspace attribute specifies the horizontal space to the left and     
+    right of this image.
+
+    Retrieve the hspace attribute and examine it's value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-12-26</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-53675471"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vhspace" type="int"/>
+<var name="doc" type="Node"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<hspace interface="HTMLImageElement" obj="testNode" var="vhspace"/>
+<assertEquals actual="vhspace" expected="4" id="hspaceLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail
deleted file mode 100644
index 19fb7b0..0000000
--- a/test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-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 test SYSTEM "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement06">
-<metadata>
-<title>HTMLImageElement06</title>
-<creator>NIST</creator>
-<description>
-    The hspace attribute specifies the horizontal space to the left and     
-    right of this image.
-
-    Retrieve the hspace attribute and examine it's value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-12-26</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-53675471"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vhspace" type="int"/>
-<var name="doc" type="Node"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<hspace interface="HTMLImageElement" obj="testNode" var="vhspace"/>
-<assertEquals actual="vhspace" expected="4" id="hspaceLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement11.xml b/test/testcases/tests/level2/html/HTMLImageElement11.xml
new file mode 100644
index 0000000..10f3608
--- /dev/null
+++ b/test/testcases/tests/level2/html/HTMLImageElement11.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+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 test SYSTEM "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement11">
+<metadata>
+<title>HTMLImageElement11</title>
+<creator>NIST</creator>
+<description>
+    The vspace attribute specifies the vertical space above and below this  
+    image.
+
+    Retrieve the vspace attribute and examine it's value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-12-26</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-85374897"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vvspace" type="int"/>
+<var name="doc" type="Node"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<vspace interface="HTMLImageElement" obj="testNode" var="vvspace"/>
+<assertEquals actual="vvspace" expected="10" id="vspaceLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail
deleted file mode 100644
index 10f3608..0000000
--- a/test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-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 test SYSTEM "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement11">
-<metadata>
-<title>HTMLImageElement11</title>
-<creator>NIST</creator>
-<description>
-    The vspace attribute specifies the vertical space above and below this  
-    image.
-
-    Retrieve the vspace attribute and examine it's value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-12-26</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-85374897"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vvspace" type="int"/>
-<var name="doc" type="Node"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<vspace interface="HTMLImageElement" obj="testNode" var="vvspace"/>
-<assertEquals actual="vvspace" expected="10" id="vspaceLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement12.xml b/test/testcases/tests/level2/html/HTMLImageElement12.xml
new file mode 100644
index 0000000..738f1c3
--- /dev/null
+++ b/test/testcases/tests/level2/html/HTMLImageElement12.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+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 test SYSTEM "dom2.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement12">
+<metadata>
+<title>HTMLImageElement12</title>
+<creator>NIST</creator>
+<description>
+    The width attribute overrides the natural "width" of the image.  
+
+    Retrieve the width attribute and examine it's value.  
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2001-12-07</date>
+<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13839076"/>
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vwidth" type="int"/>
+<var name="doc" type="Node"/>
+<load var="doc" href="img" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
+<assertSize collection="nodeList" size="1" id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
+<width interface="HTMLImageElement" obj="testNode" var="vwidth"/>
+<assertEquals actual="vwidth" expected="115" id="widthLink" ignoreCase="false"/>
+</test>
diff --git a/test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail
deleted file mode 100644
index 738f1c3..0000000
--- a/test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-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 test SYSTEM "dom2.dtd">
-<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLImageElement12">
-<metadata>
-<title>HTMLImageElement12</title>
-<creator>NIST</creator>
-<description>
-    The width attribute overrides the natural "width" of the image.  
-
-    Retrieve the width attribute and examine it's value.  
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2001-12-07</date>
-<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13839076"/>
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vwidth" type="int"/>
-<var name="doc" type="Node"/>
-<load var="doc" href="img" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname="&quot;img&quot;"/>
-<assertSize collection="nodeList" size="1" id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode" index="0"/>
-<width interface="HTMLImageElement" obj="testNode" var="vwidth"/>
-<assertEquals actual="vwidth" expected="115" id="widthLink" ignoreCase="false"/>
-</test>
diff --git a/test/testcases/tests/level2/html/files/img.html b/test/testcases/tests/level2/html/files/img.html
new file mode 100644
index 0000000..b4e8b27
--- /dev/null
+++ b/test/testcases/tests/level2/html/files/img.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8">
+<TITLE>NIST DOM HTML Test - IMG</TITLE>
+</HEAD>
+<BODY onload="parent.loadComplete()">
+<P>
+<IMG ID="IMAGE-1" NAME="IMAGE-1" SRC="./pix/dts.gif" ALIGN="middle" ALT="DTS IMAGE LOGO" BORDER="0" HEIGHT="47" HSPACE="4" LONGDESC="./files/desc.html" USEMAP="#DTS-MAP" VSPACE="10" WIDTH="115"/>
+</P>
+</BODY>
+</HTML>
+
diff --git a/test/testcases/tests/level2/html/files/img.xhtml b/test/testcases/tests/level2/html/files/img.xhtml
new file mode 100644
index 0000000..40e3695
--- /dev/null
+++ b/test/testcases/tests/level2/html/files/img.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+<title>NIST DOM HTML Test - IMG</title>
+</head>
+<body onload="parent.loadComplete()">
+<p>
+<img id="IMAGE-1" name="IMAGE-1" src="./pix/dts.gif" align="middle" alt="DTS IMAGE LOGO" border="0" height="47" hspace="4" longdesc="./files/desc.html" usemap="#DTS-MAP" vspace="10" width="115"/>
+</p>
+</body>
+</html>
+
diff --git a/test/testcases/tests/level2/html/files/img.xml b/test/testcases/tests/level2/html/files/img.xml
new file mode 100644
index 0000000..40e3695
--- /dev/null
+++ b/test/testcases/tests/level2/html/files/img.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+<title>NIST DOM HTML Test - IMG</title>
+</head>
+<body onload="parent.loadComplete()">
+<p>
+<img id="IMAGE-1" name="IMAGE-1" src="./pix/dts.gif" align="middle" alt="DTS IMAGE LOGO" border="0" height="47" hspace="4" longdesc="./files/desc.html" usemap="#DTS-MAP" vspace="10" width="115"/>
+</p>
+</body>
+</html>
+
-- 
cgit v1.2.3