xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mothra: interpret table regardless of nesting

Browse source
This commit is contained in:
cinap_lenrek 2012-03-18 15:02:23 +01:00
parent 847d238ca2
commit 129408103c
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/src/cmd/mothra/html.h
View file

@ -35,7 +35,6 @@ struct Stack{
int ismap; /* flag of <img> */ int ismap; /* flag of <img> */
int width; /* size of image */ int width; /* size of image */
int height; int height;
int table; /* depth of table nesting */
char image[NNAME]; /* arg of <img> */ char image[NNAME]; /* arg of <img> */
char link[NNAME]; /* arg of <a href=...> */ char link[NNAME]; /* arg of <a href=...> */
char name[NNAME]; /* arg of <a name=...> */ char name[NNAME]; /* arg of <a name=...> */

16
sys/src/cmd/mothra/rdhtml.c
View file

@ -599,7 +599,6 @@ void plrdplain(char *name, int fd, Www *dst){
g.state->margin=0; g.state->margin=0;
g.state->indent=20; g.state->indent=20;
g.state->ismap=0; g.state->ismap=0;
g.state->table=0;
g.dst=dst; g.dst=dst;
g.hfd=fd; g.hfd=fd;
g.name=name; g.name=name;
@ -639,7 +638,6 @@ void plrdhtml(char *name, int fd, Www *dst){
g.state->ismap=0; g.state->ismap=0;
g.state->width=0; g.state->width=0;
g.state->height=0; g.state->height=0;
g.state->table=0;
g.dst=dst; g.dst=dst;
g.hfd=fd; g.hfd=fd;
g.name=name; g.name=name;
@ -718,16 +716,11 @@ void plrdhtml(char *name, int fd, Www *dst){
case Tag_html: case Tag_html:
case Tag_link: case Tag_link:
case Tag_nextid: case Tag_nextid:
break;
case Tag_table: case Tag_table:
g.state->table++;
break; break;
case Tag_tr: case Tag_tr:
if(g.state->table==1){ g.spacc=0;
g.spacc=0; g.linebrk=1;
g.linebrk=1;
} else
g.spacc++;
break; break;
case Tag_td: case Tag_td:
g.spacc++; g.spacc++;
@ -1057,11 +1050,8 @@ void plrdhtml(char *name, int fd, Www *dst){
case Tag_title: case Tag_title:
case Tag_ul: case Tag_ul:
case Tag_xmp: case Tag_xmp:
g.linebrk=1;
break;
case Tag_table: case Tag_table:
if(g.state->table==0) g.linebrk=1;
g.linebrk=1;
break; break;
case Tag_pre: case Tag_pre:
pl_linespace(&g); pl_linespace(&g);