diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | file.c | 209 | ||||
| -rw-r--r-- | fm.h | 21 | ||||
| -rw-r--r-- | po/ja.po | 152 | ||||
| -rw-r--r-- | po/w3m.pot | 146 | ||||
| -rw-r--r-- | rc.c | 15 | ||||
| -rw-r--r-- | table.c | 64 |
7 files changed, 430 insertions, 185 deletions
@@ -1,5 +1,11 @@ 2007-05-23 Hiroyuki Ito <ZXB01226@nifty.com> + * [w3m-dev 04233], [w3m-dev 04236] Re: <del>, <s>, <ins>, and so on + * file.c, fm.h, po/ja.po, po/w3m.pot, rc.c, table.c: + expand display_ins_del to select a type of fontify. + +2007-05-23 Hiroyuki Ito <ZXB01226@nifty.com> + * [w3m-dev 04242] Re: Compile error when --without-ssl * aclocal.m4, configure.ac: add checking ssl before digest_auth. * configure: regenerated. @@ -8838,4 +8844,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.983 2007/05/23 12:49:43 inu Exp $ +$Id: ChangeLog,v 1.984 2007/05/23 13:07:44 inu Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.252 2007/05/23 12:26:56 inu Exp $ */ +/* $Id: file.c,v 1.253 2007/05/23 13:07:44 inu Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -2444,6 +2444,8 @@ set_breakpoint(struct readbuffer *obuf, int tag_length) obuf->bp.in_bold = obuf->in_bold; obuf->bp.in_italic = obuf->in_italic; obuf->bp.in_under = obuf->in_under; + obuf->bp.in_strike = obuf->in_strike; + obuf->bp.in_ins = obuf->in_ins; obuf->bp.nobr_level = obuf->nobr_level; obuf->bp.prev_ctype = obuf->prev_ctype; obuf->bp.init_flag = 0; @@ -2459,6 +2461,8 @@ back_to_breakpoint(struct readbuffer *obuf) obuf->in_bold = obuf->bp.in_bold; obuf->in_italic = obuf->bp.in_italic; obuf->in_under = obuf->bp.in_under; + obuf->in_strike = obuf->bp.in_strike; + obuf->in_ins = obuf->bp.in_ins; obuf->prev_ctype = obuf->bp.prev_ctype; obuf->pos = obuf->bp.pos; obuf->top_margin = obuf->bp.top_margin; @@ -2481,6 +2485,7 @@ append_tags(struct readbuffer *obuf) case HTML_B: case HTML_U: case HTML_I: + case HTML_S: push_link(obuf->tag_stack[i]->cmd, obuf->line->length, obuf->pos); break; } @@ -2695,7 +2700,8 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, FILE *f = h_env->f; Str line = obuf->line, pass = NULL; char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL, - *hidden_under = NULL, *hidden_italic = NULL, *hidden = NULL; + *hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL, + *hidden_ins = NULL, *hidden = NULL; #ifdef DEBUG if (w3m_debug) { @@ -2745,6 +2751,18 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, hidden = hidden_under; } } + if (obuf->in_strike) { + if ((hidden_strike = has_hidden_link(obuf, HTML_S)) != NULL) { + if (!hidden || hidden_strike < hidden) + hidden = hidden_strike; + } + } + if (obuf->in_ins) { + if ((hidden_ins = has_hidden_link(obuf, HTML_INS)) != NULL) { + if (!hidden || hidden_ins < hidden) + hidden = hidden_ins; + } + } if (hidden) { pass = Strnew_charp(hidden); Strshrink(line, line->ptr + line->length - hidden); @@ -2772,6 +2790,10 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, Strcat_charp(line, "</i>"); if (obuf->in_under && !hidden_under) Strcat_charp(line, "</u>"); + if (obuf->in_strike && !hidden_strike) + Strcat_charp(line, "</s>"); + if (obuf->in_ins && !hidden_ins) + Strcat_charp(line, "</ins>"); if (obuf->top_margin > 0) { int i; @@ -2978,6 +3000,10 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, push_tag(obuf, "<I>", HTML_I); if (!hidden_under && obuf->in_under) push_tag(obuf, "<U>", HTML_U); + if (!hidden_strike && obuf->in_strike) + push_tag(obuf, "<S>", HTML_S); + if (!hidden_ins && obuf->in_ins) + push_tag(obuf, "<INS>", HTML_INS); } void @@ -3092,6 +3118,10 @@ save_fonteffect(struct html_feed_environ *h_env, struct readbuffer *obuf) push_tag(obuf, "</i>", HTML_N_I); if (obuf->in_under) push_tag(obuf, "</u>", HTML_N_U); + if (obuf->in_strike) + push_tag(obuf, "</s>", HTML_N_S); + if (obuf->in_ins) + push_tag(obuf, "</ins>", HTML_N_INS); bzero(obuf->fontstat, FONTSTAT_SIZE); } @@ -3109,6 +3139,10 @@ restore_fonteffect(struct html_feed_environ *h_env, struct readbuffer *obuf) push_tag(obuf, "<i>", HTML_I); if (obuf->in_under) push_tag(obuf, "<u>", HTML_U); + if (obuf->in_strike) + push_tag(obuf, "<s>", HTML_S); + if (obuf->in_ins) + push_tag(obuf, "<ins>", HTML_INS); } static Str @@ -4985,36 +5019,114 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env) case HTML_AREA: return 0; case HTML_DEL: - if (displayInsDel) - HTMLlineproc1("<U>[DEL:</U>", h_env); - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: obuf->flag |= RB_DEL; + break; + case DISPLAY_INS_DEL_NORMAL: + HTMLlineproc1("<U>[DEL:</U>", h_env); + break; + case DISPLAY_INS_DEL_FONTIFY: + obuf->in_strike++; + if (obuf->in_strike == 1) { + push_tag(obuf, "<s>", HTML_S); + } + break; + } return 1; case HTML_N_DEL: - if (displayInsDel) - HTMLlineproc1("<U>:DEL]</U>", h_env); - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: obuf->flag &= ~RB_DEL; + break; + case DISPLAY_INS_DEL_NORMAL: + HTMLlineproc1("<U>:DEL]</U>", h_env); + case DISPLAY_INS_DEL_FONTIFY: + if (obuf->in_strike == 0) + return 1; + if (obuf->in_strike == 1 && close_effect0(obuf, HTML_S)) + obuf->in_strike = 0; + if (obuf->in_strike > 0) { + obuf->in_strike--; + if (obuf->in_strike == 0) { + push_tag(obuf, "</s>", HTML_N_S); + } + } + break; + } return 1; case HTML_S: - if (displayInsDel) - HTMLlineproc1("<U>[S:</U>", h_env); - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: obuf->flag |= RB_S; + break; + case DISPLAY_INS_DEL_NORMAL: + HTMLlineproc1("<U>[S:</U>", h_env); + break; + case DISPLAY_INS_DEL_FONTIFY: + obuf->in_strike++; + if (obuf->in_strike == 1) { + push_tag(obuf, "<s>", HTML_S); + } + break; + } return 1; case HTML_N_S: - if (displayInsDel) - HTMLlineproc1("<U>:S]</U>", h_env); - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: obuf->flag &= ~RB_S; + break; + case DISPLAY_INS_DEL_NORMAL: + HTMLlineproc1("<U>:S]</U>", h_env); + break; + case DISPLAY_INS_DEL_FONTIFY: + if (obuf->in_strike == 0) + return 1; + if (obuf->in_strike == 1 && close_effect0(obuf, HTML_S)) + obuf->in_strike = 0; + if (obuf->in_strike > 0) { + obuf->in_strike--; + if (obuf->in_strike == 0) { + push_tag(obuf, "</s>", HTML_N_S); + } + } + } return 1; case HTML_INS: - if (displayInsDel) + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: + break; + case DISPLAY_INS_DEL_NORMAL: HTMLlineproc1("<U>[INS:</U>", h_env); + break; + case DISPLAY_INS_DEL_FONTIFY: + obuf->in_ins++; + if (obuf->in_ins == 1) { + push_tag(obuf, "<ins>", HTML_INS); + } + break; + } return 1; case HTML_N_INS: - if (displayInsDel) + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: + break; + case DISPLAY_INS_DEL_NORMAL: HTMLlineproc1("<U>:INS]</U>", h_env); + break; + case DISPLAY_INS_DEL_FONTIFY: + if (obuf->in_ins == 0) + return 1; + if (obuf->in_ins == 1 && close_effect0(obuf, HTML_INS)) + obuf->in_ins = 0; + if (obuf->in_ins > 0) { + obuf->in_ins--; + if (obuf->in_ins == 0) { + push_tag(obuf, "</ins>", HTML_N_INS); + } + } + break; + } return 1; case HTML_SUP: if (!(obuf->flag & (RB_DEL | RB_S))) @@ -5109,6 +5221,25 @@ textlist_feed() return NULL; } +ex_efct(int ex) +{ + int effect = 0; + + if (! ex) + return 0; + + if (ex & PE_EX_ITALIC) + effect |= PE_EX_ITALIC_E; + + if (ex & PE_EX_INSERT) + effect |= PE_EX_INSERT_E; + + if (ex & PE_EX_STRIKE) + effect |= PE_EX_STRIKE_E; + + return effect; +} + static void HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) { @@ -5189,7 +5320,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) while (str < endp) { PSIZE; mode = get_mctype(str); - if ((effect | ex_effect) & PC_SYMBOL && *str != '<') { + if ((effect | ex_efct(ex_effect)) & PC_SYMBOL && *str != '<') { #ifdef USE_M17N char **buf = set_symbol(symbol_width0); int len; @@ -5197,16 +5328,16 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) p = buf[(int)symbol]; len = get_mclen(p); mode = get_mctype(p); - PPUSH(mode | effect | ex_effect, *(p++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(p++)); if (--len) { mode = (mode & ~PC_WCHAR1) | PC_WCHAR2; while (len--) { PSIZE; - PPUSH(mode | effect | ex_effect, *(p++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(p++)); } } #else - PPUSH(PC_ASCII | effect | ex_effect, SYMBOL_BASE + symbol); + PPUSH(PC_ASCII | effect | ex_efct(ex_effect), SYMBOL_BASE + symbol); #endif str += symbol_width; } @@ -5215,12 +5346,12 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) #else else if (mode == PC_CTRL || IS_INTSPACE(*str)) { #endif - PPUSH(PC_ASCII | effect | ex_effect, ' '); + PPUSH(PC_ASCII | effect | ex_efct(ex_effect), ' '); str++; } #ifdef USE_M17N else if (mode & PC_UNKNOWN) { - PPUSH(PC_ASCII | effect | ex_effect, ' '); + PPUSH(PC_ASCII | effect | ex_efct(ex_effect), ' '); str += get_mclen(str); } #endif @@ -5228,13 +5359,13 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) #ifdef USE_M17N int len = get_mclen(str); #endif - PPUSH(mode | effect | ex_effect, *(str++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(str++)); #ifdef USE_M17N if (--len) { mode = (mode & ~PC_WCHAR1) | PC_WCHAR2; while (len--) { PSIZE; - PPUSH(mode | effect | ex_effect, *(str++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(str++)); } } #endif @@ -5252,12 +5383,12 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) #else if (mode == PC_CTRL || IS_INTSPACE(*str)) { #endif - PPUSH(PC_ASCII | effect | ex_effect, ' '); + PPUSH(PC_ASCII | effect | ex_efct(ex_effect), ' '); p++; } #ifdef USE_M17N else if (mode & PC_UNKNOWN) { - PPUSH(PC_ASCII | effect | ex_effect, ' '); + PPUSH(PC_ASCII | effect | ex_efct(ex_effect), ' '); p += get_mclen(p); } #endif @@ -5265,13 +5396,13 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) #ifdef USE_M17N int len = get_mclen(p); #endif - PPUSH(mode | effect | ex_effect, *(p++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(p++)); #ifdef USE_M17N if (--len) { mode = (mode & ~PC_WCHAR1) | PC_WCHAR2; while (len--) { PSIZE; - PPUSH(mode | effect | ex_effect, *(p++)); + PPUSH(mode | effect | ex_efct(ex_effect), *(p++)); } } #endif @@ -5296,12 +5427,24 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit) case HTML_N_I: ex_effect &= ~PE_EX_ITALIC; break; + case HTML_INS: + ex_effect |= PE_EX_INSERT; + break; + case HTML_N_INS: + ex_effect &= ~PE_EX_INSERT; + break; case HTML_U: effect |= PE_UNDER; break; case HTML_N_U: effect &= ~PE_UNDER; break; + case HTML_S: + ex_effect |= PE_EX_STRIKE; + break; + case HTML_N_S: + ex_effect &= ~PE_EX_STRIKE; + break; case HTML_A: if (renderFrameSet && parsedtag_get_value(tag, ATTR_FRAMENAME, &p)) { @@ -6554,6 +6697,8 @@ init_henv(struct html_feed_environ *h_env, struct readbuffer *obuf, obuf->in_bold = 0; obuf->in_italic = 0; obuf->in_under = 0; + obuf->in_strike = 0; + obuf->in_ins = 0; obuf->prev_ctype = PC_ASCII; obuf->tag_sp = 0; obuf->fontstat_sp = 0; @@ -6596,6 +6741,14 @@ completeHTMLstream(struct html_feed_environ *h_env, struct readbuffer *obuf) push_tag(obuf, "</u>", HTML_N_U); obuf->in_under = 0; } + if (obuf->in_strike) { + push_tag(obuf, "</s>", HTML_N_S); + obuf->in_strike = 0; + } + if (obuf->in_ins) { + push_tag(obuf, "</ins>", HTML_N_INS); + obuf->in_ins = 0; + } if (obuf->flag & RB_INTXTA) HTMLlineproc1("</textarea>", h_env); /* for unbalanced select tag */ @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.136 2007/05/23 12:34:20 inu Exp $ */ +/* $Id: fm.h,v 1.137 2007/05/23 13:07:44 inu Exp $ */ /* * w3m: WWW wo Miru utility * @@ -167,7 +167,13 @@ void bzero(void *, int); #define PE_VISITED 0x4000 /* Extra effect */ -#define PE_EX_ITALIC PE_UNDER +#define PE_EX_ITALIC 0x01 +#define PE_EX_INSERT 0x02 +#define PE_EX_STRIKE 0x04 + +#define PE_EX_ITALIC_E PE_UNDER +#define PE_EX_INSERT_E PE_UNDER +#define PE_EX_STRIKE_E PE_STAND #define CharType(c) ((c)&P_CHARTYPE) #define CharEffect(c) ((c)&(P_EFFECT|PC_SYMBOL)) @@ -539,7 +545,7 @@ typedef struct _DownloadList { #define FONT_STACK_SIZE 5 -#define FONTSTAT_SIZE 5 +#define FONTSTAT_SIZE 7 #define _INIT_BUFFER_WIDTH (COLS - (showLineNum ? 6 : 1)) #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0) @@ -588,7 +594,9 @@ struct readbuffer { #define in_bold fontstat[0] #define in_under fontstat[1] #define in_italic fontstat[2] -#define in_stand fontstat[3] +#define in_strike fontstat[3] +#define in_ins fontstat[4] +#define in_stand fontstat[5] #define RB_PRE 0x01 #define RB_SCRIPT 0x02 @@ -970,7 +978,10 @@ global int UseDictCommand init(FALSE); global char *DictCommand init("file:///$LIB/w3mdict" CGI_EXTENSION); #endif /* USE_DICT */ global int ignore_null_img_alt init(TRUE); -global int displayInsDel init(TRUE); +#define DISPLAY_INS_DEL_SIMPLE 0 +#define DISPLAY_INS_DEL_NORMAL 1 +#define DISPLAY_INS_DEL_FONTIFY 2 +global int displayInsDel init(DISPLAY_INS_DEL_NORMAL); global int FoldTextarea init(FALSE); global int FoldLine init(FALSE); #define DEFAULT_URL_EMPTY 0 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: w3m 0.5.1\n" "Report-Msgid-Bugs-To: ukai@debian.or.jp\n" -"POT-Creation-Date: 2004-07-14 15:51+0900\n" -"PO-Revision-Date: 2003-09-26 03:35+0900\n" +"POT-Creation-Date: 2007-05-07 10:49+0900\n" +"PO-Revision-Date: 2007-05-07 10:52+0900\n" "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -202,8 +202,8 @@ msgid "Fold lines in TEXTAREA" msgstr "TEXTAREA の行を折り返して表示" #: rc.c:90 -msgid "Display DEL, S and STRIKE element" -msgstr "DEL, S, STRIKE 要素の内容を表示する" +msgid "Display INS, DEL, S and STRIKE element" +msgstr "INS, DEL, S, STRIKE 要素の表示" #: rc.c:91 msgid "Display with color" @@ -546,262 +546,278 @@ msgid "Enable cookie processing" msgstr "クッキーを使用する" #: rc.c:196 +msgid "Print a message when receiving a cookie" +msgstr "クッキーを受け付けたときにメッセージを表示する" + +#: rc.c:197 msgid "Accept cookies" msgstr "クッキーを受け付ける" -#: rc.c:197 +#: rc.c:198 msgid "Action to be taken on invalid cookie" msgstr "問題のあるクッキーでも受け付ける" -#: rc.c:198 +#: rc.c:199 msgid "Domains to reject cookies from" msgstr "クッキーを受け付けないドメイン" -#: rc.c:199 +#: rc.c:200 msgid "Domains to accept cookies from" msgstr "クッキーを受け付けるドメイン" -#: rc.c:201 +#: rc.c:202 msgid "Number of redirections to follow" msgstr "従うリダイレクトの回数" -#: rc.c:202 +#: rc.c:203 msgid "Enable processing of meta-refresh tag" msgstr "meta refresh に対応する" -#: rc.c:205 +#: rc.c:206 msgid "Enable Migemo (Roma-ji search)" msgstr "Migemo(ローマ字検索)を使用する" -#: rc.c:206 +#: rc.c:207 msgid "Migemo command" msgstr "Migemoコマンド" -#: rc.c:210 +#: rc.c:211 msgid "Display charset" msgstr "表示用文字コード" -#: rc.c:211 +#: rc.c:212 msgid "Default document charset" msgstr "文書の標準の文字コード" -#: rc.c:212 +#: rc.c:213 msgid "Automatic charset detect when loading" msgstr "文書の読み込み時に文字コードの自動判定を行う" -#: rc.c:213 +#: rc.c:214 msgid "System charset" msgstr "システムの文字コード" -#: rc.c:214 +#: rc.c:215 msgid "System charset follows locale(LC_CTYPE)" msgstr "Locale(LC_CTYPE) に従ってシステムの文字コードを設定" -#: rc.c:215 +#: rc.c:216 msgid "Output halfdump with display charset" msgstr "表示用文字コードで halfdump の出力を行う" -#: rc.c:216 +#: rc.c:217 msgid "Use multi column characters" msgstr "複数カラムの文字を使う" -#: rc.c:217 +#: rc.c:218 msgid "Use combining characters" msgstr "結合文字を使う" -#: rc.c:218 +#: rc.c:219 msgid "Use Unicode language tags" msgstr "Unicode の言語タグを使う" -#: rc.c:219 +#: rc.c:220 msgid "Charset conversion using Unicode map" msgstr "Unicodeを介したコード変換" -#: rc.c:220 +#: rc.c:221 msgid "Charset conversion when loading" msgstr "文書の読み込み時に文字コードを変換する" -#: rc.c:221 +#: rc.c:222 msgid "Adjust search string for document charset" msgstr "検索文字列を文書の文字コードに変換する" -#: rc.c:222 +#: rc.c:223 msgid "Fix character width when conversion" msgstr "文字幅の変わる変換をしない" -#: rc.c:223 +#: rc.c:224 msgid "Use GB 12345 Unicode map instead of GB 2312's" msgstr "GB 12345 の Unicode マップを GB 2312 用に使う" -#: rc.c:224 +#: rc.c:225 msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgstr "ISO-2022-JP で JIS X 0201-Roman を使う" -#: rc.c:225 +#: rc.c:226 msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgstr "ISO-2022-JP で JIS C 6226:1978(旧JIS) を使う" -#: rc.c:226 +#: rc.c:227 msgid "Use JIS X 0201 Katakana" msgstr "JIS X 0201-Katakana を使う" -#: rc.c:227 +#: rc.c:228 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgstr "JIS X 0212:1990(補助漢字) を使う" -#: rc.c:228 +#: rc.c:229 msgid "Use JIS X 0213:2000 (2000JIS)" msgstr "JIS X 0213:2000(2000JIS) を使う" -#: rc.c:229 +#: rc.c:230 msgid "Strict ISO-2022-JP/KR/CN" msgstr "厳格な ISO-2022-JP/KR/CN を使う" -#: rc.c:230 +#: rc.c:231 msgid "Treat 4 bytes char. of GB18030 as Unicode" msgstr "GB18030 の 4バイト文字を Unicode として扱う" -#: rc.c:233 +#: rc.c:234 msgid "keymap file" msgstr "keymapファイル" -#: rc.c:250 +#: rc.c:251 msgid "black" msgstr "黒" -#: rc.c:251 +#: rc.c:252 msgid "red" msgstr "赤" -#: rc.c:252 +#: rc.c:253 msgid "green" msgstr "緑" -#: rc.c:253 +#: rc.c:254 msgid "yellow" msgstr "黄" -#: rc.c:254 +#: rc.c:255 msgid "blue" msgstr "青" -#: rc.c:255 +#: rc.c:256 msgid "magenta" msgstr "紫" -#: rc.c:256 +#: rc.c:257 msgid "cyan" msgstr "空色" -#: rc.c:257 +#: rc.c:258 msgid "white" msgstr "白" -#: rc.c:258 +#: rc.c:259 msgid "terminal" msgstr "端末" -#: rc.c:277 +#: rc.c:278 msgid "none" msgstr "無し" -#: rc.c:278 +#: rc.c:279 msgid "current URL" msgstr "現在のURL" -#: rc.c:279 +#: rc.c:280 msgid "link URL" msgstr "リンク先のURL" #: rc.c:285 +msgid "simple" +msgstr "シンプル" + +#: rc.c:286 +msgid "use tag" +msgstr "タグで表示" + +#: rc.c:287 +msgid "fontify" +msgstr "文字装飾" + +#: rc.c:293 msgid "A:relative to screen height" msgstr "A:画面サイズに比例" -#: rc.c:286 +#: rc.c:294 msgid "B:fixed speed" msgstr "B:一定の行数" -#: rc.c:293 +#: rc.c:301 msgid "unspecified" msgstr "指定しない" -#: rc.c:294 +#: rc.c:302 msgid "inet inet6" msgstr "IPv4優先" -#: rc.c:295 +#: rc.c:303 msgid "inet6 inet" msgstr "IPv6優先" -#: rc.c:296 +#: rc.c:304 msgid "inet only" msgstr "IPv4のみ" -#: rc.c:297 +#: rc.c:305 msgid "inet6 only" msgstr "IPv6のみ" -#: rc.c:304 +#: rc.c:312 msgid "discard" msgstr "破棄する" -#: rc.c:306 +#: rc.c:314 msgid "accept" msgstr "受け入れる" -#: rc.c:308 +#: rc.c:316 msgid "ask" msgstr "確認する" -#: rc.c:318 +#: rc.c:326 msgid "OFF" msgstr "無効" -#: rc.c:319 +#: rc.c:327 msgid "Only ISO 2022" msgstr "ISO 2022 のみ" -#: rc.c:320 +#: rc.c:328 msgid "ON" msgstr "有効" -#: rc.c:667 +#: rc.c:679 msgid "Display Settings" msgstr "表示関係" -#: rc.c:669 +#: rc.c:681 msgid "Color Settings" msgstr "表示色" -#: rc.c:671 +#: rc.c:683 msgid "Miscellaneous Settings" msgstr "雑多な設定" -#: rc.c:672 +#: rc.c:684 msgid "Directory Settings" msgstr "ディレクトリ設定" -#: rc.c:673 +#: rc.c:685 msgid "External Program Settings" msgstr "外部プログラム" -#: rc.c:674 +#: rc.c:686 msgid "Network Settings" msgstr "ネットワークの設定" -#: rc.c:675 +#: rc.c:687 msgid "Proxy Settings" msgstr "プロキシの設定" -#: rc.c:677 +#: rc.c:689 msgid "SSL Settings" msgstr "SSLの設定" -#: rc.c:680 +#: rc.c:692 msgid "Cookie Settings" msgstr "クッキーの設定" -#: rc.c:683 +#: rc.c:695 msgid "Charset Settings" msgstr "文字コードの設定" @@ -810,6 +826,6 @@ msgstr "文字コードの設定" #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1151 +#: rc.c:1163 msgid "en;q=1.0" msgstr "ja;q=1.0, en;q=0.5" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: ukai@debian.or.jp\n" -"POT-Creation-Date: 2004-07-14 15:51+0900\n" +"POT-Creation-Date: 2007-05-07 10:49+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -545,262 +545,278 @@ msgid "Enable cookie processing" msgstr "" #: rc.c:196 -msgid "Accept cookies" +msgid "Print a message when receiving a cookie" msgstr "" #: rc.c:197 -msgid "Action to be taken on invalid cookie" +msgid "Accept cookies" msgstr "" #: rc.c:198 -msgid "Domains to reject cookies from" +msgid "Action to be taken on invalid cookie" msgstr "" #: rc.c:199 +msgid "Domains to reject cookies from" +msgstr "" + +#: rc.c:200 msgid "Domains to accept cookies from" msgstr "" -#: rc.c:201 +#: rc.c:202 msgid "Number of redirections to follow" msgstr "" -#: rc.c:202 +#: rc.c:203 msgid "Enable processing of meta-refresh tag" msgstr "" -#: rc.c:205 +#: rc.c:206 msgid "Enable Migemo (Roma-ji search)" msgstr "" -#: rc.c:206 +#: rc.c:207 msgid "Migemo command" msgstr "" -#: rc.c:210 +#: rc.c:211 msgid "Display charset" msgstr "" -#: rc.c:211 +#: rc.c:212 msgid "Default document charset" msgstr "" -#: rc.c:212 +#: rc.c:213 msgid "Automatic charset detect when loading" msgstr "" -#: rc.c:213 +#: rc.c:214 msgid "System charset" msgstr "" -#: rc.c:214 +#: rc.c:215 msgid "System charset follows locale(LC_CTYPE)" msgstr "" -#: rc.c:215 +#: rc.c:216 msgid "Output halfdump with display charset" msgstr "" -#: rc.c:216 +#: rc.c:217 msgid "Use multi column characters" msgstr "" -#: rc.c:217 +#: rc.c:218 msgid "Use combining characters" msgstr "" -#: rc.c:218 +#: rc.c:219 msgid "Use Unicode language tags" msgstr "" -#: rc.c:219 +#: rc.c:220 msgid "Charset conversion using Unicode map" msgstr "" -#: rc.c:220 +#: rc.c:221 msgid "Charset conversion when loading" msgstr "" -#: rc.c:221 +#: rc.c:222 msgid "Adjust search string for document charset" msgstr "" -#: rc.c:222 +#: rc.c:223 msgid "Fix character width when conversion" msgstr "" -#: rc.c:223 +#: rc.c:224 msgid "Use GB 12345 Unicode map instead of GB 2312's" msgstr "" -#: rc.c:224 +#: rc.c:225 msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgstr "" -#: rc.c:225 +#: rc.c:226 msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgstr "" -#: rc.c:226 +#: rc.c:227 msgid "Use JIS X 0201 Katakana" msgstr "" -#: rc.c:227 +#: rc.c:228 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgstr "" -#: rc.c:228 +#: rc.c:229 msgid "Use JIS X 0213:2000 (2000JIS)" msgstr "" -#: rc.c:229 +#: rc.c:230 msgid "Strict ISO-2022-JP/KR/CN" msgstr "" -#: rc.c:230 +#: rc.c:231 msgid "Treat 4 bytes char. of GB18030 as Unicode" msgstr "" -#: rc.c:233 +#: rc.c:234 msgid "keymap file" msgstr "" -#: rc.c:250 +#: rc.c:251 msgid "black" msgstr "" -#: rc.c:251 +#: rc.c:252 msgid "red" msgstr "" -#: rc.c:252 +#: rc.c:253 msgid "green" msgstr "" -#: rc.c:253 +#: rc.c:254 msgid "yellow" msgstr "" -#: rc.c:254 +#: rc.c:255 msgid "blue" msgstr "" -#: rc.c:255 +#: rc.c:256 msgid "magenta" msgstr "" -#: rc.c:256 +#: rc.c:257 msgid "cyan" msgstr "" -#: rc.c:257 +#: rc.c:258 msgid "white" msgstr "" -#: rc.c:258 +#: rc.c:259 msgid "terminal" msgstr "" -#: rc.c:277 +#: rc.c:278 msgid "none" msgstr "" -#: rc.c:278 +#: rc.c:279 msgid "current URL" msgstr "" -#: rc.c:279 +#: rc.c:280 msgid "link URL" msgstr "" #: rc.c:285 -msgid "A:relative to screen height" +msgid "simple" msgstr "" #: rc.c:286 -msgid "B:fixed speed" +msgid "normal" +msgstr "" + +#: rc.c:287 +msgid "fontify" msgstr "" #: rc.c:293 -msgid "unspecified" +msgid "A:relative to screen height" msgstr "" #: rc.c:294 +msgid "B:fixed speed" +msgstr "" + +#: rc.c:301 +msgid "unspecified" +msgstr "" + +#: rc.c:302 msgid "inet inet6" msgstr "" -#: rc.c:295 +#: rc.c:303 msgid "inet6 inet" msgstr "" -#: rc.c:296 +#: rc.c:304 msgid "inet only" msgstr "" -#: rc.c:297 +#: rc.c:305 msgid "inet6 only" msgstr "" -#: rc.c:304 +#: rc.c:312 msgid "discard" msgstr "" -#: rc.c:306 +#: rc.c:314 msgid "accept" msgstr "" -#: rc.c:308 +#: rc.c:316 msgid "ask" msgstr "" -#: rc.c:318 +#: rc.c:326 msgid "OFF" msgstr "" -#: rc.c:319 +#: rc.c:327 msgid "Only ISO 2022" msgstr "" -#: rc.c:320 +#: rc.c:328 msgid "ON" msgstr "" -#: rc.c:667 +#: rc.c:679 msgid "Display Settings" msgstr "" -#: rc.c:669 +#: rc.c:681 msgid "Color Settings" msgstr "" -#: rc.c:671 +#: rc.c:683 msgid "Miscellaneous Settings" msgstr "" -#: rc.c:672 +#: rc.c:684 msgid "Directory Settings" msgstr "" -#: rc.c:673 +#: rc.c:685 msgid "External Program Settings" msgstr "" -#: rc.c:674 +#: rc.c:686 msgid "Network Settings" msgstr "" -#: rc.c:675 +#: rc.c:687 msgid "Proxy Settings" msgstr "" -#: rc.c:677 +#: rc.c:689 msgid "SSL Settings" msgstr "" -#: rc.c:680 +#: rc.c:692 msgid "Cookie Settings" msgstr "" -#: rc.c:683 +#: rc.c:695 msgid "Charset Settings" msgstr "" @@ -809,6 +825,6 @@ msgstr "" #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1151 +#: rc.c:1163 msgid "en;q=1.0" msgstr "" @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.104 2007/05/23 12:34:20 inu Exp $ */ +/* $Id: rc.c,v 1.105 2007/05/23 13:07:44 inu Exp $ */ /* * Initialization file etc. */ @@ -87,7 +87,7 @@ static int OptionEncode = FALSE; #define CMT_ALT_ENTITY N_("Use ASCII equivalents to display entities") #define CMT_GRAPHIC_CHAR N_("Use graphic char for border of table and menu") #define CMT_FOLD_TEXTAREA N_("Fold lines in TEXTAREA") -#define CMT_DISP_INS_DEL N_("Display DEL, S and STRIKE element") +#define CMT_DISP_INS_DEL N_("Display INS, DEL, S and STRIKE element") #define CMT_COLOR N_("Display with color") #define CMT_B_COLOR N_("Color of normal character") #define CMT_A_COLOR N_("Color of anchor") @@ -281,6 +281,13 @@ static struct sel_c defaulturls[] = { {0, NULL, NULL} }; +static struct sel_c displayinsdel[] = { + {N_S(DISPLAY_INS_DEL_SIMPLE), N_("simple")}, + {N_S(DISPLAY_INS_DEL_NORMAL), N_("use tag")}, + {N_S(DISPLAY_INS_DEL_FONTIFY), N_("fontify")}, + {0, NULL, NULL} +}; + #ifdef USE_MOUSE static struct sel_c wheelmode[] = { {TRUE, "1", N_("A:relative to screen height")}, @@ -361,8 +368,8 @@ struct param_ptr params1[] = { CMT_GRAPHIC_CHAR, NULL}, {"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea, CMT_FOLD_TEXTAREA, NULL}, - {"display_ins_del", P_INT, PI_ONOFF, (void *)&displayInsDel, - CMT_DISP_INS_DEL, NULL}, + {"display_ins_del", P_INT, PI_SEL_C, (void *)&displayInsDel, + CMT_DISP_INS_DEL, displayinsdel}, {"ignore_null_img_alt", P_INT, PI_ONOFF, (void *)&ignore_null_img_alt, CMT_IGNORE_NULL_IMG_ALT, NULL}, {"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject, @@ -1,4 +1,4 @@ -/* $Id: table.c,v 1.54 2007/05/23 12:26:56 inu Exp $ */ +/* $Id: table.c,v 1.55 2007/05/23 13:07:44 inu Exp $ */ /* * HTML table */ @@ -2925,33 +2925,69 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, suspend_or_pushdata(tbl, line); break; case HTML_DEL: - if (displayInsDel) - feed_table_inline_tag(tbl, line, mode, 5); /* [DEL: */ - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: mode->pre_mode |= TBLM_DEL; + break; + case DISPLAY_INS_DEL_NORMAL: + feed_table_inline_tag(tbl, line, mode, 5); /* [DEL: */ + break; + case DISPLAY_INS_DEL_FONTIFY: + feed_table_inline_tag(tbl, line, mode, -1); + break; + } break; case HTML_N_DEL: - if (displayInsDel) - feed_table_inline_tag(tbl, line, mode, 5); /* :DEL] */ - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: mode->pre_mode &= ~TBLM_DEL; + break; + case DISPLAY_INS_DEL_NORMAL: + feed_table_inline_tag(tbl, line, mode, 5); /* :DEL] */ + break; + case DISPLAY_INS_DEL_FONTIFY: + feed_table_inline_tag(tbl, line, mode, -1); + break; + } break; case HTML_S: - if (displayInsDel) - feed_table_inline_tag(tbl, line, mode, 3); /* [S: */ - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: mode->pre_mode |= TBLM_S; + break; + case DISPLAY_INS_DEL_NORMAL: + feed_table_inline_tag(tbl, line, mode, 3); /* [S: */ + break; + case DISPLAY_INS_DEL_FONTIFY: + feed_table_inline_tag(tbl, line, mode, -1); + break; + } break; case HTML_N_S: - if (displayInsDel) - feed_table_inline_tag(tbl, line, mode, 3); /* :S] */ - else + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: mode->pre_mode &= ~TBLM_S; + break; + case DISPLAY_INS_DEL_NORMAL: + feed_table_inline_tag(tbl, line, mode, 3); /* :S] */ + break; + case DISPLAY_INS_DEL_FONTIFY: + feed_table_inline_tag(tbl, line, mode, -1); + break; + } break; case HTML_INS: case HTML_N_INS: - if (displayInsDel) + switch (displayInsDel) { + case DISPLAY_INS_DEL_SIMPLE: + break; + case DISPLAY_INS_DEL_NORMAL: feed_table_inline_tag(tbl, line, mode, 5); /* [INS:, :INS] */ + break; + case DISPLAY_INS_DEL_FONTIFY: + feed_table_inline_tag(tbl, line, mode, -1); + break; + } break; case HTML_SUP: case HTML_SUB: |