aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-12 18:16:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-12 18:16:10 +0000
commit7e66fa36a7526aca621bbe966698003266a8ebca (patch)
treeeba9ef382e5ceabbd8494da3649f538dcbc60b46
parentcb68312f3ef71fee8c2874b5ededbddfc22b8582 (diff)
downloadglibc-7e66fa36a7526aca621bbe966698003266a8ebca.tar
glibc-7e66fa36a7526aca621bbe966698003266a8ebca.tar.gz
glibc-7e66fa36a7526aca621bbe966698003266a8ebca.tar.bz2
glibc-7e66fa36a7526aca621bbe966698003266a8ebca.zip
Update.
2000-02-12 Ulrich Drepper <drepper@redhat.com> * locales/el_GR (toupper): Don't map *s to S*. * locales/en_DK: Likewise. * locales/en_DK.com: Likewise. * locales/ru_RU: Likewise. * locales/ru_UA: Likewise. * locales/tr_TR: Likewise. * locales/uk_UA: Likewise. * locales/en_DK (toupper): Map v% to V%. (tolower): Map V% to v%. * locales/en_DK.com: Likewise. * locales/ru_RU: Likewise. * locales/ru_UA: Likewise. * locales/tr_TR: Likewise. * locales/uk_UA: Likewise.
-rw-r--r--localedata/ChangeLog18
-rw-r--r--localedata/locales/en_DK29
-rw-r--r--localedata/locales/en_DK.com31
-rw-r--r--localedata/locales/ru_RU29
-rw-r--r--localedata/locales/ru_UA29
-rw-r--r--localedata/locales/tr_TR31
-rw-r--r--localedata/locales/uk_UA29
7 files changed, 106 insertions, 90 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 190506f7f8..71d4eaff25 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,21 @@
+2000-02-12 Ulrich Drepper <drepper@redhat.com>
+
+ * locales/el_GR (toupper): Don't map *s to S*.
+ * locales/en_DK: Likewise.
+ * locales/en_DK.com: Likewise.
+ * locales/ru_RU: Likewise.
+ * locales/ru_UA: Likewise.
+ * locales/tr_TR: Likewise.
+ * locales/uk_UA: Likewise.
+
+ * locales/en_DK (toupper): Map v% to V%.
+ (tolower): Map V% to v%.
+ * locales/en_DK.com: Likewise.
+ * locales/ru_RU: Likewise.
+ * locales/ru_UA: Likewise.
+ * locales/tr_TR: Likewise.
+ * locales/uk_UA: Likewise.
+
2000-02-11 Ulrich Drepper <drepper@redhat.com>
* Makefile (generated-dirs): Add de_DE.437.
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index f312da523a..5af6d065b0 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
@@ -2852,9 +2852,9 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<Sc>,<sc>);(<T=>,<t=>);/
(<Ts>,<ts>);(<U=>,<u=>);/
(<V3>,<v3>);(<V=>,<v=>);/
- (<Y3>,<y3>);(<Y=>,<y=>);/
- (<YI>,<yi>);(<Z%>,<z%>);/
- (<Z=>,<z=>)
+ (<V%>,<v%>);(<Y3>,<y3>);/
+ (<Y=>,<y=>);(<YI>,<yi>);/
+ (<Z%>,<z%>);(<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -3054,10 +3054,9 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<sc>,<Sc>);(<t=>,<T=>);/
(<ts>,<Ts>);(<u=>,<U=>);/
(<v3>,<V3>);(<v=>,<V=>);/
- (<y3>,<Y3>);(<y=>,<Y=>);/
- (<yi>,<YI>);(<z%>,<Z%>);/
- (<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v%>,<V%>);(<y3>,<Y3>);/
+ (<y=>,<Y=>);(<yi>,<YI>);/
+ (<z%>,<Z%>);(<z=>,<Z=>)
END LC_CTYPE
diff --git a/localedata/locales/en_DK.com b/localedata/locales/en_DK.com
index d03f508a56..ce4d5b5866 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
@@ -2799,9 +2799,10 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<S=>,<s=>);(<Sc>,<sc>);/
(<T=>,<t=>);(<Ts>,<ts>);/
(<U=>,<u=>);(<V3>,<v3>);/
- (<V=>,<v=>);(<Y3>,<y3>);/
- (<Y=>,<y=>);(<YI>,<yi>);/
- (<Z%>,<z%>);(<Z=>,<z=>)
+ (<V=>,<v=>);(<V%>,<v%>);/
+ (<Y3>,<y3>);(<Y=>,<y=>);/
+ (<YI>,<yi>);(<Z%>,<z%>);/
+ (<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -2999,10 +3000,10 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<s=>,<S=>);(<sc>,<Sc>);/
(<t=>,<T=>);(<ts>,<Ts>);/
(<u=>,<U=>);(<v3>,<V3>);/
- (<v=>,<V=>);(<y3>,<Y3>);/
- (<y=>,<Y=>);(<yi>,<YI>);/
- (<z%>,<Z%>);(<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v=>,<V=>);(<v%>,<V%>);/
+ (<y3>,<Y3>);(<y=>,<Y=>);/
+ (<yi>,<YI>);(<z%>,<Z%>);/
+ (<z=>,<Z=>)
END LC_CTYPE
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 4852874582..a118111960 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
@@ -2805,9 +2805,9 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<Sc>,<sc>);(<T=>,<t=>);/
(<Ts>,<ts>);(<U=>,<u=>);/
(<V3>,<v3>);(<V=>,<v=>);/
- (<Y3>,<y3>);(<Y=>,<y=>);/
- (<YI>,<yi>);(<Z%>,<z%>);/
- (<Z=>,<z=>)
+ (<V%>,<v%>);(<Y3>,<y3>);/
+ (<Y=>,<y=>);(<YI>,<yi>);/
+ (<Z%>,<z%>);(<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -3007,10 +3007,9 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<sc>,<Sc>);(<t=>,<T=>);/
(<ts>,<Ts>);(<u=>,<U=>);/
(<v3>,<V3>);(<v=>,<V=>);/
- (<y3>,<Y3>);(<y=>,<Y=>);/
- (<yi>,<YI>);(<z%>,<Z%>);/
- (<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v%>,<V%>);(<y3>,<Y3>);/
+ (<y=>,<Y=>);(<yi>,<YI>);/
+ (<z%>,<Z%>);(<z=>,<Z=>)
END LC_CTYPE
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 7290c0208e..8a25bbc2bb 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -733,9 +733,9 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<Sc>,<sc>);(<T=>,<t=>);/
(<Ts>,<ts>);(<U=>,<u=>);/
(<V3>,<v3>);(<V=>,<v=>);/
- (<Y3>,<y3>);(<Y=>,<y=>);/
- (<YI>,<yi>);(<Z%>,<z%>);/
- (<Z=>,<z=>)
+ (<V%>,<v%>);(<Y3>,<y3>);/
+ (<Y=>,<y=>);(<YI>,<yi>);/
+ (<Z%>,<z%>);(<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -935,10 +935,9 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<sc>,<Sc>);(<t=>,<T=>);/
(<ts>,<Ts>);(<u=>,<U=>);/
(<v3>,<V3>);(<v=>,<V=>);/
- (<y3>,<Y3>);(<y=>,<Y=>);/
- (<yi>,<YI>);(<z%>,<Z%>);/
- (<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v%>,<V%>);(<y3>,<Y3>);/
+ (<y=>,<Y=>);(<yi>,<YI>);/
+ (<z%>,<Z%>);(<z=>,<Z=>)
END LC_CTYPE
@@ -2819,14 +2818,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/tr_TR b/localedata/locales/tr_TR
index cd05b8c998..8fa7a78dff 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
@@ -2800,9 +2800,10 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<S=>,<s=>);(<Sc>,<sc>);/
(<T=>,<t=>);(<Ts>,<ts>);/
(<U=>,<u=>);(<V3>,<v3>);/
- (<V=>,<v=>);(<Y3>,<y3>);/
- (<Y=>,<y=>);(<YI>,<yi>);/
- (<Z%>,<z%>);(<Z=>,<z=>)
+ (<V=>,<v=>);(<V%>,<v%>);/
+ (<Y3>,<y3>);(<Y=>,<y=>);/
+ (<YI>,<yi>);(<Z%>,<z%>);/
+ (<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -3000,10 +3001,10 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<s=>,<S=>);(<sc>,<Sc>);/
(<t=>,<T=>);(<ts>,<Ts>);/
(<u=>,<U=>);(<v3>,<V3>);/
- (<v=>,<V=>);(<y3>,<Y3>);/
- (<y=>,<Y=>);(<yi>,<YI>);/
- (<z%>,<Z%>);(<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v=>,<V=>);(<v%>,<V%>);/
+ (<y3>,<Y3>);(<y=>,<Y=>);/
+ (<yi>,<YI>);(<z%>,<Z%>);/
+ (<z=>,<Z=>)
END LC_CTYPE
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 3b9c723232..69518a62e7 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -733,9 +733,9 @@ tolower (<A>,<a>);(<A!>,<a!>);/
(<Sc>,<sc>);(<T=>,<t=>);/
(<Ts>,<ts>);(<U=>,<u=>);/
(<V3>,<v3>);(<V=>,<v=>);/
- (<Y3>,<y3>);(<Y=>,<y=>);/
- (<YI>,<yi>);(<Z%>,<z%>);/
- (<Z=>,<z=>)
+ (<V%>,<v%>);(<Y3>,<y3>);/
+ (<Y=>,<y=>);(<YI>,<yi>);/
+ (<Z%>,<z%>);(<Z=>,<z=>)
toupper (<a>,<A>);(<a!>,<A!>);/
(<a!!>,<A!!>);(<a'>,<A'>);/
@@ -935,10 +935,9 @@ toupper (<a>,<A>);(<a!>,<A!>);/
(<sc>,<Sc>);(<t=>,<T=>);/
(<ts>,<Ts>);(<u=>,<U=>);/
(<v3>,<V3>);(<v=>,<V=>);/
- (<y3>,<Y3>);(<y=>,<Y=>);/
- (<yi>,<YI>);(<z%>,<Z%>);/
- (<z=>,<Z=>);/
- (<*s>,<S*>)
+ (<v%>,<V%>);(<y3>,<Y3>);/
+ (<y=>,<Y=>);(<yi>,<YI>);/
+ (<z%>,<Z%>);(<z=>,<Z=>)
END LC_CTYPE
@@ -2819,14 +2818,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