diff options
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | include/dom/dom.h | 1 | ||||
-rw-r--r-- | include/dom/html/html_tablecol_element.h | 48 | ||||
-rw-r--r-- | src/html/Makefile | 4 | ||||
-rw-r--r-- | src/html/html_document.c | 6 | ||||
-rw-r--r-- | src/html/html_tablecol_element.c | 181 | ||||
-rw-r--r-- | src/html/html_tablecol_element.h | 45 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement01.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement02.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement03.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement04.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement05.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement06.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement07.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement08.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement09.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement10.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement11.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLTableColElement12.xml (renamed from test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail) | 0 |
19 files changed, 284 insertions, 2 deletions
@@ -125,6 +125,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_map_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_script_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecaption_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecell_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecol_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 fac1dac..51d12c4 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -84,6 +84,7 @@ #include <dom/html/html_script_element.h> #include <dom/html/html_tablecaption_element.h> #include <dom/html/html_tablecell_element.h> +#include <dom/html/html_tablecol_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_tablecol_element.h b/include/dom/html/html_tablecol_element.h index 2e182d5..56865a9 100644 --- a/include/dom/html/html_tablecol_element.h +++ b/include/dom/html/html_tablecol_element.h @@ -3,5 +3,53 @@ * 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 <rsk1v_alignr99@gmail.com> */ +#ifndef dom_html_table_col_element_h_ +#define dom_html_table_col_element_h_ + +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_table_col_element dom_html_table_col_element; + +dom_exception dom_html_table_col_element_get_align( + dom_html_table_col_element *table_col, dom_string **align); + +dom_exception dom_html_table_col_element_set_align( + dom_html_table_col_element *table_col, dom_string *align); + +dom_exception dom_html_table_col_element_get_ch( + dom_html_table_col_element *table_col, dom_string **ch); + +dom_exception dom_html_table_col_element_set_ch( + dom_html_table_col_element *table_col, dom_string *ch); + +dom_exception dom_html_table_col_element_get_ch_off( + dom_html_table_col_element *table_col, dom_string **ch_off); + +dom_exception dom_html_table_col_element_set_ch_off( + dom_html_table_col_element *table_col, dom_string *ch_off); + +dom_exception dom_html_table_col_element_get_v_align( + dom_html_table_col_element *table_col, dom_string **v_align); + +dom_exception dom_html_table_col_element_set_v_align( + dom_html_table_col_element *table_col, dom_string *v_align); + +dom_exception dom_html_table_col_element_get_width( + dom_html_table_col_element *table_col, dom_string **width); + +dom_exception dom_html_table_col_element_set_width( + dom_html_table_col_element *table_col, dom_string *width); + +dom_exception dom_html_table_col_element_get_span( + dom_html_table_col_element *table_col, int32_t *span); + +dom_exception dom_html_table_col_element_set_span( + dom_html_table_col_element *table_col, uint32_t span); + +#endif + diff --git a/src/html/Makefile b/src/html/Makefile index fcf326f..c66e670 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -16,10 +16,10 @@ DIR_SOURCES := \ html_basefont_element.c html_image_element.c html_object_element.c \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ - html_tablecell_element.c + html_tablecell_element.c html_tablecol_element.c UNINMPLEMENTED_SOURCES := \ - html_table_element.c html_tablecol_element.c html_tablesection_element.c \ + html_table_element.c html_tablesection_element.c \ html_tablerow_element.c html_frameset_element.c \ html_frame_element.c html_iframe_element.c diff --git a/src/html/html_document.c b/src/html/html_document.c index 939b031..5aef359 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -52,6 +52,7 @@ #include "html/html_script_element.h" #include "html/html_tablecaption_element.h" #include "html/html_tablecell_element.h" +#include "html/html_tablecol_element.h" #include "core/attr.h" #include "core/string.h" @@ -341,6 +342,11 @@ _dom_html_document_create_element_internal(dom_html_document *html, ) { exc = _dom_html_table_cell_element_create(html, tag_name, namespace, prefix, (dom_html_table_cell_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_COL])|| + dom_string_caseless_isequal(tag_name, html->memoised[hds_COLGROUP]) + ) { + exc = _dom_html_table_col_element_create(html, tag_name, namespace, prefix, + (dom_html_table_col_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_tablecol_element.c b/src/html/html_tablecol_element.c index 2e182d5..cf21a24 100644 --- a/src/html/html_tablecol_element.c +++ b/src/html/html_tablecol_element.c @@ -3,5 +3,186 @@ * 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_tablecol_element.h> + +#include "html/html_document.h" +#include "html/html_tablecol_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_TABLE_COL_ELEMENT + }, + DOM_HTML_TABLE_COL_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_table_col_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_table_col_element_create(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, dom_string *prefix, + struct dom_html_table_col_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_table_col_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_table_col_element_initialise(doc, tag_name, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_table_col_element object + * + * \param doc The document object + * \param ele The dom_html_table_col_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_table_col_element_initialise(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, dom_string *prefix, + struct dom_html_table_col_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + tag_name, + namespace, prefix); +} + +/** + * Finalise a dom_html_table_col_element object + * + * \param ele The dom_html_table_col_element object + */ +void _dom_html_table_col_element_finalise(struct dom_html_table_col_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_table_col_element object + * + * \param ele The dom_html_table_col_element object + */ +void _dom_html_table_col_element_destroy(struct dom_html_table_col_element *ele) +{ + _dom_html_table_col_element_finalise(ele); + free(ele); +} + +/** + * Get the width Property + * + * \param table_col The dom_html_table_col_element object + */ +dom_exception dom_html_table_col_element_get_span( + dom_html_table_col_element *table_col, int32_t *span) +{ + return dom_html_element_get_int32_t_property(&table_col->base, "span", + SLEN("span"), span); +} + +/** + * Set the width Property + * + * \param table_col The dom_html_table_col_element object + */ +dom_exception dom_html_table_col_element_set_span( + dom_html_table_col_element *table_col, uint32_t span) +{ + return dom_html_element_set_int32_t_property(&table_col->base, "span", + SLEN("span"), span); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_table_col_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_table_col_element_destroy(dom_node_internal *node) +{ + _dom_html_table_col_element_destroy((struct dom_html_table_col_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_table_col_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_table_col_element_get_##attr( \ + dom_html_table_col_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_table_col_element_set_##attr( \ + dom_html_table_col_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); +SIMPLE_GET_SET(ch); +SIMPLE_GET_SET(ch_off); +SIMPLE_GET_SET(v_align); +SIMPLE_GET_SET(width); diff --git a/src/html/html_tablecol_element.h b/src/html/html_tablecol_element.h index 2e182d5..a8e6fa7 100644 --- a/src/html/html_tablecol_element.h +++ b/src/html/html_tablecol_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_table_col_element_h_ +#define dom_internal_html_table_col_element_h_ + +#include <dom/html/html_tablecol_element.h> +#include "html/html_element.h" + + +struct dom_html_table_col_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_table_col_element object */ +dom_exception _dom_html_table_col_element_create(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, dom_string *prefix, + struct dom_html_table_col_element **ele); + +/* Initialise a dom_html_table_col_element object */ +dom_exception _dom_html_table_col_element_initialise(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, dom_string *prefix, + struct dom_html_table_col_element *ele); + +/* Finalise a dom_html_table_col_element object */ +void _dom_html_table_col_element_finalise(struct dom_html_table_col_element *ele); + +/* Destroy a dom_html_table_col_element object */ +void _dom_html_table_col_element_destroy(struct dom_html_table_col_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_table_col_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_table_col_element_destroy(dom_node_internal *node); +dom_exception _dom_html_table_col_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_TABLE_COL_ELEMENT_PROTECT_VTABLE \ + _dom_html_table_col_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_TABLE_COL_ELEMENT \ + _dom_virtual_html_table_col_element_destroy, \ + _dom_html_table_col_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement01.xml index ae5fea0..ae5fea0 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement01.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement02.xml index 2d30433..2d30433 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement02.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement03.xml index 6710753..6710753 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement03.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement04.xml index db0ebd0..db0ebd0 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement04.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement05.xml index ebd56a9..ebd56a9 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement05.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement06.xml index 285f794..285f794 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement06.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement07.xml index 7a70e40..7a70e40 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement07.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement08.xml index 491ea88..491ea88 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement08.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement09.xml index 0e3314b..0e3314b 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement09.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement10.xml index 7be9c98..7be9c98 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement10.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement11.xml index 636a0ae..636a0ae 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement11.xml diff --git a/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLTableColElement12.xml index bc39b9a..bc39b9a 100644 --- a/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLTableColElement12.xml |