diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | lynx.hlp | 4 | ||||
| -rw-r--r-- | lynx.man | 6 | ||||
| -rw-r--r-- | src/GridText.c | 7 |
4 files changed, 16 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES index c8ce5d4b..a0bca52f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,12 @@ --- $LynxId: CHANGES,v 1.628 2012/11/14 01:15:50 tom Exp $ +-- $LynxId: CHANGES,v 1.629 2012/11/15 00:51:22 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2012-11-13 (2.8.8dev.15) +2012-11-14 (2.8.8dev.15) +* fix special case when -dont_wrap_pre option is used, to restore space between + words which was lost when inserting a soft newline used to splice together + segments of a long line (Ubuntu #806749) -TD * provide more readable ETA message as an option (prompted by patch by Joerg Hahn) -TD * add GNUTLS call to enable SNI (Server Name Indication) extension (Ubuntu diff --git a/lynx.hlp b/lynx.hlp index bd56637e..d928121b 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -218,8 +218,8 @@ set the charset for the terminal output. -dont_wrap_pre - inhibit wrapping of text in <pre> when -dump'ing and -crawl'ing, - mark wrapped lines in interactive session. + inhibit wrapping of text when -dump'ing and -crawl'ing, mark + wrapped lines of <pre> in interactive session. -dump dumps the formatted output of the default document or those specified on the command line to standard output. Unlike diff --git a/lynx.man b/lynx.man index b4db4671..781a6264 100644 --- a/lynx.man +++ b/lynx.man @@ -1,4 +1,4 @@ -.\" $LynxId: lynx.man,v 1.92 2012/11/13 09:34:36 tom Exp $ +.\" $LynxId: lynx.man,v 1.93 2012/11/15 00:56:24 tom Exp $ .nr N -1 .nr D 5 .TH LYNX 1 @@ -269,8 +269,8 @@ set the display variable for X rexec-ed programs. set the charset for the terminal output. .TP .B \-dont_wrap_pre -inhibit wrapping of text in <pre> when \fB\-dump\fR'ing and \fB\-crawl\fR'ing, -mark wrapped lines in interactive session. +inhibit wrapping of text when \fB\-dump\fR'ing and \fB\-crawl\fR'ing, +mark wrapped lines of <pre> in interactive session. .TP .B \-dump dumps the formatted output of the default document or those diff --git a/src/GridText.c b/src/GridText.c index 6cea9052..1d1bffb7 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.239 2012/08/15 22:20:41 tom Exp $ + * $LynxId: GridText.c,v 1.240 2012/11/15 00:48:46 tom Exp $ * * Character grid hypertext object * =============================== @@ -4277,6 +4277,9 @@ void HText_appendCharacter(HText *text, int ch) target_cu + UTF_XLEN(ch) >= LYcols_cu(text))) { int saved_kanji_buf; eGridState saved_state; + BOOL add_blank = (dont_wrap_pre + && line->size + && (line->data[line->size - 1] == ' ')); new_line(text); line = text->last_line; @@ -4286,6 +4289,8 @@ void HText_appendCharacter(HText *text, int ch) text->kanji_buf = '\0'; text->state = S_text; HText_appendCharacter(text, LY_SOFT_NEWLINE); + if (add_blank) + HText_appendCharacter(text, ' '); text->kanji_buf = saved_kanji_buf; text->state = saved_state; } |