From 975daa69acfba189e0d58ef4f6b00cb944eac6c3 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 28 Jul 2008 21:33:34 +0000 Subject: Add collation sequence for no_NO. The same sequence applies to nb_NO and nn_NO, which are symlinked to no_NO. The patch in the PR contained a number of errors apparently based on (sometimes incorrect) pronunciation; for instance, v and w are distinct letters and should be collated in that order, even if they are pronounced the same, while should be collated with u, even though it is often mispronounced as y. For lack of a solid reference, I have taken sv_SE and simply changed the last three letters of the alphabet. PR: conf/51920 MFC after: 2 weeks --- share/colldef/Makefile | 10 +++++++--- share/colldef/no_NO.ISO8859-1.src | 40 ++++++++++++++++++++++++++++++++++++++ share/colldef/no_NO.ISO8859-15.src | 40 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 share/colldef/no_NO.ISO8859-1.src create mode 100644 share/colldef/no_NO.ISO8859-15.src (limited to 'share/colldef') diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 8d4281f..be21dfc 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -23,6 +23,8 @@ LOCALES= bg_BG.CP1251 \ la_LN.ISO8859-2 \ la_LN.ISO8859-4 \ la_LN.US-ASCII \ + no_NO.ISO8859-1 \ + no_NO.ISO8859-15 \ lt_LT.ISO8859-4 \ lt_LT.ISO8859-13 \ pl_PL.ISO8859-2 \ @@ -65,9 +67,11 @@ ISO8859-1_Big5= is_IS:zh_TW ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \ - fr_BE fr_CA fr_CH fr_FR it_CH it_IT nb_NO nl_BE nl_NL \ - nn_NO no_NO pt_PT -ISO8859-15_ISO8859-15= de_DE:de_AT de_DE:de_CH ${LATIN1LINKS:C/^/la_LN:/} + fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT +ISO8859-15_ISO8859-15= \ + de_DE:de_AT de_DE:de_CH \ + no_NO:nb_NO no_NO:nn_NO \ + ${LATIN1LINKS:C/^/la_LN:/} LATIN2LINKS= hr_HR hu_HU ro_RO sr_YU ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} cs_CZ:sk_SK diff --git a/share/colldef/no_NO.ISO8859-1.src b/share/colldef/no_NO.ISO8859-1.src new file mode 100644 index 0000000..5ec4f8c --- /dev/null +++ b/share/colldef/no_NO.ISO8859-1.src @@ -0,0 +1,40 @@ +# Norwegian/ISO 8859-1 (backward compatible with ASCII) +# +# (Based on the Swedish sv_SE.ISO_8859-1) +# +# $FreeBSD$ +# +charmap map.ISO8859-1 +order \ +# controls + ;...;;;...;;\ +# + ;;!;;\";<<<>;/>>;;\ + ;;;;;\ + %;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\ +# digits + (0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ +# + :;\;;\<;=;>;?;;;;;;;\ +# capital + (A,,,>,);\ + B;(C,);(D,);(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,,>);\ + P;...;T;(U,,,>,);\ + V;W;X;(Y,);Z;(,);(,);;\ + ;\ +# + [;\\;];^;<':>;_;<'m>;<''>;`;\ +# small + (a,,,>,);\ + b;(c,);(d,);(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,,>);\ + p;...;t;(u,,,>,);\ + v;w;x;(y,,);z;(,);(,);;\ + ;\ +# + \{;;|;;\};~;<.M>;;;
;\ +# remains + <-a>;<-o> -- cgit v1.1
;\ +# remains + <-a>;;<-o> diff --git a/share/colldef/no_NO.ISO8859-15.src b/share/colldef/no_NO.ISO8859-15.src new file mode 100644 index 0000000..8812d04 --- /dev/null +++ b/share/colldef/no_NO.ISO8859-15.src @@ -0,0 +1,40 @@ +# Norwegian/ISO 8859-15 (backward compatible with ASCII) +# +# (Based on the Swedish sv_SE.ISO_8859-15) +# +# $FreeBSD$ +# +charmap map.ISO8859-15 +order \ +# controls + ;...;;;...;;\ +# + ;;!;;\";<<<>;/>>;;\ + ;;;;;\ + %;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\ +# digits + 0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\ +# + :;\;;\<;=;>;?;;;;;;;\ +# capital + (A,,,>,);\ + B;(C,);(D,);(E,,,>,);\ + F;G;H;(I,,,>,);\ + J;...;M;(N,);(O,,,,>,);\ + P;Q;R;(S,);T;(U,,,>,);\ + V;W;X;(Y,,);(Z,);(,);(,);;\ + ;\ +# + [;\\;];^;_;<'m>;`;\ +# small + (a,,,>,);\ + b;(c,);(d,);(e,,,>,);\ + f;g;h;(i,,,>,);\ + j;...;m;(n,);(o,,,,>,);\ + p;q;r;(s,,);t;(u,,,>,);\ + v;w;x;(y,,);(z,);(,);(,);;\ + ;\ +# + \{;;|;\};~;<.M>;;;