diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | html.c | 39 | ||||
| -rw-r--r-- | html.h | 4 | ||||
| -rw-r--r-- | tagtable.tab | 2 |
4 files changed, 34 insertions, 21 deletions
@@ -1,3 +1,11 @@ +2010-08-12 Peter J. R. Moulder + + * [w3m-dev 04384] + * http://sourceforge.net/tracker/index.php?func=detail&aid=2987194&group_id=39518&atid=425441 + * html.c: some tags have ALST_NOP attribute + * tagtable.tab: add <span> and </span> + * html.h (HTML_SPAN, HTML_N_SPAN): added + 2010-08-11 SAKAI Kiyotaka <kiyotaka.sakai@ntt-at.co.jp> * [w3m-dev 04381] Re: check socklen_t @@ -9141,4 +9149,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.1033 2010/08/11 10:07:02 htrb Exp $ +$Id: ChangeLog,v 1.1034 2010/08/12 08:56:14 htrb Exp $ @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.30 2007/04/19 12:00:38 inu Exp $ */ +/* $Id: html.c,v 1.31 2010/08/12 08:56:14 htrb Exp $ */ #include "html.h" /* Define HTML Tag Infomation Table */ @@ -127,8 +127,8 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"h", ALST_P, MAXA_P, 0}, /* 3 HTML_H */ {"/h", NULL, 0, TFLG_END}, /* 4 HTML_N_H */ {"p", ALST_P, MAXA_P, 0}, /* 5 HTML_P */ - {"br", NULL, 0, 0}, /* 6 HTML_BR */ - {"b", NULL, 0, 0}, /* 7 HTML_B */ + {"br", ALST_NOP, MAXA_CORE, 0}, /* 6 HTML_BR */ + {"b", ALST_NOP, MAXA_CORE, 0}, /* 7 HTML_B */ {"/b", NULL, 0, TFLG_END}, /* 8 HTML_N_B */ {"ul", ALST_UL, MAXA_UL, 0}, /* 9 HTML_UL */ {"/ul", NULL, 0, TFLG_END}, /* 10 HTML_N_UL */ @@ -147,7 +147,7 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"blockquote", ALST_NOP, MAXA_NOP, 0}, /* 23 HTML_BLQ */ {"/blockquote", NULL, 0, TFLG_END}, /* 24 HTML_N_BLQ */ {"img", ALST_IMG, MAXA_IMG, 0}, /* 25 HTML_IMG */ - {"listing", NULL, 0, 0}, /* 26 HTML_LISTING */ + {"listing", ALST_NOP, MAXA_CORE, 0}, /* 26 HTML_LISTING */ {"/listing", NULL, 0, TFLG_END}, /* 27 HTML_N_LISTING */ {"xmp", NULL, 0, 0}, /* 28 HTML_XMP */ {"/xmp", NULL, 0, TFLG_END}, /* 29 HTML_N_XMP */ @@ -159,9 +159,9 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"frame", ALST_FRAME, MAXA_FRAME, 0}, /* 35 HTML_FRAME */ {"frameset", ALST_FRAMESET, MAXA_FRAMESET, 0}, /* 36 HTML_FRAMESET */ {"/frameset", NULL, 0, TFLG_END}, /* 37 HTML_N_FRAMESET */ - {"center", NULL, 0, 0}, /* 38 HTML_CENTER */ + {"center", ALST_NOP, MAXA_CORE, 0}, /* 38 HTML_CENTER */ {"/center", NULL, 0, TFLG_END}, /* 39 HTML_N_CENTER */ - {"font", NULL, 0, 0}, /* 40 HTML_FONT */ + {"font", ALST_NOP, MAXA_CORE, 0}, /* 40 HTML_FONT */ {"/font", NULL, 0, TFLG_END}, /* 41 HTML_N_FONT */ {"form", ALST_FORM, MAXA_FORM, 0}, /* 42 HTML_FORM */ {"/form", NULL, 0, TFLG_END}, /* 43 HTML_N_FORM */ @@ -171,7 +171,7 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"select", ALST_SELECT, MAXA_SELECT, 0}, /* 47 HTML_SELECT */ {"/select", NULL, 0, TFLG_END}, /* 48 HTML_N_SELECT */ {"option", ALST_OPTION, MAXA_OPTION, 0}, /* 49 HTML_OPTION */ - {"nobr", NULL, 0, 0}, /* 50 HTML_NOBR */ + {"nobr", ALST_NOP, MAXA_CORE, 0}, /* 50 HTML_NOBR */ {"/nobr", NULL, 0, TFLG_END}, /* 51 HTML_N_NOBR */ {"div", ALST_P, MAXA_P, 0}, /* 52 HTML_DIV */ {"/div", NULL, 0, TFLG_END}, /* 53 HTML_N_DIV */ @@ -182,16 +182,16 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"script", NULL, 0, 0}, /* 58 HTML_SCRIPT */ {"/script", NULL, 0, TFLG_END}, /* 59 HTML_N_SCRIPT */ {"base", ALST_BASE, MAXA_BASE, 0}, /* 60 HTML_BASE */ - {"del", NULL, 0, 0}, /* 61 HTML_DEL */ + {"del", ALST_NOP, MAXA_CORE, 0}, /* 61 HTML_DEL */ {"/del", NULL, 0, TFLG_END}, /* 62 HTML_N_DEL */ - {"ins", NULL, 0, 0}, /* 63 HTML_INS */ + {"ins", ALST_NOP, MAXA_CORE, 0}, /* 63 HTML_INS */ {"/ins", NULL, 0, TFLG_END}, /* 64 HTML_N_INS */ - {"u", NULL, 0, 0}, /* 65 HTML_U */ + {"u", ALST_NOP, MAXA_CORE, 0}, /* 65 HTML_U */ {"/u", NULL, 0, TFLG_END}, /* 66 HTML_N_U */ {"style", NULL, 0, 0}, /* 67 HTML_STYLE */ {"/style", NULL, 0, TFLG_END}, /* 68 HTML_N_STYLE */ {"wbr", NULL, 0, 0}, /* 69 HTML_WBR */ - {"em", NULL, 0, 0}, /* 70 HTML_EM */ + {"em", ALST_NOP, MAXA_CORE, 0}, /* 70 HTML_EM */ {"/em", NULL, 0, TFLG_END}, /* 71 HTML_N_EM */ {"body", ALST_BODY, MAXA_BODY, 0}, /* 72 HTML_BODY */ {"/body", NULL, 0, TFLG_END}, /* 73 HTML_N_BODY */ @@ -222,21 +222,22 @@ TagInfo TagMAP[MAX_HTMLTAG] = { {"noframes", ALST_NOFRAMES, MAXA_NOFRAMES, 0}, /* 98 HTML_NOFRAMES */ {"/noframes", NULL, 0, TFLG_END}, /* 99 HTML_N_NOFRAMES */ - {"sup", NULL, 0, 0}, /* 100 HTML_SUP */ + {"sup", ALST_NOP, MAXA_CORE, 0}, /* 100 HTML_SUP */ {"/sup", NULL, 0, 0}, /* 101 HTML_N_SUP */ - {"sub", NULL, 0, 0}, /* 102 HTML_SUB */ + /* FIXME: Should /sup and /sub have TFLG_END ? */ + {"sub", ALST_NOP, MAXA_CORE, 0}, /* 102 HTML_SUB */ {"/sub", NULL, 0, 0}, /* 103 HTML_N_SUB */ {"link", ALST_LINK, MAXA_LINK, 0}, /* 104 HTML_LINK */ - {"s", NULL, 0, 0}, /* 105 HTML_S */ + {"s", ALST_NOP, MAXA_CORE, 0}, /* 105 HTML_S */ {"/s", NULL, 0, TFLG_END}, /* 106 HTML_N_S */ - {"q", NULL, 0, 0}, /* 107 HTML_Q */ + {"q", ALST_NOP, MAXA_CORE, 0}, /* 107 HTML_Q */ {"/q", NULL, 0, TFLG_END}, /* 108 HTML_N_Q */ - {"i", NULL, 0, 0}, /* 109 HTML_I */ + {"i", ALST_NOP, MAXA_CORE, 0}, /* 109 HTML_I */ {"/i", NULL, 0, TFLG_END}, /* 110 HTML_N_I */ - {"strong", NULL, 0, 0}, /* 111 HTML_STRONG */ + {"strong", ALST_NOP, MAXA_CORE, 0}, /* 111 HTML_STRONG */ {"/strong", NULL, 0, TFLG_END}, /* 112 HTML_N_STRONG */ - {NULL, NULL, 0, 0}, /* 113 Undefined */ - {NULL, NULL, 0, 0}, /* 114 Undefined */ + {"span", ALST_NOP, MAXA_CORE, 0}, /* 113 HTML_SPAN */ + {"/span", NULL, 0, TFLG_END}, /* 114 HTML_N_SPAN */ {NULL, NULL, 0, 0}, /* 115 Undefined */ {NULL, NULL, 0, 0}, /* 116 Undefined */ {NULL, NULL, 0, 0}, /* 117 Undefined */ @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.29 2007/05/23 12:01:43 inu Exp $ */ +/* $Id: html.h,v 1.30 2010/08/12 08:56:14 htrb Exp $ */ #ifndef _HTML_H #define _HTML_H #ifdef USE_SSL @@ -202,6 +202,8 @@ typedef struct { #define HTML_N_I 110 #define HTML_STRONG 111 #define HTML_N_STRONG 112 +#define HTML_SPAN 113 +#define HTML_N_SPAN 114 /* pseudo tag */ #define HTML_SELECT_INT 120 diff --git a/tagtable.tab b/tagtable.tab index d3ecfaf..1eb2f53 100644 --- a/tagtable.tab +++ b/tagtable.tab @@ -60,6 +60,8 @@ kbd HTML_NOP /kbd HTML_NOP samp HTML_NOP /samp HTML_NOP +span HTML_SPAN +/span HTML_N_SPAN strong HTML_STRONG /strong HTML_N_STRONG var HTML_NOP |