OSDN Git Service

version strings
authorRei FURUKAWA <rei_furukawa@users.sourceforge.jp>
Sun, 10 Apr 2005 06:06:20 +0000 (06:06 +0000)
committerRei FURUKAWA <rei_furukawa@users.sourceforge.jp>
Sun, 10 Apr 2005 06:06:20 +0000 (06:06 +0000)
Makefile
NKF.mod/NKF.pm
nkf.1
nkf.1j
nkf.c
nkf.doc

index 8f6c561..2f1e3b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHAR = shar
 # SHAR = shar -T
 PERL = perl
 RM = rm -rf
-VERSION = 204
+VERSION = 205
 EXIST = test -f
 #EXIST = exist #nmake
 
index 386168e..6e5c9fc 100644 (file)
@@ -36,7 +36,7 @@ require DynaLoader;
 @EXPORT = qw(
        nkf     nkf_continue    inputcode
 );
-$VERSION = '2.04';
+$VERSION = '2.05';
 
 bootstrap NKF $VERSION;
 
diff --git a/nkf.1 b/nkf.1
index 31f341a..22fbf88 100644 (file)
--- a/nkf.1
+++ b/nkf.1
@@ -1,6 +1,6 @@
 .TH NKF 2L 07/Feb/2004
 .SH NAME
-nkf \- Network Kanji code conversion Filter v2.0.4
+nkf \- Network Kanji code conversion Filter v2.0.5
 .SH SYNOPSIS
 .B nkf
 [
diff --git a/nkf.1j b/nkf.1j
index 81cfefa..01f86a1 100644 (file)
--- a/nkf.1j
+++ b/nkf.1j
@@ -1,6 +1,6 @@
 .TH NKF 1 07/Feb/2004
 .SH NAME
-nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B v2.0.4
+nkf \- \e$B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?\e(B v2.0.5
 .SH SYNOPSIS
 .B nkf
 .RI [ options ]
diff --git a/nkf.c b/nkf.c
index c791e3e..4e29e9d 100644 (file)
--- a/nkf.c
+++ b/nkf.c
 **        E-Mail: furukawa@tcp-ip.or.jp
 **    \e$B$^$G8fO"Mm$r$*4j$$$7$^$9!#\e(B
 ***********************************************************************/
-/* $Id: nkf.c,v 1.66 2005/03/07 16:16:50 naruse Exp $ */
-#define NKF_VERSION "2.0.4"
-#define NKF_RELEASE_DATE "2005-03-05"
+/* $Id: nkf.c,v 1.67 2005/04/09 21:06:20 rei_furukawa Exp $ */
+#define NKF_VERSION "2.0.5"
+#define NKF_RELEASE_DATE "2005-04-10"
 #include "config.h"
 
 static char *CopyRight =
-      "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2004 Kono, Furukawa";
+      "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2005 Kono, Furukawa, Naruse";
 
 
 /*
diff --git a/nkf.doc b/nkf.doc
index 58c16a4..7399de5 100644 (file)
--- a/nkf.doc
+++ b/nkf.doc
@@ -3,7 +3,7 @@ NKF(1)                                                                  NKF(1)
 
 
 N\bNA\bAM\bME\bE
-       nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿ v2.0.4
+       nkf - ¥Í¥Ã¥È¥ï¡¼¥¯ÍÑ´Á»ú¥³¡¼¥ÉÊÑ´¹¥Õ¥£¥ë¥¿ v2.0.5
 
 S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
        n\bnk\bkf\bf [_\bo_\bp_\bt_\bi_\bo_\bn_\bs] [_\bf_\bi_\bl_\be]
@@ -19,8 +19,8 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
        ¤¹¤ë°ÂÁ´¤Ê¤â¤Î¤Ë¤Ï¤Ê¤Ã¤Æ¤¤¤ë¡£
 
        ¸½ºß¡¢_\bn_\bk_\bf¤¬Ç§¼±¤Ç¤­¤ëÆþÎϤδÁ»ú¥³¡¼¥É·Ï¤Ï¡¢¤¤¤ï¤æ¤ë¡ÖJIS¥³¡¼ ¥É ¡×(ISO-
-       2022-JP ¤Ë´ð¤Å¤¯¤â¤Î)¡¢MS´Á»ú¥³¡¼¥É(¥·¥Õ¥ÈJIS)¡¢ÆüËܸìEUC(AT&T¥³¡¼¥É)¤Î
-       ¤¤¤º¤ì¤«¤Ç¤¢¤ë¡£½ÐÎϤ¹¤ë´Á»ú¥³¡¼¥É·Ï¤â¡¢¤³¤Î3¼ïÎà¤Ç¤¢¤ë¡£
+       2022-JP ¤Ë´ð¤Å¤¯¤â¤Î)¡¢MS´Á»ú¥³¡¼¥É(¥·¥Õ¥ÈJIS)¡¢ÆüËܸìEUC(AT&T¥³¡¼¥É)¡¢
+       UTF-8¡¢UTF-16¤Î¤¤¤º¤ì¤«¤Ç¤¢¤ë¡£½ÐÎϤ¹¤ë´Á»ú¥³¡¼¥É·Ï¤â¡¢¤³¤ì¤é¤Ç¤¢¤ë¡£
 
        ÆþÎϤϡ¢¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢É¸½àÆþÎϤȤʤ롣½ÐÎϤÏɸ½à½ÐÎϤǤ¢ ¤ë
        ¡£
@@ -33,12 +33,17 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
        -\b-s\bs     ¥·¥Õ¥ÈJIS¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£
 
-       -\b-w\bw     UTF8¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£
+       -\b-w\bw     UTF8 ¥³ ¡¼ ¥É ¤ò½ÐÎϤ¹¤ë¡£¡ÊBOM̵¤·¡Ë -\b-w\bw8\b8 UTF8¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£
+              -\b-w\bw8\b80\b0 UTF8¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£¡ÊBOM̵¤·¡Ë -\b-w\bw1\b16\b6 UTF16¥³¡¼¥É¤ò½ÐÎÏ ¤¹
+              ¤ë ¡£¡ÊBig Endian / BOM̵¤·¡Ë -\b-w\bw1\b16\b6B\bB UTF16¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£¡ÊBig
+              Endian / BOMÍ­¤ê¡Ë -\b-w\bw1\b16\b6B\bB0\b0 UTF16¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£¡ÊBig Endian  /
+              BOM̵¤·¡Ë -\b-w\bw1\b16\b6L\bL UTF16¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£¡ÊLittle Endian / BOMÍ­¤ê
+              ¡Ë -\b-w\bw1\b16\b6L\bL0\b0 UTF16¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¡£¡ÊLittle Endian / BOM̵¤·¡Ë
 
        -\b-m\bm[\b[B\bBQ\bQS\bSN\bN0\b0]\b]
-              MIME  ¤ò²òÆɤ¹¤ë¡£(¥Ç¥Õ¥©¥ë¥È) ISO-2022-JP(base64)¤ÈISO-8859-1(Q
+              MIME ¤ò²òÆɤ¹¤ë¡£(¥Ç¥Õ¥©¥ë¥È) ISO-2022-JP(base64) ¤ÈISO-8859-1(Q
               encode) ¤Î¤ß¤ò²òÆɤ¹¤ë¡£ISO-8859-1 (Latin-1) ¤ò²òÆɤ¹¤ë»þ¤Ï¡¢ -l
-              ¥Õ ¥é ¥°¤âɬÍפǤ¢¤ë¡£-m0 ¤Ç¤ÏMIME¤ò²òÆɤ·¤Ê¤¤¡£-mQ, -mB¤Ç¤Ï¡¢ Q
+              ¥Õ¥é¥°¤âɬÍפǤ¢¤ë¡£-m0 ¤Ç¤ÏMIME¤ò²òÆɤ·¤Ê¤¤¡£-mQ, -mB¤Ç¤Ï ¡¢  Q
               encode, B encode ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤·¤Æ½èÍý¤¹¤ë¡£
                  -mB MIME base64 stream ¤ò²òÆɤ¹¤ë¡£¥Ø¥Ã¥À¤Ê¤É¤Ï¼è¤ê½ü¤¯¤³¤È¡£
                  -mQ MIME quoted stream ¤ò²òÆɤ¹¤ë¡£
@@ -63,6 +68,16 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
               -\b-S\bS     MS´Á»ú¤ò²¾Äꤹ¤ë¡£X0201²¾Ì¾¤â²¾Äꤵ¤ì¤ë¡£
 
+              -\b-W\bW     UTF-8¤ò²¾Äꤹ¤ë¡£
+
+              -\b-W\bW8\b8    UTF-8¤ò²¾Äꤹ¤ë¡£
+
+              -\b-W\bW1\b16\b6   UTF-16(Little Endien)¤ò²¾Äꤹ¤ë¡£
+
+              -\b-W\bW1\b16\b6B\bB  UTF-16(Big Endien)¤ò²¾Äꤹ¤ë¡£
+
+              -\b-W\bW1\b16\b6L\bL  UTF-16(Little Endien)¤ò²¾Äꤹ¤ë¡£
+
               -\b-X\bX     MS´Á»úÃæ¤ËX0201²¾Ì¾¤¬¤¢¤ë¤È²¾Äꤹ¤ë¡£
 
               -\b-B\bB     ²õ¤ì¤¿(Broken)JIS¥³¡¼¥É¡£ESC¤¬¤Ê¤¯¤Ê¤Ã¤¿¤È²¾Äꤹ¤ë¡£
@@ -74,8 +89,8 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
        -\b-f\bf_\b?    °ì¹Ô_\b?ʸ»ú¤Ë¤Ê¤ë¤è¤¦¤Ë´Êñ¤ÊÀ°·Á¤ò¤ª¤³¤Ê¤¦¡£¥Ç¥Õ¥©¥ë¥È¤Ï 60ʸ»ú¤Ç
               ¤¢¤ë¡£
 
-       -\b-Z\bZ     X0208Ãæ¤Î±Ñ¿ô»ú¤È¼ã´³¤Îµ­¹æ¤òASCII¤ËÊÑ´¹¤¹¤ë¡£-Z1  ¤ÏX0208 ´Ö ³Ö
-              ¤òASCII  space¤ËÊÑ´¹¤¹¤ë¡£-Z2¤ÏX0208´Ö³Ö¤òASCII space Æó¤Ä¤ËÊÑ´¹
+       -\b-Z\bZ     X0208 Ã栤Π±Ñ¿ô»ú¤È¼ã´³¤Îµ­¹æ¤òASCII¤ËÊÑ´¹¤¹¤ë¡£-Z1 ¤ÏX0208´Ö³Ö
+              ¤òASCII space¤ËÊÑ´¹¤¹¤ë¡£-Z2¤ÏX0208´Ö³Ö¤òASCII space Æó¤Ä¤ËÊÑ ´¹
               ¤¹¤ë¡£¼ñÌ£¤Ë¤è¤Ã¤Æ»È¤¤Ê¬¤±¤Æ¤Û¤·¤¤¡£
 
        -\b-b\bb     ¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°½ÐÎϤò¹Ô¤¦¡£(¥Ç¥Õ¥©¥ë¥È)
@@ -87,7 +102,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
        -\b-I\bI     iso-2022-jp°Ê³°¤Î´Á»ú¥³¡¼¥É¤ò¢®¤ËÊÑ´¹¡£
 
-       -\b-i\bi_\b?    JIS ´Á»ú¤ò»Ø¼¨¤¹¤ë¥·¡¼¥±¥ó¥¹¤È¤·¤Æ E\bES\bSC\bC-\b-¡Ç\b¡Ç$\b$¡Ç\b¡Ç-\b-_\b?¤ò»ÈÍѤ¹¤ë¡£ (¥Ç¥Õ¥©
+       -\b-i\bi_\b?    JIS´Á»ú¤ò»Ø¼¨¤¹¤ë¥·¡¼¥±¥ó¥¹¤È¤·¤Æ E\bES\bSC\bC-\b-¡Ç\b¡Ç$\b$¡Ç\b¡Ç-\b-_\b?¤ò»ÈÍѤ¹¤ë¡£ (¥Ç¥Õ ¥©
               ¥ë¥È¤Ï¡¢ESC-¡Ç$¡Ç-¡ÇB¡Ç)
 
        -\b-o\bo_\b?    1¥Ð¥¤¥È±Ñ¿ôʸ»ú¥»¥Ã¥È¤ò»Ø¼¨¤¹¤ë¥·¡¼¥±¥ó¥¹¤È¤·¤Æ¡¢E\bES\bSC\bC-\b-¡Ç\b¡Ç(\b(¡Ç\b¡Ç-\b-_\b?¤ò»ÈÍÑ
@@ -95,16 +110,18 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
        -\b-r\br     ROT13/47¤ÎÊÑ´¹¤ò¤¹¤ë¡£
 
+       -\b-g\bg     ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ·¤Þ¤¹¡£
+
        -\b-v\bv     ¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë¡£
 
        -\b-T\bT     ¥Æ¥­¥¹¥È¥â¡¼¥É¤Ç½ÐÎϤ¹¤ë¡£(MS-DOS¾å¤Ç¤Î¤ß¸úÎϤò»ý¤Ä)
 
-       -\b-l\bl     0x80-0xfe ¤Î¥³¡¼¥É¤òISO-8859-1 (Latin-1)¤È¤·¤Æ°·¤¦¡£ JIS¥³¡¼¥É¥¢
+       -\b-l\bl     0x80-0xfe¤Î¥³¡¼¥É¤òISO-8859-1 (Latin-1)¤È¤·¤Æ°·¤¦¡£ JIS¥³¡¼¥É ¥¢
               ¥¦¥È¥×¥Ã¥È¤È¤ÎÁȹ礻¤ß¤Î¤ßÍ­¸ú¡£ -s, -e, -x¤È¤ÏξΩ¤·¤Ê¤¤¡£
 
        -\b-x\bx     Ä̾浪¤³¤Ê¤ï¤ì¤ëX0201²¾Ì¾->X0208¤Î²¾Ì¾ÊÑ´¹¤ò¤·¤Ê¤¤¤Ç¡¢
-               X0201²¾Ì¾¤òÊݸ¤¹¤ë¡£ÆþÎϤϠ¡¢MS-Kanji ¤Î1byte ²¾ Ì¾ ¡¢SO/SI ¡¢
-              ESC-(-I,  SSO ¤ò¼õ¤±ÉÕ¤±¤ë¡£½ÐÎϤϡ¢ÆüËܸìEUCÃæ¤Ç¤ÏSSO¡¢ JIS¤Ç¤Ï
+               X0201 ²¾ Ì¾ ¤ò Êݠ¸ ¤¹¤ë¡£ÆþÎϤϡ¢MS-Kanji¤Î1byte²¾Ì¾¡¢SO/SI¡¢
+              ESC-(-I, SSO¤ò¼õ¤±ÉÕ¤±¤ë¡£½ÐÎϤϡ¢ÆüËܸìEUCÃæ¤Ç¤ÏSSO¡¢ JIS ¤Ç ¤Ï
               ESC-¡Ç(¡Ç-I ¤ò»È¤¦¡£
 
        -\b-O\bO     ¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë¡£Unix¤Ç¤ÏÉÔÍפʵ¡Ç½¤À¤¬Windows¤äMSDOS¤Ç¤ÏɬÍ×
@@ -135,12 +152,26 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
               --cap-input, --url-input
                      ¤½¤ì¤¾¤ì ¡Ç:¡Ç, ¡Ç%¡Ç ¤Ë³¤¯ 16 ¿Ê¿ô¤òʸ»ú¤ËÊÑ´¹¤¹¤ë
 
+              --numchar-input
+                     &#....; ¤Î¤è¤¦¤Ê¡¢Unicodeʸ»ú»²¾È¤òÊÑ´¹¤¹¤ë
+
+              --no-cp932
+                     Shift_JIS ¤Î¡¢FAxx-FCxx ¤ò¡¢CP932 ¤ÇƱÃͤÊʸ»ú¤ËÆɤߴ¹ ¤¨
+                     ¤ëÆ°ºî¤ò̵¸ú¤Ë¤¹¤ë
+
+              --cp932inv
+                     Shift_JIS   ¤Ø ¤Î ÊÑ ´¹¤ÎºÝ¡¢EDxx-EFxx ¤ò¡¢CP932 ¤ÇƱÃͤÊ
+                     FAxx-FCxx ¤Îʸ»ú¤ËÊÑ´¹¤¹¤ë
+
+              --ms-ucs-map
+                     Microsoft¤ÎUCS¥Þ¥Ã¥Ô¥ó¥°¸ß´¹¤ÎÊÑ´¹¤ò¹Ô¤¦
+
               --overwrite
-                     ¸µ ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ¤­
-                     ´¹¤¨¤ë¤³¤È¤â²Äǽ¡£
+                     ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊÑ´¹·ë²Ì¤ÇÃÖ¤­´¹¤¨¤ë¡£Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò½ñ ¤­
+                     ´¹¤¨¤ë¤³¤È¤â²Äǽ
 
-              --no-cp932 Shift_JIS  ¤Î¡¢FAxx-FCxx ¤ò¡¢CP932 ¤ÇƱÃͤÊʸ»ú¤ËÆɤß
-              ´¹¤¨¤ëÆ°ºî¤ò̵¸ú¤Ë¤¹¤ë
+              --guess
+                     ¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ¹¤ë
 
               --help
 
@@ -150,7 +181,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
        ¼¡¤Î 2\b2 ¤Ä¤Ï¡¢c\bco\bon\bnf\bfi\big\bg.\b.h\bh ¤Ç E\bEX\bXE\bEC\bC_\b_I\bIO\bO ¤ò d\bde\bef\bfi\bin\bne\be ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú
               --exec-in
-                     nkf [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½Ð ÎÏ
+                     nkf  [options] --exec-in cmd args... ¤È¤ä¤ë¤È¡¢cmd ¤Î½ÐÎÏ
                      ¤ò nkf ¤ÎÆþÎϤȤ¹¤ë
 
               --exec-out
@@ -165,39 +196,39 @@ A\bAU\bUT\bTH\bHO\bOR\bR
 
 
 B\bBU\bUG\bGS\bS
-       ¼Â¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢EUC¤È¥·¥Õ¥ÈJIS¤È¤Î¼«Æ°È½Äê¤Ç¤¢¤ê¡¢ºÇ½é ¤Ë
-       ÆàÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£¤½¤·¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα¥Ð
+       ¼Â ¤Ï¡¢ÆþÎϤΥ³¡¼¥É·Ï¤ÎȽÄê¤Ï¡¢EUC¤È¥·¥Õ¥ÈJIS¤È¤Î¼«Æ°È½Äê¤Ç¤¢¤ê¡¢ºÇ½é¤Ë
+       ÆÃÄê¤Ç¤­¤ëʸ»ú¤¬Í褿»þÅÀ¤Ç³ÎÄꤷ¤Æ¤·¤Þ¤¦¡£¤½¤·¤Æ¡¢ÆÃÄêÉÔǽ¤Î´Ö¤ÏÊÝα ¥Ð
        ¥Ã¥Õ¥¡¤Ë¤¿¤á¤Æ¤ª¤«¤ì¡¢³ÎÄê¸å¤Ë½èÍý¤µ¤ì¤ë¡£¤³¤Î¤¿¤á¡¢
 
        1)     7¥Ó¥Ã¥ÈJIS¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£¥·¥Õ¥ÈJIS¡¢EUCº®¹ç¤â¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ï
               ÌäÂ꤬¤Ê¤¤¡£¤¿¤À¤·¡¢
 
-       2)      ¥·¥Õ¥ÈJIS¤ÎX0201²¾Ì¾¤ÈEUC¤¬¼±Ê̤Ǥ­¤Ê¤¤¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Õ¥©¥ë¥È
+       2)     ¥·¥Õ¥ÈJIS¤ÎX0201²¾Ì¾¤ÈEUC¤¬¼±Ê̤Ǥ­¤Ê¤¤¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Õ¥©¥ë ¥È
               ¤Ç¤Ï¥·¥Õ¥ÈJIS¤ÎX0201²¾Ì¾¤Ï¤Ê¤¤¤È²¾Äꤷ¤Æ¤¤¤ë¡£
 
-       ¤³¤Î¥Õ¥£¥ë¥¿¤ÎÊÑ´¹¤Ï¡¢¥³¡¼¥É·Ï¤ËÂбþ¤·¤¿°ì³ç¼ÌÁü¤ò»Ü¤¹¤À¤±¤Ê¤Î¤Ç¡¢³° »ú
+       ¤³ ¤Î¥Õ¥£¥ë¥¿¤ÎÊÑ´¹¤Ï¡¢¥³¡¼¥É·Ï¤ËÂбþ¤·¤¿°ì³ç¼ÌÁü¤ò»Ü¤¹¤À¤±¤Ê¤Î¤Ç¡¢³°»ú
        ¤äÆü쵭¹æ¤ä·ÓÀþÁÇÊҤʤɡ¢JISÂè°ì¡¢ÂèÆó¿å½àɽ¤Ë¤ª¤¤¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¥³
-       ¡¼¥É¤Ë³Æ¼Ò¤Ë¤è¤ê³ä¤êÅö¤Æ¤é¤ì¤¿Ê¸»úÊÑ´¹¤·¤Ê¤¤¡£Âè»°¿å½à¤Ê¤É¤âÊÑ´¹¤·¤Ê ¤¤
+       ¡¼ ¥É¤Ë³Æ¼Ò¤Ë¤è¤ê³ä¤êÅö¤Æ¤é¤ì¤¿Ê¸»úÊÑ´¹¤·¤Ê¤¤¡£Âè»°¿å½à¤Ê¤É¤âÊÑ´¹¤·¤Ê¤¤
        ¡£ UTF8¤ÎÆüËܸì°Ê³°¤ÎÉôʬ¤Ë¤âÂбþ¤·¤Æ¤¤¤Ê¤¤¡£
 
 
 k\bko\bon\bno\bo@\b@c\bcs\bsl\bl.\b.s\bso\bon\bny\by.\b.c\bco\bo.\b.j\bjp\bp (\b(S\bSh\bhi\bin\bnj\bji\bi K\bKo\bon\bno\bo)\b) ¤Ë¤è¤ëÊѹ¹¡£
-       X0201 ²¾Ì¾(¤¤¤ï¤æ¤ëȾ³Ñ¤«¤Ê)¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇX0208(Á´³Ñ²¾Ì¾)¤ËÊÑ´¹¤µ¤ì¤ë¡£
+       X0201²¾Ì¾(¤¤¤ï¤æ¤ëȾ³Ñ¤«¤Ê)¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇX0208(Á´³Ñ²¾Ì¾)¤ËÊÑ´¹¤µ¤ì¤ë ¡£
        ¤¿¤À¤·¡¢¥·¥Õ¥ÈJIS¤ÎX0201²¾Ì¾¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏEUC¤À¤È²ò¼á¤µ¤ì¤Æ¤·¤Þ¤¦¡£¤³
-       ¤ì ¤¬Ë¾¤Þ¤·¤¯¤Ê¤¤»þ¤Ë¤Ï -S ¤ä - -X ¤Ê¤É¤Î¥Õ¥é¥°¤ò»È¤¨¤ÐÎɤ¤¡£-X¤ò»ØÄꤹ
-       ¤ë¤È°ìö³ÎÄꤷ¤¿¥·¥Õ¥ÈJIS¤«¤é EUC¤Ë°Ü¹Ô¤¹¤ë¤³¤È¤Ï¤Ê¤¤¡£ESC-(-I ¤Ë ¤è ¤ë
+       ¤ì¤¬Ë¾¤Þ¤·¤¯¤Ê¤¤»þ¤Ë¤Ï -S ¤ä - -X ¤Ê¤É¤Î¥Õ¥é¥°¤ò»È¤¨¤ÐÎɤ¤¡£-X¤ò»ØÄê ¤¹
+       ¤ë ¤È °ì Ã¶³ÎÄꤷ¤¿¥·¥Õ¥ÈJIS¤«¤é EUC¤Ë°Ü¹Ô¤¹¤ë¤³¤È¤Ï¤Ê¤¤¡£ESC-(-I¤Ë¤è¤ë
        X0201¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£SI/SO SSO¤Ï¡¢-l¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤ÐX0201¤È²ò¼á
        ¤¹¤ë¡£
 
        MIME decode¤Ï¡¢ISO-2022-JP¤Îbase64¤È¡¢ISO-8859-1¤Î16¿Êencode¤Î¤ß decode
-       ¤¹ ¤ë¡£ MIME decode¤Ï¡¢Ã±½ã¤Ê²þ¹Ô¤ä¶õÇò¤Ï°ÂÁ´¤ËÆɤßÈô¤Ð¤µ¤ì¤ë¡£¤È¤¤¤¦¤³
+       ¤¹¤ë¡£ MIME decode¤Ï¡¢Ã±½ã¤Ê²þ¹Ô¤ä¶õÇò¤Ï°ÂÁ´¤ËÆɤßÈô¤Ð¤µ¤ì¤ë¡£¤È¤¤¤¦ ¤³
        ¤È¤Ï¡¢ MIME decodeÃæ¤Î¶õÇò¤ÏÊݸ¤µ¤ì¤Ê¤¤¡£ÊÑ´¹¤Ï²ÄµÕ¤Ç¤Ï¤Ê¤¤¡£ less¤ärn
-       ¤Ç ¹Ô¤¬Ê¬³ä¤µ¤ì¤¿»þ¤Ï¡¢ Terminal¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë ESC-[-K ¤Ê¤É¤¬ÁÞÆþ¤µ¤ì¤ë
-       ¤Î¤Ç¡¢´°Á´¤Ë¤Ïdecode ¤Ç¤­¤Ê¤¤¡£-mN ¤Ç¤Ï¡¢¥Á¥§¥Ã¥¯¤¬´Ë¤¤¤Î¤Ç decode¤Ç ¤­
+       ¤Ç¹Ô¤¬Ê¬³ä¤µ¤ì¤¿»þ¤Ï¡¢ Terminal¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë ESC-[-K ¤Ê¤É¤¬ÁÞÆþ¤µ¤ì ¤ë
+       ¤Î ¤Ç¡¢´°Á´¤Ë¤Ïdecode ¤Ç¤­¤Ê¤¤¡£-mN ¤Ç¤Ï¡¢¥Á¥§¥Ã¥¯¤¬´Ë¤¤¤Î¤Ç decode¤Ç¤­
        ¤ë¾ì¹ç¤â¤¢¤ë¡£ ISO-8859-1 ½ÐÎϤÏJIS ¥³¡¼¥É½ÐÎϤȤ·¤«Î¾Î©¤·¤Ê¤¤¡£
 
-       Fold  µ¡Ç½¤Ïfmt¤È°Û¤Ê¤ê¹ÔƬ¤Î¶õÇò¤ò̵»ë¤¹¤ë¡£¶Ø§½èÍý¤Ï¤¢¤ë¤¬»ØÄꤵ¤ì¤¿
-       Ĺ¤µ+5¤Ç¶¯À©²þ¹Ô¤¹¤ë¡£-f60-10 ¤Ê¤É¤È¤¹¤ë¤È¶¯À©²þ¹Ô¤Î Í¾ ÃÏ(fold-margin)
+       Fold µ¡Ç½¤Ïfmt¤È°Û¤Ê¤ê¹ÔƬ¤Î¶õÇò¤ò̵»ë¤¹¤ë¡£¶Ø§½èÍý¤Ï¤¢¤ë¤¬»ØÄꤵ¤ì ¤¿
+       Ĺ ¤µ+5 ¤Ç¶¯À©²þ¹Ô¤¹¤ë¡£-f60-10 ¤Ê¤É¤È¤¹¤ë¤È¶¯À©²þ¹Ô¤Î;ÃÏ(fold-margin)
        ¤òÄ´À°¤Ç¤­¤ë¡£-f40-0¤È¤¹¤ë¤È¶Ø§½èÍý¤Ê¤·¤È¤Ê¤ë¡£
 
        X0201²¾Ì¾¤Ïrot47¤µ¤ì¤Ê¤¤¡£
@@ -205,12 +236,12 @@ k\bko\bon\bno\bo@\b@c\bcs\bsl\bl.\b.s\bso\bon\bny\by.\b.c\bco\bo.\b.j\bjp\bp (\b(S\bSh\bhi\bin\bnj\bji\bi
 
 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.j\bjp\bp (\b(S\bSh\bhi\bin\bnj\bji\bi K\bKo\bon\bno\bo)\b) ¤Ë¤è¤ëÊѹ¹¡£
         -B ¤Îlevel¤ò0,1,2 ¤ËÁý¤ä¤·¤¿¡£MIME¤Îbase64, Q-Encoding¤ò²òÆɤ¹¤ëµ¡Ç½¤ò
-       ÉÕ¤±¤¿¡£¥Ø¥Ã¥À¤Ê¤É¤Ï²òÆɤ·¤Ê¤¤¤Î¤Ç¡¢Encode¤µ¤ì¤¿Éôʬ¤À¤±¤òÄ̤¹É¬Íפ¬ ¤¢
+       ÉÕ ¤±¤¿¡£¥Ø¥Ã¥À¤Ê¤É¤Ï²òÆɤ·¤Ê¤¤¤Î¤Ç¡¢Encode¤µ¤ì¤¿Éôʬ¤À¤±¤òÄ̤¹É¬Íפ¬¤¢
        ¤ë¡£ -mB ¤Ï¡¢nkf1.5¤È°ã¤¦Æ°¤­¤ò¤¹¤ë¤Î¤Ç¡¢-B -m ¤È¤¹¤ë¤³¤È¡£
 
 
 n\bnk\bkf\bf 1\b1.\b.6\b6.\b.1\b1
-       -Z1   ¤ÇX0208´Ö³Ö->ASCII space¤ÎÊÑ´¹¤ò¤ª¤³¤Ê¤¦¡£ -Z2 ¤ÇX0208´Ö³Ö->ASCII
+       -Z1 ¤ÇX0208´Ö³Ö->ASCII space¤ÎÊÑ´¹¤ò¤ª¤³¤Ê¤¦¡£ -Z2 ¤ÇX0208 ´Ö ³Ö->ASCII
        space 2¸Ä¤ÎÊÑ´¹¤ò¤ª¤³¤Ê¤¦¡£
 
 
@@ -227,7 +258,7 @@ n\bnk\bkf\bf 1\b1.\b.9\b9
        MIME ¥¨¥ó¥³¡¼¥É¤Îµ¡Ç½»þ¤Ç¤â¡¢¥³¡¼¥ÉÊÑ´¹¤µ¤ì¤·¤Þ¤¦¤Î¤ÇÃí°Õ¡£ base64 ¥¨¥ó
        ¥³¡¼¥É¤Ç¤Ï²þ¹Ô»þ¤ËÀèƬ¤Ë¶õÇò¤¬ÉÕ¤¯¤Î¤Ç¥á¡¼¥ë¥Ø¥Ã¥À¤Ë»ÈÍѤǤ­¤ë¡£
 
-       ¥³ ¡¼¥ÉÊÑ´¹¥â¥¸¥å¡¼¥ë¤Ï¡¢¥µ¥Ö¥ë¡¼¥Á¥ó¤ò·Ñ³¤Ë¤è¤Ã¤ÆÀܳ¤¹¤ë·Á¼°¤È¤Ê¤Ã¤¿
+       ¥³¡¼¥ÉÊÑ´¹¥â¥¸¥å¡¼¥ë¤Ï¡¢¥µ¥Ö¥ë¡¼¥Á¥ó¤ò·Ñ³¤Ë¤è¤Ã¤ÆÀܳ¤¹¤ë·Á¼°¤È¤Ê¤Ã ¤¿
        ¡£Ê£¿ô¤ÎÊÑ´¹¤ò¼«Í³¤ËÀܳ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¡£
 
              getc <-- iconv --> oconv --> other conversion --> putc
@@ -270,7 +301,7 @@ n\bnk\bkf\bf 2\b2.\b.0\b0
 
 
        nkf -f40-0 ¤Ê¤É¤È¤·¤Æ¥á¡¼¥ë¤ò 40 Ê¸»ú¤Å¤ÄÀÚ¤ê½Ð¤·¤Æ¡¢¡ÖSubject 160 Ê¸»ú
-       ÌÜ ¤«¤é 199 Ê¸»úÌܤޤǡסÖËÜʸ    200 Ê¸»úÌܤ«¤é 239 Ê¸»úÌܤޤǡפȤ¹¤ë
+       Ìܤ«¤é 199 Ê¸»úÌܤޤǡסÖËÜʸ    200 Ê¸»úÌܤ«¤é 239 Ê¸»úÌܤޤǡפȤ¹ ¤ë
        ¡£
 
 
@@ -281,19 +312,19 @@ M\bMI\bIM\bME\bE
        Q encode ¤Î Soft Wrap ¤ËÂбþ¡£
 
 
-       MIME encode ¤ÎWrap¤Ç¤Ï¡¢ÀèƬ¤Ë°ìʸ»ú¤Î¶õÇòÁÞÆþ¡£¤·¤¿¡£¤¢A ¤Î MIME ÊÑ ´¹
+       MIME  encode ¤ÎWrap¤Ç¤Ï¡¢ÀèƬ¤Ë°ìʸ»ú¤Î¶õÇòÁÞÆþ¡£¤·¤¿¡£¤¢A ¤Î MIME ÊÑ´¹
        ¤Ï¡¢A ¤ò´Þ¤ó¤ÇÊÑ´¹¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤¬¡¢Âбþ¤·¤Æ¤¤¤Ê¤¤¡£RFC¤Ë¤ÏÈ¿¤·¤¿Æ°ºî
-       ¤À¤¬¡¢ encoded word ´Ö¤Îwhite space¤Ï̵»ë¤µ¤ì¤ë ¡£  nkf_test.pl   ¤Ç ¤Ï
+       ¤À ¤¬ ¡¢  encoded  word  ´Ö¤Îwhite space¤Ï̵»ë¤µ¤ì¤ë¡£ nkf_test.pl ¤Ç¤Ï
        ¡¢MIME¤Î¶õÇò¤òºï½ü¤·¤Æ¤«¤éÈæ³Ó¤·¤Æ¤¤¤ë¡£
 
 
-       non-strict  mime -MN ¤Ç¤Ï¡¢¶õÇò¡¢²þ¹Ô¤ò¤Þ¤¿¤¤¤Ç¡¢base64 encoding ¤ò²òÆÉ
+       non-strict mime -MN ¤Ç¤Ï¡¢¶õÇò¡¢²þ¹Ô¤ò¤Þ¤¿¤¤¤Ç¡¢base64 encoding ¤ò²ò ÆÉ
        ¤¹¤ë¡£¤³¤ì¤Ç¡¢¥¹¥¯¥ê¡¼¥ó¤«¤écut&paste¤Ç¥Ç¥³¡¼¥É¤¹¤ë¤³¤È¤â²Äǽ¡£»ß¤Þ¤é¤Ê
        ¤¤²ÄǽÀ­¤¢¤ê¡£
 
 
 ¤½¤Î¾
-       nkf_test.pl  ¤Î¥Ð¥°¥Á¥§¥Ã¥¯¤òÁý¤ä¤·¤¿¡£ test ¤¬¼ºÇÔ¤·¤¿¤È¤­¤Ëdiff¤ò¼è¤ë
+       nkf_test.pl ¤Î¥Ð¥°¥Á¥§¥Ã¥¯¤òÁý¤ä¤·¤¿¡£ test ¤¬¼ºÇÔ¤·¤¿¤È¤­¤Ëdiff¤ò¼è ¤ë
        ¤è¤¦¤Ë¤·¤¿¡£ make_test.pl ¤Ç¥Æ¥¹¥ÈºîÀ®²Äǽ¡£
 
 
@@ -318,8 +349,8 @@ M\bMI\bIM\bME\bE
 
 
 n\bnk\bkf\bf 2\b2.\b.0\b0.\b.4\b4
-       Shift_JIS   ¤Î  FAxx-FCxx ¤Ë¤Ä¤¤¤Æ¡¢ÉáÄ̤μ°¤Ç¤Ï euc ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¤¬
-       ¡¢CP932 ¤ÇƱÃͤÊʸ»ú¤ËÆɤߴ¹¤¨¤ÆÊÑ´¹¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤ò̵¸ú¤Ë¤¹ ¤ë ¤Ë ¤Ï
+       Shift_JIS ¤Î FAxx-FCxx ¤Ë¤Ä¤¤¤Æ¡¢ÉáÄ̤μ°¤Ç¤Ï euc ¤ËÊÑ´¹¤Ç¤­¤Þ ¤» ¤ó ¤¬
+       ¡¢CP932   ¤Ç Æ±ÃͤÊʸ»ú¤ËÆɤߴ¹¤¨¤ÆÊÑ´¹¤·¤Þ¤¹¡£¤³¤ÎÆ°ºî¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï
        ¡¢--no-cp932 ¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
 
 
@@ -333,7 +364,7 @@ n\bnk\bkf\bf 2\b2.\b.0\b0.\b.4\b4
        ÊÑ´¹¤·¤Þ¤¹¡£
 
 
-       --exec-in, --exec-out ¥ª¥×¥·¥ç¥ó¤ò¿·Àß (config.h ¤Ç EXEC_IO  ¤ò  define
+       --exec-in,  --exec-out  ¥ª¥×¥·¥ç¥ó¤ò¿·Àß (config.h ¤Ç EXEC_IO ¤ò define
        ¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿»þ¤Î¤ßÍ­¸ú)
 
            nkf -e --exec-in cmd args...
@@ -349,13 +380,13 @@ n\bnk\bkf\bf 2\b2.\b.0\b0.\b.5\b5
        ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ CP932 ¤ÇƱÃͤʠFAxx-FCxx ¤Îʸ»ú¤ËÊÑ´¹¤·¤Þ¤¹¡£
 
 
-       --guess ¤Þ¤¿¤Ï -g ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤ë¤È¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ·¤Þ ¤¹
+       --guess  ¤Þ¤¿¤Ï -g ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤ë¤È¼«Æ°È½Ê̤ηë²Ì¤ò½ÐÎϤ·¤Þ¤¹
        ¡£
 
 
-       --prefix=  ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤ë¤È¡¢EUC-JP ¤«¤é Shift_JIS ¤Ø¤ÎÊÑ´¹¤Î
-       ºÝ¡¢2 ¥Ð¥¤¥ÈÌܤ˸½¤ì¤¿Ê¸»ú¤ÎÁ°¤Ë¥¨¥¹¥±¡¼¥×ʸ»ú¤ò¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹ ¡£
-       °ú ¿ô¤Î 1 Ê¸»úÌܤ¬¥¨¥¹¥±¡¼¥×ʸ»ú¡¢2ʸ»úÌܰʹߤ˥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤Ù¤­Ê¸»ú
+       --prefix= ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤ë¤È¡¢EUC-JP ¤«¤é Shift_JIS ¤Ø¤ÎÊÑ´¹ ¤Î
+       ºÝ ¡¢2 ¥Ð¥¤¥ÈÌܤ˸½¤ì¤¿Ê¸»ú¤ÎÁ°¤Ë¥¨¥¹¥±¡¼¥×ʸ»ú¤ò¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+       °ú¿ô¤Î 1 Ê¸»úÌܤ¬¥¨¥¹¥±¡¼¥×ʸ»ú¡¢2ʸ»úÌܰʹߤ˥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤Ù¤­Ê¸ »ú
        ¤ò»ØÄꤷ¤Þ¤¹¡£
 
        Î㤨¤Ð¡¢
@@ -365,6 +396,13 @@ n\bnk\bkf\bf 2\b2.\b.0\b0.\b.5\b5
        ¤½¤ÎÁ°¤Ë @ ¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹
 
 
+       -w8, -w16B, -w16L, -W8, -W16B, -W16L ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤òÄɲä·¤Þ¤·¤¿¡£
+
+
+       --ms-ucs-map  ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤È¡¢ Microsoft¤ÎUCS¥Þ¥Ã¥Ô¥ó¥°¸ß´¹
+       ¤ÎÊÑ´¹¤ò¹Ô¤¤¤Þ¤¹¡£
+
+
 
 A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
        °Ê²¼¤Î¤«¤¿¤¬¤¿¡¢¤É¤¦¤â¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤·¤¿¡£
@@ -405,7 +443,6 @@ A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
        YAMASHITA Junji (»³²¼ ½ã»Ê)
        Yasuyuki Sato
        Yoshiaki Yanagihara
-       Yoshiaki Yanagihara
        hat@so-net
        £Ä£Ã£Ãµ»½ÑÉôÅÏÊÕ
        ¤«¤È¤Ú / ²ÃÆ£ µ®»Ê
@@ -451,6 +488,8 @@ A\bAC\bCK\bKN\bNO\bOW\bWL\bLE\bED\bDG\bGE\bE
        À®À¥¤æ¤¤
        Äáëľ¼ù
        ÃæÅÄ¿­±Ù
+       ¤ï¤¿¤Ê¤Ù¤Ò¤í¤Õ¤ß
+       MoonWolf
 
        ²ÏÌî¿¿¼£
             www.ie.u-ryukyu.ac.jp/~kono/nkf/