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 <u:> 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

3 files changed, 87 insertions, 3 deletions

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
+	<NU>;...;<US>;<PA>;...;<AC>;\
+#
+	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
+	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
+	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
+# digits
+	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
+#
+	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
+# capital
+	(A,<A'>,<A!>,<A/>>,<A?>);\
+	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
+	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
+	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O?>,<O/>>);\
+	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
+	V;W;X;(Y,<Y'>);Z;(<AE>,<A:>);(<O//>,<O:>);<AA>;\
+	<TH>;\
+#
+	[;\\;];^;<':>;_;<'m>;<''>;`;\
+# small
+	(a,<a'>,<a!>,<a/>>,<a?>);\
+	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
+	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
+	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o?>,<o/>>);\
+	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
+	v;w;x;(y,<y'>,<y:>);z;(<ae>,<a:>);(<o//>,<o:>);<aa>;\
+	<th>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
+# remains
+	<-a>;<ss>;<-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
+	<NU>;...;<US>;<PA>;...;<AC>;\
+#
+	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
+	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
+	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
+# digits
+	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
+#
+	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
+# capital
+	(A,<A'>,<A!>,<A/>>,<A?>);\
+	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
+	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
+	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O?>,<O/>>,<OE>);\
+	P;Q;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
+	V;W;X;(Y,<Y'>,<Y:>);(Z,<Z<>);(<AE>,<A:>);(<O//>,<O:>);<AA>;\
+	<TH>;\
+#
+	[;\\;];^;_;<'m>;`;\
+# small
+	(a,<a'>,<a!>,<a/>>,<a?>);\
+	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
+	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
+	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o?>,<o/>>,<oe>);\
+	p;q;r;(s,<s<>,<ss>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
+	v;w;x;(y,<y'>,<y:>);(z,<z<>);(<ae>,<a:>);(<o//>,<o:>);<aa>;\
+	<th>;\
+#
+	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
+# remains
+	<-a>;<-o>