From 4cf3b4ce6cf8a050fd449126ff82b8ce612fc33a Mon Sep 17 00:00:00 2001 From: ache Date: Tue, 22 Oct 1996 23:27:56 +0000 Subject: [PATCH] Use same primary / different secondary order for umlauts and digits parts --- share/colldef/la_LN.ISO8859-1.src | 26 +++++++++++------------ share/colldef/la_LN.ISO_8859-1.src | 26 +++++++++++------------ share/colldef/lt_LN.ISO_8859-1.src | 26 +++++++++++------------ share/colldef/ru_RU.CP866.src | 2 +- share/colldef/ru_RU.KOI8-R.src | 2 +- share/colldef/ru_SU.CP866.src | 2 +- share/colldef/ru_SU.KOI8-R.src | 2 +- usr.bin/colldef/data/lt_LN.ISO_8859-1.src | 26 +++++++++++------------ usr.bin/colldef/data/ru_SU.CP866.src | 2 +- usr.bin/colldef/data/ru_SU.KOI8-R.src | 2 +- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src index 791b78b89370..59581d1cb7dc 100644 --- a/share/colldef/la_LN.ISO8859-1.src +++ b/share/colldef/la_LN.ISO8859-1.src @@ -11,22 +11,22 @@ order \ # controls ;...;;;...;;
;;...;;\ # digits - 0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\ + (0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ # capital - A;;;>;;;;;\ - B;C;;D;E;;;>;;\ - F;...;I;;;>;;\ - J;...;N;;O;;;>;;;;\ - P;...;U;;;>;;\ - V;...;Y;;Z;\ + (A,,,>,,,,);\ + B;(C,);D;(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,>,,,);\ + P;...;T;(U,,,>,);\ + V;W;X;(Y,);Z;\ ;;\ # small - a;;;>;;;;;\ - b;c;;d;e;;;>;;\ - f;...;i;;;>;;\ - j;...;n;;o;;;>;;;;\ - p;...;u;;;>;;\ - v;...;y;;;z;\ + (a,,,>,,,,);\ + b;(c,);d;(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,>,,,);\ + p;...;t;(u,,,>,);\ + v;w;x;(y,,);z;\ ;;;\ # remains <-a>;<-o> diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src index 791b78b89370..59581d1cb7dc 100644 --- a/share/colldef/la_LN.ISO_8859-1.src +++ b/share/colldef/la_LN.ISO_8859-1.src @@ -11,22 +11,22 @@ order \ # controls ;...;;;...;;
;;...;;\ # digits - 0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\ + (0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ # capital - A;;;>;;;;;\ - B;C;;D;E;;;>;;\ - F;...;I;;;>;;\ - J;...;N;;O;;;>;;;;\ - P;...;U;;;>;;\ - V;...;Y;;Z;\ + (A,,,>,,,,);\ + B;(C,);D;(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,>,,,);\ + P;...;T;(U,,,>,);\ + V;W;X;(Y,);Z;\ ;;\ # small - a;;;>;;;;;\ - b;c;;d;e;;;>;;\ - f;...;i;;;>;;\ - j;...;n;;o;;;>;;;;\ - p;...;u;;;>;;\ - v;...;y;;;z;\ + (a,,,>,,,,);\ + b;(c,);d;(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,>,,,);\ + p;...;t;(u,,,>,);\ + v;w;x;(y,,);z;\ ;;;\ # remains <-a>;<-o> diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src index 791b78b89370..59581d1cb7dc 100644 --- a/share/colldef/lt_LN.ISO_8859-1.src +++ b/share/colldef/lt_LN.ISO_8859-1.src @@ -11,22 +11,22 @@ order \ # controls ;...;;;...;;
;;...;;\ # digits - 0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\ + (0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ # capital - A;;;>;;;;;\ - B;C;;D;E;;;>;;\ - F;...;I;;;>;;\ - J;...;N;;O;;;>;;;;\ - P;...;U;;;>;;\ - V;...;Y;;Z;\ + (A,,,>,,,,);\ + B;(C,);D;(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,>,,,);\ + P;...;T;(U,,,>,);\ + V;W;X;(Y,);Z;\ ;;\ # small - a;;;>;;;;;\ - b;c;;d;e;;;>;;\ - f;...;i;;;>;;\ - j;...;n;;o;;;>;;;;\ - p;...;u;;;>;;\ - v;...;y;;;z;\ + (a,,,>,,,,);\ + b;(c,);d;(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,>,,,);\ + p;...;t;(u,,,>,);\ + v;w;x;(y,,);z;\ ;;;\ # remains <-a>;<-o> diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src index a9f8fa93c384..a10a5f238847 100644 --- a/share/colldef/ru_RU.CP866.src +++ b/share/colldef/ru_RU.CP866.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\ diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src index a3977d9387d6..cd559425c853 100644 --- a/share/colldef/ru_RU.KOI8-R.src +++ b/share/colldef/ru_RU.KOI8-R.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\ diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src index a9f8fa93c384..a10a5f238847 100644 --- a/share/colldef/ru_SU.CP866.src +++ b/share/colldef/ru_SU.CP866.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\ diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src index a3977d9387d6..cd559425c853 100644 --- a/share/colldef/ru_SU.KOI8-R.src +++ b/share/colldef/ru_SU.KOI8-R.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\ diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src index 791b78b89370..59581d1cb7dc 100644 --- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src +++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src @@ -11,22 +11,22 @@ order \ # controls ;...;;;...;;
;;...;;\ # digits - 0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\ + (0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ # capital - A;;;>;;;;;\ - B;C;;D;E;;;>;;\ - F;...;I;;;>;;\ - J;...;N;;O;;;>;;;;\ - P;...;U;;;>;;\ - V;...;Y;;Z;\ + (A,,,>,,,,);\ + B;(C,);D;(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,>,,,);\ + P;...;T;(U,,,>,);\ + V;W;X;(Y,);Z;\ ;;\ # small - a;;;>;;;;;\ - b;c;;d;e;;;>;;\ - f;...;i;;;>;;\ - j;...;n;;o;;;>;;;;\ - p;...;u;;;>;;\ - v;...;y;;;z;\ + (a,,,>,,,,);\ + b;(c,);d;(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,>,,,);\ + p;...;t;(u,,,>,);\ + v;w;x;(y,,);z;\ ;;;\ # remains <-a>;<-o> diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src index a9f8fa93c384..a10a5f238847 100644 --- a/usr.bin/colldef/data/ru_SU.CP866.src +++ b/usr.bin/colldef/data/ru_SU.CP866.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\ diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src index a3977d9387d6..cd559425c853 100644 --- a/usr.bin/colldef/data/ru_SU.KOI8-R.src +++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src @@ -17,7 +17,7 @@ order \ # controls ;...;;;...;;
;\ # digits - 0;1;2;<2S>;3;...;9;\ + 0;1;(2,<2S>);3;...;9;\ # capital A;...;Z;\ ;;;;;;;;;\