storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken anchor with link number at EOL

Browse Source 
If, while adding the link number, we detect that we need to flush the
line, the anchor will be broken. When returning to the last breakpoint
only the link number will be removed, the internal anchor reference '<a
hseq=... >' remains on the flushed line.

Instead of adding the link number in a separate operation, check if we
just processed an anchor tag and prepend the current token with the link
number.
This commit is contained in:
Rene Kita
2021-12-12 11:29:48 +01:00
parent fa6da6a0fa
commit 9a2b86088c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
file.c
+14 -3
View File
@@ -30,6 +30,7 @@
#define MAX_INPUT_SIZE 80 /* TODO - max should be screen line length */
static int frame_source = 0;
static int need_number = 0;
static char *guess_filename(char *file);
static int _MoveFile(char *path1, char *path2);
@@ -5017,8 +5018,6 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
obuf->anchor.hseq = cur_hseq;
tmp = process_anchor(tag, h_env->tagbuf->ptr);
push_tag(obuf, tmp->ptr, HTML_A);
if (displayLinkNumber)
HTMLlineproc1(getLinkNumberStr(-1)->ptr, h_env);
return 1;
}
return 0;
@@ -5029,6 +5028,10 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
if (parsedtag_exists(tag, ATTR_USEMAP))
HTML5_CLOSE_A;
tmp = process_img(tag, h_env->limit);
if (need_number) {
tmp = Strnew_m_charp(getLinkNumberStr(-1)->ptr, tmp->ptr, NULL);
need_number = 0;
}
HTMLlineproc1(tmp->ptr, h_env);
return 1;
case HTML_IMG_ALT:
@@ -6489,6 +6492,10 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
if (obuf->status != R_ST_NORMAL) /* R_ST_AMP ? */
obuf->status = R_ST_NORMAL;
str = tokbuf->ptr;
if (need_number) {
str = Strnew_m_charp(getLinkNumberStr(-1)->ptr, str, NULL)->ptr;
need_number = 0;
}
}
if (pre_mode & (RB_PLAIN | RB_INTXTA | RB_INSELECT | RB_SCRIPT |
@@ -6616,8 +6623,12 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
clear_ignore_p_flag(cmd, obuf);
if (cmd == HTML_TABLE)
goto table_start;
else
else {
if (displayLinkNumber && cmd == HTML_A && !internal)
if (h_env->obuf->anchor.url)
need_number = 1;
continue;
}
}
if (obuf->flag & (RB_DEL | RB_S))