X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=nkf.c;h=505d19290fc58126e7d98b611bbe287ab318b356;hp=4b0e4e02d3206f65c9fd914fc3ec5759fe96f142;hb=477df6ae857330396b089025d986f949f27bc5ac;hpb=f17996f6e6c0b846683c50b18bd66915ffbd7811 diff --git a/nkf.c b/nkf.c index 4b0e4e0..505d192 100644 --- a/nkf.c +++ b/nkf.c @@ -1,7 +1,7 @@ /** Network Kanji Filter. (PDS Version) ************************************************************************ ** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA) -** 連絡先： （株）富士通研究所　ソフト３研　市川　至 +** 連絡先： （株）富士通研究所　ソフト３研　市川　至 ** （E-Mail Address: ichikawa@flab.fujitsu.co.jp） ** Copyright (C) 1996,1998 ** Copyright (C) 2002 @@ -17,86 +17,68 @@ ** バイナリの配布の際にはversion messageを保存することを条件とします。 ** このプログラムについては特に何の保証もしない、悪しからず。 ** -** Everyone is permitted to do anything on this program +** Everyone is permitted to do anything on this program ** including copying, modifying, improving, ** as long as you don't try to pretend that you wrote it. -** i.e., the above copyright notice has to appear in all copies. +** i.e., the above copyright notice has to appear in all copies. ** Binary distribution requires original version messages. ** You don't have to ask before copying, redistribution or publishing. ** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE. ***********************************************************************/ /*********************************************************************** -** UTF-8 サポートについて -** 従来の nkf と入れかえてそのまま使えるようになっています -** nkf -e などとして起動すると、自動判別で UTF-8 と判定されれば、 -** そのまま euc-jp に変換されます -** -** まだバグがある可能性が高いです。 -** (特に自動判別、コード混在、エラー処理系) -** -** 何か問題を見つけたら、 -** E-Mail: furukawa@tcp-ip.or.jp -** まで御連絡をお願いします。 + * 現在、nkf は SorceForge にてメンテナンスが続けられています。 + * http://sourceforge.jp/projects/nkf/ ***********************************************************************/ -/* $Id: nkf.c,v 1.97 2006/04/01 18:19:25 naruse Exp $ */ -#define NKF_VERSION "2.0.7" -#define NKF_RELEASE_DATE "2006-04-01" -#include "config.h" - +/* $Id: nkf.c,v 1.159 2007/12/23 07:55:20 naruse Exp $ */ +#define NKF_VERSION "2.0.8" +#define NKF_RELEASE_DATE "2007-12-22" #define COPY_RIGHT \ "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \ - " 2002-2006 Kono, Furukawa, Naruse, mastodon" + "Copyright (C) 2002-2007 Kono, Furukawa, Naruse, mastodon" +#include "config.h" +#include "utf8tbl.h" -/* -** -** -** -** USAGE: nkf [flags] [file] -** -** Flags: -** b Output is buffered (DEFAULT) -** u Output is unbuffered -** -** t no operation -** -** j Outout code is JIS 7 bit (DEFAULT SELECT) -** s Output code is MS Kanji (DEFAULT SELECT) -** e Output code is AT&T JIS (DEFAULT SELECT) -** w Output code is AT&T JIS (DEFAULT SELECT) -** l Output code is JIS 7bit and ISO8859-1 Latin-1 -** -** m MIME conversion for ISO-2022-JP -** I Convert non ISO-2022-JP charactor to GETA by Pekoe -** i_ Output sequence to designate JIS-kanji (DEFAULT_J) -** o_ Output sequence to designate single-byte roman characters (DEFAULT_R) -** M MIME output conversion -** -** r {de/en}crypt ROT13/47 -** -** v display Version -** -** T Text mode output (for MS-DOS) -** -** x Do not convert X0201 kana into X0208 -** Z Convert X0208 alphabet to ASCII -** -** f60 fold option -** -** m MIME decode -** B try to fix broken JIS, missing Escape -** B[1-9] broken level -** -** O Output to 'nkf.out' file or last file name -** d Delete \r in line feed -** c Add \r in line feed -** -- other long option -** -- ignore following option (don't use with -O ) -** -**/ +#if defined(DEFAULT_CODE_JIS) +#elif defined(DEFAULT_CODE_SJIS) +#elif defined(DEFAULT_CODE_EUC) +#elif defined(DEFAULT_CODE_UTF8) +#else +#define DEFAULT_CODE_JIS 1 +#endif + +#ifndef MIME_DECODE_DEFAULT +#define MIME_DECODE_DEFAULT STRICT_MIME +#endif +#ifndef X0201_DEFAULT +#define X0201_DEFAULT TRUE +#endif + +#if DEFAULT_NEWLINE == 0x0D0A +#define PUT_NEWLINE(func) do {\ + func(0x0D);\ + func(0x0A);\ +} while (0) +#define OCONV_NEWLINE(func) do {\ + func(0, 0x0D);\ + func(0, 0x0A);\ +} while (0) +#elif DEFAULT_NEWLINE == 0x0D +#define PUT_NEWLINE(func) func(0x0D) +#define OCONV_NEWLINE(func) func(0, 0x0D) +#else +#define DEFAULT_NEWLINE 0x0A +#define PUT_NEWLINE(func) func(0x0A) +#define OCONV_NEWLINE(func) func(0, 0x0A) +#endif +#ifdef HELP_OUTPUT_STDERR +#define HELP_OUTPUT stderr +#else +#define HELP_OUTPUT stdout +#endif -#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__)) && !defined(MSDOS) +#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS) #define MSDOS #if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__) #define __WIN32__ @@ -117,18 +99,35 @@ #if defined(MSDOS) || defined(__OS2__) #include #include +#if defined(_MSC_VER) || defined(__WATCOMC__) +#define mktemp _mktemp +#endif #endif #ifdef MSDOS #ifdef LSI_C #define setbinmode(fp) fsetbin(fp) +#elif defined(__DJGPP__) +#include +#define setbinmode(fp) djgpp_setbinmode(fp) #else /* Microsoft C, Turbo C */ #define setbinmode(fp) setmode(fileno(fp), O_BINARY) #endif -#else /* UNIX,OS/2 */ +#else /* UNIX */ #define setbinmode(fp) #endif +#if defined(__DJGPP__) +void djgpp_setbinmode(FILE *fp) +{ + /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */ + int fd, m; + fd = fileno(fp); + m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY; + __file_handle_set(fd, m); +} +#endif + #ifdef _IOFBF /* SysV and MSDOS, Windows */ #define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size) #else /* BSD */ @@ -146,10 +145,17 @@ #ifdef OVERWRITE /* added by satoru@isoternet.org */ +#if defined(__EMX__) +#include +#endif #include -#ifndef MSDOS /* UNIX, OS/2 */ +#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */ #include +#if defined(__WATCOMC__) +#include +#else #include +#endif #else /* defined(MSDOS) */ #ifdef __WIN32__ #ifdef __BORLANDC__ /* BCC32 */ @@ -158,7 +164,7 @@ #include #endif /* (__BORLANDC__) */ #else /* !defined(__WIN32__) */ -#if defined(_MSC_VER) || defined(__MINGW32__) /* VC++, MinGW */ +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__) /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */ #include #elif defined(__TURBOC__) /* BCC */ #include @@ -171,55 +177,48 @@ #define FALSE 0 #define TRUE 1 -/* state of output_mode and input_mode +/* state of output_mode and input_mode c2 0 means ASCII - X0201 - ISO8859_1 - X0208 + JIS_X_0201 + ISO_8859_1 + JIS_X_0208 EOF all termination c1 32bit data */ -#define ASCII 0 -#define X0208 1 -#define X0201 2 -#define ISO8859_1 8 -#define NO_X0201 3 -#define X0212 0x2844 -#define X0213_1 0x284F -#define X0213_2 0x2850 - /* Input Assumption */ #define JIS_INPUT 4 +#define EUC_INPUT 16 #define SJIS_INPUT 5 #define LATIN1_INPUT 6 +#define UTF8_INPUT 13 +#define UTF16_INPUT 1015 +#define UTF32_INPUT 1017 + #define FIXED_MIME 7 #define STRICT_MIME 8 /* MIME ENCODE */ -#define ISO2022JP 9 -#define JAPANESE_EUC 10 -#define SHIFT_JIS 11 -#define UTF8 12 -#define UTF8_INPUT 13 -#define UTF16BE_INPUT 14 -#define UTF16LE_INPUT 15 +/* byte order */ -#define WISH_TRUE 15 +#define ENDIAN_BIG 1234 +#define ENDIAN_LITTLE 4321 +#define ENDIAN_2143 2143 +#define ENDIAN_3412 3412 /* ASCII CODE */ #define BS 0x08 #define TAB 0x09 -#define NL 0x0a +#define LF 0x0a #define CR 0x0d #define ESC 0x1b -#define SPACE 0x20 +#define SP 0x20 #define AT 0x40 #define SSP 0xa0 #define DEL 0x7f @@ -227,6 +226,181 @@ #define SO 0x0e #define SSO 0x8e #define SS3 0x8f +#define CRLF 0x0D0A + + +/* encodings */ + +enum nkf_encodings { + ASCII, + ISO_8859_1, + ISO_2022_JP, + CP50220, + CP50221, + CP50222, + ISO_2022_JP_1, + ISO_2022_JP_3, + SHIFT_JIS, + WINDOWS_31J, + CP10001, + EUC_JP, + CP51932, + EUCJP_MS, + EUCJP_ASCII, + SHIFT_JISX0213, + SHIFT_JIS_2004, + EUC_JISX0213, + EUC_JIS_2004, + UTF_8, + UTF_8N, + UTF_8_BOM, + UTF8_MAC, + UTF_16, + UTF_16BE, + UTF_16BE_BOM, + UTF_16LE, + UTF_16LE_BOM, + UTF_32, + UTF_32BE, + UTF_32BE_BOM, + UTF_32LE, + UTF_32LE_BOM, + JIS_X_0201=0x1000, + JIS_X_0208, + JIS_X_0212, + JIS_X_0213_1, + JIS_X_0213_2, + BINARY +}; + +nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0); +nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0); +nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0); +nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0); +nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0); +void j_oconv(nkf_char c2, nkf_char c1); +void s_oconv(nkf_char c2, nkf_char c1); +void e_oconv(nkf_char c2, nkf_char c1); +void w_oconv(nkf_char c2, nkf_char c1); +void w_oconv16(nkf_char c2, nkf_char c1); +void w_oconv32(nkf_char c2, nkf_char c1); + +typedef struct { + char *name; + nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0); + void (*oconv_func)(nkf_char c2, nkf_char c1); +} nkf_native_encoding; + +nkf_native_encoding NkfEncodingASCII = { "US_ASCII", e_iconv, e_oconv }; +nkf_native_encoding NkfEncodingISO_2022_JP = { "ISO-2022-JP", e_iconv, j_oconv }; +nkf_native_encoding NkfEncodingShift_JIS = { "Shift_JIS", s_iconv, s_oconv }; +nkf_native_encoding NkfEncodingEUC_JP = { "EUC-JP", e_iconv, e_oconv }; +nkf_native_encoding NkfEncodingUTF_8 = { "UTF-8", w_iconv, w_oconv }; +nkf_native_encoding NkfEncodingUTF_16 = { "UTF-16", w_iconv16, w_oconv16 }; +nkf_native_encoding NkfEncodingUTF_32 = { "UTF-32", w_iconv32, w_oconv32 }; + +typedef struct { + int id; + char *name; + nkf_native_encoding *based_encoding; +} nkf_encoding; +nkf_encoding nkf_encoding_table[] = { + {ASCII, "ASCII", &NkfEncodingASCII}, + {ISO_8859_1, "ISO-8859-1", &NkfEncodingASCII}, + {ISO_2022_JP, "ISO-2022-JP", &NkfEncodingASCII}, + {CP50220, "CP50220", &NkfEncodingISO_2022_JP}, + {CP50221, "CP50221", &NkfEncodingISO_2022_JP}, + {CP50222, "CP50222", &NkfEncodingISO_2022_JP}, + {ISO_2022_JP_1, "ISO-2022-JP-1", &NkfEncodingISO_2022_JP}, + {ISO_2022_JP_3, "ISO-2022-JP-3", &NkfEncodingISO_2022_JP}, + {SHIFT_JIS, "Shift_JIS", &NkfEncodingShift_JIS}, + {WINDOWS_31J, "WINDOWS-31J", &NkfEncodingShift_JIS}, + {CP10001, "CP10001", &NkfEncodingShift_JIS}, + {EUC_JP, "EUC-JP", &NkfEncodingEUC_JP}, + {CP51932, "CP51932", &NkfEncodingEUC_JP}, + {EUCJP_MS, "eucJP-MS", &NkfEncodingEUC_JP}, + {EUCJP_ASCII, "eucJP-ASCII", &NkfEncodingEUC_JP}, + {SHIFT_JISX0213, "Shift_JISX0213", &NkfEncodingShift_JIS}, + {SHIFT_JIS_2004, "Shift_JIS-2004", &NkfEncodingShift_JIS}, + {EUC_JISX0213, "EUC-JISX0213", &NkfEncodingEUC_JP}, + {EUC_JIS_2004, "EUC-JIS-2004", &NkfEncodingEUC_JP}, + {UTF_8, "UTF-8", &NkfEncodingUTF_8}, + {UTF_8N, "UTF-8N", &NkfEncodingUTF_8}, + {UTF_8_BOM, "UTF-8-BOM", &NkfEncodingUTF_8}, + {UTF8_MAC, "UTF8-MAC", &NkfEncodingUTF_8}, + {UTF_16, "UTF-16", &NkfEncodingUTF_16}, + {UTF_16BE, "UTF-16BE", &NkfEncodingUTF_16}, + {UTF_16BE_BOM, "UTF-16BE-BOM", &NkfEncodingUTF_16}, + {UTF_16LE, "UTF-16LE", &NkfEncodingUTF_16}, + {UTF_16LE_BOM, "UTF-16LE-BOM", &NkfEncodingUTF_16}, + {UTF_32, "UTF-32", &NkfEncodingUTF_32}, + {UTF_32BE, "UTF-32BE", &NkfEncodingUTF_32}, + {UTF_32BE_BOM, "UTF-32BE-BOM", &NkfEncodingUTF_32}, + {UTF_32LE, "UTF-32LE", &NkfEncodingUTF_32}, + {UTF_32LE_BOM, "UTF-32LE-BOM", &NkfEncodingUTF_32}, + {BINARY, "BINARY", &NkfEncodingASCII}, + {-1, NULL, NULL} +}; +#define NKF_ENCODING_TABLE_SIZE 34 +struct { + const char *name; + const int id; +} encoding_name_to_id_table[] = { + {"ASCII", ASCII}, + {"ISO-2022-JP", ISO_2022_JP}, + {"X-ISO2022JP-CP932", CP50220}, + {"CP50220", CP50220}, + {"CP50221", CP50221}, + {"CP50222", CP50222}, + {"ISO-2022-JP-1", ISO_2022_JP_1}, + {"ISO-2022-JP-3", ISO_2022_JP_3}, + {"SHIFT_JIS", SHIFT_JIS}, + {"SJIS", SHIFT_JIS}, + {"WINDOWS-31J", WINDOWS_31J}, + {"CSWINDOWS31J", WINDOWS_31J}, + {"CP932", WINDOWS_31J}, + {"MS932", WINDOWS_31J}, + {"CP10001", CP10001}, + {"EUCJP", EUC_JP}, + {"EUC-JP", EUC_JP}, + {"CP51932", CP51932}, + {"EUC-JP-MS", EUCJP_MS}, + {"EUCJP-MS", EUCJP_MS}, + {"EUCJPMS", EUCJP_MS}, + {"EUC-JP-ASCII", EUCJP_ASCII}, + {"EUCJP-ASCII", EUCJP_ASCII}, + {"SHIFT_JISX0213", SHIFT_JISX0213}, + {"SHIFT_JIS-2004", SHIFT_JIS_2004}, + {"EUC-JISX0213", EUC_JISX0213}, + {"EUC-JIS-2004", EUC_JIS_2004}, + {"UTF-8", UTF_8}, + {"UTF-8N", UTF_8N}, + {"UTF-8-BOM", UTF_8_BOM}, + {"UTF8-MAC", UTF8_MAC}, + {"UTF-8-MAC", UTF8_MAC}, + {"UTF-16", UTF_16}, + {"UTF-16BE", UTF_16BE}, + {"UTF-16BE-BOM", UTF_16BE_BOM}, + {"UTF-16LE", UTF_16LE}, + {"UTF-16LE-BOM", UTF_16LE_BOM}, + {"UTF-32", UTF_32}, + {"UTF-32BE", UTF_32BE}, + {"UTF-32BE-BOM", UTF_32BE_BOM}, + {"UTF-32LE", UTF_32LE}, + {"UTF-32LE-BOM", UTF_32LE_BOM}, + {"BINARY", BINARY}, + {NULL, -1} +}; +#if defined(DEFAULT_CODE_JIS) +#define DEFAULT_ENCODING ISO_2022_JP +#elif defined(DEFAULT_CODE_SJIS) +#define DEFAULT_ENCODING SHIFT_JIS +#elif defined(DEFAULT_CODE_EUC) +#define DEFAULT_ENCODING EUC_JP +#elif defined(DEFAULT_CODE_UTF8) +#define DEFAULT_ENCODING UTF_8 +#endif + #define is_alnum(c) \ (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9')) @@ -236,14 +410,33 @@ #define nkf_isoctal(c) ('0'<=c && c<='7') #define nkf_isdigit(c) ('0'<=c && c<='9') #define nkf_isxdigit(c) (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F')) -#define nkf_isblank(c) (c == SPACE || c == TAB) -#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL) +#define nkf_isblank(c) (c == SP || c == TAB) +#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF) #define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) #define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c)) -#define hex2bin(x) ( nkf_isdigit(x) ? x - '0' : nkf_toupper(x) - 'A' + 10) +#define nkf_isprint(c) (SP<=c && c<='~') +#define nkf_isgraph(c) ('!'<=c && c<='~') +#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \ + ('A'<=c&&c<='F') ? (c-'A'+10) : \ + ('a'<=c&&c<='f') ? (c-'a'+10) : 0) +#define bin2hex(c) ("0123456789ABCDEF"[c&15]) +#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3) +#define nkf_noescape_mime(c) ((c == CR) || (c == LF) || \ + ((c > SP) && (c < DEL) && (c != '?') && (c != '=') && (c != '_') \ + && (c != '(') && (c != ')') && (c != '.') && (c != 0x22))) + +#define CP932_TABLE_BEGIN 0xFA +#define CP932_TABLE_END 0xFC +#define CP932INV_TABLE_BEGIN 0xED +#define CP932INV_TABLE_END 0xEE +#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END) #define HOLD_SIZE 1024 +#if defined(INT_IS_SHORT) +#define IOBUF_SIZE 2048 +#else #define IOBUF_SIZE 16384 +#endif #define DEFAULT_J 'B' #define DEFAULT_R 'B' @@ -273,122 +466,113 @@ extern POINT _BufferSize; struct input_code{ char *name; - int stat; - int score; - int index; - int buf[3]; - void (*status_func)(struct input_code *, int); - int (*iconv_func)(int c2, int c1, int c0); + nkf_char stat; + nkf_char score; + nkf_char index; + nkf_char buf[3]; + void (*status_func)(struct input_code *, nkf_char); + nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0); int _file_stat; }; -static char *input_codename = ""; +static char *input_codename = NULL; /* NULL: unestablished, "": BINARY */ +static nkf_encoding *output_encoding; -#ifndef PERL_XS -static const char *CopyRight = COPY_RIGHT; -#endif #if !defined(PERL_XS) && !defined(WIN32DLL) -static int noconvert(FILE *f); +static nkf_char noconvert(FILE *f); #endif static void module_connection(void); -static int kanji_convert(FILE *f); -static int h_conv(FILE *f,int c2,int c1); -static int push_hold_buf(int c2); -static void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0)); -static int s_iconv(int c2,int c1,int c0); -static int s2e_conv(int c2, int c1, int *p2, int *p1); -static int e_iconv(int c2,int c1,int c0); +static nkf_char kanji_convert(FILE *f); +static nkf_char h_conv(FILE *f,nkf_char c2,nkf_char c1); +static nkf_char push_hold_buf(nkf_char c2); +static void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0)); +static nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1); #if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) /* UCS Mapping * 0: Shift_JIS, eucJP-ascii * 1: eucJP-ms * 2: CP932, CP51932 + * 3: CP10001 */ -#define UCS_MAP_ASCII 0 -#define UCS_MAP_MS 1 -#define UCS_MAP_CP932 2 +#define UCS_MAP_ASCII 0 +#define UCS_MAP_MS 1 +#define UCS_MAP_CP932 2 +#define UCS_MAP_CP10001 3 static int ms_ucs_map_f = UCS_MAP_ASCII; #endif #ifdef UTF8_INPUT_ENABLE /* no NEC special, NEC-selected IBM extended and IBM extended characters */ static int no_cp932ext_f = FALSE; /* ignore ZERO WIDTH NO-BREAK SPACE */ -static int ignore_zwnbsp_f = TRUE; static int no_best_fit_chars_f = FALSE; -static int unicode_subchar = '?'; /* the regular substitution character */ -static void nkf_each_char_to_hex(void (*f)(int c2,int c1), int c); -static void encode_fallback_html(int c); -static void encode_fallback_xml(int c); -static void encode_fallback_java(int c); -static void encode_fallback_perl(int c); -static void encode_fallback_subchar(int c); -static void (*encode_fallback)(int c) = NULL; -static int w2e_conv(int c2,int c1,int c0,int *p2,int *p1); -static int w_iconv(int c2,int c1,int c0); -static int w_iconv16(int c2,int c1,int c0); -static int unicode_to_jis_common(int c2,int c1,int c0,int *p2,int *p1); -static int w_iconv_common(int c1,int c0,const unsigned short *const *pp,int psize,int *p2,int *p1); -static void w16w_conv(int val, int *p2, int *p1, int *p0); -static int ww16_conv(int c2, int c1, int c0); -static int w16e_conv(int val,int *p2,int *p1); +static int input_endian = ENDIAN_BIG; +static nkf_char unicode_subchar = '?'; /* the regular substitution character */ +static void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c); +static void encode_fallback_html(nkf_char c); +static void encode_fallback_xml(nkf_char c); +static void encode_fallback_java(nkf_char c); +static void encode_fallback_perl(nkf_char c); +static void encode_fallback_subchar(nkf_char c); +static void (*encode_fallback)(nkf_char c) = NULL; +static nkf_char w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1); +static nkf_char unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1); +static nkf_char w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1); +static void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0); +static nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0); +static nkf_char w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1); +static void w_status(struct input_code *, nkf_char); #endif #ifdef UTF8_OUTPUT_ENABLE -static int unicode_bom_f= 0; /* Output Unicode BOM */ -static int w_oconv16_LE = 0; /* utf-16 little endian */ -static int e2w_conv(int c2,int c1); -static void w_oconv(int c2,int c1); -static void w_oconv16(int c2,int c1); -#endif -static void e_oconv(int c2,int c1); -static int e2s_conv(int c2, int c1, int *p2, int *p1); -static void s_oconv(int c2,int c1); -static void j_oconv(int c2,int c1); -static void fold_conv(int c2,int c1); -static void cr_conv(int c2,int c1); -static void z_conv(int c2,int c1); -static void rot_conv(int c2,int c1); -static void hira_conv(int c2,int c1); -static void base64_conv(int c2,int c1); -static void iso2022jp_check_conv(int c2,int c1); -static void no_connection(int c2,int c1); -static int no_connection2(int c2,int c1,int c0); +static int output_bom_f = FALSE; +static int output_endian = ENDIAN_BIG; +static nkf_char e2w_conv(nkf_char c2,nkf_char c1); +#endif +static nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1); +static void fold_conv(nkf_char c2,nkf_char c1); +static void nl_conv(nkf_char c2,nkf_char c1); +static void z_conv(nkf_char c2,nkf_char c1); +static void rot_conv(nkf_char c2,nkf_char c1); +static void hira_conv(nkf_char c2,nkf_char c1); +static void base64_conv(nkf_char c2,nkf_char c1); +static void iso2022jp_check_conv(nkf_char c2,nkf_char c1); +static void no_connection(nkf_char c2,nkf_char c1); +static nkf_char no_connection2(nkf_char c2,nkf_char c1,nkf_char c0); static void code_score(struct input_code *ptr); -static void code_status(int c); +static void code_status(nkf_char c); -static void std_putc(int c); -static int std_getc(FILE *f); -static int std_ungetc(int c,FILE *f); +static void std_putc(nkf_char c); +static nkf_char std_getc(FILE *f); +static nkf_char std_ungetc(nkf_char c,FILE *f); -static int broken_getc(FILE *f); -static int broken_ungetc(int c,FILE *f); +static nkf_char broken_getc(FILE *f); +static nkf_char broken_ungetc(nkf_char c,FILE *f); -static int mime_begin(FILE *f); -static int mime_getc(FILE *f); -static int mime_ungetc(int c,FILE *f); +static nkf_char mime_begin(FILE *f); +static nkf_char mime_getc(FILE *f); +static nkf_char mime_ungetc(nkf_char c,FILE *f); static void switch_mime_getc(void); static void unswitch_mime_getc(void); -static int mime_begin_strict(FILE *f); -static int mime_getc_buf(FILE *f); -static int mime_ungetc_buf(int c,FILE *f); -static int mime_integrity(FILE *f,const unsigned char *p); - -static int base64decode(int c); -static void mime_prechar(int c2, int c1); -static void mime_putc(int c); -static void open_mime(int c); +static nkf_char mime_begin_strict(FILE *f); +static nkf_char mime_getc_buf(FILE *f); +static nkf_char mime_ungetc_buf(nkf_char c,FILE *f); +static nkf_char mime_integrity(FILE *f,const unsigned char *p); + +static nkf_char base64decode(nkf_char c); +static void mime_prechar(nkf_char c2, nkf_char c1); +static void mime_putc(nkf_char c); +static void open_mime(nkf_char c); static void close_mime(void); static void eof_mime(void); -static void mimeout_addchar(int c); +static void mimeout_addchar(nkf_char c); #ifndef PERL_XS static void usage(void); static void version(void); +static void show_configuration(void); #endif static void options(unsigned char *c); -#if defined(PERL_XS) || defined(WIN32DLL) static void reinit(void); -#endif /* buffers */ @@ -397,18 +581,18 @@ static unsigned char stdibuf[IOBUF_SIZE]; static unsigned char stdobuf[IOBUF_SIZE]; #endif static unsigned char hold_buf[HOLD_SIZE*2]; -static int hold_count; +static int hold_count = 0; /* MIME preprocessor fifo */ #define MIME_BUF_SIZE (1024) /* 2^n ring buffer */ -#define MIME_BUF_MASK (MIME_BUF_SIZE-1) +#define MIME_BUF_MASK (MIME_BUF_SIZE-1) #define Fifo(n) mime_buf[(n)&MIME_BUF_MASK] static unsigned char mime_buf[MIME_BUF_SIZE]; static unsigned int mime_top = 0; static unsigned int mime_last = 0; /* decoded */ static unsigned int mime_input = 0; /* undecoded */ -static int (*mime_iconv_back)(int c2,int c1,int c0) = NULL; +static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL; /* flags */ static int unbuf_f = FALSE; @@ -419,66 +603,71 @@ static int rot_f = FALSE; /* rot14/43 mode */ static int hira_f = FALSE; /* hira/kata henkan */ static int input_f = FALSE; /* non fixed input code */ static int alpha_f = FALSE; /* convert JIx0208 alphbet to ASCII */ -static int mime_f = STRICT_MIME; /* convert MIME B base64 or Q */ +static int mime_f = MIME_DECODE_DEFAULT; /* convert MIME B base64 or Q */ static int mime_decode_f = FALSE; /* mime decode is explicitly on */ static int mimebuf_f = FALSE; /* MIME buffered input */ static int broken_f = FALSE; /* convert ESC-less broken JIS */ static int iso8859_f = FALSE; /* ISO8859 through */ static int mimeout_f = FALSE; /* base64 mode */ -#if defined(MSDOS) || defined(__OS2__) -static int x0201_f = TRUE; /* Assume JISX0201 kana */ -#else -static int x0201_f = NO_X0201; /* Assume NO JISX0201 */ -#endif -static int iso2022jp_f = FALSE; /* convert ISO-2022-JP */ +static int x0201_f = X0201_DEFAULT; /* convert JIS X 0201 */ +static int iso2022jp_f = FALSE; /* replace non ISO-2022-JP with GETA */ #ifdef UNICODE_NORMALIZATION static int nfc_f = FALSE; -static int (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */ -static int (*i_nfc_ungetc)(int c ,FILE *f) = std_ungetc; -static int nfc_getc(FILE *f); -static int nfc_ungetc(int c,FILE *f); +static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char nfc_getc(FILE *f); +static nkf_char nfc_ungetc(nkf_char c,FILE *f); #endif #ifdef INPUT_OPTION static int cap_f = FALSE; -static int (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */ -static int (*i_cungetc)(int c ,FILE *f) = std_ungetc; -static int cap_getc(FILE *f); -static int cap_ungetc(int c,FILE *f); +static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */ +static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char cap_getc(FILE *f); +static nkf_char cap_ungetc(nkf_char c,FILE *f); static int url_f = FALSE; -static int (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */ -static int (*i_uungetc)(int c ,FILE *f) = std_ungetc; -static int url_getc(FILE *f); -static int url_ungetc(int c,FILE *f); +static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char url_getc(FILE *f); +static nkf_char url_ungetc(nkf_char c,FILE *f); +#endif + +#if defined(INT_IS_SHORT) +#define NKF_INT32_C(n) (n##L) +#else +#define NKF_INT32_C(n) (n) #endif +#define PREFIX_EUCG3 NKF_INT32_C(0x8F00) +#define CLASS_MASK NKF_INT32_C(0xFF000000) +#define CLASS_UNICODE NKF_INT32_C(0x01000000) +#define VALUE_MASK NKF_INT32_C(0x00FFFFFF) +#define UNICODE_MAX NKF_INT32_C(0x0010FFFF) +#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE) +#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF)) #ifdef NUMCHAR_OPTION -#define CLASS_MASK 0x0f000000 -#define CLASS_UTF16 0x01000000 static int numchar_f = FALSE; -static int (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */ -static int (*i_nungetc)(int c ,FILE *f) = std_ungetc; -static int numchar_getc(FILE *f); -static int numchar_ungetc(int c,FILE *f); +static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char numchar_getc(FILE *f); +static nkf_char numchar_ungetc(nkf_char c,FILE *f); #endif #ifdef CHECK_OPTION static int noout_f = FALSE; -static void no_putc(int c); +static void no_putc(nkf_char c); static int debug_f = FALSE; static void debug(const char *str); -static int (*iconv_for_check)(int c2,int c1,int c0) = 0; +static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0; #endif -static int guess_f = FALSE; +static int guess_f = 0; /* 0: OFF, 1: ON, 2: VERBOSE */ #if !defined PERL_XS static void print_guessed_code(char *filename); #endif static void set_input_codename(char *codename); -static int is_inputcode_mixed = FALSE; -static int is_inputcode_set = FALSE; #ifdef EXEC_IO static int exec_f = 0; @@ -486,55 +675,46 @@ static int exec_f = 0; #ifdef SHIFTJIS_CP932 /* invert IBM extended characters to others */ -static int cp51932_f = TRUE; -#define CP932_TABLE_BEGIN (0xfa) -#define CP932_TABLE_END (0xfc) +static int cp51932_f = FALSE; /* invert NEC-selected IBM extended characters to IBM extended characters */ static int cp932inv_f = TRUE; -#define CP932INV_TABLE_BEGIN (0xed) -#define CP932INV_TABLE_END (0xee) -/* static int cp932_conv(int c2, int c1); */ +/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */ #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE static int x0212_f = FALSE; -static int x0212_shift(int c); -static int x0212_unshift(int c); +static nkf_char x0212_shift(nkf_char c); +static nkf_char x0212_unshift(nkf_char c); #endif static int x0213_f = FALSE; static unsigned char prefix_table[256]; -static void set_code_score(struct input_code *ptr, int score); -static void clr_code_score(struct input_code *ptr, int score); +static void set_code_score(struct input_code *ptr, nkf_char score); +static void clr_code_score(struct input_code *ptr, nkf_char score); static void status_disable(struct input_code *ptr); -static void status_push_ch(struct input_code *ptr, int c); +static void status_push_ch(struct input_code *ptr, nkf_char c); static void status_clear(struct input_code *ptr); static void status_reset(struct input_code *ptr); static void status_reinit(struct input_code *ptr); -static void status_check(struct input_code *ptr, int c); -static void e_status(struct input_code *, int); -static void s_status(struct input_code *, int); - -#ifdef UTF8_INPUT_ENABLE -static void w_status(struct input_code *, int); -static void w16_status(struct input_code *, int); -static int utf16_mode = UTF16BE_INPUT; -#endif +static void status_check(struct input_code *ptr, nkf_char c); +static void e_status(struct input_code *, nkf_char); +static void s_status(struct input_code *, nkf_char); struct input_code input_code_list[] = { {"EUC-JP", 0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0}, {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0}, #ifdef UTF8_INPUT_ENABLE {"UTF-8", 0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0}, - {"UTF-16", 0, 0, 0, {0, 0, 0}, w16_status, w_iconv16, 0}, + {"UTF-16", 0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0}, + {"UTF-32", 0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0}, #endif {0} }; -static int mimeout_mode = 0; +static int mimeout_mode = 0; /* 0, -1, 'Q', 'B', 1, 2 */ static int base64_count = 0; /* X0208 -> ASCII converter */ @@ -573,38 +753,38 @@ static int fold_margin = FOLD_MARGIN; #endif /* process default */ -static void (*output_conv)(int c2,int c1) = DEFAULT_CONV; +static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV; -static void (*oconv)(int c2,int c1) = no_connection; +static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection; /* s_iconv or oconv */ -static int (*iconv)(int c2,int c1,int c0) = no_connection2; +static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2; -static void (*o_zconv)(int c2,int c1) = no_connection; -static void (*o_fconv)(int c2,int c1) = no_connection; -static void (*o_crconv)(int c2,int c1) = no_connection; -static void (*o_rot_conv)(int c2,int c1) = no_connection; -static void (*o_hira_conv)(int c2,int c1) = no_connection; -static void (*o_base64conv)(int c2,int c1) = no_connection; -static void (*o_iso2022jp_check_conv)(int c2,int c1) = no_connection; +static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_nlconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection; /* static redirections */ -static void (*o_putc)(int c) = std_putc; +static void (*o_putc)(nkf_char c) = std_putc; -static int (*i_getc)(FILE *f) = std_getc; /* general input */ -static int (*i_ungetc)(int c,FILE *f) =std_ungetc; +static nkf_char (*i_getc)(FILE *f) = std_getc; /* general input */ +static nkf_char (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc; -static int (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */ -static int (*i_bungetc)(int c ,FILE *f) = std_ungetc; +static nkf_char (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */ +static nkf_char (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc; -static void (*o_mputc)(int c) = std_putc ; /* output of mputc */ +static void (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */ -static int (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */ -static int (*i_mungetc)(int c ,FILE *f) = std_ungetc; +static nkf_char (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */ +static nkf_char (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc; /* for strict mime */ -static int (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */ -static int (*i_mungetc_buf)(int c,FILE *f) = std_ungetc; +static nkf_char (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */ +static nkf_char (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc; /* Global states */ static int output_mode = ASCII, /* output kanji mode */ @@ -616,8 +796,7 @@ static int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */ /* X0201 kana conversion table */ /* 90-9F A0-DF */ -static const -unsigned char cv[]= { +static const unsigned char cv[]= { 0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57, 0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21, 0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29, @@ -639,8 +818,7 @@ unsigned char cv[]= { /* X0201 kana conversion table for daguten */ /* 90-9F A0-DF */ -static const -unsigned char dv[]= { +static const unsigned char dv[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -661,8 +839,7 @@ unsigned char dv[]= { /* X0201 kana conversion table for han-daguten */ /* 90-9F A0-DF */ -static const -unsigned char ev[]= { +static const unsigned char ev[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -684,8 +861,7 @@ unsigned char ev[]= { /* X0208 kigou conversion table */ /* 0x8140 - 0x819e */ -static const -unsigned char fv[] = { +static const unsigned char fv[] = { 0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a, 0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00, @@ -702,7 +878,6 @@ unsigned char fv[] = { } ; -#define CRLF 1 static int file_out_f = FALSE; #ifdef OVERWRITE @@ -713,14 +888,67 @@ static char *backup_suffix = ""; static char *get_backup_filename(const char *suffix, const char *filename); #endif -static int crmode_f = 0; /* CR, NL, CRLF */ +static int nlmode_f = 0; /* CR, LF, CRLF */ +static int input_newline = 0; /* 0: unestablished, EOF: MIXED */ +static nkf_char prev_cr = 0; /* CR or 0 */ #ifdef EASYWIN /*Easy Win */ static int end_check; #endif /*Easy Win */ #define STD_GC_BUFSIZE (256) -int std_gc_buf[STD_GC_BUFSIZE]; -int std_gc_ndx; +nkf_char std_gc_buf[STD_GC_BUFSIZE]; +nkf_char std_gc_ndx; + +char* nkf_strcpy(const char *str) +{ + char* result = malloc(strlen(str) + 1); + if (!result){ + perror(str); + return ""; + } + strcpy(result, str); + return result; +} + +static void nkf_str_upcase(const char *src, char *dest, size_t length) +{ + int i = 0; + for (; i < length && dest[i]; i++) { + dest[i] = nkf_toupper(src[i]); + } + dest[i] = 0; +} + +static nkf_encoding *nkf_enc_from_index(int idx) +{ + if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) { + return 0; + } + return &nkf_encoding_table[idx]; +} + +static int nkf_enc_find_index(const char *name) +{ + int i, index = -1; + for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) { + if (strcmp(name, encoding_name_to_id_table[i].name) == 0) { + return encoding_name_to_id_table[i].id; + } + } + return index; +} + +static nkf_encoding *nkf_enc_find(const char *name) +{ + int idx = -1; + idx = nkf_enc_find_index(name); + if (idx < 0) return 0; + return nkf_enc_from_index(idx); +} + +#define nkf_enc_name(enc) (enc)->name +#define nkf_enc_to_index(enc) (enc)->id +#define nkf_enc_to_base_encoding(enc) (enc)->based_encoding #ifdef WIN32DLL #include "nkf32dll.c" @@ -741,6 +969,32 @@ int main(int argc, char **argv) for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) { cp = (unsigned char *)*argv; options(cp); + if (guess_f) { +#ifdef CHECK_OPTION + int debug_f_back = debug_f; +#endif +#ifdef EXEC_IO + int exec_f_back = exec_f; +#endif +#ifdef X0212_ENABLE + int x0212_f_back = x0212_f; +#endif + int x0213_f_back = x0213_f; + int guess_f_back = guess_f; + reinit(); + guess_f = guess_f_back; + mime_f = FALSE; +#ifdef CHECK_OPTION + debug_f = debug_f_back; +#endif +#ifdef EXEC_IO + exec_f = exec_f_back; +#endif +#ifdef X0212_ENABLE + x0212_f = x0212_f_back; +#endif + x0213_f = x0213_f_back; + } #ifdef EXEC_IO if (exec_f){ int fds[2], pid; @@ -769,12 +1023,10 @@ int main(int argc, char **argv) } #endif } - if(x0201_f == WISH_TRUE) - x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201); if (binmode_f == TRUE) -#ifdef __OS2__ - if (freopen("","wb",stdout) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","wb",stdout) == NULL) return (-1); #else setbinmode(stdout); @@ -787,7 +1039,7 @@ int main(int argc, char **argv) if (argc == 0) { if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","rb",stdin) == NULL) return (-1); #else setbinmode(stdin); @@ -801,16 +1053,17 @@ int main(int argc, char **argv) } } else { int nfiles = argc; + int is_argument_error = FALSE; while (argc--) { - is_inputcode_mixed = FALSE; - is_inputcode_set = FALSE; - input_codename = ""; + input_codename = NULL; + input_newline = 0; #ifdef CHECK_OPTION iconv_for_check = 0; #endif if ((fin = fopen((origfname = *argv++), "r")) == NULL) { - perror(*--argv); - return(-1); + perror(*(argv-1)); + is_argument_error = TRUE; + continue; } else { #ifdef OVERWRITE int fd = 0; @@ -857,7 +1110,7 @@ int main(int argc, char **argv) } }else #endif - if(argc == 1 ) { + if(argc == 1) { outfname = *argv++; argc--; } else { @@ -869,8 +1122,8 @@ int main(int argc, char **argv) return (-1); } if (binmode_f == TRUE) { -#ifdef __OS2__ - if (freopen("","wb",stdout) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","wb",stdout) == NULL) return (-1); #else setbinmode(stdout); @@ -878,12 +1131,12 @@ int main(int argc, char **argv) } } if (binmode_f == TRUE) -#ifdef __OS2__ - if (freopen("","rb",fin) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","rb",fin) == NULL) return (-1); #else setbinmode(fin); -#endif +#endif setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE); if (nop_f) noconvert(fin); @@ -897,7 +1150,7 @@ int main(int argc, char **argv) #ifdef OVERWRITE if (overwrite_f) { struct stat sb; -#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) +#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__) time_t tb[2]; #else struct utimbuf tb; @@ -918,7 +1171,7 @@ int main(int argc, char **argv) /* タイムスタンプを復元 */ if(preserve_time_f){ -#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) +#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__) tb[0] = tb[1] = sb.st_mtime; if (utime(outfname, tb)) { fprintf(stderr, "Can't set timestamp %s\n", outfname); @@ -958,14 +1211,16 @@ int main(int argc, char **argv) #endif } } + if (is_argument_error) + return(-1); } #ifdef EASYWIN /*Easy Win */ - if (file_out_f == FALSE) + if (file_out_f == FALSE) scanf("%d",&end_check); - else + else fclose(stdout); #else /* for Other OS */ - if (file_out_f == TRUE) + if (file_out_f == TRUE) fclose(stdout); #endif /*Easy Win */ return (0); @@ -1013,8 +1268,7 @@ char *get_backup_filename(const char *suffix, const char *filename) } #endif -static const -struct { +static const struct { const char *name; const char *alias; } long_option[] = { @@ -1039,7 +1293,8 @@ struct { {"hiragana","h1"}, {"katakana","h2"}, {"katakana-hiragana","h3"}, - {"guess", "g"}, + {"guess=", ""}, + {"guess", "g1"}, {"cp932", ""}, {"no-cp932", ""}, #ifdef X0212_ENABLE @@ -1097,10 +1352,11 @@ static int option_mode = 0; void options(unsigned char *cp) { - int i, j; + nkf_char i, j; unsigned char *p; unsigned char *cp_back = NULL; char codeset[32]; + nkf_encoding *enc; if (option_mode==1) return; @@ -1114,280 +1370,335 @@ void options(unsigned char *cp) p = 0; switch (*cp++) { case '-': /* literal options */ - if (!*cp || *cp == SPACE) { /* ignore the rest of arguments */ + if (!*cp || *cp == SP) { /* ignore the rest of arguments */ option_mode = 1; return; } for (i=0;iname); - debug(input_codename); + debug(p->name); } iconv_for_check = iconv; } @@ -1863,39 +2225,36 @@ void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0)) #define SCORE_L2 (1) /* 第2水準漢字 */ #define SCORE_KANA (SCORE_L2 << 1) /* いわゆる半角カナ */ #define SCORE_DEPEND (SCORE_KANA << 1) /* 機種依存文字 */ -#ifdef SHIFTJIS_CP932 -#define SCORE_CP932 (SCORE_DEPEND << 1) /* CP932 による読み換え */ -#define SCORE_NO_EXIST (SCORE_CP932 << 1) /* 存在しない文字 */ -#else -#define SCORE_NO_EXIST (SCORE_DEPEND << 1) /* 存在しない文字 */ -#endif +#define SCORE_CP932 (SCORE_DEPEND << 1) /* CP932 による読み換え (IBM extended characters) */ +#define SCORE_X0212 (SCORE_CP932 << 1) /* JIS X 0212 */ +#define SCORE_NO_EXIST (SCORE_X0212 << 1) /* 存在しない文字 */ #define SCORE_iMIME (SCORE_NO_EXIST << 1) /* MIME による指定 */ #define SCORE_ERROR (SCORE_iMIME << 1) /* エラー */ #define SCORE_INIT (SCORE_iMIME) -const int score_table_A0[] = { +static const char score_table_A0[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST, }; -const int score_table_F0[] = { +static const char score_table_F0[] = { SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, - SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, - SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR, + SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932, + SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR, }; -void set_code_score(struct input_code *ptr, int score) +void set_code_score(struct input_code *ptr, nkf_char score) { if (ptr){ ptr->score |= score; } } -void clr_code_score(struct input_code *ptr, int score) +void clr_code_score(struct input_code *ptr, nkf_char score) { if (ptr){ ptr->score &= ~score; @@ -1904,14 +2263,16 @@ void clr_code_score(struct input_code *ptr, int score) void code_score(struct input_code *ptr) { - int c2 = ptr->buf[0]; + nkf_char c2 = ptr->buf[0]; #ifdef UTF8_OUTPUT_ENABLE - int c1 = ptr->buf[1]; + nkf_char c1 = ptr->buf[1]; #endif if (c2 < 0){ set_code_score(ptr, SCORE_ERROR); }else if (c2 == SSO){ set_code_score(ptr, SCORE_KANA); + }else if (c2 == 0x8f){ + set_code_score(ptr, SCORE_X0212); #ifdef UTF8_OUTPUT_ENABLE }else if (!e2w_conv(c2, c1)){ set_code_score(ptr, SCORE_NO_EXIST); @@ -1933,7 +2294,7 @@ void status_disable(struct input_code *ptr) if (iconv == ptr->iconv_func) set_iconv(FALSE, 0); } -void status_push_ch(struct input_code *ptr, int c) +void status_push_ch(struct input_code *ptr, nkf_char c) { ptr->buf[ptr->index++] = c; } @@ -1956,14 +2317,14 @@ void status_reinit(struct input_code *ptr) ptr->_file_stat = 0; } -void status_check(struct input_code *ptr, int c) +void status_check(struct input_code *ptr, nkf_char c) { if (c <= DEL && estab_f){ status_reset(ptr); } } -void s_status(struct input_code *ptr, int c) +void s_status(struct input_code *ptr, nkf_char c) { switch(ptr->stat){ case -1: @@ -1973,7 +2334,7 @@ void s_status(struct input_code *ptr, int c) if (c <= DEL){ break; #ifdef NUMCHAR_OPTION - }else if ((c & CLASS_MASK) == CLASS_UTF16){ + }else if (is_unicode_capsule(c)){ break; #endif }else if (0xa1 <= c && c <= 0xdf){ @@ -1981,17 +2342,19 @@ void s_status(struct input_code *ptr, int c) status_push_ch(ptr, c); code_score(ptr); status_clear(ptr); - }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xef)){ + }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xea)){ ptr->stat = 1; status_push_ch(ptr, c); + }else if (0xed <= c && c <= 0xee){ + ptr->stat = 3; + status_push_ch(ptr, c); #ifdef SHIFTJIS_CP932 - }else if (cp51932_f - && CP932_TABLE_BEGIN <= c && c <= CP932_TABLE_END){ + }else if (is_ibmext_in_sjis(c)){ ptr->stat = 2; status_push_ch(ptr, c); #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE - }else if (x0212_f && 0xf0 <= c && c <= 0xfc){ + }else if (0xf0 <= c && c <= 0xfc){ ptr->stat = 1; status_push_ch(ptr, c); #endif /* X0212_ENABLE */ @@ -2011,23 +2374,31 @@ void s_status(struct input_code *ptr, int c) break; case 2: #ifdef SHIFTJIS_CP932 + if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)) { + status_push_ch(ptr, c); + if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0) { + set_code_score(ptr, SCORE_CP932); + status_clear(ptr); + break; + } + } +#endif /* SHIFTJIS_CP932 */ + status_disable(ptr); + break; + case 3: if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){ status_push_ch(ptr, c); - if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0){ - set_code_score(ptr, SCORE_CP932); - status_clear(ptr); - break; - } + s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]); + set_code_score(ptr, SCORE_CP932); + status_clear(ptr); + }else{ + status_disable(ptr); } -#endif /* SHIFTJIS_CP932 */ -#ifndef X0212_ENABLE - status_disable(ptr); -#endif break; } } -void e_status(struct input_code *ptr, int c) +void e_status(struct input_code *ptr, nkf_char c) { switch (ptr->stat){ case -1: @@ -2037,7 +2408,7 @@ void e_status(struct input_code *ptr, int c) if (c <= DEL){ break; #ifdef NUMCHAR_OPTION - }else if ((c & CLASS_MASK) == CLASS_UTF16){ + }else if (is_unicode_capsule(c)){ break; #endif }else if (SSO == c || (0xa1 <= c && c <= 0xfe)){ @@ -2074,53 +2445,7 @@ void e_status(struct input_code *ptr, int c) } #ifdef UTF8_INPUT_ENABLE -void w16_status(struct input_code *ptr, int c) -{ - switch (ptr->stat){ - case -1: - break; - case 0: - if (ptr->_file_stat == 0){ - if (c == 0xfe || c == 0xff){ - ptr->stat = c; - status_push_ch(ptr, c); - ptr->_file_stat = 1; - }else{ - status_disable(ptr); - ptr->_file_stat = -1; - } - }else if (ptr->_file_stat > 0){ - ptr->stat = 1; - status_push_ch(ptr, c); - }else if (ptr->_file_stat < 0){ - status_disable(ptr); - } - break; - - case 1: - if (c == EOF){ - status_disable(ptr); - ptr->_file_stat = -1; - }else{ - status_push_ch(ptr, c); - status_clear(ptr); - } - break; - - case 0xfe: - case 0xff: - if (ptr->stat != c && (c == 0xfe || c == 0xff)){ - status_push_ch(ptr, c); - status_clear(ptr); - }else{ - status_disable(ptr); - ptr->_file_stat = -1; - } - break; - } -} - -void w_status(struct input_code *ptr, int c) +void w_status(struct input_code *ptr, nkf_char c) { switch (ptr->stat){ case -1: @@ -2130,7 +2455,7 @@ void w_status(struct input_code *ptr, int c) if (c <= DEL){ break; #ifdef NUMCHAR_OPTION - }else if ((c & CLASS_MASK) == CLASS_UTF16){ + }else if (is_unicode_capsule(c)){ break; #endif }else if (0xc0 <= c && c <= 0xdf){ @@ -2139,6 +2464,9 @@ void w_status(struct input_code *ptr, int c) }else if (0xe0 <= c && c <= 0xef){ ptr->stat = 2; status_push_ch(ptr, c); + }else if (0xf0 <= c && c <= 0xf4){ + ptr->stat = 3; + status_push_ch(ptr, c); }else{ status_disable(ptr); } @@ -2161,16 +2489,33 @@ void w_status(struct input_code *ptr, int c) status_disable(ptr); } break; + case 3: + if (0x80 <= c && c <= 0xbf){ + if (ptr->index < ptr->stat){ + status_push_ch(ptr, c); + } else { + status_clear(ptr); + } + }else{ + status_disable(ptr); + } + break; } } #endif -void code_status(int c) +void code_status(nkf_char c) { int action_flag = 1; struct input_code *result = 0; struct input_code *p = input_code_list; while (p->name){ + if (!p->status_func) { + ++p; + continue; + } + if (!p->status_func) + continue; (p->status_func)(p, c); if (p->stat > 0){ action_flag = 0; @@ -2198,7 +2543,7 @@ void code_status(int c) } #ifndef WIN32DLL -int std_getc(FILE *f) +nkf_char std_getc(FILE *f) { if (std_gc_ndx){ return std_gc_buf[--std_gc_ndx]; @@ -2207,7 +2552,7 @@ int std_getc(FILE *f) } #endif /*WIN32DLL*/ -int std_ungetc(int c, FILE *f) +nkf_char std_ungetc(nkf_char c, FILE *f) { if (std_gc_ndx == STD_GC_BUFSIZE){ return EOF; @@ -2217,7 +2562,7 @@ int std_ungetc(int c, FILE *f) } #ifndef WIN32DLL -void std_putc(int c) +void std_putc(nkf_char c) { if(c!=EOF) putchar(c); @@ -2225,19 +2570,22 @@ void std_putc(int c) #endif /*WIN32DLL*/ #if !defined(PERL_XS) && !defined(WIN32DLL) -int noconvert(FILE *f) +nkf_char noconvert(FILE *f) { - int c; + nkf_char c; + if (nop_f == 2) + module_connection(); while ((c = (*i_getc)(f)) != EOF) (*o_putc)(c); + (*o_putc)(EOF); return 1; } #endif void module_connection(void) { - oconv = output_conv; + oconv = output_conv; o_putc = std_putc; /* replace continucation module, from output side */ @@ -2257,8 +2605,8 @@ void module_connection(void) /* base64_count = 0; */ } - if (crmode_f) { - o_crconv = oconv; oconv = cr_conv; + if (nlmode_f || guess_f) { + o_nlconv = oconv; oconv = nl_conv; } if (rot_f) { o_rot_conv = oconv; oconv = rot_conv; @@ -2310,17 +2658,17 @@ void module_connection(void) i_bgetc = i_getc; i_getc = broken_getc; i_bungetc = i_ungetc; i_ungetc = broken_ungetc; } - if (input_f == JIS_INPUT || input_f == LATIN1_INPUT) { + if (input_f == JIS_INPUT || input_f == EUC_INPUT || input_f == LATIN1_INPUT) { set_iconv(-TRUE, e_iconv); } else if (input_f == SJIS_INPUT) { set_iconv(-TRUE, s_iconv); #ifdef UTF8_INPUT_ENABLE } else if (input_f == UTF8_INPUT) { set_iconv(-TRUE, w_iconv); - } else if (input_f == UTF16BE_INPUT) { - set_iconv(-TRUE, w_iconv16); - } else if (input_f == UTF16LE_INPUT) { + } else if (input_f == UTF16_INPUT) { set_iconv(-TRUE, w_iconv16); + } else if (input_f == UTF32_INPUT) { + set_iconv(-TRUE, w_iconv32); #endif } else { set_iconv(FALSE, e_iconv); @@ -2335,27 +2683,133 @@ void module_connection(void) } /* - Conversion main loop. Code detection only. + * Check and Ignore BOM + */ +void check_bom(FILE *f) +{ + int c2; + switch(c2 = (*i_getc)(f)){ + case 0x00: + if((c2 = (*i_getc)(f)) == 0x00){ + if((c2 = (*i_getc)(f)) == 0xFE){ + if((c2 = (*i_getc)(f)) == 0xFF){ + if(!input_f){ + set_iconv(TRUE, w_iconv32); + } + if (iconv == w_iconv32) { + input_endian = ENDIAN_BIG; + return; + } + (*i_ungetc)(0xFF,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xFE,f); + }else if(c2 == 0xFF){ + if((c2 = (*i_getc)(f)) == 0xFE){ + if(!input_f){ + set_iconv(TRUE, w_iconv32); + } + if (iconv == w_iconv32) { + input_endian = ENDIAN_2143; + return; + } + (*i_ungetc)(0xFF,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xFF,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0x00,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0x00,f); + break; + case 0xEF: + if((c2 = (*i_getc)(f)) == 0xBB){ + if((c2 = (*i_getc)(f)) == 0xBF){ + if(!input_f){ + set_iconv(TRUE, w_iconv); + } + if (iconv == w_iconv) { + return; + } + (*i_ungetc)(0xBF,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xBB,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xEF,f); + break; + case 0xFE: + if((c2 = (*i_getc)(f)) == 0xFF){ + if((c2 = (*i_getc)(f)) == 0x00){ + if((c2 = (*i_getc)(f)) == 0x00){ + if(!input_f){ + set_iconv(TRUE, w_iconv32); + } + if (iconv == w_iconv32) { + input_endian = ENDIAN_3412; + return; + } + (*i_ungetc)(0x00,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0x00,f); + }else (*i_ungetc)(c2,f); + if(!input_f){ + set_iconv(TRUE, w_iconv16); + } + if (iconv == w_iconv16) { + input_endian = ENDIAN_BIG; + return; + } + (*i_ungetc)(0xFF,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xFE,f); + break; + case 0xFF: + if((c2 = (*i_getc)(f)) == 0xFE){ + if((c2 = (*i_getc)(f)) == 0x00){ + if((c2 = (*i_getc)(f)) == 0x00){ + if(!input_f){ + set_iconv(TRUE, w_iconv32); + } + if (iconv == w_iconv32) { + input_endian = ENDIAN_LITTLE; + return; + } + (*i_ungetc)(0x00,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0x00,f); + }else (*i_ungetc)(c2,f); + if(!input_f){ + set_iconv(TRUE, w_iconv16); + } + if (iconv == w_iconv16) { + input_endian = ENDIAN_LITTLE; + return; + } + (*i_ungetc)(0xFE,f); + }else (*i_ungetc)(c2,f); + (*i_ungetc)(0xFF,f); + break; + default: + (*i_ungetc)(c2,f); + break; + } +} + +/* + Conversion main loop. Code detection only. */ -int kanji_convert(FILE *f) +nkf_char kanji_convert(FILE *f) { - int c1, - c2, c3; + nkf_char c3, c2=0, c1, c0=0; int is_8bit = FALSE; - module_connection(); - c2 = 0; - - if(input_f == SJIS_INPUT + if(input_f == SJIS_INPUT || input_f == EUC_INPUT #ifdef UTF8_INPUT_ENABLE - || input_f == UTF8_INPUT || input_f == UTF16BE_INPUT || input_f == UTF16LE_INPUT + || input_f == UTF8_INPUT || input_f == UTF16_INPUT #endif ){ is_8bit = TRUE; } - input_mode = ASCII; output_mode = ASCII; shift_mode = FALSE; @@ -2364,6 +2818,9 @@ int kanji_convert(FILE *f) #define SEND ; /* output c1 and c2, get next */ #define LAST break /* end of loop, go closing */ + module_connection(); + check_bom(f); + while ((c1 = (*i_getc)(f)) != EOF) { #ifdef INPUT_CODE_FIX if (!input_f) @@ -2371,28 +2828,30 @@ int kanji_convert(FILE *f) code_status(c1); if (c2) { /* second byte */ - if (c2 > DEL) { + if (c2 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) { /* in case of 8th bit is on */ if (!estab_f&&!mime_decode_mode) { /* in case of not established yet */ /* It is still ambiguious */ - if (h_conv(f, c2, c1)==EOF) + if (h_conv(f, c2, c1)==EOF) LAST; - else + else c2 = 0; NEXT; - } else - /* in case of already established */ - if (c1 < AT) { - /* ignore bogus code */ - c2 = 0; - NEXT; - } else - SEND; + } else { + /* in case of already established */ + if (c1 < AT) { + /* ignore bogus code and not CP5022x UCD */ + c2 = 0; + NEXT; + } else { + SEND; + } + } } else /* second byte, 7 bit code */ /* it might be kanji shitfted */ - if ((c1 == DEL) || (c1 <= SPACE)) { + if ((c1 == DEL) || (c1 <= SP)) { /* ignore bogus first code */ c2 = 0; NEXT; @@ -2400,39 +2859,82 @@ int kanji_convert(FILE *f) SEND; } else { /* first byte */ - if ( #ifdef UTF8_INPUT_ENABLE - iconv == w_iconv16 -#else - 0 -#endif - ) { - c2 = c1; - c1 = (*i_getc)(f); + if (iconv == w_iconv16) { + if (input_endian == ENDIAN_BIG) { + c2 = c1; + if ((c1 = (*i_getc)(f)) != EOF) { + if (0xD8 <= c2 && c2 <= 0xDB) { + if ((c0 = (*i_getc)(f)) != EOF) { + c0 <<= 8; + if ((c3 = (*i_getc)(f)) != EOF) { + c0 |= c3; + } else c2 = EOF; + } else c2 = EOF; + } + } else c2 = EOF; + } else { + if ((c2 = (*i_getc)(f)) != EOF) { + if (0xD8 <= c2 && c2 <= 0xDB) { + if ((c3 = (*i_getc)(f)) != EOF) { + if ((c0 = (*i_getc)(f)) != EOF) { + c0 <<= 8; + c0 |= c3; + } else c2 = EOF; + } else c2 = EOF; + } + } else c2 = EOF; + } + SEND; + } else if(iconv == w_iconv32){ + int c3 = c1; + if((c2 = (*i_getc)(f)) != EOF && + (c1 = (*i_getc)(f)) != EOF && + (c0 = (*i_getc)(f)) != EOF){ + switch(input_endian){ + case ENDIAN_BIG: + c1 = (c2&0xFF)<<16 | (c1&0xFF)<<8 | (c0&0xFF); + break; + case ENDIAN_LITTLE: + c1 = (c3&0xFF) | (c2&0xFF)<<8 | (c1&0xFF)<<16; + break; + case ENDIAN_2143: + c1 = (c3&0xFF)<<16 | (c1&0xFF) | (c0&0xFF)<<8; + break; + case ENDIAN_3412: + c1 = (c3&0xFF)<<8 | (c2&0xFF) | (c0&0xFF)<<16; + break; + } + c2 = 0; + }else{ + c2 = EOF; + } SEND; + } else +#endif #ifdef NUMCHAR_OPTION - } else if ((c1 & CLASS_MASK) == CLASS_UTF16){ + if (is_unicode_capsule(c1)){ SEND; + } else #endif - } else if (c1 > DEL) { + if (c1 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) { /* 8 bit code */ if (!estab_f && !iso8859_f) { /* not established yet */ - if (!is_8bit) is_8bit = TRUE; c2 = c1; NEXT; } else { /* estab_f==TRUE */ if (iso8859_f) { - c2 = ISO8859_1; + c2 = ISO_8859_1; c1 &= 0x7f; SEND; } else if (SSP<=c1 && c1<0xe0 && iconv == s_iconv) { /* SJIS X0201 Case... */ - if(iso2022jp_f && x0201_f==NO_X0201) { + if (iso2022jp_f && !x0201_f) { (*oconv)(GETA1, GETA2); NEXT; } else { - c2 = X0201; + c2 = JIS_X_0201; c1 &= 0x7f; SEND; } @@ -2441,49 +2943,55 @@ int kanji_convert(FILE *f) c1 = (*i_getc)(f); /* skip SSO */ code_status(c1); if (SSP<=c1 && c1<0xe0) { - if(iso2022jp_f && x0201_f==NO_X0201) { + if (iso2022jp_f && !x0201_f) { (*oconv)(GETA1, GETA2); NEXT; } else { - c2 = X0201; + c2 = JIS_X_0201; c1 &= 0x7f; SEND; } } else { /* bogus code, skip SSO and one byte */ NEXT; } + } else if (ms_ucs_map_f == UCS_MAP_CP10001 && + (c1 == 0xFD || c1 == 0xFE)) { + /* CP10001 */ + c2 = JIS_X_0201; + c1 &= 0x7f; + SEND; } else { /* already established */ c2 = c1; NEXT; } } - } else if ((c1 > SPACE) && (c1 != DEL)) { + } else if ((c1 > SP) && (c1 != DEL)) { /* in case of Roman characters */ - if (shift_mode) { + if (shift_mode) { /* output 1 shifted byte */ if (iso8859_f) { - c2 = ISO8859_1; + c2 = ISO_8859_1; SEND; - } else if (SPACE<=c1 && c1<(0xe0&0x7f) ){ + } else if (SP <= c1 && c1 < (0xe0&0x7f)){ /* output 1 shifted byte */ - if(iso2022jp_f && x0201_f==NO_X0201) { + if (iso2022jp_f && !x0201_f) { (*oconv)(GETA1, GETA2); NEXT; } else { - c2 = X0201; + c2 = JIS_X_0201; SEND; } } else { /* look like bogus code */ NEXT; } - } else if (input_mode == X0208 || input_mode == X0212 || - input_mode == X0213_1 || input_mode == X0213_2) { + } else if (input_mode == JIS_X_0208 || input_mode == JIS_X_0212 || + input_mode == JIS_X_0213_1 || input_mode == JIS_X_0213_2) { /* in case of Kanji shifted */ c2 = c1; NEXT; - } else if (c1 == '=' && mime_f && !mime_decode_mode ) { + } else if (c1 == '=' && mime_f && !mime_decode_mode) { /* Check MIME code */ if ((c1 = (*i_getc)(f)) == EOF) { (*oconv)(0, '='); @@ -2492,11 +3000,11 @@ int kanji_convert(FILE *f) /* =? is mime conversion start sequence */ if(mime_f == STRICT_MIME) { /* check in real detail */ - if (mime_begin_strict(f) == EOF) + if (mime_begin_strict(f) == EOF) LAST; else NEXT; - } else if (mime_begin(f) == EOF) + } else if (mime_begin(f) == EOF) LAST; else NEXT; @@ -2506,37 +3014,37 @@ int kanji_convert(FILE *f) NEXT; } } else { - /* normal ASCII code */ + /* normal ASCII code */ SEND; } - } else if (!is_8bit && c1 == SI) { - shift_mode = FALSE; + } else if (c1 == SI && (!is_8bit || mime_decode_mode)) { + shift_mode = FALSE; NEXT; - } else if (!is_8bit && c1 == SO) { - shift_mode = TRUE; + } else if (c1 == SO && (!is_8bit || mime_decode_mode)) { + shift_mode = TRUE; NEXT; - } else if (!is_8bit && c1 == ESC ) { + } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) { if ((c1 = (*i_getc)(f)) == EOF) { /* (*oconv)(0, ESC); don't send bogus code */ LAST; } else if (c1 == '$') { if ((c1 = (*i_getc)(f)) == EOF) { /* - (*oconv)(0, ESC); don't send bogus code + (*oconv)(0, ESC); don't send bogus code (*oconv)(0, '$'); */ LAST; } else if (c1 == '@'|| c1 == 'B') { /* This is kanji introduction */ - input_mode = X0208; + input_mode = JIS_X_0208; shift_mode = FALSE; set_input_codename("ISO-2022-JP"); #ifdef CHECK_OPTION - debug(input_codename); + debug("ISO-2022-JP"); #endif NEXT; } else if (c1 == '(') { if ((c1 = (*i_getc)(f)) == EOF) { - /* don't send bogus code + /* don't send bogus code (*oconv)(0, ESC); (*oconv)(0, '$'); (*oconv)(0, '('); @@ -2544,21 +3052,21 @@ int kanji_convert(FILE *f) LAST; } else if (c1 == '@'|| c1 == 'B') { /* This is kanji introduction */ - input_mode = X0208; + input_mode = JIS_X_0208; shift_mode = FALSE; NEXT; #ifdef X0212_ENABLE } else if (c1 == 'D'){ - input_mode = X0212; + input_mode = JIS_X_0212; shift_mode = FALSE; NEXT; #endif /* X0212_ENABLE */ - } else if (c1 == (X0213_1&0x7F)){ - input_mode = X0213_1; + } else if (c1 == 0x4F){ + input_mode = JIS_X_0213_1; shift_mode = FALSE; NEXT; - } else if (c1 == (X0213_2&0x7F)){ - input_mode = X0213_2; + } else if (c1 == 0x50){ + input_mode = JIS_X_0213_2; shift_mode = FALSE; NEXT; } else { @@ -2571,7 +3079,7 @@ int kanji_convert(FILE *f) } } else if (broken_f&0x2) { /* accept any ESC-(-x as broken code ... */ - input_mode = X0208; + input_mode = JIS_X_0208; shift_mode = FALSE; NEXT; } else { @@ -2582,14 +3090,14 @@ int kanji_convert(FILE *f) } } else if (c1 == '(') { if ((c1 = (*i_getc)(f)) == EOF) { - /* don't send bogus code + /* don't send bogus code (*oconv)(0, ESC); (*oconv)(0, '('); */ LAST; } else { if (c1 == 'I') { /* This is X0201 kana introduction */ - input_mode = X0201; shift_mode = X0201; + input_mode = JIS_X_0201; shift_mode = JIS_X_0201; NEXT; } else if (c1 == 'B' || c1 == 'J' || c1 == 'H') { /* This is X0208 kanji introduction */ @@ -2605,12 +3113,12 @@ int kanji_convert(FILE *f) SEND; } } - } else if ( c1 == 'N' || c1 == 'n' ){ + } else if ( c1 == 'N' || c1 == 'n'){ /* SS2 */ c3 = (*i_getc)(f); /* skip SS2 */ - if ( (SPACE<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){ + if ( (SP<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){ c1 = c3; - c2 = X0201; + c2 = JIS_X_0201; SEND; }else{ (*i_ungetc)(c3, f); @@ -2623,73 +3131,141 @@ int kanji_convert(FILE *f) (*oconv)(0, ESC); SEND; } - } else if ((c1 == NL || c1 == CR) && broken_f&4) { - input_mode = ASCII; set_iconv(FALSE, 0); - SEND; - } else if (c1 == NL && mime_decode_f && !mime_decode_mode ) { - if ((c1=(*i_getc)(f))!=EOF && c1 == SPACE) { - i_ungetc(SPACE,f); - continue; - } else { - i_ungetc(c1,f); - } - c1 = NL; - SEND; - } else if (c1 == CR && mime_decode_f && !mime_decode_mode ) { - if ((c1=(*i_getc)(f))!=EOF) { - if (c1==SPACE) { - i_ungetc(SPACE,f); - continue; - } else if (c1 == NL && (c1=(*i_getc)(f))!=EOF && c1 == SPACE) { - i_ungetc(SPACE,f); - continue; + } else if (c1 == ESC && iconv == s_iconv) { + /* ESC in Shift_JIS */ + if ((c1 = (*i_getc)(f)) == EOF) { + /* (*oconv)(0, ESC); don't send bogus code */ + LAST; + } else if (c1 == '$') { + /* J-PHONE emoji */ + if ((c1 = (*i_getc)(f)) == EOF) { + /* + (*oconv)(0, ESC); don't send bogus code + (*oconv)(0, '$'); */ + LAST; } else { - i_ungetc(c1,f); + if (('E' <= c1 && c1 <= 'G') || + ('O' <= c1 && c1 <= 'Q')) { + /* + NUM : 0 1 2 3 4 5 + BYTE: G E F O P Q + C%7 : 1 6 0 2 3 4 + C%7 : 0 1 2 3 4 5 6 + NUM : 2 0 3 4 5 X 1 + */ + static const char jphone_emoji_first_table[7] = {2, 0, 3, 4, 5, 0, 1}; + c0 = (jphone_emoji_first_table[c1 % 7] << 8) - SP + 0xE000 + CLASS_UNICODE; + while ((c1 = (*i_getc)(f)) != EOF) { + if (SP <= c1 && c1 <= 'z') { + (*oconv)(0, c1 + c0); + } else break; /* c1 == SO */ + } + } } - i_ungetc(NL,f); + if (c1 == EOF) LAST; + NEXT; } else { - i_ungetc(c1,f); + /* lonely ESC */ + (*oconv)(0, ESC); + SEND; } - c1 = CR; - SEND; - } else + } else if (c1 == LF || c1 == CR) { + if (broken_f&4) { + input_mode = ASCII; set_iconv(FALSE, 0); + SEND; + } else if (mime_decode_f && !mime_decode_mode){ + if (c1 == LF) { + if ((c1=(*i_getc)(f))!=EOF && c1 == SP) { + i_ungetc(SP,f); + continue; + } else { + i_ungetc(c1,f); + } + c1 = LF; + SEND; + } else { /* if (c1 == CR)*/ + if ((c1=(*i_getc)(f))!=EOF) { + if (c1==SP) { + i_ungetc(SP,f); + continue; + } else if (c1 == LF && (c1=(*i_getc)(f))!=EOF && c1 == SP) { + i_ungetc(SP,f); + continue; + } else { + i_ungetc(c1,f); + } + i_ungetc(LF,f); + } else { + i_ungetc(c1,f); + } + c1 = CR; + SEND; + } + } + } else if (c1 == DEL && input_mode == JIS_X_0208) { + /* CP5022x */ + c2 = c1; + NEXT; + } else SEND; } /* send: */ switch(input_mode){ case ASCII: - if ((*iconv)(c2, c1, 0) < 0){ /* can be EUC/SJIS */ - int c0 = (*i_getc)(f); - if (c0 != EOF){ + switch ((*iconv)(c2, c1, c0)) { /* can be EUC / SJIS / UTF-8 / UTF-16 */ + case -2: + /* 4 bytes UTF-8 */ + if ((c0 = (*i_getc)(f)) != EOF) { + code_status(c0); + c0 <<= 8; + if ((c3 = (*i_getc)(f)) != EOF) { + code_status(c3); + (*iconv)(c2, c1, c0|c3); + } + } + break; + case -1: + /* 3 bytes EUC or UTF-8 */ + if ((c0 = (*i_getc)(f)) != EOF) { code_status(c0); (*iconv)(c2, c1, c0); } + break; } break; - case X0208: - case X0213_1: + case JIS_X_0208: + case JIS_X_0213_1: + if (ms_ucs_map_f && + 0x7F <= c2 && c2 <= 0x92 && + 0x21 <= c1 && c1 <= 0x7E) { + /* CP932 UDC */ + if(c1 == 0x7F) return 0; + c1 = (c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000 + CLASS_UNICODE; + c2 = 0; + } (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */ break; #ifdef X0212_ENABLE - case X0212: - (*oconv)((0x8f << 8) | c2, c1); + case JIS_X_0212: + (*oconv)(PREFIX_EUCG3 | c2, c1); break; #endif /* X0212_ENABLE */ - case X0213_2: - (*oconv)((0x8f << 8) | c2, c1); + case JIS_X_0213_2: + (*oconv)(PREFIX_EUCG3 | c2, c1); break; default: (*oconv)(input_mode, c1); /* other special case */ } c2 = 0; + c0 = 0; continue; /* goto next_word */ } /* epilogue */ (*iconv)(EOF, 0, 0); - if (!is_inputcode_set) + if (!input_codename) { if (is_8bit) { struct input_code *p = input_code_list; @@ -2699,15 +3275,19 @@ int kanji_convert(FILE *f) ++p; } set_input_codename(result->name); +#ifdef CHECK_OPTION + debug(result->name); +#endif } } return 1; } -int -h_conv(FILE *f, int c2, int c1) +nkf_char +h_conv(FILE *f, nkf_char c2, nkf_char c1) { - int wc,c3; + nkf_char ret, c3, c0; + int hold_index; /** it must NOT be in the kanji shifte sequence */ @@ -2736,12 +3316,12 @@ h_conv(FILE *f, int c2, int c1) code_status(c1); } while (p->name){ - if (p->score < result->score){ + if (p->status_func && p->score < result->score){ result = p; } ++p; } - set_iconv(FALSE, result->iconv_func); + set_iconv(TRUE, result->iconv_func); } @@ -2754,23 +3334,23 @@ h_conv(FILE *f, int c2, int c1) ** Kanji codes by oconv and leave estab_f unchanged. **/ - c3=c1; - wc = 0; - while (wc < hold_count){ - c2 = hold_buf[wc++]; + ret = c1; + hold_index = 0; + while (hold_index < hold_count){ + c2 = hold_buf[hold_index++]; if (c2 <= DEL #ifdef NUMCHAR_OPTION - || (c2 & CLASS_MASK) == CLASS_UTF16 + || is_unicode_capsule(c2) #endif ){ (*iconv)(0, c2, 0); continue; }else if (iconv == s_iconv && 0xa1 <= c2 && c2 <= 0xdf){ - (*iconv)(X0201, c2, 0); + (*iconv)(JIS_X_0201, c2, 0); continue; } - if (wc < hold_count){ - c1 = hold_buf[wc++]; + if (hold_index < hold_count){ + c1 = hold_buf[hold_index++]; }else{ c1 = (*i_getc)(f); if (c1 == EOF){ @@ -2779,28 +3359,48 @@ h_conv(FILE *f, int c2, int c1) } code_status(c1); } - if ((*iconv)(c2, c1, 0) < 0){ - int c0; - if (wc < hold_count){ - c0 = hold_buf[wc++]; - }else{ - c0 = (*i_getc)(f); - if (c0 == EOF){ - c3 = EOF; - break; - } + c0 = 0; + switch ((*iconv)(c2, c1, 0)) { /* can be EUC/SJIS/UTF-8 */ + case -2: + /* 4 bytes UTF-8 */ + if (hold_index < hold_count){ + c0 = hold_buf[hold_index++]; + } else if ((c0 = (*i_getc)(f)) == EOF) { + ret = EOF; + break; + } else { + code_status(c0); + c0 <<= 8; + if (hold_index < hold_count){ + c3 = hold_buf[hold_index++]; + } else if ((c3 = (*i_getc)(f)) == EOF) { + c0 = ret = EOF; + break; + } else { + code_status(c3); + (*iconv)(c2, c1, c0|c3); + } + } + break; + case -1: + /* 3 bytes EUC or UTF-8 */ + if (hold_index < hold_count){ + c0 = hold_buf[hold_index++]; + } else if ((c0 = (*i_getc)(f)) == EOF) { + ret = EOF; + break; + } else { code_status(c0); } (*iconv)(c2, c1, c0); - } + break; + } + if (c0 == EOF) break; } - return c3; + return ret; } - - -int -push_hold_buf(int c2) +nkf_char push_hold_buf(nkf_char c2) { if (hold_count >= HOLD_SIZE*2) return (EOF); @@ -2808,29 +3408,35 @@ push_hold_buf(int c2) return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count); } -int s2e_conv(int c2, int c1, int *p2, int *p1) +nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1) { #if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE) - int val; + nkf_char val; #endif - static const int shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} }; + static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} }; #ifdef SHIFTJIS_CP932 - if (cp51932_f && CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END){ - extern const unsigned short shiftjis_cp932[3][189]; + if (!cp932inv_f && is_ibmext_in_sjis(c2)){ val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40]; if (val){ c2 = val >> 8; c1 = val & 0xff; } } + if (cp932inv_f + && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){ + nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40]; + if (c){ + c2 = c >> 8; + c1 = c & 0xff; + } + } #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE - if (!x0213_f && 0xfa <= c2 && c2 <= 0xfc){ - extern const unsigned short shiftjis_x0212[3][189]; + if (!x0213_f && is_ibmext_in_sjis(c2)){ val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40]; if (val){ - if (val & 0x8000){ - c2 = (0x8f << 8) | (val >> 8); + if (val > 0x7FFF){ + c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f); c1 = val & 0xff; }else{ c2 = val >> 8; @@ -2845,9 +3451,9 @@ int s2e_conv(int c2, int c1, int *p2, int *p1) if(c2 >= 0x80){ if(x0213_f && c2 >= 0xF0){ if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */ - c2 = 0x8F20 + shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; + c2 = PREFIX_EUCG3 | 0x20 | shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; }else{ /* 78<=k<=94 */ - c2 = 0x8F00 | (c2 * 2 - 0x17B); + c2 = PREFIX_EUCG3 | (c2 * 2 - 0x17B); if (0x9E < c1) c2++; } }else{ @@ -2855,7 +3461,7 @@ int s2e_conv(int c2, int c1, int *p2, int *p1) if (0x9E < c1) c2++; } if (c1 < 0x9F) - c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F); + c1 = c1 - ((c1 > DEL) ? SP : 0x1F); else { c1 = c1 - 0x7E; } @@ -2869,61 +3475,90 @@ int s2e_conv(int c2, int c1, int *p2, int *p1) return 0; } -int s_iconv(int c2, int c1, int c0) +nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { - if (c2 == X0201) { + if (c2 == JIS_X_0201) { c1 &= 0x7f; - } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { + } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) { /* NOP */ + } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) { + /* CP932 UDC */ + if(c1 == 0x7F) return 0; + c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE; + c2 = 0; } else { - int ret = s2e_conv(c2, c1, &c2, &c1); + nkf_char ret = s2e_conv(c2, c1, &c2, &c1); if (ret) return ret; } (*oconv)(c2, c1); return 0; } -int e_iconv(int c2, int c1, int c0) +nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { - if (c2 == X0201) { + if (c2 == JIS_X_0201) { c1 &= 0x7f; #ifdef X0212_ENABLE }else if (c2 == 0x8f){ if (c0 == 0){ return -1; } - c2 = (c2 << 8) | (c1 & 0x7f); - c1 = c0 & 0x7f; + if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) { + /* encoding is eucJP-ms, so invert to Unicode Private User Area */ + c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE; + c2 = 0; + } else { + c2 = (c2 << 8) | (c1 & 0x7f); + c1 = c0 & 0x7f; #ifdef SHIFTJIS_CP932 - if (cp51932_f){ - int s2, s1; - if (e2s_conv(c2, c1, &s2, &s1) == 0){ - s2e_conv(s2, s1, &c2, &c1); - if ((c2 & 0xff00) == 0){ - c1 &= 0x7f; - c2 &= 0x7f; - } - } - } + if (cp51932_f){ + nkf_char s2, s1; + if (e2s_conv(c2, c1, &s2, &s1) == 0){ + s2e_conv(s2, s1, &c2, &c1); + if (c2 < 0x100){ + c1 &= 0x7f; + c2 &= 0x7f; + } + } + } #endif /* SHIFTJIS_CP932 */ + } #endif /* X0212_ENABLE */ } else if (c2 == SSO){ - c2 = X0201; + c2 = JIS_X_0201; c1 &= 0x7f; - } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { + } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) { /* NOP */ } else { - c1 &= 0x7f; - c2 &= 0x7f; + if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) { + /* encoding is eucJP-ms, so invert to Unicode Private User Area */ + c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE; + c2 = 0; + } else { + c1 &= 0x7f; + c2 &= 0x7f; +#ifdef SHIFTJIS_CP932 + if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){ + nkf_char s2, s1; + if (e2s_conv(c2, c1, &s2, &s1) == 0){ + s2e_conv(s2, s1, &c2, &c1); + if (c2 < 0x100){ + c1 &= 0x7f; + c2 &= 0x7f; + } + } + } +#endif /* SHIFTJIS_CP932 */ + } } (*oconv)(c2, c1); return 0; } #ifdef UTF8_INPUT_ENABLE -int w2e_conv(int c2, int c1, int c0, int *p2, int *p1) +nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) { - int ret = 0; + nkf_char ret = 0; if (!c1){ *p2 = 0; @@ -2933,7 +3568,7 @@ int w2e_conv(int c2, int c1, int c0, int *p2, int *p1) #ifdef NUMCHAR_OPTION if (ret > 0){ if (p2) *p2 = 0; - if (p1) *p1 = CLASS_UTF16 | ww16_conv(c2, c1, c0); + if (p1) *p1 = CLASS_UNICODE | ww16_conv(c2, c1, c0); ret = 0; } #endif @@ -2941,46 +3576,66 @@ int w2e_conv(int c2, int c1, int c0, int *p2, int *p1) return ret; } -int w_iconv(int c2, int c1, int c0) +nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { - int ret = 0; - - /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ - if(ignore_zwnbsp_f){ - ignore_zwnbsp_f = FALSE; - if(c2 == 0xef && c1 == 0xbb && c0 == 0xbf) - return 0; - } - - if (c2 == 0) /* 0x00-0x7f */ - c1 &= 0x7F; /* 1byte */ - else if (c0 == 0){ - if ((c2 & 0xe0) == 0xc0){ /* 0xc0-0xdf */ - /* 2ytes */ - if((c2 & 0xFE) == 0xC0 || c1 < 0x80 || 0xBF < c1) return 0; - }else if ((c2 & 0xf0) == 0xe0) /* 0xe0-0xef */ - return -1; /* 3bytes */ -#ifdef __COMMENT__ - else if (0xf0 <= c2) - return 0; /* 4,5,6bytes */ - else if ((c2 & 0xc0) == 0x80) /* 0x80-0xbf */ - return 0; /* trail byte */ -#endif - else return 0; - }else{ - /* must be 3bytes */ - if(c2 == 0xE0){ - if(c1 < 0xA0 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0) + nkf_char ret = 0; + static const char w_iconv_utf8_1st_byte[] = + { /* 0xC0 - 0xFF */ + 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, + 40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70}; + + if (c2 < 0 || 0xff < c2) { + }else if (c2 == 0) { /* 0 : 1 byte*/ + c0 = 0; + } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */ + return 0; + } else{ + switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) { + case 21: + if (c1 < 0x80 || 0xBF < c1) return 0; + break; + case 30: + if (c0 == 0) return -1; + if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 31: + case 33: + if (c0 == 0) return -1; + if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 32: + if (c0 == 0) return -1; + if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 40: + if (c0 == 0) return -2; + if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080) return 0; - }else if(c2 == 0xED){ - if(c1 < 0x80 || 0x9F < c1 || c0 < 0x80 || 0xBF < c0) + break; + case 41: + if (c0 == 0) return -2; + if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080) return 0; - }else if((c2 & 0xf0) == 0xe0){ - if(c1 < 0x80 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0) + break; + case 42: + if (c0 == 0) return -2; + if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080) return 0; - }else return 0; + break; + default: + return 0; + break; + } } if (c2 == 0 || c2 == EOF){ + } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */ + c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0); + c2 = 0; } else { ret = w2e_conv(c2, c1, c0, &c2, &c1); } @@ -2992,9 +3647,9 @@ int w_iconv(int c2, int c1, int c0) #endif #if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) -void w16w_conv(int val, int *p2, int *p1, int *p0) +void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0) { - val &= 0xFFFFFF; + val &= VALUE_MASK; if (val < 0x80){ *p2 = val; *p1 = 0; @@ -3003,20 +3658,34 @@ void w16w_conv(int val, int *p2, int *p1, int *p0) *p2 = 0xc0 | (val >> 6); *p1 = 0x80 | (val & 0x3f); *p0 = 0; - }else{ + } else if (val <= NKF_INT32_C(0xFFFF)) { *p2 = 0xe0 | (val >> 12); *p1 = 0x80 | ((val >> 6) & 0x3f); *p0 = 0x80 | (val & 0x3f); + } else if (val <= NKF_INT32_C(0x10FFFF)) { + *p2 = 0xe0 | (val >> 16); + *p1 = 0x80 | ((val >> 12) & 0x3f); + *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f); + } else { + *p2 = 0; + *p1 = 0; + *p0 = 0; } } #endif #ifdef UTF8_INPUT_ENABLE -int ww16_conv(int c2, int c1, int c0) +nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0) { - int val; - if (c2 >= 0xf0){ + nkf_char val; + if (c2 >= 0xf8) { val = -1; + } else if (c2 >= 0xf0){ + /* c2: 1st, c1: 2nd, c0: 3rd/4th */ + val = (c2 & 0x0f) << 18; + val |= (c1 & 0x3f) << 12; + val |= (c0 & 0x3f00) >> 2; + val |= (c0 & 0x3f); }else if (c2 >= 0xe0){ val = (c2 & 0x0f) << 12; val |= (c1 & 0x3f) << 6; @@ -3030,11 +3699,11 @@ int ww16_conv(int c2, int c1, int c0) return val; } -int w16e_conv(int val, int *p2, int *p1) +nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1) { - int c2, c1, c0; - int ret = 0; - val &= 0xFFFFFF; + nkf_char c2, c1, c0; + nkf_char ret = 0; + val &= VALUE_MASK; if (val < 0x80){ *p2 = 0; *p1 = val; @@ -3044,77 +3713,79 @@ int w16e_conv(int val, int *p2, int *p1) #ifdef NUMCHAR_OPTION if (ret > 0){ *p2 = 0; - *p1 = CLASS_UTF16 | val; + *p1 = CLASS_UNICODE | val; ret = 0; } #endif } return ret; } -#endif +#endif + +#ifdef UTF8_INPUT_ENABLE +nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0) +{ + nkf_char ret = 0; + if ((c2==0 && c1 < 0x80) || c2==EOF) { + (*oconv)(c2, c1); + return 0; + }else if (0xD8 <= c2 && c2 <= 0xDB) { + if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0) + return -2; + c1 = CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00)); + c2 = 0; + }else if ((c2>>3) == 27) { /* unpaired surrogate */ + /* + return 2; + */ + return 1; + }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1); + if (ret) return ret; + (*oconv)(c2, c1); + return 0; +} -#ifdef UTF8_INPUT_ENABLE -int w_iconv16(int c2, int c1, int c0) +nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0) { - int ret; + int ret = 0; - /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ - if(ignore_zwnbsp_f){ - ignore_zwnbsp_f = FALSE; - if (c2==0376 && c1==0377){ - utf16_mode = UTF16BE_INPUT; - return 0; - }else if(c2==0377 && c1==0376){ - utf16_mode = UTF16LE_INPUT; - return 0; - } - } - if (c2 != EOF && utf16_mode == UTF16LE_INPUT) { - int tmp; - tmp=c1; c1=c2; c2=tmp; + if ((c2 == 0 && c1 < 0x80) || c2==EOF) { + } else if (is_unicode_bmp(c1)) { + ret = w16e_conv(c1, &c2, &c1); + } else { + c2 = 0; + c1 = CLASS_UNICODE | c1; } - if ((c2==0 && c1 < 0x80) || c2==EOF) { - (*oconv)(c2, c1); - return 0; - }else if((c2>>3)==27){ /* surrogate pair */ - return 1; - }else ret = w16e_conv(((c2<<8)&0xff00) + c1, &c2, &c1); if (ret) return ret; (*oconv)(c2, c1); return 0; } -int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) +nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) { - extern const unsigned short *const utf8_to_euc_2bytes[]; - extern const unsigned short *const utf8_to_euc_2bytes_ms[]; - extern const unsigned short *const utf8_to_euc_2bytes_932[]; - extern const unsigned short *const *const utf8_to_euc_3bytes[]; - extern const unsigned short *const *const utf8_to_euc_3bytes_ms[]; - extern const unsigned short *const *const utf8_to_euc_3bytes_932[]; const unsigned short *const *pp; const unsigned short *const *const *ppp; - static const int no_best_fit_chars_table_C2[] = + static const char no_best_fit_chars_table_C2[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2, 0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1}; - static const int no_best_fit_chars_table_C2_ms[] = + static const char no_best_fit_chars_table_C2_ms[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0}; - static const int no_best_fit_chars_table_932_C2[] = + static const char no_best_fit_chars_table_932_C2[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0}; - static const int no_best_fit_chars_table_932_C3[] = + static const char no_best_fit_chars_table_932_C3[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}; - int ret = 0; + nkf_char ret = 0; if(c2 < 0x80){ *p2 = 0; @@ -3130,7 +3801,7 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1; break; } - }else if(cp51932_f){ + }else if(!cp932inv_f){ switch(c2){ case 0xC2: if(no_best_fit_chars_table_C2[c1&0x3F]) return 1; @@ -3141,14 +3812,30 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) } }else if(ms_ucs_map_f == UCS_MAP_MS){ if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1; + }else if(ms_ucs_map_f == UCS_MAP_CP10001){ + switch(c2){ + case 0xC2: + switch(c1){ + case 0xA2: + case 0xA3: + case 0xA5: + case 0xA6: + case 0xAC: + case 0xAF: + case 0xB8: + return 1; + } + break; + } } } pp = ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 : ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms : + ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac : utf8_to_euc_2bytes; ret = w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1); - }else if(c0){ + }else if(c0 < 0xF0){ if(no_best_fit_chars_f){ if(ms_ucs_map_f == UCS_MAP_CP932){ if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) return 1; @@ -3168,6 +3855,19 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) if(c1 == 0x80 || c0 == 0x9C) return 1; break; } + }else if(ms_ucs_map_f == UCS_MAP_CP10001){ + switch(c2){ + case 0xE3: + switch(c1){ + case 0x82: + if(c0 == 0x94) return 1; + break; + case 0x83: + if(c0 == 0xBB) return 1; + break; + } + break; + } }else{ switch(c2){ case 0xE2: @@ -3186,7 +3886,7 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) if(c0 == 0x8D) return 1; break; case 0xBD: - if(c0 == 0x9E && cp51932_f) return 1; + if(c0 == 0x9E && !cp932inv_f) return 1; break; case 0xBF: if(0xA0 <= c0 && c0 <= 0xA5) return 1; @@ -3199,12 +3899,13 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) ppp = ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 : ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms : + ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac : utf8_to_euc_3bytes; ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1); }else return -1; #ifdef SHIFTJIS_CP932 - if (!ret && cp51932_f && (*p2 & 0xff00) >> 8 == 0x8f) { - int s2, s1; + if (!ret && !cp932inv_f && is_eucg3(*p2)) { + nkf_char s2, s1; if (e2s_conv(*p2, *p1, &s2, &s1) == 0) { s2e_conv(s2, s1, p2, p1); }else{ @@ -3215,9 +3916,9 @@ int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) return ret; } -int w_iconv_common(int c1, int c0, const unsigned short *const *pp, int psize, int *p2, int *p1) +nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1) { - int c2; + nkf_char c2; const unsigned short *p; unsigned short val; @@ -3234,30 +3935,29 @@ int w_iconv_common(int c1, int c0, const unsigned short *const *pp, int psize, i if (val == 0) return 1; if (no_cp932ext_f && ( (val>>8) == 0x2D || /* NEC special characters */ - val > 0xF300 /* NEC special characters */ + val > NKF_INT32_C(0xF300) /* IBM extended characters */ )) return 1; c2 = val >> 8; - if (val & 0x8000){ + if (val > 0x7FFF){ c2 &= 0x7f; - c2 |= 0x8f00; + c2 |= PREFIX_EUCG3; } - if (c2 == SO) c2 = X0201; + if (c2 == SO) c2 = JIS_X_0201; c1 = val & 0x7f; if (p2) *p2 = c2; if (p1) *p1 = c1; return 0; } -void nkf_each_char_to_hex(void (*f)(int c2,int c1), int c) +void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c) { - const char *hex = "0123456789ABCDEF"; int shift = 20; - c &= 0x00FFFFFF; + c &= VALUE_MASK; while(shift >= 0){ if(c >= 1<= 0){ - (*f)(0, hex[(c>>shift)&0xF]); + (*f)(0, bin2hex(c>>shift)); shift -= 4; } }else{ @@ -3267,15 +3967,15 @@ void nkf_each_char_to_hex(void (*f)(int c2,int c1), int c) return; } -void encode_fallback_html(int c) +void encode_fallback_html(nkf_char c) { (*oconv)(0, '&'); (*oconv)(0, '#'); - c &= 0x00FFFFFF; - if(c >= 1000000) - (*oconv)(0, 0x30+(c/1000000)%10); - if(c >= 100000) - (*oconv)(0, 0x30+(c/100000 )%10); + c &= VALUE_MASK; + if(c >= NKF_INT32_C(1000000)) + (*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10); + if(c >= NKF_INT32_C(100000)) + (*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10); if(c >= 10000) (*oconv)(0, 0x30+(c/10000 )%10); if(c >= 1000) @@ -3290,7 +3990,7 @@ void encode_fallback_html(int c) return; } -void encode_fallback_xml(int c) +void encode_fallback_xml(nkf_char c) { (*oconv)(0, '&'); (*oconv)(0, '#'); @@ -3300,27 +4000,27 @@ void encode_fallback_xml(int c) return; } -void encode_fallback_java(int c) +void encode_fallback_java(nkf_char c) { - const char *hex = "0123456789ABCDEF"; (*oconv)(0, '\\'); - if((c&0x00FFFFFF) > 0xFFFF){ + c &= VALUE_MASK; + if(!is_unicode_bmp(c)){ (*oconv)(0, 'U'); (*oconv)(0, '0'); (*oconv)(0, '0'); - (*oconv)(0, hex[(c>>20)&0xF]); - (*oconv)(0, hex[(c>>16)&0xF]); + (*oconv)(0, bin2hex(c>>20)); + (*oconv)(0, bin2hex(c>>16)); }else{ (*oconv)(0, 'u'); } - (*oconv)(0, hex[(c>>12)&0xF]); - (*oconv)(0, hex[(c>> 8)&0xF]); - (*oconv)(0, hex[(c>> 4)&0xF]); - (*oconv)(0, hex[ c &0xF]); + (*oconv)(0, bin2hex(c>>12)); + (*oconv)(0, bin2hex(c>> 8)); + (*oconv)(0, bin2hex(c>> 4)); + (*oconv)(0, bin2hex(c )); return; } -void encode_fallback_perl(int c) +void encode_fallback_perl(nkf_char c) { (*oconv)(0, '\\'); (*oconv)(0, 'x'); @@ -3330,7 +4030,7 @@ void encode_fallback_perl(int c) return; } -void encode_fallback_subchar(int c) +void encode_fallback_subchar(nkf_char c) { c = unicode_subchar; (*oconv)((c>>8)&0xFF, c&0xFF); @@ -3339,19 +4039,23 @@ void encode_fallback_subchar(int c) #endif #ifdef UTF8_OUTPUT_ENABLE -int e2w_conv(int c2, int c1) +nkf_char e2w_conv(nkf_char c2, nkf_char c1) { - extern const unsigned short euc_to_utf8_1byte[]; - extern const unsigned short *const euc_to_utf8_2bytes[]; - extern const unsigned short *const euc_to_utf8_2bytes_ms[]; - extern const unsigned short *const x0212_to_utf8_2bytes[]; const unsigned short *p; - if (c2 == X0201) { + if (c2 == JIS_X_0201) { + if (ms_ucs_map_f == UCS_MAP_CP10001) { + switch (c1) { + case 0x20: + return 0xA0; + case 0x7D: + return 0xA9; + } + } p = euc_to_utf8_1byte; #ifdef X0212_ENABLE - } else if (c2 >> 8 == 0x8f){ - if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22 && c1 == 0x43){ + } else if (is_eucg3(c2)){ + if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){ return 0xA6; } c2 = (c2&0x7f) - 0x21; @@ -3364,7 +4068,10 @@ int e2w_conv(int c2, int c1) c2 &= 0x7f; c2 = (c2&0x7f) - 0x21; if (0<=c2 && c2> 6)); + (*o_putc)(0x80 | (val & 0x3f)); + } else if (val <= NKF_INT32_C(0xFFFF)) { + (*o_putc)(0xE0 | (val >> 12)); + (*o_putc)(0x80 | ((val >> 6) & 0x3f)); + (*o_putc)(0x80 | (val & 0x3f)); + } else if (val <= NKF_INT32_C(0x10FFFF)) { + (*o_putc)(0xF0 | ( val>>18)); + (*o_putc)(0x80 | ((val>>12) & 0x3f)); + (*o_putc)(0x80 | ((val>> 6) & 0x3f)); + (*o_putc)(0x80 | ( val & 0x3f)); } return; } #endif - if (c2 == 0) { + if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); - } else if (c2 == ISO8859_1) { - output_mode = ISO8859_1; + } else if (c2 == ISO_8859_1) { + output_mode = UTF_8; (*o_putc)(c1 | 0x080); } else { - output_mode = UTF8; + output_mode = UTF_8; val = e2w_conv(c2, c1); if (val){ w16w_conv(val, &c2, &c1, &c0); @@ -3423,38 +4141,59 @@ void w_oconv(int c2, int c1) } } -void w_oconv16(int c2, int c1) +void w_oconv16(nkf_char c2, nkf_char c1) { - if (c2 == EOF) { - (*o_putc)(EOF); - return; - } - - if (unicode_bom_f==2) { - if (w_oconv16_LE){ + if (output_bom_f) { + output_bom_f = FALSE; + if (output_endian == ENDIAN_LITTLE){ (*o_putc)((unsigned char)'\377'); (*o_putc)('\376'); }else{ (*o_putc)('\376'); (*o_putc)((unsigned char)'\377'); } - unicode_bom_f=1; } - if (c2 == ISO8859_1) { + if (c2 == EOF) { + (*o_putc)(EOF); + return; + } + + if (c2 == ISO_8859_1) { c2 = 0; c1 |= 0x80; #ifdef NUMCHAR_OPTION - } else if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16) { - c2 = (c1 >> 8) & 0xff; - c1 &= 0xff; + } else if (c2 == 0 && is_unicode_capsule(c1)) { + if (is_unicode_bmp(c1)) { + c2 = (c1 >> 8) & 0xff; + c1 &= 0xff; + } else { + c1 &= VALUE_MASK; + if (c1 <= UNICODE_MAX) { + c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */ + c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */ + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)(c2 & 0xff); + (*o_putc)((c2 >> 8) & 0xff); + (*o_putc)(c1 & 0xff); + (*o_putc)((c1 >> 8) & 0xff); + }else{ + (*o_putc)((c2 >> 8) & 0xff); + (*o_putc)(c2 & 0xff); + (*o_putc)((c1 >> 8) & 0xff); + (*o_putc)(c1 & 0xff); + } + } + return; + } #endif } else if (c2) { - int val = e2w_conv(c2, c1); + nkf_char val = e2w_conv(c2, c1); c2 = (val >> 8) & 0xff; c1 = val & 0xff; + if (!val) return; } - if (w_oconv16_LE){ + if (output_endian == ENDIAN_LITTLE){ (*o_putc)(c1); (*o_putc)(c2); }else{ @@ -3463,37 +4202,99 @@ void w_oconv16(int c2, int c1) } } +void w_oconv32(nkf_char c2, nkf_char c1) +{ + if (output_bom_f) { + output_bom_f = FALSE; + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)((unsigned char)'\377'); + (*o_putc)('\376'); + (*o_putc)('\000'); + (*o_putc)('\000'); + }else{ + (*o_putc)('\000'); + (*o_putc)('\000'); + (*o_putc)('\376'); + (*o_putc)((unsigned char)'\377'); + } + } + + if (c2 == EOF) { + (*o_putc)(EOF); + return; + } + + if (c2 == ISO_8859_1) { + c1 |= 0x80; +#ifdef NUMCHAR_OPTION + } else if (c2 == 0 && is_unicode_capsule(c1)) { + c1 &= VALUE_MASK; +#endif + } else if (c2) { + c1 = e2w_conv(c2, c1); + if (!c1) return; + } + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)( c1 & NKF_INT32_C(0x000000FF)); + (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8); + (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16); + (*o_putc)('\000'); + }else{ + (*o_putc)('\000'); + (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16); + (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8); + (*o_putc)( c1 & NKF_INT32_C(0x000000FF)); + } +} #endif -void e_oconv(int c2, int c1) +void e_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ - if(encode_fallback)(*encode_fallback)(c1); - return; + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* eucJP-ms UDC */ + c1 &= 0xFFF; + c2 = c1 / 94; + c2 += c2 < 10 ? 0x75 : 0x8FEB; + c1 = 0x21 + c1 % 94; + if (is_eucg3(c2)){ + (*o_putc)(0x8f); + (*o_putc)((c2 & 0x7f) | 0x080); + (*o_putc)(c1 | 0x080); + }else{ + (*o_putc)((c2 & 0x7f) | 0x080); + (*o_putc)(c1 | 0x080); + } + return; + } else { + if (encode_fallback) (*encode_fallback)(c1); + return; + } } } #endif if (c2 == EOF) { (*o_putc)(EOF); return; - } else if (c2 == 0) { + } else if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); - } else if (c2 == X0201) { - output_mode = JAPANESE_EUC; + } else if (c2 == JIS_X_0201) { + output_mode = EUC_JP; (*o_putc)(SSO); (*o_putc)(c1|0x80); - } else if (c2 == ISO8859_1) { - output_mode = ISO8859_1; + } else if (c2 == ISO_8859_1) { + output_mode = ISO_8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ - output_mode = JAPANESE_EUC; + } else if (is_eucg3(c2)){ + output_mode = EUC_JP; #ifdef SHIFTJIS_CP932 - if (cp51932_f){ - int s2, s1; + if (!cp932inv_f){ + nkf_char s2, s1; if (e2s_conv(c2, c1, &s2, &s1) == 0){ s2e_conv(s2, s1, &c2, &c1); } @@ -3502,7 +4303,7 @@ void e_oconv(int c2, int c1) if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); - }else if ((c2 & 0xff00) >> 8 == 0x8f){ + }else if (is_eucg3(c2)){ if (x0212_f){ (*o_putc)(0x8f); (*o_putc)((c2 & 0x7f) | 0x080); @@ -3514,23 +4315,22 @@ void e_oconv(int c2, int c1) } #endif } else { - if ((c1<0x21 || 0x7e> 1) + 0xec - ndx / 8 * 3; @@ -3573,10 +4373,9 @@ int e2s_conv(int c2, int c1, int *p2, int *p1) return 1; } #ifdef X0212_ENABLE - else if(0x21 <= ndx && ndx <= 0x7e){ - int val = 0; + else if(nkf_isgraph(ndx)){ + nkf_char val = 0; const unsigned short *ptr; - extern const unsigned short *const x0212_shiftjis[]; ptr = x0212_shiftjis[ndx - 0x21]; if (ptr){ val = ptr[(c1 & 0x7f) - 0x21]; @@ -3598,15 +4397,27 @@ int e2s_conv(int c2, int c1, int *p2, int *p1) return 0; } -void s_oconv(int c2, int c1) +void s_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ - if(encode_fallback)(*encode_fallback)(c1); - return; - } + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* CP932 UDC */ + c1 &= 0xFFF; + c2 = c1 / 188 + 0xF0; + c1 = c1 % 188; + c1 += 0x40 + (c1 > 0x3e); + (*o_putc)(c2); + (*o_putc)(c1); + return; + } else { + if(encode_fallback)(*encode_fallback)(c1); + return; + } + } } #endif if (c2 == EOF) { @@ -3615,14 +4426,14 @@ void s_oconv(int c2, int c1) } else if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); - } else if (c2 == X0201) { + } else if (c2 == JIS_X_0201) { output_mode = SHIFT_JIS; (*o_putc)(c1|0x80); - } else if (c2 == ISO8859_1) { - output_mode = ISO8859_1; + } else if (c2 == ISO_8859_1) { + output_mode = ISO_8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ + } else if (is_eucg3(c2)){ output_mode = SHIFT_JIS; if (e2s_conv(c2, c1, &c2, &c1) == 0){ (*o_putc)(c2); @@ -3630,8 +4441,7 @@ void s_oconv(int c2, int c1) } #endif } else { - if ((c1<0x20 || 0x7e> 8; c1 = c & 0xff; @@ -3658,19 +4467,27 @@ void s_oconv(int c2, int c1) } } -void j_oconv(int c2, int c1) +void j_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ - if(encode_fallback)(*encode_fallback)(c1); - return; + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* CP5022x UDC */ + c1 &= 0xFFF; + c2 = 0x7F + c1 / 94; + c1 = 0x21 + c1 % 94; + } else { + if (encode_fallback) (*encode_fallback)(c1); + return; + } } } #endif if (c2 == EOF) { - if (output_mode !=ASCII && output_mode!=ISO8859_1) { + if (output_mode !=ASCII && output_mode!=ISO_8859_1) { (*o_putc)(ESC); (*o_putc)('('); (*o_putc)(ascii_intro); @@ -3678,43 +4495,43 @@ void j_oconv(int c2, int c1) } (*o_putc)(EOF); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ + } else if (is_eucg3(c2)){ if(x0213_f){ - if(output_mode!=X0213_2){ - output_mode = X0213_2; + if(output_mode!=JIS_X_0213_2){ + output_mode = JIS_X_0213_2; (*o_putc)(ESC); (*o_putc)('$'); (*o_putc)('('); - (*o_putc)(X0213_2&0x7F); + (*o_putc)(0x50); } }else{ - if(output_mode!=X0212){ - output_mode = X0212; + if(output_mode!=JIS_X_0212){ + output_mode = JIS_X_0212; (*o_putc)(ESC); (*o_putc)('$'); (*o_putc)('('); - (*o_putc)(X0212&0x7F); + (*o_putc)(0x44); } } (*o_putc)(c2 & 0x7f); (*o_putc)(c1); #endif - } else if (c2==X0201) { - if (output_mode!=X0201) { - output_mode = X0201; + } else if (c2==JIS_X_0201) { + if (output_mode!=JIS_X_0201) { + output_mode = JIS_X_0201; (*o_putc)(ESC); (*o_putc)('('); (*o_putc)('I'); } (*o_putc)(c1); - } else if (c2==ISO8859_1) { + } else if (c2==ISO_8859_1) { /* iso8859 introduction, or 8th bit on */ - /* Can we convert in 7bit form using ESC-'-'-A ? + /* Can we convert in 7bit form using ESC-'-'-A ? Is this popular? */ - output_mode = ISO8859_1; + output_mode = ISO_8859_1; (*o_putc)(c1|0x80); } else if (c2 == 0) { - if (output_mode !=ASCII && output_mode!=ISO8859_1) { + if (output_mode !=ASCII && output_mode!=ISO_8859_1) { (*o_putc)(ESC); (*o_putc)('('); (*o_putc)(ascii_intro); @@ -3722,17 +4539,19 @@ void j_oconv(int c2, int c1) } (*o_putc)(c1); } else { - if(c2<0x20 || 0x7e0) { return broken_buf[--broken_counter]; } c= (*i_bgetc)(f); - if (c=='$' && broken_last != ESC - && (input_mode==ASCII || input_mode==X0201)) { + if (c=='$' && broken_last != ESC + && (input_mode==ASCII || input_mode==JIS_X_0201)) { c1= (*i_bgetc)(f); broken_last = 0; if (c1=='@'|| c1=='B') { - broken_buf[0]=c1; broken_buf[1]=c; + broken_buf[0]=c1; broken_buf[1]=c; broken_counter=2; return ESC; } else { (*i_bungetc)(c1,f); return c; } - } else if (c=='(' && broken_last != ESC - && (input_mode==X0208 || input_mode==X0201)) { /* ) */ + } else if (c=='(' && broken_last != ESC + && (input_mode==JIS_X_0208 || input_mode==JIS_X_0201)) { /* ) */ c1= (*i_bgetc)(f); broken_last = 0; if (c1=='J'|| c1=='B') { @@ -3790,55 +4609,48 @@ int broken_getc(FILE *f) } } -int broken_ungetc(int c, FILE *f) +nkf_char broken_ungetc(nkf_char c, FILE *f) { if (broken_counter<2) broken_buf[broken_counter++]=c; return c; } -static int prev_cr = 0; - -void cr_conv(int c2, int c1) +void nl_conv(nkf_char c2, nkf_char c1) { - if (prev_cr) { + if (guess_f && input_newline != EOF) { + if (c2 == 0 && c1 == LF) { + if (!input_newline) input_newline = prev_cr ? CRLF : LF; + else if (input_newline != (prev_cr ? CRLF : LF)) input_newline = EOF; + } else if (c2 == 0 && c1 == CR && input_newline == LF) input_newline = EOF; + else if (!prev_cr); + else if (!input_newline) input_newline = CR; + else if (input_newline != CR) input_newline = EOF; + } + if (prev_cr || (c2 == 0 && c1 == LF)) { prev_cr = 0; - if (! (c2==0&&c1==NL) ) { - cr_conv(0,'\n'); - } - } - if (c2) { - (*o_crconv)(c2,c1); - } else if (c1=='\r') { - prev_cr = c1; - } else if (c1=='\n') { - if (crmode_f==CRLF) { - (*o_crconv)(0,'\r'); - } else if (crmode_f==CR) { - (*o_crconv)(0,'\r'); - return; - } - (*o_crconv)(0,NL); - } else if (c1!='\032' || crmode_f!=NL){ - (*o_crconv)(c2,c1); + if (nlmode_f != LF) (*o_nlconv)(0, CR); + if (nlmode_f != CR) (*o_nlconv)(0, LF); } + if (c2 == 0 && c1 == CR) prev_cr = CR; + else if (c2 != 0 || c1 != LF) (*o_nlconv)(c2, c1); } -/* +/* Return value of fold_conv() - \n add newline and output char - \r add newline and output nothing - ' ' space - 0 skip - 1 (or else) normal output + LF add newline and output char + CR add newline and output nothing + SP space + 0 skip + 1 (or else) normal output fold state in prev (previous character) >0x80 Japanese (X0208/X0201) <0x80 ASCII - \n new line - ' ' space + LF new line + SP space This fold algorthm does not preserve heading space in a line. This is the main difference from fmt. @@ -3846,35 +4658,35 @@ void cr_conv(int c2, int c1) #define char_size(c2,c1) (c2?2:1) -void fold_conv(int c2, int c1) -{ - int prev0; - int fold_state; +void fold_conv(nkf_char c2, nkf_char c1) +{ + nkf_char prev0; + nkf_char fold_state; - if (c1== '\r' && !fold_preserve_f) { + if (c1== CR && !fold_preserve_f) { fold_state=0; /* ignore cr */ - }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) { - f_prev = '\n'; + }else if (c1== LF&&f_prev==CR && fold_preserve_f) { + f_prev = LF; fold_state=0; /* ignore cr */ } else if (c1== BS) { if (f_line>0) f_line--; fold_state = 1; } else if (c2==EOF && f_line != 0) { /* close open last line */ - fold_state = '\n'; - } else if ((c1=='\n' && !fold_preserve_f) - || ((c1=='\r'||(c1=='\n'&&f_prev!='\r')) + fold_state = LF; + } else if ((c1==LF && !fold_preserve_f) + || ((c1==CR||(c1==LF&&f_prev!=CR)) && fold_preserve_f)) { /* new line */ - if (fold_preserve_f) { + if (fold_preserve_f) { f_prev = c1; f_line = 0; - fold_state = '\r'; + fold_state = CR; } else if ((f_prev == c1 && !fold_preserve_f) - || (f_prev == '\n' && fold_preserve_f) + || (f_prev == LF && fold_preserve_f) ) { /* duplicate newline */ if (f_line) { f_line = 0; - fold_state = '\n'; /* output two newline */ + fold_state = LF; /* output two newline */ } else { f_line = 0; fold_state = 1; @@ -3883,41 +4695,41 @@ void fold_conv(int c2, int c1) if (f_prev&0x80) { /* Japanese? */ f_prev = c1; fold_state = 0; /* ignore given single newline */ - } else if (f_prev==' ') { + } else if (f_prev==SP) { fold_state = 0; } else { f_prev = c1; - if (++f_line<=fold_len) - fold_state = ' '; + if (++f_line<=fold_len) + fold_state = SP; else { f_line = 0; - fold_state = '\r'; /* fold and output nothing */ + fold_state = CR; /* fold and output nothing */ } } } } else if (c1=='\f') { - f_prev = '\n'; + f_prev = LF; f_line = 0; - fold_state = '\n'; /* output newline and clear */ - } else if ( (c2==0 && c1==' ')|| - (c2==0 && c1=='\t')|| + fold_state = LF; /* output newline and clear */ + } else if ( (c2==0 && c1==SP)|| + (c2==0 && c1==TAB)|| (c2=='!'&& c1=='!')) { /* X0208 kankaku or ascii space */ - if (f_prev == ' ') { + if (f_prev == SP) { fold_state = 0; /* remove duplicate spaces */ } else { - f_prev = ' '; - if (++f_line<=fold_len) - fold_state = ' '; /* output ASCII space only */ + f_prev = SP; + if (++f_line<=fold_len) + fold_state = SP; /* output ASCII space only */ else { - f_prev = ' '; f_line = 0; - fold_state = '\r'; /* fold and output nothing */ + f_prev = SP; f_line = 0; + fold_state = CR; /* fold and output nothing */ } } } else { prev0 = f_prev; /* we still need this one... , but almost done */ f_prev = c1; - if (c2 || c2==X0201) + if (c2 || c2==JIS_X_0201) f_prev |= 0x80; /* this is Japanese */ f_line += char_size(c2,c1); if (f_line<=fold_len) { /* normal case */ @@ -3925,8 +4737,8 @@ void fold_conv(int c2, int c1) } else { if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */ f_line = char_size(c2,c1); - fold_state = '\n'; /* We can't wait, do fold now */ - } else if (c2==X0201) { + fold_state = LF; /* We can't wait, do fold now */ + } else if (c2==JIS_X_0201) { /* simple kinsoku rules return 1 means no folding */ if (c1==(0xde&0x7f)) fold_state = 1; /* ゛*/ else if (c1==(0xdf&0x7f)) fold_state = 1; /* ゜*/ @@ -3934,15 +4746,15 @@ void fold_conv(int c2, int c1) else if (c1==(0xa3&0x7f)) fold_state = 1; /* ，*/ else if (c1==(0xa1&0x7f)) fold_state = 1; /* 」*/ else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */ - else if (SPACE<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */ + else if (SP<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */ f_line = 1; - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } else { f_line = 1; - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } } else if (c2==0) { - /* kinsoku point in ASCII */ + /* kinsoku point in ASCII */ if ( c1==')'|| /* { [ ( */ c1==']'|| c1=='}'|| @@ -3952,17 +4764,17 @@ void fold_conv(int c2, int c1) c1=='?'|| c1=='/'|| c1==':'|| - c1==';' ) { + c1==';') { fold_state = 1; /* just after special */ } else if (!is_alnum(prev0)) { f_line = char_size(c2,c1); - fold_state = '\n'; - } else if ((prev0==' ') || /* ignored new f_line */ - (prev0=='\n')|| /* ignored new f_line */ + fold_state = LF; + } else if ((prev0==SP) || /* ignored new f_line */ + (prev0==LF)|| /* ignored new f_line */ (prev0&0x80)) { /* X0208 - ASCII */ f_line = char_size(c2,c1); - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } else { fold_state = 1; /* default no fold in ASCII */ } @@ -3981,14 +4793,14 @@ void fold_conv(int c2, int c1) else if (c1=='+') fold_state = 1; /* ゛ */ else if (c1==',') fold_state = 1; /* ゜ */ /* default no fold in kinsoku */ - else { - fold_state = '\n'; + else { + fold_state = LF; f_line = char_size(c2,c1); /* add one new f_line before this character */ } } else { f_line = char_size(c2,c1); - fold_state = '\n'; + fold_state = LF; /* add one new f_line before this character */ } } @@ -3996,100 +4808,180 @@ void fold_conv(int c2, int c1) } /* terminator process */ switch(fold_state) { - case '\n': - (*o_fconv)(0,'\n'); + case LF: + OCONV_NEWLINE((*o_fconv)); (*o_fconv)(c2,c1); break; - case 0: + case 0: return; - case '\r': - (*o_fconv)(0,'\n'); + case CR: + OCONV_NEWLINE((*o_fconv)); break; - case '\t': - case ' ': - (*o_fconv)(0,' '); + case TAB: + case SP: + (*o_fconv)(0,SP); break; default: (*o_fconv)(c2,c1); } } -int z_prev2=0,z_prev1=0; +nkf_char z_prev2=0,z_prev1=0; -void z_conv(int c2, int c1) +void z_conv(nkf_char c2, nkf_char c1) { /* if (c2) c1 &= 0x7f; assertion */ - if (x0201_f && z_prev2==X0201) { /* X0201 */ - if (c1==(0xde&0x7f)) { /* 濁点 */ - z_prev2=0; - (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]); - return; - } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) { /* 半濁点 */ - z_prev2=0; - (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]); - return; - } else { - z_prev2=0; - (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]); - } + if (c2 == JIS_X_0201 && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) { + (*o_zconv)(c2,c1); + return; } - if (c2==EOF) { - (*o_zconv)(c2,c1); - return; + if (x0201_f) { + if (z_prev2 == JIS_X_0201) { + if (c2 == JIS_X_0201) { + if (c1 == (0xde&0x7f)) { /* 濁点 */ + z_prev2 = 0; + (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]); + return; + } else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) { /* 半濁点 */ + z_prev2 = 0; + (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]); + return; + } + } + z_prev2 = 0; + (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]); + } + if (c2 == JIS_X_0201) { + if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) { + /* wait for 濁点 or 半濁点 */ + z_prev1 = c1; + z_prev2 = c2; + return; + } else { + (*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]); + return; + } + } } - if (x0201_f && c2==X0201) { - if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) { - /* wait for 濁点 or 半濁点 */ - z_prev1 = c1; z_prev2 = c2; - return; - } else { - (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]); - return; - } + if (c2 == EOF) { + (*o_zconv)(c2, c1); + return; } - /* JISX0208 Alphabet */ - if (alpha_f && c2 == 0x23 ) { + if (alpha_f&1 && c2 == 0x23) { + /* JISX0208 Alphabet */ c2 = 0; - } else if (alpha_f && c2 == 0x21 ) { - /* JISX0208 Kigou */ + } else if (c2 == 0x21) { + /* JISX0208 Kigou */ if (0x21==c1) { - if (alpha_f&0x2) { - c1 = ' '; + if (alpha_f&2) { c2 = 0; - } else if (alpha_f&0x4) { - (*o_zconv)(0,' '); - (*o_zconv)(0,' '); + c1 = SP; + } else if (alpha_f&4) { + (*o_zconv)(0, SP); + (*o_zconv)(0, SP); return; - } - } else if (0x20': entity = ">"; break; - case '<': entity = "<"; break; - case '\"': entity = """; break; - case '&': entity = "&"; break; - } - if (entity){ - while (*entity) (*o_zconv)(0, *entity++); - return; - } } - } + } else if (alpha_f&1 && 0x20': entity = ">"; break; + case '<': entity = "<"; break; + case '\"': entity = """; break; + case '&': entity = "&"; break; + } + if (entity){ + while (*entity) (*o_zconv)(0, *entity++); + return; + } + } + + if (alpha_f & 16) { + /* JIS X 0208 Katakana to JIS X 0201 Katakana */ + if (c2 == 0x21) { + char c = 0; + switch (c1) { + case 0x23: + /* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */ + c = 0xA1; + break; + case 0x56: + /* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */ + c = 0xA2; + break; + case 0x57: + /* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */ + c = 0xA3; + break; + case 0x22: + /* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */ + c = 0xA4; + break; + case 0x26: + /* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */ + c = 0xA5; + break; + case 0x3C: + /* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */ + c = 0xB0; + break; + case 0x2B: + /* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */ + c = 0xDE; + break; + case 0x2C: + /* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */ + c = 0xDF; + break; + } + if (c) { + (*o_zconv)(JIS_X_0201, c); + return; + } + } else if (c2 == 0x25) { + /* JISX0208 Katakana */ + static const int fullwidth_to_halfwidth[] = + { + 0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00, + 0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800, + 0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00, + 0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000, + 0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E, + 0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00, + 0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F, + 0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000, + 0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00, + 0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00, + 0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }; + if (fullwidth_to_halfwidth[c1-0x20]){ + c2 = fullwidth_to_halfwidth[c1-0x20]; + (*o_zconv)(JIS_X_0201, c2>>8); + if (c2 & 0xFF) { + (*o_zconv)(JIS_X_0201, c2&0xFF); + } + return; + } + } } (*o_zconv)(c2,c1); } #define rot13(c) ( \ - ( c < 'A' ) ? c: \ + ( c < 'A') ? c: \ (c <= 'M') ? (c + 13): \ (c <= 'Z') ? (c - 13): \ (c < 'a') ? (c): \ @@ -4099,15 +4991,15 @@ void z_conv(int c2, int c1) ) #define rot47(c) ( \ - ( c < '!' ) ? c: \ - ( c <= 'O' ) ? (c + 47) : \ - ( c <= '~' ) ? (c - 47) : \ + ( c < '!') ? c: \ + ( c <= 'O') ? (c + 47) : \ + ( c <= '~') ? (c - 47) : \ c \ ) -void rot_conv(int c2, int c1) +void rot_conv(nkf_char c2, nkf_char c1) { - if (c2==0 || c2==X0201 || c2==ISO8859_1) { + if (c2==0 || c2==JIS_X_0201 || c2==ISO_8859_1) { c1 = rot13(c1); } else if (c2) { c1 = rot47(c1); @@ -4116,20 +5008,43 @@ void rot_conv(int c2, int c1) (*o_rot_conv)(c2,c1); } -void hira_conv(int c2, int c1) +void hira_conv(nkf_char c2, nkf_char c1) { - if ((hira_f & 1) && c2==0x25 && 0x20= 0x00 && c2 <= 0x20 && c1 >= 0x7f && c1 <= 0xff) { c2 = GETA1; @@ -4176,7 +5091,7 @@ void iso2022jp_check_conv(int c2, int c1) /* This converts =?ISO-2022-JP?B?HOGE HOGE?= */ -const unsigned char *mime_pattern[] = { +static const unsigned char *mime_pattern[] = { (const unsigned char *)"\075?EUC-JP?B?", (const unsigned char *)"\075?SHIFT_JIS?B?", (const unsigned char *)"\075?ISO-8859-1?Q?", @@ -4193,7 +5108,7 @@ const unsigned char *mime_pattern[] = { /* 該当するコードの優先度を上げるための目印 */ -int (*mime_priority_func[])(int c2, int c1, int c0) = { +nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = { e_iconv, s_iconv, 0, 0, 0, 0, #if defined(UTF8_INPUT_ENABLE) w_iconv, w_iconv, @@ -4201,16 +5116,16 @@ int (*mime_priority_func[])(int c2, int c1, int c0) = { 0, }; -const int mime_encode[] = { - JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201, +static const nkf_char mime_encode[] = { + EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201, #if defined(UTF8_INPUT_ENABLE) - UTF8, UTF8, + UTF_8, UTF_8, #endif ASCII, 0 }; -const int mime_encode_method[] = { +static const nkf_char mime_encode_method[] = { 'B', 'B','Q', 'B', 'B', 'Q', #if defined(UTF8_INPUT_ENABLE) 'B', 'Q', @@ -4246,12 +5161,12 @@ void unswitch_mime_getc(void) mime_iconv_back = NULL; } -int mime_begin_strict(FILE *f) +nkf_char mime_begin_strict(FILE *f) { - int c1 = 0; + nkf_char c1 = 0; int i,j,k; const unsigned char *p,*q; - int r[MAXRECOVER]; /* recovery buffer, max mime pattern lenght */ + nkf_char r[MAXRECOVER]; /* recovery buffer, max mime pattern length */ mime_decode_mode = FALSE; /* =? has been checked */ @@ -4259,8 +5174,8 @@ int mime_begin_strict(FILE *f) p = mime_pattern[j]; r[0]='='; r[1]='?'; - for(i=2;p[i]>' ';i++) { /* start at =? */ - if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) { + for(i=2;p[i]>SP;i++) { /* start at =? */ + if (((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i]) { /* pattern fails, try next one */ q = p; while (mime_pattern[++j]) { @@ -4290,14 +5205,14 @@ int mime_begin_strict(FILE *f) if (!unbuf_f) { /* do MIME integrity check */ return mime_integrity(f,mime_pattern[j]); - } + } } switch_mime_getc(); mimebuf_f = TRUE; return c1; } -int mime_getc_buf(FILE *f) +nkf_char mime_getc_buf(FILE *f) { /* we don't keep eof of Fifo, becase it contains ?= as a terminator. It was checked in mime_integrity. */ @@ -4305,18 +5220,18 @@ int mime_getc_buf(FILE *f) (*i_mgetc_buf)(f):Fifo(mime_input++)); } -int mime_ungetc_buf(int c, FILE *f) +nkf_char mime_ungetc_buf(nkf_char c, FILE *f) { if (mimebuf_f) (*i_mungetc_buf)(c,f); - else + else Fifo(--mime_input) = (unsigned char)c; return c; } -int mime_begin(FILE *f) +nkf_char mime_begin(FILE *f) { - int c1; + nkf_char c1; int i,k; /* In NONSTRICT mode, only =? is checked. In case of failure, we */ @@ -4328,8 +5243,8 @@ int mime_begin(FILE *f) for(i=2;iscore & (SCORE_DEPEND|SCORE_CP932)) + input_codename = "CP932"; + } else if (strcmp(input_codename, "EUC-JP") == 0) { + if (p->score & (SCORE_X0212)) + input_codename = "EUCJP-MS"; + else if (p->score & (SCORE_DEPEND|SCORE_CP932)) + input_codename = "CP51932"; + } else if (strcmp(input_codename, "ISO-2022-JP") == 0) { + if (p->score & (SCORE_KANA)) + input_codename = "CP50221"; + else if (p->score & (SCORE_DEPEND|SCORE_CP932)) + input_codename = "CP50220"; + } } - input_codename = codename; - is_inputcode_set = TRUE; + return input_codename; } #if !defined(PERL_XS) && !defined(WIN32DLL) void print_guessed_code(char *filename) { - char *codename = "BINARY"; - if (!is_inputcode_mixed) { - if (strcmp(input_codename, "") == 0) { - codename = "ASCII"; - } else { - codename = input_codename; - } + if (filename != NULL) printf("%s: ", filename); + if (input_codename && !*input_codename) { + printf("BINARY\n"); + } else { + input_codename = get_guessed_code(); + if (guess_f == 1) { + printf("%s\n", input_codename); + } else { + printf("%s%s\n", + input_codename, + input_newline == CR ? " (CR)" : + input_newline == LF ? " (LF)" : + input_newline == CRLF ? " (CRLF)" : + input_newline == EOF ? " (MIXED NL)" : + ""); + } } - if (filename != NULL) printf("%s:", filename); - printf("%s\n", codename); } #endif /*WIN32DLL*/ -#ifdef INPUT_OPTION +#ifdef INPUT_OPTION -int hex_getc(int ch, FILE *f, int (*g)(FILE *f), int (*u)(int c, FILE *f)) +nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f)) { - int c1, c2, c3; + nkf_char c1, c2, c3; c1 = (*g)(f); if (c1 != ch){ return c1; @@ -4436,34 +5380,34 @@ int hex_getc(int ch, FILE *f, int (*g)(FILE *f), int (*u)(int c, FILE *f)) return (hex2bin(c2) << 4) | hex2bin(c3); } -int cap_getc(FILE *f) +nkf_char cap_getc(FILE *f) { return hex_getc(':', f, i_cgetc, i_cungetc); } -int cap_ungetc(int c, FILE *f) +nkf_char cap_ungetc(nkf_char c, FILE *f) { return (*i_cungetc)(c, f); } -int url_getc(FILE *f) +nkf_char url_getc(FILE *f) { return hex_getc('%', f, i_ugetc, i_uungetc); } -int url_ungetc(int c, FILE *f) +nkf_char url_ungetc(nkf_char c, FILE *f) { return (*i_uungetc)(c, f); } #endif #ifdef NUMCHAR_OPTION -int numchar_getc(FILE *f) +nkf_char numchar_getc(FILE *f) { - int (*g)(FILE *) = i_ngetc; - int (*u)(int c ,FILE *f) = i_nungetc; + nkf_char (*g)(FILE *) = i_ngetc; + nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc; int i = 0, j; - int buf[8]; + nkf_char buf[8]; long c = -1; buf[i] = (*g)(f); @@ -4473,7 +5417,7 @@ int numchar_getc(FILE *f) c = 0; buf[++i] = (*g)(f); if (buf[i] == 'x' || buf[i] == 'X'){ - for (j = 0; j < 5; j++){ + for (j = 0; j < 7; j++){ buf[++i] = (*g)(f); if (!nkf_isxdigit(buf[i])){ if (buf[i] != ';'){ @@ -4485,7 +5429,7 @@ int numchar_getc(FILE *f) c |= hex2bin(buf[i]); } }else{ - for (j = 0; j < 6; j++){ + for (j = 0; j < 8; j++){ if (j){ buf[++i] = (*g)(f); } @@ -4502,7 +5446,7 @@ int numchar_getc(FILE *f) } } if (c != -1){ - return CLASS_UTF16 | c; + return CLASS_UNICODE | c; } while (i > 0){ (*u)(buf[i], f); @@ -4511,7 +5455,7 @@ int numchar_getc(FILE *f) return buf[0]; } -int numchar_ungetc(int c, FILE *f) +nkf_char numchar_ungetc(nkf_char c, FILE *f) { return (*i_nungetc)(c, f); } @@ -4520,15 +5464,14 @@ int numchar_ungetc(int c, FILE *f) #ifdef UNICODE_NORMALIZATION /* Normalization Form C */ -int nfc_getc(FILE *f) +nkf_char nfc_getc(FILE *f) { - int (*g)(FILE *f) = i_nfc_getc; - int (*u)(int c ,FILE *f) = i_nfc_ungetc; + nkf_char (*g)(FILE *f) = i_nfc_getc; + nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc; int i=0, j, k=1, lower, upper; - int buf[9]; - const int *array; - extern const struct normalization_pair normalization_table[]; - + nkf_char buf[9]; + const nkf_nfchar *array; + buf[i] = (*g)(f); while (k > 0 && ((buf[i] & 0xc0) != 0x80)){ lower=0, upper=NORMALIZATION_TABLE_LENGTH-1; @@ -4546,7 +5489,7 @@ int nfc_getc(FILE *f) if (k > 0){ array = normalization_table[j].nfc; for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++) - buf[i] = array[i]; + buf[i] = (nkf_char)(array[i]); i--; break; } @@ -4557,22 +5500,22 @@ int nfc_getc(FILE *f) return buf[0]; } -int nfc_ungetc(int c, FILE *f) +nkf_char nfc_ungetc(nkf_char c, FILE *f) { return (*i_nfc_ungetc)(c, f); } #endif /* UNICODE_NORMALIZATION */ -int +nkf_char mime_getc(FILE *f) { - int c1, c2, c3, c4, cc; - int t1, t2, t3, t4, mode, exit_mode; - int lwsp_count; + nkf_char c1, c2, c3, c4, cc; + nkf_char t1, t2, t3, t4, mode, exit_mode; + nkf_char lwsp_count; char *lwsp_buf; char *lwsp_buf_new; - int lwsp_size = 128; + nkf_char lwsp_size = 128; if (mime_top != mime_last) { /* Something is in FIFO */ return Fifo(mime_top++); @@ -4590,15 +5533,15 @@ mime_getc(FILE *f) if (mime_decode_mode == 'Q') { if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF); restart_mime_q: - if (c1=='_' && mimebuf_f != FIXED_MIME) return ' '; - if (c1<=' ' || DEL<=c1) { + if (c1=='_' && mimebuf_f != FIXED_MIME) return SP; + if (c1<=SP || DEL<=c1) { mime_decode_mode = exit_mode; /* prepare for quit */ return c1; } if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) { return c1; } - + mime_decode_mode = exit_mode; /* prepare for quit */ if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF); if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) { @@ -4612,32 +5555,32 @@ restart_mime_q: } while ((c1=(*i_getc)(f))!=EOF) { switch (c1) { - case NL: + case LF: case CR: - if (c1==NL) { - if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) { - i_ungetc(SPACE,f); + if (c1==LF) { + if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) { + i_ungetc(SP,f); continue; } else { i_ungetc(c1,f); } - c1 = NL; + c1 = LF; } else { - if ((c1=(*i_getc)(f))!=EOF && c1 == NL) { - if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) { - i_ungetc(SPACE,f); + if ((c1=(*i_getc)(f))!=EOF && c1 == LF) { + if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) { + i_ungetc(SP,f); continue; } else { i_ungetc(c1,f); } - i_ungetc(NL,f); + i_ungetc(LF,f); } else { i_ungetc(c1,f); } c1 = CR; } break; - case SPACE: + case SP: case TAB: lwsp_buf[lwsp_count] = (unsigned char)c1; if (lwsp_count++>lwsp_size){ @@ -4654,7 +5597,7 @@ restart_mime_q: } break; } - if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) { + if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) { i_ungetc(c1,f); for(lwsp_count--;lwsp_count>0;lwsp_count--) i_ungetc(lwsp_buf[lwsp_count],f); @@ -4663,8 +5606,8 @@ restart_mime_q: free(lwsp_buf); return c1; } - if (c1=='='&&c2<' ') { /* this is soft wrap */ - while((c1 = (*i_mgetc)(f)) <=' ') { + if (c1=='='&&c2 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) { i_ungetc(c1,f); for(lwsp_count--;lwsp_count>0;lwsp_count--) i_ungetc(lwsp_buf[lwsp_count],f); @@ -4777,19 +5718,19 @@ mime_c2_retry: return c1; } mime_c3_retry: - if ((c3 = (*i_mgetc)(f))<=' ') { + if ((c3 = (*i_mgetc)(f))<=SP) { if (c3==EOF) return (EOF); if (mime_f != STRICT_MIME) goto mime_c3_retry; - if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; + if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; return c3; } mime_c4_retry: - if ((c4 = (*i_mgetc)(f))<=' ') { + if ((c4 = (*i_mgetc)(f))<=SP) { if (c4==EOF) return (EOF); if (mime_f != STRICT_MIME) goto mime_c4_retry; - if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; + if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; return c4; } @@ -4808,7 +5749,7 @@ mime_c4_retry: if (c3 != '=') { Fifo(mime_last++) = (unsigned char)cc; cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f); - if (c4 != '=') + if (c4 != '=') Fifo(mime_last++) = (unsigned char)cc; } } else { @@ -4817,21 +5758,21 @@ mime_c4_retry: return Fifo(mime_top++); } -int mime_ungetc(int c, FILE *f) +nkf_char mime_ungetc(nkf_char c, FILE *f) { Fifo(--mime_top) = (unsigned char)c; return c; } -int mime_integrity(FILE *f, const unsigned char *p) +nkf_char mime_integrity(FILE *f, const unsigned char *p) { - int c,d; + nkf_char c,d; unsigned int q; /* In buffered mode, read until =? or NL or buffer full */ mime_input = mime_top; mime_last = mime_top; - + while(*p) Fifo(mime_input++) = *p++; d = 0; q = mime_input; @@ -4843,7 +5784,7 @@ int mime_integrity(FILE *f, const unsigned char *p) /* checked. skip header, start decode */ Fifo(mime_input++) = (unsigned char)c; /* mime_last_input = mime_input; */ - mime_input = q; + mime_input = q; switch_mime_getc(); return 1; } @@ -4861,19 +5802,21 @@ int mime_integrity(FILE *f, const unsigned char *p) return 1; } -int base64decode(int c) +nkf_char base64decode(nkf_char c) { int i; if (c > '@') { if (c < '[') { i = c - 'A'; /* A..Z 0-25 */ + } else if (c == '_') { + i = '?' /* 63 */ ; /* _ 63 */ } else { i = c - 'G' /* - 'a' + 26 */ ; /* a..z 26-51 */ } } else if (c > '/') { i = c - '0' + '4' /* - '0' + 52 */ ; /* 0..9 52-61 */ - } else if (c == '+') { - i = '>' /* 62 */ ; /* + 62 */ + } else if (c == '+' || c == '-') { + i = '>' /* 62 */ ; /* + and - 62 */ } else { i = '?' /* 63 */ ; /* / 63 */ } @@ -4883,55 +5826,48 @@ int base64decode(int c) static const char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static int b64c; +static nkf_char b64c; #define MIMEOUT_BUF_LENGTH (60) char mimeout_buf[MIMEOUT_BUF_LENGTH+1]; int mimeout_buf_count = 0; -int mimeout_preserve_space = 0; -#define itoh4(c) (c>=10?c+'A'-10:c+'0') -void open_mime(int mode) +void open_mime(nkf_char mode) { const unsigned char *p; int i; int j; p = mime_pattern[0]; - for(i=0;mime_encode[i];i++) { + for(i=0;mime_pattern[i];i++) { if (mode == mime_encode[i]) { p = mime_pattern[i]; break; } } mimeout_mode = mime_encode_method[i]; - i = 0; if (base64_count>45) { if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){ (*o_mputc)(mimeout_buf[i]); i++; } - (*o_mputc)(NL); - (*o_mputc)(SPACE); + PUT_NEWLINE((*o_mputc)); + (*o_mputc)(SP); base64_count = 1; - if (!mimeout_preserve_space && mimeout_buf_count>0 - && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB - || mimeout_buf[i]==CR || mimeout_buf[i]==NL )) { + if (mimeout_buf_count>0 + && (mimeout_buf[i]==SP || mimeout_buf[i]==TAB + || mimeout_buf[i]==CR || mimeout_buf[i]==LF)) { i++; } } - if (!mimeout_preserve_space) { - for (;i 0) { if (mimeout_f!=FIXED_MIME) { - close_mime(); + close_mime(); } else if (mimeout_mode != 'Q') mimeout_mode = 'B'; } } -void mimeout_addchar(int c) +void mimeout_addchar(nkf_char c) { switch(mimeout_mode) { case 'Q': - if (c==CR||c==NL) { + if (c==CR||c==LF) { (*o_mputc)(c); base64_count = 0; } else if(!nkf_isalnum(c)) { (*o_mputc)('='); - (*o_mputc)(itoh4(((c>>4)&0xf))); - (*o_mputc)(itoh4((c&0xf))); + (*o_mputc)(bin2hex(((c>>4)&0xf))); + (*o_mputc)(bin2hex((c&0xf))); base64_count += 3; } else { (*o_mputc)(c); @@ -5019,50 +5955,58 @@ void mimeout_addchar(int c) } } -int mime_lastchar2, mime_lastchar1; +/*nkf_char mime_lastchar2, mime_lastchar1;*/ -void mime_prechar(int c2, int c1) +void mime_prechar(nkf_char c2, nkf_char c1) { - if (mimeout_mode){ - if (c2){ - if (base64_count + mimeout_buf_count/3*4> 66){ + if (mimeout_mode > 0){ + if (c2 == EOF){ + if (base64_count + mimeout_buf_count/3*4> 73){ (*o_base64conv)(EOF,0); - (*o_base64conv)(0,NL); - (*o_base64conv)(0,SPACE); + OCONV_NEWLINE((*o_base64conv)); + (*o_base64conv)(0,SP); + base64_count = 1; } - }/*else if (mime_lastchar2){ - if (c1 <=DEL && !nkf_isspace(c1)){ - (*o_base64conv)(0,SPACE); + } else { + if (base64_count + mimeout_buf_count/3*4> 66) { + (*o_base64conv)(EOF,0); + OCONV_NEWLINE((*o_base64conv)); + (*o_base64conv)(0,SP); + base64_count = 1; + mimeout_mode = -1; } - }*/ - }/*else{ - if (c2 && mime_lastchar2 == 0 - && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){ - (*o_base64conv)(0,SPACE); } - }*/ - mime_lastchar2 = c2; - mime_lastchar1 = c1; + } else if (c2) { + if (c2 != EOF && base64_count + mimeout_buf_count/3*4> 60) { + mimeout_mode = (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B'; + open_mime(output_mode); + (*o_base64conv)(EOF,0); + OCONV_NEWLINE((*o_base64conv)); + (*o_base64conv)(0,SP); + base64_count = 1; + mimeout_mode = -1; + } + } } -void mime_putc(int c) +void mime_putc(nkf_char c) { int i, j; - int lastchar; + nkf_char lastchar; if (mimeout_f == FIXED_MIME){ if (mimeout_mode == 'Q'){ if (base64_count > 71){ - if (c!=CR && c!=NL) { + if (c!=CR && c!=LF) { (*o_mputc)('='); - (*o_mputc)(NL); + PUT_NEWLINE((*o_mputc)); } base64_count = 0; } }else{ if (base64_count > 71){ eof_mime(); - (*o_mputc)(NL); + PUT_NEWLINE((*o_mputc)); base64_count = 0; } if (c == EOF) { /* c==EOF */ @@ -5074,69 +6018,120 @@ void mime_putc(int c) } return; } - + /* mimeout_f != FIXED_MIME */ if (c == EOF) { /* c==EOF */ + if (mimeout_mode == -1 && mimeout_buf_count > 1) open_mime(output_mode); j = mimeout_buf_count; mimeout_buf_count = 0; i = 0; - for (;i 0) { + if (!nkf_isblank(mimeout_buf[j-1])) { + for (;i 0){ lastchar = mimeout_buf[mimeout_buf_count - 1]; }else{ lastchar = -1; } - if (!mimeout_mode) { - if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) { + if (mimeout_mode=='Q') { + if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) { + if (c == CR || c == LF) { + close_mime(); + (*o_mputc)(c); + base64_count = 0; + return; + } else if (c <= SP) { + close_mime(); + if (base64_count > 70) { + PUT_NEWLINE((*o_mputc)); + base64_count = 0; + } + if (!nkf_isblank(c)) { + (*o_mputc)(SP); + base64_count++; + } + } else { + if (base64_count > 70) { + close_mime(); + PUT_NEWLINE((*o_mputc)); + (*o_mputc)(SP); + base64_count = 1; + open_mime(output_mode); + } + if (!nkf_noescape_mime(c)) { + mimeout_addchar(c); + return; + } + } + (*o_mputc)(c); + base64_count++; + } + return; + } + + if (mimeout_mode <= 0) { + if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) { if (nkf_isspace(c)) { - if (c==CR || c==NL) { - base64_count=0; + int flag = 0; + if (mimeout_mode == -1) { + flag = 1; + } + if (c==CR || c==LF) { + if (flag) { + open_mime(output_mode); + output_mode = 0; + } else { + base64_count = 0; + } } for (i=0;i 1 - && base64_count + mimeout_buf_count > 76){ - (*o_mputc)(NL); + && base64_count + mimeout_buf_count > 76 + && mimeout_buf[0] != CR && mimeout_buf[0] != LF){ + PUT_NEWLINE((*o_mputc)); base64_count = 0; if (!nkf_isspace(mimeout_buf[0])){ - (*o_mputc)(SPACE); + (*o_mputc)(SP); base64_count++; } } @@ -5147,33 +6142,33 @@ void mime_putc(int c) } return; }else{ - if (lastchar==CR || lastchar == NL){ + if (lastchar==CR || lastchar == LF){ for (i=0;i0 && SPACE0 && SPMIMEOUT_BUF_LENGTH) { j = mimeout_buf_count; @@ -5221,7 +6218,7 @@ void mime_putc(int c) j = mimeout_buf_count; mimeout_buf_count = 0; for (i=0;ihiragana, 2 hiragana->katakana, 3 both\n"); - fprintf(stderr,"v Show this usage. V: show version\n"); - fprintf(stderr,"m[BQN0] MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n"); - fprintf(stderr,"M[BQ] MIME encode [B:base64 Q:quoted]\n"); - fprintf(stderr,"l ISO8859-1 (Latin-1) support\n"); - fprintf(stderr,"f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"); - fprintf(stderr,"Z[0-3] Convert X0208 alphabet to ASCII\n"); - fprintf(stderr," 1: Kankaku to 1 space 2: to 2 spaces 3: Convert to HTML Entity\n"); - fprintf(stderr,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n"); - fprintf(stderr,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n"); + fprintf(HELP_OUTPUT," After 'W' you can add more options. -W[ 8, 16 [BL] ] \n"); +#endif + fprintf(HELP_OUTPUT,"t no conversion\n"); + fprintf(HELP_OUTPUT,"i[@B] Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n"); + fprintf(HELP_OUTPUT,"o[BJH] Specify the Esc Seq for ASCII/Roman (DEFAULT B)\n"); + fprintf(HELP_OUTPUT,"r {de/en}crypt ROT13/47\n"); + fprintf(HELP_OUTPUT,"h 1 katakana->hiragana, 2 hiragana->katakana, 3 both\n"); + fprintf(HELP_OUTPUT,"m[BQN0] MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n"); + fprintf(HELP_OUTPUT,"M[BQ] MIME encode [B:base64 Q:quoted]\n"); + fprintf(HELP_OUTPUT,"l ISO8859-1 (Latin-1) support\n"); + fprintf(HELP_OUTPUT,"f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"); + fprintf(HELP_OUTPUT,"Z[0-4] Default/0: Convert JISX0208 Alphabet to ASCII\n"); + fprintf(HELP_OUTPUT," 1: Kankaku to one space 2: to two spaces 3: HTML Entity\n"); + fprintf(HELP_OUTPUT," 4: JISX0208 Katakana to JISX0201 Katakana\n"); + fprintf(HELP_OUTPUT,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n"); + fprintf(HELP_OUTPUT,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n"); #ifdef MSDOS - fprintf(stderr,"T Text mode output\n"); -#endif - fprintf(stderr,"O Output to File (DEFAULT 'nkf.out')\n"); - fprintf(stderr,"I Convert non ISO-2022-JP charactor to GETA\n"); - fprintf(stderr,"d,c Convert line breaks -d: LF -c: CRLF\n"); - fprintf(stderr,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"); - fprintf(stderr,"\n"); - fprintf(stderr,"Long name options\n"); - fprintf(stderr," --ic= --oc=\n"); - fprintf(stderr," Specify the input or output codeset\n"); - fprintf(stderr," --fj --unix --mac --windows\n"); - fprintf(stderr," --jis --euc --sjis --utf8 --utf16 --mime --base64\n"); - fprintf(stderr," Convert for the system or code\n"); - fprintf(stderr," --hiragana --katakana --katakana-hiragana\n"); - fprintf(stderr," To Hiragana/Katakana Conversion\n"); - fprintf(stderr," --prefix= Insert escape before troublesome characters of Shift_JIS\n"); + fprintf(HELP_OUTPUT,"T Text mode output\n"); +#endif + fprintf(HELP_OUTPUT,"O Output to File (DEFAULT 'nkf.out')\n"); + fprintf(HELP_OUTPUT,"I Convert non ISO-2022-JP charactor to GETA\n"); + fprintf(HELP_OUTPUT,"d,c Convert line breaks -d: LF -c: CRLF\n"); + fprintf(HELP_OUTPUT,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"); + fprintf(HELP_OUTPUT,"v, V Show this usage. V: show configuration\n"); + fprintf(HELP_OUTPUT,"\n"); + fprintf(HELP_OUTPUT,"Long name options\n"); + fprintf(HELP_OUTPUT," --ic= --oc=\n"); + fprintf(HELP_OUTPUT," Specify the input or output codeset\n"); + fprintf(HELP_OUTPUT," --fj --unix --mac --windows\n"); + fprintf(HELP_OUTPUT," --jis --euc --sjis --utf8 --utf16 --mime --base64\n"); + fprintf(HELP_OUTPUT," Convert for the system or code\n"); + fprintf(HELP_OUTPUT," --hiragana --katakana --katakana-hiragana\n"); + fprintf(HELP_OUTPUT," To Hiragana/Katakana Conversion\n"); + fprintf(HELP_OUTPUT," --prefix= Insert escape before troublesome characters of Shift_JIS\n"); #ifdef INPUT_OPTION - fprintf(stderr," --cap-input, --url-input Convert hex after ':' or '%%'\n"); + fprintf(HELP_OUTPUT," --cap-input, --url-input Convert hex after ':' or '%%'\n"); #endif #ifdef NUMCHAR_OPTION - fprintf(stderr," --numchar-input Convert Unicode Character Reference\n"); + fprintf(HELP_OUTPUT," --numchar-input Convert Unicode Character Reference\n"); #endif #ifdef UTF8_INPUT_ENABLE - fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n"); - fprintf(stderr," Specify how nkf handles unassigned characters\n"); + fprintf(HELP_OUTPUT," --fb-{skip, html, xml, perl, java, subchar}\n"); + fprintf(HELP_OUTPUT," Specify how nkf handles unassigned characters\n"); #endif #ifdef OVERWRITE - fprintf(stderr," --in-place[=SUFFIX] --overwrite[=SUFFIX]\n"); - fprintf(stderr," Overwrite original listed files by filtered result\n"); - fprintf(stderr," --overwrite preserves timestamp of original files\n"); -#endif - fprintf(stderr," -g --guess Guess the input code\n"); - fprintf(stderr," --help --version Show this help/the version\n"); - fprintf(stderr," For more information, see also man nkf\n"); - fprintf(stderr,"\n"); + fprintf(HELP_OUTPUT," --in-place[=SUFFIX] --overwrite[=SUFFIX]\n"); + fprintf(HELP_OUTPUT," Overwrite original listed files by filtered result\n"); + fprintf(HELP_OUTPUT," --overwrite preserves timestamp of original files\n"); +#endif + fprintf(HELP_OUTPUT," -g --guess Guess the input code\n"); + fprintf(HELP_OUTPUT," --help --version Show this help/the version\n"); + fprintf(HELP_OUTPUT," For more information, see also man nkf\n"); + fprintf(HELP_OUTPUT,"\n"); version(); } -void version(void) +void show_configuration(void) { - fprintf(stderr,"Network Kanji Filter Version %s (%s) " -#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) - "for DOS" + fprintf(HELP_OUTPUT, "Summary of my nkf " NKF_VERSION " (" NKF_RELEASE_DATE ") configuration:\n"); + fprintf(HELP_OUTPUT, " Compile-time options:\n"); + fprintf(HELP_OUTPUT, " Default output encoding: " +#if defined(DEFAULT_CODE_JIS) + "ISO-2022-JP" +#elif defined(DEFAULT_CODE_SJIS) + "Shift_JIS" +#elif defined(DEFAULT_CODE_EUC) + "EUC-JP" +#elif defined(DEFAULT_CODE_UTF8) + "UTF-8" +#endif + "\n"); + fprintf(HELP_OUTPUT, " Default output newline: " +#if DEFAULT_NEWLINE == CR + "CR" +#elif DEFAULT_NEWLINE == CRLF + "CRLF" +#else + "LF" #endif -#if defined(MSDOS) && defined(__WIN16__) - "for Win16" + "\n"); + fprintf(HELP_OUTPUT, " Decode MIME encoded string: " +#if MIME_DECODE_DEFAULT + "ON" +#else + "OFF" #endif -#if defined(MSDOS) && defined(__WIN32__) - "for Win32" + "\n"); + fprintf(HELP_OUTPUT, " Convert JIS X 0201 Katakana: " +#if X0201_DEFAULT + "ON" +#else + "OFF" #endif -#ifdef __OS2__ - "for OS/2" + "\n"); +fprintf(HELP_OUTPUT, " --help, --version output: " +#if HELP_OUTPUT_HELP_OUTPUT +"HELP_OUTPUT" +#else +"STDOUT" #endif - ,NKF_VERSION,NKF_RELEASE_DATE); - fprintf(stderr,"\n%s\n",CopyRight); +"\n"); } -#endif /*PERL_XS*/ -/** - ** パッチ制作者 - ** void@merope.pleiades.or.jp (Kusakabe Youichi) - ** NIDE Naoyuki - ** ohta@src.ricoh.co.jp (Junn Ohta) - ** inouet@strl.nhk.or.jp (Tomoyuki Inoue) - ** kiri@pulser.win.or.jp (Tetsuaki Kiriyama) - ** Kimihiko Sato - ** a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe) - ** kono@ie.u-ryukyu.ac.jp (Shinji Kono) - ** GHG00637@nifty-serve.or.jp (COW) - ** - **/ - -/* end */ +void version(void) +{ + fprintf(HELP_OUTPUT,"Network Kanji Filter Version " NKF_VERSION " (" NKF_RELEASE_DATE ") \n" COPY_RIGHT "\n"); +} +#endif /*PERL_XS*/