aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-07-15 14:54:40 -04:00
Code

struct element_info: add .close callback

Browse Source 
Rename enum element_type values, shortening ELEMENT_TYPE_ to just ET_
and reformat the elements table to squeeze everything in.
This commit is contained in:
Miciah Dashiel Butler Masters 2006-05-27 03:19:52 +00:00 committed by Miciah Dashiel Butler Masters
parent 12b5345b9a
commit 03fde090cf
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/document/html/parser/parse.c
View File

@ -386,10 +386,10 @@ skip_comment(unsigned char *html, unsigned char *eof)
enum element_type { enum element_type {
ELEMENT_TYPE_NESTABLE, ET_NESTABLE,
ELEMENT_TYPE_NON_NESTABLE, ET_NON_NESTABLE,
ELEMENT_TYPE_NON_PAIRABLE, ET_NON_PAIRABLE,
ELEMENT_TYPE_LI, ET_LI,
}; };
struct element_info { struct element_info {
@ -402,6 +402,8 @@ struct element_info {
* in start_element() (which is also where we call these handlers). */ * in start_element() (which is also where we call these handlers). */
element_handler_T *open; element_handler_T *open;
element_handler_T *close;
/* How many line-breaks to ensure we have before and after an element. /* How many line-breaks to ensure we have before and after an element.
* Value of 1 means the element will be on a line on its own, value * Value of 1 means the element will be on a line on its own, value
* of 2 means that it will also have empty lines before and after. * of 2 means that it will also have empty lines before and after.
@ -418,79 +420,79 @@ struct element_info {
}; };
static struct element_info elements[] = { static struct element_info elements[] = {
{"A", html_a, 0, ELEMENT_TYPE_NON_NESTABLE}, {"A", html_a, NULL, 0, ET_NON_NESTABLE},
{"ABBR", html_italic, 0, ELEMENT_TYPE_NESTABLE }, {"ABBR", html_italic, NULL, 0, ET_NESTABLE },
{"ADDRESS", html_address, 2, ELEMENT_TYPE_NESTABLE }, {"ADDRESS", html_address, NULL, 2, ET_NESTABLE },
{"APPLET", html_applet, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"APPLET", html_applet, NULL, 1, ET_NON_PAIRABLE},
{"B", html_bold, 0, ELEMENT_TYPE_NESTABLE }, {"B", html_bold, NULL, 0, ET_NESTABLE },
{"BASE", html_base, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"BASE", html_base, NULL, 0, ET_NON_PAIRABLE},
{"BASEFONT", html_font, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"BASEFONT", html_font, NULL, 0, ET_NON_PAIRABLE},
{"BLOCKQUOTE", html_blockquote, 2, ELEMENT_TYPE_NESTABLE }, {"BLOCKQUOTE", html_blockquote, NULL, 2, ET_NESTABLE },
{"BODY", html_body, 0, ELEMENT_TYPE_NESTABLE }, {"BODY", html_body, NULL, 0, ET_NESTABLE },
{"BR", html_br, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"BR", html_br, NULL, 1, ET_NON_PAIRABLE},
{"BUTTON", html_button, 0, ELEMENT_TYPE_NESTABLE }, {"BUTTON", html_button, NULL, 0, ET_NESTABLE },
{"CAPTION", html_center, 1, ELEMENT_TYPE_NESTABLE }, {"CAPTION", html_center, NULL, 1, ET_NESTABLE },
{"CENTER", html_center, 1, ELEMENT_TYPE_NESTABLE }, {"CENTER", html_center, NULL, 1, ET_NESTABLE },
{"CODE", html_fixed, 0, ELEMENT_TYPE_NESTABLE }, {"CODE", html_fixed, NULL, 0, ET_NESTABLE },
{"DD", html_dd, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"DD", html_dd, NULL, 1, ET_NON_PAIRABLE},
{"DFN", html_bold, 0, ELEMENT_TYPE_NESTABLE }, {"DFN", html_bold, NULL, 0, ET_NESTABLE },
{"DIR", html_ul, 2, ELEMENT_TYPE_NESTABLE }, {"DIR", html_ul, NULL, 2, ET_NESTABLE },
{"DIV", html_linebrk, 1, ELEMENT_TYPE_NESTABLE }, {"DIV", html_linebrk, NULL, 1, ET_NESTABLE },
{"DL", html_dl, 2, ELEMENT_TYPE_NESTABLE }, {"DL", html_dl, NULL, 2, ET_NESTABLE },
{"DT", html_dt, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"DT", html_dt, NULL, 1, ET_NON_PAIRABLE},
{"EM", html_italic, 0, ELEMENT_TYPE_NESTABLE }, {"EM", html_italic, NULL, 0, ET_NESTABLE },
{"EMBED", html_embed, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"EMBED", html_embed, NULL, 0, ET_NON_PAIRABLE},
{"FIXED", html_fixed, 0, ELEMENT_TYPE_NESTABLE }, {"FIXED", html_fixed, NULL, 0, ET_NESTABLE },
{"FONT", html_font, 0, ELEMENT_TYPE_NESTABLE }, {"FONT", html_font, NULL, 0, ET_NESTABLE },
{"FORM", html_form, 1, ELEMENT_TYPE_NESTABLE }, {"FORM", html_form, NULL, 1, ET_NESTABLE },
{"FRAME", html_frame, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"FRAME", html_frame, NULL, 1, ET_NON_PAIRABLE},
{"FRAMESET", html_frameset, 1, ELEMENT_TYPE_NESTABLE }, {"FRAMESET", html_frameset, NULL, 1, ET_NESTABLE },
{"H1", html_h1, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H1", html_h1, NULL, 2, ET_NON_NESTABLE},
{"H2", html_h2, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H2", html_h2, NULL, 2, ET_NON_NESTABLE},
{"H3", html_h3, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H3", html_h3, NULL, 2, ET_NON_NESTABLE},
{"H4", html_h4, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H4", html_h4, NULL, 2, ET_NON_NESTABLE},
{"H5", html_h5, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H5", html_h5, NULL, 2, ET_NON_NESTABLE},
{"H6", html_h6, 2, ELEMENT_TYPE_NON_NESTABLE}, {"H6", html_h6, NULL, 2, ET_NON_NESTABLE},
{"HEAD", html_head, 0, ELEMENT_TYPE_NESTABLE }, {"HEAD", html_head, NULL, 0, ET_NESTABLE },
{"HR", html_hr, 2, ELEMENT_TYPE_NON_PAIRABLE}, {"HR", html_hr, NULL, 2, ET_NON_PAIRABLE},
{"HTML", html_html, 0, ELEMENT_TYPE_NESTABLE }, {"HTML", html_html, NULL, 0, ET_NESTABLE },
{"I", html_italic, 0, ELEMENT_TYPE_NESTABLE }, {"I", html_italic, NULL, 0, ET_NESTABLE },
{"IFRAME", html_iframe, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"IFRAME", html_iframe, NULL, 1, ET_NON_PAIRABLE},
{"IMG", html_img, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"IMG", html_img, NULL, 0, ET_NON_PAIRABLE},
{"INPUT", html_input, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"INPUT", html_input, NULL, 0, ET_NON_PAIRABLE},
{"LI", html_li, 1, ELEMENT_TYPE_LI }, {"LI", html_li, NULL, 1, ET_LI },
{"LINK", html_link, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"LINK", html_link, NULL, 1, ET_NON_PAIRABLE},
{"LISTING", html_pre, 2, ELEMENT_TYPE_NESTABLE }, {"LISTING", html_pre, NULL, 2, ET_NESTABLE },
{"MENU", html_ul, 2, ELEMENT_TYPE_NESTABLE }, {"MENU", html_ul, NULL, 2, ET_NESTABLE },
{"META", html_meta, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"META", html_meta, NULL, 0, ET_NON_PAIRABLE},
{"NOFRAMES", html_noframes, 0, ELEMENT_TYPE_NESTABLE }, {"NOFRAMES", html_noframes, NULL, 0, ET_NESTABLE },
{"NOSCRIPT", html_noscript, 0, ELEMENT_TYPE_NESTABLE }, {"NOSCRIPT", html_noscript, NULL, 0, ET_NESTABLE },
{"OBJECT", html_object, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"OBJECT", html_object, NULL, 1, ET_NON_PAIRABLE},
{"OL", html_ol, 2, ELEMENT_TYPE_NESTABLE }, {"OL", html_ol, NULL, 2, ET_NESTABLE },
{"OPTION", html_option, 1, ELEMENT_TYPE_NON_PAIRABLE}, {"OPTION", html_option, NULL, 1, ET_NON_PAIRABLE},
{"P", html_p, 2, ELEMENT_TYPE_NON_NESTABLE}, {"P", html_p, NULL, 2, ET_NON_NESTABLE},
{"PRE", html_pre, 2, ELEMENT_TYPE_NESTABLE }, {"PRE", html_pre, NULL, 2, ET_NESTABLE },
{"Q", html_italic, 0, ELEMENT_TYPE_NESTABLE }, {"Q", html_italic, NULL, 0, ET_NESTABLE },
{"S", html_underline, 0, ELEMENT_TYPE_NESTABLE }, {"S", html_underline, NULL, 0, ET_NESTABLE },
{"SCRIPT", html_script, 0, ELEMENT_TYPE_NESTABLE }, {"SCRIPT", html_script, NULL, 0, ET_NESTABLE },
{"SELECT", html_select, 0, ELEMENT_TYPE_NESTABLE }, {"SELECT", html_select, NULL, 0, ET_NESTABLE },
{"SPAN", html_span, 0, ELEMENT_TYPE_NESTABLE }, {"SPAN", html_span, NULL, 0, ET_NESTABLE },
{"STRIKE", html_underline, 0, ELEMENT_TYPE_NESTABLE }, {"STRIKE", html_underline, NULL, 0, ET_NESTABLE },
{"STRONG", html_bold, 0, ELEMENT_TYPE_NESTABLE }, {"STRONG", html_bold, NULL, 0, ET_NESTABLE },
{"STYLE", html_style, 0, ELEMENT_TYPE_NESTABLE }, {"STYLE", html_style, NULL, 0, ET_NESTABLE },
{"SUB", html_subscript, 0, ELEMENT_TYPE_NESTABLE }, {"SUB", html_subscript, NULL, 0, ET_NESTABLE },
{"SUP", html_superscript, 0, ELEMENT_TYPE_NESTABLE }, {"SUP", html_superscript, NULL, 0, ET_NESTABLE },
{"TABLE", html_table, 2, ELEMENT_TYPE_NESTABLE }, {"TABLE", html_table, NULL, 2, ET_NESTABLE },
{"TD", html_td, 0, ELEMENT_TYPE_NESTABLE }, {"TD", html_td, NULL, 0, ET_NESTABLE },
{"TEXTAREA", html_textarea, 0, ELEMENT_TYPE_NON_PAIRABLE}, {"TEXTAREA", html_textarea, NULL, 0, ET_NON_PAIRABLE},
{"TH", html_th, 0, ELEMENT_TYPE_NESTABLE }, {"TH", html_th, NULL, 0, ET_NESTABLE },
{"TITLE", html_title, 0, ELEMENT_TYPE_NESTABLE }, {"TITLE", html_title, NULL, 0, ET_NESTABLE },
{"TR", html_tr, 1, ELEMENT_TYPE_NESTABLE }, {"TR", html_tr, NULL, 1, ET_NESTABLE },
{"TT", html_tt, 0, ELEMENT_TYPE_NON_NESTABLE}, {"TT", html_tt, NULL, 0, ET_NON_NESTABLE},
{"U", html_underline, 0, ELEMENT_TYPE_NESTABLE }, {"U", html_underline, NULL, 0, ET_NESTABLE },
{"UL", html_ul, 2, ELEMENT_TYPE_NESTABLE }, {"UL", html_ul, NULL, 2, ET_NESTABLE },
{"XMP", html_xmp, 2, ELEMENT_TYPE_NESTABLE }, {"XMP", html_xmp, NULL, 2, ET_NESTABLE },
{NULL, NULL, 0, ELEMENT_TYPE_NESTABLE }, {NULL, NULL, NULL, 0, ET_NESTABLE },
}; };
#define NUMBER_OF_TAGS (sizeof_array(elements) - 1) #define NUMBER_OF_TAGS (sizeof_array(elements) - 1)
@ -794,11 +796,10 @@ start_element(struct element_info *ei,
} }
#endif #endif
if (ei->type == ELEMENT_TYPE_NON_NESTABLE if (ei->type == ET_NON_NESTABLE || ei->type == ET_LI) {
|| ei->type == ELEMENT_TYPE_LI) {
struct html_element *e; struct html_element *e;
if (ei->type == ELEMENT_TYPE_NON_NESTABLE) { if (ei->type == ET_NON_NESTABLE) {
foreach (e, html_context->stack) { foreach (e, html_context->stack) {
if (e->type < ELEMENT_KILLABLE) break; if (e->type < ELEMENT_KILLABLE) break;
if (is_block_element(e) || is_inline_element(ei)) break; if (is_block_element(e) || is_inline_element(ei)) break;
@ -820,7 +821,7 @@ start_element(struct element_info *ei,
} }
} }
if (ei->type != ELEMENT_TYPE_NON_PAIRABLE) { if (ei->type != ET_NON_PAIRABLE) {
html_stack_dup(html_context, ELEMENT_KILLABLE); html_stack_dup(html_context, ELEMENT_KILLABLE);
html_top->name = name; html_top->name = name;
html_top->namelen = namelen; html_top->namelen = namelen;
@ -847,7 +848,7 @@ start_element(struct element_info *ei,
/* XXX: We should apply CSS otherwise as well, but that'll need /* XXX: We should apply CSS otherwise as well, but that'll need
* some deeper changes in order to have options filled etc. * some deeper changes in order to have options filled etc.
* Probably just applying CSS from more places, since we * Probably just applying CSS from more places, since we
* usually have type != ELEMENT_TYPE_NESTABLE when we either (1) * usually have type != ET_NESTABLE when we either (1)
* rescan on your own from somewhere else (2) html_stack_dup() * rescan on your own from somewhere else (2) html_stack_dup()
* in our own way. --pasky */ * in our own way. --pasky */
/* Call it now to gain some of the stuff which might affect /* Call it now to gain some of the stuff which might affect
@ -907,8 +908,7 @@ end_element(struct element_info *ei,
if (ei->open == html_style) html_context->was_style = 0; if (ei->open == html_style) html_context->was_style = 0;
html_context->was_br = 0; html_context->was_br = 0;
if (ei->type == ELEMENT_TYPE_NON_PAIRABLE if (ei->type == ET_NON_PAIRABLE || ei->type == ET_LI)
|| ei->type == ELEMENT_TYPE_LI)
return html; return html;
/* Apply background color from the <HTML> element. (bug 696) */ /* Apply background color from the <HTML> element. (bug 696) */