From b17260bd09aff0c689eb5296082fc473f9f76126 Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Fri, 9 May 2014 23:38:03 +0530 Subject: Ulist Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_ulist_element.h | 22 +++ src/html/Makefile | 8 +- src/html/html_document.c | 4 + src/html/html_label_element.h | 2 +- src/html/html_ulist_element.c | 177 +++++++++++++++++++++ src/html/html_ulist_element.h | 45 ++++++ .../tests/level1/html/HTMLUListElement01.xml | 43 +++++ .../tests/level1/html/HTMLUListElement01.xml.kfail | 43 ----- .../tests/level1/html/HTMLUListElement02.xml | 42 +++++ .../tests/level1/html/HTMLUListElement02.xml.kfail | 42 ----- 12 files changed, 340 insertions(+), 90 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLUListElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLUListElement02.xml delete mode 100644 test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail diff --git a/Makefile b/Makefile index de937e9..b591dd4 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_quote_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_pre_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_br_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_label_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_ulist_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 8035622..0610427 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -68,6 +68,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_ulist_element.h b/include/dom/html/html_ulist_element.h index 2e182d5..c5daa6a 100644 --- a/include/dom/html/html_ulist_element.h +++ b/include/dom/html/html_ulist_element.h @@ -3,5 +3,27 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_html_u_list_element_h_ +#define dom_html_u_list_element_h_ +#include +#include +#include + +typedef struct dom_html_u_list_element dom_html_u_list_element; + +dom_exception dom_html_u_list_element_get_compact( + dom_html_u_list_element *ele, bool *compact); + +dom_exception dom_html_u_list_element_set_compact( + dom_html_u_list_element *ele, bool compact); + +dom_exception dom_html_u_list_element_get_type( + dom_html_u_list_element *ele, dom_string **type); + +dom_exception dom_html_u_list_element_set_type( + dom_html_u_list_element *ele, dom_string *type); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index a682418..3f42e43 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -10,12 +10,12 @@ DIR_SOURCES := \ 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_heading_element.c html_quote_element.c \ - html_pre_element.c html_br_element.c html_label_element.c + html_pre_element.c html_br_element.c html_label_element.c \ + html_ulist_element.c UNINMPLEMENTED_SOURCES := \ - html_ulist_element.c html_olist_element.c \ - html_li_element.c html_basefont_element.c html_font_element.c \ - html_mod_element.c html_anchor_element.c \ + html_olist_element.c html_li_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 \ html_applet_element.c html_map_element.c html_area_element.c \ html_script_element.c html_table_element.c html_tablecaption_element.c \ diff --git a/src/html/html_document.c b/src/html/html_document.c index 07f155e..34e2bf0 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -36,6 +36,7 @@ #include "html/html_pre_element.h" #include "html/html_br_element.h" #include "html/html_label_element.h" +#include "html/html_ulist_element.h" #include "core/attr.h" #include "core/string.h" @@ -274,6 +275,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_LABEL])) { exc = _dom_html_label_element_create(html, namespace, prefix, (dom_html_label_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_UL])) { + exc = _dom_html_u_list_element_create(html, namespace, prefix, + (dom_html_u_list_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_label_element.h b/src/html/html_label_element.h index b5ec3f4..e28b453 100644 --- a/src/html/html_label_element.h +++ b/src/html/html_label_element.h @@ -17,7 +17,7 @@ struct dom_html_label_element { struct dom_html_element base; /**< The base class */ dom_html_form_element *form; - /**< The form associated with label */ + /**< The form associated with label */ }; /* Create a dom_html_label_element object */ diff --git a/src/html/html_ulist_element.c b/src/html/html_ulist_element.c index 2e182d5..e7f8bb3 100644 --- a/src/html/html_ulist_element.c +++ b/src/html/html_ulist_element.c @@ -3,5 +3,182 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#include +#include +#include + +#include "html/html_document.h" +#include "html/html_ulist_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_U_LIST_ELEMENT + }, + DOM_HTML_U_LIST_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_u_list_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_u_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *u_listfix, + struct dom_html_u_list_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_u_list_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_u_list_element_initialise(doc, namespace, u_listfix, *ele); +} + +/** + * Initialise a dom_html_u_list_element object + * + * \param doc The document object + * \param ele The dom_html_u_list_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_u_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *u_listfix, + struct dom_html_u_list_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_UL], + namespace, u_listfix); +} + +/** + * Finalise a dom_html_u_list_element object + * + * \param ele The dom_html_u_list_element object + */ +void _dom_html_u_list_element_finalise(struct dom_html_u_list_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_u_list_element object + * + * \param ele The dom_html_u_list_element object + */ +void _dom_html_u_list_element_destroy(struct dom_html_u_list_element *ele) +{ + _dom_html_u_list_element_finalise(ele); + free(ele); +} + +/** + * Get the compact Property + * + * \param u_list The dom_html_u_list_element object + */ +dom_exception dom_html_u_list_element_get_compact( + dom_html_u_list_element *u_list, bool *compact) +{ + return dom_html_element_get_bool_property(&u_list->base, "compact", + SLEN("compact"), compact); +} + +/** + * Set the compact Property + * + * \param u_list The dom_html_u_list_element object + */ +dom_exception dom_html_u_list_element_set_compact( + dom_html_u_list_element *u_list, bool compact) +{ + return dom_html_element_set_bool_property(&u_list->base, "compact", + SLEN("compact"), compact); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_u_list_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_u_list_element_destroy(dom_node_internal *node) +{ + _dom_html_u_list_element_destroy((struct dom_html_u_list_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_u_list_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_u_list_element_get_##attr( \ + dom_html_u_list_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_u_list_element_set_##attr( \ + dom_html_u_list_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(type); diff --git a/src/html/html_ulist_element.h b/src/html/html_ulist_element.h index 2e182d5..7e03f47 100644 --- a/src/html/html_ulist_element.h +++ b/src/html/html_ulist_element.h @@ -3,5 +3,50 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_internal_html_u_list_element_h_ +#define dom_internal_html_u_list_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_u_list_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_u_list_element object */ +dom_exception _dom_html_u_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_u_list_element **ele); + +/* Initialise a dom_html_u_list_element object */ +dom_exception _dom_html_u_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_u_list_element *ele); + +/* Finalise a dom_html_u_list_element object */ +void _dom_html_u_list_element_finalise(struct dom_html_u_list_element *ele); + +/* Destroy a dom_html_u_list_element object */ +void _dom_html_u_list_element_destroy(struct dom_html_u_list_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_u_list_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_u_list_element_destroy(dom_node_internal *node); +dom_exception _dom_html_u_list_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_U_LIST_ELEMENT_PROTECT_VTABLE \ + _dom_html_u_list_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_U_LIST_ELEMENT \ + _dom_virtual_html_u_list_element_destroy, \ + _dom_html_u_list_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLUListElement01.xml b/test/testcases/tests/level1/html/HTMLUListElement01.xml new file mode 100644 index 0000000..75695aa --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLUListElement01.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLUListElement01 +NIST + + The compact attribute specifies whether to reduce spacing between list + items. + + Retrieve the compact attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail deleted file mode 100644 index 75695aa..0000000 --- a/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLUListElement01 -NIST - - The compact attribute specifies whether to reduce spacing between list - items. - - Retrieve the compact attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLUListElement02.xml b/test/testcases/tests/level1/html/HTMLUListElement02.xml new file mode 100644 index 0000000..e525d5b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLUListElement02.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLUListElement02 +NIST + + The type attribute specifies the bullet style. + + Retrieve the type attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail deleted file mode 100644 index e525d5b..0000000 --- a/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLUListElement02 -NIST - - The type attribute specifies the bullet style. - - Retrieve the type attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3