Standard correction and a multibye condition addition.

diff --git a/multibyte.c b/multibyte.c
index 997e3365fc5af7d98bb13a0bffc7d8e580397671..5854d5764f032185e1dc97ab9a2de3e9e9e0d932 100644 (file)
--- 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 55e6c175feb818ff396e21fcdd34586281c25193..937d5bf5ff67e06566cdaac617e4e575fc2af25c 100644 (file)
--- 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
 };