* update document (--in-place and others)

diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm
index a0680ff..3a52d5b 100644 (file)
--- a/NKF.mod/NKF.pm
+++ b/NKF.mod/NKF.pm
@@ -36,7 +36,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );

-$VERSION = '2.05';
+$VERSION = '2.06';

 
 bootstrap NKF $VERSION;
 
 
 bootstrap NKF $VERSION;
 


@@ -50,7 +50,7 @@ __END__
 
 =head1 NAME
 
 
 =head1 NAME
 

-NKF - Perl extension for Network Kanji Filter 
+NKF - Perl extension for Network Kanji Filter

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 


@@ -63,7 +63,6 @@ This is a Perl Extension version of nkf (Netowrk Kanji Filter).
 It converts the last argument and return converted result. Conversion
 details are specified by flags before the last argument.
 
 It converts the last argument and return converted result. Conversion
 details are specified by flags before the last argument.
 

-

 B<Nkf> is a yet another kanji code converter among networks, hosts and terminals.
 It converts input kanji code to designated kanji code
 such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 or UTF-16.
 B<Nkf> is a yet another kanji code converter among networks, hosts and terminals.
 It converts input kanji code to designated kanji code
 such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 or UTF-16.


@@ -120,13 +119,13 @@ Same as -J.
 
 No conversion.
 
 
 No conversion.
 

-=item B<-i_>
+=item B<-i[@B]>

 
 

-Output sequence to designate JIS-kanji. (DEFAULT B)
+Specify the Esc Seq for JIS X 0208-1978/83. (DEFAULT B)

 
 

-=item B<-o_>
+=item B<-o[BJH]>

 
 

-Output sequence to designate ASCII. (DEFAULT B)
+Specify the Esc Seq for ASCII/Roman. (DEFAULT B)

 
 =item B<-r>
 
 
 =item B<-r>
 


@@ -220,10 +219,6 @@ forces ASCII after NL.
 Replacing non iso-2022-jp char into a geta character
 (substitute character in Japanese).
 
 Replacing non iso-2022-jp char into a geta character
 (substitute character in Japanese).
 

-=item B<-d -c>
-
-Delete \r in line feed, Add \r in line feed.
-

 =item B<-m[BQN0]>
 
 MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)
 =item B<-m[BQN0]>
 
 MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)


@@ -273,17 +268,17 @@ Perfome quoted encoding.
 Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
 B<-s>, B<-e> and B<-x> are not compatible with this option.
 
 Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
 B<-s>, B<-e> and B<-x> are not compatible with this option.
 

-=item B<-L[uwm]>
+=item B<-L[uwm] -d -c>

 
 

-new line mode
+Convert line breaks.

 
 =over
 
 
 =over
 

-=item B<-Lu>
+=item B<-Lu -d>

 
 unix (LF)
 
 
 unix (LF)
 

-=item B<-Lw>
+=item B<-Lw -c>

 
 windows (CRLF)
 
 
 windows (CRLF)
 


@@ -411,18 +406,6 @@ Unescape percent escaped characters.
 
 Decode character reference, such as "&#....;".
 
 
 Decode character reference, such as "&#....;".
 

-=begin man
-
-=item B<--overwrite>
-
-Overwrite original file by converted result.
-
-=item B<--guess>
-
-Print guessed encoding.
-
-=end man
-

 =item B<-->
 
 Ignore rest of -option.
 =item B<-->
 
 Ignore rest of -option.


@@ -431,9 +414,10 @@ Ignore rest of -option.
 
 =head1 AUTHOR
 
 
 =head1 AUTHOR
 

-Network Kanji Filter Version 2.0.5
+Network Kanji Filter Version 2.0.6

 
 

-Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2005 Kono, Furukawa, Naruse
+Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW
+                     2002-2006 Kono, Furukawa, Naruse, mastodon

 
 =head1 SEE ALSO
 
 
 =head1 SEE ALSO
 

diff --git a/nkf.1 b/nkf.1
index 27a210b..4da8410 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -128,10 +128,13 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"

-.IX Title "NKF(1)"
-.TH NKF 1 "2006-03-05" "nkf 2.0.6"
+.IX Title "nkf 1"
+.TH nkf 1 "2006-03-15" "nkf 2.0.6" " "

 .SH "NAME"
 .SH "NAME"

-NKF \- Network Kanji Filter 
+nkf \- Network Kanji Filter
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+nkf \fB\-[\fR\fIflags\fR\fB]\fR \fB[\fR\fIin_file\fR\fB]\fR .. \fB[\fR\fIout_file_for_\-O_flag\fR\fB]\fR

 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBNkf\fR is a yet another kanji code converter among networks, hosts and terminals.
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBNkf\fR is a yet another kanji code converter among networks, hosts and terminals.


@@ -180,12 +183,12 @@ Same as \-J.
 .IP "\fB\-t\fR" 4
 .IX Item "-t"
 No conversion.
 .IP "\fB\-t\fR" 4
 .IX Item "-t"
 No conversion.

-.IP "\fB\-i_\fR" 4
-.IX Item "-i_"
-Output sequence to designate JIS\-kanji. (\s-1DEFAULT\s0 B)
-.IP "\fB\-o_\fR" 4
-.IX Item "-o_"
-Output sequence to designate \s-1ASCII\s0. (\s-1DEFAULT\s0 B)
+.IP "\fB\-i[@B]\fR" 4
+.IX Item "-i[@B]"
+Specify the Esc Seq for \s-1JIS\s0 X 0208\-1978/83. (\s-1DEFAULT\s0 B)
+.IP "\fB\-o[\s-1BJH\s0]\fR" 4
+.IX Item "-o[BJH]"
+Specify the Esc Seq for ASCII/Roman. (\s-1DEFAULT\s0 B)

 .IP "\fB\-r\fR" 4
 .IX Item "-r"
 {de/en}crypt \s-1ROT13/47\s0
 .IP "\fB\-r\fR" 4
 .IX Item "-r"
 {de/en}crypt \s-1ROT13/47\s0


@@ -264,7 +267,7 @@ Replacing non iso\-2022\-jp char into a geta character
 (substitute character in Japanese).
 .IP "\fB\-d \-c\fR" 4
 .IX Item "-d -c"
 (substitute character in Japanese).
 .IP "\fB\-d \-c\fR" 4
 .IX Item "-d -c"

-Delete \er in line feed, Add \er in line feed.
+Convert line breaks  \-d: \s-1LF\s0  \-c: \s-1CRLF\s0.

 .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)
 .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)


@@ -419,24 +422,20 @@ Unescape percent escaped characters.
 .IP "\fB\-\-numchar\-input\fR" 4
 .IX Item "--numchar-input"
 Decode character reference, such as \*(L"&#....;\*(R".
 .IP "\fB\-\-numchar\-input\fR" 4
 .IX Item "--numchar-input"
 Decode character reference, such as \*(L"&#....;\*(R".

-.IP "\fB\-\-overwrite\fR" 4
-.IX Item "--overwrite"
-Overwrite original file by converted result.
-
-.PD 0
+.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]"
+Overwrite \fBoriginal\fR listed files by filtered result.
+.Sp
+\&\fBNote\fR \-\-overwrite preserves timestamp of original files.

 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"
 Print guessed encoding.
 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"
 Print guessed encoding.

-

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

-.PD

 Ignore rest of \-option.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Network Kanji Filter Version 2.0.6
 .PP
 Ignore rest of \-option.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Network Kanji Filter Version 2.0.6
 .PP

-Copyright (C) 1987, \s-1FUJITSU\s0 \s-1LTD\s0. (I.Ichikawa),2000 S. Kono, \s-1COW\s0, 2002\-2006 Kono, Furukawa, Naruse
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fInkf\fR\|(1)
+Copyright (C) 1987, \s-1FUJITSU\s0 \s-1LTD\s0. (I.Ichikawa),2000 S. Kono, \s-1COW\s0
+                     2002\-2006 Kono, Furukawa, Naruse, mastodon

diff --git a/nkf.1j b/nkf.1j
index 4934d98..6c99bbc 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,6 +1,6 @@
-.TH NKF 1 07/Feb/2004
+.TH NKF 1 01/Apr/2006

 .SH NAME
 .SH NAME

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

 .SH SYNOPSIS
 .B nkf
 .RI [ options ]
 .SH SYNOPSIS
 .B nkf
 .RI [ options ]


@@ -204,10 +204,10 @@ JIS\e$B$G$O\e(B ESC\-'('\-I \e$B$r;H$&!#\e(B
 nkf.out\e$B!#\e(B
 .TP
 .B \-c
 nkf.out\e$B!#\e(B
 .TP
 .B \-c

-NL\e$B$^$($K\e(BCR\e$B$rIU2C$9$k!#\e(B
+NL\e$BA0$K\e(BCR\e$B$rIU2C$9$k!#\e(B

 .TP
 .B \-d
 .TP
 .B \-d

-NL\e$B$^$($N\e(BCR\e$B$r:o=|$9$k!#C1FH$N\e(BCR\e$B$O!"\e(BNL\e$B$KCV$-49$($i$l$k!#\e(B
+NL\e$BA0$N\e(BCR\e$B$r:o=|$9$k!#C1FH$N\e(BCR\e$B$O!"\e(BNL\e$B$KCV$-49$($i$l$k!#\e(B

 .TP
 .B \-L[wmu]
 \e$B2~9T%b!<%I\e(B 
 .TP
 .B \-L[wmu]
 \e$B2~9T%b!<%I\e(B 


@@ -328,8 +328,11 @@ nkf \e$B$r\e(B UTF \e$B7A<0$NJQ49$KMQ$$$k$3$H$,$G$-$^$9!#\e(B
 \--numchar-input
 &#....; \e$B$N$h$&$J!"\e(BUnicode\e$BJ8;z;2>H$rJQ49$9$k\e(B
 .TP
 \--numchar-input
 &#....; \e$B$N$h$&$J!"\e(BUnicode\e$BJ8;z;2>H$rJQ49$9$k\e(B
 .TP

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

 .TP
 \--guess
 \e$B<+F0H=JL$N7k2L$r=PNO$9$k\e(B
 .TP
 \--guess
 \e$B<+F0H=JL$N7k2L$r=PNO$9$k\e(B


@@ -593,11 +596,6 @@ Microsoft\e$B$N\e(BUCS\e$B%^%C%T%s%08_49$NJQ49$r9T$$$^$9!#\e(B
    \-h3   \--katakana-hiragana \e$B%+%?%+%J\e(B<->\e$B$R$i$,$J\e(B
 
 .TP
    \-h3   \--katakana-hiragana \e$B%+%?%+%J\e(B<->\e$B$R$i$,$J\e(B
 
 .TP

-.B UTF8-MAC \e$B$NF~NO$X$NBP1~\e(B
-Mac OS X \e$B$GMQ$$$i$l$F$$$k!"$R$i$,$JEy$r@55,J,2r$7$?\e(B UTF-8 (UTF8-MAC)
-\e$B$NF~NO$KBP1~$7$^$7$?!#!J=PNO$OHsBP1~!K\e(B
-
-.TP

 .B \--no-best-fit-chars \e$B%*%W%7%g%s$NDI2C\e(B
 Unicode \e$B$+$i$NJQ49$N:]$K!"1}I|0BA4@-$,3NJ]$5$l$J$$J8;z$NJQ49$r9T$$$^$;$s!#\e(B
 Unicode \e$B$+$i\e(B Unicode \e$B$NJQ49$N:]$K\e(B -x \e$B$H6&$K;XDj$9$k$H!"\e(B
 .B \--no-best-fit-chars \e$B%*%W%7%g%s$NDI2C\e(B
 Unicode \e$B$+$i$NJQ49$N:]$K!"1}I|0BA4@-$,3NJ]$5$l$J$$J8;z$NJQ49$r9T$$$^$;$s!#\e(B
 Unicode \e$B$+$i\e(B Unicode \e$B$NJQ49$N:]$K\e(B -x \e$B$H6&$K;XDj$9$k$H!"\e(B


@@ -607,6 +605,11 @@ nkf \e$B$r\e(B UTF \e$B7A<0$NJQ49$KMQ$$$k$3$H$,$G$-$^$9!#\e(B
 \e$B%Q%9$K4X$o$kJ8;zNs$rJQ49$9$k:]$K$O!"$3$N%*%W%7%g%s$r;XDj$9$k$3$H$r6/$/?d>)$7$^$9!#\e(B
 
 .TP
 \e$B%Q%9$K4X$o$kJ8;zNs$rJQ49$9$k:]$K$O!"$3$N%*%W%7%g%s$r;XDj$9$k$3$H$r6/$/?d>)$7$^$9!#\e(B
 
 .TP

+.B \--in-place[=SUFFIX] \e$B%*%W%7%g%s$NDI2C\e(B
+\e$B%?%$%`%9%?%s%W$rJ];}$9$k\e(B \--overwrite \e$B$KBP$7!"\e(B
+\e$B%?%$%`%9%?%s%W$r99?7$9$k\e(B \--in-place \e$B%*%W%7%g%s$rDI2C$7$^$7$?!#\e(B
+
+.TP

 .B fallback \e$B%*%W%7%g%s$NDI2C\e(B
 \--fb-{skip, html, xml, perl, java, subchar} \e$B%*%W%7%g%s$rDI2C$7$^$7$?!#\e(B
 Unicode \e$B$+$i\e(B Shift_JIS, EUC-JP, ISO-2022-JP \e$B$KJQ49$9$k:]$K!"\e(B
 .B fallback \e$B%*%W%7%g%s$NDI2C\e(B
 \--fb-{skip, html, xml, perl, java, subchar} \e$B%*%W%7%g%s$rDI2C$7$^$7$?!#\e(B
 Unicode \e$B$+$i\e(B Shift_JIS, EUC-JP, ISO-2022-JP \e$B$KJQ49$9$k:]$K!"\e(B


@@ -630,6 +633,9 @@ Unicode \e$B$+$i$N\e(B encode \e$B$O!"Dj5A$5$l$F$$$kHO0O$G$NJQ49$,@5$7$/9T$o$l$k;v$
 \e$BDj5A$5$l$F$$$J$$HO0O$G$NJQ49$O%(%i!<$H$J$j!J\e(Bfallback \e$B2DG=!K!"\e(B
 Unicode \e$B$H$7$FIT@5$JJ8;z$O%9%-%C%W$5$l$k;v$rJ]>c$7$^$9!#\e(B
 
 \e$BDj5A$5$l$F$$$J$$HO0O$G$NJQ49$O%(%i!<$H$J$j!J\e(Bfallback \e$B2DG=!K!"\e(B
 Unicode \e$B$H$7$FIT@5$JJ8;z$O%9%-%C%W$5$l$k;v$rJ]>c$7$^$9!#\e(B
 

+.TP
+\e$B$=$NB>!"\e(B"Q" encoding\e$B$N%G%3!<%I$d\e(Bfold-margin\e$BEy$N%P%0$r=$@5!#\e(B
+

 .SH ACKNOWLEDGE
 
 \e$B0J2<$N$+$?$,$?!"$I$&$b$"$j$,$H$&$4$6$$$^$7$?!#\e(B
 .SH ACKNOWLEDGE
 
 \e$B0J2<$N$+$?$,$?!"$I$&$b$"$j$,$H$&$4$6$$$^$7$?!#\e(B