Update.

	* tests-mbwc/dat_iswctype.c: Full width 9 is not a digit in ja_JP.
	* tests-mbwc/dat_iswdigit.c: Likewise.

	Add full width digits to alnum class.

4 files changed, 67 insertions, 2 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 296a5ba330..57420fff2b 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,7 +1,11 @@
 2000-10-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* tests-mbwc/dat_iswctype.c: Full width 9 is not a digit in ja_JP.
+	* tests-mbwc/dat_iswdigit.c: Likewise.
+
 	* locales/zh_CN: Remove non-ASCII digit entry.
 	* locales/ja_JP: Likewise.
+	Add full width digits to alnum class.
 
 2000-09-30  Bruno Haible  <haible@clisp.cons.org>
 
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index 826247f490..73ae29075b 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -154,6 +154,67 @@ alpha	<U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;/
 	<U016B>;<U0173>;<U016F>;<U0169>;<U01D8>;<U01DC>;<U01DA>;<U01D6>;/
 	<U0175>;<U00FD>;<U00FF>;<U0177>;<U017A>;<U017E>;<U017C>
 
+alnum	<U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;/
+	<U0049>;<U004A>;<U004B>;<U004C>;<U004D>;<U004E>;<U004F>;<U0050>;/
+	<U0051>;<U0052>;<U0053>;<U0054>;<U0055>;<U0056>;<U0057>;<U0058>;/
+	<U0059>;<U005A>;<UFF21>;<UFF22>;<UFF23>;<UFF24>;<UFF25>;<UFF26>;/
+	<UFF27>;<UFF28>;<UFF29>;<UFF2A>;<UFF2B>;<UFF2C>;<UFF2D>;<UFF2E>;/
+	<UFF2F>;<UFF30>;<UFF31>;<UFF32>;<UFF33>;<UFF34>;<UFF35>;<UFF36>;/
+	<UFF37>;<UFF38>;<UFF39>;<UFF3A>;<U0391>;<U0392>;<U0393>;<U0394>;/
+	<U0395>;<U0396>;<U0397>;<U0398>;<U0399>;<U039A>;<U039B>;<U039C>;/
+	<U039D>;<U039E>;<U039F>;<U03A0>;<U03A1>;<U03A3>;<U03A4>;<U03A5>;/
+	<U03A6>;<U03A7>;<U03A8>;<U03A9>;<U0410>;<U0411>;<U0412>;<U0413>;/
+	<U0414>;<U0415>;<U0401>;<U0416>;<U0417>;<U0418>;<U0419>;<U041A>;/
+	<U041B>;<U041C>;<U041D>;<U041E>;<U041F>;<U0420>;<U0421>;<U0422>;/
+	<U0423>;<U0424>;<U0425>;<U0426>;<U0427>;<U0428>;<U0429>;<U042A>;/
+	<U042B>;<U042C>;<U042D>;<U042E>;<U042F>;<U0061>;<U0062>;<U0063>;/
+	<U0064>;<U0065>;<U0066>;<U0067>;<U0068>;<U0069>;<U006A>;<U006B>;/
+	<U006C>;<U006D>;<U006E>;<U006F>;<U0070>;<U0071>;<U0072>;<U0073>;/
+	<U0074>;<U0075>;<U0076>;<U0077>;<U0078>;<U0079>;<U007A>;<UFF41>;/
+	<UFF42>;<UFF43>;<UFF44>;<UFF45>;<UFF46>;<UFF47>;<UFF48>;<UFF49>;/
+	<UFF4A>;<UFF4B>;<UFF4C>;<UFF4D>;<UFF4E>;<UFF4F>;<UFF50>;<UFF51>;/
+	<UFF52>;<UFF53>;<UFF54>;<UFF55>;<UFF56>;<UFF57>;<UFF58>;<UFF59>;/
+	<UFF5A>;<U03B1>;<U03B2>;<U03B3>;<U03B4>;<U03B5>;<U03B6>;<U03B7>;/
+	<U03B8>;<U03B9>;<U03BA>;<U03BB>;<U03BC>;<U03BD>;<U03BE>;<U03BF>;/
+	<U03C0>;<U03C1>;<U03C3>;<U03C4>;<U03C5>;<U03C6>;<U03C7>;<U03C8>;/
+	<U03C9>;<U0430>;<U0431>;<U0432>;<U0433>;<U0434>;<U0435>;<U0451>;/
+	<U0436>;<U0437>;<U0438>;<U0439>;<U043A>;<U043B>;<U043C>;<U043D>;/
+	<U043E>;<U043F>;<U0440>;<U0441>;<U0442>;<U0443>;<U0444>;<U0445>;/
+	<U0446>;<U0447>;<U0448>;<U0449>;<U044A>;<U044B>;<U044C>;<U044D>;/
+	<U044E>;<U044F>;<U0386>;<U0388>;<U0389>;<U038A>;<U03AA>;<U038C>;/
+	<U038E>;<U03AB>;<U038F>;<U0402>;<U0403>;<U0404>;<U0405>;<U0406>;/
+	<U0407>;<U0408>;<U0409>;<U040A>;<U040B>;<U040C>;<U040E>;<U040F>;/
+	<U00C6>;<U0110>;<U0126>;<U0132>;<U0141>;<U013F>;<U014A>;<U00D8>;/
+	<U0152>;<U0166>;<U00DE>;<U00C1>;<U00C0>;<U00C4>;<U00C2>;<U0102>;/
+	<U01CD>;<U0100>;<U0104>;<U00C5>;<U00C3>;<U0106>;<U0108>;<U010C>;/
+	<U00C7>;<U010A>;<U010E>;<U00C9>;<U00C8>;<U00CB>;<U00CA>;<U011A>;/
+	<U0116>;<U0112>;<U0118>;<U011C>;<U011E>;<U0122>;<U0120>;<U0124>;/
+	<U00CD>;<U00CC>;<U00CF>;<U00CE>;<U01CF>;<U0130>;<U012A>;<U012E>;/
+	<U0128>;<U0134>;<U0136>;<U0139>;<U013D>;<U013B>;<U0143>;<U0147>;/
+	<U0145>;<U00D1>;<U00D3>;<U00D2>;<U00D6>;<U00D4>;<U01D1>;<U0150>;/
+	<U014C>;<U00D5>;<U0154>;<U0158>;<U0156>;<U015A>;<U015C>;<U0160>;/
+	<U015E>;<U0164>;<U0162>;<U00DA>;<U00D9>;<U00DC>;<U00DB>;<U016C>;/
+	<U01D3>;<U0170>;<U016A>;<U0172>;<U016E>;<U0168>;<U01D7>;<U01DB>;/
+	<U01D9>;<U01D5>;<U0174>;<U00DD>;<U0178>;<U0176>;<U0179>;<U017D>;/
+	<U017B>;<U03AC>;<U03AD>;<U03AE>;<U03AF>;<U03CA>;<U0390>;<U03CC>;/
+	<U03C2>;<U03CD>;<U03CB>;<U03B0>;<U03CE>;<U0452>;<U0453>;<U0454>;/
+	<U0455>;<U0456>;<U0457>;<U0458>;<U0459>;<U045A>;<U045B>;<U045C>;/
+	<U045E>;<U045F>;<U00E6>;<U0111>;<U00F0>;<U0127>;<U0131>;<U0133>;/
+	<U0138>;<U0142>;<U0140>;<U0149>;<U014B>;<U00F8>;<U0153>;<U00DF>;/
+	<U0167>;<U00FE>;<U00E1>;<U00E0>;<U00E4>;<U00E2>;<U0103>;<U01CE>;/
+	<U0101>;<U0105>;<U00E5>;<U00E3>;<U0107>;<U0109>;<U010D>;<U00E7>;/
+	<U010B>;<U010F>;<U00E9>;<U00E8>;<U00EB>;<U00EA>;<U011B>;<U0117>;/
+	<U0113>;<U0119>;<U01F5>;<U011D>;<U011F>;<U0121>;<U0125>;<U00ED>;/
+	<U00EC>;<U00EF>;<U00EE>;<U01D0>;<U012B>;<U012F>;<U0129>;<U0135>;/
+	<U0137>;<U013A>;<U013E>;<U013C>;<U0144>;<U0148>;<U0146>;<U00F1>;/
+	<U00F3>;<U00F2>;<U00F6>;<U00F4>;<U01D2>;<U0151>;<U014D>;<U00F5>;/
+	<U0155>;<U0159>;<U0157>;<U015B>;<U015D>;<U0161>;<U015F>;<U0165>;/
+	<U0163>;<U00FA>;<U00F9>;<U00FC>;<U00FB>;<U016D>;<U01D4>;<U0171>;/
+	<U016B>;<U0173>;<U016F>;<U0169>;<U01D8>;<U01DC>;<U01DA>;<U01D6>;/
+	<U0175>;<U00FD>;<U00FF>;<U0177>;<U017A>;<U017E>;<U017C>;/
+	<UFF10>;<UFF11>;<UFF12>;<UFF13>;<UFF14>;/
+	<UFF15>;<UFF16>;<UFF17>;<UFF18>;<UFF19>
+
 digit	<U0030>;<U0031>;<U0032>;<U0033>;<U0034>;/
 	<U0035>;<U0036>;<U0037>;<U0038>;<U0039>
 
diff --git a/localedata/tests-mbwc/dat_iswctype.c b/localedata/tests-mbwc/dat_iswctype.c
index 644cbbc273..88b568b388 100644
--- a/localedata/tests-mbwc/dat_iswctype.c
+++ b/localedata/tests-mbwc/dat_iswctype.c
@@ -411,7 +411,7 @@ TST_ISWCTYPE tst_iswctype_loc [] = {
       {	 { 0x32CB, "digit"  }, { 0,1,0 }  },	   /* IDEO.TEL.SYM.DEC12 */
       /* 21: */
       {	 { 0x33FE, "digit"  }, { 0,1,0 }  },	   /* CJK IDEO.TEL.31th	 */
-      {	 { 0xFF19, "digit"  }, { 0,0,0 }  },	   /* FULL 9		 */
+      {	 { 0xFF19, "digit"  }, { 0,1,0 }  },	   /* FULL 9		 */
       {	 { 0x3000, "graph"  }, { 0,1,0 }  },	   /* IDEO. SPACE	 */
       {	 { 0x3020, "graph"  }, { 0,1,0 }  },	   /* POSTAL MARK FACE	 */
       {	 { 0x3029, "graph"  }, { 0,1,0 }  },	   /* Hangzhou NUM9	 */
diff --git a/localedata/tests-mbwc/dat_iswdigit.c b/localedata/tests-mbwc/dat_iswdigit.c
index de63a8d155..6cece4f8c9 100644
--- a/localedata/tests-mbwc/dat_iswdigit.c
+++ b/localedata/tests-mbwc/dat_iswdigit.c
@@ -101,7 +101,7 @@ TST_ISW_LOC (DIGIT, digit) = {
 	{  { 0x9FA5 }, { 0,1,0 }  },	/* CJK UNI.IDEO.      */
 	{  { 0xFE4F }, { 0,1,0 }  },	/* CJK UNI.IDEO.      */
 	{  { 0xFF0F }, { 0,1,0 }  },	/* FULL SLASH	      */
-	{  { 0xFF19 }, { 0,0,0 }  },	/* FULL 9	      */
+	{  { 0xFF19 }, { 0,1,0 }  },	/* FULL 9	      */
 	{  { 0xFF20 }, { 0,1,0 }  },	/* FULL @	      */
 	{  { 0xFF3A }, { 0,1,0 }  },	/* FULL Z	      */
 	{  { 0xFF40 }, { 0,1,0 }  },	/* FULL GRAVE ACC.    */