Package: w3m
Version: 0.5.2-4
Severity: wishlist
Tags: patch
Section 12.2.3 in the HTML 4.01 reccommendation says:
The id attribute may be used to create an anchor at the start tag of
any element (including the A element).
While w3m supports this functionality with some elements, it doesn't
with all. I've added all elements from the HTML 4.01 reccommendation
to the tag table, and set every opening tag to record the id element
so this works.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages w3m depends on:
ii libc6 2.10.2-6 Embedded GNU C Library: Shared lib
ii libgc1c2 1:6.8-1.2 conservative garbage collector for
ii libgpm2 1.20.4-3.3 General Purpose Mouse - shared lib
ii libncurses5 5.7+20090803-2 shared libraries for terminal hand
ii libssl0.9.8 0.9.8m-2 SSL shared libraries
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages w3m recommends:
ii ca-certificates 20090814 Common CA certificates
Versions of packages w3m suggests:
ii man-db 2.5.7-2 on-line manual pager
ii menu 2.1.43 generates programs menu for all me
ii migemo 0.40-10 Japanese incremental search with R
ii mime-support 3.48-1 MIME files 'mime.types' & 'mailcap
ii w3m-el-snapshot [w3 1.4.387+0.20100304-1 simple Emacs interface of w3m (dev
pn w3m-img <none> (no description available)
-- no debconf information
diff -urpN w3m-0.5.2-orig/html.c w3m-0.5.2/html.c
--- w3m-0.5.2-orig/html.c 2007-04-19 08:00:38.000000000 -0400
+++ w3m-0.5.2/html.c 2010-03-13 17:44:47.796827639 -0500
@@ -127,15 +127,15 @@ 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_NOP, 0},/* 6 HTML_BR */
+ {"b", ALST_NOP, MAXA_NOP, 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 */
{"li", ALST_LI, MAXA_LI, 0}, /* 11 HTML_LI */
{"ol", ALST_UL, MAXA_UL, 0}, /* 12 HTML_OL */
{"/ol", NULL, 0, TFLG_END}, /* 13 HTML_N_OL */
- {"title", NULL, 0, 0}, /* 14 HTML_TITLE */
+ {"title", ALST_NOP, MAXA_NOP, 0}, /* 14 HTML_TITLE */
{"/title", NULL, 0, TFLG_END}, /* 15 HTML_N_TITLE */
{"hr", ALST_HR, MAXA_HR, 0}, /* 16 HTML_HR */
{"dl", ALST_DL, MAXA_DL, 0}, /* 17 HTML_DL */
@@ -147,11 +147,11 @@ 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_NOP, 0}, /* 26 HTML_LISTING */
{"/listing", NULL, 0, TFLG_END}, /* 27 HTML_N_LISTING */
- {"xmp", NULL, 0, 0}, /* 28 HTML_XMP */
+ {"xmp", ALST_NOP, MAXA_NOP, 0}, /* 28 HTML_XMP */
{"/xmp", NULL, 0, TFLG_END}, /* 29 HTML_N_XMP */
- {"plaintext", NULL, 0, 0}, /* 30 HTML_PLAINTEXT */
+ {"plaintext", ALST_NOP, MAXA_NOP, 0}, /* 30 HTML_PLAINTEXT */
{"table", ALST_TABLE, MAXA_TABLE, 0}, /* 31 HTML_TABLE */
{"/table", NULL, 0, TFLG_END}, /* 32 HTML_N_TABLE */
{"meta", ALST_META, MAXA_META, 0}, /* 33 HTML_META */
@@ -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_NOP, 0}, /* 38 HTML_CENTER */
{"/center", NULL, 0, TFLG_END}, /* 39 HTML_N_CENTER */
- {"font", NULL, 0, 0}, /* 40 HTML_FONT */
+ {"font", ALST_NOP, MAXA_NOP, 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_NOP, 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 */
@@ -179,19 +179,19 @@ TagInfo TagMAP[MAX_HTMLTAG] = {
{"map", ALST_MAP, MAXA_MAP, 0}, /* 55 HTML_MAP */
{"/map", NULL, 0, TFLG_END}, /* 56 HTML_N_MAP */
{"area", ALST_AREA, MAXA_AREA, 0}, /* 57 HTML_AREA */
- {"script", NULL, 0, 0}, /* 58 HTML_SCRIPT */
+ {"script", ALST_NOP, MAXA_NOP, 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_NOP, 0}, /* 61 HTML_DEL */
{"/del", NULL, 0, TFLG_END}, /* 62 HTML_N_DEL */
- {"ins", NULL, 0, 0}, /* 63 HTML_INS */
+ {"ins", ALST_NOP, MAXA_NOP, 0}, /* 63 HTML_INS */
{"/ins", NULL, 0, TFLG_END}, /* 64 HTML_N_INS */
- {"u", NULL, 0, 0}, /* 65 HTML_U */
+ {"u", ALST_NOP, MAXA_NOP, 0}, /* 65 HTML_U */
{"/u", NULL, 0, TFLG_END}, /* 66 HTML_N_U */
- {"style", NULL, 0, 0}, /* 67 HTML_STYLE */
+ {"style", ALST_NOP, MAXA_NOP, 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 */
+ {"wbr", ALST_NOP, MAXA_NOP, 0}, /* 69 HTML_WBR */
+ {"em", ALST_NOP, MAXA_NOP, 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 */
@@ -203,45 +203,85 @@ TagInfo TagMAP[MAX_HTMLTAG] = {
{"/caption", NULL, 0, TFLG_END}, /* 79 HTML_N_CAPTION */
{"th", ALST_TD, MAXA_TD, 0}, /* 80 HTML_TH */
{"/th", NULL, 0, TFLG_END}, /* 81 HTML_N_TH */
- {"thead", NULL, 0, 0}, /* 82 HTML_THEAD */
+ {"thead", ALST_NOP, MAXA_NOP, 0}, /* 82 HTML_THEAD */
{"/thead", NULL, 0, TFLG_END}, /* 83 HTML_N_THEAD */
- {"tbody", NULL, 0, 0}, /* 84 HTML_TBODY */
+ {"tbody", ALST_NOP, MAXA_NOP, 0}, /* 84 HTML_TBODY */
{"/tbody", NULL, 0, TFLG_END}, /* 85 HTML_N_TBODY */
- {"tfoot", NULL, 0, 0}, /* 86 HTML_TFOOT */
+ {"tfoot", ALST_NOP, MAXA_NOP, 0}, /* 86 HTML_TFOOT */
{"/tfoot", NULL, 0, TFLG_END}, /* 87 HTML_N_TFOOT */
- {"colgroup", NULL, 0, 0}, /* 88 HTML_COLGROUP */
+ {"colgroup", ALST_NOP, MAXA_NOP, 0}, /* 88 HTML_COLGROUP */
{"/colgroup", NULL, 0, TFLG_END}, /* 89 HTML_N_COLGROUP */
- {"col", NULL, 0, 0}, /* 90 HTML_COL */
+ {"col", ALST_NOP, MAXA_NOP, 0}, /* 90 HTML_COL */
{"bgsound", ALST_BGSOUND, MAX_BGSOUND, 0}, /* 91 HTML_BGSOUND */
{"applet", ALST_APPLET, MAX_APPLET, 0}, /* 92 HTML_APPLET */
{"embed", ALST_EMBED, MAX_EMBED, 0}, /* 93 HTML_EMBED */
{"/option", NULL, 0, TFLG_END}, /* 94 HTML_N_OPTION */
- {"head", NULL, 0, 0}, /* 95 HTML_HEAD */
+ {"head", ALST_NOP, MAXA_NOP, 0}, /* 95 HTML_HEAD */
{"/head", NULL, 0, TFLG_END}, /* 96 HTML_N_HEAD */
- {"doctype", NULL, 0, 0}, /* 97 HTML_DOCTYPE */
+ {"doctype", ALST_NOP, MAXA_NOP, 0}, /* 97 HTML_DOCTYPE */
{"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", NULL, 0, 0}, /* 101 HTML_N_SUP */
- {"sub", NULL, 0, 0}, /* 102 HTML_SUB */
- {"/sub", NULL, 0, 0}, /* 103 HTML_N_SUB */
+ {"sup", ALST_NOP, MAXA_NOP, 0}, /* 100 HTML_SUP */
+ {"/sup", ALST_NOP, MAXA_NOP, 0}, /* 101 HTML_N_SUP */
+ {"sub", ALST_NOP, MAXA_NOP, 0}, /* 102 HTML_SUB */
+ {"/sub", ALST_NOP, MAXA_NOP, 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_NOP, 0}, /* 105 HTML_S */
{"/s", NULL, 0, TFLG_END}, /* 106 HTML_N_S */
- {"q", NULL, 0, 0}, /* 107 HTML_Q */
+ {"q", ALST_NOP, MAXA_NOP, 0}, /* 107 HTML_Q */
{"/q", NULL, 0, TFLG_END}, /* 108 HTML_N_Q */
- {"i", NULL, 0, 0}, /* 109 HTML_I */
+ {"i", ALST_NOP, MAXA_NOP, 0}, /* 109 HTML_I */
{"/i", NULL, 0, TFLG_END}, /* 110 HTML_N_I */
- {"strong", NULL, 0, 0}, /* 111 HTML_STRONG */
+ {"strong", ALST_NOP, MAXA_NOP, 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 */
- {NULL, NULL, 0, 0}, /* 115 Undefined */
- {NULL, NULL, 0, 0}, /* 116 Undefined */
- {NULL, NULL, 0, 0}, /* 117 Undefined */
- {NULL, NULL, 0, 0}, /* 118 Undefined */
- {NULL, NULL, 0, 0}, /* 119 Undefined */
+ {"span", ALST_P, MAXA_P, 0}, /* 113 HTML_SPAN */
+ {"/span", NULL, 0, TFLG_END}, /* 114 HTML_N_SPAN */
+ {"abbr", ALST_NOP, MAXA_NOP, 0}, /* 115 HTML_ABBR */
+ {"/abbr", NULL, 0, TFLG_END}, /* 116 HTML_N_ABBR */
+ {"acronym", ALST_NOP, MAXA_NOP, 0}, /* 117 HTML_ACRONYM */
+ {"/acronym", NULL, 0, TFLG_END}, /* 118 HTML_N_ACRONYM */
+ {"basefont", ALST_NOP, MAXA_NOP, 0}, /* 119 HTML_BASEFONT */
+ {"bdo", ALST_NOP, MAXA_NOP, 0}, /* 120 HTML_BDO */
+ {"/bdo", NULL, 0, TFLG_END}, /* 121 HTML_N_BDO */
+ {"big", ALST_NOP, MAXA_NOP, 0}, /* 122 HTML_BIG */
+ {"/big", NULL, 0, TFLG_END}, /* 123 HTML_N_BIG */
+ {"button", ALST_NOP, MAXA_NOP, 0}, /* 124 HTML_BUTTON */
+ {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 125 HTML_FIELDSET */
+ {"/fieldset", NULL, 0, TFLG_END}, /* 126 HTML_N_FIELDSET */
+ {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 127 HTML_IFRAME */
+ {"label", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_LABEL */
+ {"/label", NULL, 0, TFLG_END}, /* 129 HTML_N_LABEL */
+ {"legend", ALST_NOP, MAXA_NOP, 0}, /* 130 HTML_LEGEND */
+ {"/legend", NULL, 0, TFLG_END}, /* 131 HTML_N_LEGEND */
+ {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 132 HTML_NOSCRIPT */
+ {"/noscript", NULL, 0, TFLG_END}, /* 133 HTML_N_NOSCRIPT */
+ {"object", ALST_NOP, MAXA_NOP, 0}, /* 134 HTML_OBJECT */
+ {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OPTGROUP */
+ {"/optgroup", NULL, 0, TFLG_END}, /* 136 HTML_N_OPTGROUP */
+ {"param", ALST_NOP, MAXA_NOP, 0}, /* 137 HTML_PARAM */
+ {"small", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_SMALL */
+ {"/small", NULL, 0, TFLG_END}, /* 139 HTML_N_SMALL */
+
+ {NULL, NULL, 0, 0}, /* 140 Undefined */
+ {NULL, NULL, 0, 0}, /* 141 Undefined */
+ {NULL, NULL, 0, 0}, /* 142 Undefined */
+ {NULL, NULL, 0, 0}, /* 143 Undefined */
+ {NULL, NULL, 0, 0}, /* 144 Undefined */
+ {NULL, NULL, 0, 0}, /* 145 Undefined */
+ {NULL, NULL, 0, 0}, /* 146 Undefined */
+ {NULL, NULL, 0, 0}, /* 147 Undefined */
+ {NULL, NULL, 0, 0}, /* 148 Undefined */
+ {NULL, NULL, 0, 0}, /* 149 Undefined */
+ {NULL, NULL, 0, 0}, /* 150 Undefined */
+ {NULL, NULL, 0, 0}, /* 151 Undefined */
+ {NULL, NULL, 0, 0}, /* 152 Undefined */
+ {NULL, NULL, 0, 0}, /* 153 Undefined */
+ {NULL, NULL, 0, 0}, /* 154 Undefined */
+ {NULL, NULL, 0, 0}, /* 155 Undefined */
+ {NULL, NULL, 0, 0}, /* 156 Undefined */
+ {NULL, NULL, 0, 0}, /* 157 Undefined */
+ {NULL, NULL, 0, 0}, /* 158 Undefined */
+ {NULL, NULL, 0, 0}, /* 159 Undefined */
/* pseudo tag */
{"select_int", ALST_SELECT_INT, MAXA_SELECT_INT, TFLG_INT}, /* 120 HTML_SELECT_INT */
diff -urpN w3m-0.5.2-orig/html.h w3m-0.5.2/html.h
--- w3m-0.5.2-orig/html.h 2007-05-23 08:01:43.000000000 -0400
+++ w3m-0.5.2/html.h 2010-03-13 17:22:26.677305583 -0500
@@ -202,35 +202,62 @@ 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
+#define HTML_ABBR 115
+#define HTML_N_ABBR 116
+#define HTML_ACRONYM 117
+#define HTML_N_ACRONYM 118
+#define HTML_BASEFONT 119
+#define HTML_BDO 120
+#define HTML_N_BDO 121
+#define HTML_BIG 122
+#define HTML_N_BIG 123
+#define HTML_BUTTON 124
+#define HTML_FIELDSET 125
+#define HTML_N_FIELDSET 126
+#define HTML_IFRAME 127
+#define HTML_LABEL 128
+#define HTML_N_LABEL 129
+#define HTML_LEGEND 130
+#define HTML_N_LEGEND 131
+#define HTML_NOSCRIPT 132
+#define HTML_N_NOSCRIPT 133
+#define HTML_OBJECT 134
+#define HTML_OPTGROUP 135
+#define HTML_N_OPTGROUP 136
+#define HTML_PARAM 137
+#define HTML_SMALL 138
+#define HTML_N_SMALL 139
/* pseudo tag */
-#define HTML_SELECT_INT 120
-#define HTML_N_SELECT_INT 121
-#define HTML_OPTION_INT 122
-#define HTML_TEXTAREA_INT 123
-#define HTML_N_TEXTAREA_INT 124
-#define HTML_TABLE_ALT 125
-#define HTML_SYMBOL 126
-#define HTML_N_SYMBOL 127
-#define HTML_PRE_INT 128
-#define HTML_N_PRE_INT 129
-#define HTML_TITLE_ALT 130
-#define HTML_FORM_INT 131
-#define HTML_N_FORM_INT 132
-#define HTML_DL_COMPACT 133
-#define HTML_INPUT_ALT 134
-#define HTML_N_INPUT_ALT 135
-#define HTML_IMG_ALT 136
-#define HTML_N_IMG_ALT 137
-#define HTML_NOP 138
-#define HTML_PRE_PLAIN 139
-#define HTML_N_PRE_PLAIN 140
-#define HTML_INTERNAL 141
-#define HTML_N_INTERNAL 142
-#define HTML_DIV_INT 143
-#define HTML_N_DIV_INT 144
+#define HTML_SELECT_INT 160
+#define HTML_N_SELECT_INT 161
+#define HTML_OPTION_INT 162
+#define HTML_TEXTAREA_INT 163
+#define HTML_N_TEXTAREA_INT 164
+#define HTML_TABLE_ALT 165
+#define HTML_SYMBOL 166
+#define HTML_N_SYMBOL 167
+#define HTML_PRE_INT 168
+#define HTML_N_PRE_INT 169
+#define HTML_TITLE_ALT 170
+#define HTML_FORM_INT 171
+#define HTML_N_FORM_INT 172
+#define HTML_DL_COMPACT 173
+#define HTML_INPUT_ALT 174
+#define HTML_N_INPUT_ALT 175
+#define HTML_IMG_ALT 176
+#define HTML_N_IMG_ALT 177
+#define HTML_NOP 178
+#define HTML_PRE_PLAIN 179
+#define HTML_N_PRE_PLAIN 180
+#define HTML_INTERNAL 181
+#define HTML_N_INTERNAL 182
+#define HTML_DIV_INT 183
+#define HTML_N_DIV_INT 184
-#define MAX_HTMLTAG 145
+#define MAX_HTMLTAG 185
/* Tag attribute */
Binary files w3m-0.5.2-orig/po/ja.gmo and w3m-0.5.2/po/ja.gmo differ
diff -urpN w3m-0.5.2-orig/po/stamp-po w3m-0.5.2/po/stamp-po
--- w3m-0.5.2-orig/po/stamp-po 1969-12-31 19:00:00.000000000 -0500
+++ w3m-0.5.2/po/stamp-po 2010-03-13 17:23:01.439093949 -0500
@@ -0,0 +1 @@
+timestamp
diff -urpN w3m-0.5.2-orig/tagtable.tab w3m-0.5.2/tagtable.tab
--- w3m-0.5.2-orig/tagtable.tab 2006-12-10 06:06:12.000000000 -0500
+++ w3m-0.5.2/tagtable.tab 2010-03-13 17:03:26.061248690 -0500
@@ -161,6 +161,34 @@ pre_int HTML_PRE_INT
bgsound HTML_BGSOUND
applet HTML_APPLET
embed HTML_EMBED
+span HTML_SPAN
+/span HTML_N_SPAN
+abbr HTML_ABBR
+/abbr HTML_N_ABBR
+acronym HTML_ACRONYM
+/acronym HTML_N_ACRONYM
+area HTML_AREA
+basefont HTML_BASEFONT
+bdo HTML_BDO
+/bdo HTML_N_BDO
+big HTML_BIG
+/big HTML_N_BIG
+button HTML_BUTTON
+fieldset HTML_FIELDSET
+/fieldset HTML_N_FIELDSET
+iframe HTML_IFRAME
+label HTML_LABEL
+/label HTML_N_LABEL
+legend HTML_LEGEND
+/legend HTML_N_LEGEND
+noscript HTML_NOSCRIPT
+/noscript HTML_N_NOSCRIPT
+object HTML_OBJECT
+optgroup HTML_OPTGROUP
+/optgroup HTML_N_OPTGROUP
+param HTML_PARAM
+small HTML_SMALL
+/small HTML_N_SMALL
internal HTML_INTERNAL
/internal HTML_N_INTERNAL
select_int HTML_SELECT_INT