bump version

diff --git a/Makefile b/Makefile
index e66b30c..b8a54f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHAR = shar
 # SHAR = shar -T
 PERL = perl
 RM = rm -rf
-VERSION = 2.1.3
+VERSION = 2.1.4
 MKDIR = mkdir
 prefix = /usr/local
 PYTHON2 = python

diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm
index d27f499..9abd9bc 100644 (file)
--- a/NKF.mod/NKF.pm
+++ b/NKF.mod/NKF.pm
@@ -1,5 +1,5 @@
 # Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
-# Copyright (c) 1996-2014, The nkf Project.
+# Copyright (c) 1996-2015, The nkf Project.
 # All rights reserved.
 #
 # This software is provided 'as-is', without any express or implied
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
-$VERSION = '2.13';
+$VERSION = '2.14';
 
 bootstrap NKF $VERSION;
 
@@ -505,7 +505,7 @@ Ignore rest of -option.
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 
-Copyright (c) 1996-2014, The nkf Project.
+Copyright (c) 1996-2015, The nkf Project.
 
 =begin
 

diff --git a/dll.rc b/dll.rc
index dd2da5a..8482299 100755 (executable)
--- a/dll.rc
+++ b/dll.rc
@@ -1,8 +1,8 @@
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r
-FILEVERSION 2,1,3,0\r
-PRODUCTVERSION 2,1,3,0\r
+FILEVERSION 2,1,4,0\r
+PRODUCTVERSION 2,1,4,0\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
-            VALUE "FileVersion", "2.1.3.0 1\0"\r
+            VALUE "FileVersion", "2.1.4.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 "ProductVersion", "2.1.3.0 1\0"\r
+            VALUE "ProductVersion", "2.1.4.0 1\0"\r
         }\r
     }\r
     BLOCK "VarFileInfo"\r

diff --git a/man/nkf.1.pm b/man/nkf.1.pm
index 6d4cf6d..8a6757c 100644 (file)
--- a/man/nkf.1.pm
+++ b/man/nkf.1.pm
@@ -1,5 +1,5 @@
 # Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
-# Copyright (c) 1996-2010, The nkf Project.
+# Copyright (c) 1996-2015, The nkf Project.
 # All rights reserved.
 #
 # This software is provided 'as-is', without any express or implied
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
-$VERSION = '2.13';
+$VERSION = '2.14';
 
 bootstrap NKF $VERSION;
 
@@ -77,6 +77,12 @@ For X0201 kana, SO/SI, SSO and ESC-(-I methods are supported.
 For automatic code detection, nkf assumes no X0201 kana in Shift_JIS.
 To accept X0201 in Shift_JIS, use B<-X>, B<-x> or B<-S>.
 
+multiple options are specifed as seprate strings, such as
+
+  print nkf('--ic=UTF8-MAC', '-w', $string), "\n";
+
+except the last arguments.
+
 =head1 OPTIONS
 
 =over
@@ -475,7 +481,7 @@ Ignore rest of -option.
 
 Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 
-Copyright (c) 1996-2013, The nkf Project.
+Copyright (c) 1996-2015, The nkf Project.
 
 
 =cut

diff --git a/nkf.1 b/nkf.1
index b6d1739..d9747a2 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
 .\" 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.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -124,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2013-11-22" "nkf 2.1.3" " "
+.TH nkf 1 "2015-12-12" "nkf 2.1.4" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -138,16 +147,24 @@ 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
-such as \s-1ISO\-2022\-JP\s0, Shift_JIS, EUC-JP, \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, UTF\-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.
-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.
+It currently recognizes \s-1ISO\-2022\-JP,\s0 Shift_JIS, EUC-JP, \s-1UTF\-8, UTF\-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.
-For X0201 kana, \s-1SO/SI\s0, \s-1SSO\s0 and \s-1ESC\-\s0(\-I methods are supported.
+For X0201 kana, \s-1SO/SI, SSO\s0 and \s-1ESC\-\s0(\-I methods are supported.
 For automatic code detection, nkf assumes no X0201 kana in Shift_JIS.
 To accept X0201 in Shift_JIS, use \fB\-X\fR, \fB\-x\fR or \fB\-S\fR.
+.PP
+multiple options are specifed as seprate strings, such as
+.PP
+.Vb 1
+\&  print nkf(\*(Aq\-\-ic=UTF8\-MAC\*(Aq, \*(Aq\-w\*(Aq, $string), "\en";
+.Ve
+.PP
+except the last arguments.
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .IP "\fB\-J \-S \-E \-W \-W16 \-W32 \-j \-s \-e \-w \-w16 \-w32\fR" 4
@@ -157,28 +174,28 @@ cf. \-\-ic and \-\-oc.
 .RS 4
 .IP "\fB\-J\fR" 4
 .IX Item "-J"
-\&\s-1ISO\-2022\-JP\s0 (\s-1JIS\s0 code).
+\&\s-1ISO\-2022\-JP \s0(\s-1JIS\s0 code).
 .IP "\fB\-S\fR" 4
 .IX Item "-S"
-Shift_JIS and \s-1JIS\s0 X 0201 kana.
+Shift_JIS and \s-1JIS X 0201\s0 kana.
 EUC-JP is recognized as X0201 kana. Without \fB\-x\fR flag,
-\&\s-1JIS\s0 X 0201 Katakana (a.k.a.halfwidth kana) is converted into \s-1JIS\s0 X 0208.
+\&\s-1JIS X 0201\s0 Katakana (a.k.a.halfwidth kana) is converted into \s-1JIS X 0208.\s0
 If you use Windows, see Windows\-31J (\s-1CP932\s0).
 .IP "\fB\-E\fR" 4
 .IX Item "-E"
 EUC-JP.
 .IP "\fB\-W\fR" 4
 .IX Item "-W"
-\&\s-1UTF\-8N\s0.
+\&\s-1UTF\-8N.\s0
 .IP "\fB\-W16[\s-1BL\s0][0]\fR" 4
 .IX Item "-W16[BL][0]"
-\&\s-1UTF\-16\s0.
-B or L gives whether Big Endian or Little Endian.
+\&\s-1UTF\-16.
+B\s0 or L gives whether Big Endian or Little Endian.
 0 gives whther put \s-1BOM\s0 or not.
 .IP "\fB\-W32[\s-1BL\s0][0]\fR" 4
 .IX Item "-W32[BL][0]"
-\&\s-1UTF\-32\s0.
-B or L gives whether Big Endian or Little Endian.
+\&\s-1UTF\-32.
+B\s0 or L gives whether Big Endian or Little Endian.
 0 gives whther put \s-1BOM\s0 or not.
 .RE
 .RS 4
@@ -191,20 +208,20 @@ Output is buffered (\s-1DEFAULT\s0), Output is unbuffered.
 No conversion.
 .IP "\fB\-i[@B]\fR" 4
 .IX Item "-i[@B]"
-Specify the escape sequence for \s-1JIS\s0 X 0208.
+Specify the escape sequence for \s-1JIS X 0208.\s0
 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"
-Use \s-1ESC\s0 ( @. (\s-1JIS\s0 X 0208\-1978)
+Use \s-1ESC \s0( @. (\s-1JIS X 0208\-1978\s0)
 .IP "\fB\-iB\fR" 4
 .IX Item "-iB"
-Use \s-1ESC\s0 ( B. (\s-1JIS\s0 X 0208\-1983/1990 \s-1DEFAULT\s0)
+Use \s-1ESC \s0( B. (\s-1JIS X 0208\-1983/1990 DEFAULT\s0)
 .RE
 .RS 4
 .RE
 .IP "\fB\-o[\s-1BJ\s0]\fR" 4
 .IX Item "-o[BJ]"
-Specify the escape sequence for \s-1US\-ASCII/JIS\s0 X 0201 Roman. (\s-1DEFAULT\s0 B)
+Specify the escape sequence for \s-1US\-ASCII/JIS X 0201\s0 Roman. (\s-1DEFAULT B\s0)
 .IP "\fB\-r\fR" 4
 .IX Item "-r"
 {de/en}crypt \s-1ROT13/47\s0
@@ -237,11 +254,11 @@ Without this option, fold length is 60 and fold margin is 10.
 New line preserving line folding.
 .IP "\fB\-Z[0\-3]\fR" 4
 .IX Item "-Z[0-3]"
-Convert X0208 alphabet (Fullwidth Alphabets) to \s-1ASCII\s0.
+Convert X0208 alphabet (Fullwidth Alphabets) to \s-1ASCII.\s0
 .RS 4
 .IP "\fB\-Z \-Z0\fR" 4
 .IX Item "-Z -Z0"
-Convert X0208 alphabet to \s-1ASCII\s0.
+Convert X0208 alphabet to \s-1ASCII.\s0
 .IP "\fB\-Z1\fR" 4
 .IX Item "-Z1"
 Convert X0208 kankaku to single \s-1ASCII\s0 space.
@@ -250,7 +267,7 @@ Convert X0208 kankaku to single \s-1ASCII\s0 space.
 Convert X0208 kankaku to double \s-1ASCII\s0 spaces.
 .IP "\fB\-Z3\fR" 4
 .IX Item "-Z3"
-Replacing fullwidth >, <, ", & into '&gt;', '&lt;', '&quot;', '&amp;' as in \s-1HTML\s0.
+Replacing fullwidth >, <, ", & into '&gt;', '&lt;', '&quot;', '&amp;' as in \s-1HTML.\s0
 .RE
 .RS 4
 .RE
@@ -261,15 +278,15 @@ With \fB\-x\fR, try to preserve X0208 kana and do not convert X0201 kana to X020
 In \s-1JIS\s0 output, \s-1ESC\-\s0(\-I is used. In \s-1EUC\s0 output, \s-1SS2\s0 is used.
 .IP "\fB\-B[0\-2]\fR" 4
 .IX Item "-B[0-2]"
-Assume broken JIS-Kanji input, which lost \s-1ESC\s0.
+Assume broken JIS-Kanji input, which lost \s-1ESC.\s0
 Useful when your site is using old B\-News Nihongo patch.
 .RS 4
 .IP "\fB\-B1\fR" 4
 .IX Item "-B1"
-allows any chars after \s-1ESC\-\s0( or \s-1ESC\-$\s0.
+allows any chars after \s-1ESC\-\s0( or \s-1ESC\-$.\s0
 .IP "\fB\-B2\fR" 4
 .IX Item "-B2"
-force \s-1ASCII\s0 after \s-1NL\s0.
+force \s-1ASCII\s0 after \s-1NL.\s0
 .RE
 .RS 4
 .RE
@@ -279,8 +296,8 @@ Replacing non iso\-2022\-jp char into a geta character
 (substitute character in Japanese).
 .IP "\fB\-m[\s-1BQN0\s0]\fR" 4
 .IX Item "-m[BQN0]"
-\&\s-1MIME\s0 \s-1ISO\-2022\-JP/ISO8859\-1\s0 decode. (\s-1DEFAULT\s0)
-To see \s-1ISO8859\-1\s0 (Latin\-1) \-l is necessary.
+\&\s-1MIME ISO\-2022\-JP/ISO8859\-1\s0 decode. (\s-1DEFAULT\s0)
+To see \s-1ISO8859\-1 \s0(Latin\-1) \-l is necessary.
 .RS 4
 .IP "\fB\-mB\fR" 4
 .IX Item "-mB"
@@ -315,8 +332,8 @@ Perform quoted encoding.
 .RE
 .IP "\fB\-l\fR" 4
 .IX Item "-l"
-Input and output code is \s-1ISO8859\-1\s0 (Latin\-1) and \s-1ISO\-2022\-JP\s0.
-\&\fB\-s\fR, \fB\-e\fR and \fB\-x\fR are not compatible with this option.
+Input and output code is \s-1ISO8859\-1 \s0(Latin\-1) and \s-1ISO\-2022\-JP.
+\&\s0\fB\-s\fR, \fB\-e\fR and \fB\-x\fR are not compatible with this option.
 .IP "\fB\-L[uwm] \-d \-c\fR" 4
 .IX Item "-L[uwm] -d -c"
 Convert line breaks.
@@ -351,10 +368,10 @@ Set the input or output codeset.
 .RS 4
 .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
+a.k.a. \s-1RFC1468,\s0 7bit \s-1JIS, JUNET\s0
 .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
+a.k.a. \s-1AT&T JIS,\s0 Japanese \s-1EUC, UJIS\s0
 .IP "eucJP-ascii" 4
 .IX Item "eucJP-ascii"
 .PD 0
@@ -366,7 +383,7 @@ a.k.a. \s-1AT&T\s0 \s-1JIS\s0, Japanese \s-1EUC\s0, \s-1UJIS\s0
 Microsoft Version of EUC-JP.
 .IP "Shift_JIS" 4
 .IX Item "Shift_JIS"
-a.k.a. \s-1SJIS\s0, MS_Kanji
+a.k.a. \s-1SJIS,\s0 MS_Kanji
 .IP "Windows\-31J" 4
 .IX Item "Windows-31J"
 a.k.a. \s-1CP932\s0
@@ -379,7 +396,7 @@ same as \s-1UTF\-8N\s0
 .IP "\s-1UTF\-8\-BOM\s0" 4
 .IX Item "UTF-8-BOM"
 \&\s-1UTF\-8\s0 with \s-1BOM\s0
-.IP "\s-1UTF8\-MAC\s0 (input only)" 4
+.IP "\s-1UTF8\-MAC \s0(input only)" 4
 .IX Item "UTF8-MAC (input only)"
 decomposed \s-1UTF\-8\s0
 .IP "\s-1UTF\-16\s0" 4
@@ -446,7 +463,7 @@ Unescape percent escaped characters.
 .IX Item "--numchar-input"
 Decode character reference, such as \*(L"&#....;\*(R".
 .IP "\fB\-\-in\-place[=\fR\fI\s-1SUFFIX\s0\fR\fB]\fR  \fB\-\-overwrite[=\fR\fI\s-1SUFFIX\s0\fR\fB]\fR" 4
-.IX Item "--in-place[=SUFFIX]  --overwrite[=SUFFIX]"
+.IX Item "--in-place[=SUFFIX] --overwrite[=SUFFIX]"
 Overwrite \fBoriginal\fR listed files by filtered result.
 .Sp
 \&\fBNote\fR \-\-overwrite preserves timestamps of original files.
@@ -464,6 +481,6 @@ Print nkf's version.
 Ignore rest of \-option.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-Copyright (c) 1987, Fujitsu \s-1LTD\s0. (Itaru \s-1ICHIKAWA\s0).
+Copyright (c) 1987, Fujitsu \s-1LTD. \s0(Itaru \s-1ICHIKAWA\s0).
 .PP
-Copyright (c) 1996\-2013, The nkf Project.
+Copyright (c) 1996\-2015, The nkf Project.

diff --git a/nkf.1j b/nkf.1j
index 547c588..551211e 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,21 +50,28 @@
 .\" 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.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2013-11-22" "nkf 2.1.3" " "
+.TH nkf 1 "2015-12-12" "nkf 2.1.4" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -81,7 +90,7 @@ nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 \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
 .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$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
@@ -126,8 +135,8 @@ Unicode \e$B$r=PNO$9$k!#\e(B
 .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
+\&\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
 .RS 4
@@ -178,11 +187,11 @@ Quoted stream \e$B$KJQ49$9$k\e(B
 \&\s-1ISO\-2022\-JP\s0 \e$B$r2>Dj$9$k!#\e(B
 .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
+\e$BF|K\8l\e(B \s-1EUC \s0(\s-1AT&T\s0) \e$B$r2>Dj$9$k!#\e(B
 .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
+\e$B$$$o$f$kH>3Q%+%J\e(B (\s-1JIS X 0201\s0 \e$BJR2>L>\e(B) \e$B$b<u$1F~$l$k!#\e(B
 .IP "\fB\-W\fR" 4
 .IX Item "-W"
 \&\s-1UTF\-8\s0 \e$B$r2>Dj$9$k!#\e(B
@@ -191,25 +200,25 @@ Shift_JIS \e$B$r2>Dj$9$k!#\e(B
 \&\s-1UTF\-8\s0 \e$B$r2>Dj$9$k!#\e(B
 .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)\e$B$r2>Dj$9$k!#\e(B
 .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)\e$B$r2>Dj$9$k!#\e(B
 .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)\e$B$r2>Dj$9$k!#\e(B
 .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$BDL>o$*$3$J$o$l$k!"$$$o$f$kH>3Q%+%J\e(B (\s-1JIS X 0201\s0 \e$BJR2>L>\e(B)
+\e$B$+$i$$$o$f$kA43Q%+%J\e(B (\s-1JIS X 0208\s0 \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
 .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
+\e$B$$$o$f$kH>3Q%+%J\e(B (\s-1JIS X 0201\s0 \e$BJR2>L>\e(B) \e$B$r\e(B \e$B$$$o$f$kA43Q%+%J\e(B (\s-1JIS X 0208\s0 \e$BJR2>L>\e(B) \e$B$X$HJQ49$9$k!#\e(B
 .IP "\fB\-B\fR" 4
 .IX Item "-B"
 \e$B2u$l$?\e(B (Broken) \s-1JIS\s0 \e$B%3!<%I!#\e(B
@@ -230,18 +239,18 @@ Shift_JIS \e$B$r2>Dj$9$k!#\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
 .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
+\&\s-1JIS X 0208\s0 \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
 .RS 4
 .IP "\fB\-Z \-Z0\fR" 4
 .IX Item "-Z -Z0"
-Convert X0208 alphabet to \s-1ASCII\s0.
+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 X 0208\s0 \e$BOB;z4V3V$r\e(B \s-1ASCII\s0 space \e$B0l$D$KJQ49$9$k!#\e(B
 .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 X 0208\s0 \e$BOB;z4V3V$r\e(B \s-1ASCII\s0 space \e$BFs$D$KJQ49$9$k!#\e(B
 .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
@@ -267,10 +276,10 @@ ssh localhost | nkf \-u \e$B$H$$$&$h$&$K;H$&!#\e(B
 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"
-\&\s-1JIS\s0 X 0208\-1978 \e$B$rMQ$$$k!#\e(B
+\&\s-1JIS X 0208\-1978\s0 \e$B$rMQ$$$k!#\e(B
 .IP "\fB\-iB\fR" 4
 .IX Item "-iB"
-\&\s-1JIS\s0 X 0208\-1983/1990 \e$B$rMQ$$$k!#\e(B
+\&\s-1JIS X 0208\-1983/1990\s0 \e$B$rMQ$$$k!#\e(B
 .RE
 .RS 4
 .RE
@@ -283,10 +292,10 @@ ssh localhost | nkf \-u \e$B$H$$$&$h$&$K;H$&!#\e(B
 1 \e$B%P%$%H1Q?tJ8;z%;%C%H$H$7$F\e(B US-ASCII \e$B$rMQ$$$k!#\e(B
 .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 \e$B%P%$%H1Q?tJ8;z%;%C%H$H$7$F\e(B \s-1JIS X 0201\s0 Roman \e$B$rMQ$$$k!#\e(B
 .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 \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
 .RE
 .RS 4
 .RE
@@ -301,7 +310,7 @@ ssh localhost | nkf \-u \e$B$H$$$&$h$&$K;H$&!#\e(B
 \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)
 .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
+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
 .IP "\fB\-O\fR" 4
@@ -337,19 +346,19 @@ mac (\s-1CR\s0)
 \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
 .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 2237\s0 \e$B$KDj$a$i$l$?7A<0!#\e(B \s-1JIS X 0212\s0 \e$B$r4^$`!#\e(B
 .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 2237\s0 \e$B$KDj$a$i$l$?7A<0!#\e(B \s-1JIS X 0213\s0 \e$B$r4^$`!#\e(B
 .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
 .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
+\e$BJ8;z=89g$K\e(B \s-1JIS X 0213:2000\s0 \e$B$rMQ$$$?\e(B EUC\-JP\e$B!#\e(B
 .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
+\e$BJ8;z=89g$K\e(B \s-1JIS X 0213:2004\s0 \e$B$rMQ$$$?\e(B EUC\-JP\e$B!#\e(B
 .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
@@ -368,15 +377,15 @@ Shift_JIS\e$B!#\e(B
 \&\fB\-s, \-S\fR \e$B$HF1$8!#\e(B
 .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
+\e$BJ8;z=89g$K\e(B \s-1JIS X 0213:2000\s0 \e$B$rMQ$$$?\e(B Shift_JIS\e$B!#\e(B
 .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
+\e$BJ8;z=89g$K\e(B \s-1JIS X 0213:2004\s0 \e$B$rMQ$$$?\e(B Shift_JIS\e$B!#\e(B
 .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
-.IP "\fB\s-1UTF\-8\s0 \s-1UTF\-8N\s0\fR" 4
+.IP "\fB\s-1UTF\-8 UTF\-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
@@ -387,7 +396,7 @@ Micorosft Code Page 932\e$B!#\e(B
 .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
-.IP "\fB\s-1UTF\-16\s0 \s-1UTF\-16BE\-BOM\s0\fR" 4
+.IP "\fB\s-1UTF\-16 UTF\-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
@@ -407,7 +416,7 @@ UTF8\-MAC\e$B!#8_49J,2r$5$l$?$R$i$,$J!&%+%?%+%JEy$r7k9g$7$^$9!#\e(B
 .RS 4
 .RE
 .IP "\fB\-\-fj \-\-unix \-\-mac \-\-msdos  \-\-windows\fR" 4
-.IX Item "--fj --unix --mac --msdos  --windows"
+.IX Item "--fj --unix --mac --msdos --windows"
 \e$B$3$l$i$N%7%9%F%`$KE,$7$?JQ49$r$7$^$9!#\e(B
 .IP "\fB\-\-jis \-\-euc \-\-sjis \-\-mime \-\-base64\fR" 4
 .IX Item "--jis --euc --sjis --mime --base64"
@@ -445,7 +454,7 @@ 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$
 .IX Item "--numchar-input"
 &#....; \e$B$N$h$&$J\e(B Unicode \e$BJ8;z;2>H$rJQ49$9$k\e(B
 .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]"
+.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
@@ -479,7 +488,7 @@ nkf [options] \-\-exec\-out cmd args... \e$B$H$d$k$H!"\e(Bnkf \e$B$N=PNO$r\e(B cmd \e
 \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!"\e(BShift_JIS \e$B$N$$$o$f$kH>3Q%+%J\e(B (\s-1JIS X 0201\s0 \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)
 .PP
@@ -517,7 +526,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .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
+.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 "Yoshiharu \s-1ITO\s0" 4
 .IX Item "Yoshiharu ITO"
@@ -538,7 +547,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .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)"
+.IX Item "Mitsuru Hase (\e$BD9C+\e(B \e$BK~\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 "Rei \s-1FURUKAWA\s0" 4
@@ -608,13 +617,13 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .IP "\e$B>.Eg4pLw\e(B" 4
 .IX Item "\e$B>.Eg4pLw\e(B"
 .IP "\e$B>eED!!7r\e(B" 4
-.IX Item "\e$B>eED!!7r\e(B"
+.IX Item "\e$B>eED\e(B \e$B7r\e(B"
 .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
-.IX Item "\e$B?9!!@i3(;R\e(B"
+.IX Item "\e$B?9\e(B \e$B@i3(;R\e(B"
 .IP "\e$B?9!!OBI'\e(B" 4
-.IX Item "\e$B?9!!OBI'\e(B"
+.IX Item "\e$B?9\e(B \e$BOBI'\e(B"
 .IP "\e$B?eLn\e(B \e$B5.J8\e(B" 4
 .IX Item "\e$B?eLn\e(B \e$B5.J8\e(B"
 .IP "\e$BA0COOB=S\e(B" 4
@@ -624,7 +633,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .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
-.IX Item "\e$BF#86!!=(9T\e(B"
+.IX Item "\e$BF#86\e(B \e$B=(9T\e(B"
 .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
@@ -642,7 +651,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .IP "\e$BMn9g0l4n\e(B" 4
 .IX Item "\e$BMn9g0l4n\e(B"
 .IP "\e$BNS\e(B  \e$BN<\e(B" 4
-.IX Item "\e$BNS\e(B  \e$BN<\e(B"
+.IX Item "\e$BNS\e(B \e$BN<\e(B"
 .IP "\e$BT"0B\e(B \e$B<#\e(B" 4
 .IX Item "\e$BT"0B\e(B \e$B<#\e(B"
 .IP "\e$BLZ2<\e(B \e$BM:2p\e(B" 4
@@ -663,12 +672,12 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .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)"
+.IX Item "\e$B;T@n\e(B \e$B;j\e(B ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)"
 .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 "Rei \s-1FURUKAWA\s0    furukawa@tcp\-ip.or.jp" 4
-.IX Item "Rei FURUKAWA    furukawa@tcp-ip.or.jp"
+.IX Item "\e$B2OLn\e(B \e$B??<#\e(B 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 "\e$B@.@%\e(B" 4
 .IX Item "\e$B@.@%\e(B"
 .IP "mastodon" 4
@@ -677,6 +686,6 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .PP
 http://sourceforge.jp/projects/nkf/
 .PP
-Copyright (C) 1987, \s-1FUJITSU\s0 \s-1LTD\s0. (I.Ichikawa).
+Copyright (C) 1987, \s-1FUJITSU LTD. \s0(I.Ichikawa).
 .PP
 Copyright (C) 1996\-2013, The nkf Project.

diff --git a/nkf.c b/nkf.c
index 2a3cb42..3e4364d 100644 (file)
--- a/nkf.c
+++ b/nkf.c
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.3"
-#define NKF_RELEASE_DATE "2013-11-22"
+#define NKF_VERSION "2.1.4"
+#define NKF_RELEASE_DATE "2015-12-12"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2013, The nkf Project."
+    "Copyright (C) 1996-2015, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"

diff --git a/nkf32dll.c b/nkf32dll.c
index c2208d7..60b22cf 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 */
-#define NKF_VERSIONW L"2.1.3"
+#define NKF_VERSIONW L"2.1.4"
 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
-#define DLL_VERSION   "2.1.3.0 2"
+#define DLL_VERSION   "2.1.4.0 2"
 /* DLL\82ª\95Ô\82· */
-#define DLL_VERSIONW L"2.1.3.0 2"
+#define DLL_VERSIONW L"2.1.4.0 2"
 /* 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 e08cb61..090c27b 100755 (executable)
--- a/version.rc
+++ b/version.rc
@@ -1,8 +1,8 @@
 #include <windows.h>\r
 \r
 1 VERSIONINFO\r
-FILEVERSION 2,1,3,0\r
-PRODUCTVERSION 2,1,3,0\r
+FILEVERSION 2,1,4,0\r
+PRODUCTVERSION 2,1,4,0\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
-            VALUE "FileVersion", "2.1.3\0"\r
+            VALUE "FileVersion", "2.1.4\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.3\0"\r
+            VALUE "ProductVersion", "2.1.4\0"\r
         }\r
     }\r
     BLOCK "VarFileInfo"\r