From 50470507730eac4319dccc907f46f36fb168edea Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Sat, 12 Dec 2015 22:31:34 +0900 Subject: [PATCH] bump version --- Makefile | 2 +- NKF.mod/NKF.pm | 6 +-- dll.rc | 8 ++-- man/nkf.1.pm | 12 ++++-- nkf.1 | 101 +++++++++++++++++++++++++++++--------------------- nkf.1j | 115 +++++++++++++++++++++++++++++++-------------------------- nkf.c | 6 +-- nkf32dll.c | 6 +-- version.rc | 8 ++-- 9 files changed, 148 insertions(+), 116 deletions(-) diff --git a/Makefile b/Makefile index e66b30c..b8a54f8 100644 --- 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 --- 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 --- a/dll.rc +++ b/dll.rc @@ -1,8 +1,8 @@ #include 1 VERSIONINFO -FILEVERSION 2,1,3,0 -PRODUCTVERSION 2,1,3,0 +FILEVERSION 2,1,4,0 +PRODUCTVERSION 2,1,4,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.3.0 1\0" + VALUE "FileVersion", "2.1.4.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.3.0 1\0" + VALUE "ProductVersion", "2.1.4.0 1\0" } } BLOCK "VarFileInfo" diff --git a/man/nkf.1.pm b/man/nkf.1.pm index 6d4cf6d..8a6757c 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-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 --- 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 '>', '<', '"', '&' as in \s-1HTML\s0. +Replacing fullwidth >, <, ", & into '>', '<', '"', '&' 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 --- 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 $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 -$B$$$o$f$kH>3Q%+%J(B (\s-1JIS\s0 X 0201 $BJR2>L>(B) $B$b3Q%+%J(B (\s-1JIS X 0201\s0 $BJR2>L>(B) $B$bDj$9$k!#(B @@ -191,25 +200,25 @@ 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 .IP "\fB\-x\fR" 4 .IX Item "-x" -$BDL>o$*$3$J$o$l$k!"$$$o$f$kH>3Q%+%J(B (\s-1JIS\s0 X 0201 $BJR2>L>(B) -$B$+$i$$$o$f$kA43Q%+%J(B (\s-1JIS\s0 X 0208 $BJR2>L>(B) $B$X$NJQ49$r9T$o$:!"H>3Q%+%J$rJ]B8$9$k!#(B +$BDL>o$*$3$J$o$l$k!"$$$o$f$kH>3Q%+%J(B (\s-1JIS X 0201\s0 $BJR2>L>(B) +$B$+$i$$$o$f$kA43Q%+%J(B (\s-1JIS X 0208\s0 $BJR2>L>(B) $B$X$NJQ49$r9T$o$:!"H>3Q%+%J$rJ]B8$9$k!#(B $BF~NO$O!"(BShift_JIS $B$N(B 1byte $B%+%J!"(BSO/SI$B!"(BESC\-(\-I, \s-1SSO\s0 $B$r3Q%+%J(B (\s-1JIS\s0 X 0201 $BJR2>L>(B) $B$r(B $B$$$o$f$kA43Q%+%J(B (\s-1JIS\s0 X 0208 $BJR2>L>(B) $B$X$HJQ49$9$k!#(B +$B$$$o$f$kH>3Q%+%J(B (\s-1JIS X 0201\s0 $BJR2>L>(B) $B$r(B $B$$$o$f$kA43Q%+%J(B (\s-1JIS X 0208\s0 $BJR2>L>(B) $B$X$HJQ49$9$k!#(B .IP "\fB\-B\fR" 4 .IX Item "-B" $B2u$l$?(B (Broken) \s-1JIS\s0 $B%3!<%I!#(B @@ -230,18 +239,18 @@ Shift_JIS $B$r2>Dj$9$k!#(B $B%G%U%)%k%H$OJ8;z?t$O(B 60$B!"%^!<%8%s$O(B 10 $B$G$"$k!#(B .IP "\fB\-Z[0\-3]\fR" 4 .IX Item "-Z[0-3]" -\&\s-1JIS\s0 X 0208 $B1Q?t;z$H3Q$KJQ49$9$k!#(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 $BOB;z4V3V$r(B \s-1ASCII\s0 space $B0l$D$KJQ49$9$k!#(B +\&\s-1JIS X 0208\s0 $BOB;z4V3V$r(B \s-1ASCII\s0 space $B0l$D$KJQ49$9$k!#(B .IP "\fB\-Z2\fR" 4 .IX Item "-Z2" -\&\s-1JIS\s0 X 0208 $BOB;z4V3V$r(B \s-1ASCII\s0 space $BFs$D$KJQ49$9$k!#(B +\&\s-1JIS X 0208\s0 $BOB;z4V3V$r(B \s-1ASCII\s0 space $BFs$D$KJQ49$9$k!#(B .IP "\fB\-Z3\fR" 4 .IX Item "-Z3" $B!d!"!c!"!I!"!u!"$r(B >$B!"(B<$B!"(B"$B!"(B& $B$KJQ49$9$k!#(B @@ -267,10 +276,10 @@ ssh localhost | nkf \-u $B$H$$$&$h$&$K;H$&!#(B .RS 4 .IP "\fB\-i@\fR" 4 .IX Item "-i@" -\&\s-1JIS\s0 X 0208\-1978 $B$rMQ$$$k!#(B +\&\s-1JIS X 0208\-1978\s0 $B$rMQ$$$k!#(B .IP "\fB\-iB\fR" 4 .IX Item "-iB" -\&\s-1JIS\s0 X 0208\-1983/1990 $B$rMQ$$$k!#(B +\&\s-1JIS X 0208\-1983/1990\s0 $B$rMQ$$$k!#(B .RE .RS 4 .RE @@ -283,10 +292,10 @@ ssh localhost | nkf \-u $B$H$$$&$h$&$K;H$&!#(B 1 $B%P%$%H1Q?tJ8;z%;%C%H$H$7$F(B US-ASCII $B$rMQ$$$k!#(B .IP "\fB\-oJ\fR" 4 .IX Item "-oJ" -1 $B%P%$%H1Q?tJ8;z%;%C%H$H$7$F(B \s-1JIS\s0 X 0201 Roman $B$rMQ$$$k!#(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 @@ -301,7 +310,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 @@ -337,19 +346,19 @@ mac (\s-1CR\s0) $B$$$o$f$k(B \s-1JIS\s0 $B%3!<%I!#(B\fB\-j, \-J\fR $B$HF1$8!#(B .IP "\fB\s-1ISO\-2022\-JP\-1\s0\fR" 4 .IX Item "ISO-2022-JP-1" -\&\s-1RFC\s0 2237 $B$KDj$a$i$l$?7A<0!#(B \s-1JIS\s0 X 0212 $B$r4^$`!#(B +\&\s-1RFC 2237\s0 $B$KDj$a$i$l$?7A<0!#(B \s-1JIS X 0212\s0 $B$r4^$`!#(B .IP "\fB\s-1ISO\-2022\-JP\-3\s0\fR" 4 .IX Item "ISO-2022-JP-3" -\&\s-1RFC\s0 2237 $B$KDj$a$i$l$?7A<0!#(B \s-1JIS\s0 X 0213 $B$r4^$`!#(B +\&\s-1RFC 2237\s0 $B$KDj$a$i$l$?7A<0!#(B \s-1JIS X 0213\s0 $B$r4^$`!#(B .IP "\fBEUC-JP\fR" 4 .IX Item "EUC-JP" \&\s-1EUC\s0 $B%3!<%I!#(B\fB\-e, \-E\fR $B$HF1$8!#(B .IP "\fB\s-1EUC\-JISX0213\s0\fR" 4 .IX Item "EUC-JISX0213" -$BJ8;z=89g$K(B \s-1JIS\s0 X 0213:2000 $B$rMQ$$$?(B EUC\-JP$B!#(B +$BJ8;z=89g$K(B \s-1JIS X 0213:2000\s0 $B$rMQ$$$?(B EUC\-JP$B!#(B .IP "\fB\s-1EUC\-JIS\-2004\s0\fR" 4 .IX Item "EUC-JIS-2004" -$BJ8;z=89g$K(B \s-1JIS\s0 X 0213:2004 $B$rMQ$$$?(B EUC\-JP$B!#(B +$BJ8;z=89g$K(B \s-1JIS X 0213:2004\s0 $B$rMQ$$$?(B EUC\-JP$B!#(B .IP "\fBeucJP-ascii\fR" 4 .IX Item "eucJP-ascii" $B%*!<%W%s%0%k!<%WF|K\%Y%s%@6(5D2q$,Dj5A$7$?(B eucJP\-ascii$B!#(B @@ -368,15 +377,15 @@ Shift_JIS$B!#(B \&\fB\-s, \-S\fR $B$HF1$8!#(B .IP "\fBShift_JISX0213\fR" 4 .IX Item "Shift_JISX0213" -$BJ8;z=89g$K(B \s-1JIS\s0 X 0213:2000 $B$rMQ$$$?(B Shift_JIS$B!#(B +$BJ8;z=89g$K(B \s-1JIS X 0213:2000\s0 $B$rMQ$$$?(B Shift_JIS$B!#(B .IP "\fBShift_JIS\-2004\fR" 4 .IX Item "Shift_JIS-2004" -$BJ8;z=89g$K(B \s-1JIS\s0 X 0213:2004 $B$rMQ$$$?(B Shift_JIS$B!#(B +$BJ8;z=89g$K(B \s-1JIS X 0213:2004\s0 $B$rMQ$$$?(B Shift_JIS$B!#(B .IP "\fB\s-1CP932\s0\fR" 4 .IX Item "CP932" Micorosft Code Page 932$B!#(B \&\fB\-x\fR $B$,0EL[$N$&$A$K;XDj$5$l$k!#(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 $BL5$7$N(B UTF\-8$B!#(B \&\fB\-w, \-W\fR $B$HF1$8!#(B @@ -387,7 +396,7 @@ Micorosft Code Page 932$B!#(B .IX Item "UTF8-MAC" UTF8\-MAC$B!#8_49J,2r$5$l$?$R$i$,$J!&%+%?%+%JEy$r7k9g$7$^$9!#(B $BF~NO$N$_$NBP1~$G$9!#(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 $BM-$j$G(B Big Endian $B$N(B UTF\-16$B!#(B \&\fB\-w16B, \-W16B\fR $B$HF1$8!#(B @@ -407,7 +416,7 @@ UTF8\-MAC$B!#8_49J,2r$5$l$?$R$i$,$J!&%+%?%+%JEy$r7k9g$7$^$9!#(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" $B$3$l$i$N%7%9%F%`$KE,$7$?JQ49$r$7$^$9!#(B .IP "\fB\-\-jis \-\-euc \-\-sjis \-\-mime \-\-base64\fR" 4 .IX Item "--jis --euc --sjis --mime --base64" @@ -445,7 +454,7 @@ Unicode $B$+$i(B Unicode $B$NJQ49$N:]$K(B \-x $B$H6&$K;XDj$9$k$H!"(Bnkf $ .IX Item "--numchar-input" &#....; $B$N$h$&$J(B Unicode $BJ8;z;2>H$rJQ49$9$k(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]" $B85$N%U%!%$%k$rJQ497k2L$GCV$-49$($k!#(B $BJ#?t$N%U%!%$%k$r=q$-49$($k$3$H$b2DG=!#(B $B85$N%U%!%$%k$N%?%$%`%9%?%s%W$H%Q!<%_%C%7%g%s$,J];}$5$l$k!#(B @@ -479,7 +488,7 @@ nkf [options] \-\-exec\-out cmd args... $B$H$d$k$H!"(Bnkf $B$N=PNO$r(B cmd  $B$=$7$F!"FCDjITG=$N4V$OJ]N1%P%C%U%!$K$?$a$F$*$+$l!"3NDj8e$K=hM}$5$l$k!#(B $B$3$N$?$a!"(B7 $B%S%C%H(B \s-1JIS\s0 $B$O>o$KG'<1$5$l$k!#(B Shift_JIS$B!"(BEUC $B:.9g$b$[$H$s$I$N>l9g$OLdBj$,$J$$!#(B -$B$?$@$7!"(BShift_JIS $B$N$$$o$f$kH>3Q%+%J(B (\s-1JIS\s0 X 0201 $BJR2>L>(B) $B$H(B \s-1EUC\s0 $B4A;z$,<1JL$G$-$J$$!#(B +$B$?$@$7!"(BShift_JIS $B$N$$$o$f$kH>3Q%+%J(B (\s-1JIS X 0201\s0 $BJR2>L>(B) $B$H(B \s-1EUC\s0 $B4A;z$,<1JL$G$-$J$$!#(B $B$7$?$,$C$F!"%G%U%)%k%H$G$O(B Shift_JIS $B$N$$$o$f$kH>3Q%+%J$O$J$$$H2>Dj$7$F$$$k!#(B ($B$D$^$j!"(BShift_JIS $B$+(B \s-1EUC\s0 $B$+LB$C$?;~$O(B \s-1EUC\s0 $B$H$_$J$9(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 ($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" @@ -538,7 +547,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0) .IP "Koichi Hirayama" 4 .IX Item "Koichi Hirayama" .IP "Mitsuru Hase ($BD9C+!!K~(B)" 4 -.IX Item "Mitsuru Hase ($BD9C+!!K~(B)" +.IX Item "Mitsuru Hase ($BD9C+(B $BK~(B)" .IP "\s-1OHARA\s0 Shigeki ($BBg86(B $B=E.Eg4pLw(B" 4 .IX Item "$B>.Eg4pLw(B" .IP "$B>eED!!7r(B" 4 -.IX Item "$B>eED!!7r(B" +.IX Item "$B>eED(B $B7r(B" .IP "$B?70f(B $B9/;J(B (Koji Arai)" 4 .IX Item "$B?70f(B $B9/;J(B (Koji Arai)" .IP "$B?9!!@i3(;R(B" 4 -.IX Item "$B?9!!@i3(;R(B" +.IX Item "$B?9(B $B@i3(;R(B" .IP "$B?9!!OBI'(B" 4 -.IX Item "$B?9!!OBI'(B" +.IX Item "$B?9(B $BOBI'(B" .IP "$B?eLn(B $B5.J8(B" 4 .IX Item "$B?eLn(B $B5.J8(B" .IP "$BA0COOB=S(B" 4 @@ -624,7 +633,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0) .IP "$BCvC+(B $B1Q0lO:(B == Eiichiro Itani" 4 .IX Item "$BCvC+(B $B1Q0lO:(B == Eiichiro Itani" .IP "$BF#86!!=(9T(B" 4 -.IX Item "$BF#86!!=(9T(B" +.IX Item "$BF#86(B $B=(9T(B" .IP "$BH,ED(B $B??9T(B (Masayuki Hatta)" 4 .IX Item "$BH,ED(B $B??9T(B (Masayuki Hatta)" .IP "$BHx@nIRLi(B" 4 @@ -642,7 +651,7 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0) .IP "$BMn9g0l4n(B" 4 .IX Item "$BMn9g0l4n(B" .IP "$BNS(B $BN<(B" 4 -.IX Item "$BNS(B $BN<(B" +.IX Item "$BNS(B $BN<(B" .IP "$BT"0B(B $B<#(B" 4 .IX Item "$BT"0B(B $B<#(B" .IP "$BLZ2<(B $BM:2p(B" 4 @@ -663,12 +672,12 @@ GHG00637@nifty\-serve.or.jp (\s-1COW\s0) .SH "AUTHOR" .IX Header "AUTHOR" .IP "$B;T@n(B $B;j(B ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)" 4 -.IX Item "$B;T@n(B $B;j(B ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)" +.IX Item "$B;T@n(B $B;j(B ichikawa@flab.fujitsu.co.jp (was ichikawa@fujitsu.JUNET)" .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 -.IX Item "Rei FURUKAWA furukawa@tcp-ip.or.jp" +.IX Item "$B2OLn(B $B??<#(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 "$B@.@%(B" 4 .IX Item "$B@.@%(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 --- 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 --- a/nkf32dll.c +++ b/nkf32dll.c @@ -4,11 +4,11 @@ /*WIN32DLL*/ /* ‚±‚¿‚ç‚̃o[ƒWƒ‡ƒ“‚àXV‚µ‚Ä‚­‚¾‚³‚¢B */ -#define NKF_VERSIONW L"2.1.3" +#define NKF_VERSIONW L"2.1.4" /* NKF_VERSION ‚̃ƒCƒh•¶Žš */ -#define DLL_VERSION "2.1.3.0 2" +#define DLL_VERSION "2.1.4.0 2" /* DLL‚ª•Ô‚· */ -#define DLL_VERSIONW L"2.1.3.0 2" +#define DLL_VERSIONW L"2.1.4.0 2" /* DLL‚ª•Ô‚· DLL_VERSION ‚̃ƒCƒh•¶Žš */ /* nkf32.dll main */ diff --git a/version.rc b/version.rc index e08cb61..090c27b 100755 --- a/version.rc +++ b/version.rc @@ -1,8 +1,8 @@ #include 1 VERSIONINFO -FILEVERSION 2,1,3,0 -PRODUCTVERSION 2,1,3,0 +FILEVERSION 2,1,4,0 +PRODUCTVERSION 2,1,4,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.3\0" + VALUE "FileVersion", "2.1.4\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.3\0" + VALUE "ProductVersion", "2.1.4\0" } } BLOCK "VarFileInfo" -- 2.11.0