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

* merge ambiguous width patch

Browse Source 
* http://www.j10n.org/files/w3m-cvs-1.914-ambwidth.patch
This commit is contained in:
Ito Hiroyuki
2010-07-25 09:55:05 +00:00
parent 1cf2e954a1
commit e2782c2ae9
17 changed files with 22236 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9 -1
View File
@@ -1,3 +1,11 @@
2010-07-25 AIDA Shinra <shinra@j10n.org>
* [w3m-dev 04049] Ctrl-C safe resolver
* fm.h (GRAPHIC_CHAR_ASCII, GRAPHIC_CHAR_CHARSET, GRAPHIC_CHAR_ALL): removed.
* fm.h: UseGraphicChar is initialized as FALSE.
* main.c (sig_chld): use TRUE and FALSE instead of GRAPHIC_CHAR_ALL and GRAPHIC_CHAR_ASCII.
* merge ambiguous width patch ( http://www.j10n.org/files/w3m-cvs-1.914-ambwidth.patch ).
2010-07-24 Ito Hiroyuki <ZXB01226 at nifty.com> 2010-07-24 Ito Hiroyuki <ZXB01226 at nifty.com>
* [w3m-dev 04326] suppress compile warnings * [w3m-dev 04326] suppress compile warnings
@@ -9041,4 +9049,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1018 2010/07/24 04:42:38 htrb Exp $ $Id: ChangeLog,v 1.1019 2010/07/25 09:55:05 htrb Exp $
fm.h
+2 -5
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.143 2010/07/19 23:34:01 htrb Exp $ */ /* $Id: fm.h,v 1.144 2010/07/25 09:55:05 htrb Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -1059,10 +1059,7 @@ global char SimplePreserveSpace init(FALSE);
#define wc_Str_conv_strict(x,charset0,charset1) (x) #define wc_Str_conv_strict(x,charset0,charset1) (x)
#endif #endif
global char UseAltEntity init(TRUE); global char UseAltEntity init(TRUE);
#define GRAPHIC_CHAR_ASCII 2 global char UseGraphicChar init(FALSE);
#define GRAPHIC_CHAR_CHARSET 0
#define GRAPHIC_CHAR_ALL 1
global char UseGraphicChar init(GRAPHIC_CHAR_ASCII);
extern char *graph_symbol[]; extern char *graph_symbol[];
extern char *graph2_symbol[]; extern char *graph2_symbol[];
extern int symbol_width; extern int symbol_width;
libwc/EastAsianWidth.txt
+21866
View File
File diff suppressed because it is too large Load Diff
libwc/Makefile.in
+3 -1
View File
@@ -95,6 +95,8 @@ $(LIBRARY): $(OBJS)
test: $(LIBRARY) test.o ../Str.o ../myctype.o test: $(LIBRARY) test.o ../Str.o ../myctype.o
$(CC) -o wctest test.o ../Str.o ../myctype.o $(LIBRARY) ../gc/gc.a $(CC) -o wctest test.o ../Str.o ../myctype.o $(LIBRARY) ../gc/gc.a
map/ucs_ambwidth.map: EastAsianWidth.txt
awk -f ambwidth_map.awk EastAsianWidth.txt > map/ucs_ambwidth.map
### ###
big5.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h big5.h search.h wtf.h \ big5.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h big5.h search.h wtf.h \
ucs.h ucs.h
@@ -154,7 +156,7 @@ ucs.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h search.h big5.h \
map/hkscs_ucs_p2.map map/gb12345_ucs.map map/johab_ucs.map \ map/hkscs_ucs_p2.map map/gb12345_ucs.map map/johab_ucs.map \
map/sjis_ext_ucs.map map/gbk_ucs.map map/uhc_ucs.map map/ucs_wide.map \ map/sjis_ext_ucs.map map/gbk_ucs.map map/uhc_ucs.map map/ucs_wide.map \
map/ucs_combining.map map/ucs_precompose.map map/ucs_hangul.map \ map/ucs_combining.map map/ucs_precompose.map map/ucs_hangul.map \
map/ucs_fullwidth.map map/ucs_fullwidth.map map/ucs_ambwidth.map
uhc.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h uhc.h wtf.h ucs.h uhc.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h uhc.h wtf.h ucs.h
utf7.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf7.h wtf.h utf7.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf7.h wtf.h
utf8.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf8.h wtf.h utf8.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf8.h wtf.h
libwc/ambwidth_map.awk
+47
View File
@@ -0,0 +1,47 @@
BEGIN {
FS = "[; ]";
i = 0;
}
$2 == "A" {
code = sprintf("0x%s", $1);
if (strtonum(code) < 0x10000) {
map[i] = code
i++;
}
}
END {
n = 0;
start = map[0]
prev = strtonum(map[0]);
for (j = 1; j < i; j++) {
cur = strtonum(map[j]);
if (match(map[j], "[.]+")) {
map2[n] = sprintf("%s, %s", start, map[j - 1]);
n++;
gsub("[.]+", ", 0x", map[j])
map2[n] = map[j];
n++;
start = map[j + 1];
cur = strtonum(start);
} else {
if (cur - prev > 2) {
map2[n] = sprintf("%s, %s", start, map[j - 1]);
start = map[j];
n++;
}
if (j == i - 1) {
map2[n] = sprintf("%s, %s", start, map[j]);
n++;
}
}
prev = cur;
}
printf("static wc_map ucs_ambwidth_map[] = {\n");
for (j = 0; j < n; j++) {
printf(" { %s },\n", map2[j]);
}
printf("};\n");
printf("#define N_ucs_ambwidth_map (sizeof(ucs_ambwidth_map) / sizeof(*ucs_ambwidth_map))\n");
}
libwc/map/ucs_ambwidth.map
+120
View File
@@ -0,0 +1,120 @@
static wc_map ucs_ambwidth_map[] = {
{ 0x00A1, 0x00A1 },
{ 0x00A4, 0x00A4 },
{ 0x00A7, 0x00AA },
{ 0x00AD, 0x00BF },
{ 0x00C6, 0x00C6 },
{ 0x00D0, 0x00D0 },
{ 0x00D7, 0x00D8 },
{ 0x00DE, 0x00E1 },
{ 0x00E6, 0x00ED },
{ 0x00F0, 0x00F3 },
{ 0x00F7, 0x00FE },
{ 0x0101, 0x0101 },
{ 0x0111, 0x0113 },
{ 0x011B, 0x011B },
{ 0x0126, 0x0127 },
{ 0x012B, 0x012B },
{ 0x0131, 0x0133 },
{ 0x0138, 0x0138 },
{ 0x013F, 0x0144 },
{ 0x0148, 0x014D },
{ 0x0152, 0x0153 },
{ 0x0166, 0x0167 },
{ 0x016B, 0x016B },
{ 0x01CE, 0x01DC },
{ 0x0251, 0x0251 },
{ 0x0261, 0x0261 },
{ 0x02C4, 0x02C4 },
{ 0x02C7, 0x02CD },
{ 0x02D0, 0x02D0 },
{ 0x02D8, 0x02DF },
{ 0x0300, 0x036F },
{ 0x0391, 0x03A9 },
{ 0x03B1, 0x03C9 },
{ 0x0401, 0x0401 },
{ 0x0410, 0x0451 },
{ 0x2010, 0x2010 },
{ 0x2013, 0x2019 },
{ 0x201C, 0x201D },
{ 0x2020, 0x2027 },
{ 0x2030, 0x2035 },
{ 0x203B, 0x203B },
{ 0x203E, 0x203E },
{ 0x2074, 0x2074 },
{ 0x207F, 0x2084 },
{ 0x20AC, 0x20AC },
{ 0x2103, 0x2105 },
{ 0x2109, 0x2109 },
{ 0x2113, 0x2113 },
{ 0x2116, 0x2116 },
{ 0x2121, 0x2122 },
{ 0x2126, 0x2126 },
{ 0x212B, 0x212B },
{ 0x2153, 0x2154 },
{ 0x215B, 0x216B },
{ 0x2170, 0x2179 },
{ 0x2189, 0x2189 },
{ 0x2190, 0x2199 },
{ 0x21B8, 0x21B9 },
{ 0x21D2, 0x21D4 },
{ 0x21E7, 0x21E7 },
{ 0x2200, 0x2203 },
{ 0x2207, 0x2208 },
{ 0x220B, 0x220B },
{ 0x220F, 0x2211 },
{ 0x2215, 0x2215 },
{ 0x221A, 0x221A },
{ 0x221D, 0x2220 },
{ 0x2223, 0x222E },
{ 0x2234, 0x2237 },
{ 0x223C, 0x223D },
{ 0x2248, 0x2248 },
{ 0x224C, 0x224C },
{ 0x2252, 0x2252 },
{ 0x2260, 0x2261 },
{ 0x2264, 0x2267 },
{ 0x226A, 0x226B },
{ 0x226E, 0x226F },
{ 0x2282, 0x2283 },
{ 0x2286, 0x2287 },
{ 0x2295, 0x2295 },
{ 0x2299, 0x2299 },
{ 0x22A5, 0x22A5 },
{ 0x22BF, 0x22BF },
{ 0x2312, 0x2312 },
{ 0x2460, 0x254B },
{ 0x2550, 0x2573 },
{ 0x2580, 0x258F },
{ 0x2592, 0x2595 },
{ 0x25A0, 0x25A9 },
{ 0x25B2, 0x25B3 },
{ 0x25B6, 0x25B7 },
{ 0x25BC, 0x25BD },
{ 0x25C0, 0x25C1 },
{ 0x25C6, 0x25C8 },
{ 0x25CB, 0x25CB },
{ 0x25CE, 0x25D1 },
{ 0x25E2, 0x25E5 },
{ 0x25EF, 0x25EF },
{ 0x2605, 0x2606 },
{ 0x2609, 0x2609 },
{ 0x260E, 0x260F },
{ 0x2614, 0x2615 },
{ 0x261C, 0x261E },
{ 0x2640, 0x2642 },
{ 0x2660, 0x266F },
{ 0x269E, 0x269F },
{ 0x26BE, 0x26BF },
{ 0x26C4, 0x26E3 },
{ 0x26E8, 0x26FF },
{ 0x273D, 0x273D },
{ 0x2757, 0x2757 },
{ 0x2776, 0x277F },
{ 0x2B55, 0x2B59 },
{ 0x3248, 0x324F },
{ 0xE000, 0xF8FF },
{ 0xFE00, 0xFE0F },
{ 0xFFFD, 0xFFFD },
};
#define N_ucs_ambwidth_map (sizeof(ucs_ambwidth_map) / sizeof(*ucs_ambwidth_map))
libwc/status.c
+1
View File
@@ -25,6 +25,7 @@ wc_option WcOption = {
WC_FALSE, /* gb18030_as_ucs */ WC_FALSE, /* gb18030_as_ucs */
WC_FALSE, /* no_replace */ WC_FALSE, /* no_replace */
WC_TRUE, /* use_wide */ WC_TRUE, /* use_wide */
WC_FALSE, /* east_asian_width */
}; };
static wc_status output_st; static wc_status output_st;
libwc/ucs.c
+16
View File
@@ -17,6 +17,7 @@
#include "ucs.map" #include "ucs.map"
#include "map/ucs_ambwidth.map"
#include "map/ucs_wide.map" #include "map/ucs_wide.map"
#include "map/ucs_combining.map" #include "map/ucs_combining.map"
#include "map/ucs_precompose.map" #include "map/ucs_precompose.map"
@@ -511,10 +512,25 @@ wc_ucs_to_ccs(wc_uint32 ucs)
if (0x80 <= ucs && ucs <= 0x9F) if (0x80 <= ucs && ucs <= 0x9F)
return WC_CCS_C1; return WC_CCS_C1;
return ((ucs <= WC_C_UCS2_END) ? WC_CCS_UCS2 : WC_CCS_UCS4) return ((ucs <= WC_C_UCS2_END) ? WC_CCS_UCS2 : WC_CCS_UCS4)
| ((WcOption.east_asian_width && wc_is_ucs_ambiguous_width(ucs))
? WC_CCS_A_WIDE : 0)
| (wc_is_ucs_wide(ucs) ? WC_CCS_A_WIDE : 0) | (wc_is_ucs_wide(ucs) ? WC_CCS_A_WIDE : 0)
| (wc_is_ucs_combining(ucs) ? WC_CCS_A_COMB : 0); | (wc_is_ucs_combining(ucs) ? WC_CCS_A_COMB : 0);
} }
wc_bool
wc_is_ucs_ambiguous_width(wc_uint32 ucs)
{
if (0xa1 <= ucs && ucs <= 0xfe && WcOption.use_jisx0213)
return 1;
else if (ucs <= WC_C_UCS2_END)
return (wc_map_range_search((wc_uint16)ucs,
ucs_ambwidth_map, N_ucs_ambwidth_map) != NULL);
else
return ((0xF0000 <= ucs && ucs <= 0xFFFFD)
|| (0x100000 <= ucs && ucs <= 0x10FFFD));
}
wc_bool wc_bool
wc_is_ucs_wide(wc_uint32 ucs) wc_is_ucs_wide(wc_uint32 ucs)
{ {
libwc/ucs.h
+1
View File
@@ -44,6 +44,7 @@ extern wc_wchar_t wc_any_to_iso2022(wc_wchar_t cc, wc_status *st);
extern wc_wchar_t wc_ucs_to_iso2022(wc_uint32 ucs); extern wc_wchar_t wc_ucs_to_iso2022(wc_uint32 ucs);
extern wc_wchar_t wc_ucs_to_iso2022w(wc_uint32 ucs); extern wc_wchar_t wc_ucs_to_iso2022w(wc_uint32 ucs);
extern wc_ccs wc_ucs_to_ccs(wc_uint32 ucs); extern wc_ccs wc_ucs_to_ccs(wc_uint32 ucs);
extern wc_bool wc_is_ucs_ambiguous_width(wc_uint32 ucs);
extern wc_bool wc_is_ucs_wide(wc_uint32 ucs); extern wc_bool wc_is_ucs_wide(wc_uint32 ucs);
extern wc_bool wc_is_ucs_combining(wc_uint32 ucs); extern wc_bool wc_is_ucs_combining(wc_uint32 ucs);
extern wc_bool wc_is_ucs_hangul(wc_uint32 ucs); extern wc_bool wc_is_ucs_hangul(wc_uint32 ucs);
libwc/wc_types.h
+1
View File
@@ -91,6 +91,7 @@ typedef struct {
wc_bool gb18030_as_ucs; /* treat 4 bytes char. of GB18030 as Unicode */ wc_bool gb18030_as_ucs; /* treat 4 bytes char. of GB18030 as Unicode */
wc_bool no_replace; /* don't output replace character */ wc_bool no_replace; /* don't output replace character */
wc_bool use_wide; /* use wide characters */ wc_bool use_wide; /* use wide characters */
wc_bool east_asian_width; /* East Asian Ambiguous characters are wide */
} wc_option; } wc_option;
typedef struct { typedef struct {
main.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.263 2010/07/19 23:34:01 htrb Exp $ */ /* $Id: main.c,v 1.264 2010/07/25 09:55:05 htrb Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -562,9 +562,9 @@ main(int argc, char **argv, char **envp)
} }
#endif #endif
else if (!strcmp("-graph", argv[i])) else if (!strcmp("-graph", argv[i]))
UseGraphicChar = GRAPHIC_CHAR_ALL; UseGraphicChar = TRUE;
else if (!strcmp("-no-graph", argv[i])) else if (!strcmp("-no-graph", argv[i]))
UseGraphicChar = GRAPHIC_CHAR_ASCII; UseGraphicChar = FALSE;
else if (!strcmp("-T", argv[i])) { else if (!strcmp("-T", argv[i])) {
if (++i >= argc) if (++i >= argc)
usage(); usage();
po/ja.po
+59 -67
View File
@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: w3m 0.5.2\n" "Project-Id-Version: w3m 0.5.2\n"
"Report-Msgid-Bugs-To: satodai@w3m.jp\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n"
"POT-Creation-Date: 2010-07-21 19:30+0900\n" "POT-Creation-Date: 2010-07-24 17:31+0900\n"
"PO-Revision-Date: 2010-07-21 19:38+0900\n" "PO-Revision-Date: 2010-07-24 13:50+0900\n"
"Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n" "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n"
"Language-Team: Japanese\n" "Language-Team: Japanese\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -622,226 +622,218 @@ msgid "Use combining characters"
msgstr "結合文字を使う" msgstr "結合文字を使う"
#: rc.c:221 #: rc.c:221
msgid "Use double width for some Unicode characters"
msgstr "ある種のUnicode文字を全角にする"
#: rc.c:222
msgid "Use Unicode language tags" msgid "Use Unicode language tags"
msgstr "Unicode の言語タグを使う" msgstr "Unicode の言語タグを使う"
#: rc.c:222 #: rc.c:223
msgid "Charset conversion using Unicode map" msgid "Charset conversion using Unicode map"
msgstr "Unicodeを介したコード変換" msgstr "Unicodeを介したコード変換"
#: rc.c:223 #: rc.c:224
msgid "Charset conversion when loading" msgid "Charset conversion when loading"
msgstr "文書の読み込み時に文字コードを変換する" msgstr "文書の読み込み時に文字コードを変換する"
#: rc.c:224 #: rc.c:225
msgid "Adjust search string for document charset" msgid "Adjust search string for document charset"
msgstr "検索文字列を文書の文字コードに変換する" msgstr "検索文字列を文書の文字コードに変換する"
#: rc.c:225 #: rc.c:226
msgid "Fix character width when conversion" msgid "Fix character width when conversion"
msgstr "文字幅の変わる変換をしない" msgstr "文字幅の変わる変換をしない"
#: rc.c:226 #: rc.c:227
msgid "Use GB 12345 Unicode map instead of GB 2312's" msgid "Use GB 12345 Unicode map instead of GB 2312's"
msgstr "GB 12345 の Unicode マップを GB 2312 用に使う" msgstr "GB 12345 の Unicode マップを GB 2312 用に使う"
#: rc.c:227 #: rc.c:228
msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgid "Use JIS X 0201 Roman for ISO-2022-JP"
msgstr "ISO-2022-JP で JIS X 0201-Roman を使う" msgstr "ISO-2022-JP で JIS X 0201-Roman を使う"
#: rc.c:228 #: rc.c:229
msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgid "Use JIS C 6226:1978 for ISO-2022-JP"
msgstr "ISO-2022-JP で JIS C 6226:1978(旧JIS) を使う" msgstr "ISO-2022-JP で JIS C 6226:1978(旧JIS) を使う"
#: rc.c:229 #: rc.c:230
msgid "Use JIS X 0201 Katakana" msgid "Use JIS X 0201 Katakana"
msgstr "JIS X 0201-Katakana を使う" msgstr "JIS X 0201-Katakana を使う"
#: rc.c:230 #: rc.c:231
msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
msgstr "JIS X 0212:1990(補助漢字) を使う" msgstr "JIS X 0212:1990(補助漢字) を使う"
#: rc.c:231 #: rc.c:232
msgid "Use JIS X 0213:2000 (2000JIS)" msgid "Use JIS X 0213:2000 (2000JIS)"
msgstr "JIS X 0213:2000(2000JIS) を使う" msgstr "JIS X 0213:2000(2000JIS) を使う"
#: rc.c:232 #: rc.c:233
msgid "Strict ISO-2022-JP/KR/CN" msgid "Strict ISO-2022-JP/KR/CN"
msgstr "厳格な ISO-2022-JP/KR/CN を使う" msgstr "厳格な ISO-2022-JP/KR/CN を使う"
#: rc.c:233 #: rc.c:234
msgid "Treat 4 bytes char. of GB18030 as Unicode" msgid "Treat 4 bytes char. of GB18030 as Unicode"
msgstr "GB18030 の 4バイト文字を Unicode として扱う" msgstr "GB18030 の 4バイト文字を Unicode として扱う"
#: rc.c:234 #: rc.c:235
msgid "Simple Preserve space" msgid "Simple Preserve space"
msgstr "単純な空白の保存" msgstr "単純な空白の保存"
#: rc.c:237 #: rc.c:238
msgid "keymap file" msgid "keymap file"
msgstr "keymapファイル" msgstr "keymapファイル"
#: rc.c:254 #: rc.c:255
msgid "black" msgid "black"
msgstr "黒" msgstr "黒"
#: rc.c:255 #: rc.c:256
msgid "red" msgid "red"
msgstr "赤" msgstr "赤"
#: rc.c:256 #: rc.c:257
msgid "green" msgid "green"
msgstr "緑" msgstr "緑"
#: rc.c:257 #: rc.c:258
msgid "yellow" msgid "yellow"
msgstr "黄" msgstr "黄"
#: rc.c:258 #: rc.c:259
msgid "blue" msgid "blue"
msgstr "青" msgstr "青"
#: rc.c:259 #: rc.c:260
msgid "magenta" msgid "magenta"
msgstr "紫" msgstr "紫"
#: rc.c:260 #: rc.c:261
msgid "cyan" msgid "cyan"
msgstr "空色" msgstr "空色"
#: rc.c:261 #: rc.c:262
msgid "white" msgid "white"
msgstr "白" msgstr "白"
#: rc.c:262 #: rc.c:263
msgid "terminal" msgid "terminal"
msgstr "端末" msgstr "端末"
#: rc.c:281 #: rc.c:282
msgid "none" msgid "none"
msgstr "無し" msgstr "無し"
#: rc.c:282 #: rc.c:283
msgid "current URL" msgid "current URL"
msgstr "現在のURL" msgstr "現在のURL"
#: rc.c:283 #: rc.c:284
msgid "link URL" msgid "link URL"
msgstr "リンク先のURL" msgstr "リンク先のURL"
#: rc.c:288 #: rc.c:289
msgid "simple" msgid "simple"
msgstr "シンプル" msgstr "シンプル"
#: rc.c:289 #: rc.c:290
msgid "use tag" msgid "use tag"
msgstr "タグで表示" msgstr "タグで表示"
#: rc.c:290 #: rc.c:291
msgid "fontify" msgid "fontify"
msgstr "文字装飾" msgstr "文字装飾"
#: rc.c:296 #: rc.c:297
msgid "A:relative to screen height" msgid "A:relative to screen height"
msgstr "A:画面サイズに比例" msgstr "A:画面サイズに比例"
#: rc.c:297 #: rc.c:298
msgid "B:fixed speed" msgid "B:fixed speed"
msgstr "B:一定の行数" msgstr "B:一定の行数"
#: rc.c:304 #: rc.c:305
msgid "unspecified" msgid "unspecified"
msgstr "指定しない" msgstr "指定しない"
#: rc.c:305 #: rc.c:306
msgid "inet inet6" msgid "inet inet6"
msgstr "IPv4優先" msgstr "IPv4優先"
#: rc.c:306 #: rc.c:307
msgid "inet6 inet" msgid "inet6 inet"
msgstr "IPv6優先" msgstr "IPv6優先"
#: rc.c:307 #: rc.c:308
msgid "inet only" msgid "inet only"
msgstr "IPv4のみ" msgstr "IPv4のみ"
#: rc.c:308 #: rc.c:309
msgid "inet6 only" msgid "inet6 only"
msgstr "IPv6のみ" msgstr "IPv6のみ"
#: rc.c:315 #: rc.c:316
msgid "discard" msgid "discard"
msgstr "破棄する" msgstr "破棄する"
#: rc.c:317 #: rc.c:318
msgid "accept" msgid "accept"
msgstr "受け入れる" msgstr "受け入れる"
#: rc.c:319 #: rc.c:320
msgid "ask" msgid "ask"
msgstr "確認する" msgstr "確認する"
#: rc.c:329 #: rc.c:330
msgid "OFF" msgid "OFF"
msgstr "無効" msgstr "無効"
#: rc.c:330 #: rc.c:331
msgid "Only ISO 2022" msgid "Only ISO 2022"
msgstr "ISO 2022 のみ" msgstr "ISO 2022 のみ"
#: rc.c:331 #: rc.c:332
msgid "ON" msgid "ON"
msgstr "有効" msgstr "有効"
#: rc.c:337 #: rc.c:691
msgid "No"
msgstr "いいえ"
#: rc.c:338
msgid "Yes, but only charset specific"
msgstr "文字コード固有"
#: rc.c:339
msgid "Yes"
msgstr "はい"
#: rc.c:695
msgid "Display Settings" msgid "Display Settings"
msgstr "表示関係" msgstr "表示関係"
#: rc.c:697 #: rc.c:693
msgid "Color Settings" msgid "Color Settings"
msgstr "表示色" msgstr "表示色"
#: rc.c:699 #: rc.c:695
msgid "Miscellaneous Settings" msgid "Miscellaneous Settings"
msgstr "雑多な設定" msgstr "雑多な設定"
#: rc.c:700 #: rc.c:696
msgid "Directory Settings" msgid "Directory Settings"
msgstr "ディレクトリ設定" msgstr "ディレクトリ設定"
#: rc.c:701 #: rc.c:697
msgid "External Program Settings" msgid "External Program Settings"
msgstr "外部プログラム" msgstr "外部プログラム"
#: rc.c:702 #: rc.c:698
msgid "Network Settings" msgid "Network Settings"
msgstr "ネットワークの設定" msgstr "ネットワークの設定"
#: rc.c:703 #: rc.c:699
msgid "Proxy Settings" msgid "Proxy Settings"
msgstr "プロキシの設定" msgstr "プロキシの設定"
#: rc.c:705 #: rc.c:701
msgid "SSL Settings" msgid "SSL Settings"
msgstr "SSLの設定" msgstr "SSLの設定"
#: rc.c:708 #: rc.c:704
msgid "Cookie Settings" msgid "Cookie Settings"
msgstr "クッキーの設定" msgstr "クッキーの設定"
#: rc.c:711 #: rc.c:707
msgid "Charset Settings" msgid "Charset Settings"
msgstr "文字コードの設定" msgstr "文字コードの設定"
@@ -850,6 +842,6 @@ msgstr "文字コードの設定"
#. * header. For example, ja.po should translate it as #. * header. For example, ja.po should translate it as
#. * "ja;q=1.0, en;q=0.5" like that. #. * "ja;q=1.0, en;q=0.5" like that.
#. #.
#: rc.c:1187 #: rc.c:1183
msgid "en;q=1.0" msgid "en;q=1.0"
msgstr "ja;q=1.0, en;q=0.5" msgstr "ja;q=1.0, en;q=0.5"
po/w3m.pot
+58 -66
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: satodai@w3m.jp\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n"
"POT-Creation-Date: 2010-07-21 19:30+0900\n" "POT-Creation-Date: 2010-07-24 17:31+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -621,226 +621,218 @@ msgid "Use combining characters"
msgstr "" msgstr ""
#: rc.c:221 #: rc.c:221
msgid "Use Unicode language tags" msgid "Use double width for some Unicode characters"
msgstr "" msgstr ""
#: rc.c:222 #: rc.c:222
msgid "Charset conversion using Unicode map" msgid "Use Unicode language tags"
msgstr "" msgstr ""
#: rc.c:223 #: rc.c:223
msgid "Charset conversion when loading" msgid "Charset conversion using Unicode map"
msgstr "" msgstr ""
#: rc.c:224 #: rc.c:224
msgid "Adjust search string for document charset" msgid "Charset conversion when loading"
msgstr "" msgstr ""
#: rc.c:225 #: rc.c:225
msgid "Fix character width when conversion" msgid "Adjust search string for document charset"
msgstr "" msgstr ""
#: rc.c:226 #: rc.c:226
msgid "Use GB 12345 Unicode map instead of GB 2312's" msgid "Fix character width when conversion"
msgstr "" msgstr ""
#: rc.c:227 #: rc.c:227
msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgid "Use GB 12345 Unicode map instead of GB 2312's"
msgstr "" msgstr ""
#: rc.c:228 #: rc.c:228
msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgid "Use JIS X 0201 Roman for ISO-2022-JP"
msgstr "" msgstr ""
#: rc.c:229 #: rc.c:229
msgid "Use JIS X 0201 Katakana" msgid "Use JIS C 6226:1978 for ISO-2022-JP"
msgstr "" msgstr ""
#: rc.c:230 #: rc.c:230
msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgid "Use JIS X 0201 Katakana"
msgstr "" msgstr ""
#: rc.c:231 #: rc.c:231
msgid "Use JIS X 0213:2000 (2000JIS)" msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
msgstr "" msgstr ""
#: rc.c:232 #: rc.c:232
msgid "Strict ISO-2022-JP/KR/CN" msgid "Use JIS X 0213:2000 (2000JIS)"
msgstr "" msgstr ""
#: rc.c:233 #: rc.c:233
msgid "Treat 4 bytes char. of GB18030 as Unicode" msgid "Strict ISO-2022-JP/KR/CN"
msgstr "" msgstr ""
#: rc.c:234 #: rc.c:234
msgid "Treat 4 bytes char. of GB18030 as Unicode"
msgstr ""
#: rc.c:235
msgid "Simple Preserve space" msgid "Simple Preserve space"
msgstr "" msgstr ""
#: rc.c:237 #: rc.c:238
msgid "keymap file" msgid "keymap file"
msgstr "" msgstr ""
#: rc.c:254 #: rc.c:255
msgid "black" msgid "black"
msgstr "" msgstr ""
#: rc.c:255 #: rc.c:256
msgid "red" msgid "red"
msgstr "" msgstr ""
#: rc.c:256 #: rc.c:257
msgid "green" msgid "green"
msgstr "" msgstr ""
#: rc.c:257 #: rc.c:258
msgid "yellow" msgid "yellow"
msgstr "" msgstr ""
#: rc.c:258 #: rc.c:259
msgid "blue" msgid "blue"
msgstr "" msgstr ""
#: rc.c:259 #: rc.c:260
msgid "magenta" msgid "magenta"
msgstr "" msgstr ""
#: rc.c:260 #: rc.c:261
msgid "cyan" msgid "cyan"
msgstr "" msgstr ""
#: rc.c:261 #: rc.c:262
msgid "white" msgid "white"
msgstr "" msgstr ""
#: rc.c:262 #: rc.c:263
msgid "terminal" msgid "terminal"
msgstr "" msgstr ""
#: rc.c:281 #: rc.c:282
msgid "none" msgid "none"
msgstr "" msgstr ""
#: rc.c:282 #: rc.c:283
msgid "current URL" msgid "current URL"
msgstr "" msgstr ""
#: rc.c:283 #: rc.c:284
msgid "link URL" msgid "link URL"
msgstr "" msgstr ""
#: rc.c:288 #: rc.c:289
msgid "simple" msgid "simple"
msgstr "" msgstr ""
#: rc.c:289 #: rc.c:290
msgid "use tag" msgid "use tag"
msgstr "" msgstr ""
#: rc.c:290 #: rc.c:291
msgid "fontify" msgid "fontify"
msgstr "" msgstr ""
#: rc.c:296 #: rc.c:297
msgid "A:relative to screen height" msgid "A:relative to screen height"
msgstr "" msgstr ""
#: rc.c:297 #: rc.c:298
msgid "B:fixed speed" msgid "B:fixed speed"
msgstr "" msgstr ""
#: rc.c:304 #: rc.c:305
msgid "unspecified" msgid "unspecified"
msgstr "" msgstr ""
#: rc.c:305 #: rc.c:306
msgid "inet inet6" msgid "inet inet6"
msgstr "" msgstr ""
#: rc.c:306 #: rc.c:307
msgid "inet6 inet" msgid "inet6 inet"
msgstr "" msgstr ""
#: rc.c:307 #: rc.c:308
msgid "inet only" msgid "inet only"
msgstr "" msgstr ""
#: rc.c:308 #: rc.c:309
msgid "inet6 only" msgid "inet6 only"
msgstr "" msgstr ""
#: rc.c:315 #: rc.c:316
msgid "discard" msgid "discard"
msgstr "" msgstr ""
#: rc.c:317 #: rc.c:318
msgid "accept" msgid "accept"
msgstr "" msgstr ""
#: rc.c:319 #: rc.c:320
msgid "ask" msgid "ask"
msgstr "" msgstr ""
#: rc.c:329 #: rc.c:330
msgid "OFF" msgid "OFF"
msgstr "" msgstr ""
#: rc.c:330 #: rc.c:331
msgid "Only ISO 2022" msgid "Only ISO 2022"
msgstr "" msgstr ""
#: rc.c:331 #: rc.c:332
msgid "ON" msgid "ON"
msgstr "" msgstr ""
#: rc.c:337 #: rc.c:691
msgid "No"
msgstr ""
#: rc.c:338
msgid "Yes, but only charset specific"
msgstr ""
#: rc.c:339
msgid "Yes"
msgstr ""
#: rc.c:695
msgid "Display Settings" msgid "Display Settings"
msgstr "" msgstr ""
#: rc.c:697 #: rc.c:693
msgid "Color Settings" msgid "Color Settings"
msgstr "" msgstr ""
#: rc.c:699 #: rc.c:695
msgid "Miscellaneous Settings" msgid "Miscellaneous Settings"
msgstr "" msgstr ""
#: rc.c:700 #: rc.c:696
msgid "Directory Settings" msgid "Directory Settings"
msgstr "" msgstr ""
#: rc.c:701 #: rc.c:697
msgid "External Program Settings" msgid "External Program Settings"
msgstr "" msgstr ""
#: rc.c:702 #: rc.c:698
msgid "Network Settings" msgid "Network Settings"
msgstr "" msgstr ""
#: rc.c:703 #: rc.c:699
msgid "Proxy Settings" msgid "Proxy Settings"
msgstr "" msgstr ""
#: rc.c:705 #: rc.c:701
msgid "SSL Settings" msgid "SSL Settings"
msgstr "" msgstr ""
#: rc.c:708 #: rc.c:704
msgid "Cookie Settings" msgid "Cookie Settings"
msgstr "" msgstr ""
#: rc.c:711 #: rc.c:707
msgid "Charset Settings" msgid "Charset Settings"
msgstr "" msgstr ""
@@ -849,6 +841,6 @@ msgstr ""
#. * header. For example, ja.po should translate it as #. * header. For example, ja.po should translate it as
#. * "ja;q=1.0, en;q=0.5" like that. #. * "ja;q=1.0, en;q=0.5" like that.
#. #.
#: rc.c:1187 #: rc.c:1183
msgid "en;q=1.0" msgid "en;q=1.0"
msgstr "" msgstr ""
proto.h
+4 -1
View File
@@ -1,4 +1,4 @@
/* $Id: proto.h,v 1.103 2010/07/19 23:34:01 htrb Exp $ */ /* $Id: proto.h,v 1.104 2010/07/25 09:55:05 htrb Exp $ */
/* /*
* This file was automatically generated by version 1.7 of cextract. * This file was automatically generated by version 1.7 of cextract.
* Manual editing not recommended. * Manual editing not recommended.
@@ -177,6 +177,9 @@ extern Str convertLine0(URLFile *uf, Str line, int mode);
#define convertLine(uf,line,mode,charset,dcharset) convertLine0(uf,line,mode) #define convertLine(uf,line,mode,charset,dcharset) convertLine0(uf,line,mode)
#endif #endif
extern void push_symbol(Str str, char symbol, int width, int n); extern void push_symbol(Str str, char symbol, int width, int n);
#ifdef USE_UNICODE
extern void update_utf8_symbol(void);
#endif
extern Buffer *loadFile(char *path); extern Buffer *loadFile(char *path);
extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer, extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer,
int flag, FormList *request); int flag, FormList *request);
rc.c
+9 -10
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.112 2010/07/19 23:34:01 htrb Exp $ */ /* $Id: rc.c,v 1.113 2010/07/25 09:55:05 htrb Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -218,6 +218,7 @@ static int OptionEncode = FALSE;
#define CMT_EXT_HALFDUMP N_("Output halfdump with display charset") #define CMT_EXT_HALFDUMP N_("Output halfdump with display charset")
#define CMT_USE_WIDE N_("Use multi column characters") #define CMT_USE_WIDE N_("Use multi column characters")
#define CMT_USE_COMBINING N_("Use combining characters") #define CMT_USE_COMBINING N_("Use combining characters")
#define CMT_EAST_ASIAN_WIDTH N_("Use double width for some Unicode characters")
#define CMT_USE_LANGUAGE_TAG N_("Use Unicode language tags") #define CMT_USE_LANGUAGE_TAG N_("Use Unicode language tags")
#define CMT_UCS_CONV N_("Charset conversion using Unicode map") #define CMT_UCS_CONV N_("Charset conversion using Unicode map")
#define CMT_PRE_CONV N_("Charset conversion when loading") #define CMT_PRE_CONV N_("Charset conversion when loading")
@@ -333,13 +334,6 @@ static struct sel_c auto_detect_str[] = {
}; };
#endif #endif
static struct sel_c graphic_char_str[] = {
{N_S(GRAPHIC_CHAR_ASCII), N_("No")},
{N_S(GRAPHIC_CHAR_CHARSET), N_("Yes, but only charset specific")},
{N_S(GRAPHIC_CHAR_ALL), N_("Yes")},
{0, NULL, NULL}
};
struct param_ptr params1[] = { struct param_ptr params1[] = {
{"tabstop", P_NZINT, PI_TEXT, (void *)&Tabstop, CMT_TABSTOP, NULL}, {"tabstop", P_NZINT, PI_TEXT, (void *)&Tabstop, CMT_TABSTOP, NULL},
{"indent_incr", P_NZINT, PI_TEXT, (void *)&IndentIncr, CMT_INDENT_INCR, {"indent_incr", P_NZINT, PI_TEXT, (void *)&IndentIncr, CMT_INDENT_INCR,
@@ -376,8 +370,8 @@ struct param_ptr params1[] = {
{"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL}, {"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL},
{"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY, {"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY,
NULL}, NULL},
{"graphic_char", P_CHARINT, PI_SEL_C, (void *)&UseGraphicChar, {"graphic_char", P_CHARINT, PI_ONOFF, (void *)&UseGraphicChar,
CMT_GRAPHIC_CHAR, (void *)graphic_char_str}, CMT_GRAPHIC_CHAR, NULL},
{"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea, {"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea,
CMT_FOLD_TEXTAREA, NULL}, CMT_FOLD_TEXTAREA, NULL},
{"display_ins_del", P_INT, PI_SEL_C, (void *)&displayInsDel, {"display_ins_del", P_INT, PI_SEL_C, (void *)&displayInsDel,
@@ -654,6 +648,8 @@ struct param_ptr params10[] = {
{"use_combining", P_CHARINT, PI_ONOFF, (void *)&WcOption.use_combining, {"use_combining", P_CHARINT, PI_ONOFF, (void *)&WcOption.use_combining,
CMT_USE_COMBINING, NULL}, CMT_USE_COMBINING, NULL},
#ifdef USE_UNICODE #ifdef USE_UNICODE
{"east_asian_width", P_CHARINT, PI_ONOFF,
(void *)&WcOption.east_asian_width, CMT_EAST_ASIAN_WIDTH, NULL},
{"use_language_tag", P_CHARINT, PI_ONOFF, {"use_language_tag", P_CHARINT, PI_ONOFF,
(void *)&WcOption.use_language_tag, CMT_USE_LANGUAGE_TAG, NULL}, (void *)&WcOption.use_language_tag, CMT_USE_LANGUAGE_TAG, NULL},
{"ucs_conv", P_CHARINT, PI_ONOFF, (void *)&WcOption.ucs_conv, CMT_UCS_CONV, {"ucs_conv", P_CHARINT, PI_ONOFF, (void *)&WcOption.ucs_conv, CMT_UCS_CONV,
@@ -1190,6 +1186,9 @@ sync_with_option(void)
AcceptEncoding = acceptableEncoding(); AcceptEncoding = acceptableEncoding();
if (AcceptMedia == NULL || *AcceptMedia == '\0') if (AcceptMedia == NULL || *AcceptMedia == '\0')
AcceptMedia = acceptableMimeTypes(); AcceptMedia = acceptableMimeTypes();
#ifdef USE_UNICODE
update_utf8_symbol();
#endif
if (fmInitialized) { if (fmInitialized) {
initKeymap(FALSE); initKeymap(FALSE);
#ifdef USE_MOUSE #ifdef USE_MOUSE
symbol.c
+35 -18
View File
@@ -18,7 +18,7 @@ typedef struct {
wc_ces ces; wc_ces ces;
char width; char width;
char **item; char **item;
char encode; char **conved_item;
} symbol_set; } symbol_set;
typedef struct { typedef struct {
@@ -27,17 +27,17 @@ typedef struct {
} charset_symbol_set; } charset_symbol_set;
/* *INDENT-OFF* */ /* *INDENT-OFF* */
static symbol_set alt_symbol_set = { WC_CES_US_ASCII, 1, alt_symbol, 1 }; static symbol_set alt_symbol_set = { WC_CES_US_ASCII, 1, alt_symbol, alt_symbol };
static symbol_set alt2_symbol_set = { WC_CES_US_ASCII, 2, alt2_symbol, 1 }; static symbol_set alt2_symbol_set = { WC_CES_US_ASCII, 2, alt2_symbol, alt2_symbol };
static symbol_set eucjp_symbol_set = { WC_CES_EUC_JP, 2, eucjp_symbol, 0 }; static symbol_set eucjp_symbol_set = { WC_CES_EUC_JP, 2, eucjp_symbol, NULL };
static symbol_set euckr_symbol_set = { WC_CES_EUC_KR, 2, euckr_symbol, 0 }; static symbol_set euckr_symbol_set = { WC_CES_EUC_KR, 2, euckr_symbol, NULL };
static symbol_set euccn_symbol_set = { WC_CES_EUC_CN, 2, euccn_symbol, 0 }; static symbol_set euccn_symbol_set = { WC_CES_EUC_CN, 2, euccn_symbol, NULL };
static symbol_set euctw_symbol_set = { WC_CES_EUC_TW, 2, euctw_symbol, 0 }; static symbol_set euctw_symbol_set = { WC_CES_EUC_TW, 2, euctw_symbol, NULL };
static symbol_set big5_symbol_set = { WC_CES_BIG5, 2, big5_symbol, 0 }; static symbol_set big5_symbol_set = { WC_CES_BIG5, 2, big5_symbol, NULL };
#ifdef USE_UNICODE #ifdef USE_UNICODE
static symbol_set utf8_symbol_set = { WC_CES_UTF_8, 1, utf8_symbol, 0 }; static symbol_set utf8_symbol_set = { WC_CES_UTF_8, 1, utf8_symbol, NULL };
#endif #endif
static symbol_set cp850_symbol_set = { WC_CES_CP850, 1, cp850_symbol, 0 }; static symbol_set cp850_symbol_set = { WC_CES_CP850, 1, cp850_symbol, NULL };
static charset_symbol_set charset_symbol_list[] = { static charset_symbol_set charset_symbol_list[] = {
{ WC_CES_EUC_JP, &eucjp_symbol_set }, { WC_CES_EUC_JP, &eucjp_symbol_set },
@@ -73,11 +73,12 @@ encode_symbol(symbol_set * s)
{ {
int i; int i;
for (i = 0; s->item[i]; i++) ;
s->conved_item = New_N(char *, i);
for (i = 0; s->item[i]; i++) { for (i = 0; s->item[i]; i++) {
if (*(s->item[i])) if (*(s->item[i]))
s->item[i] = wc_conv(s->item[i], s->ces, InnerCharset)->ptr; s->conved_item[i] = wc_conv(s->item[i], s->ces, InnerCharset)->ptr;
} }
s->encode = 1;
} }
char ** char **
@@ -86,10 +87,11 @@ get_symbol(wc_ces charset, int *width)
charset_symbol_set *p; charset_symbol_set *p;
symbol_set *s = NULL; symbol_set *s = NULL;
if (UseGraphicChar != GRAPHIC_CHAR_ASCII) { if (UseGraphicChar) {
if (charset == save_charset && save_symbol != NULL && if (charset == save_charset && save_symbol != NULL &&
*width == save_symbol->width) *width == save_symbol->width) {
return save_symbol->item; return save_symbol->conved_item;
}
save_charset = charset; save_charset = charset;
for (p = charset_symbol_list; p->charset; p++) { for (p = charset_symbol_list; p->charset; p++) {
if (charset == p->charset && if (charset == p->charset &&
@@ -101,18 +103,18 @@ get_symbol(wc_ces charset, int *width)
if (s == NULL) if (s == NULL)
s = (*width == 2) ? &alt2_symbol_set : &alt_symbol_set; s = (*width == 2) ? &alt2_symbol_set : &alt_symbol_set;
if (s != save_symbol) { if (s != save_symbol) {
if (!s->encode) if (!s->conved_item)
encode_symbol(s); encode_symbol(s);
save_symbol = s; save_symbol = s;
} }
} else { } else {
if (save_symbol != NULL && *width == save_symbol->width) if (save_symbol != NULL && *width == save_symbol->width)
return save_symbol->item; return save_symbol->conved_item;
s = (*width == 2) ? &alt2_symbol_set : &alt_symbol_set; s = (*width == 2) ? &alt2_symbol_set : &alt_symbol_set;
save_symbol = s; save_symbol = s;
} }
*width = s->width; *width = s->width;
return s->item; return s->conved_item;
} }
char ** char **
@@ -142,6 +144,21 @@ set_symbol(int width)
return symbol_buf; return symbol_buf;
} }
#ifdef USE_UNICODE
void
update_utf8_symbol(void)
{
charset_symbol_set *p;
utf8_symbol_set.width = WcOption.east_asian_width ? 2 : 1;
for (p = charset_symbol_list; p->charset; p++) {
if (p->charset == WC_CES_UTF_8) {
encode_symbol(p->symbol);
break;
}
}
}
#endif
#else #else
char ** char **
terms.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: terms.c,v 1.60 2010/07/19 12:08:41 htrb Exp $ */ /* $Id: terms.c,v 1.61 2010/07/25 09:55:05 htrb Exp $ */
/* /*
* An original curses library for EUC-kanji by Akinori ITO, December 1989 * An original curses library for EUC-kanji by Akinori ITO, December 1989
* revised by Akinori ITO, January 1995 * revised by Akinori ITO, January 1995
@@ -1201,7 +1201,7 @@ graphend(void)
int int
graph_ok(void) graph_ok(void)
{ {
if (UseGraphicChar != GRAPHIC_CHAR_ALL) if (! UseGraphicChar)
return 0; return 0;
return T_as[0] != 0 && T_ae[0] != 0 && T_ac[0] != 0; return T_as[0] != 0 && T_ae[0] != 0 && T_ac[0] != 0;
} }