diff --git a/ChangeLog b/ChangeLog
index 72dbc99f23..cdec1309c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-12-19  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/bits/resource.h: Remove <asm/resource.h>
+	inclusion.
+
+1999-12-19  Andreas Jaeger  <aj@suse.de>
+
+	* include/string.h: Mark __strndup with __attribute_malloc__.
+
 1999-12-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* locale/langinfo.h: Always define CODESET.
diff --git a/include/string.h b/include/string.h
index 5256bdcfc2..6f00a894fa 100644
--- a/include/string.h
+++ b/include/string.h
@@ -14,7 +14,8 @@ extern int __strverscmp (__const char *__s1, __const char *__s2);
 extern int __strncasecmp (__const char *__s1, __const char *__s2,
 			  size_t __n);
 
-extern char *__strndup (__const char *__string, size_t __n);
+extern char *__strndup (__const char *__string, size_t __n)
+     __attribute_malloc__;
 
 extern void *__rawmemchr (__const void *__s, int __c);
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 3fb6f33f5e..b463be9eff 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,53 @@
+1999-12-19  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locales/POSIX: Fix collation order of <SI> and add a few missing
+	symbols.  Patch by Miloslav Trmac <mitr@volny.cz>.
+
+	* locales/cs_CZ: Fix syntax of collation entries with multi-character
+	weights.
+	* locales/da_DK: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_CA,2.5: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_DK.com: Likewise.
+	* locales/es_AR: Likewise.
+	* locales/es_BO: Likewise.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_DO: Likewise.
+	* locales/es_EC: Likewise.
+	* locales/es_ES: Likewise.
+	* locales/es_GT: Likewise.
+	* locales/es_HN: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_PA: Likewise.
+	* locales/es_PE: Likewise.
+	* locales/es_PY: Likewise.
+	* locales/es_SV: Likewise.
+	* locales/es_US: Likewise.
+	* locales/es_UY: Likewise.
+	* locales/es_VE: Likewise.
+	* locales/et_EE: Likewise.
+	* locales/fi_FI: Likewise.
+	* locales/fr_CA,2.13: Likewise.
+	* locales/hr_HR: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/is_IS: Likewise.
+	* locales/lt_LT: Likewise.
+	* locales/lv_LV: Likewise.
+	* locales/no_NO: Likewise.
+	* locales/pl_PL: Likewise.
+	* locales/ro_RO: Likewise.
+	* locales/ru_RU: Likewise.
+	* locales/ru_UA: Likewise.
+	* locales/sl_SI: Likewise.
+	* locales/sr_YU: Likewise.
+	* locales/sv_SE: Likewise.
+	* locales/th_TH: Likewise.
+	* locales/tr_TR: Likewise.
+	* locales/uk_UA: Likewise.
+
 1999-12-18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* charmaps/ISIRI-3342: New file.
diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX
index 7d65b351ff..0eb1216b39 100644
--- a/localedata/locales/POSIX
+++ b/localedata/locales/POSIX
@@ -94,8 +94,8 @@ order_start forward
 <vertical-tab>
 <form-feed>
 <carriage-return>
-<SI>
 <SO>
+<SI>
 <DLE>
 <DC1>
 <DC2>
@@ -134,6 +134,7 @@ order_start forward
 <three>
 <four>
 <five>
+<six>
 <seven>
 <eight>
 <nine>
@@ -199,6 +200,7 @@ order_start forward
 <u>
 <v>
 <w>
+<x>
 <y>
 <z>
 <left-curly-bracket>
@@ -206,7 +208,7 @@ order_start forward
 <right-curly-bracket>
 <tilde>
 <DEL>
-<UNDEFINED>
+UNDEFINED
 order_end
 #
 END LC_COLLATE
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 440434e904..cd15976790 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -1894,14 +1894,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index f75de50251..4629032174 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2082,14 +2082,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;<8>
 <9a>	<9>;<9a>;IGNORE;<9>
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;<l+><aM>
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;<l+><aM>
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;<l+><aH>
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;<l+><aH>
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;<l+><ah>
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;<l+><ah>
-<la->	<l+><a+>;<l+><a+->;<la-><la->;<l+><a+>
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;<l+><a+>
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";"<l+><aM>"
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";"<l+><aM>"
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";"<l+><aH>"
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";"<l+><aH>"
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";"<l+><ah>"
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";"<l+><ah>"
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";"<l+><a+>"
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";"<l+><a+>"
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index f54be814e1..ea84e7fd67 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -1918,14 +1918,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index ff71b5c1b2..e3d865c480 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -1932,14 +1932,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index cbf86ab203..c3649e8998 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -1898,14 +1898,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/en_CA,2.5 b/localedata/locales/en_CA,2.5
index ee12945c5f..854c7e28e4 100644
--- a/localedata/locales/en_CA,2.5
+++ b/localedata/locales/en_CA,2.5
@@ -323,7 +323,7 @@ order_start forward;backward;forward;forward,position
 <a(>            <a97>;<BRE>;<MIN>;IGNORE                               #0103
 <a;>            <a97>;<OGO>;<MIN>;IGNORE                               #0105
 <a->            <a97>;<MAC>;<MIN>;IGNORE                               #0101
-<ae>            <a97><e101>;<LIG><LIG>;<MIN><MIN>;IGNORE  #�            00E6
+<ae>            "<a97><e101>";"<LIG><LIG>";"<MIN><MIN>";IGNORE    #�    00E6
 <b>             <b98>;<BAS>;<MIN>;IGNORE          #b                    0062
 <c>             <c99>;<BAS>;<MIN>;IGNORE          #c                    0063
 <c,>            <c99>;<CDI>;<MIN>;IGNORE                  #�            00E7
@@ -362,7 +362,7 @@ order_start forward;backward;forward;forward,position
 <i?>            <i105>;<TIL>;<MIN>;IGNORE                              #0129
 <i;>            <i105>;<OGO>;<MIN>;IGNORE                              #012F
 <i->            <i105>;<MAC>;<MIN>;IGNORE                              #012B
-<ij>            <i105><j106>;<LIG><LIG>;<MIN><MIN>;IGNORE              #0133
+<ij>            "<i105><j106>";"<LIG><LIG>";"<MIN><MIN>";IGNORE        #0133
 <j>             <j106>;<BAS>;<MIN>;IGNORE         #j                    006A
 <j/>>           <j106>;<CIR>;<MIN>;IGNORE                              #0135
 <k>             <k107>;<BAS>;<MIN>;IGNORE         #k                    006B
@@ -381,7 +381,7 @@ order_start forward;backward;forward;forward,position
 <n'>            <n110>;<ACA>;<MIN>;IGNORE                              #0144
 <n<>            <n110>;<CAR>;<MIN>;IGNORE                              #0148
 <n,>            <n110>;<CDI>;<MIN>;IGNORE                              #0146
-<ng>            <n110><g103>;<LIG><LIG>;<MIN><MIN>;IGNORE              #014B
+<ng>            "<n110><g103>";"<LIG><LIG>";"<MIN><MIN>";IGNORE        #014B
 <o>             <o111>;<BAS>;<MIN>;IGNORE         #o                    006F
 <-o>            <o111>;<PCL>;<EMI>;IGNORE                         #�    00BA
 <o'>            <o111>;<ACA>;<MIN>;IGNORE                         #�    00F3
@@ -392,7 +392,7 @@ order_start forward;backward;forward;forward,position
 <o//>           <o111>;<OBL>;<MIN>;IGNORE                         #�    00F8
 <o">            <o111>;<DAC>;<MIN>;IGNORE                              #0151
 <o->            <o111>;<MAC>;<MIN>;IGNORE                              #014D
-<oe>            <o111><e101>;<LIG><LIG>;<MIN><MIN>;IGNORE #<oe>         0153
+<oe>            "<o111><e101>";"<LIG><LIG>";"<MIN><MIN>";IGNORE   #<oe>    0153
 <p>             <p112>;<BAS>;<MIN>;IGNORE         #p                    0070
 <q>             <q113>;<BAS>;<MIN>;IGNORE         #q                    0071
 <r>             <r114>;<BAS>;<MIN>;IGNORE         #r                    0072
@@ -404,12 +404,12 @@ order_start forward;backward;forward;forward,position
 <s/>>           <s115>;<CIR>;<MIN>;IGNORE                              #015D
 <s<>            <s115>;<CAR>;<MIN>;IGNORE                              #0161
 <s,>            <s115>;<CDI>;<MIN>;IGNORE                              #015F
-<ss>            <s115><s115>;<LIG><LIG>;<MIN><MIN>;IGNORE         #�    00DF
+<ss>            "<s115><s115>";"<LIG><LIG>";"<MIN><MIN>";IGNORE   #�    00DF
 <t>             <t116>;<BAS>;<MIN>;IGNORE         #t                    0074
 <t<>            <t116>;<CAR>;<MIN>;IGNORE                              #0165
 <t//>           <t116>;<OBL>;<MIN>;IGNORE                              #0167
 <t,>            <t116>;<CDI>;<MIN>;IGNORE                              #0163
-<th>            <t116><h104>;<PCL><PCL>;<MIN><MIN>;IGNORE         #�    00FE
+<th>            "<t116><h104>";"<PCL><PCL>";"<MIN><MIN>";IGNORE   #�    00FE
 <u>             <u117>;<BAS>;<MIN>;IGNORE         #u                    0075
 <u'>            <u117>;<ACA>;<MIN>;IGNORE                         #�    00FA
 <u!>            <u117>;<GRA>;<MIN>;IGNORE                 #�            00F9
@@ -443,7 +443,7 @@ order_start forward;backward;forward;forward,position
 <A(>            <a97>;<BRE>;<CAP>;IGNORE                               #0102
 <A;>            <a97>;<OGO>;<CAP>;IGNORE                               #0104
 <A->            <a97>;<MAC>;<CAP>;IGNORE                               #0100
-<AE>            <a97><e101>;<LIG><LIG>;<CAP><CAP>;IGNORE  #�            00C6
+<AE>            "<a97><e101>";"<LIG><LIG>";"<CAP><CAP>";IGNORE    #�    00C6
 <B>             <b98>;<BAS>;<CAP>;IGNORE          #B                    0042
 <C>             <c99>;<BAS>;<CAP>;IGNORE          #C                    0043
 <C,>            <c99>;<CDI>;<CAP>;IGNORE                  #�            00C7
@@ -482,7 +482,7 @@ order_start forward;backward;forward;forward,position
 <I?>            <i105>;<TIL>;<CAP>;IGNORE                              #0128
 <I;>            <i105>;<OGO>;<CAP>;IGNORE                              #012E
 <I->            <i105>;<MAC>;<CAP>;IGNORE                              #012A
-<IJ>            <i105><j106>;<LIG><LIG>;<CAP><CAP>;IGNORE              #0132
+<IJ>            "<i105><j106>";"<LIG><LIG>";"<CAP><CAP>";IGNORE        #0132
 <J>             <j106>;<BAS>;<CAP>;IGNORE         #J                    004A
 <J/>>           <j106>;<CIR>;<CAP>;IGNORE                              #0134
 <K>             <k107>;<BAS>;<CAP>;IGNORE         #K                    004B
@@ -499,7 +499,7 @@ order_start forward;backward;forward;forward,position
 <N'>            <n110>;<ACA>;<CAP>;IGNORE                              #0143
 <N<>            <n110>;<CAR>;<CAP>;IGNORE                              #0147
 <N,>            <n110>;<CDI>;<CAP>;IGNORE                              #0145
-<NG>            <n110><g103>;<LIG><LIG>;<CAP><CAP>;IGNORE              #014A
+<NG>            "<n110><g103>";"<LIG><LIG>";"<CAP><CAP>";IGNORE        #014A
 <O>             <o111>;<BAS>;<CAP>;IGNORE         #O                    004F
 <O'>            <o111>;<ACA>;<CAP>;IGNORE                         #�    00D3
 <O!>            <o111>;<GRA>;<CAP>;IGNORE                         #�    00D2
@@ -509,7 +509,7 @@ order_start forward;backward;forward;forward,position
 <O//>           <o111>;<OBL>;<CAP>;IGNORE                         #�    00D8
 <O">            <o111>;<DAC>;<CAP>;IGNORE                              #0150
 <O->            <o111>;<MAC>;<CAP>;IGNORE                              #014C
-<OE>            <o111><e101>;<LIG><LIG>;<CAP><CAP>;IGNORE #<OE>         0152
+<OE>            "<o111><e101>";"<LIG><LIG>";"<CAP><CAP>";IGNORE   #<OE>    0152
 <P>             <p112>;<BAS>;<CAP>;IGNORE         #P                    0050
 <Q>             <q113>;<BAS>;<CAP>;IGNORE         #Q                    0051
 <R>             <r114>;<BAS>;<CAP>;IGNORE         #R                    0052
@@ -525,7 +525,7 @@ order_start forward;backward;forward;forward,position
 <T<>            <t116>;<CAR>;<CAP>;IGNORE                              #0164
 <T//>           <t116>;<OBL>;<CAP>;IGNORE                              #0166
 <T,>            <t116>;<CDI>;<CAP>;IGNORE                              #0162
-<TH>            <t116><h104>;<PCL><PCL>;<CAP><CAP>;IGNORE         #�    00DE
+<TH>            "<t116><h104>";"<PCL><PCL>";"<CAP><CAP>";IGNORE   #�    00DE
 <U>             <u117>;<BAS>;<CAP>;IGNORE         #U                    0055
 <U'>            <u117>;<ACA>;<CAP>;IGNORE                         #�    00DA
 <U!>            <u117>;<GRA>;<CAP>;IGNORE                 #�            00D9
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 0cc9b04f84..f312da523a 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -1938,14 +1938,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/en_DK.com b/localedata/locales/en_DK.com
index 7ff1ff71e0..d03f508a56 100644
--- a/localedata/locales/en_DK.com
+++ b/localedata/locales/en_DK.com
@@ -1901,14 +1901,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE	<U0668>	ARABIC-INDIC DIGIT EIGHT
 <9a>	<9>;<9a>;IGNORE;IGNORE	<U0669>	ARABIC-INDIC DIGIT NINE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE	<Ufef5>	ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE	<Ufef6>	ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE	<Ufef7>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE	<Ufef8>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE	<Ufef9>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE	<Ufefa>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE	<Ufefb>	ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE	<Ufefc>	ARABIC LIGATURE LAM WITH ALEF FINAL FORM
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE	<Ufef5>	ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE	<Ufef6>	ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE	<Ufef7>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE	<Ufef8>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE	<Ufef9>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE	<Ufefa>	ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE	<Ufefb>	ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE	<Ufefc>	ARABIC LIGATURE LAM WITH ALEF FINAL FORM
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 729539d431..a62d5e4dd1 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 6e26599ca3..0c9dd09894 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 54663d5471..a2d59906da 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 5046915a39..153d3ec5bc 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index 522464478c..5c914ea2cd 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 898f26b098..42b9ba42ce 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -1913,14 +1913,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 91cc6b67b0..96760aa5d6 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index b0383bb8ef..4786d1099b 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 3b0217e71c..2266099fdc 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 9caedb7951..e79cac936a 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index 2b686975d1..99296d6457 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index 117a7fa737..78577ce838 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index e6a5750d7e..6d0074e8d4 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 52deceb7be..ececa74920 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index dff47698a7..6a9755bfa8 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -1913,14 +1913,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index d464d5669f..b6b08b6a82 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index 43e66e3dae..14c3d80459 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 4f622e01d1..54ccbf36f6 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -1904,14 +1904,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index dc74d8b1a5..bbe177d77c 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -1872,14 +1872,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/fr_CA,2.13 b/localedata/locales/fr_CA,2.13
index 25d5fa9b2a..4c6be6ae21 100644
--- a/localedata/locales/fr_CA,2.13
+++ b/localedata/locales/fr_CA,2.13
@@ -338,7 +338,7 @@ order_start forward;backward;forward;forward,position
 <a(>            <a97>;<BRE>;<MIN>;IGNORE                               #0103
 <a;>            <a97>;<OGO>;<MIN>;IGNORE                               #0105
 <a->            <a97>;<MAC>;<MIN>;IGNORE                               #0101
-<ae>            <a97><e101>;<LIG><LIG>;<MIN><MIN>;IGNORE  #�            00E6
+<ae>            "<a97><e101>";"<LIG><LIG>";"<MIN><MIN>";IGNORE    #�    00E6
 <b>             <b98>;<BAS>;<MIN>;IGNORE          #b                    0062
 <c>             <c99>;<BAS>;<MIN>;IGNORE          #c                    0063
 <c,>            <c99>;<CDI>;<MIN>;IGNORE                  #�            00E7
@@ -377,7 +377,7 @@ order_start forward;backward;forward;forward,position
 <i?>            <i105>;<TIL>;<MIN>;IGNORE                              #0129
 <i;>            <i105>;<OGO>;<MIN>;IGNORE                              #012F
 <i->            <i105>;<MAC>;<MIN>;IGNORE                              #012B
-<ij>            <i105><j106>;<LIG><LIG>;<MIN><MIN>;IGNORE              #0133
+<ij>            "<i105><j106>";"<LIG><LIG>";"<MIN><MIN>";IGNORE        #0133
 <j>             <j106>;<BAS>;<MIN>;IGNORE         #j                    006A
 <j/>>           <j106>;<CIR>;<MIN>;IGNORE                              #0135
 <k>             <k107>;<BAS>;<MIN>;IGNORE         #k                    006B
@@ -396,7 +396,7 @@ order_start forward;backward;forward;forward,position
 <n'>            <n110>;<ACA>;<MIN>;IGNORE                              #0144
 <n<>            <n110>;<CAR>;<MIN>;IGNORE                              #0148
 <n,>            <n110>;<CDI>;<MIN>;IGNORE                              #0146
-<ng>            <n110><g103>;<LIG><LIG>;<MIN><MIN>;IGNORE              #014B
+<ng>            "<n110><g103>";"<LIG><LIG>";"<MIN><MIN>";IGNORE        #014B
 <o>             <o111>;<BAS>;<MIN>;IGNORE         #o                    006F
 <-o>            <o111>;<PCL>;<EMI>;IGNORE                         #�    00BA
 <o'>            <o111>;<ACA>;<MIN>;IGNORE                         #�    00F3
@@ -407,7 +407,7 @@ order_start forward;backward;forward;forward,position
 <o//>           <o111>;<OBL>;<MIN>;IGNORE                         #�    00F8
 <o">            <o111>;<DAC>;<MIN>;IGNORE                              #0151
 <o->            <o111>;<MAC>;<MIN>;IGNORE                              #014D
-<oe>            <o111><e101>;<LIG><LIG>;<MIN><MIN>;IGNORE #<oe>         0153
+<oe>            "<o111><e101>";"<LIG><LIG>";"<MIN><MIN>";IGNORE   #<oe> 0153
 <p>             <p112>;<BAS>;<MIN>;IGNORE         #p                    0070
 <q>             <q113>;<BAS>;<MIN>;IGNORE         #q                    0071
 <r>             <r114>;<BAS>;<MIN>;IGNORE         #r                    0072
@@ -419,12 +419,12 @@ order_start forward;backward;forward;forward,position
 <s/>>           <s115>;<CIR>;<MIN>;IGNORE                              #015D
 <s<>            <s115>;<CAR>;<MIN>;IGNORE                              #0161
 <s,>            <s115>;<CDI>;<MIN>;IGNORE                              #015F
-<ss>            <s115><s115>;<LIG><LIG>;<MIN><MIN>;IGNORE         #�    00DF
+<ss>            "<s115><s115>";"<LIG><LIG>";"<MIN><MIN>";IGNORE   #�    00DF
 <t>             <t116>;<BAS>;<MIN>;IGNORE         #t                    0074
 <t<>            <t116>;<CAR>;<MIN>;IGNORE                              #0165
 <t//>           <t116>;<OBL>;<MIN>;IGNORE                              #0167
 <t,>            <t116>;<CDI>;<MIN>;IGNORE                              #0163
-<th>            <t116><h104>;<PCL><PCL>;<MIN><MIN>;IGNORE         #�    00FE
+<th>            "<t116><h104>";"<PCL><PCL>";"<MIN><MIN>";IGNORE   #�    00FE
 <u>             <u117>;<BAS>;<MIN>;IGNORE         #u                    0075
 <u'>            <u117>;<ACA>;<MIN>;IGNORE                         #�    00FA
 <u!>            <u117>;<GRA>;<MIN>;IGNORE                 #�            00F9
@@ -458,7 +458,7 @@ order_start forward;backward;forward;forward,position
 <A(>            <a97>;<BRE>;<CAP>;IGNORE                               #0102
 <A;>            <a97>;<OGO>;<CAP>;IGNORE                               #0104
 <A->            <a97>;<MAC>;<CAP>;IGNORE                               #0100
-<AE>            <a97><e101>;<LIG><LIG>;<CAP><CAP>;IGNORE  #�            00C6
+<AE>            "<a97><e101>";"<LIG><LIG>";"<CAP><CAP>";IGNORE    #�    00C6
 <B>             <b98>;<BAS>;<CAP>;IGNORE          #B                    0042
 <C>             <c99>;<BAS>;<CAP>;IGNORE          #C                    0043
 <C,>            <c99>;<CDI>;<CAP>;IGNORE                  #�            00C7
@@ -497,7 +497,7 @@ order_start forward;backward;forward;forward,position
 <I?>            <i105>;<TIL>;<CAP>;IGNORE                              #0128
 <I;>            <i105>;<OGO>;<CAP>;IGNORE                              #012E
 <I->            <i105>;<MAC>;<CAP>;IGNORE                              #012A
-<IJ>            <i105><j106>;<LIG><LIG>;<CAP><CAP>;IGNORE              #0132
+<IJ>            "<i105><j106>";"<LIG><LIG>";"<CAP><CAP>";IGNORE        #0132
 <J>             <j106>;<BAS>;<CAP>;IGNORE         #J                    004A
 <J/>>           <j106>;<CIR>;<CAP>;IGNORE                              #0134
 <K>             <k107>;<BAS>;<CAP>;IGNORE         #K                    004B
@@ -514,7 +514,7 @@ order_start forward;backward;forward;forward,position
 <N'>            <n110>;<ACA>;<CAP>;IGNORE                              #0143
 <N<>            <n110>;<CAR>;<CAP>;IGNORE                              #0147
 <N,>            <n110>;<CDI>;<CAP>;IGNORE                              #0145
-<NG>            <n110><g103>;<LIG><LIG>;<CAP><CAP>;IGNORE              #014A
+<NG>            "<n110><g103>";"<LIG><LIG>";"<CAP><CAP>";IGNORE        #014A
 <O>             <o111>;<BAS>;<CAP>;IGNORE         #O                    004F
 <O'>            <o111>;<ACA>;<CAP>;IGNORE                         #�    00D3
 <O!>            <o111>;<GRA>;<CAP>;IGNORE                         #�    00D2
@@ -524,7 +524,7 @@ order_start forward;backward;forward;forward,position
 <O//>           <o111>;<OBL>;<CAP>;IGNORE                         #�    00D8
 <O">            <o111>;<DAC>;<CAP>;IGNORE                              #0150
 <O->            <o111>;<MAC>;<CAP>;IGNORE                              #014C
-<OE>            <o111><e101>;<LIG><LIG>;<CAP><CAP>;IGNORE #<OE>         0152
+<OE>            "<o111><e101>";"<LIG><LIG>";"<CAP><CAP>";IGNORE   #<OE> 0152
 <P>             <p112>;<BAS>;<CAP>;IGNORE         #P                    0050
 <Q>             <q113>;<BAS>;<CAP>;IGNORE         #Q                    0051
 <R>             <r114>;<BAS>;<CAP>;IGNORE         #R                    0052
@@ -540,7 +540,7 @@ order_start forward;backward;forward;forward,position
 <T<>            <t116>;<CAR>;<CAP>;IGNORE                              #0164
 <T//>           <t116>;<OBL>;<CAP>;IGNORE                              #0166
 <T,>            <t116>;<CDI>;<CAP>;IGNORE                              #0162
-<TH>            <t116><h104>;<PCL><PCL>;<CAP><CAP>;IGNORE         #�    00DE
+<TH>            "<t116><h104>";"<PCL><PCL>";"<CAP><CAP>";IGNORE   #�    00DE
 <U>             <u117>;<BAS>;<CAP>;IGNORE         #U                    0055
 <U'>            <u117>;<ACA>;<CAP>;IGNORE                         #�    00DA
 <U!>            <u117>;<GRA>;<CAP>;IGNORE                 #�            00D9
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 6e539f48a7..d28a271f7a 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -1921,14 +1921,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 54dd1f30e7..c9ffcc7080 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -2001,14 +2001,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index 9f66c04170..e94ad8de59 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -1933,14 +1933,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
index 75c86c5fbf..31aa352bd3 100644
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@@ -1907,14 +1907,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index 2a086ad6c7..4e777eb80a 100644
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -1899,14 +1899,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/no_NO b/localedata/locales/no_NO
index 3a1c4a1847..31eed9f2bd 100644
--- a/localedata/locales/no_NO
+++ b/localedata/locales/no_NO
@@ -1906,14 +1906,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 3ea41e3c83..2f74bdebd0 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 1b564a5b38..e13be411de 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 6fe8f7f1ed..4852874582 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -1898,14 +1898,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 99fd4435e4..7290c0208e 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -956,7 +956,7 @@ LC_COLLATE
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -984,10 +984,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "replace-after" statements
@@ -1910,7 +1910,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE
-<a8>	
+<a8>
 <AE>	"<A><E>";"<AE><AE>";"<CAPITAL><CAPITAL>";IGNORE
 <ae>	"<A><E>";"<AE><AE>";"<SMALL><SMALL>";IGNORE
 <AE'>	"<A><E>";"<AE'><AE'>";"<CAPITAL><CAPITAL>";IGNORE
@@ -1925,7 +1925,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE
-<b8>	
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE
 <c>	<C>;<NONE>;<SMALL>;IGNORE
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1942,7 +1942,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
-<c8>	
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE
 <d>	<D>;<NONE>;<SMALL>;IGNORE
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE
@@ -1959,7 +1959,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE
-<d8>	
+<d8>
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE
 <e>	<E>;<NONE>;<SMALL>;IGNORE
 <E'>	<E>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2010,14 +2010,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
-<e8>	
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE
 <f>	<F>;<NONE>;<SMALL>;IGNORE
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE
-<f8>	
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE
@@ -2041,7 +2041,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE
 <g->	<G>;<MACRON>;<SMALL>;IGNORE
-<g8>	
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE
 <h>	<H>;<NONE>;<SMALL>;IGNORE
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE
@@ -2058,7 +2058,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE
-<h8>	
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE
 <i>	<I>;<NONE>;<SMALL>;IGNORE
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2093,14 +2093,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE
 <i->	<I>;<MACRON>;<SMALL>;IGNORE
-<i8>	
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE
 <j>	<J>;<NONE>;<SMALL>;IGNORE
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE
-<j8>	
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE
 <k>	<K>;<NONE>;<SMALL>;IGNORE
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2115,7 +2115,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE
-<k8>	
+<k8>
 <kk>	<K>;<kk>;<SMALL>;IGNORE
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE
 <l>	<L>;<NONE>;<SMALL>;IGNORE
@@ -2137,7 +2137,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE
-<l8>	
+<l8>
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE
 <m>	<M>;<NONE>;<SMALL>;IGNORE
 <M'>	<M>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2146,7 +2146,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE
-<m8>	
+<m8>
 <N>	<N>;<NONE>;<CAPITAL>;IGNORE
 <n>	<N>;<NONE>;<SMALL>;IGNORE
 <N'>	<N>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2166,7 +2166,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <N_>	<N>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <n_>	<N>;<LINE-BELOW>;<SMALL>;IGNORE
 <'n>	<N>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
-<n8>	
+<n8>
 <NG>	"<N><G>";"<NG><NG>";"<CAPITAL><CAPITAL>";IGNORE
 <ng>	"<N><G>";"<NG><NG>";"<SMALL><SMALL>";IGNORE
 <O>	<O>;<NONE>;<CAPITAL>;IGNORE
@@ -2236,7 +2236,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <o9?>	<O>;<HORN+TILDE>;<SMALL>;IGNORE
 <O9-.>	<O>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <o9-.>	<O>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<o8>	
+<o8>
 <OE>	"<O><E>";"<OE><OE>";"<CAPITAL><CAPITAL>";IGNORE
 <oe>	"<O><E>";"<OE><OE>";"<SMALL><SMALL>";IGNORE
 <P>	<P>;<NONE>;<CAPITAL>;IGNORE
@@ -2245,10 +2245,10 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <p'>	<P>;<ACUTE>;<SMALL>;IGNORE
 <P.>	<P>;<DOT>;<CAPITAL>;IGNORE
 <p.>	<P>;<DOT>;<SMALL>;IGNORE
-<p8>	
+<p8>
 <Q>	<Q>;<NONE>;<CAPITAL>;IGNORE
 <q>	<Q>;<NONE>;<SMALL>;IGNORE
-<q8>	
+<q8>
 <R>	<R>;<NONE>;<CAPITAL>;IGNORE
 <r>	<R>;<NONE>;<SMALL>;IGNORE
 <R'>	<R>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2269,7 +2269,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <r--.>	<R>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
 <R_>	<R>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <r_>	<R>;<LINE-BELOW>;<SMALL>;IGNORE
-<r8>	
+<r8>
 <S>	<S>;<NONE>;<CAPITAL>;IGNORE
 <s>	<S>;<NONE>;<SMALL>;IGNORE
 <st>	"<S><T>";"<NONE><NONE>";"<st><st>";IGNORE
@@ -2291,7 +2291,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <s.-.>	<S>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
 <S,>	<S>;<CEDILLA>;<CAPITAL>;IGNORE
 <s,>	<S>;<CEDILLA>;<SMALL>;IGNORE
-<s8>	
+<s8>
 <s1>	<S>;<s1>;<SMALL>;IGNORE
 <ss>	"<S><S>";"<NONE><NONE>";"<SMALL><ss>";IGNORE
 <St>	"<S><T>";"<NONE><NONE>";"<St><St>";IGNORE
@@ -2311,7 +2311,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <t-/>>	<T>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <T_>	<T>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <t_>	<T>;<LINE-BELOW>;<SMALL>;IGNORE
-<t8>	
+<t8>
 <TH>	"<T><H>";"<TH><TH>";"<CAPITAL><CAPITAL>";IGNORE
 <th>	"<T><H>";"<TH><TH>";"<SMALL><SMALL>";IGNORE
 <U>	<U>;<NONE>;<CAPITAL>;IGNORE
@@ -2376,14 +2376,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <u9?>	<U>;<HORN+TILDE>;<SMALL>;IGNORE
 <U9-.>	<U>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <u9-.>	<U>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<u8>	
+<u8>
 <V>	<V>;<NONE>;<CAPITAL>;IGNORE
 <v>	<V>;<NONE>;<SMALL>;IGNORE
 <V?>	<V>;<TILDE>;<CAPITAL>;IGNORE
 <v?>	<V>;<TILDE>;<SMALL>;IGNORE
 <V-.>	<V>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <v-.>	<V>;<DOT-BELOW>;<SMALL>;IGNORE
-<v8>	
+<v8>
 <W>	<W>;<NONE>;<CAPITAL>;IGNORE
 <w>	<W>;<NONE>;<SMALL>;IGNORE
 <W'>	<W>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2398,14 +2398,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <w.>	<W>;<DOT>;<SMALL>;IGNORE
 <W-.>	<W>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <w-.>	<W>;<DOT-BELOW>;<SMALL>;IGNORE
-<w8>	
+<w8>
 <X>	<X>;<NONE>;<CAPITAL>;IGNORE
 <x>	<X>;<NONE>;<SMALL>;IGNORE
 <X:>	<X>;<DIAERESIS>;<CAPITAL>;IGNORE
 <x:>	<X>;<DIAERESIS>;<SMALL>;IGNORE
 <X.>	<X>;<DOT>;<CAPITAL>;IGNORE
 <x.>	<X>;<DOT>;<SMALL>;IGNORE
-<x8>	
+<x8>
 <Y>	<Y>;<NONE>;<CAPITAL>;IGNORE
 <y>	<Y>;<NONE>;<SMALL>;IGNORE
 <Y'>	<Y>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2424,7 +2424,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <y.>	<Y>;<DOT>;<SMALL>;IGNORE
 <Y-.>	<Y>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <y-.>	<Y>;<DOT-BELOW>;<SMALL>;IGNORE
-<y8>	
+<y8>
 <Z>	<Z>;<NONE>;<CAPITAL>;IGNORE
 <z>	<Z>;<NONE>;<SMALL>;IGNORE
 <Z'>	<Z>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2441,7 +2441,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <z//>	<Z>;<STROKE>;<SMALL>;IGNORE
 <Z_>	<Z>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <z_>	<Z>;<LINE-BELOW>;<SMALL>;IGNORE
-<z8>	
+<z8>
 <A*>	<A*>;<CAPITAL>;<GREEK>;IGNORE
 <A%>	<A*>;<CAPITAL>;<TONOS>;IGNORE
 <a*>	<A*>;<SMALL>;<GREEK>;IGNORE
@@ -2819,14 +2819,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index 5f7db0f93b..f3acd166f9 100644
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -1897,14 +1897,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/sr_YU b/localedata/locales/sr_YU
index ac07c05bd2..ef56f5287e 100644
--- a/localedata/locales/sr_YU
+++ b/localedata/locales/sr_YU
@@ -1921,14 +1921,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index a14d1cf66b..f26a224629 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -1906,14 +1906,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index c1b7098b7c..c8a1d71dae 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -562,316 +562,316 @@ UNDEFINED      IGNORE;IGNORE;IGNORE;IGNORE
 % Thai consonants, with leading vowels rearrangement
 %
 <th161>        <th161>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KO KAI
-<ko-kai-e>           <th161><th224>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ae>          <th161><th225>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-o>           <th161><th226>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ai-maimuan>  <th161><th227>;<BLANK>;<BLANK>;<BLANK>
-<ko-kai-ai-maimalai> <th161><th228>;<BLANK>;<BLANK>;<BLANK>
+<ko-kai-e>           "<th161><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ko-kai-ae>          "<th161><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ko-kai-o>           "<th161><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ko-kai-ai-maimuan>  "<th161><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ko-kai-ai-maimalai> "<th161><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th162>        <th162>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHAI
-<kho-khai-e>           <th162><th224>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ae>          <th162><th225>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-o>           <th162><th226>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ai-maimuan>  <th162><th227>;<BLANK>;<BLANK>;<BLANK>
-<kho-khai-ai-maimalai> <th162><th228>;<BLANK>;<BLANK>;<BLANK>
+<kho-khai-e>           "<th162><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khai-ae>          "<th162><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khai-o>           "<th162><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khai-ai-maimuan>  "<th162><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khai-ai-maimalai> "<th162><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th163>        <th163>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHUAT
-<kho-khuat-e>           <th163><th224>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ae>          <th163><th225>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-o>           <th163><th226>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ai-maimuan>  <th163><th227>;<BLANK>;<BLANK>;<BLANK>
-<kho-khuat-ai-maimalai> <th163><th228>;<BLANK>;<BLANK>;<BLANK>
+<kho-khuat-e>           "<th163><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khuat-ae>          "<th163><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khuat-o>           "<th163><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khuat-ai-maimuan>  "<th163><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khuat-ai-maimalai> "<th163><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th164>        <th164>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHWAI
-<kho-khwai-e>           <th164><th224>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ae>          <th164><th225>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-o>           <th164><th226>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ai-maimuan>  <th164><th227>;<BLANK>;<BLANK>;<BLANK>
-<kho-khwai-ai-maimalai> <th164><th228>;<BLANK>;<BLANK>;<BLANK>
+<kho-khwai-e>           "<th164><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khwai-ae>          "<th164><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khwai-o>           "<th164><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khwai-ai-maimuan>  "<th164><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khwai-ai-maimalai> "<th164><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th165>        <th165>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO KHON
-<kho-khon-e>           <th165><th224>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ae>          <th165><th225>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-o>           <th165><th226>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ai-maimuan>  <th165><th227>;<BLANK>;<BLANK>;<BLANK>
-<kho-khon-ai-maimalai> <th165><th228>;<BLANK>;<BLANK>;<BLANK>
+<kho-khon-e>           "<th165><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khon-ae>          "<th165><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khon-o>           "<th165><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khon-ai-maimuan>  "<th165><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-khon-ai-maimalai> "<th165><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th166>        <th166>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER KHO RAKHANG
-<kho-rakhang-e>           <th166><th224>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ae>          <th166><th225>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-o>           <th166><th226>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ai-maimuan>  <th166><th227>;<BLANK>;<BLANK>;<BLANK>
-<kho-rakhang-ai-maimalai> <th166><th228>;<BLANK>;<BLANK>;<BLANK>
+<kho-rakhang-e>           "<th166><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-rakhang-ae>          "<th166><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-rakhang-o>           "<th166><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-rakhang-ai-maimuan>  "<th166><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<kho-rakhang-ai-maimalai> "<th166><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th167>        <th167>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NGO NGU
-<ngo-ngu-e>           <th167><th224>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ae>          <th167><th225>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-o>           <th167><th226>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ai-maimuan>  <th167><th227>;<BLANK>;<BLANK>;<BLANK>
-<ngo-ngu-ai-maimalai> <th167><th228>;<BLANK>;<BLANK>;<BLANK>
+<ngo-ngu-e>           "<th167><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ngo-ngu-ae>          "<th167><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ngo-ngu-o>           "<th167><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ngo-ngu-ai-maimuan>  "<th167><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ngo-ngu-ai-maimalai> "<th167><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th168>        <th168>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHAN
-<cho-chan-e>           <th168><th224>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ae>          <th168><th225>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-o>           <th168><th226>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ai-maimuan>  <th168><th227>;<BLANK>;<BLANK>;<BLANK>
-<cho-chan-ai-maimalai> <th168><th228>;<BLANK>;<BLANK>;<BLANK>
+<cho-chan-e>           "<th168><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chan-ae>          "<th168><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chan-o>           "<th168><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chan-ai-maimuan>  "<th168><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chan-ai-maimalai> "<th168><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th169>        <th169>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHING
-<cho-ching-e>           <th169><th224>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ae>          <th169><th225>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-o>           <th169><th226>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ai-maimuan>  <th169><th227>;<BLANK>;<BLANK>;<BLANK>
-<cho-ching-ai-maimalai> <th169><th228>;<BLANK>;<BLANK>;<BLANK>
+<cho-ching-e>           "<th169><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-ching-ae>          "<th169><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-ching-o>           "<th169><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-ching-ai-maimuan>  "<th169><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-ching-ai-maimalai> "<th169><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th170>        <th170>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHANG
-<cho-chang-e>           <th170><th224>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ae>          <th170><th225>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-o>           <th170><th226>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ai-maimuan>  <th170><th227>;<BLANK>;<BLANK>;<BLANK>
-<cho-chang-ai-maimalai> <th170><th228>;<BLANK>;<BLANK>;<BLANK>
+<cho-chang-e>           "<th170><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chang-ae>          "<th170><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chang-o>           "<th170><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chang-ai-maimuan>  "<th170><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-chang-ai-maimalai> "<th170><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th171>        <th171>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SO
-<so-so-e>           <th171><th224>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ae>          <th171><th225>;<BLANK>;<BLANK>;<BLANK>
-<so-so-o>           <th171><th226>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ai-maimuan>  <th171><th227>;<BLANK>;<BLANK>;<BLANK>
-<so-so-ai-maimalai> <th171><th228>;<BLANK>;<BLANK>;<BLANK>
+<so-so-e>           "<th171><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-so-ae>          "<th171><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-so-o>           "<th171><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-so-ai-maimuan>  "<th171><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-so-ai-maimalai> "<th171><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th172>        <th172>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER CHO CHOE
-<cho-choe-e>           <th172><th224>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ae>          <th172><th225>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-o>           <th172><th226>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ai-maimuan>  <th172><th227>;<BLANK>;<BLANK>;<BLANK>
-<cho-choe-ai-maimalai> <th172><th228>;<BLANK>;<BLANK>;<BLANK>
+<cho-choe-e>           "<th172><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-choe-ae>          "<th172><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-choe-o>           "<th172><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-choe-ai-maimuan>  "<th172><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<cho-choe-ai-maimalai> "<th172><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th173>        <th173>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER YO YING
-<yo-ying-e>           <th173><th224>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ae>          <th173><th225>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-o>           <th173><th226>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ai-maimuan>  <th173><th227>;<BLANK>;<BLANK>;<BLANK>
-<yo-ying-ai-maimalai> <th173><th228>;<BLANK>;<BLANK>;<BLANK>
+<yo-ying-e>           "<th173><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-ying-ae>          "<th173><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-ying-o>           "<th173><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-ying-ai-maimuan>  "<th173><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-ying-ai-maimalai> "<th173><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th174>        <th174>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER DO CHADA
-<do-chada-e>           <th174><th224>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ae>          <th174><th225>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-o>           <th174><th226>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ai-maimuan>  <th174><th227>;<BLANK>;<BLANK>;<BLANK>
-<do-chada-ai-maimalai> <th174><th228>;<BLANK>;<BLANK>;<BLANK>
+<do-chada-e>           "<th174><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-chada-ae>          "<th174><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-chada-o>           "<th174><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-chada-ai-maimuan>  "<th174><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-chada-ai-maimalai> "<th174><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th175>        <th175>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER TO PATAK
-<to-patak-e>           <th175><th224>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ae>          <th175><th225>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-o>           <th175><th226>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ai-maimuan>  <th175><th227>;<BLANK>;<BLANK>;<BLANK>
-<to-patak-ai-maimalai> <th175><th228>;<BLANK>;<BLANK>;<BLANK>
+<to-patak-e>           "<th175><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-patak-ae>          "<th175><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-patak-o>           "<th175><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-patak-ai-maimuan>  "<th175><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-patak-ai-maimalai> "<th175><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th176>        <th176>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THAN
-<tho-than-e>           <th176><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ae>          <th176><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-o>           <th176><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ai-maimuan>  <th176><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-than-ai-maimalai> <th176><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-than-e>           "<th176><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-than-ae>          "<th176><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-than-o>           "<th176><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-than-ai-maimuan>  "<th176><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-than-ai-maimalai> "<th176><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th177>        <th177>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO NANGMONTHO
-<tho-nangmontho-e>           <th177><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ae>          <th177><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-o>           <th177><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ai-maimuan>  <th177><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-nangmontho-ai-maimalai> <th177><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-nangmontho-e>           "<th177><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-nangmontho-ae>          "<th177><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-nangmontho-o>           "<th177><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-nangmontho-ai-maimuan>  "<th177><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-nangmontho-ai-maimalai> "<th177><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th178>        <th178>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO PHUTHAO
-<tho-phuthao-e>           <th178><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ae>          <th178><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-o>           <th178><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ai-maimuan>  <th178><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-phuthao-ai-maimalai> <th178><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-phuthao-e>           "<th178><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-phuthao-ae>          "<th178><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-phuthao-o>           "<th178><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-phuthao-ai-maimuan>  "<th178><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-phuthao-ai-maimalai> "<th178><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th179>        <th179>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NO NEN
-<no-nen-e>           <th179><th224>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ae>          <th179><th225>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-o>           <th179><th226>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ai-maimuan>  <th179><th227>;<BLANK>;<BLANK>;<BLANK>
-<no-nen-ai-maimalai> <th179><th228>;<BLANK>;<BLANK>;<BLANK>
+<no-nen-e>           "<th179><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nen-ae>          "<th179><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nen-o>           "<th179><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nen-ai-maimuan>  "<th179><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nen-ai-maimalai> "<th179><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th180>        <th180>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER DO DEK
-<do-dek-e>           <th180><th224>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ae>          <th180><th225>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-o>           <th180><th226>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ai-maimuan>  <th180><th227>;<BLANK>;<BLANK>;<BLANK>
-<do-dek-ai-maimalai> <th180><th228>;<BLANK>;<BLANK>;<BLANK>
+<do-dek-e>           "<th180><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-dek-ae>          "<th180><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-dek-o>           "<th180><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-dek-ai-maimuan>  "<th180><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<do-dek-ai-maimalai> "<th180><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th181>        <th181>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER TO TAO
-<to-tao-e>           <th181><th224>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ae>          <th181><th225>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-o>           <th181><th226>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ai-maimuan>  <th181><th227>;<BLANK>;<BLANK>;<BLANK>
-<to-tao-ai-maimalai> <th181><th228>;<BLANK>;<BLANK>;<BLANK>
+<to-tao-e>           "<th181><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-tao-ae>          "<th181><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-tao-o>           "<th181><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-tao-ai-maimuan>  "<th181><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<to-tao-ai-maimalai> "<th181><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th182>        <th182>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THUNG
-<tho-thung-e>           <th182><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ae>          <th182><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-o>           <th182><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ai-maimuan>  <th182><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-thung-ai-maimalai> <th182><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-thung-e>           "<th182><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thung-ae>          "<th182><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thung-o>           "<th182><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thung-ai-maimuan>  "<th182><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thung-ai-maimalai> "<th182><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th183>        <th183>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THAHAN
-<tho-thahan-e>           <th183><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ae>          <th183><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-o>           <th183><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ai-maimuan>  <th183><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-thahan-ai-maimalai> <th183><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-thahan-e>           "<th183><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thahan-ae>          "<th183><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thahan-o>           "<th183><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thahan-ai-maimuan>  "<th183><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thahan-ai-maimalai> "<th183><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th184>        <th184>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER THO THONG
-<tho-thong-e>           <th184><th224>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ae>          <th184><th225>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-o>           <th184><th226>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ai-maimuan>  <th184><th227>;<BLANK>;<BLANK>;<BLANK>
-<tho-thong-ai-maimalai> <th184><th228>;<BLANK>;<BLANK>;<BLANK>
+<tho-thong-e>           "<th184><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thong-ae>          "<th184><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thong-o>           "<th184><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thong-ai-maimuan>  "<th184><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<tho-thong-ai-maimalai> "<th184><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th185>        <th185>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER NO NU
-<no-nu-e>           <th185><th224>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ae>          <th185><th225>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-o>           <th185><th226>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ai-maimuan>  <th185><th227>;<BLANK>;<BLANK>;<BLANK>
-<no-nu-ai-maimalai> <th185><th228>;<BLANK>;<BLANK>;<BLANK>
+<no-nu-e>           "<th185><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nu-ae>          "<th185><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nu-o>           "<th185><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nu-ai-maimuan>  "<th185><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<no-nu-ai-maimalai> "<th185><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th186>        <th186>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER BO BAIMAI
-<bo-baimai-e>           <th186><th224>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ae>          <th186><th225>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-o>           <th186><th226>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ai-maimuan>  <th186><th227>;<BLANK>;<BLANK>;<BLANK>
-<bo-baimai-ai-maimalai> <th186><th228>;<BLANK>;<BLANK>;<BLANK>
+<bo-baimai-e>           "<th186><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<bo-baimai-ae>          "<th186><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<bo-baimai-o>           "<th186><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<bo-baimai-ai-maimuan>  "<th186><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<bo-baimai-ai-maimalai> "<th186><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th187>        <th187>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PO PLA
-<po-pla-e>           <th187><th224>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ae>          <th187><th225>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-o>           <th187><th226>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ai-maimuan>  <th187><th227>;<BLANK>;<BLANK>;<BLANK>
-<po-pla-ai-maimalai> <th187><th228>;<BLANK>;<BLANK>;<BLANK>
+<po-pla-e>           "<th187><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<po-pla-ae>          "<th187><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<po-pla-o>           "<th187><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<po-pla-ai-maimuan>  "<th187><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<po-pla-ai-maimalai> "<th187><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th188>        <th188>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO PHUNG
-<pho-phung-e>           <th188><th224>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ae>          <th188><th225>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-o>           <th188><th226>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ai-maimuan>  <th188><th227>;<BLANK>;<BLANK>;<BLANK>
-<pho-phung-ai-maimalai> <th188><th228>;<BLANK>;<BLANK>;<BLANK>
+<pho-phung-e>           "<th188><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phung-ae>          "<th188><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phung-o>           "<th188><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phung-ai-maimuan>  "<th188><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phung-ai-maimalai> "<th188><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th189>        <th189>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER FO FA
-<fo-fa-e>           <th189><th224>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ae>          <th189><th225>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-o>           <th189><th226>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ai-maimuan>  <th189><th227>;<BLANK>;<BLANK>;<BLANK>
-<fo-fa-ai-maimalai> <th189><th228>;<BLANK>;<BLANK>;<BLANK>
+<fo-fa-e>           "<th189><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fa-ae>          "<th189><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fa-o>           "<th189><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fa-ai-maimuan>  "<th189><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fa-ai-maimalai> "<th189><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th190>        <th190>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO PHAN
-<pho-phan-e>           <th190><th224>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ae>          <th190><th225>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-o>           <th190><th226>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ai-maimuan>  <th190><th227>;<BLANK>;<BLANK>;<BLANK>
-<pho-phan-ai-maimalai> <th190><th228>;<BLANK>;<BLANK>;<BLANK>
+<pho-phan-e>           "<th190><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phan-ae>          "<th190><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phan-o>           "<th190><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phan-ai-maimuan>  "<th190><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-phan-ai-maimalai> "<th190><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th191>        <th191>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER FO FAN
-<fo-fan-e>           <th191><th224>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ae>          <th191><th225>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-o>           <th191><th226>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ai-maimuan>  <th191><th227>;<BLANK>;<BLANK>;<BLANK>
-<fo-fan-ai-maimalai> <th191><th228>;<BLANK>;<BLANK>;<BLANK>
+<fo-fan-e>           "<th191><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fan-ae>          "<th191><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fan-o>           "<th191><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fan-ai-maimuan>  "<th191><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<fo-fan-ai-maimalai> "<th191><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th192>        <th192>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER PHO SAMPHAO
-<pho-samphao-e>           <th192><th224>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ae>          <th192><th225>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-o>           <th192><th226>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ai-maimuan>  <th192><th227>;<BLANK>;<BLANK>;<BLANK>
-<pho-samphao-ai-maimalai> <th192><th228>;<BLANK>;<BLANK>;<BLANK>
+<pho-samphao-e>           "<th192><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-samphao-ae>          "<th192><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-samphao-o>           "<th192><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-samphao-ai-maimuan>  "<th192><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<pho-samphao-ai-maimalai> "<th192><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th193>        <th193>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER MO MA
-<mo-ma-e>           <th193><th224>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ae>          <th193><th225>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-o>           <th193><th226>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ai-maimuan>  <th193><th227>;<BLANK>;<BLANK>;<BLANK>
-<mo-ma-ai-maimalai> <th193><th228>;<BLANK>;<BLANK>;<BLANK>
+<mo-ma-e>           "<th193><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<mo-ma-ae>          "<th193><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<mo-ma-o>           "<th193><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<mo-ma-ai-maimuan>  "<th193><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<mo-ma-ai-maimalai> "<th193><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th194>        <th194>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER YO YAK
-<yo-yak-e>           <th194><th224>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ae>          <th194><th225>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-o>           <th194><th226>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ai-maimuan>  <th194><th227>;<BLANK>;<BLANK>;<BLANK>
-<yo-yak-ai-maimalai> <th194><th228>;<BLANK>;<BLANK>;<BLANK>
+<yo-yak-e>           "<th194><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-yak-ae>          "<th194><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-yak-o>           "<th194><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-yak-ai-maimuan>  "<th194><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<yo-yak-ai-maimalai> "<th194><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th195>        <th195>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER RO RUA
-<ro-rua-e>           <th195><th224>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ae>          <th195><th225>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-o>           <th195><th226>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ai-maimuan>  <th195><th227>;<BLANK>;<BLANK>;<BLANK>
-<ro-rua-ai-maimalai> <th195><th228>;<BLANK>;<BLANK>;<BLANK>
+<ro-rua-e>           "<th195><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ro-rua-ae>          "<th195><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ro-rua-o>           "<th195><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ro-rua-ai-maimuan>  "<th195><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ro-rua-ai-maimalai> "<th195><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th196>        <th196>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER RU
 
 <th197>        <th197>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LO LING
-<lo-ling-e>           <th197><th224>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ae>          <th197><th225>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-o>           <th197><th226>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ai-maimuan>  <th197><th227>;<BLANK>;<BLANK>;<BLANK>
-<lo-ling-ai-maimalai> <th197><th228>;<BLANK>;<BLANK>;<BLANK>
+<lo-ling-e>           "<th197><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-ling-ae>          "<th197><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-ling-o>           "<th197><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-ling-ai-maimuan>  "<th197><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-ling-ai-maimalai> "<th197><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th198>        <th198>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LU
 
 <th199>        <th199>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER WO WAEN
-<wo-waen-e>           <th199><th224>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ae>          <th199><th225>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-o>           <th199><th226>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ai-maimuan>  <th199><th227>;<BLANK>;<BLANK>;<BLANK>
-<wo-waen-ai-maimalai> <th199><th228>;<BLANK>;<BLANK>;<BLANK>
+<wo-waen-e>           "<th199><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<wo-waen-ae>          "<th199><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<wo-waen-o>           "<th199><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<wo-waen-ai-maimuan>  "<th199><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<wo-waen-ai-maimalai> "<th199><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th200>        <th200>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SALA
-<so-sala-e>           <th200><th224>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ae>          <th200><th225>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-o>           <th200><th226>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ai-maimuan>  <th200><th227>;<BLANK>;<BLANK>;<BLANK>
-<so-sala-ai-maimalai> <th200><th228>;<BLANK>;<BLANK>;<BLANK>
+<so-sala-e>           "<th200><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sala-ae>          "<th200><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sala-o>           "<th200><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sala-ai-maimuan>  "<th200><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sala-ai-maimalai> "<th200><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th201>        <th201>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO RUSI
-<so-rusi-e>           <th201><th224>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ae>          <th201><th225>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-o>           <th201><th226>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ai-maimuan>  <th201><th227>;<BLANK>;<BLANK>;<BLANK>
-<so-rusi-ai-maimalai> <th201><th228>;<BLANK>;<BLANK>;<BLANK>
+<so-rusi-e>           "<th201><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-rusi-ae>          "<th201><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-rusi-o>           "<th201><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-rusi-ai-maimuan>  "<th201><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-rusi-ai-maimalai> "<th201><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th202>        <th202>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER SO SUA
-<so-sua-e>           <th202><th224>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ae>          <th202><th225>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-o>           <th202><th226>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ai-maimuan>  <th202><th227>;<BLANK>;<BLANK>;<BLANK>
-<so-sua-ai-maimalai> <th202><th228>;<BLANK>;<BLANK>;<BLANK>
+<so-sua-e>           "<th202><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sua-ae>          "<th202><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sua-o>           "<th202><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sua-ai-maimuan>  "<th202><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<so-sua-ai-maimalai> "<th202><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th203>        <th203>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER HO HIP
-<ho-hip-e>           <th203><th224>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ae>          <th203><th225>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-o>           <th203><th226>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ai-maimuan>  <th203><th227>;<BLANK>;<BLANK>;<BLANK>
-<ho-hip-ai-maimalai> <th203><th228>;<BLANK>;<BLANK>;<BLANK>
+<ho-hip-e>           "<th203><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-hip-ae>          "<th203><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-hip-o>           "<th203><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-hip-ai-maimuan>  "<th203><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-hip-ai-maimalai> "<th203><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th204>        <th204>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER LO CHULA
-<lo-chula-e>           <th204><th224>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ae>          <th204><th225>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-o>           <th204><th226>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ai-maimuan>  <th204><th227>;<BLANK>;<BLANK>;<BLANK>
-<lo-chula-ai-maimalai> <th204><th228>;<BLANK>;<BLANK>;<BLANK>
+<lo-chula-e>           "<th204><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-chula-ae>          "<th204><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-chula-o>           "<th204><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-chula-ai-maimuan>  "<th204><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<lo-chula-ai-maimalai> "<th204><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th205>        <th205>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER O ANG
-<o-ang-e>           <th205><th224>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ae>          <th205><th225>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-o>           <th205><th226>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ai-maimuan>  <th205><th227>;<BLANK>;<BLANK>;<BLANK>
-<o-ang-ai-maimalai> <th205><th228>;<BLANK>;<BLANK>;<BLANK>
+<o-ang-e>           "<th205><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<o-ang-ae>          "<th205><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<o-ang-o>           "<th205><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<o-ang-ai-maimuan>  "<th205><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<o-ang-ai-maimalai> "<th205><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th206>        <th206>;<BLANK>;<BLANK>;<BLANK> % THAI CHARACTER HO NOKHUK
-<ho-nokhuk-e>           <th206><th224>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ae>          <th206><th225>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-o>           <th206><th226>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ai-maimuan>  <th206><th227>;<BLANK>;<BLANK>;<BLANK>
-<ho-nokhuk-ai-maimalai> <th206><th228>;<BLANK>;<BLANK>;<BLANK>
+<ho-nokhuk-e>           "<th206><th224>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-nokhuk-ae>          "<th206><th225>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-nokhuk-o>           "<th206><th226>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-nokhuk-ai-maimuan>  "<th206><th227>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
+<ho-nokhuk-ai-maimalai> "<th206><th228>";"<BLANK><BLANK>";"<BLANK><BLANK>";"<BLANK><BLANK>"
 
 <th237> <th237>;<BLANK>;<BLANK>;<BLANK>  % THAI CHARACTER NIKHAHIT
 
@@ -992,4 +992,3 @@ yesstr  "<th227><th170><th232>"
 nostr   "<th228><th193><th232><th227><th170><th232>"
 
 END LC_MESSAGES
-
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index 19bd99166c..cd05b8c998 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -1902,14 +1902,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 2ff291c1b4..3b9c723232 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -956,7 +956,7 @@ LC_COLLATE
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -984,10 +984,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "replace-after" statements
@@ -1910,7 +1910,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE
-<a8>	
+<a8>
 <AE>	"<A><E>";"<AE><AE>";"<CAPITAL><CAPITAL>";IGNORE
 <ae>	"<A><E>";"<AE><AE>";"<SMALL><SMALL>";IGNORE
 <AE'>	"<A><E>";"<AE'><AE'>";"<CAPITAL><CAPITAL>";IGNORE
@@ -1925,7 +1925,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE
-<b8>	
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE
 <c>	<C>;<NONE>;<SMALL>;IGNORE
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1942,7 +1942,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
-<c8>	
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE
 <d>	<D>;<NONE>;<SMALL>;IGNORE
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE
@@ -1959,7 +1959,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE
-<d8>	
+<d8>
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE
 <e>	<E>;<NONE>;<SMALL>;IGNORE
 <E'>	<E>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2010,14 +2010,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
-<e8>	
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE
 <f>	<F>;<NONE>;<SMALL>;IGNORE
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE
-<f8>	
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE
@@ -2041,7 +2041,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE
 <g->	<G>;<MACRON>;<SMALL>;IGNORE
-<g8>	
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE
 <h>	<H>;<NONE>;<SMALL>;IGNORE
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE
@@ -2058,7 +2058,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE
-<h8>	
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE
 <i>	<I>;<NONE>;<SMALL>;IGNORE
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2093,14 +2093,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE
 <i->	<I>;<MACRON>;<SMALL>;IGNORE
-<i8>	
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE
 <j>	<J>;<NONE>;<SMALL>;IGNORE
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE
-<j8>	
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE
 <k>	<K>;<NONE>;<SMALL>;IGNORE
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2115,7 +2115,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE
-<k8>	
+<k8>
 <kk>	<K>;<kk>;<SMALL>;IGNORE
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE
 <l>	<L>;<NONE>;<SMALL>;IGNORE
@@ -2137,7 +2137,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE
-<l8>	
+<l8>
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE
 <m>	<M>;<NONE>;<SMALL>;IGNORE
 <M'>	<M>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2146,7 +2146,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE
-<m8>	
+<m8>
 <N>	<N>;<NONE>;<CAPITAL>;IGNORE
 <n>	<N>;<NONE>;<SMALL>;IGNORE
 <N'>	<N>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2166,7 +2166,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <N_>	<N>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <n_>	<N>;<LINE-BELOW>;<SMALL>;IGNORE
 <'n>	<N>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
-<n8>	
+<n8>
 <NG>	"<N><G>";"<NG><NG>";"<CAPITAL><CAPITAL>";IGNORE
 <ng>	"<N><G>";"<NG><NG>";"<SMALL><SMALL>";IGNORE
 <O>	<O>;<NONE>;<CAPITAL>;IGNORE
@@ -2236,7 +2236,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <o9?>	<O>;<HORN+TILDE>;<SMALL>;IGNORE
 <O9-.>	<O>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <o9-.>	<O>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<o8>	
+<o8>
 <OE>	"<O><E>";"<OE><OE>";"<CAPITAL><CAPITAL>";IGNORE
 <oe>	"<O><E>";"<OE><OE>";"<SMALL><SMALL>";IGNORE
 <P>	<P>;<NONE>;<CAPITAL>;IGNORE
@@ -2245,10 +2245,10 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <p'>	<P>;<ACUTE>;<SMALL>;IGNORE
 <P.>	<P>;<DOT>;<CAPITAL>;IGNORE
 <p.>	<P>;<DOT>;<SMALL>;IGNORE
-<p8>	
+<p8>
 <Q>	<Q>;<NONE>;<CAPITAL>;IGNORE
 <q>	<Q>;<NONE>;<SMALL>;IGNORE
-<q8>	
+<q8>
 <R>	<R>;<NONE>;<CAPITAL>;IGNORE
 <r>	<R>;<NONE>;<SMALL>;IGNORE
 <R'>	<R>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2269,7 +2269,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <r--.>	<R>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
 <R_>	<R>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <r_>	<R>;<LINE-BELOW>;<SMALL>;IGNORE
-<r8>	
+<r8>
 <S>	<S>;<NONE>;<CAPITAL>;IGNORE
 <s>	<S>;<NONE>;<SMALL>;IGNORE
 <st>	"<S><T>";"<NONE><NONE>";"<st><st>";IGNORE
@@ -2291,7 +2291,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <s.-.>	<S>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
 <S,>	<S>;<CEDILLA>;<CAPITAL>;IGNORE
 <s,>	<S>;<CEDILLA>;<SMALL>;IGNORE
-<s8>	
+<s8>
 <s1>	<S>;<s1>;<SMALL>;IGNORE
 <ss>	"<S><S>";"<NONE><NONE>";"<SMALL><ss>";IGNORE
 <St>	"<S><T>";"<NONE><NONE>";"<St><St>";IGNORE
@@ -2311,7 +2311,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <t-/>>	<T>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <T_>	<T>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <t_>	<T>;<LINE-BELOW>;<SMALL>;IGNORE
-<t8>	
+<t8>
 <TH>	"<T><H>";"<TH><TH>";"<CAPITAL><CAPITAL>";IGNORE
 <th>	"<T><H>";"<TH><TH>";"<SMALL><SMALL>";IGNORE
 <U>	<U>;<NONE>;<CAPITAL>;IGNORE
@@ -2376,14 +2376,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <u9?>	<U>;<HORN+TILDE>;<SMALL>;IGNORE
 <U9-.>	<U>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <u9-.>	<U>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<u8>	
+<u8>
 <V>	<V>;<NONE>;<CAPITAL>;IGNORE
 <v>	<V>;<NONE>;<SMALL>;IGNORE
 <V?>	<V>;<TILDE>;<CAPITAL>;IGNORE
 <v?>	<V>;<TILDE>;<SMALL>;IGNORE
 <V-.>	<V>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <v-.>	<V>;<DOT-BELOW>;<SMALL>;IGNORE
-<v8>	
+<v8>
 <W>	<W>;<NONE>;<CAPITAL>;IGNORE
 <w>	<W>;<NONE>;<SMALL>;IGNORE
 <W'>	<W>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2398,14 +2398,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <w.>	<W>;<DOT>;<SMALL>;IGNORE
 <W-.>	<W>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <w-.>	<W>;<DOT-BELOW>;<SMALL>;IGNORE
-<w8>	
+<w8>
 <X>	<X>;<NONE>;<CAPITAL>;IGNORE
 <x>	<X>;<NONE>;<SMALL>;IGNORE
 <X:>	<X>;<DIAERESIS>;<CAPITAL>;IGNORE
 <x:>	<X>;<DIAERESIS>;<SMALL>;IGNORE
 <X.>	<X>;<DOT>;<CAPITAL>;IGNORE
 <x.>	<X>;<DOT>;<SMALL>;IGNORE
-<x8>	
+<x8>
 <Y>	<Y>;<NONE>;<CAPITAL>;IGNORE
 <y>	<Y>;<NONE>;<SMALL>;IGNORE
 <Y'>	<Y>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2424,7 +2424,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <y.>	<Y>;<DOT>;<SMALL>;IGNORE
 <Y-.>	<Y>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <y-.>	<Y>;<DOT-BELOW>;<SMALL>;IGNORE
-<y8>	
+<y8>
 <Z>	<Z>;<NONE>;<CAPITAL>;IGNORE
 <z>	<Z>;<NONE>;<SMALL>;IGNORE
 <Z'>	<Z>;<ACUTE>;<CAPITAL>;IGNORE
@@ -2441,7 +2441,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <z//>	<Z>;<STROKE>;<SMALL>;IGNORE
 <Z_>	<Z>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <z_>	<Z>;<LINE-BELOW>;<SMALL>;IGNORE
-<z8>	
+<z8>
 <A*>	<A*>;<CAPITAL>;<GREEK>;IGNORE
 <A%>	<A*>;<CAPITAL>;<TONOS>;IGNORE
 <a*>	<A*>;<SMALL>;<GREEK>;IGNORE
@@ -2819,14 +2819,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <8a>	<8>;<8a>;IGNORE;IGNORE
 <9a>	<9>;<9a>;IGNORE;IGNORE
 
-<lM->	<l+><aM>;<l+><aM>;<lM-><lM->;IGNORE
-<lM.>	<l+><aM>;<l+><aM.>;<lM.><lM.>;IGNORE
-<lH->	<l+><aH>;<l+><aH>;<lH-><lH->;IGNORE
-<lH.>	<l+><aH>;<l+><aH.>;<lH.><lH.>;IGNORE
-<lh->	<l+><ah>;<l+><ah>;<lh-><lh->;IGNORE
-<lh.>	<l+><ah>;<l+><ah.>;<lh.><lh.>;IGNORE
-<la->	<l+><a+>;<l+><a+->;<la-><la->;IGNORE
-<la.>	<l+><a+>;<l+><a+.>;<la.><la.>;IGNORE
+<lM->	"<l+><aM>";"<l+><aM>";"<lM-><lM->";IGNORE
+<lM.>	"<l+><aM>";"<l+><aM.>";"<lM.><lM.>";IGNORE
+<lH->	"<l+><aH>";"<l+><aH>";"<lH-><lH->";IGNORE
+<lH.>	"<l+><aH>";"<l+><aH.>";"<lH.><lH.>";IGNORE
+<lh->	"<l+><ah>";"<l+><ah>";"<lh-><lh->";IGNORE
+<lh.>	"<l+><ah>";"<l+><ah.>";"<lh.><lh.>";IGNORE
+<la->	"<l+><a+>";"<l+><a+->";"<la-><la->";IGNORE
+<la.>	"<l+><a+>";"<l+><a+.>";"<la.><la.>";IGNORE
 
 % katakana/hiragana sorting
 % base is katakana, as this is present in most charsets
diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h
index fef37f8da9..50c659389c 100644
--- a/sysdeps/unix/sysv/linux/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/bits/resource.h
@@ -21,7 +21,6 @@
 # error "Never use <bits/resource.h> directly; include <sys/resource.h> instead."
 #endif
 
-#include <asm/resource.h>
 #include <bits/types.h>
 
 /* Transmute defines to enumerations.  The macro re-definitions are