Update.

	* crypt/md5-crypt.c (__md5_crypt_r): Clear arrays the key and salt
	string got copied in.
	Patch by Solar Designer <solar@false.com>.

2000-07-05  Andreas Jaeger  <aj@suse.de>

	* manual/install.texi (Installation): Update information about
	add-ons.
	(Configuring and compiling): Update for glibc 2.2.

2000-07-04  Andreas Jaeger  <aj@suse.de>

	* sysdeps/i386/fpu_control.h (_FPU_DEFAULT): Correct value.
	(_FPU_IEEE): Likewise.

	* math/Makefile (tests): Add test-fpucw.

	* math/test-fpucw.c (main): New file.

2000-07-05  Ulrich Drepper  <drepper@redhat.com>

36 files changed, 386 insertions, 276 deletions

diff --git a/ChangeLog b/ChangeLog
index 32d4633..c844d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2000-07-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* crypt/md5-crypt.c (__md5_crypt_r): Clear arrays the key and salt
+	string got copied in.
+	Patch by Solar Designer <solar@false.com>.
+
+2000-07-05  Andreas Jaeger  <aj@suse.de>
+
+	* manual/install.texi (Installation): Update information about
+	add-ons.
+	(Configuring and compiling): Update for glibc 2.2.
+
+2000-07-04  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/i386/fpu_control.h (_FPU_DEFAULT): Correct value.
+	(_FPU_IEEE): Likewise.
+
+	* math/Makefile (tests): Add test-fpucw.
+
+	* math/test-fpucw.c (main): New file.
+
+2000-07-05  Ulrich Drepper  <drepper@redhat.com>
+
 	* locale/loadlocale.c (_nl_unload_locale): Add cast to avoid warning.
 
 	* locale/programs/ld-collate.c (collate_output): Also write out the
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
index 3b20ed1..6340502 100644
--- a/crypt/md5-crypt.c
+++ b/crypt/md5-crypt.c
@@ -60,6 +60,8 @@ __md5_crypt_r (key, salt, buffer, buflen)
   size_t key_len;
   size_t cnt;
   char *cp;
+  int key_copied = 0;
+  int salt_copied = 0;
 
   /* Find beginning of salt string.  The prefix should normally always
      be present.  Just in case it is not.  */
@@ -77,6 +79,7 @@ __md5_crypt_r (key, salt, buffer, buflen)
 		    - (tmp - (char *) 0) % __alignof__ (md5_uint32),
 		    key, key_len);
       assert ((key - (char *) 0) % __alignof__ (md5_uint32) == 0);
+      key_copied = 1;
     }
 
   if ((salt - (char *) 0) % __alignof__ (md5_uint32) != 0)
@@ -86,6 +89,7 @@ __md5_crypt_r (key, salt, buffer, buflen)
 		     - (tmp - (char *) 0) % __alignof__ (md5_uint32),
 		     salt, salt_len);
       assert ((salt - (char *) 0) % __alignof__ (md5_uint32) == 0);
+      salt_copied = 1;
     }
 
   /* Prepare for the real work.  */
@@ -215,8 +219,16 @@ __md5_crypt_r (key, salt, buffer, buflen)
 
   /* Clear the buffer for the intermediate result so that people
      attaching to processes or reading core dumps cannot get any
-     information.  */
-  memset (alt_result, '\0', sizeof (alt_result));
+     information.  We do it in this way to clear correct_words[]
+     inside the MD5 implementation as well.  */
+  __md5_init_ctx (&ctx);
+  __md5_finish_ctx (&ctx, alt_result);
+  memset (&ctx, '\0', sizeof (ctx));
+  memset (&alt_ctx, '\0', sizeof (alt_ctx));
+  if (key_copied)
+    memset (key, '\0', key_len);
+  if (salt_copied)
+    memset (salt, '\0', salt_len);
 
   return buffer;
 }
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0ce505a..a6bafc9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,41 @@
+2000-07-05  NIIBE Yutaka  <gniibe@chroot.org>
+
+	* locales/th_TH: Update revision information.
+	(LC_CTYPE: alpha): Replace ";...;" with "..".
+	(LC_COLLATE: order): Quote with "".
+
+2000-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* locales/en_GR (LC_IDENTIFICATION): Don't use iso8859-1 characters
+	in address.
+	* locales/hu_HU (LC_IDENTIFICATION): Likewise.
+	* locales/ro_RO (LC_IDENTIFICATION): Likewise.
+	* locales/ru_RU (LC_IDENTIFICATION): Likewise.
+	* locales/es_AR (LC_IDENTIFICATION): Fix address of RAP.
+	* locales/es_BO (LC_IDENTIFICATION): Likewise.
+	* locales/es_CL (LC_IDENTIFICATION): Likewise.
+	* locales/es_CO (LC_IDENTIFICATION): Likewise.
+	* locales/es_DO (LC_IDENTIFICATION): Likewise.
+	* locales/es_EC (LC_IDENTIFICATION): Likewise.
+	* locales/es_ES (LC_IDENTIFICATION): Likewise.
+	* locales/es_GT (LC_IDENTIFICATION): Likewise.
+	* locales/es_HN (LC_IDENTIFICATION): Likewise.
+	* locales/es_MX (LC_IDENTIFICATION): Likewise.
+	* locales/es_PA (LC_IDENTIFICATION): Likewise.
+	* locales/es_PE (LC_IDENTIFICATION): Likewise.
+	* locales/es_PY (LC_IDENTIFICATION): Likewise.
+	* locales/es_SV (LC_IDENTIFICATION): Likewise.
+	* locales/es_US (LC_IDENTIFICATION): Likewise.
+	* locales/es_UY (LC_IDENTIFICATION): Likewise.
+	* locales/es_VE (LC_IDENTIFICATION): Likewise.
+	* locales/fr_CA (LC_IDENTIFICATION): Likewise.
+	* locales/tr_TR (LC_IDENTIFICATION): Likewise.
+	* locales/no_NO (LC_TELEPHONE): Fill in.
+	* locales/pt_PT (LC_TELEPHONE): Fill in.
+	* locales/sv_SE (LC_TELEPHONE): Fill in.
+	* locales/en_GB (LC_TELEPHONE): Fill in.
+	* locales/cs_CZ (LC_TELEPHONE): Fill in.
+
 2000-07-04  Ulrich Drepper  <drepper@redhat.com>
 
 	* tst-fmon.sh (LC_ALL): Define to C for localedef run.
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 05e4ba4..18f3a0f 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2456,7 +2456,7 @@ END LC_PAPER
 LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
-tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
+tel_dom_fmt    "<U0028><U0030><U0025><U0061><U0029><U0020><U0025><U006C>"
 int_select     "<U0030><U0030>"
 int_prefix     "<U0034><U0032><U0030>"
 END LC_TELEPHONE
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index c2da377..2ca321e 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -22,7 +22,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Greek locale for Greece"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt Jorgens Alle 8, DK-1615 Kobenhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 39a4b0f..4089345 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -130,6 +130,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
+int_select     "<U0030><U0030>"
 int_prefix     "<U0034><U0034>"
 END LC_TELEPHONE
 
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 455bde8..4dcfd8b 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Argentina"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 228b643..e08a73f 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Bolivia"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 2aefc14..f0d795e 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Chile"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 79a09d2..a6e91be 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Colombia"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index 85ea6a5..4fda017 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Dominican Republic"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index ae06a9b..16fba0d 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Equador"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 70241b2..ea3b162 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Spain"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index 45a0f75..320d223 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Guatemala"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 9d73b35..4731f55 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Honduras"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 9830cec..18a6265 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Mexico"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index cc3d6d0..19236d2 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Panama"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index cf8face..d57ed36 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Peru"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index de21e2e..1af0e73 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Paraguay"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index eff14d3..bce7039 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for El Salvador"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 990572b..f3bc70b 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for the USA"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index 1e2650d..40cb536 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Uruguay"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index 108aa3b..a9bc4da 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Venezuela"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 4256cd7..2641ffc 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -22,7 +22,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for Canada"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index d5d8c8f..29ed604 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Hungarian locale for Hungary"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt Jorgens Alle 8, DK-1615 Kobenhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/no_NO b/localedata/locales/no_NO
index baf6198..a38c838 100644
--- a/localedata/locales/no_NO
+++ b/localedata/locales/no_NO
@@ -2193,19 +2193,18 @@ noexpr      "<U005E><U005B><U004E><U006E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_PAPER
-% FIXME
 height   297
-% FIXME
 width    210
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U006C>"
+tel_dom_fmt    "<U0025><U006C>"
+int_select     "<U0030><U0030>"
+int_prefix     "<U0034><U0037>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index 48940af..fbb85e6 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -121,19 +121,18 @@ t_fmt_ampm ""
 END LC_TIME
 
 LC_PAPER
-% FIXME
 height   297
-% FIXME
 width    210
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U006C>"
+tel_dom_fmt    "<U0025><U006C>"
+int_select     "<U0030><U0030>"
+int_prefix     "<U0033><U0035><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 8b8dd16..bb5bc49 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Romanian locale for Romania"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt Jorgens Alle 8, DK-1615 Kobenhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 75eaa7b..fec6585 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -23,7 +23,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Russian locale for Russia"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt Jorgens Alle 8, DK-1615 Kobenhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index 4291650..7ed9fa0 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -2192,19 +2192,19 @@ noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_PAPER
-% FIXME
 height   297
-% FIXME
 width    210
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+tel_int_fmt    "<U002B><U0025><U0063><U002D><U0025><U0061><U002D><U0025>/
 <U006C>"
+tel_dom_fmt    "<U0030><U0025><U0061><U002D><U0025><U006C>"
+int_select     "<U0030><U0030>"
+int_prefix     "<U0034><U0036>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index 41ed0d1..1147838 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -16,9 +16,9 @@ comment_char %
 % E-mail:    thep@links.nectec.or.th
 % Language:  Thai
 % Territory: Thailand
-% Charset:   TIS-620:1990
-% Revision:  0.5.2
-% Date:      1995-04-02
+% Charset:   TIS-620.2533:1990
+% Revision:  0.5.3
+% Date:      1999-05-28
 %
 
 %
@@ -88,8 +88,8 @@ alpha   <U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;<U0049>;
         <U004E>;<U004F>;<U0050>;<U0051>;<U0052>;<U0053>;<U0054>;<U0055>;<U0056>;<U0057>;<U0058>;<U0059>;<U005A>;/
         <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>;/
-        <U0E01>;...;<U0E2E>;<U0E30>;...;<U0E39>;<U0E40>;...;<U0E44>;/
-        <U0E45>;<U0E47>;<U0E48>;...;<U0E4B>;<U0E4C>
+        <U0E01>..<U0E2E>;<U0E30>..<U0E39>;<U0E40>..<U0E44>;/
+        <U0E45>;<U0E47>;<U0E48>..<U0E4B>;<U0E4C>
 
 %
 % digit = Arabic digits  + Thai digits
@@ -97,7 +97,7 @@ alpha   <U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;<U0049>;
 digit   <U0030>;<U0031>;<U0032>;<U0033>;<U0034>;/
         <U0035>;<U0036>;<U0037>;<U0038>;<U0039>
 % The Thai digits
-%       <U0E50>;...;<U0E59>
+%       <U0E50>..<U0E59>
 % cannot be listed here.  In glibc 2.2 they'll be in indigits and
 % possibly outdigits.
 
@@ -606,316 +606,316 @@ UNDEFINED      IGNORE;IGNORE;IGNORE;IGNORE
 % Thai consonants, with leading vowels rearrangement
 %
 <U0E01>        <U0E01>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KO KAI
-<ko-kai-e>           <U0E01><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ae>          <U0E01><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-o>           <U0E01><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ai-maimuan>  <U0E01><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ai-maimalai> <U0E01><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<ko-kai-e>           "<U0E01><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<ko-kai-ae>          "<U0E01><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<ko-kai-o>           "<U0E01><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<ko-kai-ai-maimuan>  "<U0E01><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<ko-kai-ai-maimalai> "<U0E01><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E02>        <U0E02>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHAI
-<kho-khai-e>           <U0E02><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ae>          <U0E02><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-o>           <U0E02><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ai-maimuan>  <U0E02><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ai-maimalai> <U0E02><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<kho-khai-e>           "<U0E02><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<kho-khai-ae>          "<U0E02><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<kho-khai-o>           "<U0E02><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<kho-khai-ai-maimuan>  "<U0E02><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<kho-khai-ai-maimalai> "<U0E02><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E03>        <U0E03>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHUAT
-<kho-khuat-e>           <U0E03><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ae>          <U0E03><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-o>           <U0E03><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ai-maimuan>  <U0E03><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ai-maimalai> <U0E03><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-e>           "<U0E03><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-ae>          "<U0E03><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-o>           "<U0E03><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-ai-maimuan>  "<U0E03><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-ai-maimalai> "<U0E03><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E04>        <U0E04>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHWAI
-<kho-khwai-e>           <U0E04><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ae>          <U0E04><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-o>           <U0E04><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ai-maimuan>  <U0E04><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ai-maimalai> <U0E04><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-e>           "<U0E04><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-ae>          "<U0E04><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-o>           "<U0E04><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-ai-maimuan>  "<U0E04><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-ai-maimalai> "<U0E04><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E05>        <U0E05>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHON
-<kho-khon-e>           <U0E05><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ae>          <U0E05><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-o>           <U0E05><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ai-maimuan>  <U0E05><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ai-maimalai> <U0E05><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<kho-khon-e>           "<U0E05><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<kho-khon-ae>          "<U0E05><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<kho-khon-o>           "<U0E05><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<kho-khon-ai-maimuan>  "<U0E05><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<kho-khon-ai-maimalai> "<U0E05><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E06>        <U0E06>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO RAKHANG
-<kho-rakhang-e>           <U0E06><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ae>          <U0E06><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-o>           <U0E06><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ai-maimuan>  <U0E06><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ai-maimalai> <U0E06><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-e>           "<U0E06><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-ae>          "<U0E06><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-o>           "<U0E06><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-ai-maimuan>  "<U0E06><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-ai-maimalai> "<U0E06><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E07>        <U0E07>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NGO NGU
-<ngo-ngu-e>           <U0E07><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ae>          <U0E07><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-o>           <U0E07><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ai-maimuan>  <U0E07><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ai-maimalai> <U0E07><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-e>           "<U0E07><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-ae>          "<U0E07><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-o>           "<U0E07><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-ai-maimuan>  "<U0E07><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-ai-maimalai> "<U0E07><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E08>        <U0E08>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHAN
-<cho-chan-e>           <U0E08><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ae>          <U0E08><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-o>           <U0E08><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ai-maimuan>  <U0E08><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ai-maimalai> <U0E08><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<cho-chan-e>           "<U0E08><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<cho-chan-ae>          "<U0E08><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<cho-chan-o>           "<U0E08><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<cho-chan-ai-maimuan>  "<U0E08><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<cho-chan-ai-maimalai> "<U0E08><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E09>        <U0E09>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHING
-<cho-ching-e>           <U0E09><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ae>          <U0E09><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-o>           <U0E09><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ai-maimuan>  <U0E09><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ai-maimalai> <U0E09><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<cho-ching-e>           "<U0E09><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<cho-ching-ae>          "<U0E09><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<cho-ching-o>           "<U0E09><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<cho-ching-ai-maimuan>  "<U0E09><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<cho-ching-ai-maimalai> "<U0E09><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0A>        <U0E0A>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHANG
-<cho-chang-e>           <U0E0A><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ae>          <U0E0A><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-o>           <U0E0A><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ai-maimuan>  <U0E0A><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ai-maimalai> <U0E0A><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<cho-chang-e>           "<U0E0A><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<cho-chang-ae>          "<U0E0A><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<cho-chang-o>           "<U0E0A><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<cho-chang-ai-maimuan>  "<U0E0A><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<cho-chang-ai-maimalai> "<U0E0A><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0B>        <U0E0B>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SO
-<so-so-e>           <U0E0B><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ae>          <U0E0B><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<so-so-o>           <U0E0B><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ai-maimuan>  <U0E0B><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ai-maimalai> <U0E0B><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<so-so-e>           "<U0E0B><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<so-so-ae>          "<U0E0B><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<so-so-o>           "<U0E0B><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<so-so-ai-maimuan>  "<U0E0B><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<so-so-ai-maimalai> "<U0E0B><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0C>        <U0E0C>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHOE
-<cho-choe-e>           <U0E0C><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ae>          <U0E0C><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-o>           <U0E0C><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ai-maimuan>  <U0E0C><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ai-maimalai> <U0E0C><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<cho-choe-e>           "<U0E0C><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<cho-choe-ae>          "<U0E0C><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<cho-choe-o>           "<U0E0C><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<cho-choe-ai-maimuan>  "<U0E0C><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<cho-choe-ai-maimalai> "<U0E0C><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0D>        <U0E0D>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER YO YING
-<yo-ying-e>           <U0E0D><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ae>          <U0E0D><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-o>           <U0E0D><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ai-maimuan>  <U0E0D><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ai-maimalai> <U0E0D><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<yo-ying-e>           "<U0E0D><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<yo-ying-ae>          "<U0E0D><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<yo-ying-o>           "<U0E0D><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<yo-ying-ai-maimuan>  "<U0E0D><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<yo-ying-ai-maimalai> "<U0E0D><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0E>        <U0E0E>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER DO CHADA
-<do-chada-e>           <U0E0E><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ae>          <U0E0E><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-o>           <U0E0E><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ai-maimuan>  <U0E0E><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ai-maimalai> <U0E0E><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<do-chada-e>           "<U0E0E><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<do-chada-ae>          "<U0E0E><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<do-chada-o>           "<U0E0E><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<do-chada-ai-maimuan>  "<U0E0E><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<do-chada-ai-maimalai> "<U0E0E><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E0F>        <U0E0F>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER TO PATAK
-<to-patak-e>           <U0E0F><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ae>          <U0E0F><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-o>           <U0E0F><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ai-maimuan>  <U0E0F><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ai-maimalai> <U0E0F><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<to-patak-e>           "<U0E0F><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<to-patak-ae>          "<U0E0F><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<to-patak-o>           "<U0E0F><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<to-patak-ai-maimuan>  "<U0E0F><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<to-patak-ai-maimalai> "<U0E0F><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E10>        <U0E10>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THAN
-<tho-than-e>           <U0E10><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ae>          <U0E10><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-o>           <U0E10><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ai-maimuan>  <U0E10><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ai-maimalai> <U0E10><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-than-e>           "<U0E10><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-than-ae>          "<U0E10><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-than-o>           "<U0E10><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-than-ai-maimuan>  "<U0E10><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-than-ai-maimalai> "<U0E10><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E11>        <U0E11>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO NANGMONTHO
-<tho-nangmontho-e>           <U0E11><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ae>          <U0E11><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-o>           <U0E11><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ai-maimuan>  <U0E11><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ai-maimalai> <U0E11><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-e>           "<U0E11><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-ae>          "<U0E11><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-o>           "<U0E11><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-ai-maimuan>  "<U0E11><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-ai-maimalai> "<U0E11><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E12>        <U0E12>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO PHUTHAO
-<tho-phuthao-e>           <U0E12><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ae>          <U0E12><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-o>           <U0E12><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ai-maimuan>  <U0E12><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ai-maimalai> <U0E12><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-e>           "<U0E12><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-ae>          "<U0E12><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-o>           "<U0E12><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-ai-maimuan>  "<U0E12><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-ai-maimalai> "<U0E12><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E13>        <U0E13>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NO NEN
-<no-nen-e>           <U0E13><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ae>          <U0E13><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-o>           <U0E13><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ai-maimuan>  <U0E13><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ai-maimalai> <U0E13><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<no-nen-e>           "<U0E13><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<no-nen-ae>          "<U0E13><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<no-nen-o>           "<U0E13><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<no-nen-ai-maimuan>  "<U0E13><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<no-nen-ai-maimalai> "<U0E13><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E14>        <U0E14>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER DO DEK
-<do-dek-e>           <U0E14><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ae>          <U0E14><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-o>           <U0E14><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ai-maimuan>  <U0E14><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ai-maimalai> <U0E14><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<do-dek-e>           "<U0E14><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<do-dek-ae>          "<U0E14><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<do-dek-o>           "<U0E14><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<do-dek-ai-maimuan>  "<U0E14><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<do-dek-ai-maimalai> "<U0E14><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E15>        <U0E15>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER TO TAO
-<to-tao-e>           <U0E15><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ae>          <U0E15><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-o>           <U0E15><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ai-maimuan>  <U0E15><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ai-maimalai> <U0E15><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<to-tao-e>           "<U0E15><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<to-tao-ae>          "<U0E15><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<to-tao-o>           "<U0E15><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<to-tao-ai-maimuan>  "<U0E15><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<to-tao-ai-maimalai> "<U0E15><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E16>        <U0E16>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THUNG
-<tho-thung-e>           <U0E16><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ae>          <U0E16><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-o>           <U0E16><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ai-maimuan>  <U0E16><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ai-maimalai> <U0E16><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-thung-e>           "<U0E16><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-thung-ae>          "<U0E16><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-thung-o>           "<U0E16><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-thung-ai-maimuan>  "<U0E16><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-thung-ai-maimalai> "<U0E16><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E17>        <U0E17>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THAHAN
-<tho-thahan-e>           <U0E17><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ae>          <U0E17><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-o>           <U0E17><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ai-maimuan>  <U0E17><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ai-maimalai> <U0E17><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-e>           "<U0E17><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-ae>          "<U0E17><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-o>           "<U0E17><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-ai-maimuan>  "<U0E17><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-ai-maimalai> "<U0E17><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E18>        <U0E18>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THONG
-<tho-thong-e>           <U0E18><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ae>          <U0E18><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-o>           <U0E18><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ai-maimuan>  <U0E18><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ai-maimalai> <U0E18><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<tho-thong-e>           "<U0E18><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<tho-thong-ae>          "<U0E18><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<tho-thong-o>           "<U0E18><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<tho-thong-ai-maimuan>  "<U0E18><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<tho-thong-ai-maimalai> "<U0E18><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E19>        <U0E19>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NO NU
-<no-nu-e>           <U0E19><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ae>          <U0E19><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-o>           <U0E19><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ai-maimuan>  <U0E19><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ai-maimalai> <U0E19><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<no-nu-e>           "<U0E19><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<no-nu-ae>          "<U0E19><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<no-nu-o>           "<U0E19><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<no-nu-ai-maimuan>  "<U0E19><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<no-nu-ai-maimalai> "<U0E19><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1A>        <U0E1A>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER BO BAIMAI
-<bo-baimai-e>           <U0E1A><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ae>          <U0E1A><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-o>           <U0E1A><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ai-maimuan>  <U0E1A><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ai-maimalai> <U0E1A><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-e>           "<U0E1A><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-ae>          "<U0E1A><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-o>           "<U0E1A><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-ai-maimuan>  "<U0E1A><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-ai-maimalai> "<U0E1A><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1B>        <U0E1B>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PO PLA
-<po-pla-e>           <U0E1B><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ae>          <U0E1B><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-o>           <U0E1B><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ai-maimuan>  <U0E1B><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ai-maimalai> <U0E1B><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<po-pla-e>           "<U0E1B><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<po-pla-ae>          "<U0E1B><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<po-pla-o>           "<U0E1B><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<po-pla-ai-maimuan>  "<U0E1B><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<po-pla-ai-maimalai> "<U0E1B><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1C>        <U0E1C>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO PHUNG
-<pho-phung-e>           <U0E1C><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ae>          <U0E1C><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-o>           <U0E1C><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ai-maimuan>  <U0E1C><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ai-maimalai> <U0E1C><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<pho-phung-e>           "<U0E1C><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<pho-phung-ae>          "<U0E1C><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<pho-phung-o>           "<U0E1C><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<pho-phung-ai-maimuan>  "<U0E1C><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<pho-phung-ai-maimalai> "<U0E1C><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1D>        <U0E1D>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER FO FA
-<fo-fa-e>           <U0E1D><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ae>          <U0E1D><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-o>           <U0E1D><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ai-maimuan>  <U0E1D><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ai-maimalai> <U0E1D><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<fo-fa-e>           "<U0E1D><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<fo-fa-ae>          "<U0E1D><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<fo-fa-o>           "<U0E1D><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<fo-fa-ai-maimuan>  "<U0E1D><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<fo-fa-ai-maimalai> "<U0E1D><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1E>        <U0E1E>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO PHAN
-<pho-phan-e>           <U0E1E><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ae>          <U0E1E><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-o>           <U0E1E><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ai-maimuan>  <U0E1E><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ai-maimalai> <U0E1E><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<pho-phan-e>           "<U0E1E><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<pho-phan-ae>          "<U0E1E><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<pho-phan-o>           "<U0E1E><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<pho-phan-ai-maimuan>  "<U0E1E><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<pho-phan-ai-maimalai> "<U0E1E><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E1F>        <U0E1F>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER FO FAN
-<fo-fan-e>           <U0E1F><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ae>          <U0E1F><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-o>           <U0E1F><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ai-maimuan>  <U0E1F><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ai-maimalai> <U0E1F><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<fo-fan-e>           "<U0E1F><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<fo-fan-ae>          "<U0E1F><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<fo-fan-o>           "<U0E1F><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<fo-fan-ai-maimuan>  "<U0E1F><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<fo-fan-ai-maimalai> "<U0E1F><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E20>        <U0E20>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO SAMPHAO
-<pho-samphao-e>           <U0E20><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ae>          <U0E20><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-o>           <U0E20><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ai-maimuan>  <U0E20><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ai-maimalai> <U0E20><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-e>           "<U0E20><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-ae>          "<U0E20><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-o>           "<U0E20><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-ai-maimuan>  "<U0E20><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-ai-maimalai> "<U0E20><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E21>        <U0E21>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER MO MA
-<mo-ma-e>           <U0E21><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ae>          <U0E21><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-o>           <U0E21><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ai-maimuan>  <U0E21><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ai-maimalai> <U0E21><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<mo-ma-e>           "<U0E21><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<mo-ma-ae>          "<U0E21><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<mo-ma-o>           "<U0E21><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<mo-ma-ai-maimuan>  "<U0E21><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<mo-ma-ai-maimalai> "<U0E21><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E22>        <U0E22>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER YO YAK
-<yo-yak-e>           <U0E22><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ae>          <U0E22><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-o>           <U0E22><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ai-maimuan>  <U0E22><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ai-maimalai> <U0E22><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<yo-yak-e>           "<U0E22><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<yo-yak-ae>          "<U0E22><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<yo-yak-o>           "<U0E22><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<yo-yak-ai-maimuan>  "<U0E22><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<yo-yak-ai-maimalai> "<U0E22><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E23>        <U0E23>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER RO RUA
-<ro-rua-e>           <U0E23><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ae>          <U0E23><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-o>           <U0E23><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ai-maimuan>  <U0E23><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ai-maimalai> <U0E23><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<ro-rua-e>           "<U0E23><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<ro-rua-ae>          "<U0E23><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<ro-rua-o>           "<U0E23><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<ro-rua-ai-maimuan>  "<U0E23><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<ro-rua-ai-maimalai> "<U0E23><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E24>        <U0E24>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER RU
 
 <U0E25>        <U0E25>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LO LING
-<lo-ling-e>           <U0E25><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ae>          <U0E25><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-o>           <U0E25><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ai-maimuan>  <U0E25><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ai-maimalai> <U0E25><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<lo-ling-e>           "<U0E25><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<lo-ling-ae>          "<U0E25><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<lo-ling-o>           "<U0E25><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<lo-ling-ai-maimuan>  "<U0E25><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<lo-ling-ai-maimalai> "<U0E25><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E26>        <U0E26>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LU
 
 <U0E27>        <U0E27>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER WO WAEN
-<wo-waen-e>           <U0E27><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ae>          <U0E27><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-o>           <U0E27><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ai-maimuan>  <U0E27><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ai-maimalai> <U0E27><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<wo-waen-e>           "<U0E27><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<wo-waen-ae>          "<U0E27><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<wo-waen-o>           "<U0E27><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<wo-waen-ai-maimuan>  "<U0E27><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<wo-waen-ai-maimalai> "<U0E27><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E28>        <U0E28>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SALA
-<so-sala-e>           <U0E28><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ae>          <U0E28><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-o>           <U0E28><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ai-maimuan>  <U0E28><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ai-maimalai> <U0E28><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<so-sala-e>           "<U0E28><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<so-sala-ae>          "<U0E28><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<so-sala-o>           "<U0E28><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<so-sala-ai-maimuan>  "<U0E28><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<so-sala-ai-maimalai> "<U0E28><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E29>        <U0E29>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO RUSI
-<so-rusi-e>           <U0E29><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ae>          <U0E29><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-o>           <U0E29><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ai-maimuan>  <U0E29><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ai-maimalai> <U0E29><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<so-rusi-e>           "<U0E29><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<so-rusi-ae>          "<U0E29><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<so-rusi-o>           "<U0E29><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<so-rusi-ai-maimuan>  "<U0E29><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<so-rusi-ai-maimalai> "<U0E29><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E2A>        <U0E2A>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SUA
-<so-sua-e>           <U0E2A><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ae>          <U0E2A><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-o>           <U0E2A><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ai-maimuan>  <U0E2A><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ai-maimalai> <U0E2A><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<so-sua-e>           "<U0E2A><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<so-sua-ae>          "<U0E2A><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<so-sua-o>           "<U0E2A><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<so-sua-ai-maimuan>  "<U0E2A><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<so-sua-ai-maimalai> "<U0E2A><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E2B>        <U0E2B>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER HO HIP
-<ho-hip-e>           <U0E2B><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ae>          <U0E2B><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-o>           <U0E2B><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ai-maimuan>  <U0E2B><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ai-maimalai> <U0E2B><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<ho-hip-e>           "<U0E2B><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<ho-hip-ae>          "<U0E2B><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<ho-hip-o>           "<U0E2B><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<ho-hip-ai-maimuan>  "<U0E2B><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<ho-hip-ai-maimalai> "<U0E2B><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E2C>        <U0E2C>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LO CHULA
-<lo-chula-e>           <U0E2C><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ae>          <U0E2C><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-o>           <U0E2C><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ai-maimuan>  <U0E2C><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ai-maimalai> <U0E2C><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<lo-chula-e>           "<U0E2C><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<lo-chula-ae>          "<U0E2C><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<lo-chula-o>           "<U0E2C><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<lo-chula-ai-maimuan>  "<U0E2C><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<lo-chula-ai-maimalai> "<U0E2C><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E2D>        <U0E2D>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER O ANG
-<o-ang-e>           <U0E2D><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ae>          <U0E2D><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-o>           <U0E2D><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ai-maimuan>  <U0E2D><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ai-maimalai> <U0E2D><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<o-ang-e>           "<U0E2D><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<o-ang-ae>          "<U0E2D><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<o-ang-o>           "<U0E2D><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<o-ang-ai-maimuan>  "<U0E2D><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<o-ang-ai-maimalai> "<U0E2D><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E2E>        <U0E2E>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER HO NOKHUK
-<ho-nokhuk-e>           <U0E2E><U0E40>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ae>          <U0E2E><U0E41>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-o>           <U0E2E><U0E42>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ai-maimuan>  <U0E2E><U0E43>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ai-maimalai> <U0E2E><U0E44>;<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-e>           "<U0E2E><U0E40>";<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-ae>          "<U0E2E><U0E41>";<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-o>           "<U0E2E><U0E42>";<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-ai-maimuan>  "<U0E2E><U0E43>";<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-ai-maimalai> "<U0E2E><U0E44>";<BLANK>;<BLANK>;<BLANK>
 
 <U0E4D> <U0E4D>;<BLANK>;<BLANK>;<BLANK>  % THAI CHARACTER NIKHAHIT
 
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index 247c079..cae0db0 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -28,7 +28,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Turkish locale for Turkey"
 source     "RAP"
-address    "Sankt Jo<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
+address    "Sankt J<U00F8>rgens Alle 8, DK-1615 K<U00F8>benhavn V, Danmark"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
diff --git a/manual/install.texi b/manual/install.texi
index dbbd2cc..9bb4e64 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -15,9 +15,9 @@ Features can be added to GNU Libc via @dfn{add-on} bundles.  These are
 separate tarfiles which you unpack into the top level of the source
 tree.  Then you give @code{configure} the @samp{--enable-add-ons} option
 to activate them, and they will be compiled into the library.  As of the
-2.1 release, two important components of glibc are distributed as
-``official'' add-ons.  Unless you are doing an unusual installation, you
-should get them both.
+2.2 release, one important component of glibc is distributed as
+``official'' add-ons: the linuxthreads add-on.  Unless you are doing an
+unusual installation, you should get this.
 
 Support for POSIX threads is maintained by someone else, so it's in a
 separate package.  It is only available for Linux systems, but this will
@@ -43,7 +43,7 @@ GNU Make, and possibly others.  @xref{Tools for Compilation}, below.
 
 GNU libc can be compiled in the source directory, but we strongly advise to
 build it in a separate build directory.  For example, if you have unpacked
-the glibc sources in @file{/src/gnu/glibc-2.1.0}, create a directory
+the glibc sources in @file{/src/gnu/glibc-2.2.0}, create a directory
 @file{/src/gnu/glibc-build} to put the object files in.  This allows
 removing the whole build directory in case an error occurs, which is the
 safest way to get a fresh start and should always be done.
@@ -52,7 +52,7 @@ From your object directory, run the shell script @file{configure} found
 at the top level of the source tree.  In the scenario above, you'd type
 
 @smallexample
-$ ../glibc-2.1.0/configure @var{args...}
+$ ../glibc-2.2.0/configure @var{args...}
 @end smallexample
 
 Please note that even if you're building in a separate build directory,
diff --git a/math/Makefile b/math/Makefile
index e545031..2c868d0 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -79,7 +79,7 @@ include ../Makeconfig
 
 # Rules for the test suite.
 tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
-	test-misc
+	test-misc test-fpucw
 # We do the `long double' tests only if this data type is available and
 # distinct from `double'.
 test-longdouble-yes = test-ldouble test-ildoubl
diff --git a/math/test-fpucw.c b/math/test-fpucw.c
new file mode 100644
index 0000000..7f46bd4
--- /dev/null
+++ b/math/test-fpucw.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fpu_control.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+#ifdef _FPU_GETCW
+/* Some architectures don't have _FPU_GETCW (e.g. Linux/Alpha).  */
+  fpu_control_t cw;
+
+  _FPU_GETCW (cw);
+
+  if (cw != _FPU_DEFAULT)
+    printf ("control word is 0x%x but should be 0x%x.\n", cw, _FPU_DEFAULT);
+
+  return (cw != _FPU_DEFAULT);
+  
+#else
+  return 0;
+#endif
+}
diff --git a/sysdeps/i386/fpu_control.h b/sysdeps/i386/fpu_control.h
index b957010..00350b9 100644
--- a/sysdeps/i386/fpu_control.h
+++ b/sysdeps/i386/fpu_control.h
@@ -1,5 +1,5 @@
 /* FPU control word bits.  i387 version.
-   Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Olaf Flebbe.
 
@@ -50,7 +50,7 @@
  * IC: Infinity control
  * That is for 8087 and 80287 only.
  *
- * The hardware default is 0x037f. I choose 0x1372.
+ * The hardware default is 0x037f which we use.
  */
 
 #include <features.h>
@@ -80,10 +80,10 @@
 /* The fdlibm code requires strict IEEE double precision arithmetic,
    and no interrupts for exceptions, rounding to nearest.  */
 
-#define _FPU_DEFAULT  0x137f
+#define _FPU_DEFAULT  0x037f
 
 /* IEEE:  same as above.  */
-#define _FPU_IEEE     0x137f
+#define _FPU_IEEE     0x037f
 
 /* Type of the control word.  */
 typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__)));