v2.1.5

diff --git a/Makefile b/Makefile
index e519b97..1cfb459 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.4
+VERSION = 2.1.5

 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 75d5950..e99aaca 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) 1987, Fujitsu LTD. (Itaru ICHIKAWA).

-# Copyright (c) 1996-2015, The nkf Project.
+# Copyright (c) 1996-2018, The nkf Project.

 # All rights reserved.
 #
 # This software is provided 'as-is', without any express or implied
 # 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
 );
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );

-$VERSION = '2.14';
+$VERSION = '2.15';

 
 bootstrap NKF $VERSION;
 
 
 bootstrap NKF $VERSION;
 


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

-Copyright (c) 1996-2015, The nkf Project.
+Copyright (c) 1996-2018, The nkf Project.

 
 =begin FUNC
 
 
 =begin FUNC
 

diff --git a/dll.rc b/dll.rc
index 8482299..d6f481a 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,4,0\r
-PRODUCTVERSION 2,1,4,0\r
+FILEVERSION 2,1,5,0\r
+PRODUCTVERSION 2,1,5,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.4.0 1\0"\r
+            VALUE "FileVersion", "2.1.5.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.4.0 1\0"\r
+            VALUE "ProductVersion", "2.1.5.0 1\0"\r

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

diff --git a/man/nkf.1.pm b/man/nkf.1.pm
index 8a6757c..978ddd9 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) 1987, Fujitsu LTD. (Itaru ICHIKAWA).

-# Copyright (c) 1996-2015, The nkf Project.
+# Copyright (c) 1996-2018, The nkf Project.

 # All rights reserved.
 #
 # This software is provided 'as-is', without any express or implied
 # 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
 );
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );

-$VERSION = '2.14';
+$VERSION = '2.15';

 
 bootstrap NKF $VERSION;
 
 
 bootstrap NKF $VERSION;
 


@@ -52,12 +52,14 @@ __END__
 =head1 NAME
 
 
 =head1 NAME
 
 

+

 nkf - Network Kanji Filter
 
 
 =head1 SYNOPSIS
 
 
 nkf - Network Kanji Filter
 
 
 =head1 SYNOPSIS
 
 

+

 nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
 
 
 nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
 
 


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

-Copyright (c) 1996-2015, The nkf Project.
+Copyright (c) 1996-2018, The nkf Project.

 
 
 =cut
 
 
 =cut

diff --git a/man/nkf.1j.pm b/man/nkf.1j.pm
index 9db36b9..3a764d5 100755 (executable)
--- a/man/nkf.1j.pm
+++ b/man/nkf.1j.pm
@@ -727,6 +727,6 @@ https://osdn.jp/projects/nkf/
 
 Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 
 
 Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 

-Copyright (C) 1996-2016, The nkf Project.
+Copyright (C) 1996-2018, The nkf Project.

 
 =cut
 
 =cut

diff --git a/nkf.1 b/nkf.1
index d9747a2..09b5981 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)

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


@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
 .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 >0, we'll generate index entries on stderr for

 .\" 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.
 .\" 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.


@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
 .\" Avoid warning from groff about undefined register 'F'.
 .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 .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"

 ..
 ..

-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 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.
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.


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

-.TH nkf 1 "2015-12-12" "nkf 2.1.4" " "
+.TH nkf 1 "2018-12-15" "nkf 2.1.5" " "

 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l


@@ -174,7 +170,7 @@ cf. \-\-ic and \-\-oc.
 .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(\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 X 0201\s0 kana.
 .IP "\fB\-S\fR" 4
 .IX Item "-S"
 Shift_JIS and \s-1JIS X 0201\s0 kana.


@@ -212,10 +208,10 @@ Specify the escape sequence for \s-1JIS X 0208.\s0
 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"
 .RS 4
 .IP "\fB\-i@\fR" 4
 .IX Item "-i@"

-Use \s-1ESC \s0( @. (\s-1JIS X 0208\-1978\s0)
+Use \s-1ESC\s0 ( @. (\s-1JIS X 0208\-1978\s0)

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

-Use \s-1ESC \s0( B. (\s-1JIS X 0208\-1983/1990 DEFAULT\s0)
+Use \s-1ESC\s0 ( B. (\s-1JIS X 0208\-1983/1990 DEFAULT\s0)

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


@@ -297,7 +293,7 @@ Replacing non iso\-2022\-jp char into a geta character
 .IP "\fB\-m[\s-1BQN0\s0]\fR" 4
 .IX Item "-m[BQN0]"
 \&\s-1MIME ISO\-2022\-JP/ISO8859\-1\s0 decode. (\s-1DEFAULT\s0)
 .IP "\fB\-m[\s-1BQN0\s0]\fR" 4
 .IX Item "-m[BQN0]"
 \&\s-1MIME ISO\-2022\-JP/ISO8859\-1\s0 decode. (\s-1DEFAULT\s0)

-To see \s-1ISO8859\-1 \s0(Latin\-1) \-l is necessary.
+To see \s-1ISO8859\-1\s0 (Latin\-1) \-l is necessary.

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


@@ -332,8 +328,8 @@ Perform quoted encoding.
 .RE
 .IP "\fB\-l\fR" 4
 .IX Item "-l"
 .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.
 .IP "\fB\-L[uwm] \-d \-c\fR" 4
 .IX Item "-L[uwm] -d -c"
 Convert line breaks.


@@ -396,7 +392,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-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
 .IX Item "UTF8-MAC (input only)"
 decomposed \s-1UTF\-8\s0
 .IP "\s-1UTF\-16\s0" 4


@@ -481,6 +477,6 @@ Print nkf's version.
 Ignore rest of \-option.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 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
 .PP

-Copyright (c) 1996\-2015, The nkf Project.
+Copyright (c) 1996\-2018, The nkf Project.

diff --git a/nkf.1j b/nkf.1j
index afbb846..5515c68 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)

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


@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
 .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 >0, we'll generate index entries on stderr for

 .\" 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.
 .\" 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.


@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
 .\" Avoid warning from groff about undefined register 'F'.
 .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 .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"

 ..
 ..

-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2

 .    \}
 .\}
 .    \}
 .\}

-.rr rF

 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"

-.TH nkf 1 "2015-12-12" "nkf 2.1.4" " "
+.TH nkf 1 "2018-12-15" "nkf 2.1.5" " "

 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l


@@ -90,7 +86,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$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
 \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


@@ -135,8 +131,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)
 .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
 \&\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


@@ -187,7 +183,7 @@ 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"
 \&\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
 .IP "\fB\-S\fR" 4
 .IX Item "-S"
 Shift_JIS \e$B$r2>Dj$9$k!#\e(B


@@ -200,13 +196,13 @@ 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\-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"
 .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"
 .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
 .RE
 .RS 4
 .RE


@@ -295,7 +291,7 @@ 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 \s-1JIS X 0201\s0 Roman \e$B$rMQ$$$k!#\e(B
 .IP "\fB\-oH\fR" 4
 .IX Item "-oH"
 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
 .RE
 .RS 4
 .RE


@@ -310,7 +306,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"
 \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
 \&\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


@@ -526,7 +522,7 @@ 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
+.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"
 .IX Item "Ikuhiro MORITA (\e$B?9ED\e(B \e$B0i9(\e(B)"
 .IP "Yoshiharu \s-1ITO\s0" 4
 .IX Item "Yoshiharu ITO"


@@ -676,7 +672,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .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"
 .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
+.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"
 .IX Item "Rei FURUKAWA furukawa@tcp-ip.or.jp"
 .IP "\e$B@.@%\e(B" 4
 .IX Item "\e$B@.@%\e(B"


@@ -686,6 +682,6 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0)
 .PP
 https://osdn.jp/projects/nkf/
 .PP
 .PP
 https://osdn.jp/projects/nkf/
 .PP

-Copyright (C) 1987, \s-1FUJITSU LTD. \s0(I.Ichikawa).
+Copyright (C) 1987, \s-1FUJITSU LTD.\s0 (I.Ichikawa).

 .PP
 .PP

-Copyright (C) 1996\-2016, The nkf Project.
+Copyright (C) 1996\-2018, The nkf Project.

diff --git a/nkf.c b/nkf.c
index f6a25dd..cc438a5 100644 (file)
--- a/nkf.c
+++ b/nkf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
 /*
  * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).

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

  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages


@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */

-#define NKF_VERSION "2.1.4"
-#define NKF_RELEASE_DATE "2015-12-12"
+#define NKF_VERSION "2.1.5"
+#define NKF_RELEASE_DATE "2018-12-15"

 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \

-    "Copyright (C) 1996-2015, The nkf Project."
+    "Copyright (C) 1996-2018, The nkf Project."

 
 #include "config.h"
 #include "nkf.h"
 
 #include "config.h"
 #include "nkf.h"

diff --git a/nkf.doc b/nkf.doc
index f80e59d..1cadaef 100644 (file)
--- a/nkf.doc
+++ b/nkf.doc
@@ -409,5 +409,5 @@ AUTHOR
 
     Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 
 
     Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).
 

-    Copyright (C) 1996-2016, The nkf Project.
+    Copyright (C) 1996-2018, The nkf Project.

 
 

diff --git a/nkf32dll.c b/nkf32dll.c
index 60b22cf..799dfd7 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.4"
+#define NKF_VERSIONW L"2.1.5"

 /* 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.4.0 2"
+#define DLL_VERSION   "2.1.5.0 2"

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

-#define DLL_VERSIONW L"2.1.4.0 2"
+#define DLL_VERSIONW L"2.1.5.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 090c27b..a02ad96 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,4,0\r
-PRODUCTVERSION 2,1,4,0\r
+FILEVERSION 2,1,5,0\r
+PRODUCTVERSION 2,1,5,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.4\0"\r
+            VALUE "FileVersion", "2.1.5\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.4\0"\r
+            VALUE "ProductVersion", "2.1.5\0"\r

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