*** empty log message ***

diff --git a/config.h b/config.h
index 7779be9..affd87b 100644 (file)
--- a/config.h
+++ b/config.h
@@ -26,6 +26,7 @@
 
 /* --exec-in, --exec-out \e$B%*%W%7%g%s\e(B
  * pipe, fork, execvp \e$B$"$?$j$,L5$$$HF0$-$^$;$s\e(B
+ * MS-DOS, MinGW \e$B$J$I$G$O\e(B undef \e$B$K$7$F$/$@$5$$\e(B
  */
 #define EXEC_IO
 

diff --git a/nkf.1j b/nkf.1j
index 4db2ac5..d168eec 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,4 +1,4 @@
-.TH NKF 2 9/Sep/2002
+.TH NKF 2 13/Oct/2003
 .SH NAME
 nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B v2.0
 .SH SYNOPSIS
@@ -164,10 +164,17 @@ 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
      \--hirakana, \--katakana \e$BJ?2>L>!"JR2>L>JQ49\e(B
      \--cap-input, \--url-input \e$B$=$l$>$l\e(B ':', '%' \e$B$KB3$/\e(B 16 \e$B?J?t$rJ8;z$KJQ49$9$k\e(B
      \--overwrite \e$B85$N%U%!%$%k$rJQ497k2L$GCV$-49$($k!#J#?t$N%U%!%$%k$r=q$-49$($k$3$H$b2DG=!#\e(B
+     \--no-cp932 Shift_JIS \e$B$N!"\e(BFAxx-FCxx \e$B$r!"\e(BCP932 \e$B$GF1CM$JJ8;z$KFI$_49$($kF0:n$rL58z$K$9$k\e(B
      \--help
      \--version
      \--               \e$B$3$l0J9_$N%*%W%7%g%s$rL5;k$9$k\e(B
 .fi
+.TP
+.B \e$B<!$N\e(B 2 \e$B$D$O!"\e(Bconfig.h \e$B$G\e(B EXEC_IO \e$B$r\e(B define \e$B$7$?;~$N$_M-8z\e(B
+.nf
+     \--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
+     \--exec-out  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
+.fi
 .SH AUTHOR
 
 .nf
@@ -317,6 +324,9 @@ non-strict mime \-MN \e$B$G$O!"6uGr!"2~9T$r$^$?$$$G!"\e(Bbase64 encoding
 \e$B$r2rFI$9$k!#$3$l$G!"%9%/%j!<%s$+$i\e(Bcut&paste\e$B$G\e(B
 \e$B%G%3!<%I$9$k$3$H$b2DG=!#;_$^$i$J$$2DG=@-$"$j!#\e(B
 
+.SH
+\e$B$=$NB>\e(B
+
 .PP
 nkf_test.pl \e$B$N%P%0%A%'%C%/$rA}$d$7$?!#\e(B
 test \e$B$,<:GT$7$?$H$-$K\e(Bdiff\e$B$r<h$k$h$&$K$7$?!#\e(B
@@ -342,6 +352,30 @@ hiragana/katakana \e$BJQ49$,$G$-$k$h$&$K$J$j$^$7$?!#\e(B
 
 \--overwrite \e$B$G!"0z?t$N%U%!%$%k$rD>@\!"CV$-49$($k$3$H$,$G$-$^$9!#\e(B
 
+.SH nkf 2.0.4 (\e$BM=Dj\e(B)
+
+.PP
+Shift_JIS \e$B$N\e(B FAxx-FCxx \e$B$K$D$$$F!"IaDL$N<0$G$O\e(B euc \e$B$KJQ49$G$-$^$;$s$,!"\e(BCP932 \e$B$GF1CM$JJ8;z$KFI$_49$($FJQ49$7$^$9!#$3$NF0:n$rL58z$K$9$k$K$O!"\e(B--no-cp932 \e$B$r$D$1$F$/$@$5$$!#\e(B
+
+.PP
+perl module \e$B$K\e(B
+   nkf_continue     \e$B%*%W%7%g%s!"<+F0H=JL$N>uBV$J$I$r0z$-7Q$$$GJQ49\e(B
+   inputcode        \e$B<+F0H=JL7k2L$NJ8;z%3!<%I$rJV$9\e(B
+\e$B$rDI2C$7$^$7$?!#\e(B
+
+.PP
+\--numchar-input \e$B%*%W%7%g%s$r?7@_\e(B
+    mhonarc \e$B$J$I!"F|K\8l$r\e(B UTF-16 \e$B$N\e(B &#....; \e$B$N%Q%?!<%s$G=PNO$9$k$b$N$rJQ49$7$^$9!#\e(B
+
+.PP
+\--exec-in, \--exec-out \e$B%*%W%7%g%s$r?7@_\e(B
+
+    nkf -e \--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$7$^$9!#\e(B
+
+    nkf -e \--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$7$^$9!#\e(B
+
 
 .SH ACKNOWLEDGE
 
@@ -357,10 +391,12 @@ kono@ie.u-ryukyu.ac.jp
 
 nkf 1.9-
 Akio Furukawa
+Andy Taki
 From: OHARA Shigeki
 Fumitaka Kitagawa
 Hiroaki Sengoku 
 Ikuhiro MORITA (\e$B?9ED\e(B \e$B0i9(\e(B)
+Yoshiharu ITO
 Junn Ohta
 KAWAMURA Masao
 Kazuhiko Mori 
@@ -375,6 +411,7 @@ Rei FURUKAWA
 Satoru Takabayashi
 Shigeyuki Takagi
 Shin MICHIMUKO 
+TOYODA Jiro
 Tsutomu Sakai 
 YAMASHITA Junji (\e$B;32<\e(B \e$B=c;J\e(B)
 Yasuyuki Sato 
@@ -421,7 +458,9 @@ hat@so-net
 \e$BMn9g0l4n\e(B
 \e$BNS\e(B  \e$BN<\e(B
 \e$BT"0B\e(B \e$B<#\e(B
-
+\e$BLZ2<\e(B \e$BM:2p\e(B
+\e$B@.@%$f$$\e(B
+\e$BDaC+D><y\e(B
 
 \e$B2OLn??<#\e(B
      www.ie.u-ryukyu.ac.jp/~kono/nkf/

diff --git a/nkf.doc b/nkf.doc
index 1b6230c..3543250 100644 (file)
--- a/nkf.doc
+++ b/nkf.doc
@@ -61,7 +61,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
-                            9/Sep/2002                          1
+                           13/Oct/2003                          1
 
 
 
@@ -127,7 +127,7 @@ NKF(2)                                                     NKF(2)
 
 
 
-                            9/Sep/2002                          2
+                           13/Oct/2003                          2
 
 
 
@@ -174,10 +174,15 @@ NKF(2)                                                     NKF(2)
                    --hirakana, --katakana Ê¿²¾Ì¾¡¢ÊÒ²¾Ì¾ÊÑ´¹
                    --cap-input, --url-input ¤½¤ì¤¾¤ì ':', '%' ¤Ë³¤¯ 16 ¿Ê¿ô¤òʸ»ú¤ËÊÑ´¹¤¹¤ë
                    --overwrite ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
+                   --no-cp932 Shift_JIS ¤Î¡¢FAxx-FCxx ¤ò¡¢CP932 ¤ÇƱÃͤÊʸ»ú¤ËÆɤߴ¹¤¨¤ëÆ°ºî¤ò̵¸ú¤Ë¤¹¤ë
                    --help
                    --version
                    --        ¤³¤ì°Ê¹ß¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤¹¤ë
 
+       ¼¡\b\b¼¡¤Î\b\b¤Î 2\b2 ¤Ä\b\b¤Ä¤Ï\b\b¤Ï¡¢\b\b¡¢c\bco\bon\bnf\bfi\big\bg.\b.h\bh ¤Ç\b\b¤Ç E\bEX\bXE\bEC\bC_\b_I\bIO\bO ¤ò\b\b¤ò d\bde\bef\bfi\bin\bne\be ¤·\b\b¤·¤¿\b\b¤¿»þ\b\b»þ¤Î\b\b¤Î¤ß\b\b¤ßÍ­\b\bÍ­¸ú\b\b¸ú
+                   --exec-in  nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf ¤ÎÆþÎϤȤ¹¤ë
+                   --exec-out  nkf [options] --exec-out cmd args... ¤È¤ä¤ë¤È¡¢nkf ¤Î½ÐÎϤò cmd ¤ÎÆþÎϤȤ¹¤ë
+
 A\bAU\bUT\bTH\bHO\bOR\bR
        »ÔÀî  »ê  ichikawa@flab.fujitsu.co.jp   (was ichikawa@fujitsu.JUNET)
        ²ÏÌî  ¿¿¼£      kono@ie.u-ryukyu.acjp
@@ -185,15 +190,10 @@ A\bAU\bUT\bTH\bHO\bOR\bR
 
 
 
-B\bBU\bUG\bGS\bS
-       ¼Â¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢EUC¤È¥·¥Õ¥ÈJIS¤È¤Î¼«Æ°È½Äê¤Ç
-       ¤¢¤ê¡¢ºÇ½é¤ËÆÃÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£¤½¤·
-       ¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα¥Ð¥Ã¥Õ¥¡¤Ë¤¿¤á¤Æ¤ª¤«¤ì¡¢³ÎÄê¸å¤Ë½èÍý
-       ¤µ¤ì¤ë¡£¤³¤Î¤¿¤á¡¢
 
 
 
-                            9/Sep/2002                          3
+                           13/Oct/2003                          3
 
 
 
@@ -202,6 +202,12 @@ B\bBU\bUG\bGS\bS
 NKF(2)                                                     NKF(2)
 
 
+B\bBU\bUG\bGS\bS
+       ¼Â¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢EUC¤È¥·¥Õ¥ÈJIS¤È¤Î¼«Æ°È½Äê¤Ç
+       ¤¢¤ê¡¢ºÇ½é¤ËÆÃÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£¤½¤·
+       ¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα¥Ð¥Ã¥Õ¥¡¤Ë¤¿¤á¤Æ¤ª¤«¤ì¡¢³ÎÄê¸å¤Ë½èÍý
+       ¤µ¤ì¤ë¡£¤³¤Î¤¿¤á¡¢
+
        1)     7¥Ó¥Ã¥ÈJIS¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£¥·¥Õ¥ÈJIS¡¢EUCº®¹ç¤â ¤Û
               ¤È¤ó¤É¤Î¾ì¹ç¤ÏÌäÂ꤬¤Ê¤¤¡£¤¿¤À¤·¡¢
 
@@ -250,22 +256,22 @@ n\bnk\bkf\bf 1\b1.\b.6\b6 k\bko\bon\bno\bo@\b@i\bie\be.\b.u\bu-\b-r\bry\byu\buk\bky\byu\bu.\b.a\bac\bc.\b.
        ¤¹¤ë¤Î¤Ç¡¢-B -m ¤È¤¹¤ë¤³¤È¡£
 
 
-n\bnk\bkf\bf 1\b1.\b.6\b6.\b.1\b1
-       -Z1  ¤ÇX0208´Ö ³Ö->ASCII  space¤Î ÊÑ ´¹ ¤ò ¤ª ¤³¤Ê¤¦¡£ -Z2
-       ¤ÇX0208´Ö³Ö->ASCII space 2¸Ä¤ÎÊÑ´¹¤ò¤ª¤³¤Ê¤¦¡£
 
 
 
+                           13/Oct/2003                          4
 
 
 
-                            9/Sep/2002                          4
 
 
+NKF(2)                                                     NKF(2)
 
 
+n\bnk\bkf\bf 1\b1.\b.6\b6.\b.1\b1
+       -Z1  ¤ÇX0208´Ö ³Ö->ASCII  space¤Î ÊÑ ´¹ ¤ò ¤ª ¤³¤Ê¤¦¡£ -Z2
+       ¤ÇX0208´Ö³Ö->ASCII space 2¸Ä¤ÎÊÑ´¹¤ò¤ª¤³¤Ê¤¦¡£
 
-NKF(2)                                                     NKF(2)
 
 
 n\bnk\bkf\bf 1\b1.\b.7\b7
@@ -318,20 +324,18 @@ U\bUT\bTF\bF-\b-8\b8 
                '>', '<', '"', '&' ¤ËÊÑ´¹¤·¤Þ¤¹
 
 
-n\bnk\bkf\bf 2\b2.\b.0\b0
-       newline ¤òÊݸ¤¹¤ë folding -F¡£fmt¤Ë¶á¤¤Æ°ºî¤ò¤¹¤ë¡£
-
-
 
+                           13/Oct/2003                          5
 
 
-                            9/Sep/2002                          5
 
 
 
+NKF(2)                                                     NKF(2)
 
 
-NKF(2)                                                     NKF(2)
+n\bnk\bkf\bf 2\b2.\b.0\b0
+       newline ¤òÊݸ¤¹¤ë folding -F¡£fmt¤Ë¶á¤¤Æ°ºî¤ò¤¹¤ë¡£
 
 
        folding ¤Î¥Þ¡¼¥¸¥ó¡£-f60-0 ¤Ê¤É¤È¡¢0¤Ë¤¹¤ë¤È¶Ø§¤»¤º¤Ë¡¢¶¯
@@ -363,6 +367,7 @@ M\bMI\bIM\bME\bE
        ¡¼¥É¤¹¤ë¤³¤È¤â²Äǽ¡£»ß¤Þ¤é¤Ê¤¤²ÄǽÀ­¤¢¤ê¡£
 
 
+¤½\b\b¤½¤Î\b\b¤Î¾\b\b¾
        nkf_test.pl ¤Î¥Ð¥°¥Á¥§¥Ã¥¯¤òÁý¤ä¤·¤¿¡£ test ¤¬¼ºÇÔ¤·¤¿¤È¤­
        ¤Ëdiff¤ò¼è¤ë¤è¤¦¤Ë¤·¤¿¡£ make_test.pl ¤Ç¥Æ¥¹¥ÈºîÀ®²Äǽ¡£
 
@@ -384,20 +389,47 @@ M\bMI\bIM\bME\bE
           -h2   --hirakana ¤«¤¿¤«¤Ê->¤Ò¤é¤¬¤Ê
           -h3   --hirakana-katakana ¤«¤¿¤«¤Ê<->¤Ò¤é¤¬¤Ê
 
+
+
+                           13/Oct/2003                          6
+
+
+
+
+
+NKF(2)                                                     NKF(2)
+
+
        --overwrite ¤Ç¡¢°ú¿ô¤Î¥Õ¥¡¥¤¥ë¤òľÀÜ¡¢ÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­
        ¤Þ¤¹¡£
 
 
+n\bnk\bkf\bf 2\b2.\b.0\b0.\b.4\b4 (\b(ͽ\b\bͽÄê\b\bÄê)\b)
+       Shift_JIS ¤Î FAxx-FCxx ¤Ë¤Ä¤¤¤Æ¡¢ÉáÄ̤μ°¤Ç¤Ï euc ¤ËÊÑ´¹¤Ç
+       ¤­¤Þ¤»¤ó¤¬¡¢CP932 ¤ÇƱÃͤÊʸ»ú¤ËÆɤߴ¹¤¨¤ÆÊÑ´¹¤·¤Þ¤¹¡£¤³¤Î
+       Æ°ºî¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢--no-cp932 ¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
 
 
+       perl module ¤Ë
+          nkf_continue     ¥ª¥×¥·¥ç¥ó¡¢¼«Æ°È½Ê̤ξõÂ֤ʤɤò°ú¤­·Ñ
+       ¤¤¤ÇÊÑ´¹
+          inputcode        ¼«Æ°È½ÊÌ·ë²Ì¤Îʸ»ú¥³¡¼¥É¤òÊÖ¤¹¤òÄɲä·
+       ¤Þ¤·¤¿¡£
 
-                            9/Sep/2002                          6
 
+       --numchar-input ¥ª¥×¥·¥ç¥ó¤ò¿·Àß
+           mhonarc ¤Ê¤É¡¢ÆüËܸì¤ò UTF-16 ¤Î &#....; ¤Î¥Ñ¥¿¡¼¥ó ¤Ç
+       ½ÐÎϤ¹¤ë¤â¤Î¤òÊÑ´¹¤·¤Þ¤¹¡£
 
 
+       --exec-in, --exec-out ¥ª¥×¥·¥ç¥ó¤ò¿·Àß
 
+           nkf -e --exec-in cmd args...
+           ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎϤò nkf ¤ÎÆþÎϤȤ·¤Þ¤¹¡£
+
+           nkf -e --exec-out cmd args...
+           ¤È¤ä¤ë¤È¡¢nkf ¤Î½ÐÎϤò cmd ¤ÎÆþÎϤȤ·¤Þ¤¹¡£
 
-NKF(2)                                                     NKF(2)
 
 
 A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
@@ -412,14 +444,28 @@ A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
 
        nkf 1.9-
        Akio Furukawa
+       Andy Taki
        From: OHARA Shigeki
        Fumitaka Kitagawa
        Hiroaki Sengoku
        Ikuhiro MORITA (¿¹ÅÄ °é¹¨)
+       Yoshiharu ITO
        Junn Ohta
        KAWAMURA Masao
        Kazuhiko Mori
        Keitaro Isokawa
+
+
+
+                           13/Oct/2003                          7
+
+
+
+
+
+NKF(2)                                                     NKF(2)
+
+
        Ken-ichi Hirose
        Ki-ichiro SATO
        Kiwamu Aoyama
@@ -430,6 +476,7 @@ A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
        Satoru Takabayashi
        Shigeyuki Takagi
        Shin MICHIMUKO
+       TOYODA Jiro
        Tsutomu Sakai
        YAMASHITA Junji (»³²¼ ½ã»Ê)
        Yasuyuki Sato
@@ -454,18 +501,6 @@ A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
        »°ÂðÀµÂÙ
        »³ÁÒ ¿¿
        »³ËÜ Ë§¿Í
-
-
-
-                            9/Sep/2002                          7
-
-
-
-
-
-NKF(2)                                                     NKF(2)
-
-
        »³Ìî͵»Ê (¤ä¤Þ¤Î¤æ¤¦¤¸)
        ½Å¼ˡ¹î
        ¾®Åç´ðÌ÷
@@ -485,10 +520,24 @@ NKF(2)                                                     NKF(2)
        Ìî¼½Ó¾´
        Í­²¬¡÷¥ß¥Î¥ë¥¿
        Í­Âô ÌÀ¹¨
+
+
+
+                           13/Oct/2003                          8
+
+
+
+
+
+NKF(2)                                                     NKF(2)
+
+
        Íî¹ç°ì´î
        ÎÓ  μ
        Ô¢°Â ¼£
-
+       ÌÚ²¼ ͺ²ð
+       À®À¥¤æ¤¤
+       Äáëľ¼ù
 
        ²ÏÌî¿¿¼£
             www.ie.u-ryukyu.ac.jp/~kono/nkf/
@@ -523,6 +572,23 @@ NKF(2)                                                     NKF(2)
 
 
 
-                            9/Sep/2002                          8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                           13/Oct/2003                          9