From 5373c6c718529fa3cec52c87f35a3f22cff9999d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Wed, 30 Jul 2008 15:37:13 +0000
Subject: [PATCH] According to a proposed Norwegian standard for
 alphabetization of which I've obtained a draft, <u:> is indeed equivalent to
 u (to my surprise), and <th> sorts immediately after z.

The correct ordering is algorithmic (based on the EOR) and can not be
accurately represented as a table.
---
 share/colldef/no_NO.ISO8859-1.src  | 10 ++++++----
 share/colldef/no_NO.ISO8859-15.src | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/share/colldef/no_NO.ISO8859-1.src b/share/colldef/no_NO.ISO8859-1.src
index 5ec4f8cbf97..fe615a2fa2e 100644
--- a/share/colldef/no_NO.ISO8859-1.src
+++ b/share/colldef/no_NO.ISO8859-1.src
@@ -21,9 +21,10 @@ order \
 	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>;\
+	P;...;T;(U,<U'>,<U!>,<U/>>);\
+	V;W;X;(Y,<Y'>,<U:>);Z;\
 	<TH>;\
+	(<AE>,<A:>);(<O//>,<O:>);<AA>;\
 #
 	[;\\;];^;<':>;_;<'m>;<''>;`;\
 # small
@@ -31,9 +32,10 @@ order \
 	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>;\
+	p;...;t;(u,<u'>,<u!>,<u/>>);\
+	v;w;x;(y,<y'>,<y:>,<u:>);z;\
 	<th>;\
+	(<ae>,<a:>);(<o//>,<o:>);<aa>;\
 #
 	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
 # remains
diff --git a/share/colldef/no_NO.ISO8859-15.src b/share/colldef/no_NO.ISO8859-15.src
index 8812d045630..3d5e1e83c5b 100644
--- a/share/colldef/no_NO.ISO8859-15.src
+++ b/share/colldef/no_NO.ISO8859-15.src
@@ -21,9 +21,10 @@ order \
 	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>;\
+	P;Q;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>);\
+	V;W;X;(Y,<Y'>,<Y:>,<U:>);(Z,<Z<>);\
 	<TH>;\
+	(<AE>,<A:>);(<O//>,<O:>);<AA>;\
 #
 	[;\\;];^;_;<'m>;`;\
 # small
@@ -31,9 +32,10 @@ order \
 	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>;\
+	p;q;r;(s,<s<>,<ss>);t;(u,<u'>,<u!>,<u/>>);\
+	v;w;x;(y,<y'>,<y:>,<u:>);(z,<z<>);\
 	<th>;\
+	(<ae>,<a:>);(<o//>,<o:>);<aa>;\
 #
 	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
 # remains