From: NARUSE, Yui <naruse@users.sourceforge.jp>
Date: Sun, 17 Feb 2019 22:47:56 +0000 (+0900)
Subject: Add description about --overwrite and --in-place
X-Git-Url: http://git.osdn.net/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=b17db8aeb211cc16c52b9edf2069889fb640f04c

Add description about --overwrite and --in-place

fix https://osdn.net/projects/nkf/ticket/38282
fix https://osdn.net/projects/nkf/ticket/38931
fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473916

From: NOKUBI Takatsugu (knok)
---

diff --git a/man/nkf.1j.pm b/man/nkf.1j.pm
index 3a764d5..5ccb4c7 100755
--- a/man/nkf.1j.pm
+++ b/man/nkf.1j.pm
@@ -480,7 +480,8 @@ Unicode 
 
 ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£
 Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
-¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
+
+B<--overwrite> ¤Ç¤Ï¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
 ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
 
 =item B<--guess>
diff --git a/nkf.1 b/nkf.1
index 3a595c8..6d2f1ac 100644
--- a/nkf.1
+++ b/nkf.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -54,16 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.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
+.        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.
@@ -129,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2018-12-15" "nkf 2.1.5" " "
+.TH nkf 1 "2019-02-17" "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
diff --git a/nkf.1j b/nkf.1j
index 5515c68..e9a8fb9 100644
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -54,20 +54,24 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.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
+.        if !\nF==2 \{\
+.            nr % 0
+.            nr F 2
+.        \}
 .    \}
 .\}
+.rr rF
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2018-12-15" "nkf 2.1.5" " "
+.TH nkf 1 "2019-02-17" "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
@@ -453,7 +457,8 @@ Unicode $B$+$i(B Unicode $B$NJQ49$N:]$K(B \-x $B$H6&$K;XDj$9$k$H!"(Bnkf $
 .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
+.Sp
+\&\fB\-\-overwrite\fR $B$G$O85$N%U%!%$%k$N%?%$%`%9%?%s%W$H%Q!<%_%C%7%g%s$,J];}$5$l$k!#(B
 $B8=:_!":n@.F|;~$d(B inode $B$OJQ99$5$l$k$,!">-Mh$K$o$?$C$F$3$N<BAu$N$^$^$G$"$kJ]>Z$OL5$$!#(B
 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"
diff --git a/nkf.doc b/nkf.doc
index 1cadaef..faa471d 100644
--- a/nkf.doc
+++ b/nkf.doc
@@ -271,8 +271,10 @@ OPTIONS
         &#....; ¤Î¤è¤¦¤Ê Unicode ʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
 
     --in-place[=*SUFFIX*] --overwrite[=*SUFFIX*]
-        ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£ Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£ ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
-        ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
+        ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£ Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
+
+        --overwrite ¤Ç¤Ï¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£ ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode
+        ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
 
     --guess
         ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ¹¤ë