summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsk1994 <rsk1coder99@gmail.com>2014-05-02 23:29:10 (GMT)
committer Rupinder Singh Khokhar <rsk1coder99@gmail.com>2014-06-10 22:57:03 (GMT)
commit6ba15f74fdb3009fce39dbc2ef23b1e238b95e9b (patch)
treeda481d23a097a940ff31ed3b27bd77f579a38266
parentd82ef1d51de315ab8b976854319bc3bcaffba07f (diff)
downloadlibdom-6ba15f74fdb3009fce39dbc2ef23b1e238b95e9b.tar.gz
libdom-6ba15f74fdb3009fce39dbc2ef23b1e238b95e9b.tar.bz2
H1, H2, H3, H4, H5 & H6 Elements
-rw-r--r--Makefile1
-rw-r--r--include/dom/dom.h1
-rw-r--r--include/dom/html/html_heading_element.h16
-rw-r--r--src/html/Makefile4
-rw-r--r--src/html/TODO2
-rw-r--r--src/html/html_document.c10
-rw-r--r--src/html/html_heading_element.c156
-rw-r--r--src/html/html_heading_element.h45
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement01.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement02.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement03.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement04.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement05.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLHeadingElement06.xml (renamed from test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail)0
14 files changed, 232 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 254531c..89adc6f 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_fieldset_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_legend_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_div_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_paragraph_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_heading_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 e2d0661..2dd63bb 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -63,6 +63,7 @@
#include <dom/html/html_legend_element.h>
#include <dom/html/html_div_element.h>
#include <dom/html/html_paragraph_element.h>
+#include <dom/html/html_heading_element.h>
/* DOM Events header */
#include <dom/events/events.h>
diff --git a/include/dom/html/html_heading_element.h b/include/dom/html/html_heading_element.h
index 2e182d5..fb42b89 100644
--- a/include/dom/html/html_heading_element.h
+++ b/include/dom/html/html_heading_element.h
@@ -3,5 +3,21 @@
* 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_heading_element_h_
+#define dom_html_heading_element_h_
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_heading_element dom_html_heading_element;
+
+dom_exception dom_html_heading_element_get_align(
+ dom_html_heading_element *element, dom_string **align);
+
+dom_exception dom_html_heading_element_set_align(
+ dom_html_heading_element *element, dom_string *align);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 463dba3..72cdadf 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -9,12 +9,12 @@ DIR_SOURCES := \
html_opt_group_element.c html_option_element.c html_hr_element.c \
html_dlist_element.c html_directory_element.c html_menu_element.c \
html_fieldset_element.c html_legend_element.c html_div_element.c \
- html_paragraph_element.c
+ html_paragraph_element.c html_heading_element.c
UNINMPLEMENTED_SOURCES := \
html_label_element.c html_ulist_element.c html_olist_element.c \
html_li_element.c \
- html_heading_element.c html_quote_element.c html_pre_element.c \
+ html_quote_element.c html_pre_element.c \
html_br_element.c html_basefont_element.c html_font_element.c \
html_mod_element.c html_anchor_element.c \
html_image_element.c html_object_element.c html_param_element.c \
diff --git a/src/html/TODO b/src/html/TODO
index b6ed604..f33587d 100644
--- a/src/html/TODO
+++ b/src/html/TODO
@@ -30,7 +30,7 @@ HTMLLIElement html_li_element MISSING
HTMLBlockquoteElement html_blockquote_element MISSING
HTMLDivElement html_div_element MISSING
HTMLParagraphElement html_paragraph_element MISSING
-HTMLHeadingElement html_heading_element MISSING
+HTMLHeadingElement html_heading_element DONE
HTMLQuoteElement html_quote_element MISSING
HTMLPreElement html_pre_element MISSING
HTMLBRElement html_br_element MISSING
diff --git a/src/html/html_document.c b/src/html/html_document.c
index 823194c..f4a2a64 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -31,6 +31,7 @@
#include "html/html_fieldset_element.h"
#include "html/html_legend_element.h"
#include "html/html_paragraph_element.h"
+#include "html/html_heading_element.h"
#include "core/attr.h"
#include "core/string.h"
@@ -248,6 +249,15 @@ _dom_html_document_create_element_internal(dom_html_document *html,
} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_P])) {
exc = _dom_html_paragraph_element_create(html, namespace, prefix,
(dom_html_paragraph_element **) result);
+ } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_H1]) ||
+ dom_string_caseless_isequal(tag_name, html->memoised[hds_H2]) ||
+ dom_string_caseless_isequal(tag_name, html->memoised[hds_H3]) ||
+ dom_string_caseless_isequal(tag_name, html->memoised[hds_H4]) ||
+ dom_string_caseless_isequal(tag_name, html->memoised[hds_H5]) ||
+ dom_string_caseless_isequal(tag_name, html->memoised[hds_H6])
+ ) {
+ exc = _dom_html_heading_element_create(html, tag_name, namespace, prefix,
+ (dom_html_heading_element **) result);
} else {
exc = _dom_html_element_create(html, tag_name, namespace,
prefix, result);
diff --git a/src/html/html_heading_element.c b/src/html/html_heading_element.c
index 2e182d5..ba2842f 100644
--- a/src/html/html_heading_element.c
+++ b/src/html/html_heading_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_heading_element.h>
+
+#include "html/html_document.h"
+#include "html/html_heading_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_HEADING_ELEMENT
+ },
+ DOM_HTML_HEADING_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_heading_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_heading_element_create(struct dom_html_document *doc,
+ dom_string *tag_name, dom_string *namespace,
+ dom_string *prefix, struct dom_html_heading_element **ele)
+{
+ struct dom_node_internal *node;
+
+ *ele = malloc(sizeof(dom_html_heading_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_heading_element_initialise(doc,
+ tag_name, namespace,
+ prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_heading_element object
+ *
+ * \param doc The document object
+ * \param ele The dom_html_heading_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_heading_element_initialise(struct dom_html_document *doc,
+ dom_string *tag_name, dom_string *namespace,
+ dom_string *prefix, struct dom_html_heading_element *ele)
+{
+ return _dom_html_element_initialise(doc, &ele->base,
+ tag_name, namespace,
+ prefix);
+}
+
+/**
+ * Finalise a dom_html_heading_element object
+ *
+ * \param ele The dom_html_heading_element object
+ */
+void _dom_html_heading_element_finalise(struct dom_html_heading_element *ele)
+{
+ _dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_heading_element object
+ *
+ * \param ele The dom_html_heading_element object
+ */
+void _dom_html_heading_element_destroy(struct dom_html_heading_element *ele)
+{
+ _dom_html_heading_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_heading_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_heading_element_destroy(dom_node_internal *node)
+{
+ _dom_html_heading_element_destroy((struct dom_html_heading_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_heading_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_heading_element_get_##attr( \
+ dom_html_heading_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_heading_element_set_##attr( \
+ dom_html_heading_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(align);
diff --git a/src/html/html_heading_element.h b/src/html/html_heading_element.h
index 2e182d5..fdd1c25 100644
--- a/src/html/html_heading_element.h
+++ b/src/html/html_heading_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_heading_element_h_
+#define dom_internal_html_heading_element_h_
+
+#include <dom/html/html_heading_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_heading_element {
+ struct dom_html_element base;
+ /**< The base class */
+};
+
+/* Create a dom_html_heading_element object */
+dom_exception _dom_html_heading_element_create(struct dom_html_document *doc,
+ dom_string *tag_name, dom_string *namespace,
+ dom_string *prefix, struct dom_html_heading_element **ele);
+
+/* Initialise a dom_html_heading_element object */
+dom_exception _dom_html_heading_element_initialise(struct dom_html_document *doc,
+ dom_string *tag_name, dom_string *namespace,
+ dom_string *prefix, struct dom_html_heading_element *ele);
+
+/* Finalise a dom_html_heading_element object */
+void _dom_html_heading_element_finalise(struct dom_html_heading_element *ele);
+
+/* Destroy a dom_html_heading_element object */
+void _dom_html_heading_element_destroy(struct dom_html_heading_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_heading_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed);
+void _dom_virtual_html_heading_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_heading_element_copy(dom_node_internal *old,
+ dom_node_internal **copy);
+
+#define DOM_HTML_HEADING_ELEMENT_PROTECT_VTABLE \
+ _dom_html_heading_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_HEADING_ELEMENT \
+ _dom_virtual_html_heading_element_destroy, \
+ _dom_html_heading_element_copy
+
+#endif
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement01.xml
index 3f8b9fa..3f8b9fa 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement01.xml
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement02.xml
index e74b428..e74b428 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement02.xml
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement03.xml
index a03702b..a03702b 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement03.xml
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement04.xml
index 9e16866..9e16866 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement04.xml
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement05.xml
index e732f74..e732f74 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement05.xml
diff --git a/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLHeadingElement06.xml
index 3853483..3853483 100644
--- a/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLHeadingElement06.xml