diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2007-05-02 16:15:18 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2007-05-02 16:15:18 +0000 |
commit | 491e58e575eca9bb4eb5c182ac93ef751a42c7f7 (patch) | |
tree | 6d53d15f27c3106bfb01316258a76cc6dd73b09a | |
parent | 739e9d0981e646481356a3b2f6d5bad3233668cc (diff) | |
download | android_external_libxml2-491e58e575eca9bb4eb5c182ac93ef751a42c7f7.tar.gz android_external_libxml2-491e58e575eca9bb4eb5c182ac93ef751a42c7f7.tar.bz2 android_external_libxml2-491e58e575eca9bb4eb5c182ac93ef751a42c7f7.zip |
applied patch from Michael Day to add support for <embed> Daniel
* HTMLparser.c: applied patch from Michael Day to add support for <embed>
Daniel
svn path=/trunk/; revision=3611
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | HTMLparser.c | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed May 2 18:12:58 CEST 2007 Daniel Veillard <daniel@veillard.com> + + * HTMLparser.c: applied patch from Michael Day to add support for + <embed> + Thu Apr 26 10:58:50 CEST 2007 Daniel Veillard <daniel@veillard.com> * HTMLparser.c: Jean-Daniel Dupas pointed a couple of problems diff --git a/HTMLparser.c b/HTMLparser.c index 693b4d23..29aa89a8 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -472,8 +472,8 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) { #define NB_FONTSTYLE 8 #define PHRASE "em", "strong", "dfn", "code", "samp", "kbd", "var", "cite", "abbr", "acronym" #define NB_PHRASE 10 -#define SPECIAL "a", "img", "applet", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe" -#define NB_SPECIAL 15 +#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe" +#define NB_SPECIAL 16 #define INLINE PCDATA FONTSTYLE PHRASE SPECIAL FORMCTRL #define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL #define BLOCK HEADING, LIST "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address" @@ -572,6 +572,7 @@ static const char* const version_attr[] = { "version", NULL } ; static const char* const html_content[] = { "head", "body", "frameset", NULL } ; static const char* const iframe_attrs[] = { COREATTRS, "longdesc", "name", "src", "frameborder", "marginwidth", "marginheight", "scrolling", "align", "height", "width", NULL } ; static const char* const img_attrs[] = { ATTRS, "longdesc", "name", "height", "width", "usemap", "ismap", NULL } ; +static const char* const embed_attrs[] = { COREATTRS, "align", "alt", "border", "code", "codebase", "frameborder", "height", "hidden", "hspace", "name", "palette", "pluginspace", "pluginurl", "src", "type", "units", "vspace", "width", NULL } ; static const char* const input_attrs[] = { ATTRS, "type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "ismap", "tabindex", "accesskey", "onfocus", "onblur", "onselect", "onchange", "accept", NULL } ; static const char* const prompt_attrs[] = { COREATTRS, I18N, "prompt", NULL } ; static const char* const label_attrs[] = { ATTRS, "for", "accesskey", "onfocus", "onblur", NULL } ; @@ -706,6 +707,9 @@ html40ElementTable[] = { { "em", 0, 3, 0, 0, 0, 0, 1, "emphasis", DECL html_inline, NULL, DECL html_attrs, NULL, NULL }, +{ "embed", 0, 1, 2, 0, 1, 1, 1, "generic embedded object ", + EMPTY, NULL, DECL embed_attrs, NULL, NULL +}, { "fieldset", 0, 0, 0, 0, 0, 0, 0, "form control group ", DECL fieldset_contents , NULL, DECL html_attrs, NULL, NULL }, |