From 3f747fd70c9402d8935c243da3b7ab2e0f4b406c Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Thu, 8 May 2014 03:55:24 +0530 Subject: Pre Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_pre_element.h | 16 +++ src/html/Makefile | 7 +- src/html/TODO | 4 +- src/html/html_document.c | 4 + src/html/html_pre_element.c | 136 +++++++++++++++++++++ src/html/html_pre_element.h | 45 +++++++ .../tests/level1/html/HTMLPreElement01.xml | 42 +++++++ .../tests/level1/html/HTMLPreElement01.xml.kfail | 42 ------- 10 files changed, 251 insertions(+), 47 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLPreElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail diff --git a/Makefile b/Makefile index db20cab..eb2870d 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,7 @@ 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) $(I):$(Is)/html_quote_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_pre_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 d820fd0..8b9e0c9 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -65,6 +65,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_pre_element.h b/include/dom/html/html_pre_element.h index 2e182d5..bd72701 100644 --- a/include/dom/html/html_pre_element.h +++ b/include/dom/html/html_pre_element.h @@ -3,5 +3,21 @@ * 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_pre_element_h_ +#define dom_html_pre_element_h_ +#include +#include +#include + +typedef struct dom_html_pre_element dom_html_pre_element; + +dom_exception dom_html_pre_element_get_width( + dom_html_pre_element *element, int32_t *width); + +dom_exception dom_html_pre_element_set_width( + dom_html_pre_element *element, uint32_t width); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 1c84310..718a44f 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -9,12 +9,13 @@ 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_heading_element.c html_quote_element.c + html_paragraph_element.c html_heading_element.c html_quote_element.c \ + html_pre_element.c UNINMPLEMENTED_SOURCES := \ html_label_element.c html_ulist_element.c html_olist_element.c \ - html_li_element.c html_pre_element.c \ - html_br_element.c html_basefont_element.c html_font_element.c \ + html_li_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 \ html_applet_element.c html_map_element.c html_area_element.c \ diff --git a/src/html/TODO b/src/html/TODO index f33587d..8753087 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -31,8 +31,8 @@ HTMLBlockquoteElement html_blockquote_element MISSING HTMLDivElement html_div_element MISSING HTMLParagraphElement html_paragraph_element MISSING HTMLHeadingElement html_heading_element DONE -HTMLQuoteElement html_quote_element MISSING -HTMLPreElement html_pre_element MISSING +HTMLQuoteElement html_quote_element DONE +HTMLPreElement html_pre_element DONE HTMLBRElement html_br_element MISSING HTMLBaseFontElement html_basefont_element MISSING HTMLFontElement html_font_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index ecf861f..68734fa 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -33,6 +33,7 @@ #include "html/html_paragraph_element.h" #include "html/html_heading_element.h" #include "html/html_quote_element.h" +#include "html/html_pre_element.h" #include "core/attr.h" #include "core/string.h" @@ -262,6 +263,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_Q])) { exc = _dom_html_quote_element_create(html, namespace, prefix, (dom_html_quote_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_PRE])) { + exc = _dom_html_pre_element_create(html, namespace, prefix, + (dom_html_pre_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_pre_element.c b/src/html/html_pre_element.c index 2e182d5..1d220fd 100644 --- a/src/html/html_pre_element.c +++ b/src/html/html_pre_element.c @@ -3,5 +3,141 @@ * 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_pre_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_PRE_ELEMENT + }, + DOM_HTML_PRE_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_pre_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_pre_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_pre_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_pre_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_pre_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_pre_element object + * + * \param doc The document object + * \param ele The dom_html_pre_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_pre_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_pre_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_PRE], + namespace, prefix); +} + +/** + * Finalise a dom_html_pre_element object + * + * \param ele The dom_html_pre_element object + */ +void _dom_html_pre_element_finalise(struct dom_html_pre_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_pre_element object + * + * \param ele The dom_html_pre_element object + */ +void _dom_html_pre_element_destroy(struct dom_html_pre_element *ele) +{ + _dom_html_pre_element_finalise(ele); + free(ele); +} + +/** + * Get the width Property + * + * \param pre The dom_html_pre_element object + */ +dom_exception dom_html_pre_element_get_width( + dom_html_pre_element *pre, int32_t *width) +{ + return dom_html_element_get_int32_t_property(&pre->base, "width", + SLEN("width"), width); +} + +/** + * Set the width Property + * + * \param pre The dom_html_pre_element object + */ +dom_exception dom_html_pre_element_set_width( + dom_html_pre_element *pre, uint32_t width) +{ + return dom_html_element_set_int32_t_property(&pre->base, "width", + SLEN("width"), width); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_pre_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_pre_element_destroy(dom_node_internal *node) +{ + _dom_html_pre_element_destroy((struct dom_html_pre_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_pre_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} diff --git a/src/html/html_pre_element.h b/src/html/html_pre_element.h index 2e182d5..75d8df8 100644 --- a/src/html/html_pre_element.h +++ b/src/html/html_pre_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_pre_element_h_ +#define dom_internal_html_pre_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_pre_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_pre_element object */ +dom_exception _dom_html_pre_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_pre_element **ele); + +/* Initialise a dom_html_pre_element object */ +dom_exception _dom_html_pre_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_pre_element *ele); + +/* Finalise a dom_html_pre_element object */ +void _dom_html_pre_element_finalise(struct dom_html_pre_element *ele); + +/* Destroy a dom_html_pre_element object */ +void _dom_html_pre_element_destroy(struct dom_html_pre_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_pre_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_pre_element_destroy(dom_node_internal *node); +dom_exception _dom_html_pre_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_PRE_ELEMENT_PROTECT_VTABLE \ + _dom_html_pre_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_PRE_ELEMENT \ + _dom_virtual_html_pre_element_destroy, \ + _dom_html_pre_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLPreElement01.xml b/test/testcases/tests/level1/html/HTMLPreElement01.xml new file mode 100644 index 0000000..9b8d4f2 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLPreElement01.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLPreElement01 +NIST + + The width attribute specifies the fixed width for content. + + Retrieve the width attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail deleted file mode 100644 index 9b8d4f2..0000000 --- a/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLPreElement01 -NIST - - The width attribute specifies the fixed width for content. - - Retrieve the width attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3