aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-10-10 16:59:32 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-10-10 16:59:32 +0000
commite6e9b7ae2e6d750db972584cf355d86b33b18954 (patch)
treec510fa8f9520ea1c8da86fb19b24ec9869e09324
parent[w3m-dev 03337] delete unused functions in fb.c etc. (Re: canna patch) (diff)
downloadw3m-e6e9b7ae2e6d750db972584cf355d86b33b18954.tar.gz
w3m-e6e9b7ae2e6d750db972584cf355d86b33b18954.zip
[w3m-dev 03339] Re: Debian Bug#164098 w3m: <sup> is not properly supported
* file.c (HTMLtagproc1): HTML_SUP, HTML_N_SUP, HTML_SUB, HTML_N_SUB * html.c (TagMAP): sup, /sup, sub, /sub * html.c (HTML_SUP): added (HTML_N_SUP): added (HTML_SUB): added (HTML_N_SUB): added * table.c (feed_table_tag): HTML_SUP, HTML_N_SUP, HTML_SUB, HTML_N_SUB * tagtable.tab (sup): added (/sup): added (sub): added (/sub): added From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to '')
-rw-r--r--ChangeLog17
-rw-r--r--file.c13
-rw-r--r--html.c10
-rw-r--r--html.h7
-rw-r--r--table.c6
-rw-r--r--tagtable.tab4
6 files changed, 47 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f98c45..74c5587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-11 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03339] Re: Debian Bug#164098 w3m: <sup> is not properly supported
+ * file.c (HTMLtagproc1): HTML_SUP, HTML_N_SUP, HTML_SUB, HTML_N_SUB
+ * html.c (TagMAP): sup, /sup, sub, /sub
+ * html.c (HTML_SUP): added
+ (HTML_N_SUP): added
+ (HTML_SUB): added
+ (HTML_N_SUB): added
+ * table.c (feed_table_tag): HTML_SUP, HTML_N_SUP, HTML_SUB, HTML_N_SUB
+ * tagtable.tab (sup): added
+ (/sup): added
+ (sub): added
+ (/sub): added
+
2002-10-11 Hiroyuki Ito <hito@crl.go.jp>
* [w3m-dev 03337] delete unused functions in fb.c etc. (Re: canna patch)
@@ -3915,4 +3930,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.441 2002/10/10 16:32:06 ukai Exp $
+$Id: ChangeLog,v 1.442 2002/10/10 16:59:32 ukai Exp $
diff --git a/file.c b/file.c
index fc62f4f..0ebbb35 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.102 2002/09/28 16:30:07 ukai Exp $ */
+/* $Id: file.c,v 1.103 2002/10/10 16:59:33 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -4591,6 +4591,17 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
case HTML_N_INS:
HTMLlineproc1("<U>:INS]</U>", h_env);
return 1;
+ case HTML_SUP:
+ HTMLlineproc1("^", h_env);
+ return 1;
+ case HTML_N_SUP:
+ return 1;
+ case HTML_SUB:
+ HTMLlineproc1("[", h_env);
+ return 1;
+ case HTML_N_SUB:
+ HTMLlineproc1("]", h_env);
+ return 1;
case HTML_FONT:
case HTML_N_FONT:
case HTML_NOP:
diff --git a/html.c b/html.c
index 641b7a3..9d0be18 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.12 2002/02/28 16:15:41 ukai Exp $ */
+/* $Id: html.c,v 1.13 2002/10/10 16:59:33 ukai Exp $ */
#include "html.h"
/* Define HTML Tag Infomation Table */
@@ -216,10 +216,10 @@ TagInfo TagMAP[MAX_HTMLTAG] = {
{"noframes", ALST_NOFRAMES, MAXA_NOFRAMES, 0}, /* 98 HTML_NOFRAMES */
{"/noframes", NULL, 0, TFLG_END}, /* 99 HTML_N_NOFRAMES */
- {NULL, NULL, 0, 0}, /* 100 Undefined */
- {NULL, NULL, 0, 0}, /* 101 Undefined */
- {NULL, NULL, 0, 0}, /* 102 Undefined */
- {NULL, NULL, 0, 0}, /* 103 Undefined */
+ {"sup", NULL, 0, 0}, /* 100 HTML_SUP */
+ {"/sup", NULL, 0, 0}, /* 101 HTML_N_SUP */
+ {"sub", NULL, 0, 0}, /* 102 HTML_SUB */
+ {"/sub", NULL, 0, 0}, /* 103 HTML_N_SUB */
{NULL, NULL, 0, 0}, /* 104 Undefined */
{NULL, NULL, 0, 0}, /* 105 Undefined */
diff --git a/html.h b/html.h
index 971d8fa..cde57c6 100644
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/* $Id: html.h,v 1.8 2002/09/28 16:30:07 ukai Exp $ */
+/* $Id: html.h,v 1.9 2002/10/10 16:59:33 ukai Exp $ */
#ifndef _HTML_H
#define _HTML_H
#ifdef USE_SSL
@@ -185,7 +185,10 @@ typedef struct {
#define HTML_DOCTYPE 97
#define HTML_NOFRAMES 98
#define HTML_N_NOFRAMES 99
-
+#define HTML_SUP 100
+#define HTML_N_SUP 101
+#define HTML_SUB 102
+#define HTML_N_SUB 103
/* pseudo tag */
#define HTML_INTERNAL 106
diff --git a/table.c b/table.c
index 2f81c1c..357b1d1 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.24 2002/04/17 02:42:27 ukai Exp $ */
+/* $Id: table.c,v 1.25 2002/10/10 16:59:33 ukai Exp $ */
/*
* HTML table
*/
@@ -2896,6 +2896,10 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
case HTML_N_DEL:
case HTML_INS:
case HTML_N_INS:
+ case HTML_SUP:
+ case HTML_N_SUP:
+ case HTML_SUB:
+ case HTML_N_SUB:
feed_table_inline_tag(tbl, line, mode, 5);
break;
case HTML_TABLE_ALT:
diff --git a/tagtable.tab b/tagtable.tab
index 5baa11e..31208fb 100644
--- a/tagtable.tab
+++ b/tagtable.tab
@@ -139,6 +139,10 @@ tfoot HTML_TFOOT
colgroup HTML_COLGROUP
/colgroup HTML_N_COLGROUP
col HTML_COL
+sup HTML_SUP
+/sup HTML_N_SUP
+sub HTML_SUB
+/sub HTML_N_SUB
table_alt HTML_TABLE_ALT
_rule HTML_RULE
/_rule HTML_N_RULE