summary refs log tree commit diff
path: root/localedata/tests-mbwc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-26 00:05:52 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-26 00:05:52 +0000
commit0b95971d92a07bdc4719f41fbbb23cfc8decb2f7 (patch)
treebcea861005746afbc240e24884a73ebd4d51792e /localedata/tests-mbwc
parenta2aa7df3d6bf73cda977ee050a503a7f7a78a82d (diff)
downloadglibc-0b95971d92a07bdc4719f41fbbb23cfc8decb2f7.tar.gz
glibc-0b95971d92a07bdc4719f41fbbb23cfc8decb2f7.tar.xz
glibc-0b95971d92a07bdc4719f41fbbb23cfc8decb2f7.zip
Update.
2000-09-23  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/gbk.c (USE_PRIVATE_AREA): Define to 0.
	(__gbk_to_ucs): Conditionalize private area mappings.
	(__gbk_from_ucs4_tab9): Likewise.
	(BODY for TO_LOOP): Likewise.
	* iconvdata/testdata/GBK: Don't use characters not yet in Unicode.
	* iconvdata/testdata/GBK..UTF-8: Likewise.
	* iconvdata/tst-tables.sh: Enable GBK test.

2000-09-23  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/gbk.c (__gbk_to_ucs): Swap U+2014 and U+2015.
	(__gbk_from_ucs4_tab4): Swap entries for U+2014 and U+2015.
	(BODY for FROM_LOOP): Reject input > 0xFEA0, avoids out-of-bounds
	array access.
	* iconvdata/gbgbk.c (BODY for FROM_LOOP): Map 0xA844 to 0xA1AA.
	* iconvdata/testdata/GBK..UTF8: Swap U+2014 and U+2015.

2000-09-23  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/johab.c (final_to_ucs): Fix typos.
	(jamo_from_ucs_table): Likewise.
	(BODY for FROM_LOOP): Map 0x5c to U+20A9. Reject ranges
	0xD9E6..0xD9FE and 0xDEF2..0xDEFE.
	(BODY for TO_LOOP): Map U+20A9 to 0x5c. Don't produce values in
	the range 0xD9E6..0xD9FE.
	* iconvdata/tst-tables.sh: Enable JOHAB testing.
Diffstat (limited to 'localedata/tests-mbwc')
-rw-r--r--localedata/tests-mbwc/dat_iswctype.c12
-rw-r--r--localedata/tests-mbwc/dat_iswgraph.c4
-rw-r--r--localedata/tests-mbwc/dat_iswprint.c4
-rw-r--r--localedata/tests-mbwc/dat_iswpunct.c4
-rw-r--r--localedata/tests-mbwc/dat_wcswidth.c4
5 files changed, 28 insertions, 0 deletions
diff --git a/localedata/tests-mbwc/dat_iswctype.c b/localedata/tests-mbwc/dat_iswctype.c
index 86d0835304..644cbbc273 100644
--- a/localedata/tests-mbwc/dat_iswctype.c
+++ b/localedata/tests-mbwc/dat_iswctype.c
@@ -81,7 +81,11 @@ TST_ISWCTYPE tst_iswctype_loc [] = {
       {	 { 0x00B9, "digit"  }, { 0,1,0 }  },	   /* SUP 1    */
       {	 { 0x00BE, "digit"  }, { 0,1,0 }  },	   /* 3/4      */
       {	 { 0x009F, "graph"  }, { 0,1,0 }  },	   /* CTRL     */
+#ifdef SHOJI_IS_RIGHT
       {	 { 0x00A0, "graph"  }, { 0,1,0 }  },	   /* NB SPACE */
+#else
+      {	 { 0x00A0, "graph"  }, { 0,0,0 }  },	   /* NB SPACE */
+#endif
       {	 { 0x00A1, "graph"  }, { 0,0,0 }  },	   /* UD !     */
       {	 { 0x00B1, "graph"  }, { 0,0,0 }  },	   /* +- sign  */
       {	 { 0x00B3, "graph"  }, { 0,0,0 }  },	   /* SUP 3    */
@@ -97,7 +101,11 @@ TST_ISWCTYPE tst_iswctype_loc [] = {
       {	 { 0x00F8, "graph"  }, { 0,0,0 }  },	   /* o stroke */
       {	 { 0x00FF, "graph"  }, { 0,0,0 }  },	   /* y dia    */
       {	 { 0x009F, "print"  }, { 0,1,0 }  },	   /* CTRL     */
+#ifdef SHOJI_IS_RIGHT
       {	 { 0x00A0, "print"  }, { 0,1,0 }  },	   /* NB SPACE */
+#else
+      {	 { 0x00A0, "print"  }, { 0,0,0 }  },	   /* NB SPACE */
+#endif
       {	 { 0x00A1, "print"  }, { 0,0,0 }  },	   /* UD !     */
       {	 { 0x00B1, "print"  }, { 0,0,0 }  },	   /* +- sign  */
       {	 { 0x00B4, "print"  }, { 0,0,0 }  },	   /* ACUTE    */
@@ -112,7 +120,11 @@ TST_ISWCTYPE tst_iswctype_loc [] = {
       {	 { 0x00F8, "print"  }, { 0,0,0 }  },	   /* o stroke */
       {	 { 0x00FF, "print"  }, { 0,0,0 }  },	   /* y dia    */
       {	 { 0x009F, "punct"  }, { 0,1,0 }  },	   /* CTRL     */
+#ifdef SHOJI_IS_RIGHT
       {	 { 0x00A0, "punct"  }, { 0,1,0 }  },	   /* NB SPACE */
+#else
+      {	 { 0x00A0, "punct"  }, { 0,0,0 }  },	   /* NB SPACE */
+#endif
       {	 { 0x00A1, "punct"  }, { 0,0,0 }  },	   /* UD !     */
       {	 { 0x00B0, "punct"  }, { 0,0,0 }  },	   /* Degree   */
       {	 { 0x00B1, "punct"  }, { 0,0,0 }  },	   /* +- sign  */
diff --git a/localedata/tests-mbwc/dat_iswgraph.c b/localedata/tests-mbwc/dat_iswgraph.c
index 98583e2fd3..0ab56d273e 100644
--- a/localedata/tests-mbwc/dat_iswgraph.c
+++ b/localedata/tests-mbwc/dat_iswgraph.c
@@ -16,7 +16,11 @@ TST_ISW_LOC (GRAPH, graph) = {
       {
 	{  { 0x0080 }, { 0,1,0 }  },	/* CTRL	    */
 	{  { 0x009F }, { 0,1,0 }  },	/* CTRL	    */
+#ifdef SHOJI_IS_RIGHT
 	{  { 0x00A0 }, { 0,1,0 }  },	/* NB SPACE */
+#else
+	{  { 0x00A0 }, { 0,0,0 }  },	/* NB SPACE */
+#endif
 	{  { 0x00A1 }, { 0,0,0 }  },	/* UD !	    */
 	{  { 0x00B0 }, { 0,0,0 }  },	/* Degree   */
 	{  { 0x00B1 }, { 0,0,0 }  },	/* +- sign  */
diff --git a/localedata/tests-mbwc/dat_iswprint.c b/localedata/tests-mbwc/dat_iswprint.c
index a7cf34cffb..a574a5906b 100644
--- a/localedata/tests-mbwc/dat_iswprint.c
+++ b/localedata/tests-mbwc/dat_iswprint.c
@@ -16,7 +16,11 @@ TST_ISW_LOC (PRINT, print) = {
       {
 	{  { 0x0080 }, { 0,1,0 }  },  /* CTRL     */
 	{  { 0x009F }, { 0,1,0 }  },  /* CTRL     */
+#ifdef SHOJI_IS_RIGHT
 	{  { 0x00A0 }, { 0,1,0 }  },  /* NB SPACE */
+#else
+	{  { 0x00A0 }, { 0,0,0 }  },  /* NB SPACE */
+#endif
 	{  { 0x00A1 }, { 0,0,0 }  },  /* UD !     */
 	{  { 0x00B0 }, { 0,0,0 }  },  /* Degree   */
 	{  { 0x00B1 }, { 0,0,0 }  },  /* +- sign  */
diff --git a/localedata/tests-mbwc/dat_iswpunct.c b/localedata/tests-mbwc/dat_iswpunct.c
index 710395c717..2d17478121 100644
--- a/localedata/tests-mbwc/dat_iswpunct.c
+++ b/localedata/tests-mbwc/dat_iswpunct.c
@@ -16,7 +16,11 @@ TST_ISW_LOC (PUNCT, punct) = {
       {
 	{  { 0x0080 }, { 0,1,0 }  },	/* CTRL	    */
 	{  { 0x009F }, { 0,1,0 }  },	/* CTRL	    */
+#ifdef SHOJI_IS_RIGHT
 	{  { 0x00A0 }, { 0,1,0 }  },	/* NB SPACE */
+#else
+	{  { 0x00A0 }, { 0,0,0 }  },	/* NB SPACE */
+#endif
 	{  { 0x00A1 }, { 0,0,0 }  },	/* UD !	    */
 	{  { 0x00B0 }, { 0,0,0 }  },	/* Degree   */
 	{  { 0x00B1 }, { 0,0,0 }  },	/* +- sign  */
diff --git a/localedata/tests-mbwc/dat_wcswidth.c b/localedata/tests-mbwc/dat_wcswidth.c
index fd426ef2c1..fb66d979e5 100644
--- a/localedata/tests-mbwc/dat_wcswidth.c
+++ b/localedata/tests-mbwc/dat_wcswidth.c
@@ -56,7 +56,11 @@ TST_WCSWIDTH tst_wcswidth_loc [] = {
 	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x00A0,0x0000 },		 2 },  /* 16 */
+#ifdef SHOJI_IS_RIGHT
 	/*expect*/ { 0,1,-1				   },
+#else
+	/*expect*/ { 0,1,2				   },
+#endif
       },
       { /*input.*/ { { 0x00C1,0x00A1,0x0000 },		 2 },  /* 17 */
 	/*expect*/ { 0,1,2				   },