From 4c5e9d67cd3b44a9769d975bd897780c18ca3df2 Mon Sep 17 00:00:00 2001
From: Hiroshi Saito <hiroshi@winpg.jp>
Date: Tue, 21 Aug 2007 06:56:24 +0000
Subject: [PATCH] Standard correction and a multibye condition addition.

---
 multibyte.c | 12 +++++++++---
 multibyte.h |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/multibyte.c b/multibyte.c
index 997e336..5854d57 100644
--- a/multibyte.c
+++ b/multibyte.c
@@ -57,13 +57,13 @@ static pg_CS CS_Table[] =
 	{ "WIN1255",	WIN1255 },	/* Hebrew since 8.2 */
 	{ "WIN1257",	WIN1257 },	/* Baltic(North Europe) since 8.2 */
 
-	{ "EUC_JIS_2004", PG_EUC_JIS_2004},	/* EUC for SHIFT-JIS-2004 Japanese, since 8.3 */
+	{ "EUC_JIS_2004", EUC_JIS_2004},	/* EUC for SHIFT-JIS-2004 Japanese, since 8.3 */
 	{ "SJIS",	SJIS },
 	{ "BIG5",	BIG5 },
 	{ "GBK",	GBK },		/* since 7.3 */
 	{ "UHC",	UHC },		/* since 7.3 */	
 	{ "GB18030",	GB18030 },	/* since 7.3 */
-	{ "SHIFT_JIS_2004", PG_SHIFT_JIS_2004 },	/* SHIFT-JIS-2004 Japanese, standard JIS X 0213, since 8.3 */
+	{ "SHIFT_JIS_2004", SHIFT_JIS_2004 },	/* SHIFT-JIS-2004 Japanese, standard JIS X 0213, since 8.3 */
 	{ "OTHER",	OTHER }
 };
 
@@ -208,9 +208,11 @@ pg_mb_maxlen(characterset_code)
 			return 6;
 		case EUC_TW:
 			return 4;
+		case EUC_JIS_2004:
 		case EUC_JP:
 		case GB18030:
 			return 3;
+		case SHIFT_JIS_2004:
 		case SJIS:
 		case BIG5:
 		case GBK:
@@ -255,6 +257,7 @@ pg_CS_stat(int stat,unsigned int character,int characterset_code)
 			}
 			break;
 /* Shift-JIS Support. */
+			case SHIFT_JIS_2004:
 			case SJIS:
 			{
 				if (stat < 2 &&
@@ -306,7 +309,10 @@ pg_CS_stat(int stat,unsigned int character,int characterset_code)
 			}
 			break;
 
-/* EUC_JP Support */
+		case EUC_JIS_2004:
+			/* 0x8f is JIS X 0212 3 byte */
+			/* 0x8e is JIS X 0201 2 byte */
+			/* 0xa0-0xff is JIS X 0208 2 byte */
 		case EUC_JP:
 			{
 				if (stat < 3 && 
diff --git a/multibyte.h b/multibyte.h
index 55e6c17..937d5bf 100644
--- a/multibyte.h
+++ b/multibyte.h
@@ -44,13 +44,13 @@ enum {
 	,WIN1254		/* Turkish Windows */
 	,WIN1255		/* Hebrew Windows */
 	,WIN1257		/* Baltic(North Europe) Windows */
-	,PG_EUC_JIS_2004	/* EUC for SHIFT-JIS-2004 Japanese */
+	,EUC_JIS_2004		/* EUC for SHIFT-JIS-2004 Japanese */
 	,SJIS			/* Shift JIS */
 	,BIG5			/* Big5 */
 	,GBK			/* GBK */
 	,UHC			/* UHC */
 	,GB18030		/* GB18030 */
-	,PG_SHIFT_JIS_2004	/* SHIFT-JIS-2004 Japanese, JIS X 0213 */
+	,SHIFT_JIS_2004		/* SHIFT-JIS-2004 Japanese, JIS X 0213 */
 	,OTHER		=	-1
 };
 
-- 
2.39.5