mirror of
https://github.com/rkd77/elinks.git
synced 2024-07-04 02:35:29 +00:00
parse_table(): totally drop @t_name and @t_namelen in favor of @name
and @namelen.
This commit is contained in:
parent
975a4251e8
commit
3fe59e8c7a
|
@ -533,10 +533,10 @@ parse_table(unsigned char *html, unsigned char *eof, unsigned char **end,
|
||||||
{
|
{
|
||||||
struct table *table;
|
struct table *table;
|
||||||
struct table_cell *cell;
|
struct table_cell *cell;
|
||||||
unsigned char *t_name, *t_attr, *en, *name;
|
unsigned char *t_attr, *en, *name;
|
||||||
unsigned char *l_fragment_id = NULL;
|
unsigned char *l_fragment_id = NULL;
|
||||||
color_T last_bgcolor;
|
color_T last_bgcolor;
|
||||||
int t_namelen, namelen;
|
int namelen;
|
||||||
int in_cell = 0;
|
int in_cell = 0;
|
||||||
int l_al = ALIGN_LEFT;
|
int l_al = ALIGN_LEFT;
|
||||||
int l_val = VALIGN_MIDDLE;
|
int l_val = VALIGN_MIDDLE;
|
||||||
|
@ -579,13 +579,11 @@ see:
|
||||||
goto se;
|
goto se;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parse_element(html, eof, &t_name, &t_namelen, &t_attr, &en)) {
|
if (parse_element(html, eof, &name, &namelen, &t_attr, &en)) {
|
||||||
html++;
|
html++;
|
||||||
goto se;
|
goto se;
|
||||||
}
|
}
|
||||||
|
|
||||||
name = t_name;
|
|
||||||
namelen = t_namelen;
|
|
||||||
if (name[0] == '/') {
|
if (name[0] == '/') {
|
||||||
name++; namelen--;
|
name++; namelen--;
|
||||||
closing_tag = 1;
|
closing_tag = 1;
|
||||||
|
@ -691,7 +689,7 @@ see:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TR */
|
/* TR */
|
||||||
if (t_namelen == 2 && toupper(t_name[1]) == 'R') {
|
if (!closing_tag && namelen == 2 && toupper(name[1]) == 'R') {
|
||||||
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
||||||
|
|
||||||
if (in_cell) {
|
if (in_cell) {
|
||||||
|
@ -716,10 +714,10 @@ see:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* THEAD TBODY TFOOT */
|
/* THEAD TBODY TFOOT */
|
||||||
if (t_namelen == 5
|
if (!closing_tag && namelen == 5
|
||||||
&& ((!strncasecmp(&t_name[1], "HEAD", 4)) ||
|
&& ((!strncasecmp(&name[1], "HEAD", 4)) ||
|
||||||
(!strncasecmp(&t_name[1], "BODY", 4)) ||
|
(!strncasecmp(&name[1], "BODY", 4)) ||
|
||||||
(!strncasecmp(&t_name[1], "FOOT", 4)))) {
|
(!strncasecmp(&name[1], "FOOT", 4)))) {
|
||||||
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
||||||
|
|
||||||
add_table_bad_html_end(table, html);
|
add_table_bad_html_end(table, html);
|
||||||
|
@ -728,9 +726,11 @@ see:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TD TH */
|
/* TD TH */
|
||||||
if (t_namelen != 2
|
if (closing_tag) goto see;
|
||||||
|| (toupper(t_name[1]) != 'D'
|
if (namelen != 2) goto see;
|
||||||
&& toupper(t_name[1]) != 'H'))
|
|
||||||
|
if (toupper(name[1]) != 'D'
|
||||||
|
&& toupper(name[1]) != 'H')
|
||||||
goto see;
|
goto see;
|
||||||
|
|
||||||
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
|
||||||
|
@ -770,7 +770,7 @@ see:
|
||||||
l_fragment_id = NULL;
|
l_fragment_id = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
cell->is_header = (toupper(t_name[1]) == 'H');
|
cell->is_header = (toupper(name[1]) == 'H');
|
||||||
if (cell->is_header) cell->align = ALIGN_CENTER;
|
if (cell->is_header) cell->align = ALIGN_CENTER;
|
||||||
|
|
||||||
if (group == 1) cell->is_group = 1;
|
if (group == 1) cell->is_group = 1;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user