Save half of LC_COLLATE space

ASCIIfy data files, use RFC1345 symbolic names instead of hex codes
Improve parser and manpage

12 files changed, 857 insertions, 134 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 6e653c6..7114d57 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/11/03 14:53:50 ache Exp $
+# $Id: Makefile,v 1.2 1996/06/24 04:24:30 jkh Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -20,10 +20,14 @@ LATIN1LINKS = \
 .SUFFIXES: .src .out
 
 .src.out:
-	${COLLDEF} -o ${.TARGET} ${.IMPSRC}
+	${COLLDEF} -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC}
 
 all: ${LOCALES:S/$/.out/g}
 
+ru_SU.KOI8-R.out:       map.KOI8-R
+ru_SU.CP866.out:        map.CP866
+lt_LN.ISO_8859-1.out:   map.ISO_8859-1
+
 afterinstall:
 	for l in ${LOCALES}; do \
 		${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out ${LOCALEDIR}/$$l/LC_COLLATE; \
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 54a80b8..791b78b 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,31 +1,32 @@
 # latin1
+charmap map.ISO_8859-1
 order \
 # spaces
-	\xa0;\x20;\t;\v;\r;\n;\f;\
+	<NS>;<SP>;\t;\v;\r;\n;\f;\
 # puncts
-	_;\xaf;\xad;-;\,;\;;:;!;\xa1;?;\xbf;/;.;\xb4;`;^;\xa8;~;\xb7;\
-	\xb8;';\";\xab;\xbb;\(;\);[;];\{;\};\xa7;\xb6;\xa9;\xae;@;\xa4;\
-	\xa2;$;\xa3;\xa5;*;\\;&;\#;%;+;\xb1;\xf7;\xd7;\<;=;\>;\xac;|;\xa6;\
-	\xb0;\xb5;\
+	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
+	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
+	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
+	<DG>;<My>;\
 # controls
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\x80;...;\x9f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
 # digits
-	0;\xbc;\xbd;\xbe;1;\xb9;2;\xb2;3;\xb3;4;...;9;\
+	0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\
 # capital
-	A;\xc1;\xc0;\xc2;\xc5;\xc4;\xc3;\xc6;\
-	B;C;\xc7;D;E;\xc9;\xc8;\xca;\xcb;\
-	F;...;I;\xcd;\xcc;\xce;\xcf;\
-	J;...;N;\xd1;O;\xd3;\xd2;\xd4;\xd6;\xd5;\xd8;\
-	P;...;U;\xda;\xd9;\xdb;\xdc;\
-	V;...;Y;\xdd;Z;\
-	\xd0;\xde;\
+	A;<A'>;<A!>;<A/>>;<AA>;<A:>;<A?>;<AE>;\
+	B;C;<C,>;D;E;<E'>;<E!>;<E/>>;<E:>;\
+	F;...;I;<I'>;<I!>;<I/>>;<I:>;\
+	J;...;N;<N?>;O;<O'>;<O!>;<O/>>;<O:>;<O?>;<O//>;\
+	P;...;U;<U'>;<U!>;<U/>>;<U:>;\
+	V;...;Y;<Y'>;Z;\
+	<D->;<TH>;\
 # small
-	a;\xe1;\xe0;\xe2;\xe5;\xe4;\xe3;\xe6;\
-	b;c;\xe7;d;e;\xe9;\xe8;\xea;\xeb;\
-	f;...;i;\xed;\xec;\xee;\xef;\
-	j;...;n;\xf1;o;\xf3;\xf2;\xf4;\xf6;\xf5;\xf8;\
-	p;...;u;\xfa;\xf9;\xfb;\xfc;\
-	v;...;y;\xfd;\xff;z;\
-	\xf0;\xfe;\xdf;\
+	a;<a'>;<a!>;<a/>>;<aa>;<a:>;<a?>;<ae>;\
+	b;c;<c,>;d;e;<e'>;<e!>;<e/>>;<e:>;\
+	f;...;i;<i'>;<i!>;<i/>>;<i:>;\
+	j;...;n;<n?>;o;<o'>;<o!>;<o/>>;<o:>;<o?>;<o//>;\
+	p;...;u;<u'>;<u!>;<u/>>;<u:>;\
+	v;...;y;<y'>;<y:>;z;\
+	<d->;<th>;<ss>;\
 # remains
-	\xaa;\xba
+	<-a>;<-o>
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
index 54a80b8..791b78b 100644
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ b/share/colldef/la_LN.ISO_8859-1.src
@@ -1,31 +1,32 @@
 # latin1
+charmap map.ISO_8859-1
 order \
 # spaces
-	\xa0;\x20;\t;\v;\r;\n;\f;\
+	<NS>;<SP>;\t;\v;\r;\n;\f;\
 # puncts
-	_;\xaf;\xad;-;\,;\;;:;!;\xa1;?;\xbf;/;.;\xb4;`;^;\xa8;~;\xb7;\
-	\xb8;';\";\xab;\xbb;\(;\);[;];\{;\};\xa7;\xb6;\xa9;\xae;@;\xa4;\
-	\xa2;$;\xa3;\xa5;*;\\;&;\#;%;+;\xb1;\xf7;\xd7;\<;=;\>;\xac;|;\xa6;\
-	\xb0;\xb5;\
+	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
+	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
+	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
+	<DG>;<My>;\
 # controls
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\x80;...;\x9f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
 # digits
-	0;\xbc;\xbd;\xbe;1;\xb9;2;\xb2;3;\xb3;4;...;9;\
+	0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\
 # capital
-	A;\xc1;\xc0;\xc2;\xc5;\xc4;\xc3;\xc6;\
-	B;C;\xc7;D;E;\xc9;\xc8;\xca;\xcb;\
-	F;...;I;\xcd;\xcc;\xce;\xcf;\
-	J;...;N;\xd1;O;\xd3;\xd2;\xd4;\xd6;\xd5;\xd8;\
-	P;...;U;\xda;\xd9;\xdb;\xdc;\
-	V;...;Y;\xdd;Z;\
-	\xd0;\xde;\
+	A;<A'>;<A!>;<A/>>;<AA>;<A:>;<A?>;<AE>;\
+	B;C;<C,>;D;E;<E'>;<E!>;<E/>>;<E:>;\
+	F;...;I;<I'>;<I!>;<I/>>;<I:>;\
+	J;...;N;<N?>;O;<O'>;<O!>;<O/>>;<O:>;<O?>;<O//>;\
+	P;...;U;<U'>;<U!>;<U/>>;<U:>;\
+	V;...;Y;<Y'>;Z;\
+	<D->;<TH>;\
 # small
-	a;\xe1;\xe0;\xe2;\xe5;\xe4;\xe3;\xe6;\
-	b;c;\xe7;d;e;\xe9;\xe8;\xea;\xeb;\
-	f;...;i;\xed;\xec;\xee;\xef;\
-	j;...;n;\xf1;o;\xf3;\xf2;\xf4;\xf6;\xf5;\xf8;\
-	p;...;u;\xfa;\xf9;\xfb;\xfc;\
-	v;...;y;\xfd;\xff;z;\
-	\xf0;\xfe;\xdf;\
+	a;<a'>;<a!>;<a/>>;<aa>;<a:>;<a?>;<ae>;\
+	b;c;<c,>;d;e;<e'>;<e!>;<e/>>;<e:>;\
+	f;...;i;<i'>;<i!>;<i/>>;<i:>;\
+	j;...;n;<n?>;o;<o'>;<o!>;<o/>>;<o:>;<o?>;<o//>;\
+	p;...;u;<u'>;<u!>;<u/>>;<u:>;\
+	v;...;y;<y'>;<y:>;z;\
+	<d->;<th>;<ss>;\
 # remains
-	\xaa;\xba
+	<-a>;<-o>
diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src
index 54a80b8..791b78b 100644
--- a/share/colldef/lt_LN.ISO_8859-1.src
+++ b/share/colldef/lt_LN.ISO_8859-1.src
@@ -1,31 +1,32 @@
 # latin1
+charmap map.ISO_8859-1
 order \
 # spaces
-	\xa0;\x20;\t;\v;\r;\n;\f;\
+	<NS>;<SP>;\t;\v;\r;\n;\f;\
 # puncts
-	_;\xaf;\xad;-;\,;\;;:;!;\xa1;?;\xbf;/;.;\xb4;`;^;\xa8;~;\xb7;\
-	\xb8;';\";\xab;\xbb;\(;\);[;];\{;\};\xa7;\xb6;\xa9;\xae;@;\xa4;\
-	\xa2;$;\xa3;\xa5;*;\\;&;\#;%;+;\xb1;\xf7;\xd7;\<;=;\>;\xac;|;\xa6;\
-	\xb0;\xb5;\
+	_;<'m>;<-->;-;\,;\;;:;!;<!I>;?;<?I>;/;.;<''>;`;^;<':>;~;<.M>;\
+	<',>;';\";<<<>;</>/>>;\(;\);[;];\{;\};<SE>;<PI>;<Co>;<Rg>;@;<Cu>;\
+	<Ct>;$;<Pd>;<Ye>;*;\\;&;\#;%;+;<+->;<-:>;<*X>;\<;=;>;<NO>;|;<BB>;\
+	<DG>;<My>;\
 # controls
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\x80;...;\x9f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;<PA>;...;<AC>;\
 # digits
-	0;\xbc;\xbd;\xbe;1;\xb9;2;\xb2;3;\xb3;4;...;9;\
+	0;<14>;<12>;<34>;1;<1S>;2;<2S>;3;<3S>;4;...;9;\
 # capital
-	A;\xc1;\xc0;\xc2;\xc5;\xc4;\xc3;\xc6;\
-	B;C;\xc7;D;E;\xc9;\xc8;\xca;\xcb;\
-	F;...;I;\xcd;\xcc;\xce;\xcf;\
-	J;...;N;\xd1;O;\xd3;\xd2;\xd4;\xd6;\xd5;\xd8;\
-	P;...;U;\xda;\xd9;\xdb;\xdc;\
-	V;...;Y;\xdd;Z;\
-	\xd0;\xde;\
+	A;<A'>;<A!>;<A/>>;<AA>;<A:>;<A?>;<AE>;\
+	B;C;<C,>;D;E;<E'>;<E!>;<E/>>;<E:>;\
+	F;...;I;<I'>;<I!>;<I/>>;<I:>;\
+	J;...;N;<N?>;O;<O'>;<O!>;<O/>>;<O:>;<O?>;<O//>;\
+	P;...;U;<U'>;<U!>;<U/>>;<U:>;\
+	V;...;Y;<Y'>;Z;\
+	<D->;<TH>;\
 # small
-	a;\xe1;\xe0;\xe2;\xe5;\xe4;\xe3;\xe6;\
-	b;c;\xe7;d;e;\xe9;\xe8;\xea;\xeb;\
-	f;...;i;\xed;\xec;\xee;\xef;\
-	j;...;n;\xf1;o;\xf3;\xf2;\xf4;\xf6;\xf5;\xf8;\
-	p;...;u;\xfa;\xf9;\xfb;\xfc;\
-	v;...;y;\xfd;\xff;z;\
-	\xf0;\xfe;\xdf;\
+	a;<a'>;<a!>;<a/>>;<aa>;<a:>;<a?>;<ae>;\
+	b;c;<c,>;d;e;<e'>;<e!>;<e/>>;<e:>;\
+	f;...;i;<i'>;<i!>;<i/>>;<i:>;\
+	j;...;n;<n?>;o;<o'>;<o!>;<o/>>;<o:>;<o?>;<o//>;\
+	p;...;u;<u'>;<u!>;<u/>>;<u:>;\
+	v;...;y;<y'>;<y:>;z;\
+	<d->;<th>;<ss>;\
 # remains
-	\xaa;\xba
+	<-a>;<-o>
diff --git a/share/colldef/map.CP866 b/share/colldef/map.CP866
new file mode 100644
index 0000000..0311771
--- /dev/null
+++ b/share/colldef/map.CP866
@@ -0,0 +1,174 @@
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \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
+D= \x84
+E= \x85
+F= \x94
+G= \x83
+H= \x95
+I= \x88
+J= \x89
+K= \x8a
+L= \x8b
+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
+S% \x98
+JE \x9d
+Sc \x99
+C% \x97
+=" \x9a
diff --git a/share/colldef/map.ISO8859-1 b/share/colldef/map.ISO8859-1
new file mode 100644
index 0000000..ee5a557
--- /dev/null
+++ b/share/colldef/map.ISO8859-1
@@ -0,0 +1,174 @@
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \x7d
+'? \x7e
+DT \x7f
+PA \x80
+HO \x81
+BH \x82
+NH \x83
+IN \x84
+NL \x85
+SA \x86
+ES \x87
+HS \x88
+HJ \x89
+VS \x8a
+PD \x8b
+PU \x8c
+RI \x8d
+S2 \x8e
+S3 \x8f
+DC \x90
+P1 \x91
+P2 \x92
+TS \x93
+CC \x94
+MW \x95
+SG \x96
+EG \x97
+SS \x98
+GC \x99
+SC \x9a
+CI \x9b
+ST \x9c
+OC \x9d
+PM \x9e
+AC \x9f
+NS \xa0
+!I \xa1
+Ct \xa2
+Pd \xa3
+Cu \xa4
+Ye \xa5
+BB \xa6
+SE \xa7
+': \xa8
+Co \xa9
+-a \xaa
+<< \xab
+NO \xac
+-- \xad
+Rg \xae
+'m \xaf
+DG \xb0
++- \xb1
+2S \xb2
+3S \xb3
+'' \xb4
+My \xb5
+PI \xb6
+.M \xb7
+', \xb8
+1S \xb9
+-o \xba
+>> \xbb
+14 \xbc
+12 \xbd
+34 \xbe
+?I \xbf
+A! \xc0
+A' \xc1
+A> \xc2
+A? \xc3
+A: \xc4
+AA \xc5
+AE \xc6
+C, \xc7
+E! \xc8
+E' \xc9
+E> \xca
+E: \xcb
+I! \xcc
+I' \xcd
+I> \xce
+I: \xcf
+D- \xd0
+N? \xd1
+O! \xd2
+O' \xd3
+O> \xd4
+O? \xd5
+O: \xd6
+*X \xd7
+O/ \xd8
+U! \xd9
+U' \xda
+U> \xdb
+U: \xdc
+Y' \xdd
+TH \xde
+ss \xdf
+a! \xe0
+a' \xe1
+a> \xe2
+a? \xe3
+a: \xe4
+aa \xe5
+ae \xe6
+c, \xe7
+e! \xe8
+e' \xe9
+e> \xea
+e: \xeb
+i! \xec
+i' \xed
+i> \xee
+i: \xef
+d- \xf0
+n? \xf1
+o! \xf2
+o' \xf3
+o> \xf4
+o? \xf5
+o: \xf6
+-: \xf7
+o/ \xf8
+u! \xf9
+u' \xfa
+u> \xfb
+u: \xfc
+y' \xfd
+th \xfe
+y: \xff
diff --git a/share/colldef/map.ISO_8859-1 b/share/colldef/map.ISO_8859-1
new file mode 100644
index 0000000..ee5a557
--- /dev/null
+++ b/share/colldef/map.ISO_8859-1
@@ -0,0 +1,174 @@
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \x7d
+'? \x7e
+DT \x7f
+PA \x80
+HO \x81
+BH \x82
+NH \x83
+IN \x84
+NL \x85
+SA \x86
+ES \x87
+HS \x88
+HJ \x89
+VS \x8a
+PD \x8b
+PU \x8c
+RI \x8d
+S2 \x8e
+S3 \x8f
+DC \x90
+P1 \x91
+P2 \x92
+TS \x93
+CC \x94
+MW \x95
+SG \x96
+EG \x97
+SS \x98
+GC \x99
+SC \x9a
+CI \x9b
+ST \x9c
+OC \x9d
+PM \x9e
+AC \x9f
+NS \xa0
+!I \xa1
+Ct \xa2
+Pd \xa3
+Cu \xa4
+Ye \xa5
+BB \xa6
+SE \xa7
+': \xa8
+Co \xa9
+-a \xaa
+<< \xab
+NO \xac
+-- \xad
+Rg \xae
+'m \xaf
+DG \xb0
++- \xb1
+2S \xb2
+3S \xb3
+'' \xb4
+My \xb5
+PI \xb6
+.M \xb7
+', \xb8
+1S \xb9
+-o \xba
+>> \xbb
+14 \xbc
+12 \xbd
+34 \xbe
+?I \xbf
+A! \xc0
+A' \xc1
+A> \xc2
+A? \xc3
+A: \xc4
+AA \xc5
+AE \xc6
+C, \xc7
+E! \xc8
+E' \xc9
+E> \xca
+E: \xcb
+I! \xcc
+I' \xcd
+I> \xce
+I: \xcf
+D- \xd0
+N? \xd1
+O! \xd2
+O' \xd3
+O> \xd4
+O? \xd5
+O: \xd6
+*X \xd7
+O/ \xd8
+U! \xd9
+U' \xda
+U> \xdb
+U: \xdc
+Y' \xdd
+TH \xde
+ss \xdf
+a! \xe0
+a' \xe1
+a> \xe2
+a? \xe3
+a: \xe4
+aa \xe5
+ae \xe6
+c, \xe7
+e! \xe8
+e' \xe9
+e> \xea
+e: \xeb
+i! \xec
+i' \xed
+i> \xee
+i: \xef
+d- \xf0
+n? \xf1
+o! \xf2
+o' \xf3
+o> \xf4
+o? \xf5
+o: \xf6
+-: \xf7
+o/ \xf8
+u! \xf9
+u' \xfa
+u> \xfb
+u: \xfc
+y' \xfd
+th \xfe
+y: \xff
diff --git a/share/colldef/map.KOI8-R b/share/colldef/map.KOI8-R
new file mode 100644
index 0000000..180568f
--- /dev/null
+++ b/share/colldef/map.KOI8-R
@@ -0,0 +1,174 @@
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \x7d
+'? \x7e
+DT \x7f
+hh \x80
+vv \x81
+dr \x82
+dl \x83
+ur \x84
+ul \x85
+vr \x86
+vl \x87
+dh \x88
+uh \x89
+vh \x8a
+TB \x8b
+LB \x8c
+FB \x8d
+lB \x8e
+RB \x8f
+.S \x90
+:S \x91
+?S \x92
+Iu \x93
+fS \x94
+sb \x95
+RT \x96
+?2 \x97
+=< \x98
+>= \x99
+NS \x9a
+Il \x9b
+DG \x9c
+2S \x9d
+.M \x9e
+-: \x9f
+HH \xa0
+VV \xa1
+dR \xa2
+io \xa3
+Dr \xa4
+DR \xa5
+dL \xa6
+Dl \xa7
+LD \xa8
+uR \xa9
+Ur \xaa
+UR \xab
+uL \xac
+Ul \xad
+UL \xae
+vR \xaf
+Vr \xb0
+VR \xb1
+vL \xb2
+IO \xb3
+Vl \xb4
+VL \xb5
+dH \xb6
+Dh \xb7
+DH \xb8
+uH \xb9
+Uh \xba
+UH \xbb
+vH \xbc
+Vh \xbd
+VH \xbe
+Co \xbf
+ju \xc0
+a= \xc1
+b= \xc2
+c= \xc3
+d= \xc4
+e= \xc5
+f= \xc6
+g= \xc7
+h= \xc8
+i= \xc9
+j= \xca
+k= \xcb
+l= \xcc
+m= \xcd
+n= \xce
+o= \xcf
+p= \xd0
+ja \xd1
+r= \xd2
+s= \xd3
+t= \xd4
+u= \xd5
+z% \xd6
+v= \xd7
+%' \xd8
+y= \xd9
+z= \xda
+s% \xdb
+je \xdc
+sc \xdd
+c% \xde
+=' \xdf
+JU \xe0
+A= \xe1
+B= \xe2
+C= \xe3
+D= \xe4
+E= \xe5
+F= \xe6
+G= \xe7
+H= \xe8
+I= \xe9
+J= \xea
+K= \xeb
+L= \xec
+M= \xed
+N= \xee
+O= \xef
+P= \xf0
+JA \xf1
+R= \xf2
+S= \xf3
+T= \xf4
+U= \xf5
+Z% \xf6
+V= \xf7
+%" \xf8
+Y= \xf9
+Z= \xfa
+S% \xfb
+JE \xfc
+Sc \xfd
+C% \xfe
+=" \xff
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 2648fd8..a9f8fa9 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,27 +1,32 @@
-# cp866
+# IBM Code Page 866
+charmap map.CP866
 order \
 # spaces
-	�;\ ;\t;\v;\r;\n;\f;\
+	<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
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
 # digits
-	0;1;2;�;3;...;9;\
+	0;1;2;<2S>;3;...;9;\
 # 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>
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index 87a09a0..a3977d9 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,27 +1,32 @@
 # koi8-r
+charmap map.KOI8-R
 order \
 # spaces
-	\x9a;\x20;\t;\v;\r;\n;\f;\
+	<NS>;<SP>;\t;\v;\r;\n;\f;\
 # puncts
 	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';\x9e;\";\(;\);[;];\{;\};\xbf;@;\
-	$;*;\\;&;\#;%;+;\x9f;\<;\x98;=;\x99;\>;|;\
-	\x9c;\x95;\x96;\x97;\x93;\x9b;\
-	\x80;\xa0;\x81;\xa1;\x82;\xa2;\xa4;\xa5;\
-	\x83;\xa6;\xa7;\xa8;\x84;\xa9;\xaa;\xab;\
-	\x85;\xac;\xad;\xae;\x86;\xaf;\xb0;\xb1;\
-	\x87;\xb2;\xb4;\xb5;\x88;\xb6;\xb7;\xb8;\
-	\x89;\xb9;\xba;\xbb;\x8a;\xbc;\xbd;\xbe;\
-	\x8b;\x8c;\x8d;\x8e;\x8f;\x90;\x91;\x92;\x94;\
+	';<.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
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
 # digits
-	0;1;2;\x9d;3;...;9;\
+	0;1;2;<2S>;3;...;9;\
 # 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>
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
index 2648fd8..a9f8fa9 100644
--- a/share/colldef/ru_SU.CP866.src
+++ b/share/colldef/ru_SU.CP866.src
@@ -1,27 +1,32 @@
-# cp866
+# IBM Code Page 866
+charmap map.CP866
 order \
 # spaces
-	�;\ ;\t;\v;\r;\n;\f;\
+	<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
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
 # digits
-	0;1;2;�;3;...;9;\
+	0;1;2;<2S>;3;...;9;\
 # 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>
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
index 87a09a0..a3977d9 100644
--- a/share/colldef/ru_SU.KOI8-R.src
+++ b/share/colldef/ru_SU.KOI8-R.src
@@ -1,27 +1,32 @@
 # koi8-r
+charmap map.KOI8-R
 order \
 # spaces
-	\x9a;\x20;\t;\v;\r;\n;\f;\
+	<NS>;<SP>;\t;\v;\r;\n;\f;\
 # puncts
 	_;-;\,;\;;:;!;?;/;.;`;^;~;\
-	';\x9e;\";\(;\);[;];\{;\};\xbf;@;\
-	$;*;\\;&;\#;%;+;\x9f;\<;\x98;=;\x99;\>;|;\
-	\x9c;\x95;\x96;\x97;\x93;\x9b;\
-	\x80;\xa0;\x81;\xa1;\x82;\xa2;\xa4;\xa5;\
-	\x83;\xa6;\xa7;\xa8;\x84;\xa9;\xaa;\xab;\
-	\x85;\xac;\xad;\xae;\x86;\xaf;\xb0;\xb1;\
-	\x87;\xb2;\xb4;\xb5;\x88;\xb6;\xb7;\xb8;\
-	\x89;\xb9;\xba;\xbb;\x8a;\xbc;\xbd;\xbe;\
-	\x8b;\x8c;\x8d;\x8e;\x8f;\x90;\x91;\x92;\x94;\
+	';<.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
-	\x00;...;\x08;\x0e;...;\x1f;\x7f;\
+	<NU>;...;<BS>;<SO>;...;<US>;<DT>;\
 # digits
-	0;1;2;\x9d;3;...;9;\
+	0;1;2;<2S>;3;...;9;\
 # 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>