Mod Element

16 files changed, 235 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 5582dde..0495b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -113,6 +113,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_ulist_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_olist_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_li_element.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_font_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_mod_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 98dc5ee..3dabeec 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -72,6 +72,7 @@
 #include <dom/html/html_olist_element.h>
 #include <dom/html/html_li_element.h>
 #include <dom/html/html_font_element.h>
+#include <dom/html/html_mod_element.h>
 
 /* DOM Events header */
 #include <dom/events/events.h>
diff --git a/include/dom/html/html_mod_element.h b/include/dom/html/html_mod_element.h
index 2e182d5..99c4f2e 100644
--- a/include/dom/html/html_mod_element.h
+++ b/include/dom/html/html_mod_element.h
@@ -3,5 +3,27 @@
  * 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_mod_element_h_
+#define dom_html_mod_element_h_
 
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_mod_element dom_html_mod_element;
+
+dom_exception dom_html_mod_element_get_cite(
+	dom_html_mod_element *ele, dom_string **cite);
+
+dom_exception dom_html_mod_element_set_cite(
+	dom_html_mod_element *ele, dom_string *cite);
+
+dom_exception dom_html_mod_element_get_date_time(
+	dom_html_mod_element *ele, dom_string **date_time);
+
+dom_exception dom_html_mod_element_set_date_time(
+	dom_html_mod_element *ele, dom_string *date_time);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 651ebbb..7711479 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -12,10 +12,10 @@ DIR_SOURCES := \
 	html_paragraph_element.c html_heading_element.c html_quote_element.c \
 	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_font_element.c html_mod_element.c
 
 UNINMPLEMENTED_SOURCES := \
-	html_basefont_element.c  html_mod_element.c \
+	html_basefont_element.c  \
 	html_anchor_element.c html_image_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 \
diff --git a/src/html/TODO b/src/html/TODO
index 9806c6b..53e6edb 100644
--- a/src/html/TODO
+++ b/src/html/TODO
@@ -35,9 +35,9 @@ HTMLQuoteElement	html_quote_element		DONE
 HTMLPreElement		html_pre_element		DONE
 HTMLBRElement		html_br_element			DONE
 HTMLBaseFontElement	html_basefont_element		MISSING
-HTMLFontElement		html_font_element		MISSING
+HTMLFontElement		html_font_element		DONE
 HTMLHRElement		html_hr_element			DONE
-HTMLModElement		html_mod_element		MISSING
+HTMLModElement		html_mod_element		DONE
 HTMLAnchorElement	html_anchor_element		MISSING
 HTMLImageElement	html_image_element		MISSING
 HTMLObjectElement	html_object_element		MISSING
diff --git a/src/html/html_document.c b/src/html/html_document.c
index 1c3ebab..c8fd11e 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -40,6 +40,7 @@
 #include "html/html_olist_element.h"
 #include "html/html_li_element.h"
 #include "html/html_font_element.h"
+#include "html/html_mod_element.h"
 
 #include "core/attr.h"
 #include "core/string.h"
@@ -290,6 +291,10 @@ _dom_html_document_create_element_internal(dom_html_document *html,
 	} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FONT])) {
 		exc = _dom_html_font_element_create(html, namespace, prefix,
 				(dom_html_font_element **) result);
+	} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DEL]) ||
+			dom_string_caseless_isequal(tag_name, html->memoised[hds_INS])) {
+		exc = _dom_html_mod_element_create(html, tag_name, namespace, 
+				prefix, (dom_html_mod_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 23b36cf..73b7bab 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -89,6 +89,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(color)
 HTML_DOCUMENT_STRINGS_ACTION1(face)
 HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex)
 HTML_DOCUMENT_STRINGS_ACTION(html_for,for)
+HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime)
 /* HTML_DOCUMENT_STRINGS_ACTION1(type) */
 HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap)
 /* HTML_DOCUMENT_STRINGS_ACTION1(value) */
diff --git a/src/html/html_mod_element.c b/src/html/html_mod_element.c
index 2e182d5..f20a994 100644
--- a/src/html/html_mod_element.c
+++ b/src/html/html_mod_element.c
@@ -3,5 +3,161 @@
  * 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_mod_element.h>
+
+#include "html/html_document.h"
+#include "html/html_mod_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_MOD_ELEMENT
+	},
+	DOM_HTML_MOD_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_mod_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_mod_element_create(struct dom_html_document *doc,
+		dom_string *tag_name, dom_string *namespace, 
+		dom_string *prefix, struct dom_html_mod_element **ele)
+{
+	struct dom_node_internal *node;
+
+	*ele = malloc(sizeof(dom_html_mod_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_mod_element_initialise(doc, tag_name, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_mod_element object
+ *
+ * \param doc  The document object
+ * \param ele  The dom_html_mod_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_mod_element_initialise(struct dom_html_document *doc,
+		dom_string *tag_name, dom_string *namespace, 
+		dom_string *prefix, struct dom_html_mod_element *ele)
+{
+	return _dom_html_element_initialise(doc, &ele->base,
+					    tag_name,
+					    namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_mod_element object
+ *
+ * \param ele  The dom_html_mod_element object
+ */
+void _dom_html_mod_element_finalise(struct dom_html_mod_element *ele)
+{
+	_dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_mod_element object
+ *
+ * \param ele  The dom_html_mod_element object
+ */
+void _dom_html_mod_element_destroy(struct dom_html_mod_element *ele)
+{
+	_dom_html_mod_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_mod_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_mod_element_destroy(dom_node_internal *node)
+{
+	_dom_html_mod_element_destroy((struct dom_html_mod_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_mod_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_mod_element_get_##attr(		\
+		dom_html_mod_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_mod_element_set_##attr(			\
+		dom_html_mod_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(cite);
+SIMPLE_GET_SET(date_time);
 
diff --git a/src/html/html_mod_element.h b/src/html/html_mod_element.h
index 2e182d5..9df07d5 100644
--- a/src/html/html_mod_element.h
+++ b/src/html/html_mod_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_mod_element_h_
+#define dom_internal_html_mod_element_h_
+
+#include <dom/html/html_mod_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_mod_element {
+	struct dom_html_element base;
+			/**< The base class */
+};
+
+/* Create a dom_html_mod_element object */
+dom_exception _dom_html_mod_element_create(struct dom_html_document *doc,
+		dom_string *tag_name, dom_string *namespace, 
+		dom_string *prefix, struct dom_html_mod_element **ele);
+
+/* Initialise a dom_html_mod_element object */
+dom_exception _dom_html_mod_element_initialise(struct dom_html_document *doc,
+		dom_string *tag_name, dom_string *namespace, dom_string *prefix,
+		struct dom_html_mod_element *ele);
+
+/* Finalise a dom_html_mod_element object */
+void _dom_html_mod_element_finalise(struct dom_html_mod_element *ele);
+
+/* Destroy a dom_html_mod_element object */
+void _dom_html_mod_element_destroy(struct dom_html_mod_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_mod_element_parse_attribute(dom_element *ele,
+		dom_string *name, dom_string *value,
+		dom_string **parsed);
+void _dom_virtual_html_mod_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_mod_element_copy(dom_node_internal *old,
+		                dom_node_internal **copy);
+
+#define DOM_HTML_MOD_ELEMENT_PROTECT_VTABLE \
+	_dom_html_mod_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_MOD_ELEMENT \
+	_dom_virtual_html_mod_element_destroy, \
+	_dom_html_mod_element_copy
+
+#endif
diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail
index 525438f..525438f 100644
--- a/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml
+++ b/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail
diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail
index 94894d6..94894d6 100644
--- a/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml
+++ b/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail
diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail
index e63b16f..e63b16f 100644
--- a/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml
+++ b/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail
diff --git a/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement01.xml
index 616bc36..616bc36 100644
--- a/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLModElement01.xml
diff --git a/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement02.xml
index bcb8c11..bcb8c11 100644
--- a/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLModElement02.xml
diff --git a/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement03.xml
index 82f85b0..82f85b0 100644
--- a/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLModElement03.xml
diff --git a/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement04.xml
index 4220ba5..4220ba5 100644
--- a/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLModElement04.xml