Release 2.1.3

diff --git a/Changes b/Changes
index d31f04d..834ba04 100644 (file)
--- a/Changes
+++ b/Changes
@@ -522,3 +522,15 @@ CP50220 
 .SS nkf 2.1.2
 
 Q-encoded UTF-8 ¤Î¥Ç¥³¡¼¥É¤¬²õ¤ì¤Æ¤¤¤¿¤Î¤ò½¤Àµ [nkf-bug:55125]
 .SS nkf 2.1.2
 
 Q-encoded UTF-8 ¤Î¥Ç¥³¡¼¥É¤¬²õ¤ì¤Æ¤¤¤¿¤Î¤ò½¤Àµ [nkf-bug:55125]

+
+.SS nkf 2.1.3
+
+NKF_python ¤ò¥Þ¡¼¥¸¤·¤¿
+http://sourceforge.jp/ticket/browse.php?group_id=248&tid=27841
+
+guess ¥ª¥×¥·¥ç¥ó¤Î¶¯²½
+http://sourceforge.jp/ticket/browse.php?group_id=248&tid=26325
+http://sourceforge.jp/ticket/browse.php?group_id=248&tid=26325
+
+¤½¤Î¾¥Ð¥°¤Î½¤Àµ
+http://sourceforge.jp/projects/nkf/scm/git/nkf/

diff --git a/Makefile b/Makefile
index 3b5cb8f..f0c5e9d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHAR = shar
 # SHAR = shar -T
 PERL = perl
 RM = rm -rf
 # SHAR = shar -T
 PERL = perl
 RM = rm -rf

-VERSION = 2.1.2
+VERSION = 2.1.3

 MKDIR = mkdir
 prefix = /usr/local
 PYTHON2 = python
 MKDIR = mkdir
 prefix = /usr/local
 PYTHON2 = python

diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm
index 0e5003b..a159d40 100644 (file)
--- a/NKF.mod/NKF.pm
+++ b/NKF.mod/NKF.pm
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );

-$VERSION = '2.12';
+$VERSION = '2.13';

 
 bootstrap NKF $VERSION;
 
 
 bootstrap NKF $VERSION;
 


@@ -499,7 +499,7 @@ Ignore rest of -option.
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 

-Copyright (c) 1996-2010, The nkf Project.
+Copyright (c) 1996-2013, The nkf Project.

 
 =begin
 
 
 =begin
 

diff --git a/dll.rc b/dll.rc
index bb7a54f..dd2da5a 100755 (executable)
--- a/dll.rc
+++ b/dll.rc
@@ -1,8 +1,8 @@
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r

-FILEVERSION 2,1,2,0\r
-PRODUCTVERSION 2,1,2,0\r
+FILEVERSION 2,1,3,0\r
+PRODUCTVERSION 2,1,3,0\r

 FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
 FILEFLAGS 0x1L\r
 FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
 FILEFLAGS 0x1L\r


@@ -19,12 +19,12 @@ FILESUBTYPE 0x0L
         {\r
             VALUE "CompanyName", "project nkf\0"\r
             VALUE "FileDescription", "Network Kanji Filter\0"\r
         {\r
             VALUE "CompanyName", "project nkf\0"\r
             VALUE "FileDescription", "Network Kanji Filter\0"\r

-            VALUE "FileVersion", "2.1.2.0 1\0"\r
+            VALUE "FileVersion", "2.1.3.0 1\0"\r

             VALUE "InternalName", "nkf32\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA); Copyright (C) 2003-2004 T.kaneto\0"\r
             VALUE "OriginalFilename", "nkf32.c\0"\r
             VALUE "ProductName", "nkf32.dll\0"\r
             VALUE "InternalName", "nkf32\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA); Copyright (C) 2003-2004 T.kaneto\0"\r
             VALUE "OriginalFilename", "nkf32.c\0"\r
             VALUE "ProductName", "nkf32.dll\0"\r

-            VALUE "ProductVersion", "2.1.2.0 1\0"\r
+            VALUE "ProductVersion", "2.1.3.0 1\0"\r

         }\r
     }\r
     BLOCK "VarFileInfo"\r
         }\r
     }\r
     BLOCK "VarFileInfo"\r

diff --git a/man/make_doc.sh b/man/make_doc.sh
index 74f3184..8131f08 100755 (executable)
--- a/man/make_doc.sh
+++ b/man/make_doc.sh
@@ -1,5 +1,5 @@
 current=`pwd`
 current=`pwd`

-self_dir=`echo $0 | sed -e's/\/[^\/]*$//`
+self_dir=`echo $0 | sed -e's/\/[^\/]*$//'`

 if [ -d $self_dir ]
 then
   echo cd $self_dir
 if [ -d $self_dir ]
 then
   echo cd $self_dir

diff --git a/man/nkf.1.pm b/man/nkf.1.pm
index 28b2650..6d4cf6d 100644 (file)
--- a/man/nkf.1.pm
+++ b/man/nkf.1.pm
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );

-$VERSION = '2.12';
+$VERSION = '2.13';

 
 bootstrap NKF $VERSION;
 
 
 bootstrap NKF $VERSION;
 


@@ -475,7 +475,7 @@ Ignore rest of -option.
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 

-Copyright (c) 1996-2010, The nkf Project.
+Copyright (c) 1996-2013, The nkf Project.

 
 
 =cut
 
 
 =cut

diff --git a/man/nkf.1j.pm b/man/nkf.1j.pm
index 11b55a6..0bf9d9b 100755 (executable)
--- a/man/nkf.1j.pm
+++ b/man/nkf.1j.pm
@@ -727,6 +727,6 @@ http://sourceforge.jp/projects/nkf/
 
 Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 
 
 Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 

-Copyright (C) 1996-2009, The nkf Project.
+Copyright (C) 1996-2013, The nkf Project.

 
 =cut
 
 =cut

diff --git a/nkf.1 b/nkf.1
index f8ac5e8..b6d1739 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.37
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)

 .\"
 .\" Standard preamble:
 .\" ========================================================================
 .\"
 .\" Standard preamble:
 .\" ========================================================================

-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..

 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp


@@ -25,11 +17,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left

-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-

 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-


@@ -48,22 +40,25 @@
 .    ds R" ''
 'br\}
 .\"
 .    ds R" ''
 'br\}
 .\"

+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"

 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" If the F register is turned on, we'll generate index entries on stderr for

-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index

 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.

-.if \nF \{\
+.ie \nF \{\

 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}

-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}

 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.


@@ -129,7 +124,11 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"

-.TH nkf 1 "2011-09-08" "nkf 2.1.2" " "
+.TH nkf 1 "2013-11-22" "nkf 2.1.3" " "
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh

 .SH "NAME"
 nkf \- Network Kanji Filter
 .SH "SYNOPSIS"
 .SH "NAME"
 nkf \- Network Kanji Filter
 .SH "SYNOPSIS"


@@ -139,10 +138,10 @@ nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 .IX Header "DESCRIPTION"
 \&\fBNkf\fR is a yet another kanji code converter among networks, hosts and terminals.
 It converts input kanji code to designated kanji code
 .IX Header "DESCRIPTION"
 \&\fBNkf\fR is a yet another kanji code converter among networks, hosts and terminals.
 It converts input kanji code to designated kanji code

-such as \s-1ISO\-2022\-JP\s0, Shift_JIS, \s-1EUC\-JP\s0, \s-1UTF\-8\s0, \s-1UTF\-16\s0 or \s-1UTF\-32\s0.
+such as \s-1ISO\-2022\-JP\s0, Shift_JIS, EUC-JP, \s-1UTF\-8\s0, \s-1UTF\-16\s0 or \s-1UTF\-32\s0.

 .PP
 One of the most unique faculty of \fBnkf\fR is the guess of the input kanji encodings.
 .PP
 One of the most unique faculty of \fBnkf\fR is the guess of the input kanji encodings.

-It currently recognizes \s-1ISO\-2022\-JP\s0, Shift_JIS, \s-1EUC\-JP\s0, \s-1UTF\-8\s0, \s-1UTF\-16\s0 and \s-1UTF\-32\s0.
+It currently recognizes \s-1ISO\-2022\-JP\s0, Shift_JIS, EUC-JP, \s-1UTF\-8\s0, \s-1UTF\-16\s0 and \s-1UTF\-32\s0.

 So users needn't set the input kanji code explicitly.
 .PP
 By default, X0201 kana is converted into X0208 kana.
 So users needn't set the input kanji code explicitly.
 .PP
 By default, X0201 kana is converted into X0208 kana.


@@ -167,7 +166,7 @@ EUC-JP is recognized as X0201 kana. Without \fB\-x\fR flag,
 If you use Windows, see Windows\-31J (\s-1CP932\s0).
 .IP "\fB\-E\fR" 4
 .IX Item "-E"
 If you use Windows, see Windows\-31J (\s-1CP932\s0).
 .IP "\fB\-E\fR" 4
 .IX Item "-E"

-\&\s-1EUC\-JP\s0.
+EUC-JP.

 .IP "\fB\-W\fR" 4
 .IX Item "-W"
 \&\s-1UTF\-8N\s0.
 .IP "\fB\-W\fR" 4
 .IX Item "-W"
 \&\s-1UTF\-8N\s0.


@@ -228,7 +227,7 @@ Katakana to Hiragana and Hiragana to Katakana conversion.
 .RE
 .IP "\fB\-T\fR" 4
 .IX Item "-T"
 .RE
 .IP "\fB\-T\fR" 4
 .IX Item "-T"

-Text mode output (\s-1MS\-DOS\s0)
+Text mode output (MS-DOS)

 .IP "\fB\-f[\f(BIm\fB [\- \f(BIn\fB]]\fR" 4
 .IX Item "-f[m [- n]]"
 Folding on \fIm\fR length with \fIn\fR margin in a line.
 .IP "\fB\-f[\f(BIm\fB [\- \f(BIn\fB]]\fR" 4
 .IX Item "-f[m [- n]]"
 Folding on \fIm\fR length with \fIn\fR margin in a line.


@@ -286,7 +285,7 @@ To see \s-1ISO8859\-1\s0 (Latin\-1) \-l is necessary.
 .IP "\fB\-mB\fR" 4
 .IX Item "-mB"
 Decode \s-1MIME\s0 base64 encoded stream. Remove header or other part before
 .IP "\fB\-mB\fR" 4
 .IX Item "-mB"
 Decode \s-1MIME\s0 base64 encoded stream. Remove header or other part before

-conversion. 
+conversion.

 .IP "\fB\-mQ\fR" 4
 .IX Item "-mQ"
 Decode \s-1MIME\s0 quoted stream. '_' in quoted stream is converted to space.
 .IP "\fB\-mQ\fR" 4
 .IX Item "-mQ"
 Decode \s-1MIME\s0 quoted stream. '_' in quoted stream is converted to space.


@@ -353,7 +352,7 @@ Set the input or output codeset.
 .IP "\s-1ISO\-2022\-JP\s0" 4
 .IX Item "ISO-2022-JP"
 a.k.a. \s-1RFC1468\s0, 7bit \s-1JIS\s0, \s-1JUNET\s0
 .IP "\s-1ISO\-2022\-JP\s0" 4
 .IX Item "ISO-2022-JP"
 a.k.a. \s-1RFC1468\s0, 7bit \s-1JIS\s0, \s-1JUNET\s0

-.IP "EUC-JP (eucJP\-nkf)" 4
+.IP "EUC-JP (eucJP-nkf)" 4

 .IX Item "EUC-JP (eucJP-nkf)"
 a.k.a. \s-1AT&T\s0 \s-1JIS\s0, Japanese \s-1EUC\s0, \s-1UJIS\s0
 .IP "eucJP-ascii" 4
 .IX Item "EUC-JP (eucJP-nkf)"
 a.k.a. \s-1AT&T\s0 \s-1JIS\s0, Japanese \s-1EUC\s0, \s-1UJIS\s0
 .IP "eucJP-ascii" 4


@@ -364,7 +363,7 @@ a.k.a. \s-1AT&T\s0 \s-1JIS\s0, Japanese \s-1EUC\s0, \s-1UJIS\s0
 .IP "\s-1CP51932\s0" 4
 .IX Item "CP51932"
 .PD
 .IP "\s-1CP51932\s0" 4
 .IX Item "CP51932"
 .PD

-Microsoft Version of \s-1EUC\-JP\s0.
+Microsoft Version of EUC-JP.

 .IP "Shift_JIS" 4
 .IX Item "Shift_JIS"
 a.k.a. \s-1SJIS\s0, MS_Kanji
 .IP "Shift_JIS" 4
 .IX Item "Shift_JIS"
 a.k.a. \s-1SJIS\s0, MS_Kanji


@@ -467,4 +466,4 @@ Ignore rest of \-option.
 .IX Header "AUTHOR"
 Copyright (c) 1987, Fujitsu \s-1LTD\s0. (Itaru \s-1ICHIKAWA\s0).
 .PP
 .IX Header "AUTHOR"
 Copyright (c) 1987, Fujitsu \s-1LTD\s0. (Itaru \s-1ICHIKAWA\s0).
 .PP

-Copyright (c) 1996\-2010, The nkf Project.
+Copyright (c) 1996\-2013, The nkf Project.

diff --git a/nkf.1j b/nkf.1j
index d487e9e..2fec62b 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.37
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)

 .\"
 .\" Standard preamble:
 .\" ========================================================================
 .\"
 .\" Standard preamble:
 .\" ========================================================================

-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..

 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp


@@ -25,11 +17,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left

-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-

 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-


@@ -48,22 +40,25 @@
 .    ds R" ''
 'br\}
 .\"
 .    ds R" ''
 'br\}
 .\"

+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"

 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" If the F register is turned on, we'll generate index entries on stderr for

-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index

 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.

-.if \nF \{\
+.ie \nF \{\

 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}

-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}

 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.


@@ -129,253 +124,257 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"

-.TH nkf 1 "2009-06-26" "nkf 2.1.2" " "
+.TH nkf 1 "2013-11-22" "nkf 2.1.3" " "
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh

 .SH "NAME"
 .SH "NAME"

-nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B
+nkf \- XXXXXXXXXXXXXXXXXX

 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"

-\&\fBnkf\fR \e$B$O%M%C%H%o!<%/$G%a!<%k$d%K%e!<%9$NFI$_=q$-$r$9$k$?$a$K:n$i$l$?!"4A;z%3!<%I$NJQ49%U%#%k%?$G$"$k!#\e(B
+\&\fBnkf\fR \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .PP
 .PP

-\e$B$3$N\e(B\fBnkf\fR\e$B$NFCD'$H$7$F$O!"F~NO4A;z%3!<%I7O$NE}7WE*$J<+F0G'<15!G=$,$"$k!#\e(B
-\e$B$3$N$?$a!"MxMQ<T$O!"F~NO4A;z%3!<%I7O$,2?$G$"$k$+$rCN$i$J$/$F$b!"=PNO4A;z%3!<%I7O$N$_;XDj$9$l$PNI$$$3$H$K$J$k!#\e(B
-\e$B$?$@!"$3$NH=Dj5!9=$O!"M}O@E*$K$O40A4$G$O$J$$$,!"DL>o$N%K%e!<%9$d%a!<%k$N%a%C%;!<%8$K$D$$$F$O3N<B$KF0:n$9$k0BA4$J$b$N$K$O$J$C$F$$$k!#\e(B
+\&\s-1XX\s0\fBnkf\fR\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .PP
 .PP

-\e$B8=:_!"\e(B\fBnkf\fR\e$B$,G'<1$G$-$kF~NO$N4A;z%3!<%I7O$O!"$$$o$f$k\e(B \s-1JIS\s0 \e$B%3!<%I\e(B (\s-1ISO\-2022\-JP\s0 \e$B$K4p$E$/$b$N\e(B)\e$B!"\e(BShift_JIS (\s-1MS\s0 \e$B4A;z%3!<%I\e(B)\e$B!"\e(B
-\e$BF|K\8l\e(B \s-1EUC\s0 (\s-1AT&T\s0 \e$B%3!<%I\e(B)\e$B!"\e(BUTF\-8\e$B!"\e(BUTF\-16 \e$B$N$$$:$l$+$G$"$k!#\e(B
-\e$B=PNO$9$k4A;z%3!<%I7O$b!"$3$l$i$G$"$k!#\e(B
-\e$BF~NO$O!"%U%!%$%k$r;XDj$7$J$1$l$P!"I8=`F~NO$H$J$k!#\e(B
-\e$B=PNO$OI8=`=PNO$G$"$k!#\e(B
+\&\s-1XXX\s0\fBnkf\fR\s-1XXXXXXXXXXXXXXXXXXXXX\s0 \s-1JIS\s0 \s-1XXX\s0 (\s-1ISO\-2022\-JP\s0 \s-1XXXXXX\s0)XShift_JIS (\s-1MS\s0 \s-1XXXXX\s0)X
+\&\s-1XXX\s0 \s-1EUC\s0 (\s-1AT&T\s0 \s-1XXX\s0)XUTF\-8XUTF\-16 \s-1XXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXX\s0

 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .SH "OPTIONS"
 .IX Header "OPTIONS"

-\e$B;XDj$G$-$k%*%W%7%g%s$O!"0J2<$NDL$j!#\e(B
-\&\fB\-mu\fR \e$B$N$h$&$KB3$1$k$3$H$,$G$-$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXX\s0
+\&\fB\-mu\fR \s-1XXXXXXXXXXXXXX\s0

 .IP "\fB\-j\fR" 4
 .IX Item "-j"
 .IP "\fB\-j\fR" 4
 .IX Item "-j"

-\&\s-1JIS\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B
+\&\s-1JIS\s0 \s-1XXXXXXXXX\s0

 .IP "\fB\-e\fR" 4
 .IX Item "-e"
 .IP "\fB\-e\fR" 4
 .IX Item "-e"

-\&\s-1EUC\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B
+\&\s-1EUC\s0 \s-1XXXXXXXXX\s0

 .IP "\fB\-s\fR" 4
 .IX Item "-s"
 .IP "\fB\-s\fR" 4
 .IX Item "-s"

-Shift_JIS \e$B%3!<%I$r=PNO$9$k!#\e(B
+Shift_JIS \s-1XXXXXXXXX\s0

 .IP "\fB\-w \-w8[0] \-w16[\s-1BL\s0][0]\fR" 4
 .IX Item "-w -w8[0] -w16[BL][0]"
 .IP "\fB\-w \-w8[0] \-w16[\s-1BL\s0][0]\fR" 4
 .IX Item "-w -w8[0] -w16[BL][0]"

-Unicode \e$B$r=PNO$9$k!#\e(B
+Unicode \s-1XXXXXX\s0

 .RS 4
 .IP "\fB\-w \-w80\fR" 4
 .IX Item "-w -w80"
 .RS 4
 .IP "\fB\-w \-w80\fR" 4
 .IX Item "-w -w80"

-\&\s-1UTF8\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B (\s-1BOM\s0 \e$BL5$7\e(B)
+\&\s-1UTF8\s0 \s-1XXXXXXXXX\s0 (\s-1BOM\s0 \s-1XX\s0)

 .IP "\fB\-w8\fR" 4
 .IX Item "-w8"
 .IP "\fB\-w8\fR" 4
 .IX Item "-w8"

-\&\s-1UTF8\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B
+\&\s-1UTF8\s0 \s-1XXXXXXXXX\s0

 .IP "\fB\-w16 \-w16B0\fR" 4
 .IX Item "-w16 -w16B0"
 .IP "\fB\-w16 \-w16B0\fR" 4
 .IX Item "-w16 -w16B0"

-\&\s-1UTF16\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B (Big Endian / \s-1BOM\s0 \e$BL5$7\e(B)
+\&\s-1UTF16\s0 \s-1XXXXXXXXX\s0 (Big Endian / \s-1BOM\s0 \s-1XX\s0)

 .IP "\fB\-w16B\fR" 4
 .IX Item "-w16B"
 .IP "\fB\-w16B\fR" 4
 .IX Item "-w16B"

-\&\s-1UTF16\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B (Big Endian / \s-1BOM\s0 \e$BM-$j\e(B)
+\&\s-1UTF16\s0 \s-1XXXXXXXXX\s0 (Big Endian / \s-1BOM\s0 \s-1XX\s0)

 .IP "\fB\-w16L\fR" 4
 .IX Item "-w16L"
 .IP "\fB\-w16L\fR" 4
 .IX Item "-w16L"

-\&\s-1UTF16\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B (Little Endian / \s-1BOM\s0 \e$BM-$j\e(B)
+\&\s-1UTF16\s0 \s-1XXXXXXXXX\s0 (Little Endian / \s-1BOM\s0 \s-1XX\s0)

 .IP "\fB\-w16L0\fR" 4
 .IX Item "-w16L0"
 .IP "\fB\-w16L0\fR" 4
 .IX Item "-w16L0"

-\&\s-1UTF16\s0 \e$B%3!<%I$r=PNO$9$k!#\e(B (Little Endian / \s-1BOM\s0 \e$BL5$7\e(B)
+\&\s-1UTF16\s0 \s-1XXXXXXXXX\s0 (Little Endian / \s-1BOM\s0 \s-1XX\s0)

 .RE
 .RS 4
 .RE
 .IP "\fB\-m[\s-1BQSN0\s0]\fR" 4
 .IX Item "-m[BQSN0]"
 .RE
 .RS 4
 .RE
 .IP "\fB\-m[\s-1BQSN0\s0]\fR" 4
 .IX Item "-m[BQSN0]"

-\&\s-1MIME\s0 \e$B$r2rFI$9$k!#\e(B(\e$B%G%U%)%k%H\e(B)
-\&\s-1ISO\-2022\-JP\s0 (B encode) \e$B$H\e(B \s-1ISO\-8859\-1\s0 (Q encode) \e$B$N$_$r2rFI$9$k!#\e(B
-\&\s-1ISO\-8859\-1\s0 (Latin\-1) \e$B$r2rFI$9$k;~$O!"\e(B\fB\-l\fR \e$B%U%i%0$bI,MW$G$"$k!#\e(B
-\&\fB\-m0\fR \e$B$G$O\e(B \s-1MIME\s0 \e$B$r2rFI$7$J$$!#\e(B
-\&\fB\-mB\fR, \fB\-mQ\fR \e$B$G$O!"\e(BBASE64, Q encode \e$B$5$l$F$$$k$b$N$H$7$F=hM}$9$k!#\e(B
+\&\s-1MIME\s0 \s-1XXXXXX\s0(\s-1XXXXX\s0)
+\&\s-1ISO\-2022\-JP\s0 (B encode) X \s-1ISO\-8859\-1\s0 (Q encode) \s-1XXXXXXXX\s0
+\&\s-1ISO\-8859\-1\s0 (Latin\-1) \s-1XXXXXXXX\s0\fB\-l\fR \s-1XXXXXXXXXX\s0
+\&\fB\-m0\fR \s-1XX\s0 \s-1MIME\s0 \s-1XXXXXXX\s0
+\&\fB\-mB\fR, \fB\-mQ\fR \s-1XXXBASE64\s0, Q encode \s-1XXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-mB\fR" 4
 .IX Item "-mB"
 .RS 4
 .IP "\fB\-mB\fR" 4
 .IX Item "-mB"

-\&\s-1MIME\s0 base64 stream \e$B$r2rFI$9$k!#\e(B
-\e$B%X%C%@$J$I$O<h$j=|$/$3$H!#\e(B
+\&\s-1MIME\s0 base64 stream \s-1XXXXXX\s0
+\&\s-1XXXXXXXXXXXXX\s0

 .IP "\fB\-mQ\fR" 4
 .IX Item "-mQ"
 .IP "\fB\-mQ\fR" 4
 .IX Item "-mQ"

-\&\s-1MIME\s0 quoted stream \e$B$r2rFI$9$k!#\e(B
+\&\s-1MIME\s0 quoted stream \s-1XXXXXX\s0

 .IP "\fB\-mS\fR" 4
 .IX Item "-mS"
 .IP "\fB\-mS\fR" 4
 .IX Item "-mS"

-\&\s-1MIME\s0 \e$B$N%A%'%C%/$r87$7$/$9$k\e(B (\e$B%G%U%)%k%H\e(B)
+\&\s-1MIME\s0 \s-1XXXXXXXXXXX\s0 (\s-1XXXXX\s0)

 .IP "\fB\-mN\fR" 4
 .IX Item "-mN"
 .IP "\fB\-mN\fR" 4
 .IX Item "-mN"

-\&\s-1MIME\s0 \e$B$N%A%'%C%/$r4K$/$9$k\e(B
+\&\s-1MIME\s0 \s-1XXXXXXXXXX\s0

 .IP "\fB\-m0\fR" 4
 .IX Item "-m0"
 .IP "\fB\-m0\fR" 4
 .IX Item "-m0"

-\&\s-1MIME\s0 \e$B$r2rFI$7$J$$!#\e(B
+\&\s-1MIME\s0 \s-1XXXXXXX\s0

 .RE
 .RS 4
 .Sp
 .RE
 .RS 4
 .Sp

-\&\fB\-mS\fR \e$B$O!"@k8@$NFbMF$H!"$=$N8e$KB3$/\e(B encoded-text \e$B$N@09g@-$r%A%'%C%/$9$k!#\e(B
-\&\fB\-mN\fR \e$B$O!"2~9T$G@Z$i$l$?\e(B \s-1MIME\s0 \e$B$J$I$b2rFI$9$k!#2rFI$,;_$^$i$J$$$3$H$b$"$k!#\e(B
+\&\fB\-mS\fR \s-1XXXXXXXXXXXXXXX\s0 encoded-text \s-1XXXXXXXXXXXX\s0
+\&\fB\-mN\fR \s-1XXXXXXXXX\s0 \s-1MIME\s0 \s-1XXXXXXXXXXXXXXXXXXXXXX\s0

 .RE
 .IP "\fB\-M[\s-1BQ\s0]\fR" 4
 .IX Item "-M[BQ]"
 .RE
 .IP "\fB\-M[\s-1BQ\s0]\fR" 4
 .IX Item "-M[BQ]"

-\&\s-1MIME\s0 \e$B$KJQ49$9$k!#\e(B
+\&\s-1MIME\s0 \s-1XXXXXX\s0

 .RS 4
 .IP "\fB\-M\fR" 4
 .IX Item "-M"
 .RS 4
 .IP "\fB\-M\fR" 4
 .IX Item "-M"

-\e$B%X%C%@7A<0$KJQ49$9$k\e(B
+\&\s-1XXXXXXXXXX\s0

 .IP "\fB\-MB\fR" 4
 .IX Item "-MB"
 .IP "\fB\-MB\fR" 4
 .IX Item "-MB"

-base64 stream \e$B$KJQ49$9$k\e(B
+base64 stream \s-1XXXXX\s0

 .IP "\fB\-MQ\fR" 4
 .IX Item "-MQ"
 .IP "\fB\-MQ\fR" 4
 .IX Item "-MQ"

-Quoted stream \e$B$KJQ49$9$k\e(B
+Quoted stream \s-1XXXXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-J \-E \-S \-W\fR" 4
 .IX Item "-J -E -S -W"
 .RE
 .RS 4
 .RE
 .IP "\fB\-J \-E \-S \-W\fR" 4
 .IX Item "-J -E -S -W"

-\e$B4|BT$5$l$kF~NO%3!<%I$N@-<A$r;XDj$9$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-J\fR" 4
 .IX Item "-J"
 .RS 4
 .IP "\fB\-J\fR" 4
 .IX Item "-J"

-\&\s-1ISO\-2022\-JP\s0 \e$B$r2>Dj$9$k!#\e(B
+\&\s-1ISO\-2022\-JP\s0 \s-1XXXXXX\s0

 .IP "\fB\-E\fR" 4
 .IX Item "-E"
 .IP "\fB\-E\fR" 4
 .IX Item "-E"

-\e$BF|K\8l\e(B \s-1EUC\s0 (\s-1AT&T\s0) \e$B$r2>Dj$9$k!#\e(B
+\&\s-1XXX\s0 \s-1EUC\s0 (\s-1AT&T\s0) \s-1XXXXXX\s0

 .IP "\fB\-S\fR" 4
 .IX Item "-S"
 .IP "\fB\-S\fR" 4
 .IX Item "-S"

-Shift_JIS \e$B$r2>Dj$9$k!#\e(B
-\e$B$$$o$f$kH>3Q%+%J\e(B (\s-1JIS\s0 X 0201 \e$BJR2>L>\e(B) \e$B$b<u$1F~$l$k!#\e(B
+Shift_JIS \s-1XXXXXX\s0
+\&\s-1XXXXXXXX\s0 (\s-1JIS\s0 X 0201 \s-1XXX\s0) \s-1XXXXXXX\s0

 .IP "\fB\-W\fR" 4
 .IX Item "-W"
 .IP "\fB\-W\fR" 4
 .IX Item "-W"

-\&\s-1UTF\-8\s0 \e$B$r2>Dj$9$k!#\e(B
+\&\s-1UTF\-8\s0 \s-1XXXXXX\s0

 .IP "\fB\-W8\fR" 4
 .IX Item "-W8"
 .IP "\fB\-W8\fR" 4
 .IX Item "-W8"

-\&\s-1UTF\-8\s0 \e$B$r2>Dj$9$k!#\e(B
+\&\s-1UTF\-8\s0 \s-1XXXXXX\s0

 .IP "\fB\-W16\fR" 4
 .IX Item "-W16"
 .IP "\fB\-W16\fR" 4
 .IX Item "-W16"

-\&\s-1UTF\-16\s0 (Little Endian)\e$B$r2>Dj$9$k!#\e(B
+\&\s-1UTF\-16\s0 (Little Endian)XXXXXX

 .IP "\fB\-W16B\fR" 4
 .IX Item "-W16B"
 .IP "\fB\-W16B\fR" 4
 .IX Item "-W16B"

-\&\s-1UTF\-16\s0 (Big Endian)\e$B$r2>Dj$9$k!#\e(B
+\&\s-1UTF\-16\s0 (Big Endian)XXXXXX

 .IP "\fB\-W16L\fR" 4
 .IX Item "-W16L"
 .IP "\fB\-W16L\fR" 4
 .IX Item "-W16L"

-\&\s-1UTF\-16\s0 (Little Endian)\e$B$r2>Dj$9$k!#\e(B
+\&\s-1UTF\-16\s0 (Little Endian)XXXXXX

 .RE
 .RS 4
 .RE
 .IP "\fB\-x\fR" 4
 .IX Item "-x"
 .RE
 .RS 4
 .RE
 .IP "\fB\-x\fR" 4
 .IX Item "-x"

-\e$BDL>o$*$3$J$o$l$k!"$$$o$f$kH>3Q%+%J\e(B (\s-1JIS\s0 X 0201 \e$BJR2>L>\e(B)
-\e$B$+$i$$$o$f$kA43Q%+%J\e(B (\s-1JIS\s0 X 0208 \e$BJR2>L>\e(B) \e$B$X$NJQ49$r9T$o$:!"H>3Q%+%J$rJ]B8$9$k!#\e(B
-\e$BF~NO$O!"\e(BShift_JIS \e$B$N\e(B 1byte \e$B%+%J!"\e(BSO/SI\e$B!"\e(BESC\-(\-I, \s-1SSO\s0 \e$B$r<u$1IU$1$k!#\e(B
-\e$B=PNO$O!"F|K\8l\e(B \s-1EUC\s0 \e$BCf$G$O\e(B SSO\e$B!"\e(BJIS \e$B%3!<%ICf$G$O\e(B \s-1ESC\-\s0(\-I \e$B$r%G%U%)%k%H$GMQ$$$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXX\s0 (\s-1JIS\s0 X 0201 \s-1XXX\s0)
+\&\s-1XXXXXXXXXX\s0 (\s-1JIS\s0 X 0208 \s-1XXX\s0) \s-1XXXXXXXXXXXXXXXXXXX\s0
+XXXXShift_JIS X 1byte \s-1XXXSO/SIXESC\-\s0(\-I, \s-1SSO\s0 \s-1XXXXXXX\s0
+\&\s-1XXXXXXX\s0 \s-1EUC\s0 \s-1XXX\s0 \s-1SSOXJIS\s0 \s-1XXXXXX\s0 \s-1ESC\-\s0(\-I \s-1XXXXXXXXXXX\s0

 .IP "\fB\-X\fR" 4
 .IX Item "-X"
 .IP "\fB\-X\fR" 4
 .IX Item "-X"

-\e$B$$$o$f$kH>3Q%+%J\e(B (\s-1JIS\s0 X 0201 \e$BJR2>L>\e(B) \e$B$r\e(B \e$B$$$o$f$kA43Q%+%J\e(B (\s-1JIS\s0 X 0208 \e$BJR2>L>\e(B) \e$B$X$HJQ49$9$k!#\e(B
+\&\s-1XXXXXXXX\s0 (\s-1JIS\s0 X 0201 \s-1XXX\s0) X \s-1XXXXXXXX\s0 (\s-1JIS\s0 X 0208 \s-1XXX\s0) \s-1XXXXXXX\s0

 .IP "\fB\-B\fR" 4
 .IX Item "-B"
 .IP "\fB\-B\fR" 4
 .IX Item "-B"

-\e$B2u$l$?\e(B (Broken) \s-1JIS\s0 \e$B%3!<%I!#\e(B
-\&\s-1ESC\s0 \e$B$,$J$/$J$C$?$H2>Dj$9$k!#\e(B
+\&\s-1XXX\s0 (Broken) \s-1JIS\s0 \s-1XXXX\s0
+\&\s-1ESC\s0 \s-1XXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-B1\fR" 4
 .IX Item "-B1"
 .RS 4
 .IP "\fB\-B1\fR" 4
 .IX Item "-B1"

-\&\fB\s-1ESC\-\s0(\fR, \fB\s-1ESC\-$\s0\fR \e$B$N$"$H$N%3!<%I$rLd$o$J$$\e(B
+\&\fB\s-1ESC\-\s0(\fR, \fB\s-1ESC\-$\s0\fR \s-1XXXXXXXXXXXX\s0

 .IP "\fB\-B2\fR" 4
 .IX Item "-B2"
 .IP "\fB\-B2\fR" 4
 .IX Item "-B2"

-\e$B2~9T$N$"$H$K6/@)E*$K\e(B \s-1ASCII\s0 \e$B$KLa$9\e(B
+\&\s-1XXXXXXXXXX\s0 \s-1ASCII\s0 \s-1XXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-f\fR[\fIm\fR[\-\fIn\fR]]" 4
 .IX Item "-f[m[-n]]"
 .RE
 .RS 4
 .RE
 .IP "\fB\-f\fR[\fIm\fR[\-\fIn\fR]]" 4
 .IX Item "-f[m[-n]]"

-\e$B0l9T\e(B \fIm\fR \e$BJ8;z$K$J$k$h$&$K!"%^!<%8%s$r\e(B \fIn\fR \e$B$H$7$F4JC1$J@07A$r$*$3$J$&!#\e(B
-\e$B%G%U%)%k%H$OJ8;z?t$O\e(B 60\e$B!"%^!<%8%s$O\e(B 10 \e$B$G$"$k!#\e(B
+\&\s-1XX\s0 \fIm\fR \s-1XXXXXXXXXXXXXX\s0 \fIn\fR \s-1XXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXX\s0 60XXXXXX 10 \s-1XXXX\s0

 .IP "\fB\-Z[0\-3]\fR" 4
 .IX Item "-Z[0-3]"
 .IP "\fB\-Z[0\-3]\fR" 4
 .IX Item "-Z[0-3]"

-\&\s-1JIS\s0 X 0208 \e$B1Q?t;z$H<c43$N5-9f$r\e(B \s-1ASCII\s0 \e$B$KJQ49$9$k!#\e(B
-\e$B$D$^$j!"A43Q$rH>3Q$KJQ49$9$k!#\e(B
+\&\s-1JIS\s0 X 0208 \s-1XXXXXXXXXX\s0 \s-1ASCII\s0 \s-1XXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-Z \-Z0\fR" 4
 .IX Item "-Z -Z0"
 Convert X0208 alphabet to \s-1ASCII\s0.
 .IP "\fB\-Z1\fR" 4
 .IX Item "-Z1"
 .RS 4
 .IP "\fB\-Z \-Z0\fR" 4
 .IX Item "-Z -Z0"
 Convert X0208 alphabet to \s-1ASCII\s0.
 .IP "\fB\-Z1\fR" 4
 .IX Item "-Z1"

-\&\s-1JIS\s0 X 0208 \e$BOB;z4V3V$r\e(B \s-1ASCII\s0 space \e$B0l$D$KJQ49$9$k!#\e(B
+\&\s-1JIS\s0 X 0208 \s-1XXXXX\s0 \s-1ASCII\s0 space \s-1XXXXXXXX\s0

 .IP "\fB\-Z2\fR" 4
 .IX Item "-Z2"
 .IP "\fB\-Z2\fR" 4
 .IX Item "-Z2"

-\&\s-1JIS\s0 X 0208 \e$BOB;z4V3V$r\e(B \s-1ASCII\s0 space \e$BFs$D$KJQ49$9$k!#\e(B
+\&\s-1JIS\s0 X 0208 \s-1XXXXX\s0 \s-1ASCII\s0 space \s-1XXXXXXXX\s0

 .IP "\fB\-Z3\fR" 4
 .IX Item "-Z3"
 .IP "\fB\-Z3\fR" 4
 .IX Item "-Z3"

-\e$B!d!"!c!"!I!"!u!"$r\e(B &gt;\e$B!"\e(B&lt;\e$B!"\e(B&quot;\e$B!"\e(B&amp; \e$B$KJQ49$9$k!#\e(B
+\&\s-1XXXXXXXXX\s0 &gt;X&lt;X&quot;X&amp; \s-1XXXXXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-b\fR" 4
 .IX Item "-b"
 .RE
 .RS 4
 .RE
 .IP "\fB\-b\fR" 4
 .IX Item "-b"

-\e$B%P%C%U%!%j%s%0=PNO$r9T$&!#\e(B(\e$B%G%U%)%k%H\e(B)
+\&\s-1XXXXXXXXXXXXX\s0(\s-1XXXXX\s0)

 .IP "\fB\-u\fR" 4
 .IX Item "-u"
 .IP "\fB\-u\fR" 4
 .IX Item "-u"

-\e$B=PNO;~$K!"%P%C%U%!%j%s%0$7$J$$!#\e(B
-ssh localhost | nkf \-u \e$B$H$$$&$h$&$K;H$&!#\e(B
+\&\s-1XXXXXXXXXXXXXXXX\s0
+ssh localhost | nkf \-u \s-1XXXXXXXXX\s0

 .IP "\fB\-t\fR" 4
 .IX Item "-t"
 .IP "\fB\-t\fR" 4
 .IX Item "-t"

-\e$B2?$b$7$J$$!#\e(B
+\&\s-1XXXXXX\s0

 .IP "\fB\-I\fR" 4
 .IX Item "-I"
 .IP "\fB\-I\fR" 4
 .IX Item "-I"

-\&\s-1ISO\-2022\-JP\s0 \e$B0J30$N4A;z%3!<%I$r".$KJQ49!#\e(B
+\&\s-1ISO\-2022\-JP\s0 \s-1XXXXXXXXXXXXXX\s0

 .IP "\fB\-i[@B]\fR" 4
 .IX Item "-i[@B]"
 .IP "\fB\-i[@B]\fR" 4
 .IX Item "-i[@B]"

-\&\s-1JIS\s0 \e$B4A;z$r;X<($9$k%7!<%1%s%9$r;XDj$9$k!#\e(B
+\&\s-1JIS\s0 \s-1XXXXXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"
 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"

-\&\s-1JIS\s0 X 0208\-1978 \e$B$rMQ$$$k!#\e(B
+\&\s-1JIS\s0 X 0208\-1978 \s-1XXXXX\s0

 .IP "\fB\-iB\fR" 4
 .IX Item "-iB"
 .IP "\fB\-iB\fR" 4
 .IX Item "-iB"

-\&\s-1JIS\s0 X 0208\-1983/1990 \e$B$rMQ$$$k!#\e(B
+\&\s-1JIS\s0 X 0208\-1983/1990 \s-1XXXXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-o[\s-1BJH\s0]\fR" 4
 .IX Item "-o[BJH]"
 .RE
 .RS 4
 .RE
 .IP "\fB\-o[\s-1BJH\s0]\fR" 4
 .IX Item "-o[BJH]"

-1 \e$B%P%$%H1Q?tJ8;z%;%C%H$r;X<($9$k%7!<%1%s%9$r;XDj$9$k!#\e(B
+1 \s-1XXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-oB\fR" 4
 .IX Item "-oB"
 .RS 4
 .IP "\fB\-oB\fR" 4
 .IX Item "-oB"

-1 \e$B%P%$%H1Q?tJ8;z%;%C%H$H$7$F\e(B US-ASCII \e$B$rMQ$$$k!#\e(B
+1 \s-1XXXXXXXXXXXXX\s0 US-ASCII \s-1XXXXX\s0

 .IP "\fB\-oJ\fR" 4
 .IX Item "-oJ"
 .IP "\fB\-oJ\fR" 4
 .IX Item "-oJ"

-1 \e$B%P%$%H1Q?tJ8;z%;%C%H$H$7$F\e(B \s-1JIS\s0 X 0201 Roman \e$B$rMQ$$$k!#\e(B
+1 \s-1XXXXXXXXXXXXX\s0 \s-1JIS\s0 X 0201 Roman \s-1XXXXX\s0

 .IP "\fB\-oH\fR" 4
 .IX Item "-oH"
 .IP "\fB\-oH\fR" 4
 .IX Item "-oH"

-\&\s-1ESC\s0 ( H \e$B$O=i4|$N\e(B \s-1JUNET\s0 \e$B%3!<%I$G$N$_MQ$$$i$l$?$b$N$G!"8=:_$O;H$C$F$O$J$i$J$$!#\e(B
+\&\s-1ESC\s0 ( H \s-1XXXX\s0 \s-1JUNET\s0 \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-r\fR" 4
 .IX Item "-r"
 .RE
 .RS 4
 .RE
 .IP "\fB\-r\fR" 4
 .IX Item "-r"

-\&\s-1ROT13/47\s0 \e$B$NJQ49$r$9$k!#\e(B
+\&\s-1ROT13/47\s0 \s-1XXXXXXX\s0

 .IP "\fB\-g\fR" 4
 .IX Item "-g"
 .IP "\fB\-g\fR" 4
 .IX Item "-g"

-\e$B<+F0H=JL$N7k2L$r=PNO$7$^$9!#\e(B
+\&\s-1XXXXXXXXXXXXXX\s0

 .IP "\fB\-T\fR" 4
 .IX Item "-T"
 .IP "\fB\-T\fR" 4
 .IX Item "-T"

-\e$B%F%-%9%H%b!<%I$G=PNO$9$k!#\e(B(\s-1MS\-DOS\s0 \e$B>e$G$N$_8zNO$r;}$D\e(B)
+\&\s-1XXXXXXXXXXXXX\s0(\s-1MS\-DOS\s0 \s-1XXXXXXXXX\s0)

 .IP "\fB\-l\fR" 4
 .IX Item "-l"
 .IP "\fB\-l\fR" 4
 .IX Item "-l"

-0x80\-0xfe \e$B$N%3!<%I$r\e(B \s-1ISO\-8859\-1\s0 (Latin\-1) \e$B$H$7$F07$&!#\e(B
-\&\s-1JIS\s0 \e$B%3!<%I%"%&%H%W%C%H$H$NAH9g$;$_$N$_M-8z!#\e(B
-\&\fB\-s, \-e, \-x\fR \e$B$H$ON>N)$7$J$$!#\e(B
+0x80\-0xfe \s-1XXXXX\s0 \s-1ISO\-8859\-1\s0 (Latin\-1) \s-1XXXXXX\s0
+\&\s-1JIS\s0 \s-1XXXXXXXXXXXXXXXXXXXX\s0
+\&\fB\-s, \-e, \-x\fR \s-1XXXXXXXX\s0

 .IP "\fB\-O\fR" 4
 .IX Item "-O"
 .IP "\fB\-O\fR" 4
 .IX Item "-O"

-\e$B%U%!%$%k$K=PNO$9$k!#\e(B
-\&\s-1UNIX\s0 \e$B$G$OITMW$J5!G=$@$,\e(B Windows \e$B$d\e(B \s-1MSDOS\s0 \e$B$G$OI,MW$i$7$$!#\e(B
-\e$BD>8e$N0z$-?t$G$J$/!":G8e$N%U%!%$%kL>$,=PNO%U%!%$%kL>$H$J$j>e=q$-$5$l$F$7$^$&$N$GCm0U!#\e(B
-\e$B%U%!%$%kL>$,$J$$>l9g$O\e(B nkf.out\e$B!#\e(B
+\&\s-1XXXXXXXXXX\s0
+\&\s-1UNIX\s0 \s-1XXXXXXXXX\s0 Windows X \s-1MSDOS\s0 \s-1XXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXX\s0 nkf.outX

 .IP "\fB\-L[uwm] \-d \-c\fR" 4
 .IX Item "-L[uwm] -d -c"
 .IP "\fB\-L[uwm] \-d \-c\fR" 4
 .IX Item "-L[uwm] -d -c"

-\e$B2~9T%3!<%I$rJQ49$9$k!#\e(B
+\&\s-1XXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\-Lu \-d\fR" 4
 .IX Item "-Lu -d"
 .RS 4
 .IP "\fB\-Lu \-d\fR" 4
 .IX Item "-Lu -d"


@@ -389,171 +388,171 @@ mac (\s-1CR\s0)
 .RE
 .RS 4
 .Sp
 .RE
 .RS 4
 .Sp

-\e$B%G%U%)%k%H$G$OJQ49$7$J$$!#\e(B
+\&\s-1XXXXXXXXXXXXX\s0

 .RE
 .IP "\fB\-\-ic=<input_codeset\fR \-\-oc=<output_codeset>>" 4
 .IX Item "--ic=<input_codeset --oc=<output_codeset>>"
 .RE
 .IP "\fB\-\-ic=<input_codeset\fR \-\-oc=<output_codeset>>" 4
 .IX Item "--ic=<input_codeset --oc=<output_codeset>>"

-\e$BF~NO!&=PNO$N4A;z%3!<%I7O$r;XDj$7$^$9!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXX\s0

 .RS 4
 .IP "\fB\s-1ISO\-2022\-JP\s0\fR" 4
 .IX Item "ISO-2022-JP"
 .RS 4
 .IP "\fB\s-1ISO\-2022\-JP\s0\fR" 4
 .IX Item "ISO-2022-JP"

-\e$B$$$o$f$k\e(B \s-1JIS\s0 \e$B%3!<%I!#\e(B\fB\-j, \-J\fR \e$B$HF1$8!#\e(B
+\&\s-1XXXX\s0 \s-1JIS\s0 \s-1XXXX\s0\fB\-j, \-J\fR \s-1XXXX\s0

 .IP "\fB\s-1ISO\-2022\-JP\-1\s0\fR" 4
 .IX Item "ISO-2022-JP-1"
 .IP "\fB\s-1ISO\-2022\-JP\-1\s0\fR" 4
 .IX Item "ISO-2022-JP-1"

-\&\s-1RFC\s0 2237 \e$B$KDj$a$i$l$?7A<0!#\e(B \s-1JIS\s0 X 0212 \e$B$r4^$`!#\e(B
+\&\s-1RFC\s0 2237 \s-1XXXXXXXXX\s0 \s-1JIS\s0 X 0212 \s-1XXXX\s0

 .IP "\fB\s-1ISO\-2022\-JP\-3\s0\fR" 4
 .IX Item "ISO-2022-JP-3"
 .IP "\fB\s-1ISO\-2022\-JP\-3\s0\fR" 4
 .IX Item "ISO-2022-JP-3"

-\&\s-1RFC\s0 2237 \e$B$KDj$a$i$l$?7A<0!#\e(B \s-1JIS\s0 X 0213 \e$B$r4^$`!#\e(B
+\&\s-1RFC\s0 2237 \s-1XXXXXXXXX\s0 \s-1JIS\s0 X 0213 \s-1XXXX\s0

 .IP "\fBEUC-JP\fR" 4
 .IX Item "EUC-JP"
 .IP "\fBEUC-JP\fR" 4
 .IX Item "EUC-JP"

-\&\s-1EUC\s0 \e$B%3!<%I!#\e(B\fB\-e, \-E\fR \e$B$HF1$8!#\e(B
+\&\s-1EUC\s0 \s-1XXXX\s0\fB\-e, \-E\fR \s-1XXXX\s0

 .IP "\fB\s-1EUC\-JISX0213\s0\fR" 4
 .IX Item "EUC-JISX0213"
 .IP "\fB\s-1EUC\-JISX0213\s0\fR" 4
 .IX Item "EUC-JISX0213"

-\e$BJ8;z=89g$K\e(B \s-1JIS\s0 X 0213:2000 \e$B$rMQ$$$?\e(B EUC\-JP\e$B!#\e(B
+\&\s-1XXXXX\s0 \s-1JIS\s0 X 0213:2000 \s-1XXXX\s0 EUC-JPX

 .IP "\fB\s-1EUC\-JIS\-2004\s0\fR" 4
 .IX Item "EUC-JIS-2004"
 .IP "\fB\s-1EUC\-JIS\-2004\s0\fR" 4
 .IX Item "EUC-JIS-2004"

-\e$BJ8;z=89g$K\e(B \s-1JIS\s0 X 0213:2004 \e$B$rMQ$$$?\e(B EUC\-JP\e$B!#\e(B
+\&\s-1XXXXX\s0 \s-1JIS\s0 X 0213:2004 \s-1XXXX\s0 EUC-JPX

 .IP "\fBeucJP-ascii\fR" 4
 .IX Item "eucJP-ascii"
 .IP "\fBeucJP-ascii\fR" 4
 .IX Item "eucJP-ascii"

-\e$B%*!<%W%s%0%k!<%WF|K\%Y%s%@6(5D2q$,Dj5A$7$?\e(B eucJP\-ascii\e$B!#\e(B
-\&\fB\-x\fR \e$B$,0EL[$N$&$A$K;XDj$5$l$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXXXX\s0 eucJP-asciiX
+\&\fB\-x\fR \s-1XXXXXXXXXXXXX\s0

 .IP "\fBeucJP-ms\fR" 4
 .IX Item "eucJP-ms"
 .IP "\fBeucJP-ms\fR" 4
 .IX Item "eucJP-ms"

-\e$B%*!<%W%s%0%k!<%WF|K\%Y%s%@6(5D2q$,Dj5A$7$?\e(B euc\-JPms\e$B!#\e(B
-\&\fB\-x\fR \e$B$,0EL[$N$&$A$K;XDj$5$l$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXXXX\s0 euc-JPmsX
+\&\fB\-x\fR \s-1XXXXXXXXXXXXX\s0

 .IP "\fB\s-1CP51932\s0\fR" 4
 .IX Item "CP51932"
 .IP "\fB\s-1CP51932\s0\fR" 4
 .IX Item "CP51932"

-Micorosft Code Page 51932\e$B!#\e(B
-\&\fB\-x\fR \e$B$,0EL[$N$&$A$K;XDj$5$l$k!#\e(B
+Micorosft Code Page 51932X
+\&\fB\-x\fR \s-1XXXXXXXXXXXXX\s0

 .IP "\fBShift_JIS\fR" 4
 .IX Item "Shift_JIS"
 .IP "\fBShift_JIS\fR" 4
 .IX Item "Shift_JIS"

-Shift_JIS\e$B!#\e(B
-\&\fB\-s, \-S\fR \e$B$HF1$8!#\e(B
+Shift_JISX
+\&\fB\-s, \-S\fR \s-1XXXX\s0

 .IP "\fBShift_JISX0213\fR" 4
 .IX Item "Shift_JISX0213"
 .IP "\fBShift_JISX0213\fR" 4
 .IX Item "Shift_JISX0213"

-\e$BJ8;z=89g$K\e(B \s-1JIS\s0 X 0213:2000 \e$B$rMQ$$$?\e(B Shift_JIS\e$B!#\e(B
+\&\s-1XXXXX\s0 \s-1JIS\s0 X 0213:2000 \s-1XXXX\s0 Shift_JISX

 .IP "\fBShift_JIS\-2004\fR" 4
 .IX Item "Shift_JIS-2004"
 .IP "\fBShift_JIS\-2004\fR" 4
 .IX Item "Shift_JIS-2004"

-\e$BJ8;z=89g$K\e(B \s-1JIS\s0 X 0213:2004 \e$B$rMQ$$$?\e(B Shift_JIS\e$B!#\e(B
+\&\s-1XXXXX\s0 \s-1JIS\s0 X 0213:2004 \s-1XXXX\s0 Shift_JISX

 .IP "\fB\s-1CP932\s0\fR" 4
 .IX Item "CP932"
 .IP "\fB\s-1CP932\s0\fR" 4
 .IX Item "CP932"

-Micorosft Code Page 932\e$B!#\e(B
-\&\fB\-x\fR \e$B$,0EL[$N$&$A$K;XDj$5$l$k!#\e(B
+Micorosft Code Page 932X
+\&\fB\-x\fR \s-1XXXXXXXXXXXXX\s0

 .IP "\fB\s-1UTF\-8\s0 \s-1UTF\-8N\s0\fR" 4
 .IX Item "UTF-8 UTF-8N"
 .IP "\fB\s-1UTF\-8\s0 \s-1UTF\-8N\s0\fR" 4
 .IX Item "UTF-8 UTF-8N"

-\&\s-1BOM\s0 \e$BL5$7$N\e(B UTF\-8\e$B!#\e(B
-\&\fB\-w, \-W\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 \s-1UTF\-8X\s0
+\&\fB\-w, \-W\fR \s-1XXXX\s0

 .IP "\fB\s-1UTF\-8\-BOM\s0\fR" 4
 .IX Item "UTF-8-BOM"
 .IP "\fB\s-1UTF\-8\-BOM\s0\fR" 4
 .IX Item "UTF-8-BOM"

-\&\s-1BOM\s0 \e$BIU$-$N\e(B UTF\-8\e$B!#\e(B\fB\-w8\fR \e$B$^$?$O\e(B \fB\-W\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 \s-1UTF\-8X\s0\fB\-w8\fR \s-1XXX\s0 \fB\-W\fR \s-1XXXX\s0

 .IP "\fB\s-1UTF8\-MAC\s0\fR" 4
 .IX Item "UTF8-MAC"
 .IP "\fB\s-1UTF8\-MAC\s0\fR" 4
 .IX Item "UTF8-MAC"

-UTF8\-MAC\e$B!#8_49J,2r$5$l$?$R$i$,$J!&%+%?%+%JEy$r7k9g$7$^$9!#\e(B
-\e$BF~NO$N$_$NBP1~$G$9!#\e(B
+\&\s-1UTF8\-MACXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXX\s0

 .IP "\fB\s-1UTF\-16\s0 \s-1UTF\-16BE\-BOM\s0\fR" 4
 .IX Item "UTF-16 UTF-16BE-BOM"
 .IP "\fB\s-1UTF\-16\s0 \s-1UTF\-16BE\-BOM\s0\fR" 4
 .IX Item "UTF-16 UTF-16BE-BOM"

-\&\s-1BOM\s0 \e$BM-$j$G\e(B Big Endian \e$B$N\e(B UTF\-16\e$B!#\e(B
-\&\fB\-w16B, \-W16B\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 Big Endian X \s-1UTF\-16X\s0
+\&\fB\-w16B, \-W16B\fR \s-1XXXX\s0

 .IP "\fB\s-1UTF\-16BE\s0\fR" 4
 .IX Item "UTF-16BE"
 .IP "\fB\s-1UTF\-16BE\s0\fR" 4
 .IX Item "UTF-16BE"

-\&\s-1BOM\s0 \e$BL5$7$G\e(B Big Endian \e$B$N\e(B UTF\-16\e$B!#\e(B
-\&\fB\-w16B0. \-W16B\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 Big Endian X \s-1UTF\-16X\s0
+\&\fB\-w16B0. \-W16B\fR \s-1XXXX\s0

 .IP "\fB\s-1UTF\-16LE\-BOM\s0\fR" 4
 .IX Item "UTF-16LE-BOM"
 .IP "\fB\s-1UTF\-16LE\-BOM\s0\fR" 4
 .IX Item "UTF-16LE-BOM"

-\&\s-1BOM\s0 \e$BM-$j$G\e(B Little Endian \e$B$N\e(B UTF\-16\e$B!#\e(B
-\&\fB\-w16L, \-W16L\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 Little Endian X \s-1UTF\-16X\s0
+\&\fB\-w16L, \-W16L\fR \s-1XXXX\s0

 .IP "\fB\s-1UTF\-16LE\s0\fR" 4
 .IX Item "UTF-16LE"
 .IP "\fB\s-1UTF\-16LE\s0\fR" 4
 .IX Item "UTF-16LE"

-\&\s-1BOM\s0 \e$BL5$7$G\e(B Little Endian \e$B$N\e(B UTF\-16\e$B!#\e(B
-\&\fB\-w16L0, \-W16L\fR \e$B$HF1$8!#\e(B
+\&\s-1BOM\s0 \s-1XXX\s0 Little Endian X \s-1UTF\-16X\s0
+\&\fB\-w16L0, \-W16L\fR \s-1XXXX\s0

 .RE
 .RS 4
 .RE
 .IP "\fB\-\-fj \-\-unix \-\-mac \-\-msdos  \-\-windows\fR" 4
 .IX Item "--fj --unix --mac --msdos  --windows"
 .RE
 .RS 4
 .RE
 .IP "\fB\-\-fj \-\-unix \-\-mac \-\-msdos  \-\-windows\fR" 4
 .IX Item "--fj --unix --mac --msdos  --windows"

-\e$B$3$l$i$N%7%9%F%`$KE,$7$?JQ49$r$7$^$9!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXX\s0

 .IP "\fB\-\-jis \-\-euc \-\-sjis \-\-mime \-\-base64\fR" 4
 .IX Item "--jis --euc --sjis --mime --base64"
 .IP "\fB\-\-jis \-\-euc \-\-sjis \-\-mime \-\-base64\fR" 4
 .IX Item "--jis --euc --sjis --mime --base64"

-\e$BBP1~$9$kJQ49$r$7$^$9!#\e(B
+\&\s-1XXXXXXXXXXX\s0

 .IP "\fB\-\-hiragana \-\-katakana\fR" 4
 .IX Item "--hiragana --katakana"
 .IP "\fB\-\-hiragana \-\-katakana\fR" 4
 .IX Item "--hiragana --katakana"

-\e$BJ?2>L>!"JR2>L>JQ49\e(B
+\&\s-1XXXXXXXXX\s0

 .IP "\fB\-\-fb\-{skip, html, xml, perl, java, subchar}\fR" 4
 .IX Item "--fb-{skip, html, xml, perl, java, subchar}"
 .IP "\fB\-\-fb\-{skip, html, xml, perl, java, subchar}\fR" 4
 .IX Item "--fb-{skip, html, xml, perl, java, subchar}"

-Unicode \e$B$+$i\e(B Shift_JIS, \s-1EUC\-JP\s0, \s-1ISO\-2022\-JP\s0 \e$B$KJQ49$9$k:]$K!"JQ49$G$-$J$+$C$?J8;z$r$I$&07$&$+$r;XDj$G$-$^$9!#\e(B
+Unicode \s-1XX\s0 Shift_JIS, EUC-JP, \s-1ISO\-2022\-JP\s0 \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .IP "\fB\-\-prefix=\f(BIescape character\fB\f(BItarget character\fB..\fR" 4
 .IX Item "--prefix=escape charactertarget character.."
 .IP "\fB\-\-prefix=\f(BIescape character\fB\f(BItarget character\fB..\fR" 4
 .IX Item "--prefix=escape charactertarget character.."

-EUC-JP \e$B$+$i\e(B Shift_JIS \e$B$X$NJQ49$N:]!"\e(B2 \e$B%P%$%HL\\e(B
-\e$B$K8=$l$?J8;z$NA0$K%(%9%1!<%WJ8;z$r$D$1$k$3$H$,$G$-$^$9!#\e(B
-\e$B0z?t$N\e(B 1 \e$BJ8;zL\$,%(%9%1!<%WJ8;z!"\e(B2 \e$BJ8;zL\0J9_$K%(%9%1!<%W$5$l$k$Y$-J8;z$r;XDj$7$^$9!#\e(B
+EUC-JP \s-1XX\s0 Shift_JIS \s-1XXXXXXX2\s0 \s-1XXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXX\s0 1 \s-1XXXXXXXXXXXX2\s0 \s-1XXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .Sp
 .Sp

-\e$BNc$($P!"\e(B
+\&\s-1XXXX\s0

 .Sp
 .Sp

-\&\-\-prefix=\e$@ \e$B$H$9$k$H!"\e(BShift_JIS \e$B$N\e(B 2 \e$BJ8;zL\$K\e(B $ \e$B$+\e(B @ \e$B$,Mh$?$i!"$=$NA0$K\e(B \e \e$B$,A^F~$5$l$^$9\e(B
-\&\-\-prefix=@@ \e$B$H$9$k$H!"\e(BShift_JIS \e$B$N\e(B 2 \e$BJ8;zL\$K\e(B @ \e$B$,Mh$?$i!"$=$NA0$K\e(B @ \e$B$,A^F~$5$l$^$9\e(B
+\&\-\-prefix=\e$@ XXXXXShift_JIS X 2 \s-1XXXX\s0 $ X @ \s-1XXXXXXXXX\s0 \e \s-1XXXXXXX\s0
+\&\-\-prefix=@@ XXXXXShift_JIS X 2 \s-1XXXX\s0 @ \s-1XXXXXXXXX\s0 @ \s-1XXXXXXX\s0

 .IP "\fB\-\-no\-cp932ext\fR" 4
 .IX Item "--no-cp932ext"
 .IP "\fB\-\-no\-cp932ext\fR" 4
 .IX Item "--no-cp932ext"

-\&\s-1CP932\s0 \e$B$K$*$$$F3HD%$5$l$?!"\e(BNEC \e$BFC<lJ8;z!"\e(BNEC \e$BA*Dj\e(B \s-1IBM\s0 \e$B3HD%J8;z\e(B (89\-92 \e$B6h\e(B)\e$B!"\e(BIBM \e$B3HD%J8;z$rJQ49$7$^$;$s!#\e(B
+\&\s-1CP932\s0 \s-1XXXXXXXXXXNEC\s0 \s-1XXXXXNEC\s0 \s-1XX\s0 \s-1IBM\s0 \s-1XXXX\s0 (89\-92 X)XIBM \s-1XXXXXXXXXXXX\s0

 .IP "\fB\-\-no\-best\-fit\-chars\fR" 4
 .IX Item "--no-best-fit-chars"
 .IP "\fB\-\-no\-best\-fit\-chars\fR" 4
 .IX Item "--no-best-fit-chars"

-Unicode \e$B$+$i$NJQ49$N:]$K!"1}I|0BA4@-$,3NJ]$5$l$J$$J8;z$NJQ49$r9T$$$^$;$s!#\e(B
-Unicode \e$B$+$i\e(B Unicode \e$B$NJQ49$N:]$K\e(B \-x \e$B$H6&$K;XDj$9$k$H!"\e(Bnkf \e$B$r\e(B \s-1UTF\s0 \e$B7A<0$NJQ49$KMQ$$$k$3$H$,$G$-$^$9!#\e(B
-(\e$B5U$K8@$($P!"$3$l$r;XDj$7$J$$$H0lIt$NJ8;z$,J]B8$5$l$^$;$s\e(B)
+Unicode \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+Unicode \s-1XX\s0 Unicode \s-1XXXXXX\s0 \-x XXXXXXXXXnkf X \s-1UTF\s0 \s-1XXXXXXXXXXXXXXXXX\s0
+(\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0)

 .Sp
 .Sp

-\e$B%Q%9$K4X$o$kJ8;zNs$rJQ49$9$k:]$K$O!"$3$N%*%W%7%g%s$r;XDj$9$k$3$H$r6/$/?d>)$7$^$9!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .IP "\fB\-\-cap\-input, \-\-url\-input\fR" 4
 .IX Item "--cap-input, --url-input"
 .IP "\fB\-\-cap\-input, \-\-url\-input\fR" 4
 .IX Item "--cap-input, --url-input"

-\e$B$=$l$>$l\e(B :\e$B!"\e(B% \e$B$KB3$/\e(B 16 \e$B?J?t$rJ8;z$KJQ49$9$k\e(B
+\&\s-1XXXX\s0 :X% \s-1XXX\s0 16 \s-1XXXXXXXXXX\s0

 .IP "\fB\-\-numchar\-input\fR" 4
 .IX Item "--numchar-input"
 .IP "\fB\-\-numchar\-input\fR" 4
 .IX Item "--numchar-input"

-&#....; \e$B$N$h$&$J\e(B Unicode \e$BJ8;z;2>H$rJQ49$9$k\e(B
+&#....; \s-1XXXX\s0 Unicode \s-1XXXXXXXXX\s0

 .IP "\fB\-\-in\-place[=\f(BI\s-1SUFFIX\s0\fB]  \-\-overwrite[=\f(BI\s-1SUFFIX\s0\fB]\fR" 4
 .IX Item "--in-place[=SUFFIX]  --overwrite[=SUFFIX]"
 .IP "\fB\-\-in\-place[=\f(BI\s-1SUFFIX\s0\fB]  \-\-overwrite[=\f(BI\s-1SUFFIX\s0\fB]\fR" 4
 .IX Item "--in-place[=SUFFIX]  --overwrite[=SUFFIX]"

-\e$B85$N%U%!%$%k$rJQ497k2L$GCV$-49$($k!#\e(B
-\e$BJ#?t$N%U%!%$%k$r=q$-49$($k$3$H$b2DG=!#\e(B
-\e$B85$N%U%!%$%k$N%?%$%`%9%?%s%W$H%Q!<%_%C%7%g%s$,J];}$5$l$k!#\e(B
-\e$B8=:_!":n@.F|;~$d\e(B inode \e$B$OJQ99$5$l$k$,!">-Mh$K$o$?$C$F$3$N<BAu$N$^$^$G$"$kJ]>Z$OL5$$!#\e(B
+\&\s-1XXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXX\s0 inode \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0

 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"
 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"

-\e$B<+F0H=JL$N7k2L$r=PNO$9$k\e(B
+\&\s-1XXXXXXXXXXXX\s0

 .IP "\fB\-\-help\fR" 4
 .IX Item "--help"
 .IP "\fB\-\-help\fR" 4
 .IX Item "--help"

-\e$B%3%^%s%I$N4JC1$J@bL@$rI=<($9$k!#\e(B
+\&\s-1XXXXXXXXXXXXXXXX\s0

 .IP "\fB\-V\fR" 4
 .IX Item "-V"
 .IP "\fB\-V\fR" 4
 .IX Item "-V"

-nkf \e$B$N@_Dj$rI=<($9$k!#\e(B
+nkf \s-1XXXXXXXXX\s0

 .IP "\fB\-v\fR \fB\-\-version\fR" 4
 .IX Item "-v --version"
 .IP "\fB\-v\fR \fB\-\-version\fR" 4
 .IX Item "-v --version"

-nkf \e$B$N%P!<%8%g%s$rI=<($9$k!#\e(B
+nkf \s-1XXXXXXXXXXXX\s0

 .IP "\fB\-\-\fR" 4
 .IX Item "--"
 .IP "\fB\-\-\fR" 4
 .IX Item "--"

-\e$B$3$l0J9_$N%*%W%7%g%s$rL5;k$9$k\e(B
+\&\s-1XXXXXXXXXXXXXXX\s0

 .IP "\fB\-\-exec\-in\fR" 4
 .IX Item "--exec-in"
 .IP "\fB\-\-exec\-in\fR" 4
 .IX Item "--exec-in"

-nkf [options] \-\-exec\-in cmd args... \e$B$H$d$k$H!"\e(Bcmd \e$B$N=PNO$r\e(B nkf \e$B$NF~NO$H$9$k\e(B
-(config.h \e$B$G\e(B \s-1EXEC_IO\s0 \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)
+nkf [options] \-\-exec\-in cmd args... XXXXXcmd \s-1XXXX\s0 nkf \s-1XXXXXX\s0
+(config.h X \s-1EXEC_IO\s0 X define \s-1XXXXXXXXXXXXXX\s0)

 .IP "\fB\-\-exec\-out\fR" 4
 .IX Item "--exec-out"
 .IP "\fB\-\-exec\-out\fR" 4
 .IX Item "--exec-out"

-nkf [options] \-\-exec\-out cmd args... \e$B$H$d$k$H!"\e(Bnkf \e$B$N=PNO$r\e(B cmd \e$B$NF~NO$H$9$k\e(B
-(config.h \e$B$G\e(B \s-1EXEC_IO\s0 \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)
+nkf [options] \-\-exec\-out cmd args... XXXXXnkf \s-1XXXX\s0 cmd \s-1XXXXXX\s0
+(config.h X \s-1EXEC_IO\s0 X define \s-1XXXXXXXXXXXXXX\s0)

 .SH "BUGS"
 .IX Header "BUGS"
 .SH "BUGS"
 .IX Header "BUGS"

-\e$B<B$O!"F~NO$N%3!<%I7O$NH=Dj$O!"\e(BShift_JIS \e$B$H\e(B \s-1EUC\s0 \e$B$H$N<+F0H=Dj$G$"$j!":G=i$KFCDj$G$-$kJ8;z$,Mh$?;~E@$G3NDj$7$F$7$^$&!#\e(B
-\e$B$=$7$F!"FCDjITG=$N4V$OJ]N1%P%C%U%!$K$?$a$F$*$+$l!"3NDj8e$K=hM}$5$l$k!#\e(B
-\e$B$3$N$?$a!"\e(B7 \e$B%S%C%H\e(B \s-1JIS\s0 \e$B$O>o$KG'<1$5$l$k!#\e(B
-Shift_JIS\e$B!"\e(BEUC \e$B:.9g$b$[$H$s$I$N>l9g$OLdBj$,$J$$!#\e(B
-\e$B$?$@$7!"\e(BShift_JIS \e$B$N$$$o$f$kH>3Q%+%J\e(B (\s-1JIS\s0 X 0201 \e$BJR2>L>\e(B) \e$B$H\e(B \s-1EUC\s0 \e$B4A;z$,<1JL$G$-$J$$!#\e(B
-\e$B$7$?$,$C$F!"%G%U%)%k%H$G$O\e(B Shift_JIS \e$B$N$$$o$f$kH>3Q%+%J$O$J$$$H2>Dj$7$F$$$k!#\e(B
-(\e$B$D$^$j!"\e(BShift_JIS \e$B$+\e(B \s-1EUC\s0 \e$B$+LB$C$?;~$O\e(B \s-1EUC\s0 \e$B$H$_$J$9\e(B)
+XXXXXXXXXXXXXXXShift_JIS X \s-1EUC\s0 \s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\s0
+\&\s-1XXXXX7\s0 \s-1XXX\s0 \s-1JIS\s0 \s-1XXXXXXXXX\s0
+Shift_JISXEUC \s-1XXXXXXXXXXXXXXXXX\s0
+XXXXShift_JIS \s-1XXXXXXXXX\s0 (\s-1JIS\s0 X 0201 \s-1XXX\s0) X \s-1EUC\s0 \s-1XXXXXXXXXX\s0
+\&\s-1XXXXXXXXXXXXX\s0 Shift_JIS \s-1XXXXXXXXXXXXXXXXXXXX\s0
+(XXXXShift_JIS X \s-1EUC\s0 \s-1XXXXXX\s0 \s-1EUC\s0 \s-1XXXX\s0)

 .PP
 .PP

-Unicode \e$B$NF|K\8l0J30$NItJ,$NJQ49$K$OBP1~$7$F$$$J$$$,!"\e(B\fB\-\-no\-best\-fit\-chars\fR \e$B$r;XDj$9$l$P!"\e(BUTF\-8 \e$B$H\e(B \s-1UTF\-16\s0 \e$B$NAj8_JQ49$r$9$k$3$H$O2DG=$G$"$k!#\e(B
+Unicode \s-1XXXXXXXXXXXXXXXXXXXXXXX\s0\fB\-\-no\-best\-fit\-chars\fR \s-1XXXXXXXUTF\-8\s0 X \s-1UTF\-16\s0 \s-1XXXXXXXXXXXXXXXXX\s0

 .SH "ACKNOWLEDGE"
 .IX Header "ACKNOWLEDGE"
 .SH "ACKNOWLEDGE"
 .IX Header "ACKNOWLEDGE"

-\e$B0J2<$N$+$?$,$?!"$I$&$b$"$j$,$H$&$4$6$$$^$7$?!#\e(B
-.Sh "nkf 1.4"
+\&\s-1XXXXXXXXXXXXXXXXXXXXXXX\s0
+.SS "nkf 1.4"

 .IX Subsection "nkf 1.4"
 morb@fujitsu, kiss@ayumi.stars.flab.fujitsu, cen122@flab.fujitsu,
 .IX Subsection "nkf 1.4"
 morb@fujitsu, kiss@ayumi.stars.flab.fujitsu, cen122@flab.fujitsu,

-yuki@flab.fujitsu \e$BB>!"\e(Bfujitsu & flab.fujitsu \e$B$N3'$5$s$N6(NO$K46<U!#\e(B
+yuki@flab.fujitsu XXfujitsu & flab.fujitsu \s-1XXXXXXXXXXX\s0

 shinoda@cs.titech, kato@cs.titech, uematsu@cs.titech  \s-1TNX\s0
 kono@ie.u\-ryukyu.ac.jp
 void@merope.pleiades.or.jp (Kusakabe Youichi)
 shinoda@cs.titech, kato@cs.titech, uematsu@cs.titech  \s-1TNX\s0
 kono@ie.u\-ryukyu.ac.jp
 void@merope.pleiades.or.jp (Kusakabe Youichi)


@@ -565,9 +564,10 @@ Kimihiko Sato <sato@sail.t.u\-tokyo.ac.jp>
 a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
 kono@ie.u\-ryukyu.ac.jp (Shinji Kono)
 GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
 kono@ie.u\-ryukyu.ac.jp (Shinji Kono)
 GHG00637@nifty\-serve.or.jp (\s-1COW\s0)

-.Sh "nkf 1.9\-"
+.SS "nkf 1.9\-"

 .IX Subsection "nkf 1.9-"
 .IX Subsection "nkf 1.9-"

-.IP "\e$B2OLn??<#\e(B" 4
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"

 .PD 0
 .IP "Akio Furukawa" 4
 .IX Item "Akio Furukawa"
 .PD 0
 .IP "Akio Furukawa" 4
 .IX Item "Akio Furukawa"


@@ -579,8 +579,8 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .IX Item "Fumitaka Kitagawa"
 .IP "Hiroaki Sengoku" 4
 .IX Item "Hiroaki Sengoku"
 .IX Item "Fumitaka Kitagawa"
 .IP "Hiroaki Sengoku" 4
 .IX Item "Hiroaki Sengoku"

-.IP "Ikuhiro \s-1MORITA\s0 (\e$B?9ED\e(B \e$B0i9(\e(B)" 4
-.IX Item "Ikuhiro MORITA (\e$B?9ED\e(B \e$B0i9(\e(B)"
+.IP "Ikuhiro \s-1MORITA\s0 (\s-1XX\s0 \s-1XX\s0)" 4
+.IX Item "Ikuhiro MORITA (XX XX)"

 .IP "Yoshiharu \s-1ITO\s0" 4
 .IX Item "Yoshiharu ITO"
 .IP "Junn Ohta" 4
 .IP "Yoshiharu \s-1ITO\s0" 4
 .IX Item "Yoshiharu ITO"
 .IP "Junn Ohta" 4


@@ -599,10 +599,10 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .IX Item "Kiwamu Aoyama"
 .IP "Koichi Hirayama" 4
 .IX Item "Koichi Hirayama"
 .IX Item "Kiwamu Aoyama"
 .IP "Koichi Hirayama" 4
 .IX Item "Koichi Hirayama"

-.IP "Mitsuru Hase (\e$BD9C+!!K~\e(B)" 4
-.IX Item "Mitsuru Hase (\e$BD9C+!!K~\e(B)"
-.IP "\s-1OHARA\s0 Shigeki (\e$BBg86\e(B \e$B=E<y\e(B)" 4
-.IX Item "OHARA Shigeki (\e$BBg86\e(B \e$B=E<y\e(B)"
+.IP "Mitsuru Hase (\s-1XXXX\s0)" 4
+.IX Item "Mitsuru Hase (XXXX)"
+.IP "\s-1OHARA\s0 Shigeki (\s-1XX\s0 \s-1XX\s0)" 4
+.IX Item "OHARA Shigeki (XX XX)"

 .IP "Rei \s-1FURUKAWA\s0" 4
 .IX Item "Rei FURUKAWA"
 .IP "Satoru Takabayashi" 4
 .IP "Rei \s-1FURUKAWA\s0" 4
 .IX Item "Rei FURUKAWA"
 .IP "Satoru Takabayashi" 4


@@ -619,65 +619,104 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .IX Item "TSUCHIYA Masatoshi"
 .IP "Tsutomu Sakai" 4
 .IX Item "Tsutomu Sakai"
 .IX Item "TSUCHIYA Masatoshi"
 .IP "Tsutomu Sakai" 4
 .IX Item "Tsutomu Sakai"

-.IP "\s-1YAMASHITA\s0 Junji (\e$B;32<\e(B \e$B=c;J\e(B)" 4
-.IX Item "YAMASHITA Junji (\e$B;32<\e(B \e$B=c;J\e(B)"
+.IP "\s-1YAMASHITA\s0 Junji (\s-1XX\s0 \s-1XX\s0)" 4
+.IX Item "YAMASHITA Junji (XX XX)"

 .IP "Yasuyuki Sato" 4
 .IX Item "Yasuyuki Sato"
 .IP "Yoshiaki Yanagihara" 4
 .IX Item "Yoshiaki Yanagihara"
 .IP "hat@so\-net" 4
 .IX Item "hat@so-net"
 .IP "Yasuyuki Sato" 4
 .IX Item "Yasuyuki Sato"
 .IP "Yoshiaki Yanagihara" 4
 .IX Item "Yoshiaki Yanagihara"
 .IP "hat@so\-net" 4
 .IX Item "hat@so-net"

-.IP "\e$B#D#C#C5;=QItEOJU\e(B" 4
-.IP "\e$B$+$H$Z\e(B / \e$B2CF#\e(B \e$B5.;J\e(B" 4
-.IP "\e$B$+$Y\e(Bdais" 4
-.IX Item "\e$B$+$Y\e(Bdais"
-.IP "\e$B$R$m$;\e(B \e$B$^$5$"$-\e(B" 4
-.IP "\e$B%$%s%H%i%M%C%H%7%9%F%`\e(B(\e$B3t\e(B)\e$B>>Hx\e(B" 4
-.IP "\e$B1-;tJ8IR\e(B" 4
-.IP "\e$B1v:j\e(B \e$B5#I'\e(B(\s-1SHIOZAKI\s0 Takehiko)" 4
-.IX Item "\e$B1v:j\e(B \e$B5#I'\e(B(SHIOZAKI Takehiko)"
-.IP "\e$B2OB<2mIW\e(B (Media Lab.)" 4
-.IX Item "\e$B2OB<2mIW\e(B (Media Lab.)"
-.IP "\e$B2OLn\e(B \e$B9/;J\e(B" 4
-.IP "\e$B4n@%!HE_G-!I9@!wFn9q2-Fl\e(B" 4
-.IP "\e$B6b0f\e(B \e$BCRI'\e(B" 4
-.IP "\e$B7KED\e(B \e$BM4;K\e(B (\e$B$+$D$i$@\e(B \e$B$^$5$7\e(B)" 4
-.IP "\e$B9b6659LA\e(B" 4
-.IP "\e$B9q5H\e(B" 4
-.IP "\e$B9u9>L@I'\e(B" 4
-.IP "\e$B;0Bp@5BY\e(B" 4
-.IP "\e$B;3AR\e(B \e$B??\e(B" 4
-.IP "\e$B;3K\\e(B \e$BK'?M\e(B" 4
-.IP "\e$B;3LnM5;J\e(B (\e$B$d$^$N$f$&$8\e(B)" 4
-.IP "\e$B=EB<K!9n\e(B" 4
-.IP "\e$B>.Eg4pLw\e(B" 4
-.IP "\e$B>eED!!7r\e(B" 4
-.IP "\e$B?70f\e(B \e$B9/;J\e(B (Koji Arai)" 4
-.IX Item "\e$B?70f\e(B \e$B9/;J\e(B (Koji Arai)"
-.IP "\e$B?9!!@i3(;R\e(B" 4
-.IP "\e$B?9!!OBI'\e(B" 4
-.IP "\e$B?eLn\e(B \e$B5.J8\e(B" 4
-.IP "\e$BA0COOB=S\e(B" 4
-.IP "\e$BCg=!:,!wJBNs?.Mj8&\e(B" 4
-.IP "\e$BCvC+\e(B \e$B1Q0lO:\e(B == Eiichiro Itani" 4
-.IX Item "\e$BCvC+\e(B \e$B1Q0lO:\e(B == Eiichiro Itani"
-.IP "\e$BF#86!!=(9T\e(B" 4
-.IP "\e$BH,ED\e(B \e$B??9T\e(B (Masayuki Hatta)" 4
-.IX Item "\e$BH,ED\e(B \e$B??9T\e(B (Masayuki Hatta)"
-.IP "\e$BHx@nIRLi\e(B" 4
-.IP "\e$BK>7n\e(B \e$B9';V\e(B" 4
-.IP "\e$BLZB<\e(B (\e$B!wC^GHBg3X?t3X8&5f2J\e(B)" 4
-.IP "\e$BLnB<=S>4\e(B" 4
-.IP "\e$BM-2,!w%_%N%k%?\e(B" 4
-.IP "\e$BM-Bt\e(B \e$BL@9(\e(B" 4
-.IP "\e$BMn9g0l4n\e(B" 4
-.IP "\e$BNS\e(B  \e$BN<\e(B" 4
-.IP "\e$BT"0B\e(B \e$B<#\e(B" 4
-.IP "\e$BLZ2<\e(B \e$BM:2p\e(B" 4
-.IP "\e$BEDCfN4M5\e(B" 4
-.IP "\e$BDaC+D><y\e(B" 4
-.IP "\e$BCfED?-1Y\e(B" 4
-.IP "\e$B$o$?$J$Y$R$m$U$_\e(B" 4
+.IP "\s-1XXXXXXXX\s0" 4
+.IX Item "XXXXXXXX"
+.IP "\s-1XXX\s0 / \s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XXX / XX XX"
+.IP "XXdais" 4
+.IX Item "XXdais"
+.IP "\s-1XXX\s0 \s-1XXXX\s0" 4
+.IX Item "XXX XXXX"
+.IP "\s-1XXXXXXXXXXX\s0(X)XX" 4
+.IX Item "XXXXXXXXXXX(X)XX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0 \s-1XX\s0(\s-1SHIOZAKI\s0 Takehiko)" 4
+.IX Item "XX XX(SHIOZAKI Takehiko)"
+.IP "\s-1XXXX\s0 (Media Lab.)" 4
+.IX Item "XXXX (Media Lab.)"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XXXXXXXXXXXX\s0" 4
+.IX Item "XXXXXXXXXXXX"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XX\s0 \s-1XX\s0 (\s-1XXXX\s0 \s-1XXX\s0)" 4
+.IX Item "XX XX (XXXX XXX)"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0" 4
+.IX Item "XX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0 X" 4
+.IX Item "XX X"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XXXX\s0 (\s-1XXXXXX\s0)" 4
+.IX Item "XXXX (XXXXXX)"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0 \s-1XX\s0 (Koji Arai)" 4
+.IX Item "XX XX (Koji Arai)"
+.IP "\s-1XXXXX\s0" 4
+.IX Item "XXXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXXXXXXX\s0" 4
+.IX Item "XXXXXXXXX"
+.IP "\s-1XX\s0 \s-1XXX\s0 == Eiichiro Itani" 4
+.IX Item "XX XXX == Eiichiro Itani"
+.IP "\s-1XXXXX\s0" 4
+.IX Item "XXXXX"
+.IP "\s-1XX\s0 \s-1XX\s0 (Masayuki Hatta)" 4
+.IX Item "XX XX (Masayuki Hatta)"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XX\s0 (\s-1XXXXXXXXXX\s0)" 4
+.IX Item "XX (XXXXXXXXXX)"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXXXXX\s0" 4
+.IX Item "XXXXXXX"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "X  X" 4
+.IX Item "X  X"
+.IP "\s-1XX\s0 X" 4
+.IX Item "XX X"
+.IP "\s-1XX\s0 \s-1XX\s0" 4
+.IX Item "XX XX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXX\s0" 4
+.IX Item "XXXX"
+.IP "\s-1XXXXXXXX\s0" 4
+.IX Item "XXXXXXXX"

 .IP "MoonWolf" 4
 .IX Item "MoonWolf"
 .IP "sava" 4
 .IP "MoonWolf" 4
 .IX Item "MoonWolf"
 .IP "sava" 4


@@ -685,14 +724,15 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .PD
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 .PD
 .SH "AUTHOR"
 .IX Header "AUTHOR"

-.IP "\e$B;T@n\e(B  \e$B;j\e(B        ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)" 4
-.IX Item "\e$B;T@n\e(B  \e$B;j\e(B        ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)"
+.IP "\s-1XX\s0  X        ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)" 4
+.IX Item "XX  X        ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)"

 .PD 0
 .PD 0

-.IP "\e$B2OLn\e(B  \e$B??<#\e(B      kono@ie.u\-ryukyu.acjp" 4
-.IX Item "\e$B2OLn\e(B  \e$B??<#\e(B      kono@ie.u-ryukyu.acjp"
+.IP "\s-1XX\s0  \s-1XX\s0      kono@ie.u\-ryukyu.acjp" 4
+.IX Item "XX  XX      kono@ie.u-ryukyu.acjp"

 .IP "Rei \s-1FURUKAWA\s0    furukawa@tcp\-ip.or.jp" 4
 .IX Item "Rei FURUKAWA    furukawa@tcp-ip.or.jp"
 .IP "Rei \s-1FURUKAWA\s0    furukawa@tcp\-ip.or.jp" 4
 .IX Item "Rei FURUKAWA    furukawa@tcp-ip.or.jp"

-.IP "\e$B@.@%\e(B" 4
+.IP "\s-1XX\s0" 4
+.IX Item "XX"

 .IP "mastodon" 4
 .IX Item "mastodon"
 .PD
 .IP "mastodon" 4
 .IX Item "mastodon"
 .PD


@@ -701,4 +741,4 @@ http://sourceforge.jp/projects/nkf/
 .PP
 Copyright (C) 1987, \s-1FUJITSU\s0 \s-1LTD\s0. (I.Ichikawa).
 .PP
 .PP
 Copyright (C) 1987, \s-1FUJITSU\s0 \s-1LTD\s0. (I.Ichikawa).
 .PP

-Copyright (C) 1996\-2009, The nkf Project.
+Copyright (C) 1996\-2013, The nkf Project.

diff --git a/nkf.c b/nkf.c
index b94afcb..ca3e438 100644 (file)
--- a/nkf.c
+++ b/nkf.c
@@ -21,7 +21,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #define NKF_VERSION "2.1.3"
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #define NKF_VERSION "2.1.3"

-#define NKF_RELEASE_DATE "2013-02-20"
+#define NKF_RELEASE_DATE "2013-11-22"

 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
     "Copyright (C) 1996-2013, The nkf Project."
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
     "Copyright (C) 1996-2013, The nkf Project."

diff --git a/nkf.doc b/nkf.doc
index c6ccd46..c78171a 100644 (file)
--- a/nkf.doc
+++ b/nkf.doc
@@ -5,22 +5,15 @@ SYNOPSIS
     nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [*file ...*]
 
 DESCRIPTION
     nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [*file ...*]
 
 DESCRIPTION

-    nkf
-    ¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¥á¡¼¥ë¤ä¥Ë¥å¡¼¥¹¤ÎÆɤ߽ñ¤­¤ò¤¹¤ë¤¿¤á¤Ëºî¤é¤ì¤¿¡¢´Á»ú¥³¡¼
-    ¥É¤ÎÊÑ´¹¥Õ¥£¥ë¥¿¤Ç¤¢¤ë¡£
+    nkf ¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¥á¡¼¥ë¤ä¥Ë¥å¡¼¥¹¤ÎÆɤ߽ñ¤­¤ò¤¹¤ë¤¿¤á¤Ëºî¤é¤ì¤¿¡¢´Á»ú¥³¡¼¥É¤ÎÊÑ´¹¥Õ¥£¥ë¥¿¤Ç¤¢¤ë¡£

 
     ¤³¤Înkf¤ÎÆÃħ¤È¤·¤Æ¤Ï¡¢ÆþÎÏ´Á»ú¥³¡¼¥É·Ï¤ÎÅý·×Ū¤Ê¼«Æ°Ç§¼±µ¡Ç½¤¬¤¢¤ë¡£
 
     ¤³¤Înkf¤ÎÆÃħ¤È¤·¤Æ¤Ï¡¢ÆþÎÏ´Á»ú¥³¡¼¥É·Ï¤ÎÅý·×Ū¤Ê¼«Æ°Ç§¼±µ¡Ç½¤¬¤¢¤ë¡£

-    ¤³¤Î¤¿¤á¡¢ÍøÍѼԤϡ¢ÆþÎÏ´Á»ú¥³¡¼¥É·Ï¤¬²¿¤Ç¤¢¤ë¤«¤òÃΤé¤Ê¤¯¤Æ¤â¡¢½ÐÎÏ´Á»ú
-    ¥³¡¼¥É·Ï¤Î¤ß»ØÄꤹ¤ì¤ÐÎɤ¤¤³¤È¤Ë¤Ê¤ë¡£
-    ¤¿¤À¡¢¤³¤ÎȽÄ굡¹½¤Ï¡¢ÍýÏÀŪ¤Ë¤Ï´°Á´¤Ç¤Ï¤Ê¤¤¤¬¡¢Ä̾ï¤Î¥Ë¥å¡¼¥¹¤ä¥á¡¼¥ë¤Î
-    ¥á¥Ã¥»¡¼¥¸¤Ë¤Ä¤¤¤Æ¤Ï³Î¼Â¤ËÆ°ºî¤¹¤ë°ÂÁ´¤Ê¤â¤Î¤Ë¤Ï¤Ê¤Ã¤Æ¤¤¤ë¡£
-
-    ¸½ºß¡¢nkf¤¬Ç§¼±¤Ç¤­¤ëÆþÎϤδÁ»ú¥³¡¼¥É·Ï¤Ï¡¢¤¤¤ï¤æ¤ë JIS ¥³¡¼¥É
-    (ISO-2022-JP ¤Ë´ð¤Å¤¯¤â¤Î)¡¢Shift_JIS (MS ´Á»ú¥³¡¼¥É)¡¢ ÆüËܸì EUC (AT&T
-    ¥³¡¼¥É)¡¢UTF-8¡¢UTF-16 ¤Î¤¤¤º¤ì¤«¤Ç¤¢¤ë¡£
-    ½ÐÎϤ¹¤ë´Á»ú¥³¡¼¥É·Ï¤â¡¢¤³¤ì¤é¤Ç¤¢¤ë¡£
-    ÆþÎϤϡ¢¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢É¸½àÆþÎϤȤʤ롣
-    ½ÐÎϤÏɸ½à½ÐÎϤǤ¢¤ë¡£
+    ¤³¤Î¤¿¤á¡¢ÍøÍѼԤϡ¢ÆþÎÏ´Á»ú¥³¡¼¥É·Ï¤¬²¿¤Ç¤¢¤ë¤«¤òÃΤé¤Ê¤¯¤Æ¤â¡¢½ÐÎÏ´Á»ú¥³¡¼¥É·Ï¤Î¤ß»ØÄꤹ¤ì¤ÐÎɤ¤¤³¤È¤Ë¤Ê¤ë¡£
+    ¤¿¤À¡¢¤³¤ÎȽÄ굡¹½¤Ï¡¢ÍýÏÀŪ¤Ë¤Ï´°Á´¤Ç¤Ï¤Ê¤¤¤¬¡¢Ä̾ï¤Î¥Ë¥å¡¼¥¹¤ä¥á¡¼¥ë¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ä¤¤¤Æ¤Ï³Î¼Â¤ËÆ°ºî¤¹¤ë°ÂÁ´¤Ê¤â¤Î¤Ë¤Ï¤Ê¤Ã¤Æ¤¤¤ë¡£
+
+    ¸½ºß¡¢nkf¤¬Ç§¼±¤Ç¤­¤ëÆþÎϤδÁ»ú¥³¡¼¥É·Ï¤Ï¡¢¤¤¤ï¤æ¤ë JIS ¥³¡¼¥É (ISO-2022-JP ¤Ë´ð¤Å¤¯¤â¤Î)¡¢Shift_JIS (MS
+    ´Á»ú¥³¡¼¥É)¡¢ ÆüËܸì EUC (AT&T ¥³¡¼¥É)¡¢UTF-8¡¢UTF-16 ¤Î¤¤¤º¤ì¤«¤Ç¤¢¤ë¡£ ½ÐÎϤ¹¤ë´Á»ú¥³¡¼¥É·Ï¤â¡¢¤³¤ì¤é¤Ç¤¢¤ë¡£
+    ÆþÎϤϡ¢¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢É¸½àÆþÎϤȤʤ롣 ½ÐÎϤÏɸ½à½ÐÎϤǤ¢¤ë¡£

 
 OPTIONS
     »ØÄê¤Ç¤­¤ë¥ª¥×¥·¥ç¥ó¤Ï¡¢°Ê²¼¤ÎÄ̤ꡣ -mu ¤Î¤è¤¦¤Ë³¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
 
 OPTIONS
     »ØÄê¤Ç¤­¤ë¥ª¥×¥·¥ç¥ó¤Ï¡¢°Ê²¼¤ÎÄ̤ꡣ -mu ¤Î¤è¤¦¤Ë³¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡£


@@ -52,10 +45,9 @@ OPTIONS
             UTF16 ¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£ (Little Endian / BOM ̵¤·)
 
     -m[BQSN0]
             UTF16 ¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£ (Little Endian / BOM ̵¤·)
 
     -m[BQSN0]

-        MIME ¤ò²òÆɤ¹¤ë¡£(¥Ç¥Õ¥©¥ë¥È) ISO-2022-JP (B encode) ¤È ISO-8859-1
-        (Q encode) ¤Î¤ß¤ò²òÆɤ¹¤ë¡£ ISO-8859-1 (Latin-1) ¤ò²òÆɤ¹¤ë»þ¤Ï¡¢-l
-        ¥Õ¥é¥°¤âɬÍפǤ¢¤ë¡£ -m0 ¤Ç¤Ï MIME ¤ò²òÆɤ·¤Ê¤¤¡£ -mB, -mQ
-        ¤Ç¤Ï¡¢BASE64, Q encode ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤·¤Æ½èÍý¤¹¤ë¡£
+        MIME ¤ò²òÆɤ¹¤ë¡£(¥Ç¥Õ¥©¥ë¥È) ISO-2022-JP (B encode) ¤È ISO-8859-1 (Q encode)
+        ¤Î¤ß¤ò²òÆɤ¹¤ë¡£ ISO-8859-1 (Latin-1) ¤ò²òÆɤ¹¤ë»þ¤Ï¡¢-l ¥Õ¥é¥°¤âɬÍפǤ¢¤ë¡£ -m0 ¤Ç¤Ï MIME
+        ¤ò²òÆɤ·¤Ê¤¤¡£ -mB, -mQ ¤Ç¤Ï¡¢BASE64, Q encode ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤·¤Æ½èÍý¤¹¤ë¡£

 
         -mB MIME base64 stream ¤ò²òÆɤ¹¤ë¡£ ¥Ø¥Ã¥À¤Ê¤É¤Ï¼è¤ê½ü¤¯¤³¤È¡£
 
 
         -mB MIME base64 stream ¤ò²òÆɤ¹¤ë¡£ ¥Ø¥Ã¥À¤Ê¤É¤Ï¼è¤ê½ü¤¯¤³¤È¡£
 


@@ -67,8 +59,7 @@ OPTIONS
 
         -m0 MIME ¤ò²òÆɤ·¤Ê¤¤¡£
 
 
         -m0 MIME ¤ò²òÆɤ·¤Ê¤¤¡£
 

-        -mS ¤Ï¡¢Àë¸À¤ÎÆâÍƤȡ¢¤½¤Î¸å¤Ë³¤¯ encoded-text
-        ¤ÎÀ°¹çÀ­¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£ -mN ¤Ï¡¢²þ¹Ô¤ÇÀÚ¤é¤ì¤¿ MIME
+        -mS ¤Ï¡¢Àë¸À¤ÎÆâÍƤȡ¢¤½¤Î¸å¤Ë³¤¯ encoded-text ¤ÎÀ°¹çÀ­¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£ -mN ¤Ï¡¢²þ¹Ô¤ÇÀÚ¤é¤ì¤¿ MIME

         ¤Ê¤É¤â²òÆɤ¹¤ë¡£²òÆɤ¬»ß¤Þ¤é¤Ê¤¤¤³¤È¤â¤¢¤ë¡£
 
     -M[BQ]
         ¤Ê¤É¤â²òÆɤ¹¤ë¡£²òÆɤ¬»ß¤Þ¤é¤Ê¤¤¤³¤È¤â¤¢¤ë¡£
 
     -M[BQ]


@@ -87,8 +78,7 @@ OPTIONS
 
         -E  ÆüËܸì EUC (AT&T) ¤ò²¾Äꤹ¤ë¡£
 
 
         -E  ÆüËܸì EUC (AT&T) ¤ò²¾Äꤹ¤ë¡£
 

-        -S  Shift_JIS ¤ò²¾Äꤹ¤ë¡£ ¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾)
-            ¤â¼õ¤±Æþ¤ì¤ë¡£
+        -S  Shift_JIS ¤ò²¾Äꤹ¤ë¡£ ¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾) ¤â¼õ¤±Æþ¤ì¤ë¡£

 
         -W  UTF-8 ¤ò²¾Äꤹ¤ë¡£
 
 
         -W  UTF-8 ¤ò²¾Äꤹ¤ë¡£
 


@@ -103,14 +93,11 @@ OPTIONS
         -W16L
             UTF-16 (Little Endian)¤ò²¾Äꤹ¤ë¡£
 
         -W16L
             UTF-16 (Little Endian)¤ò²¾Äꤹ¤ë¡£
 

-    -x  Ä̾浪¤³¤Ê¤ï¤ì¤ë¡¢¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾)
-        ¤«¤é¤¤¤ï¤æ¤ëÁ´³Ñ¥«¥Ê (JIS X 0208 ÊÒ²¾Ì¾)
-        ¤Ø¤ÎÊÑ´¹¤ò¹Ô¤ï¤º¡¢È¾³Ñ¥«¥Ê¤òÊݸ¤¹¤ë¡£ ÆþÎϤϡ¢Shift_JIS ¤Î 1byte
-        ¥«¥Ê¡¢SO/SI¡¢ESC-(-I, SSO ¤ò¼õ¤±ÉÕ¤±¤ë¡£ ½ÐÎϤϡ¢ÆüËܸì EUC Ãæ¤Ç¤Ï
-        SSO¡¢JIS ¥³¡¼¥ÉÃæ¤Ç¤Ï ESC-(-I ¤ò¥Ç¥Õ¥©¥ë¥È¤ÇÍѤ¤¤ë¡£
+    -x  Ä̾浪¤³¤Ê¤ï¤ì¤ë¡¢¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾) ¤«¤é¤¤¤ï¤æ¤ëÁ´³Ñ¥«¥Ê (JIS X 0208 ÊÒ²¾Ì¾)
+        ¤Ø¤ÎÊÑ´¹¤ò¹Ô¤ï¤º¡¢È¾³Ñ¥«¥Ê¤òÊݸ¤¹¤ë¡£ ÆþÎϤϡ¢Shift_JIS ¤Î 1byte ¥«¥Ê¡¢SO/SI¡¢ESC-(-I, SSO
+        ¤ò¼õ¤±ÉÕ¤±¤ë¡£ ½ÐÎϤϡ¢ÆüËܸì EUC Ãæ¤Ç¤Ï SSO¡¢JIS ¥³¡¼¥ÉÃæ¤Ç¤Ï ESC-(-I ¤ò¥Ç¥Õ¥©¥ë¥È¤ÇÍѤ¤¤ë¡£

 
 

-    -X  ¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾) ¤ò ¤¤¤ï¤æ¤ëÁ´³Ñ¥«¥Ê (JIS X 0208
-        ÊÒ²¾Ì¾) ¤Ø¤ÈÊÑ´¹¤¹¤ë¡£
+    -X  ¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾) ¤ò ¤¤¤ï¤æ¤ëÁ´³Ñ¥«¥Ê (JIS X 0208 ÊÒ²¾Ì¾) ¤Ø¤ÈÊÑ´¹¤¹¤ë¡£

 
     -B  ²õ¤ì¤¿ (Broken) JIS ¥³¡¼¥É¡£ ESC ¤¬¤Ê¤¯¤Ê¤Ã¤¿¤È²¾Äꤹ¤ë¡£
 
 
     -B  ²õ¤ì¤¿ (Broken) JIS ¥³¡¼¥É¡£ ESC ¤¬¤Ê¤¯¤Ê¤Ã¤¿¤È²¾Äꤹ¤ë¡£
 


@@ -119,13 +106,10 @@ OPTIONS
         -B2 ²þ¹Ô¤Î¤¢¤È¤Ë¶¯À©Åª¤Ë ASCII ¤ËÌ᤹
 
     -f[*m*[-*n*]]
         -B2 ²þ¹Ô¤Î¤¢¤È¤Ë¶¯À©Åª¤Ë ASCII ¤ËÌ᤹
 
     -f[*m*[-*n*]]

-        °ì¹Ô *m* ʸ»ú¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢¥Þ¡¼¥¸¥ó¤ò *n*
-        ¤È¤·¤Æ´Êñ¤ÊÀ°·Á¤ò¤ª¤³¤Ê¤¦¡£ ¥Ç¥Õ¥©¥ë¥È¤Ïʸ»ú¿ô¤Ï 60¡¢¥Þ¡¼¥¸¥ó¤Ï 10
-        ¤Ç¤¢¤ë¡£
+        °ì¹Ô *m* ʸ»ú¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢¥Þ¡¼¥¸¥ó¤ò *n* ¤È¤·¤Æ´Êñ¤ÊÀ°·Á¤ò¤ª¤³¤Ê¤¦¡£ ¥Ç¥Õ¥©¥ë¥È¤Ïʸ»ú¿ô¤Ï 60¡¢¥Þ¡¼¥¸¥ó¤Ï 10 ¤Ç¤¢¤ë¡£

 
     -Z[0-3]
 
     -Z[0-3]

-        JIS X 0208 ±Ñ¿ô»ú¤È¼ã´³¤Îµ­¹æ¤ò ASCII ¤ËÊÑ´¹¤¹¤ë¡£
-        ¤Ä¤Þ¤ê¡¢Á´³Ñ¤òȾ³Ñ¤ËÊÑ´¹¤¹¤ë¡£
+        JIS X 0208 ±Ñ¿ô»ú¤È¼ã´³¤Îµ­¹æ¤ò ASCII ¤ËÊÑ´¹¤¹¤ë¡£ ¤Ä¤Þ¤ê¡¢Á´³Ñ¤òȾ³Ñ¤ËÊÑ´¹¤¹¤ë¡£

 
         -Z -Z0
             Convert X0208 alphabet to ASCII.
 
         -Z -Z0
             Convert X0208 alphabet to ASCII.


@@ -138,8 +122,7 @@ OPTIONS
 
     -b  ¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°½ÐÎϤò¹Ô¤¦¡£(¥Ç¥Õ¥©¥ë¥È)
 
 
     -b  ¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°½ÐÎϤò¹Ô¤¦¡£(¥Ç¥Õ¥©¥ë¥È)
 

-    -u  ½ÐÎÏ»þ¤Ë¡¢¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°¤·¤Ê¤¤¡£ ssh localhost | nkf -u
-        ¤È¤¤¤¦¤è¤¦¤Ë»È¤¦¡£
+    -u  ½ÐÎÏ»þ¤Ë¡¢¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°¤·¤Ê¤¤¡£ ssh localhost | nkf -u ¤È¤¤¤¦¤è¤¦¤Ë»È¤¦¡£

 
     -t  ²¿¤â¤·¤Ê¤¤¡£
 
 
     -t  ²¿¤â¤·¤Ê¤¤¡£
 


@@ -159,8 +142,7 @@ OPTIONS
 
         -oJ 1 ¥Ð¥¤¥È±Ñ¿ôʸ»ú¥»¥Ã¥È¤È¤·¤Æ JIS X 0201 Roman ¤òÍѤ¤¤ë¡£
 
 
         -oJ 1 ¥Ð¥¤¥È±Ñ¿ôʸ»ú¥»¥Ã¥È¤È¤·¤Æ JIS X 0201 Roman ¤òÍѤ¤¤ë¡£
 

-        -oH ESC ( H ¤Ï½é´ü¤Î JUNET
-            ¥³¡¼¥É¤Ç¤Î¤ßÍѤ¤¤é¤ì¤¿¤â¤Î¤Ç¡¢¸½ºß¤Ï»È¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+        -oH ESC ( H ¤Ï½é´ü¤Î JUNET ¥³¡¼¥É¤Ç¤Î¤ßÍѤ¤¤é¤ì¤¿¤â¤Î¤Ç¡¢¸½ºß¤Ï»È¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£

 
     -r  ROT13/47 ¤ÎÊÑ´¹¤ò¤¹¤ë¡£
 
 
     -r  ROT13/47 ¤ÎÊÑ´¹¤ò¤¹¤ë¡£
 


@@ -168,13 +150,11 @@ OPTIONS
 
     -T  ¥Æ¥­¥¹¥È¥â¡¼¥É¤Ç½ÐÎϤ¹¤ë¡£(MS-DOS ¾å¤Ç¤Î¤ß¸úÎϤò»ý¤Ä)
 
 
     -T  ¥Æ¥­¥¹¥È¥â¡¼¥É¤Ç½ÐÎϤ¹¤ë¡£(MS-DOS ¾å¤Ç¤Î¤ß¸úÎϤò»ý¤Ä)
 

-    -l  0x80-0xfe ¤Î¥³¡¼¥É¤ò ISO-8859-1 (Latin-1) ¤È¤·¤Æ°·¤¦¡£ JIS
-        ¥³¡¼¥É¥¢¥¦¥È¥×¥Ã¥È¤È¤ÎÁȹ礻¤ß¤Î¤ßÍ­¸ú¡£ -s, -e, -x ¤È¤ÏξΩ¤·¤Ê¤¤¡£
+    -l  0x80-0xfe ¤Î¥³¡¼¥É¤ò ISO-8859-1 (Latin-1) ¤È¤·¤Æ°·¤¦¡£ JIS ¥³¡¼¥É¥¢¥¦¥È¥×¥Ã¥È¤È¤ÎÁȹ礻¤ß¤Î¤ßÍ­¸ú¡£
+        -s, -e, -x ¤È¤ÏξΩ¤·¤Ê¤¤¡£

 
 

-    -O  ¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë¡£ UNIX ¤Ç¤ÏÉÔÍפʵ¡Ç½¤À¤¬ Windows ¤ä MSDOS
-        ¤Ç¤ÏɬÍפ餷¤¤¡£
-        ľ¸å¤Î°ú¤­¿ô¤Ç¤Ê¤¯¡¢ºÇ¸å¤Î¥Õ¥¡¥¤¥ë̾¤¬½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤È¤Ê¤ê¾å½ñ¤­¤µ¤ì
-        ¤Æ¤·¤Þ¤¦¤Î¤ÇÃí°Õ¡£ ¥Õ¥¡¥¤¥ë̾¤¬¤Ê¤¤¾ì¹ç¤Ï nkf.out¡£
+    -O  ¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë¡£ UNIX ¤Ç¤ÏÉÔÍפʵ¡Ç½¤À¤¬ Windows ¤ä MSDOS ¤Ç¤ÏɬÍפ餷¤¤¡£
+        ľ¸å¤Î°ú¤­¿ô¤Ç¤Ê¤¯¡¢ºÇ¸å¤Î¥Õ¥¡¥¤¥ë̾¤¬½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤È¤Ê¤ê¾å½ñ¤­¤µ¤ì¤Æ¤·¤Þ¤¦¤Î¤ÇÃí°Õ¡£ ¥Õ¥¡¥¤¥ë̾¤¬¤Ê¤¤¾ì¹ç¤Ï nkf.out¡£

 
     -L[uwm] -d -c
         ²þ¹Ô¥³¡¼¥É¤òÊÑ´¹¤¹¤ë¡£
 
     -L[uwm] -d -c
         ²þ¹Ô¥³¡¼¥É¤òÊÑ´¹¤¹¤ë¡£


@@ -211,12 +191,10 @@ OPTIONS
             ʸ»ú½¸¹ç¤Ë JIS X 0213:2004 ¤òÍѤ¤¤¿ EUC-JP¡£
 
         eucJP-ascii
             ʸ»ú½¸¹ç¤Ë JIS X 0213:2004 ¤òÍѤ¤¤¿ EUC-JP¡£
 
         eucJP-ascii

-            ¥ª¡¼¥×¥ó¥°¥ë¡¼¥×ÆüËÜ¥Ù¥ó¥À¶¨µÄ²ñ¤¬ÄêµÁ¤·¤¿ eucJP-ascii¡£ -x
-            ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£
+            ¥ª¡¼¥×¥ó¥°¥ë¡¼¥×ÆüËÜ¥Ù¥ó¥À¶¨µÄ²ñ¤¬ÄêµÁ¤·¤¿ eucJP-ascii¡£ -x ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£

 
         eucJP-ms
 
         eucJP-ms

-            ¥ª¡¼¥×¥ó¥°¥ë¡¼¥×ÆüËÜ¥Ù¥ó¥À¶¨µÄ²ñ¤¬ÄêµÁ¤·¤¿ euc-JPms¡£ -x
-            ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£
+            ¥ª¡¼¥×¥ó¥°¥ë¡¼¥×ÆüËÜ¥Ù¥ó¥À¶¨µÄ²ñ¤¬ÄêµÁ¤·¤¿ euc-JPms¡£ -x ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£

 
         CP51932
             Micorosft Code Page 51932¡£ -x ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£
 
         CP51932
             Micorosft Code Page 51932¡£ -x ¤¬°ÅÌۤΤ¦¤Á¤Ë»ØÄꤵ¤ì¤ë¡£


@@ -240,8 +218,7 @@ OPTIONS
             BOM ÉÕ¤­¤Î UTF-8¡£-w8 ¤Þ¤¿¤Ï -W ¤ÈƱ¤¸¡£
 
         UTF8-MAC
             BOM ÉÕ¤­¤Î UTF-8¡£-w8 ¤Þ¤¿¤Ï -W ¤ÈƱ¤¸¡£
 
         UTF8-MAC

-            UTF8-MAC¡£¸ß´¹Ê¬²ò¤µ¤ì¤¿¤Ò¤é¤¬¤Ê¡¦¥«¥¿¥«¥ÊÅù¤ò·ë¹ç¤·¤Þ¤¹¡£
-            ÆþÎϤΤߤÎÂбþ¤Ç¤¹¡£
+            UTF8-MAC¡£¸ß´¹Ê¬²ò¤µ¤ì¤¿¤Ò¤é¤¬¤Ê¡¦¥«¥¿¥«¥ÊÅù¤ò·ë¹ç¤·¤Þ¤¹¡£ ÆþÎϤΤߤÎÂбþ¤Ç¤¹¡£

 
         UTF-16 UTF-16BE-BOM
             BOM Í­¤ê¤Ç Big Endian ¤Î UTF-16¡£ -w16B, -W16B ¤ÈƱ¤¸¡£
 
         UTF-16 UTF-16BE-BOM
             BOM Í­¤ê¤Ç Big Endian ¤Î UTF-16¡£ -w16B, -W16B ¤ÈƱ¤¸¡£


@@ -269,30 +246,23 @@ OPTIONS
         ¤ËÊÑ´¹¤¹¤ëºÝ¤Ë¡¢ÊÑ´¹¤Ç¤­¤Ê¤«¤Ã¤¿Ê¸»ú¤ò¤É¤¦°·¤¦¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
 
     --prefix=*escape character**target character*..
         ¤ËÊÑ´¹¤¹¤ëºÝ¤Ë¡¢ÊÑ´¹¤Ç¤­¤Ê¤«¤Ã¤¿Ê¸»ú¤ò¤É¤¦°·¤¦¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
 
     --prefix=*escape character**target character*..

-        EUC-JP ¤«¤é Shift_JIS ¤Ø¤ÎÊÑ´¹¤ÎºÝ¡¢2 ¥Ð¥¤¥ÈÌÜ
-        ¤Ë¸½¤ì¤¿Ê¸»ú¤ÎÁ°¤Ë¥¨¥¹¥±¡¼¥×ʸ»ú¤ò¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ °ú¿ô¤Î 1
-        ʸ»úÌܤ¬¥¨¥¹¥±¡¼¥×ʸ»ú¡¢2
-        ʸ»úÌܰʹߤ˥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤Ù¤­Ê¸»ú¤ò»ØÄꤷ¤Þ¤¹¡£
+        EUC-JP ¤«¤é Shift_JIS ¤Ø¤ÎÊÑ´¹¤ÎºÝ¡¢2 ¥Ð¥¤¥ÈÌÜ ¤Ë¸½¤ì¤¿Ê¸»ú¤ÎÁ°¤Ë¥¨¥¹¥±¡¼¥×ʸ»ú¤ò¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ °ú¿ô¤Î 1
+        ʸ»úÌܤ¬¥¨¥¹¥±¡¼¥×ʸ»ú¡¢2 ʸ»úÌܰʹߤ˥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤Ù¤­Ê¸»ú¤ò»ØÄꤷ¤Þ¤¹¡£

 
         Î㤨¤Ð¡¢
 
 
         Î㤨¤Ð¡¢
 

-        --prefix=\$@ ¤È¤¹¤ë¤È¡¢Shift_JIS ¤Î 2 ʸ»úÌÜ¤Ë $ ¤« @
-        ¤¬Í褿¤é¡¢¤½¤ÎÁ°¤Ë \ ¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹ --prefix=@@ ¤È¤¹¤ë¤È¡¢Shift_JIS
-        ¤Î 2 ʸ»úÌÜ¤Ë @ ¤¬Í褿¤é¡¢¤½¤ÎÁ°¤Ë @ ¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹
+        --prefix=\$@ ¤È¤¹¤ë¤È¡¢Shift_JIS ¤Î 2 ʸ»úÌÜ¤Ë $ ¤« @ ¤¬Í褿¤é¡¢¤½¤ÎÁ°¤Ë \ ¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹
+        --prefix=@@ ¤È¤¹¤ë¤È¡¢Shift_JIS ¤Î 2 ʸ»úÌÜ¤Ë @ ¤¬Í褿¤é¡¢¤½¤ÎÁ°¤Ë @ ¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹

 
     --no-cp932ext
 
     --no-cp932ext

-        CP932 ¤Ë¤ª¤¤¤Æ³ÈÄ¥¤µ¤ì¤¿¡¢NEC Æüìʸ»ú¡¢NEC ÁªÄê IBM ³Èĥʸ»ú (89-92
-        ¶è)¡¢IBM ³Èĥʸ»ú¤òÊÑ´¹¤·¤Þ¤»¤ó¡£
+        CP932 ¤Ë¤ª¤¤¤Æ³ÈÄ¥¤µ¤ì¤¿¡¢NEC Æüìʸ»ú¡¢NEC ÁªÄê IBM ³Èĥʸ»ú (89-92 ¶è)¡¢IBM ³Èĥʸ»ú¤òÊÑ´¹¤·¤Þ¤»¤ó¡£

 
     --no-best-fit-chars
 
     --no-best-fit-chars

-        Unicode
-        ¤«¤é¤ÎÊÑ´¹¤ÎºÝ¤Ë¡¢±ýÉü°ÂÁ´À­¤¬³ÎÊݤµ¤ì¤Ê¤¤Ê¸»ú¤ÎÊÑ´¹¤ò¹Ô¤¤¤Þ¤»¤ó¡£
-        Unicode ¤«¤é Unicode ¤ÎÊÑ´¹¤ÎºÝ¤Ë -x ¤È¶¦¤Ë»ØÄꤹ¤ë¤È¡¢nkf ¤ò UTF
-        ·Á¼°¤ÎÊÑ´¹¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+        Unicode ¤«¤é¤ÎÊÑ´¹¤ÎºÝ¤Ë¡¢±ýÉü°ÂÁ´À­¤¬³ÎÊݤµ¤ì¤Ê¤¤Ê¸»ú¤ÎÊÑ´¹¤ò¹Ô¤¤¤Þ¤»¤ó¡£ Unicode ¤«¤é Unicode ¤ÎÊÑ´¹¤ÎºÝ¤Ë
+        -x ¤È¶¦¤Ë»ØÄꤹ¤ë¤È¡¢nkf ¤ò UTF ·Á¼°¤ÎÊÑ´¹¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

         (µÕ¤Ë¸À¤¨¤Ð¡¢¤³¤ì¤ò»ØÄꤷ¤Ê¤¤¤È°ìÉô¤Îʸ»ú¤¬Êݸ¤µ¤ì¤Þ¤»¤ó)
 
         (µÕ¤Ë¸À¤¨¤Ð¡¢¤³¤ì¤ò»ØÄꤷ¤Ê¤¤¤È°ìÉô¤Îʸ»ú¤¬Êݸ¤µ¤ì¤Þ¤»¤ó)
 

-        ¥Ñ¥¹¤Ë´Ø¤ï¤ëʸ»úÎó¤òÊÑ´¹¤¹¤ëºÝ¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤ò¶¯
-        ¤¯¿ä¾©¤·¤Þ¤¹¡£
+        ¥Ñ¥¹¤Ë´Ø¤ï¤ëʸ»úÎó¤òÊÑ´¹¤¹¤ëºÝ¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹¡£

 
     --cap-input, --url-input
         ¤½¤ì¤¾¤ì :¡¢% ¤Ë³¤¯ 16 ¿Ê¿ô¤òʸ»ú¤ËÊÑ´¹¤¹¤ë
 
     --cap-input, --url-input
         ¤½¤ì¤¾¤ì :¡¢% ¤Ë³¤¯ 16 ¿Ê¿ô¤òʸ»ú¤ËÊÑ´¹¤¹¤ë


@@ -301,11 +271,8 @@ OPTIONS
         &#....; ¤Î¤è¤¦¤Ê Unicode ʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
 
     --in-place[=*SUFFIX*] --overwrite[=*SUFFIX*]
         &#....; ¤Î¤è¤¦¤Ê Unicode ʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
 
     --in-place[=*SUFFIX*] --overwrite[=*SUFFIX*]

-        ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£
-        Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
-        ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
-        ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode
-        ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
+        ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£ Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£ ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
+        ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£

 
     --guess
         ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ¹¤ë
 
     --guess
         ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ¹¤ë


@@ -321,29 +288,22 @@ OPTIONS
     --  ¤³¤ì°Ê¹ß¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤¹¤ë
 
     --exec-in
     --  ¤³¤ì°Ê¹ß¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤¹¤ë
 
     --exec-in

-        nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf
-        ¤ÎÆþÎϤȤ¹¤ë (config.h ¤Ç EXEC_IO ¤ò define
-        ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
+        nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf ¤ÎÆþÎϤȤ¹¤ë
+        (config.h ¤Ç EXEC_IO ¤ò define ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)

 
     --exec-out
 
     --exec-out

-        nkf [options] --exec-out cmd args... ¤È¤ä¤ë¤È¡¢nkf ¤Î½ÐÎϤò cmd
-        ¤ÎÆþÎϤȤ¹¤ë (config.h ¤Ç EXEC_IO ¤ò define
-        ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
+        nkf [options] --exec-out cmd args... ¤È¤ä¤ë¤È¡¢nkf ¤Î½ÐÎϤò cmd ¤ÎÆþÎϤȤ¹¤ë
+        (config.h ¤Ç EXEC_IO ¤ò define ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)

 
 BUGS
 
 BUGS

-    ¼Â¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢Shift_JIS ¤È EUC
-    ¤È¤Î¼«Æ°È½Äê¤Ç¤¢¤ê¡¢ºÇ½é¤ËÆÃÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£
-    ¤½¤·¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα¥Ð¥Ã¥Õ¥¡¤Ë¤¿¤á¤Æ¤ª¤«¤ì¡¢³ÎÄê¸å¤Ë½èÍý¤µ¤ì¤ë¡£
-    ¤³¤Î¤¿¤á¡¢7 ¥Ó¥Ã¥È JIS ¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£ Shift_JIS¡¢EUC
-    º®¹ç¤â¤Û¤È¤ó¤É¤Î¾ì¹ç¤ÏÌäÂ꤬¤Ê¤¤¡£ ¤¿¤À¤·¡¢Shift_JIS ¤Î¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê
-    (JIS X 0201 ÊÒ²¾Ì¾) ¤È EUC ´Á»ú¤¬¼±Ê̤Ǥ­¤Ê¤¤¡£
-    ¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï Shift_JIS
-    ¤Î¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê¤Ï¤Ê¤¤¤È²¾Äꤷ¤Æ¤¤¤ë¡£ (¤Ä¤Þ¤ê¡¢Shift_JIS ¤« EUC
-    ¤«Ì¤ä¿»þ¤Ï EUC ¤È¤ß¤Ê¤¹)
-
-    Unicode
-    ¤ÎÆüËܸì°Ê³°¤ÎÉôʬ¤ÎÊÑ´¹¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Ê¤¤¤¬¡¢--no-best-fit-chars
-    ¤ò»ØÄꤹ¤ì¤Ð¡¢UTF-8 ¤È UTF-16 ¤ÎÁê¸ßÊÑ´¹¤ò¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¢¤ë¡£
+    ¼Â¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢Shift_JIS ¤È EUC ¤È¤Î¼«Æ°È½Äê¤Ç¤¢¤ê¡¢ºÇ½é¤ËÆÃÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£
+    ¤½¤·¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα¥Ð¥Ã¥Õ¥¡¤Ë¤¿¤á¤Æ¤ª¤«¤ì¡¢³ÎÄê¸å¤Ë½èÍý¤µ¤ì¤ë¡£ ¤³¤Î¤¿¤á¡¢7 ¥Ó¥Ã¥È JIS ¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£
+    Shift_JIS¡¢EUC º®¹ç¤â¤Û¤È¤ó¤É¤Î¾ì¹ç¤ÏÌäÂ꤬¤Ê¤¤¡£ ¤¿¤À¤·¡¢Shift_JIS ¤Î¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê (JIS X 0201 ÊÒ²¾Ì¾)
+    ¤È EUC ´Á»ú¤¬¼±Ê̤Ǥ­¤Ê¤¤¡£ ¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï Shift_JIS ¤Î¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê¤Ï¤Ê¤¤¤È²¾Äꤷ¤Æ¤¤¤ë¡£
+    (¤Ä¤Þ¤ê¡¢Shift_JIS ¤« EUC ¤«Ì¤ä¿»þ¤Ï EUC ¤È¤ß¤Ê¤¹)
+
+    Unicode ¤ÎÆüËܸì°Ê³°¤ÎÉôʬ¤ÎÊÑ´¹¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Ê¤¤¤¬¡¢--no-best-fit-chars ¤ò»ØÄꤹ¤ì¤Ð¡¢UTF-8 ¤È UTF-16
+    ¤ÎÁê¸ßÊÑ´¹¤ò¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¢¤ë¡£

 
 ACKNOWLEDGE
     °Ê²¼¤Î¤«¤¿¤¬¤¿¡¢¤É¤¦¤â¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤·¤¿¡£
 
 ACKNOWLEDGE
     °Ê²¼¤Î¤«¤¿¤¬¤¿¡¢¤É¤¦¤â¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤·¤¿¡£


@@ -376,7 +336,7 @@ ACKNOWLEDGE
     Ki-ichiro SATO
     Kiwamu Aoyama
     Koichi Hirayama
     Ki-ichiro SATO
     Kiwamu Aoyama
     Koichi Hirayama

-    Mitsuru Hase (Ĺë¡¡Ëþ)
+    Mitsuru Hase (Ĺë Ëþ)

     OHARA Shigeki (Â縶 ½Å¼ù)
     Rei FURUKAWA
     Satoru Takabayashi
     OHARA Shigeki (Â縶 ½Å¼ù)
     Rei FURUKAWA
     Satoru Takabayashi


@@ -411,15 +371,15 @@ ACKNOWLEDGE
     »³Ìî͵»Ê (¤ä¤Þ¤Î¤æ¤¦¤¸)
     ½Å¼ˡ¹î
     ¾®Åç´ðÌ÷
     »³Ìî͵»Ê (¤ä¤Þ¤Î¤æ¤¦¤¸)
     ½Å¼ˡ¹î
     ¾®Åç´ðÌ÷

-    ¾åÅÄ¡¡·ò
+    ¾åÅÄ ·ò

     ¿·°æ ¹¯»Ê (Koji Arai)
     ¿·°æ ¹¯»Ê (Koji Arai)

-    ¿¹¡¡À鳨»Ò
-    ¿¹¡¡ÏÂɧ
+    ¿¹ À鳨»Ò
+    ¿¹ ÏÂɧ

     ¿åÌî µ®Ê¸
     Á°ÃÏϽÓ
     Ã罡º¬¡÷ÊÂÎó¿®Í긦
     Ãöë ±Ñ°ìϺ == Eiichiro Itani
     ¿åÌî µ®Ê¸
     Á°ÃÏϽÓ
     Ã罡º¬¡÷ÊÂÎó¿®Í긦
     Ãöë ±Ñ°ìϺ == Eiichiro Itani

-    Æ£¸¶¡¡½¨¹Ô
+    Æ£¸¶ ½¨¹Ô

     ȬÅÄ ¿¿¹Ô (Masayuki Hatta)
     ÈøÀîÉÒÌé
     ˾·î ¹§»Ö
     ȬÅÄ ¿¿¹Ô (Masayuki Hatta)
     ÈøÀîÉÒÌé
     ˾·î ¹§»Ö


@@ -449,5 +409,5 @@ AUTHOR
 
     Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 
 
     Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 

-    Copyright (C) 1996-2009, The nkf Project.
+    Copyright (C) 1996-2013, The nkf Project.

 
 

diff --git a/nkf32dll.c b/nkf32dll.c
index 2ba639b..facbb4b 100644 (file)
--- a/nkf32dll.c
+++ b/nkf32dll.c
@@ -4,11 +4,11 @@
 
 /*WIN32DLL*/
 /* \82±\82¿\82ç\82Ì\83o\81[\83W\83\87\83\93\82à\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B */
 
 /*WIN32DLL*/
 /* \82±\82¿\82ç\82Ì\83o\81[\83W\83\87\83\93\82à\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B */

-#define NKF_VERSIONW L"2.1.2"
+#define NKF_VERSIONW L"2.1.3"

 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */

-#define DLL_VERSION   "2.1.2.0 2"
+#define DLL_VERSION   "2.1.3.0 2"

 /* DLL\82ª\95Ô\82· */
 /* DLL\82ª\95Ô\82· */

-#define DLL_VERSIONW L"2.1.2.0 2"
+#define DLL_VERSIONW L"2.1.3.0 2"

 /* DLL\82ª\95Ô\82· DLL_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 
 /* nkf32.dll main */
 /* DLL\82ª\95Ô\82· DLL_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 
 /* nkf32.dll main */

diff --git a/version.rc b/version.rc
index ec857c0..e08cb61 100755 (executable)
--- a/version.rc
+++ b/version.rc
@@ -1,8 +1,8 @@
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r

-FILEVERSION 2,1,2,0\r
-PRODUCTVERSION 2,1,2,0\r
+FILEVERSION 2,1,3,0\r
+PRODUCTVERSION 2,1,3,0\r

 FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
 FILEFLAGS 0x1L\r
 FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
 FILEFLAGS 0x1L\r


@@ -19,12 +19,12 @@ FILESUBTYPE 0x0L
         {\r
             VALUE "CompanyName", "project nkf\0"\r
             VALUE "FileDescription", "Network Kanji Filter\0"\r
         {\r
             VALUE "CompanyName", "project nkf\0"\r
             VALUE "FileDescription", "Network Kanji Filter\0"\r

-            VALUE "FileVersion", "2.1.2\0"\r
+            VALUE "FileVersion", "2.1.3\0"\r

             VALUE "InternalName", "nkf\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)\0"\r
             VALUE "OriginalFilename", "nkf.c\0"\r
             VALUE "ProductName", "nkf.exe\0"\r
             VALUE "InternalName", "nkf\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)\0"\r
             VALUE "OriginalFilename", "nkf.c\0"\r
             VALUE "ProductName", "nkf.exe\0"\r

-            VALUE "ProductVersion", "2.1.2\0"\r
+            VALUE "ProductVersion", "2.1.3\0"\r

         }\r
     }\r
     BLOCK "VarFileInfo"\r
         }\r
     }\r
     BLOCK "VarFileInfo"\r