7 files changed, 137 insertions, 91 deletions

diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 59581d1cb7dc..93a2da01484a 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,17 +1,19 @@
-# latin1
+# latin1 (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.ISO_8859-1
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
-	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
-	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
-	<DG>;<My>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
+	<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/>>,<AA>,<A:>,<A?>,<AE>);\
 	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
@@ -20,6 +22,8 @@ order \
 	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
 	V;W;X;(Y,<Y'>);Z;\
 	<D->;<TH>;\
+#
+	[;\\;];^;<':>;_;<'m>;<''>;`;\
 # small
 	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
 	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
@@ -28,5 +32,7 @@ order \
 	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
 	v;w;x;(y,<y'>,<y:>);z;\
 	<d->;<th>;<ss>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
 # remains
 	<-a>;<-o>
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
index 59581d1cb7dc..93a2da01484a 100644
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ b/share/colldef/la_LN.ISO_8859-1.src
@@ -1,17 +1,19 @@
-# latin1
+# latin1 (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.ISO_8859-1
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
-	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
-	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
-	<DG>;<My>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
+	<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/>>,<AA>,<A:>,<A?>,<AE>);\
 	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
@@ -20,6 +22,8 @@ order \
 	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
 	V;W;X;(Y,<Y'>);Z;\
 	<D->;<TH>;\
+#
+	[;\\;];^;<':>;_;<'m>;<''>;`;\
 # small
 	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
 	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
@@ -28,5 +32,7 @@ order \
 	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
 	v;w;x;(y,<y'>,<y:>);z;\
 	<d->;<th>;<ss>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
 # remains
 	<-a>;<-o>
diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src
index 59581d1cb7dc..93a2da01484a 100644
--- a/share/colldef/lt_LN.ISO_8859-1.src
+++ b/share/colldef/lt_LN.ISO_8859-1.src
@@ -1,17 +1,19 @@
-# latin1
+# latin1 (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.ISO_8859-1
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
-	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
-	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
-	<DG>;<My>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
+	<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/>>,<AA>,<A:>,<A?>,<AE>);\
 	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
@@ -20,6 +22,8 @@ order \
 	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
 	V;W;X;(Y,<Y'>);Z;\
 	<D->;<TH>;\
+#
+	[;\\;];^;<':>;_;<'m>;<''>;`;\
 # small
 	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
 	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
@@ -28,5 +32,7 @@ order \
 	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
 	v;w;x;(y,<y'>,<y:>);z;\
 	<d->;<th>;<ss>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
 # remains
 	<-a>;<-o>
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index a10a5f238847..88ca377082a7 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,32 +1,39 @@
-# IBM Code Page 866
+# CP866 (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.CP866
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';<.M>;\";\(;\);[;];\{;\};<Co>;@;\
-	$;*;\\;&;\#;%;+;<-:>;\<;<=<>;=;</>=>;>;|;\
-	<DG>;<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
+	<NU>;...;<US>;\
+#
+	<NS>;<SP>;!;\";<Nb>;<DO>;\
+	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
 # digits
 	0;1;(2,<2S>);3;...;9;\
+#
+	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
 # capital
 	A;...;Z;\
 	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
 	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
 	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
 	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
+#
+	[;\\;];^;_;`;\
 # small
 	a;...;z;\
 	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
 	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
 	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>
+	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
+#
+	\{;|;\};~;<.M>;<DG>;<DT>;\
+#
+	<sb>;<RT>;<?2>;<Iu>;<Il>;\
+	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
+	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
+	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
+	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
+	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
+	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index cd559425c853..f6b0a1877bef 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,32 +1,39 @@
-# koi8-r
+# koi8-r (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.KOI8-R
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';<.M>;\";\(;\);[;];\{;\};<Co>;@;\
-	$;*;\\;&;\#;%;+;<-:>;\<;<=<>;=;</>=>;>;|;\
-	<DG>;<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
+	<NU>;...;<US>;\
+#
+	<NS>;<SP>;!;\";<Nb>;<DO>;\
+	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
 # digits
 	0;1;(2,<2S>);3;...;9;\
+#
+	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
 # capital
 	A;...;Z;\
 	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
 	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
 	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
 	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
+#
+	[;\\;];^;_;`;\
 # small
 	a;...;z;\
 	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
 	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
 	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>
+	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
+#
+	\{;|;\};~;<.M>;<DG>;<DT>;\
+#
+	<sb>;<RT>;<?2>;<Iu>;<Il>;\
+	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
+	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
+	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
+	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
+	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
+	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
index a10a5f238847..88ca377082a7 100644
--- a/share/colldef/ru_SU.CP866.src
+++ b/share/colldef/ru_SU.CP866.src
@@ -1,32 +1,39 @@
-# IBM Code Page 866
+# CP866 (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.CP866
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';<.M>;\";\(;\);[;];\{;\};<Co>;@;\
-	$;*;\\;&;\#;%;+;<-:>;\<;<=<>;=;</>=>;>;|;\
-	<DG>;<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
+	<NU>;...;<US>;\
+#
+	<NS>;<SP>;!;\";<Nb>;<DO>;\
+	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
 # digits
 	0;1;(2,<2S>);3;...;9;\
+#
+	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
 # capital
 	A;...;Z;\
 	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
 	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
 	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
 	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
+#
+	[;\\;];^;_;`;\
 # small
 	a;...;z;\
 	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
 	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
 	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>
+	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
+#
+	\{;|;\};~;<.M>;<DG>;<DT>;\
+#
+	<sb>;<RT>;<?2>;<Iu>;<Il>;\
+	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
+	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
+	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
+	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
+	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
+	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
index cd559425c853..f6b0a1877bef 100644
--- a/share/colldef/ru_SU.KOI8-R.src
+++ b/share/colldef/ru_SU.KOI8-R.src
@@ -1,32 +1,39 @@
-# koi8-r
+# koi8-r (backward compatible with ASCII)
+#
+# $Id$
+#
 charmap map.KOI8-R
 order \
-# spaces
-	<NS>;<SP>;\t;\v;\r;\n;\f;\
-# puncts
-	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';<.M>;\";\(;\);[;];\{;\};<Co>;@;\
-	$;*;\\;&;\#;%;+;<-:>;\<;<=<>;=;</>=>;>;|;\
-	<DG>;<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;\
 # controls
-	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
+	<NU>;...;<US>;\
+#
+	<NS>;<SP>;!;\";<Nb>;<DO>;\
+	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
 # digits
 	0;1;(2,<2S>);3;...;9;\
+#
+	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
 # capital
 	A;...;Z;\
 	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
 	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
 	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
 	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
+#
+	[;\\;];^;_;`;\
 # small
 	a;...;z;\
 	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
 	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
 	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>
+	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
+#
+	\{;|;\};~;<.M>;<DG>;<DT>;\
+#
+	<sb>;<RT>;<?2>;<Iu>;<Il>;\
+	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
+	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
+	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
+	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
+	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
+	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>