From 08043eadf4abdddcf277842217e3c77a24740dc2 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Sat, 15 Dec 2018 17:40:27 +0900 Subject: [PATCH] v2.1.5 --- Makefile | 2 +- NKF.mod/NKF.pm | 6 +++--- dll.rc | 8 ++++---- man/nkf.1.pm | 8 +++++--- man/nkf.1j.pm | 2 +- nkf.1 | 42 +++++++++++++++++++----------------------- nkf.1j | 50 +++++++++++++++++++++++--------------------------- nkf.c | 8 ++++---- nkf.doc | 2 +- nkf32dll.c | 6 +++--- version.rc | 8 ++++---- 11 files changed, 68 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index e519b97..1cfb459 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SHAR = shar # SHAR = shar -T PERL = perl RM = rm -rf -VERSION = 2.1.4 +VERSION = 2.1.5 MKDIR = mkdir prefix = /usr/local PYTHON2 = python diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm index 75d5950..e99aaca 100644 --- a/NKF.mod/NKF.pm +++ b/NKF.mod/NKF.pm @@ -1,5 +1,5 @@ # 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 @@ -35,7 +35,7 @@ require DynaLoader; @EXPORT = qw( nkf nkf_continue inputcode ); -$VERSION = '2.14'; +$VERSION = '2.15'; bootstrap NKF $VERSION; @@ -509,7 +509,7 @@ Ignore rest of -option. Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA). -Copyright (c) 1996-2015, The nkf Project. +Copyright (c) 1996-2018, The nkf Project. =begin FUNC diff --git a/dll.rc b/dll.rc index 8482299..d6f481a 100755 --- a/dll.rc +++ b/dll.rc @@ -1,8 +1,8 @@ #include 1 VERSIONINFO -FILEVERSION 2,1,4,0 -PRODUCTVERSION 2,1,4,0 +FILEVERSION 2,1,5,0 +PRODUCTVERSION 2,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,12 +19,12 @@ FILESUBTYPE 0x0L { VALUE "CompanyName", "project nkf\0" VALUE "FileDescription", "Network Kanji Filter\0" - VALUE "FileVersion", "2.1.4.0 1\0" + VALUE "FileVersion", "2.1.5.0 1\0" VALUE "InternalName", "nkf32\0" VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA); Copyright (C) 2003-2004 T.kaneto\0" VALUE "OriginalFilename", "nkf32.c\0" VALUE "ProductName", "nkf32.dll\0" - VALUE "ProductVersion", "2.1.4.0 1\0" + VALUE "ProductVersion", "2.1.5.0 1\0" } } BLOCK "VarFileInfo" diff --git a/man/nkf.1.pm b/man/nkf.1.pm index 8a6757c..978ddd9 100644 --- a/man/nkf.1.pm +++ b/man/nkf.1.pm @@ -1,5 +1,5 @@ # 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 @@ -35,7 +35,7 @@ require DynaLoader; @EXPORT = qw( nkf nkf_continue inputcode ); -$VERSION = '2.14'; +$VERSION = '2.15'; bootstrap NKF $VERSION; @@ -52,12 +52,14 @@ __END__ =head1 NAME + nkf - Network Kanji Filter =head1 SYNOPSIS + nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>IB<]> @@ -481,7 +483,7 @@ Ignore rest of -option. Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA). -Copyright (c) 1996-2015, The nkf Project. +Copyright (c) 1996-2018, The nkf Project. =cut diff --git a/man/nkf.1j.pm b/man/nkf.1j.pm index 9db36b9..3a764d5 100755 --- 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) 1996-2016, The nkf Project. +Copyright (C) 1996-2018, The nkf Project. =cut diff --git a/nkf.1 b/nkf.1 index d9747a2..09b5981 100644 --- 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: .\" ======================================================================== @@ -46,7 +46,7 @@ .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. @@ -54,20 +54,16 @@ .\" 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. @@ -133,7 +129,7 @@ .\" ======================================================================== .\" .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 @@ -174,7 +170,7 @@ 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 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@" -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" -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 @@ -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) -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" @@ -332,8 +328,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. @@ -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-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 @@ -481,6 +477,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\-2015, The nkf Project. +Copyright (c) 1996\-2018, The nkf Project. diff --git a/nkf.1j b/nkf.1j index afbb846..5515c68 100644 --- 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: .\" ======================================================================== @@ -46,7 +46,7 @@ .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. @@ -54,24 +54,20 @@ .\" 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" -.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 @@ -90,7 +86,7 @@ nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR $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$O3NDj$9$k!#(B .IP "\fB\-E\fR" 4 .IX Item "-E" -$BF|K\8l(B \s-1EUC \s0(\s-1AT&T\s0) $B$r2>Dj$9$k!#(B +$BF|K\8l(B \s-1EUC\s0 (\s-1AT&T\s0) $B$r2>Dj$9$k!#(B .IP "\fB\-S\fR" 4 .IX Item "-S" Shift_JIS $B$r2>Dj$9$k!#(B @@ -200,13 +196,13 @@ Shift_JIS $B$r2>Dj$9$k!#(B \&\s-1UTF\-8\s0 $B$r2>Dj$9$k!#(B .IP "\fB\-W16\fR" 4 .IX Item "-W16" -\&\s-1UTF\-16 \s0(Little Endian)$B$r2>Dj$9$k!#(B +\&\s-1UTF\-16\s0 (Little Endian)$B$r2>Dj$9$k!#(B .IP "\fB\-W16B\fR" 4 .IX Item "-W16B" -\&\s-1UTF\-16 \s0(Big Endian)$B$r2>Dj$9$k!#(B +\&\s-1UTF\-16\s0 (Big Endian)$B$r2>Dj$9$k!#(B .IP "\fB\-W16L\fR" 4 .IX Item "-W16L" -\&\s-1UTF\-16 \s0(Little Endian)$B$r2>Dj$9$k!#(B +\&\s-1UTF\-16\s0 (Little Endian)$B$r2>Dj$9$k!#(B .RE .RS 4 .RE @@ -295,7 +291,7 @@ ssh localhost | nkf \-u $B$H$$$&$h$&$K;H$&!#(B 1 $B%P%$%H1Q?tJ8;z%;%C%H$H$7$F(B \s-1JIS X 0201\s0 Roman $B$rMQ$$$k!#(B .IP "\fB\-oH\fR" 4 .IX Item "-oH" -\&\s-1ESC \s0( H $B$O=i4|$N(B \s-1JUNET\s0 $B%3!<%I$G$N$_MQ$$$i$l$?$b$N$G!"8=:_$O;H$C$F$O$J$i$J$$!#(B +\&\s-1ESC\s0 ( H $B$O=i4|$N(B \s-1JUNET\s0 $B%3!<%I$G$N$_MQ$$$i$l$?$b$N$G!"8=:_$O;H$C$F$O$J$i$J$$!#(B .RE .RS 4 .RE @@ -310,7 +306,7 @@ ssh localhost | nkf \-u $B$H$$$&$h$&$K;H$&!#(B $B%F%-%9%H%b!<%I$G=PNO$9$k!#(B(\s-1MS\-DOS\s0 $B>e$G$N$_8zNO$r;}$D(B) .IP "\fB\-l\fR" 4 .IX Item "-l" -0x80\-0xfe $B$N%3!<%I$r(B \s-1ISO\-8859\-1 \s0(Latin\-1) $B$H$7$F07$&!#(B +0x80\-0xfe $B$N%3!<%I$r(B \s-1ISO\-8859\-1\s0 (Latin\-1) $B$H$7$F07$&!#(B \&\s-1JIS\s0 $B%3!<%I%"%&%H%W%C%H$H$NAH9g$;$_$N$_M-8z!#(B \&\fB\-s, \-e, \-x\fR $B$H$ON>N)$7$J$$!#(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" -.IP "Ikuhiro \s-1MORITA \s0($B?9ED(B $B0i9((B)" 4 +.IP "Ikuhiro \s-1MORITA\s0 ($B?9ED(B $B0i9((B)" 4 .IX Item "Ikuhiro MORITA ($B?9ED(B $B0i9((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 "$B2OLn(B $B??<#(B kono@ie.u\-ryukyu.acjp" 4 .IX Item "$B2OLn(B $B??<#(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 "$B@.@%(B" 4 .IX Item "$B@.@%(B" @@ -686,6 +682,6 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0) .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 -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 --- a/nkf.c +++ b/nkf.c @@ -1,6 +1,6 @@ /* * 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 @@ -20,11 +20,11 @@ * * 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" \ - "Copyright (C) 1996-2015, The nkf Project." + "Copyright (C) 1996-2018, The nkf Project." #include "config.h" #include "nkf.h" diff --git a/nkf.doc b/nkf.doc index f80e59d..1cadaef 100644 --- a/nkf.doc +++ b/nkf.doc @@ -409,5 +409,5 @@ AUTHOR 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 --- a/nkf32dll.c +++ b/nkf32dll.c @@ -4,11 +4,11 @@ /*WIN32DLL*/ /* ‚±‚¿‚ç‚̃o[ƒWƒ‡ƒ“‚àXV‚µ‚Ä‚­‚¾‚³‚¢B */ -#define NKF_VERSIONW L"2.1.4" +#define NKF_VERSIONW L"2.1.5" /* NKF_VERSION ‚̃ƒCƒh•¶Žš */ -#define DLL_VERSION "2.1.4.0 2" +#define DLL_VERSION "2.1.5.0 2" /* DLL‚ª•Ô‚· */ -#define DLL_VERSIONW L"2.1.4.0 2" +#define DLL_VERSIONW L"2.1.5.0 2" /* DLL‚ª•Ô‚· DLL_VERSION ‚̃ƒCƒh•¶Žš */ /* nkf32.dll main */ diff --git a/version.rc b/version.rc index 090c27b..a02ad96 100755 --- a/version.rc +++ b/version.rc @@ -1,8 +1,8 @@ #include 1 VERSIONINFO -FILEVERSION 2,1,4,0 -PRODUCTVERSION 2,1,4,0 +FILEVERSION 2,1,5,0 +PRODUCTVERSION 2,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,12 +19,12 @@ FILESUBTYPE 0x0L { VALUE "CompanyName", "project nkf\0" VALUE "FileDescription", "Network Kanji Filter\0" - VALUE "FileVersion", "2.1.4\0" + VALUE "FileVersion", "2.1.5\0" VALUE "InternalName", "nkf\0" VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)\0" VALUE "OriginalFilename", "nkf.c\0" VALUE "ProductName", "nkf.exe\0" - VALUE "ProductVersion", "2.1.4\0" + VALUE "ProductVersion", "2.1.5\0" } } BLOCK "VarFileInfo" -- 2.11.0