* NKF.mod/NKF.pm: fix document [nkf-bugs#8614]

* man/nkf.1j.pm: fix document [nkf-patches#8829]
* man/make_doc.sh: get version from NKF.pm, etc.

diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm
index b7df1cd..46a2973 100644 (file)
--- a/NKF.mod/NKF.pm
+++ b/NKF.mod/NKF.pm
@@ -36,7 +36,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
-$VERSION = '2.07';
+$VERSION = '2.08';
 
 bootstrap NKF $VERSION;
 
@@ -73,7 +73,7 @@ nkf - Network Kanji Filter
 
 =begin COMMAND
 
-  nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
+nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
 
 =end
 
@@ -369,6 +369,10 @@ UTF-8 without BOM
 
 UTF-8 with BOM
 
+=item UTF8-MAC (input only)
+
+decomposed UTF-8
+
 =item UTF-16
 
 same as UTF-16BE
@@ -389,8 +393,6 @@ UTF-16 Little Endian without BOM
 
 UTF-16 Little Endian with BOM
 
-=item UTF8-MAC (input only)
-
 =back
 
 =item B<--fb-{skip, html, xml, perl, java, subchar}>

diff --git a/man/make_doc.sh b/man/make_doc.sh
index 3fd3620..74f3184 100755 (executable)
--- a/man/make_doc.sh
+++ b/man/make_doc.sh
@@ -1,13 +1,24 @@
-echo nkf.1.pm
+current=`pwd`
+self_dir=`echo $0 | sed -e's/\/[^\/]*$//`
+if [ -d $self_dir ]
+then
+  echo cd $self_dir
+  cd $self_dir
+fi
+version=`perl -ne'if(/VERSION/o&&/(\d)\.(\d)(\d)/o){print"$1.$2.$3";exit}' < ../NKF.mod/NKF.pm`
+echo $version
+echo generate nkf.1.pm
 perl -ne'$m=/^=end|(=begin)( COMMAND)?/?($2?2:$1?1:0):(($m!=1&&print),$m);' ../NKF.mod/NKF.pm > nkf.1.pm
-echo nkf.1
-pod2man --section=1 --release="nkf 2.0.7" --center=" " --name=nkf nkf.1.pm ../nkf.1
+echo generate nkf.1
+pod2man --section=1 --release="nkf $version" --center=" " --name=nkf nkf.1.pm ../nkf.1
 
 #pod2man --section=1 --release="nkf 2.x.x" --center=" " --name=nkf nkf.1.pm|nroff -man|more
 
-echo nkf.1j
-pod2man --section=1 --release="nkf 2.0.7" --center=" " --name=nkf nkf.1j.pm | nkf -jE > ../nkf.1j
-echo nkf.doc
+echo generate nkf.1j
+pod2man --section=1 --release="nkf $version" --center=" " --name=nkf nkf.1j.pm | nkf -jE > ../nkf.1j
+echo generate nkf.doc
 pod2text nkf.1j.pm > ../nkf.doc
 
 #pod2man --section=1 --release="nkf 2.x.x" --center=" " --name=nkf nkf.1j.pm|jgroff -mandoc -T nippon|more -r
+echo cd $current
+cd $current

diff --git a/man/nkf.1.pm b/man/nkf.1.pm
index 477f519..55a4c01 100644 (file)
--- a/man/nkf.1.pm
+++ b/man/nkf.1.pm
@@ -36,7 +36,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
-$VERSION = '2.07';
+$VERSION = '2.08';
 
 bootstrap NKF $VERSION;
 
@@ -59,7 +59,7 @@ nkf - Network Kanji Filter
 =head1 SYNOPSIS
 
 
-  nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
+nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
 
 
 =head1 DESCRIPTION
@@ -347,6 +347,10 @@ UTF-8 without BOM
 
 UTF-8 with BOM
 
+=item UTF8-MAC (input only)
+
+decomposed UTF-8
+
 =item UTF-16
 
 same as UTF-16BE
@@ -367,8 +371,6 @@ UTF-16 Little Endian without BOM
 
 UTF-16 Little Endian with BOM
 
-=item UTF8-MAC (input only)
-
 =back
 
 =item B<--fb-{skip, html, xml, perl, java, subchar}>

diff --git a/man/nkf.1j.pm b/man/nkf.1j.pm
index 8aab96e..433ca51 100755 (executable)
--- a/man/nkf.1j.pm
+++ b/man/nkf.1j.pm
@@ -2,11 +2,11 @@
 
 =head1 NAME
 
-nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿ v2.0.7
+nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿
 
 =head1 SYNOPSIS
 
-  nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [file ...]
+nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
 
 =head1 DESCRIPTION
 
@@ -455,6 +455,7 @@ Unicode 
 &#....; ¤Î¤è¤¦¤Ê Unicode ʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
 
 =item B<--in-place[=I<SUFFIX>]  --overwrite[=I<SUFFIX>]>
+
 ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£
 Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
 ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
@@ -477,6 +478,7 @@ nkf 
 ¤³¤ì°Ê¹ß¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤¹¤ë
 
 =item B<--exec-in>
+
 nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf ¤ÎÆþÎϤȤ¹¤ë
 (config.h ¤Ç EXEC_IO ¤ò define ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
 

diff --git a/nkf.1 b/nkf.1
index 8e4dae7..a8f5faa 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -129,14 +129,12 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2006-07-30" "nkf 2.0.7" " "
+.TH nkf 1 "2006-08-22" "nkf 2.0.8" " "
 .SH "NAME"
 nkf \- Network Kanji Filter
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-.Vb 1
-\&  nkf B<[-butjnesliohrTVvwWJESZxXFfmMBOcdILg]> B<[>I<file ...>B<]>
-.Ve
+nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBNkf\fR is a yet another kanji code converter among networks, hosts and terminals.
@@ -369,6 +367,9 @@ 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
+.IX Item "UTF8-MAC (input only)"
+decomposed \s-1UTF\-8\s0
 .IP "\s-1UTF\-16\s0" 4
 .IX Item "UTF-16"
 same as \s-1UTF\-16BE\s0
@@ -384,15 +385,11 @@ same as \s-1UTF\-16BE\s0
 .IP "\s-1UTF\-16LE\-BOM\s0" 4
 .IX Item "UTF-16LE-BOM"
 \&\s-1UTF\-16\s0 Little Endian with \s-1BOM\s0
-.IP "\s-1UTF8\-MAC\s0 (input only)" 4
-.IX Item "UTF8-MAC (input only)"
 .RE
 .RS 4
 .RE
-.PD 0
 .IP "\fB\-\-fb\-{skip, html, xml, perl, java, subchar}\fR" 4
 .IX Item "--fb-{skip, html, xml, perl, java, subchar}"
-.PD
 Specify the way that nkf handles unassigned characters.
 Without this option, \-\-fb\-skip is assumed.
 .IP "\fB\-\-prefix=\f(BIescape character\fB\f(BItarget character\fB..\fR" 4

diff --git a/nkf.1j b/nkf.1j
index cb72039..b78f6bb 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -129,14 +129,12 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2006-07-03" "nkf 2.0.7" " "
+.TH nkf 1 "2006-08-22" "nkf 2.0.8" " "
 .SH "NAME"
-nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B v2.0.7
+nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-.Vb 1
-\&  nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [file ...]
-.Ve
+nkf \fB[\-butjnesliohrTVvwWJESZxXFfmMBOcdILg]\fR \fB[\fR\fIfile ...\fR\fB]\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBnkf\fR \e$B$O%M%C%H%o!<%/$G%a!<%k$d%K%e!<%9$NFI$_=q$-$r$9$k$?$a$K:n$i$l$?!"4A;z%3!<%I$NJQ49%U%#%k%?$G$"$k!#\e(B
@@ -491,12 +489,14 @@ Unicode \e$B$+$i\e(B Unicode \e$B$NJQ49$N:]$K\e(B \-x \e$B$H6&$K;XDj$9$k$H!"\e(Bnkf \e$
 .IP "\fB\-\-numchar\-input\fR" 4
 .IX Item "--numchar-input"
 &#....; \e$B$N$h$&$J\e(B Unicode \e$BJ8;z;2>H$rJQ49$9$k\e(B
-.IP "\fB\-\-in\-place[=\f(BI\s-1SUFFIX\s0\fB]  \-\-overwrite[=\f(BI\s-1SUFFIX\s0\fB]\fR \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(B inode \e$B$OJQ99$5$l$k$,!">-Mh$K$o$?$C$F$3$N<BAu$N$^$^$G$"$kJ]>Z$OL5$$!#\e(B" 4
-.IX Item "--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(B inode \e$B$OJQ99$5$l$k$,!">-Mh$K$o$?$C$F$3$N<BAu$N$^$^$G$"$kJ]>Z$OL5$$!#\e(B"
-.PD 0
+.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]"
+\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(B inode \e$B$OJQ99$5$l$k$,!">-Mh$K$o$?$C$F$3$N<BAu$N$^$^$G$"$kJ]>Z$OL5$$!#\e(B
 .IP "\fB\-\-guess\fR" 4
 .IX Item "--guess"
-.PD
 \e$B<+F0H=JL$N7k2L$r=PNO$9$k\e(B
 .IP "\fB\-\-help\fR" 4
 .IX Item "--help"
@@ -507,12 +507,12 @@ nkf \e$B$N%P!<%8%g%s$rI=<($9$k!#\e(B
 .IP "\fB\-\-\fR" 4
 .IX Item "--"
 \e$B$3$l0J9_$N%*%W%7%g%s$rL5;k$9$k\e(B
-.IP "\fB\-\-exec\-in\fR nkf [options] \-\-exec\-in cmd args... \e$B$H$d$k$H!"\e(Bcmd \e$B$N=PNO$r\e(B nkf \e$B$NF~NO$H$9$k\e(B (config.h \e$B$G\e(B \s-1EXEC_IO\s0 \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)" 4
-.IX Item "--exec-in nkf [options] --exec-in cmd args... \e$B$H$d$k$H!"\e(Bcmd \e$B$N=PNO$r\e(B nkf \e$B$NF~NO$H$9$k\e(B (config.h \e$B$G\e(B EXEC_IO \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)"
-.PD 0
+.IP "\fB\-\-exec\-in\fR" 4
+.IX Item "--exec-in"
+nkf [options] \-\-exec\-in cmd args... \e$B$H$d$k$H!"\e(Bcmd \e$B$N=PNO$r\e(B nkf \e$B$NF~NO$H$9$k\e(B
+(config.h \e$B$G\e(B \s-1EXEC_IO\s0 \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)
 .IP "\fB\-\-exec\-out\fR" 4
 .IX Item "--exec-out"
-.PD
 nkf [options] \-\-exec\-out cmd args... \e$B$H$d$k$H!"\e(Bnkf \e$B$N=PNO$r\e(B cmd \e$B$NF~NO$H$9$k\e(B
 (config.h \e$B$G\e(B \s-1EXEC_IO\s0 \e$B$r\e(B define \e$B$7$F%3%s%Q%$%k$7$?;~$N$_M-8z\e(B)
 .SH "BUGS"

diff --git a/nkf.doc b/nkf.doc
index 2de0510..7c4391e 100644 (file)
--- a/nkf.doc
+++ b/nkf.doc
@@ -1,8 +1,8 @@
 NAME
-    nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿ v2.0.7
+    nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿
 
 SYNOPSIS
-      nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [file ...]
+    nkf [-butjnesliohrTVvwWJESZxXFfmMBOcdILg] [*file ...*]
 
 DESCRIPTION
     nkf
@@ -292,11 +292,12 @@ OPTIONS
         &#....; ¤Î¤è¤¦¤Ê Unicode ʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
 
     --in-place[=*SUFFIX*] --overwrite[=*SUFFIX*]
-    ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£
-    Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
-    ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
-    ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode
-    ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
+        ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£
+        Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
+        ¸µ¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬ÊÝ»ý¤µ¤ì¤ë¡£
+        ¸½ºß¡¢ºîÀ®Æü»þ¤ä inode
+        ¤ÏÊѹ¹¤µ¤ì¤ë¤¬¡¢¾­Íè¤Ë¤ï¤¿¤Ã¤Æ¤³¤Î¼ÂÁõ¤Î¤Þ¤Þ¤Ç¤¢¤ëÊݾڤÏ̵¤¤¡£
+
     --guess
         ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ¹¤ë
 
@@ -308,9 +309,11 @@ OPTIONS
 
     --  ¤³¤ì°Ê¹ß¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤¹¤ë
 
-    --exec-in nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf
-    ¤ÎÆþÎϤȤ¹¤ë (config.h ¤Ç EXEC_IO ¤ò define
-    ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
+    --exec-in
+        nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf
+        ¤ÎÆþÎϤȤ¹¤ë (config.h ¤Ç EXEC_IO ¤ò define
+        ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
+
     --exec-out
         nkf [options] --exec-out cmd args... ¤È¤ä¤ë¤È¡¢nkf ¤Î½ÐÎϤò cmd
         ¤ÎÆþÎϤȤ¹¤ë (config.h ¤Ç EXEC_IO ¤ò define