aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 11:04:14 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 11:04:14 -0500
commitb008d4c85619a753e441d7f473ba8af0db400bd6 (patch)
tree1e4b48da83639b1caa23e9979146b97a184d372d /localedata
parentd3761ebcc65825e220b215595949dc74a948f47c (diff)
downloadglibc-b008d4c85619a753e441d7f473ba8af0db400bd6.tar
glibc-b008d4c85619a753e441d7f473ba8af0db400bd6.tar.gz
glibc-b008d4c85619a753e441d7f473ba8af0db400bd6.tar.bz2
glibc-b008d4c85619a753e441d7f473ba8af0db400bd6.zip
Fix collation in Hungarian locale
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/locales/hu_HU192
2 files changed, 116 insertions, 82 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index bb9c3886e2..658b8e0ed3 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-07 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #13547]
+ * locales/hu_HU: Fix collation rules.
+ Patch by Egmont Koblinger <egmont@gmail.com>.
+
2011-12-23 Ulrich Drepper <drepper@gmail.com>
[BZ #12840]
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 8fce6e40a7..691ccad903 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -15,11 +15,11 @@ escape_char /
% - made all days abbreviations same lenght by appending spaces
% Email: srtxg@chanae.alphanet.ch
%
-% Further changes by Egmont Koblinger, 2002/Jan/06
+% Further changes by Egmont Koblinger, 2002/Jan/06, 2012/Jan/03
% - fixed tons of remaining bugs in alphabetical order
% - turned month names and similar stuff to lowercase
% - other small bugfixes
-% Email: egmont@suselinux.hu
+% Email: egmont@gmail.com
%
% Language: hu
% Territory: HU
@@ -66,10 +66,21 @@ copy "iso14651_t1"
%%
%% a' e' i' o' u' are sorted as if they were unaccented
%% o" and u" are sorted as if they were o: and u:
+%%
+%% When a compound letter is pronounced long, only the first
+%% letter is duplicated in writing, e.g. cs+cs becomes ccs,
+%% dzs+dzs becomes ddzs, and so on.
+%% However, c+cs is also spelled as ccs, you need to speak
+%% the language to tell which one is the case.
+%% Tokenize ccs as <c_or_cs><cs>, and sort the tokens as
+%% a b c c_or_cs cs d... This effectively assumes cs+cs
+%% which is more frequent than c+cs, but guarantees that the
+%% strings ccs and cscs don't collate as equal.
collating-symbol <odouble>
collating-symbol <udouble>
+collating-symbol <c_or_cs>
collating-symbol <cs>
collating-element <C-S> from "<U0043><U0053>"
collating-element <C-s> from "<U0043><U0073>"
@@ -84,6 +95,7 @@ collating-element <c-C-s> from "<U0063><U0043><U0073>"
collating-element <c-c-S> from "<U0063><U0063><U0053>"
collating-element <c-c-s> from "<U0063><U0063><U0073>"
+collating-symbol <d_or_dz>
collating-symbol <dz>
collating-element <D-Z> from "<U0044><U005A>"
collating-element <D-z> from "<U0044><U007A>"
@@ -98,6 +110,7 @@ collating-element <d-D-z> from "<U0064><U0044><U007A>"
collating-element <d-d-Z> from "<U0064><U0064><U005A>"
collating-element <d-d-z> from "<U0064><U0064><U007A>"
+collating-symbol <d_or_dzs>
collating-symbol <dzs>
collating-element <D-Z-S> from "<U0044><U005A><U0053>"
collating-element <D-Z-s> from "<U0044><U005A><U0073>"
@@ -124,6 +137,7 @@ collating-element <d-d-Z-s> from "<U0064><U0064><U005A><U0073>"
collating-element <d-d-z-S> from "<U0064><U0064><U007A><U0053>"
collating-element <d-d-z-s> from "<U0064><U0064><U007A><U0073>"
+collating-symbol <g_or_gy>
collating-symbol <gy>
collating-element <G-Y> from "<U0047><U0059>"
collating-element <G-y> from "<U0047><U0079>"
@@ -138,6 +152,7 @@ collating-element <g-G-y> from "<U0067><U0047><U0079>"
collating-element <g-g-Y> from "<U0067><U0067><U0059>"
collating-element <g-g-y> from "<U0067><U0067><U0079>"
+collating-symbol <l_or_ly>
collating-symbol <ly>
collating-element <L-Y> from "<U004C><U0059>"
collating-element <L-y> from "<U004C><U0079>"
@@ -152,6 +167,7 @@ collating-element <l-L-y> from "<U006C><U004C><U0079>"
collating-element <l-l-Y> from "<U006C><U006C><U0059>"
collating-element <l-l-y> from "<U006C><U006C><U0079>"
+collating-symbol <n_or_ny>
collating-symbol <ny>
collating-element <N-Y> from "<U004E><U0059>"
collating-element <N-y> from "<U004E><U0079>"
@@ -166,6 +182,7 @@ collating-element <n-N-y> from "<U006E><U004E><U0079>"
collating-element <n-n-Y> from "<U006E><U006E><U0059>"
collating-element <n-n-y> from "<U006E><U006E><U0079>"
+collating-symbol <s_or_sz>
collating-symbol <sz>
collating-element <S-Z> from "<U0053><U005A>"
collating-element <S-z> from "<U0053><U007A>"
@@ -180,6 +197,7 @@ collating-element <s-S-z> from "<U0073><U0053><U007A>"
collating-element <s-s-Z> from "<U0073><U0073><U005A>"
collating-element <s-s-z> from "<U0073><U0073><U007A>"
+collating-symbol <t_or_ty>
collating-symbol <ty>
collating-element <T-Y> from "<U0054><U0059>"
collating-element <T-y> from "<U0054><U0079>"
@@ -194,6 +212,7 @@ collating-element <t-T-y> from "<U0074><U0054><U0079>"
collating-element <t-t-Y> from "<U0074><U0074><U0059>"
collating-element <t-t-y> from "<U0074><U0074><U0079>"
+collating-symbol <z_or_zs>
collating-symbol <zs>
collating-element <Z-S> from "<U005A><U0053>"
collating-element <Z-s> from "<U005A><U0073>"
@@ -234,25 +253,34 @@ reorder-after <CAP>
<CAP-CAP-CAP>
reorder-after <c>
+<c_or_cs>
<cs>
reorder-after <d>
+<d_or_dz>
+<d_or_dzs>
<dz>
<dzs>
reorder-after <g>
+<g_or_gy>
<gy>
reorder-after <l>
+<l_or_ly>
<ly>
reorder-after <n>
+<n_or_ny>
<ny>
reorder-after <o>
<odouble>
reorder-after <s>
+<s_or_sz>
<sz>
reorder-after <t>
+<t_or_ty>
<ty>
reorder-after <u>
<udouble>
reorder-after <z>
+<z_or_zs>
<zs>
reorder-after <o>
@@ -270,149 +298,149 @@ reorder-after <u>
reorder-after <U0043>
<C-S> <cs>;<BAS>;<CAP>;IGNORE
<C-s> <cs>;<BAS>;<CAP-MIN>;IGNORE
-<C-C-S> "<cs><cs>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<C-C-s> "<cs><cs>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<C-c-S> "<cs><cs>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<C-c-s> "<cs><cs>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<C-C-S> "<c_or_cs><cs>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<C-C-s> "<c_or_cs><cs>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<C-c-S> "<c_or_cs><cs>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<C-c-s> "<c_or_cs><cs>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U0063>
<c-S> <cs>;<BAS>;<MIN-CAP>;IGNORE
<c-s> <cs>;<BAS>;<MIN>;IGNORE
-<c-C-S> "<cs><cs>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<c-C-s> "<cs><cs>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<c-c-S> "<cs><cs>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<c-c-s> "<cs><cs>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<c-C-S> "<c_or_cs><cs>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<c-C-s> "<c_or_cs><cs>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<c-c-S> "<c_or_cs><cs>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<c-c-s> "<c_or_cs><cs>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U0044>
<D-Z> <dz>;<BAS>;<CAP>;IGNORE
<D-z> <dz>;<BAS>;<CAP-MIN>;IGNORE
-<D-D-Z> "<dz><dz>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<D-D-z> "<dz><dz>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<D-d-Z> "<dz><dz>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<D-d-z> "<dz><dz>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<D-D-Z> "<d_or_dz><dz>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<D-D-z> "<d_or_dz><dz>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<D-d-Z> "<d_or_dz><dz>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<D-d-z> "<d_or_dz><dz>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U0064>
<d-Z> <dz>;<BAS>;<MIN-CAP>;IGNORE
<d-z> <dz>;<BAS>;<MIN>;IGNORE
-<d-D-Z> "<dz><dz>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<d-D-z> "<dz><dz>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<d-d-Z> "<dz><dz>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<d-d-z> "<dz><dz>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<d-D-Z> "<d_or_dz><dz>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<d-D-z> "<d_or_dz><dz>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<d-d-Z> "<d_or_dz><dz>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<d-d-z> "<d_or_dz><dz>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U0044>
<D-Z-S> <dzs>;<BAS>;<CAP-CAP-CAP>;IGNORE
<D-Z-s> <dzs>;<BAS>;<CAP-CAP-MIN>;IGNORE
<D-z-S> <dzs>;<BAS>;<CAP-MIN-CAP>;IGNORE
<D-z-s> <dzs>;<BAS>;<CAP-MIN-MIN>;IGNORE
-<D-D-Z-S> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-CAP>";IGNORE
-<D-D-Z-s> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-MIN>";IGNORE
-<D-D-z-S> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-CAP>";IGNORE
-<D-D-z-s> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-MIN>";IGNORE
-<D-d-Z-S> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-CAP>";IGNORE
-<D-d-Z-s> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-MIN>";IGNORE
-<D-d-z-S> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-CAP>";IGNORE
-<D-d-z-s> "<dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-MIN>";IGNORE
+<D-D-Z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-CAP>";IGNORE
+<D-D-Z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-MIN>";IGNORE
+<D-D-z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-CAP>";IGNORE
+<D-D-z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-MIN>";IGNORE
+<D-d-Z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-CAP>";IGNORE
+<D-d-Z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-CAP-MIN>";IGNORE
+<D-d-z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-CAP>";IGNORE
+<D-d-z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<CAP><CAP-MIN-MIN>";IGNORE
reorder-after <U0064>
<d-Z-S> <dzs>;<BAS>;<MIN-CAP-CAP>;IGNORE
<d-Z-s> <dzs>;<BAS>;<MIN-CAP-MIN>;IGNORE
<d-z-S> <dzs>;<BAS>;<MIN-MIN-CAP>;IGNORE
<d-z-s> <dzs>;<BAS>;<MIN-MIN-MIN>;IGNORE
-<d-D-Z-S> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-CAP>";IGNORE
-<d-D-Z-s> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-MIN>";IGNORE
-<d-D-z-S> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-CAP>";IGNORE
-<d-D-z-s> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-MIN>";IGNORE
-<d-d-Z-S> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-CAP>";IGNORE
-<d-d-Z-s> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-MIN>";IGNORE
-<d-d-z-S> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-CAP>";IGNORE
-<d-d-z-s> "<dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-MIN>";IGNORE
+<d-D-Z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-CAP>";IGNORE
+<d-D-Z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-MIN>";IGNORE
+<d-D-z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-CAP>";IGNORE
+<d-D-z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-MIN>";IGNORE
+<d-d-Z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-CAP>";IGNORE
+<d-d-Z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-CAP-MIN>";IGNORE
+<d-d-z-S> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-CAP>";IGNORE
+<d-d-z-s> "<d_or_dzs><dzs>";"<BAS><BAS>";"<MIN><CAP-MIN-MIN>";IGNORE
reorder-after <U0047>
<G-Y> <gy>;<BAS>;<CAP>;IGNORE
<G-y> <gy>;<BAS>;<CAP-MIN>;IGNORE
-<G-G-Y> "<gy><gy>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<G-G-y> "<gy><gy>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<G-g-Y> "<gy><gy>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<G-g-y> "<gy><gy>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<G-G-Y> "<g_or_gy><gy>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<G-G-y> "<g_or_gy><gy>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<G-g-Y> "<g_or_gy><gy>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<G-g-y> "<g_or_gy><gy>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U0067>
<g-y> <gy>;<BAS>;<MIN>;IGNORE
<g-Y> <gy>;<BAS>;<MIN-CAP>;IGNORE
-<g-G-Y> "<gy><gy>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<g-G-y> "<gy><gy>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<g-g-Y> "<gy><gy>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<g-g-y> "<gy><gy>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<g-G-Y> "<g_or_gy><gy>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<g-G-y> "<g_or_gy><gy>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<g-g-Y> "<g_or_gy><gy>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<g-g-y> "<g_or_gy><gy>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U004C>
<L-Y> <ly>;<BAS>;<CAP>;IGNORE
<L-y> <ly>;<BAS>;<CAP-MIN>;IGNORE
-<L-L-Y> "<ly><ly>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<L-L-y> "<ly><ly>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<L-l-Y> "<ly><ly>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<L-l-y> "<ly><ly>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<L-L-Y> "<l_or_ly><ly>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<L-L-y> "<l_or_ly><ly>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<L-l-Y> "<l_or_ly><ly>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<L-l-y> "<l_or_ly><ly>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U006C>
<l-y> <ly>;<BAS>;<MIN>;IGNORE
<l-Y> <ly>;<BAS>;<MIN-CAP>;IGNORE
-<l-L-Y> "<ly><ly>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<l-L-y> "<ly><ly>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<l-l-Y> "<ly><ly>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<l-l-y> "<ly><ly>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<l-L-Y> "<l_or_ly><ly>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<l-L-y> "<l_or_ly><ly>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<l-l-Y> "<l_or_ly><ly>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<l-l-y> "<l_or_ly><ly>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U004E>
<N-Y> <ny>;<BAS>;<CAP>;IGNORE
<N-y> <ny>;<BAS>;<CAP-MIN>;IGNORE
-<N-N-Y> "<ny><ny>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<N-N-y> "<ny><ny>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<N-n-Y> "<ny><ny>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<N-n-y> "<ny><ny>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<N-N-Y> "<n_or_ny><ny>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<N-N-y> "<n_or_ny><ny>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<N-n-Y> "<n_or_ny><ny>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<N-n-y> "<n_or_ny><ny>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U006E>
<n-y> <ny>;<BAS>;<MIN>;IGNORE
<n-Y> <ny>;<BAS>;<MIN-CAP>;IGNORE
-<n-N-Y> "<ny><ny>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<n-N-y> "<ny><ny>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<n-n-Y> "<ny><ny>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<n-n-y> "<ny><ny>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<n-N-Y> "<n_or_ny><ny>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<n-N-y> "<n_or_ny><ny>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<n-n-Y> "<n_or_ny><ny>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<n-n-y> "<n_or_ny><ny>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U0053>
<S-Z> <sz>;<BAS>;<CAP>;IGNORE
<S-z> <sz>;<BAS>;<CAP-MIN>;IGNORE
-<S-S-Z> "<sz><sz>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<S-S-z> "<sz><sz>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<S-s-Z> "<sz><sz>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<S-s-z> "<sz><sz>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<S-S-Z> "<s_or_sz><sz>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<S-S-z> "<s_or_sz><sz>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<S-s-Z> "<s_or_sz><sz>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<S-s-z> "<s_or_sz><sz>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U0073>
<s-Z> <sz>;<BAS>;<MIN-CAP>;IGNORE
<s-z> <sz>;<BAS>;<MIN>;IGNORE
-<s-S-Z> "<sz><sz>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<s-S-z> "<sz><sz>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<s-s-Z> "<sz><sz>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<s-s-z> "<sz><sz>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<s-S-Z> "<s_or_sz><sz>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<s-S-z> "<s_or_sz><sz>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<s-s-Z> "<s_or_sz><sz>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<s-s-z> "<s_or_sz><sz>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U0054>
<T-Y> <ty>;<BAS>;<CAP>;IGNORE
<T-y> <ty>;<BAS>;<CAP-MIN>;IGNORE
-<T-T-Y> "<ty><ty>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<T-T-y> "<ty><ty>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<T-t-Y> "<ty><ty>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<T-t-y> "<ty><ty>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<T-T-Y> "<t_or_ty><ty>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<T-T-y> "<t_or_ty><ty>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<T-t-Y> "<t_or_ty><ty>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<T-t-y> "<t_or_ty><ty>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U0074>
<t-Y> <ty>;<BAS>;<MIN-CAP>;IGNORE
<t-y> <ty>;<BAS>;<MIN>;IGNORE
-<t-T-Y> "<ty><ty>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<t-T-y> "<ty><ty>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<t-t-Y> "<ty><ty>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<t-t-y> "<ty><ty>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<t-T-Y> "<t_or_ty><ty>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<t-T-y> "<t_or_ty><ty>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<t-t-Y> "<t_or_ty><ty>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<t-t-y> "<t_or_ty><ty>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-after <U005A>
<Z-S> <zs>;<BAS>;<CAP>;IGNORE
<Z-s> <zs>;<BAS>;<CAP-MIN>;IGNORE
-<Z-Z-S> "<zs><zs>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
-<Z-Z-s> "<zs><zs>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
-<Z-z-S> "<zs><zs>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
-<Z-z-s> "<zs><zs>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
+<Z-Z-S> "<z_or_zs><zs>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
+<Z-Z-s> "<z_or_zs><zs>";"<BAS><BAS>";"<CAP><CAP-MIN>";IGNORE
+<Z-z-S> "<z_or_zs><zs>";"<BAS><BAS>";"<CAP><MIN-CAP>";IGNORE
+<Z-z-s> "<z_or_zs><zs>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
reorder-after <U007A>
<z-S> <zs>;<BAS>;<MIN-CAP>;IGNORE
<z-s> <zs>;<BAS>;<MIN>;IGNORE
-<z-Z-S> "<zs><zs>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
-<z-Z-s> "<zs><zs>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
-<z-z-S> "<zs><zs>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
-<z-z-s> "<zs><zs>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<z-Z-S> "<z_or_zs><zs>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
+<z-Z-s> "<z_or_zs><zs>";"<BAS><BAS>";"<MIN><CAP-MIN>";IGNORE
+<z-z-S> "<z_or_zs><zs>";"<BAS><BAS>";"<MIN><MIN-CAP>";IGNORE
+<z-z-s> "<z_or_zs><zs>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
reorder-end