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

* [w3m-dev 04238] [patch] simple preserve space

Browse Source 
* rc.c: Introduce option simple_preserve_space.
* fm.h: add global variable SimplePreserveSpace.
* file.c (HTMLlineproc0): check SimplePreserveSpace.
This commit is contained in:
Ito Hiroyuki
2010-07-19 09:00:34 +00:00
parent 6a2579bb26
commit fd8468f7f9
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+11 -1
View File
@@ -1,3 +1,10 @@
2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04238] [patch] simple preserve space
* rc.c: Introduce option simple_preserve_space.
* fm.h: add global variable SimplePreserveSpace.
* file.c (HTMLlineproc0): check SimplePreserveSpace.
2010-07-18 d+w3m@vdr.jp
* [w3m-dev 04319] Re: w3m's bugs from bugs.debian.org
@@ -10,6 +17,9 @@
* display.c (displayBuffer): use is_html_type() instead of strcasecmp().
* buffer.c (reshapeBuffer): use is_html_type() instead of strcasecmp().
* backend.c (internal_get): use is_html_type() instead of strcasecmp().
* main.c (vwSrc, reload, dispI, stopI): use is_html_type() instead of strcasecmp().
* proto.h: add is_html_type()
* url.c: add "xhtml" to DefaultGuess.
2010-07-18 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
@@ -8964,4 +8974,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.1008 2010/07/18 14:10:09 htrb Exp $
$Id: ChangeLog,v 1.1009 2010/07/19 09:00:34 htrb Exp $
file.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.255 2010/07/18 14:10:09 htrb Exp $ */
/* $Id: file.c,v 1.256 2010/07/19 09:00:34 htrb Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -6347,7 +6347,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
is_hangul = wtf_is_hangul((wc_uchar *) str);
else
is_hangul = 0;
if (mode == PC_KANJI1 &&
if (!SimplePreserveSpace && mode == PC_KANJI1 &&
!is_hangul && !prev_is_hangul &&
obuf->pos > h_env->envs[h_env->envc].indent &&
Strlastchar(obuf->line) == ' ') {
fm.h
+2 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.138 2007/05/30 04:47:24 inu Exp $ */
/* $Id: fm.h,v 1.139 2010/07/19 09:00:34 htrb Exp $ */
/*
* w3m: WWW wo Miru utility
*
@@ -1038,6 +1038,7 @@ global char ExtHalfdump init(FALSE);
global char FollowLocale init(TRUE);
global char UseContentCharset init(TRUE);
global char SearchConv init(TRUE);
global char SimplePreserveSpace init(FALSE);
#define Str_conv_from_system(x) wc_Str_conv((x), SystemCharset, InnerCharset)
#define Str_conv_to_system(x) wc_Str_conv_strict((x), InnerCharset, SystemCharset)
#define Str_conv_to_halfdump(x) (ExtHalfdump ? wc_Str_conv((x), InnerCharset, DisplayCharset) : (x))
rc.c
+4 -1
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.106 2007/05/23 15:06:06 inu Exp $ */
/* $Id: rc.c,v 1.107 2010/07/19 09:00:34 htrb Exp $ */
/*
* Initialization file etc.
*/
@@ -229,6 +229,7 @@ static int OptionEncode = FALSE;
#define CMT_USE_JISX0213 N_("Use JIS X 0213:2000 (2000JIS)")
#define CMT_STRICT_ISO2022 N_("Strict ISO-2022-JP/KR/CN")
#define CMT_GB18030_AS_UCS N_("Treat 4 bytes char. of GB18030 as Unicode")
#define CMT_SIMPLE_PRESERVE_SPACE N_("Simple Preserve space")
#endif
#define CMT_KEYMAP_FILE N_("keymap file")
@@ -671,6 +672,8 @@ struct param_ptr params10[] = {
{"gb18030_as_ucs", P_CHARINT, PI_ONOFF, (void *)&WcOption.gb18030_as_ucs,
CMT_GB18030_AS_UCS, NULL},
#endif
{"simple_preserve_space", P_CHARINT, PI_ONOFF, (void *)&SimplePreserveSpace,
CMT_SIMPLE_PRESERVE_SPACE, NULL},
{NULL, 0, 0, NULL, NULL, NULL},
};
#endif