diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | file.c | 8 | ||||
| -rw-r--r-- | html.c | 56 | ||||
| -rw-r--r-- | html.h | 58 | ||||
| -rw-r--r-- | tagtable.tab | 2 | 
5 files changed, 78 insertions, 57 deletions
| @@ -1,3 +1,12 @@ +2003-04-19  Fumitoshi UKAI  <ukai@debian.or.jp> + +	* [w3m-dev 03882] Re: Bug#189460: w3m: <q> tag is not recognized +	* file.c (HTMLtagproc1): add HTML_Q, HTML_N_Q +	* html.c (TagMAP): add "q", "/q" +	* html.h (HTML_Q): added +		(HTML_N_Q): added +	* tagtable.tab: add q, /q +  2003-04-15  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>  	* [w3m-dev 03880] Re: convert \ -> / in URL @@ -7756,4 +7765,4 @@ a	* [w3m-dev 03276] compile error on EWS4800  	* release-0-2-1  	* import w3m-0.2.1 -$Id: ChangeLog,v 1.826 2003/04/15 14:46:17 ukai Exp $ +$Id: ChangeLog,v 1.827 2003/04/18 16:47:16 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.222 2003/04/14 03:29:38 ukai Exp $ */ +/* $Id: file.c,v 1.223 2003/04/18 16:47:17 ukai Exp $ */  #include "fm.h"  #include <sys/types.h>  #include "myctype.h" @@ -4158,6 +4158,12 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)      case HTML_N_EM:  	HTMLlineproc1("</b>", h_env);  	return 1; +    case HTML_Q: +	HTMLlineproc1("`", h_env); +	return 1; +    case HTML_N_Q: +	HTMLlineproc1("'", h_env); +	return 1;      case HTML_P:      case HTML_N_P:  	CLOSE_A; @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.22 2002/12/09 15:40:36 ukai Exp $ */ +/* $Id: html.c,v 1.23 2003/04/18 16:47:18 ukai Exp $ */  #include "html.h"  /* Define HTML Tag Infomation Table */ @@ -228,34 +228,36 @@ TagInfo TagMAP[MAX_HTMLTAG] = {      {"link", ALST_LINK, MAXA_LINK, 0},	/*  104 HTML_LINK      */      {"s", NULL, 0, 0},		/*  105 HTML_S        */      {"/s", NULL, 0, TFLG_END},	/*  106 HTML_N_S      */ -    {NULL, NULL, 0, 0},		/* 107 Undefined       */ +    {"q", NULL, 0, 0},		/*  107 HTML_Q */ +    {"/q", NULL, 0, TFLG_END},	/*  108 HTML_N_Q */ +    {NULL, NULL, 0, 0},		/* 109 Undefined       */      /* pseudo tag */ -    {"select_int", ALST_SELECT_INT, MAXA_SELECT_INT, TFLG_INT},	/* 108 HTML_SELECT_INT   */ -    {"/select_int", NULL, 0, TFLG_INT | TFLG_END},	/* 109 HTML_N_SELECT_INT */ -    {"option_int", ALST_OPTION, MAXA_OPTION, TFLG_INT},	/* 110 HTML_OPTION_INT   */ -    {"textarea_int", ALST_TEXTAREA_INT, MAXA_TEXTAREA_INT, TFLG_INT},	/* 111 HTML_TEXTAREA_INT   */ -    {"/textarea_int", NULL, 0, TFLG_INT | TFLG_END},	/* 112 HTML_N_TEXTAREA_INT */ -    {"table_alt", ALST_TABLE_ALT, MAXA_TABLE_ALT, TFLG_INT},	/* 113 HTML_TABLE_ALT   */ -    {"rule", ALST_RULE, MAXA_RULE, TFLG_INT},	/* 114 HTML_RULE        */ -    {"/rule", NULL, 0, TFLG_INT | TFLG_END},	/* 115 HTML_N_RULE      */ -    {"pre_int", NULL, 0, TFLG_INT},	/* 116 HTML_PRE_INT     */ -    {"/pre_int", NULL, 0, TFLG_INT | TFLG_END},	/* 117 HTML_N_PRE_INT   */ -    {"title_alt", ALST_TITLE_ALT, MAXA_TITLE_ALT, TFLG_INT},	/* 118 HTML_TITLE_ALT   */ -    {"form_int", ALST_FORM_INT, MAXA_FORM_INT, TFLG_INT},	/* 119 HTML_FORM_INT    */ -    {"/form_int", NULL, 0, TFLG_INT | TFLG_END},	/* 120 HTML_N_FORM_INT  */ -    {"dl_compact", NULL, 0, TFLG_INT},	/* 121 HTML_DL_COMPACT  */ -    {"input_alt", ALST_INPUT_ALT, MAXA_INPUT_ALT, TFLG_INT},	/* 122 HTML_INPUT_ALT   */ -    {"/input_alt", NULL, 0, TFLG_INT | TFLG_END},	/* 123 HTML_N_INPUT_ALT */ -    {"img_alt", ALST_IMG_ALT, MAXA_IMG_ALT, TFLG_INT},	/* 124 HTML_IMG_ALT     */ -    {"/img_alt", NULL, 0, TFLG_INT | TFLG_END},	/* 125 HTML_N_IMG_ALT   */ -    {" ", ALST_NOP, MAXA_NOP, TFLG_INT},	/* 126 HTML_NOP         */ -    {"pre_plain", NULL, 0, TFLG_INT},	/* 127 HTML_PRE_PLAIN         */ -    {"/pre_plain", NULL, 0, TFLG_INT | TFLG_END},	/* 128 HTML_N_PRE_PLAIN         */ -    {"internal", NULL, 0, TFLG_INT},	/* 129 HTML_INTERNAL   */ -    {"/internal", NULL, 0, TFLG_INT | TFLG_END},	/* 130 HTML_N_INTERNAL   */ -    {"div_int", ALST_P, MAXA_P, TFLG_INT},	/*  131 HTML_DIV_INT    */ -    {"/div_int", NULL, 0, TFLG_INT | TFLG_END},	/*  132 HTML_N_DIV_INT  */ +    {"select_int", ALST_SELECT_INT, MAXA_SELECT_INT, TFLG_INT},	/* 110 HTML_SELECT_INT   */ +    {"/select_int", NULL, 0, TFLG_INT | TFLG_END},	/* 111 HTML_N_SELECT_INT */ +    {"option_int", ALST_OPTION, MAXA_OPTION, TFLG_INT},	/* 112 HTML_OPTION_INT   */ +    {"textarea_int", ALST_TEXTAREA_INT, MAXA_TEXTAREA_INT, TFLG_INT},	/* 113 HTML_TEXTAREA_INT   */ +    {"/textarea_int", NULL, 0, TFLG_INT | TFLG_END},	/* 114 HTML_N_TEXTAREA_INT */ +    {"table_alt", ALST_TABLE_ALT, MAXA_TABLE_ALT, TFLG_INT},	/* 115 HTML_TABLE_ALT   */ +    {"rule", ALST_RULE, MAXA_RULE, TFLG_INT},	/* 116 HTML_RULE        */ +    {"/rule", NULL, 0, TFLG_INT | TFLG_END},	/* 117 HTML_N_RULE      */ +    {"pre_int", NULL, 0, TFLG_INT},	/* 118 HTML_PRE_INT     */ +    {"/pre_int", NULL, 0, TFLG_INT | TFLG_END},	/* 119 HTML_N_PRE_INT   */ +    {"title_alt", ALST_TITLE_ALT, MAXA_TITLE_ALT, TFLG_INT},	/* 120 HTML_TITLE_ALT   */ +    {"form_int", ALST_FORM_INT, MAXA_FORM_INT, TFLG_INT},	/* 121 HTML_FORM_INT    */ +    {"/form_int", NULL, 0, TFLG_INT | TFLG_END},	/* 122 HTML_N_FORM_INT  */ +    {"dl_compact", NULL, 0, TFLG_INT},	/* 123 HTML_DL_COMPACT  */ +    {"input_alt", ALST_INPUT_ALT, MAXA_INPUT_ALT, TFLG_INT},	/* 124 HTML_INPUT_ALT   */ +    {"/input_alt", NULL, 0, TFLG_INT | TFLG_END},	/* 125 HTML_N_INPUT_ALT */ +    {"img_alt", ALST_IMG_ALT, MAXA_IMG_ALT, TFLG_INT},	/* 126 HTML_IMG_ALT     */ +    {"/img_alt", NULL, 0, TFLG_INT | TFLG_END},	/* 127 HTML_N_IMG_ALT   */ +    {" ", ALST_NOP, MAXA_NOP, TFLG_INT},	/* 128 HTML_NOP         */ +    {"pre_plain", NULL, 0, TFLG_INT},	/* 129 HTML_PRE_PLAIN         */ +    {"/pre_plain", NULL, 0, TFLG_INT | TFLG_END},	/* 130 HTML_N_PRE_PLAIN         */ +    {"internal", NULL, 0, TFLG_INT},	/* 131 HTML_INTERNAL   */ +    {"/internal", NULL, 0, TFLG_INT | TFLG_END},	/* 132 HTML_N_INTERNAL   */ +    {"div_int", ALST_P, MAXA_P, TFLG_INT},	/*  133 HTML_DIV_INT    */ +    {"/div_int", NULL, 0, TFLG_INT | TFLG_END},	/*  134 HTML_N_DIV_INT  */  };  TagAttrInfo AttrMAP[MAX_TAGATTR] = { @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.22 2003/01/15 16:11:43 ukai Exp $ */ +/* $Id: html.h,v 1.23 2003/04/18 16:47:18 ukai Exp $ */  #ifndef _HTML_H  #define _HTML_H  #ifdef USE_SSL @@ -195,35 +195,37 @@ typedef struct {  #define HTML_LINK       104  #define HTML_S          105  #define HTML_N_S        106 +#define HTML_Q		107 +#define HTML_N_Q	108     /* pseudo tag */ -#define HTML_SELECT_INT     108 -#define HTML_N_SELECT_INT   109 -#define HTML_OPTION_INT     110 -#define HTML_TEXTAREA_INT   111 -#define HTML_N_TEXTAREA_INT 112 -#define HTML_TABLE_ALT      113 -#define HTML_RULE           114 -#define HTML_N_RULE         115 -#define HTML_PRE_INT        116 -#define HTML_N_PRE_INT      117 -#define HTML_TITLE_ALT      118 -#define HTML_FORM_INT       119 -#define HTML_N_FORM_INT     120 -#define HTML_DL_COMPACT     121 -#define HTML_INPUT_ALT      122 -#define HTML_N_INPUT_ALT    123 -#define HTML_IMG_ALT        124 -#define HTML_N_IMG_ALT      125 -#define HTML_NOP	    126 -#define HTML_PRE_PLAIN	    127 -#define HTML_N_PRE_PLAIN    128 -#define HTML_INTERNAL       129 -#define HTML_N_INTERNAL     130 -#define HTML_DIV_INT        131 -#define HTML_N_DIV_INT      132 - -#define MAX_HTMLTAG	    133 +#define HTML_SELECT_INT     110 +#define HTML_N_SELECT_INT   111 +#define HTML_OPTION_INT     112 +#define HTML_TEXTAREA_INT   113 +#define HTML_N_TEXTAREA_INT 114 +#define HTML_TABLE_ALT      115 +#define HTML_RULE           116 +#define HTML_N_RULE         117 +#define HTML_PRE_INT        118 +#define HTML_N_PRE_INT      119 +#define HTML_TITLE_ALT      120 +#define HTML_FORM_INT       121 +#define HTML_N_FORM_INT     122 +#define HTML_DL_COMPACT     123 +#define HTML_INPUT_ALT      124 +#define HTML_N_INPUT_ALT    125 +#define HTML_IMG_ALT        126 +#define HTML_N_IMG_ALT      127 +#define HTML_NOP	    128 +#define HTML_PRE_PLAIN	    129 +#define HTML_N_PRE_PLAIN    130 +#define HTML_INTERNAL       131 +#define HTML_N_INTERNAL     132 +#define HTML_DIV_INT        133 +#define HTML_N_DIV_INT      134 + +#define MAX_HTMLTAG	    135  /* Tag attribute */ diff --git a/tagtable.tab b/tagtable.tab index 7bff629..cfb820e 100644 --- a/tagtable.tab +++ b/tagtable.tab @@ -44,6 +44,8 @@ pre		HTML_PRE  /pre		HTML_N_PRE  blockquote	HTML_BLQ  /blockquote	HTML_N_BLQ +q		HTML_Q +/q		HTML_N_Q  img		HTML_IMG  image		HTML_IMG  code		HTML_NOP | 
