Fixes to reflect corresponding standards

4 files changed, 121 insertions, 118 deletions

diff --git a/share/colldef/map.CP866 b/share/colldef/map.CP866
index 0311771..16f09b4 100644
--- a/share/colldef/map.CP866
+++ b/share/colldef/map.CP866
@@ -1,3 +1,4 @@
+# $FreeBSD$
 NU \x00
 SH \x01
 SX \x02
@@ -44,111 +45,14 @@ At \x40
 !) \x7d
 '? \x7e
 DT \x7f
-hh \xc4
-vv \xb3
-dr \xda
-dl \xbf
-ur \xc0
-ul \xd9
-vr \xc3
-vl \xb4
-dh \xc2
-uh \xc1
-vh \xc5
-TB \xdf
-LB \xdc
-FB \xdb
-lB \xdd
-RB \xde
-.S \xb0
-:S \xb1
-?S \xb2
-Iu \xf4
-fS \xfe
-sb \xf9
-RT \xfb
-?2 \xf7
-=< \xf3
->= \xf2
-NS \xff
-Il \xf5
-DG \xf8
-2S \xfd
-.M \xfa
--: \xf6
-HH \xcd
-VV \xba
-dR \xd5
-io \xf1
-Dr \xd6
-DR \xc9
-dL \xb8
-Dl \xb7
-LD \xbb
-uR \xd4
-Ur \xd3
-UR \xc8
-uL \xbe
-Ul \xbd
-UL \xbc
-vR \xc6
-Vr \xc7
-VR \xcc
-vL \xb5
-IO \xf0
-Vl \xb6
-VL \xb9
-dH \xd1
-Dh \xd2
-DH \xcb
-uH \xcf
-Uh \xd0
-UH \xca
-vH \xd8
-Vh \xd7
-VH \xce
-Co \xfc
-ju \xee
-a= \xa0
-b= \xa1
-c= \xe6
-d= \xa4
-e= \xa5
-f= \xe4
-g= \xa3
-h= \xe5
-i= \xa8
-j= \xa9
-k= \xaa
-l= \xab
-m= \xac
-n= \xad
-o= \xae
-p= \xaf
-ja \xef
-r= \xe0
-s= \xe1
-t= \xe2
-u= \xe3
-z% \xa6
-v= \xa2
-%' \xec
-y= \xeb
-z= \xa7
-s% \xe8
-je \xed
-sc \xe9
-c% \xe7
-=' \xea
-JU \x9e
 A= \x80
 B= \x81
-C= \x96
+V= \x82
+G= \x83
 D= \x84
 E= \x85
-F= \x94
-G= \x83
-H= \x95
+Z% \x86
+Z= \x87
 I= \x88
 J= \x89
 K= \x8a
@@ -157,18 +61,115 @@ M= \x8c
 N= \x8d
 O= \x8e
 P= \x8f
-JA \x9f
 R= \x90
 S= \x91
 T= \x92
 U= \x93
-Z% \x86
-V= \x82
-%" \x9c
-Y= \x9b
-Z= \x87
+F= \x94
+H= \x95
+C= \x96
+C% \x97
 S% \x98
-JE \x9d
 Sc \x99
-C% \x97
 =" \x9a
+Y= \x9b
+%" \x9c
+JE \x9d
+JU \x9e
+JA \x9f
+a= \xa0
+b= \xa1
+v= \xa2
+g= \xa3
+d= \xa4
+e= \xa5
+z% \xa6
+z= \xa7
+i= \xa8
+j= \xa9
+k= \xaa
+l= \xab
+m= \xac
+n= \xad
+o= \xae
+p= \xaf
+.S \xb0
+:S \xb1
+?S \xb2
+vv \xb3
+vl \xb4
+vL \xb5
+Vl \xb6
+Dl \xb7
+dL \xb8
+VL \xb9
+VV \xba
+LD \xbb
+UL \xbc
+Ul \xbd
+uL \xbe
+dl \xbf
+ur \xc0
+uh \xc1
+dh \xc2
+vr \xc3
+hh \xc4
+vh \xc5
+vR \xc6
+Vr \xc7
+UR \xc8
+DR \xc9
+UH \xca
+DH \xcb
+VR \xcc
+HH \xcd
+VH \xce
+uH \xcf
+Uh \xd0
+dH \xd1
+Dh \xd2
+Ur \xd3
+uR \xd4
+dR \xd5
+Dr \xd6
+Vh \xd7
+vH \xd8
+ul \xd9
+dr \xda
+FB \xdb
+LB \xdc
+lB \xdd
+RB \xde
+TB \xdf
+r= \xe0
+s= \xe1
+t= \xe2
+u= \xe3
+f= \xe4
+h= \xe5
+c= \xe6
+c% \xe7
+s% \xe8
+sc \xe9
+=' \xea
+y= \xeb
+%' \xec
+je \xed
+ju \xee
+ja \xef
+IO \xf0
+io \xf1
+IE \xf2
+ie \xf3
+YI \xf4
+yi \xf5
+V% \xf6
+v% \xf7
+DG \xf8
+Sb \xf9
+.M \xfa
+RT \xfb
+N0 \xfc
+Cu \xfd
+fS \xfe
+NS \xff
diff --git a/share/colldef/map.KOI8-R b/share/colldef/map.KOI8-R
index 180568f..62dd2f45 100644
--- a/share/colldef/map.KOI8-R
+++ b/share/colldef/map.KOI8-R
@@ -1,3 +1,4 @@
+# $FreeBSD$
 NU \x00
 SH \x01
 SX \x02
@@ -65,7 +66,7 @@ RB \x8f
 ?S \x92
 Iu \x93
 fS \x94
-sb \x95
+Sb \x95
 RT \x96
 ?2 \x97
 =< \x98
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 873f7af..425cb30 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -7,12 +7,12 @@ order \
 # controls
 	<NU>;...;<US>;\
 #
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
+	<NS>;<SP>;!;\";<Nb>;<Cu>;<DO>;\
+	%;&;';\(;\);*;+;\,;-;.;/;\
 # digits
-	0;1;(2,<2S>);3;...;9;\
+	0;...;9;\
 #
-	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
+	:;\;;\<;=;>;?;<At>;\
 # capital
 	A;...;Z;\
 	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
@@ -28,12 +28,13 @@ order \
 	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
 	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
 #
-	\{;|;\};~;<.M>;<DG>;\
+	\{;|;\};~;<.M>;<DG>;<Sb>;<N0>;<RT>;\
 #
-	<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>;<DT>
+	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;<DT>;\
+#
+	<IE>;<ie>;<YI>;<yi>;<V%>;<v%>
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index 3c12ed3..f7c69d2 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -30,7 +30,7 @@ order \
 #
 	\{;|;\};~;<.M>;<DG>;\
 #
-	<sb>;<RT>;<?2>;<Iu>;<Il>;\
+	<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>;\