OSDN Git Service
(root)
/
nkf
/
nkf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ea58b37
)
Update --help.
v2_0_9
author
NARUSE, Yui
<naruse@users.sourceforge.jp>
Tue, 20 Jan 2009 08:34:56 +0000
(17:34 +0900)
committer
NARUSE, Yui
<naruse@users.sourceforge.jp>
Tue, 20 Jan 2009 08:34:56 +0000
(17:34 +0900)
nkf.c
patch
|
blob
|
history
diff --git
a/nkf.c
b/nkf.c
index
3222ffd
..
da1c766
100644
(file)
--- a/
nkf.c
+++ b/
nkf.c
@@
-873,17
+873,20
@@
usage(void)
{
fprintf(HELP_OUTPUT,
"Usage: nkf -[flags] [--] [in file] .. [out file for -O flag]\n"
{
fprintf(HELP_OUTPUT,
"Usage: nkf -[flags] [--] [in file] .. [out file for -O flag]\n"
- " j,s,e,w Output code is ISO-2022-JP, Shift JIS, EUC-JP, UTF-8N\n"
#ifdef UTF8_OUTPUT_ENABLE
#ifdef UTF8_OUTPUT_ENABLE
- " After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n"
+ " j/s/e/w Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
+ " UTF options is -w[8[0],{16,32}[{B,L}[0]]]\n"
+#else
#endif
#endif
- " J,S,E,W Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n"
#ifdef UTF8_INPUT_ENABLE
#ifdef UTF8_INPUT_ENABLE
- " After 'W' you can add more options. -W[ 8, 16 [BL] ] \n"
+ " J/S/E/W Specify input encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
+ " UTF option is -W[8,[16,32][B,L]]\n"
+#else
+ " J/S/E Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
#endif
);
fprintf(HELP_OUTPUT,
#endif
);
fprintf(HELP_OUTPUT,
- " m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:non
-
strict,0:no decode]\n"
+ " m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:nonstrict,0:no decode]\n"
" M[BQ] MIME encode [B:base64 Q:quoted]\n"
" f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
);
" M[BQ] MIME encode [B:base64 Q:quoted]\n"
" f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
);
@@
-898,32
+901,31
@@
usage(void)
" L[uwm] Line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
);
fprintf(HELP_OUTPUT,
" L[uwm] Line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
);
fprintf(HELP_OUTPUT,
- "Long name options\n"
- " --ic=<input codeset> --oc=<output codeset>\n"
- " Specify the input or output codeset\n"
- " --hiragana --katakana --katakana-hiragana\n"
- " To Hiragana/Katakana Conversion\n"
+ " --ic=<encoding> Specify the input encoding\n"
+ " --oc=<encoding> Specify the output encoding\n"
+ " --hiragana --katakana Hiragana/Katakana Conversion\n"
+ " --katakana-hiragana Converts each other\n"
);
fprintf(HELP_OUTPUT,
#ifdef INPUT_OPTION
);
fprintf(HELP_OUTPUT,
#ifdef INPUT_OPTION
- " --
cap-input, --url-input
Convert hex after ':' or '%%'\n"
+ " --
{cap, url}-input
Convert hex after ':' or '%%'\n"
#endif
#ifdef NUMCHAR_OPTION
#endif
#ifdef NUMCHAR_OPTION
- " --numchar-input Convert Unicode Character Reference\n"
+ " --numchar-input
Convert Unicode Character Reference\n"
#endif
#ifdef UTF8_INPUT_ENABLE
" --fb-{skip, html, xml, perl, java, subchar}\n"
#endif
#ifdef UTF8_INPUT_ENABLE
" --fb-{skip, html, xml, perl, java, subchar}\n"
- "
Specify how nkf handles unassigned characters
\n"
+ "
Specify unassigned character's replacement
\n"
#endif
);
fprintf(HELP_OUTPUT,
#ifdef OVERWRITE
#endif
);
fprintf(HELP_OUTPUT,
#ifdef OVERWRITE
- " --in-place[=SUF]
Overwrite original listed files by filtered result
\n"
- " --overwrite[=SUF]
in-place and p
reserve timestamp of original files\n"
+ " --in-place[=SUF]
Overwrite original files
\n"
+ " --overwrite[=SUF]
P
reserve timestamp of original files\n"
#endif
#endif
- " -g --guess Guess the input code\n"
- " -v --version
p
rint the version\n"
- " --help/-V
p
rint this help / configuration\n"
+ " -g --guess
Guess the input code\n"
+ " -v --version
P
rint the version\n"
+ " --help/-V
P
rint this help / configuration\n"
);
version();
}
);
version();
}