Cleanup: cosmetique, standards conformance, BLANK/SPACE/GRAPH relation

15 files changed, 155 insertions, 110 deletions

diff --git a/share/mklocale/bg_BG.CP1251.src b/share/mklocale/bg_BG.CP1251.src
index 9e6c45f..e3a8e55 100644
--- a/share/mklocale/bg_BG.CP1251.src
+++ b/share/mklocale/bg_BG.CP1251.src
@@ -4,34 +4,81 @@
  * $FreeBSD$
  */
 ENCODING	"NONE"
-VARIABLE        Bulgarian Cyrillic character set (CP1251) by roam@ringlet.net
+VARIABLE        Bulgarian Cyrillic character set (CP1251) by <roam@ringlet.net>
 
 #
 # This is a comment
 #
-ALPHA           'A' - 'Z' 'a' - 'z' 0xc0 - 0xdf 0xe0 - 0xff
+ALPHA           'A' - 'Z' 'a' - 'z'
+ALPHA           0x80 0x81 0x83 0x8a 0x8c - 0x90 0x9a 0x9c - 0x9f
+ALPHA           0xa1 - 0xa3 0xa5 0xa8 0xaa 0xaf 0xb2 - 0xb4 0xb8 0xba
+ALPHA           0xbc - 0xff
 CONTROL		0x00 - 0x1f 0x7f
 DIGIT		'0' - '9'
-GRAPH           0x21 - 0x7e 0x80 - 0xff
-LOWER           'a' - 'z' 0xe0 - 0xff
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20
-UPPER           'A' - 'Z' 0xc0 - 0xdf
+GRAPH           0x21 - 0x7e 0x80 - 0x97 0x99 - 0x9f 0xa1 - 0xff
+LOWER           'a' - 'z' 0x83 0x90 0x9a 0x9c - 0x9f 0xa2 0xb3 0xb4 0xb8
+LOWER           0xba 0xbc 0xbe 0xbf 0xe0 - 0xff
+PUNCT           0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
+PUNCT           0x82 0x84 - 0x89 0x8b 0x91 - 0x97 0x99 0x9b 0xa4
+PUNCT           0xa6 0xa7 0xa9 0xab - 0xae 0xb0 0xb1 0xb5 - 0xb7 0xb9 0xbb
+SPACE		0x09 - 0x0d 0x20 0xa0
+UPPER           'A' - 'Z' 0x80 0x81 0x8a 0x8c - 0x8f 0xa1 0xa3 0xa5 0xa8
+UPPER           0xaa 0xaf 0xb2 0xbd 0xc0 - 0xdf
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
-BLANK		' ' '\t'
-PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
+BLANK		' ' '\t' 0xa0
+PRINT           0x20 - 0x7e 0x80 - 0x97 0x99 - 0xff
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
+MAPLOWER        <0x80 0x90>
+MAPLOWER        <0x81 0x83>
+MAPLOWER        <0x83 0x83>
+MAPLOWER        <0x8a - 0x8f : 0x9a>
+MAPLOWER        <0x90 0x90>
+MAPLOWER        <0x9a - 0x9f : 0x9a>
+MAPLOWER        <0xa1 0xa2>
+MAPLOWER        <0xa2 0xa2>
+MAPLOWER        <0xa3 0xbc>
+MAPLOWER        <0xa5 0xb4>
+MAPLOWER        <0xa8 0xb8>
+MAPLOWER        <0xaa 0xba>
+MAPLOWER        <0xaf 0xbf>
+MAPLOWER        <0xb2 0xb3>
+MAPLOWER        <0xb3 - 0xb4 : 0xb3>
+MAPLOWER        <0xb8 0xb8>
+MAPLOWER        <0xba 0xba>
+MAPLOWER        <0xbc 0xbc>
+MAPLOWER        <0xbd 0xbe>
+MAPLOWER        <0xbe - 0xbf : 0xbe>
 MAPLOWER        <0xc0 - 0xdf : 0xe0>
 MAPLOWER        <0xe0 - 0xff : 0xe0>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
+MAPUPPER        <0x80 - 0x81 : 0x80>
+MAPUPPER        <0x83 0x81>
+MAPUPPER        <0x8a - 0x8f : 0x8a>
+MAPUPPER        <0x90 0x80>
+MAPUPPER        <0x9a - 0x9f : 0x8a>
+MAPUPPER        <0xa1 0xa1>
+MAPUPPER        <0xa2 0xa1>
+MAPUPPER        <0xa3 0xa3>
+MAPUPPER        <0xa5 0xa5>
+MAPUPPER        <0xa8 0xa8>
+MAPUPPER        <0xaa 0xaa>
+MAPUPPER        <0xaf 0xaf>
+MAPUPPER        <0xb2 0xb2>
+MAPUPPER        <0xb3 0xb2>
+MAPUPPER        <0xb4 0xa5>
+MAPUPPER        <0xb8 0xa8>
+MAPUPPER        <0xba 0xaa>
+MAPUPPER        <0xbc 0xa3>
+MAPUPPER        <0xbd 0xbd>
+MAPUPPER        <0xbe 0xbd>
+MAPUPPER        <0xbf 0xaf>
 MAPUPPER        <0xc0 - 0xdf : 0xc0>
 MAPUPPER        <0xe0 - 0xff : 0xc0>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/el_GR.ISO8859-7.src b/share/mklocale/el_GR.ISO8859-7.src
index 8b6ce10..aeaba38 100644
--- a/share/mklocale/el_GR.ISO8859-7.src
+++ b/share/mklocale/el_GR.ISO8859-7.src
@@ -5,7 +5,7 @@
  */
 
 ENCODING	"NONE"
-VARIABLE        Greek/ISO8859-7 character set by past@netmode.ntua.gr
+VARIABLE        Greek/ISO8859-7 character set by <past@netmode.ntua.gr>
 
 ALPHA		'A' - 'Z' 'a' - 'z' 0xb6 0xb8 - 0xba 0xbc 0xbe - 0xfe 
 BLANK		' ' '\t' 0xa0
@@ -13,20 +13,15 @@ CONTROL		0x00 - 0x1f 0x7f - 0x9f
 DIGIT		'0' - '9'
 GRAPH		0x21 - 0x7e 0xa1 - 0xff
 PRINT		0x20 - 0x7e 0xa0 - 0xff
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e \
-		0xa1 - 0xb5 0xb7 0xbb 0xbd 
+PUNCT           0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
+PUNCT           0xa1 - 0xb5 0xb7 0xbb 0xbd
 SPACE		0x09 - 0x0d ' ' 0xa0
 UPPER		'A' - 'Z' 0xb6 0xb8 - 0xba 0xbc 0xbe - 0xbf 0xc1 - 0xdb
 LOWER		'a' - 'z' 0xc0 0xdc - 0xfe
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
-
 MAPLOWER	<0xb6 0xdc>
 MAPLOWER	<0xb8 - 0xba : 0xdd>
 MAPLOWER	<0xbc 0xfc>
@@ -35,7 +30,6 @@ MAPLOWER	<0xc1 - 0xdb : 0xe1>
 
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
-
 MAPUPPER	<0xc0 0xda>
 MAPUPPER	<0xdc 0xb6>
 MAPUPPER	<0xdd - 0xdf : 0xb8>
diff --git a/share/mklocale/hi_IN.ISCII-DEV.src b/share/mklocale/hi_IN.ISCII-DEV.src
index 9e8c82d..382f8e7 100644
--- a/share/mklocale/hi_IN.ISCII-DEV.src
+++ b/share/mklocale/hi_IN.ISCII-DEV.src
@@ -12,24 +12,23 @@ ENCODING     "NONE"
 ALPHA		'A' - 'Z' 'a' - 'z' '¡' - 'ê'
 CONTROL		0x00 - 0x1f 0x7f
 DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e
+GRAPH           0x21 - 0x7e 0x80 - 0xfa
 LOWER		'a' - 'z'
 PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
 SPACE		0x09 - 0x0d 0x20
 UPPER		'A' - 'Z'
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t'
-PRINT		0x20 - 0xfa
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
+PRINT           0x20 - 0x7e 0x80 - 0xfa
 
 /* ?DIGIT         'ñ' - 'ú' */
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'ñ' - 'ú' : 0>
 TODIGIT       	<'A' - 'F' : 10>
diff --git a/share/mklocale/ja_JP.SJIS.src b/share/mklocale/ja_JP.SJIS.src
index 5ddffd6..f7ccb39 100644
--- a/share/mklocale/ja_JP.SJIS.src
+++ b/share/mklocale/ja_JP.SJIS.src
@@ -62,7 +62,6 @@ TODIGIT		<'A'-'F':10><'a'-'f':10>
 PUNCT		0xa1-0xa5
 SPACE		0xa0
 BLANK		0xa0
-PRINT		0xa0-0xdf
 SPECIAL		0xa1-0xdf
 PHONOGRAM	0xa6-0xdf
 /* SWIDTH1		0xa0-0xdf*/
@@ -73,6 +72,7 @@ PHONOGRAM	0xa6-0xdf
 /* 100 */
 PUNCT		0x8141-0x8151 0x8159-0x815a 0x815c-0x817e 0x8180-0x819e
 SPACE		0x8140
+BLANK           0x8140
 PHONOGRAM	0x8152-0x8158 0x815b
 
 /* 200 */
diff --git a/share/mklocale/ja_JP.eucJP.src b/share/mklocale/ja_JP.eucJP.src
index 3e62552..d4ec767 100644
--- a/share/mklocale/ja_JP.eucJP.src
+++ b/share/mklocale/ja_JP.eucJP.src
@@ -42,6 +42,7 @@ TODIGIT       	< 'a' - 'f' : 10 >
  */
 
 SPACE		0xa1a1
+BLANK           0xa1a1
 PHONOGRAM	0xa1bc
 SPECIAL     	0xa1a2 - 0xa1fe
 PUNCT		0xa1a2 - 0xa1f8		/* A few too many in here... */
diff --git a/share/mklocale/la_LN.ISO8859-1.src b/share/mklocale/la_LN.ISO8859-1.src
index 82faff3..0545dd1 100644
--- a/share/mklocale/la_LN.ISO8859-1.src
+++ b/share/mklocale/la_LN.ISO8859-1.src
@@ -1,5 +1,7 @@
 /*
- * Standard LOCALE_CTYPE for the iso_8859_1 Locale
+ * Standard LOCALE_CTYPE for the ISO 8859-1 Locale
+ *
+ * $FreeBSD$
  */
 ENCODING	"NONE"
 VARIABLE        ISO 8859-1 Latin-1 character set
@@ -18,9 +20,6 @@ UPPER           'A' - 'Z' 0xc0 - 0xd6 0xd8 - 0xde
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
@@ -28,12 +27,14 @@ MAPLOWER        <0xc0 - 0xd6 : 0xe0>
 MAPLOWER        <0xd8 - 0xde : 0xf8>
 MAPLOWER        <0xdf - 0xf6 : 0xdf>
 MAPLOWER        <0xf8 - 0xff : 0xf8>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER        <0xc0 - 0xd6 : 0xc0>
 MAPUPPER        <0xd8 - 0xde : 0xd8>
 MAPUPPER        <0xe0 - 0xf6 : 0xc0>
 MAPUPPER        <0xf8 - 0xfe : 0xd8>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/la_LN.ISO8859-15.src b/share/mklocale/la_LN.ISO8859-15.src
index 7d89e03..a3bb385 100644
--- a/share/mklocale/la_LN.ISO8859-15.src
+++ b/share/mklocale/la_LN.ISO8859-15.src
@@ -1,8 +1,10 @@
 /*
- * Standard LOCALE_CTYPE for the dis_8859_15 Locale
+ * Standard LOCALE_CTYPE for the ISO 8859-15 Locale
+ *
+ * $FreeBSD$
  */
 ENCODING	"NONE"
-VARIABLE        DIS 8859-15 Latin-9 character set
+VARIABLE        ISO 8859-15 Latin-9 character set
 
 #
 # This is a comment
@@ -18,9 +20,6 @@ UPPER		'A' - 'Z' 0xa6 0xb4 0xbc 0xc0 - 0xd6 0xd8 - 0xde
 XDIGIT		'0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER	<'A' - 'Z' : 'a'>
 MAPLOWER	<'a' - 'z' : 'a'>
@@ -32,6 +31,7 @@ MAPLOWER	<0xc0 - 0xd6 : 0xe0>
 MAPLOWER	<0xd8 - 0xde : 0xf8>
 MAPLOWER	<0xdf - 0xf6 : 0xdf>
 MAPLOWER	<0xf8 - 0xff : 0xf8>
+
 MAPUPPER	<'A' - 'Z' : 'A'>
 MAPUPPER	<'a' - 'z' : 'A'>
 MAPUPPER	<0xa8 - 0xa8 : 0xa6>
@@ -42,6 +42,7 @@ MAPUPPER	<0xd8 - 0xde : 0xd8>
 MAPUPPER	<0xe0 - 0xf6 : 0xc0>
 MAPUPPER	<0xf8 - 0xfe : 0xd8>
 MAPUPPER	<0xff - 0xff : 0xbe>
+
 TODIGIT		<'0' - '9' : 0>
 TODIGIT		<'A' - 'F' : 10>
 TODIGIT		<'a' - 'f' : 10>
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index 43a5e05..9a28807 100644
--- a/share/mklocale/la_LN.ISO8859-2.src
+++ b/share/mklocale/la_LN.ISO8859-2.src
@@ -11,28 +11,25 @@ VARIABLE        ISO 8859-2 Latin-2 character set
 # This is a comment
 #
 ALPHA		'A' - 'Z' 'a' - 'z' 
-		0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae 0xaf 
-		0xb1 0xb3 0xb5 0xb6 0xb9 - 0xbc 0xbe 0xbf 
-		0xc0 - 0xd6 0xd8 - 0xf6 0xf8 - 0xfe
+ALPHA           0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae 0xaf
+ALPHA           0xb1 0xb3 0xb5 0xb6 0xb9 - 0xbc 0xbe 0xbf
+ALPHA           0xc0 - 0xd6 0xd8 - 0xf6 0xf8 - 0xfe
 CONTROL		0x00 - 0x1f 0x7f - 0x9f
 DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e 0xa0 - 0xff
+GRAPH           0x21 - 0x7e 0xa1 - 0xff
 LOWER		'a' - 'z' 
-		0xb1 0xb3 0xb5 0xb6 0xb9 - 0xbc 0xbe 0xbf 
-		0xdf - 0xf6 0xf8 - 0xfe
+LOWER           0xb1 0xb3 0xb5 0xb6 0xb9 - 0xbc 0xbe 0xbf
+LOWER           0xdf - 0xf6 0xf8 - 0xfe
 PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e 
-		0xa2 0xa4 0xa7 0xa8 0xad 0xb0 0xb2 0xb4 0xb7 0xb8 0xbd 
-		0xd7 0xf7 0xff
+PUNCT           0xa2 0xa4 0xa7 0xa8 0xad 0xb0 0xb2 0xb4 0xb7 0xb8 0xbd
+PUNCT           0xd7 0xf7 0xff
 SPACE		0x09 - 0x0d 0x20 0xa0
 UPPER		'A' - 'Z' 
-		0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae 0xaf 
-		0xc0 - 0xd6 0xd8 - 0xde
+UPPER           0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae 0xaf
+UPPER           0xc0 - 0xd6 0xd8 - 0xde
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
@@ -54,6 +51,7 @@ MAPLOWER	<0xc0 - 0xd6 : 0xe0>
 MAPLOWER	<0xd8 - 0xde : 0xf8>
 MAPLOWER	<0xdf - 0xf6 : 0xdf>
 MAPLOWER	<0xf8 - 0xfe : 0xf8>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER	<0xa1 0xa1>
@@ -74,6 +72,7 @@ MAPUPPER	<0xc0 - 0xd6 : 0xc0>
 MAPUPPER	<0xd8 - 0xdf : 0xd8>
 MAPUPPER	<0xe0 - 0xf6 : 0xc0>
 MAPUPPER	<0xf8 - 0xfe : 0xd8>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/la_LN.ISO8859-4.src b/share/mklocale/la_LN.ISO8859-4.src
index 426e157..2d54d92 100644
--- a/share/mklocale/la_LN.ISO8859-4.src
+++ b/share/mklocale/la_LN.ISO8859-4.src
@@ -15,7 +15,7 @@ ALPHA		'A' - 'Z' 'a' - 'z'
 		0xb1 0xb3 0xb5 0xb6 0xb9 - 0xd6 0xd8 - 0xf6 0xf8 - 0xfe
 CONTROL		0x00 - 0x1f 0x7f - 0x9f
 DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e 0xa0 - 0xff
+GRAPH           0x21 - 0x7e 0xa1 - 0xff
 LOWER		'a' - 'z' 
 		0xa2 0xb1 0xb3 0xb5 0xb6 0xb9 - 0xbc 0xbe 0xbf 
 		0xdf - 0xf6 0xf8 - 0xfe
@@ -29,9 +29,6 @@ UPPER		'A' - 'Z'
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
@@ -54,6 +51,7 @@ MAPLOWER	<0xc0 - 0xd6 : 0xe0>
 MAPLOWER	<0xd8 - 0xde : 0xf8>
 MAPLOWER	<0xdf - 0xf6 : 0xdf>
 MAPLOWER	<0xf8 - 0xfe : 0xf8>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER	<0xa1 0xa1>
@@ -74,6 +72,7 @@ MAPUPPER	<0xc0 - 0xd6 : 0xc0>
 MAPUPPER	<0xd8 - 0xde : 0xd8>
 MAPUPPER	<0xe0 - 0xf6 : 0xc0>
 MAPUPPER	<0xf8 - 0xfe : 0xd8>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/la_LN.US-ASCII.src b/share/mklocale/la_LN.US-ASCII.src
index 95cbeeb..2c22f70 100644
--- a/share/mklocale/la_LN.US-ASCII.src
+++ b/share/mklocale/la_LN.US-ASCII.src
@@ -1,8 +1,10 @@
 /*
- * Standard LOCALE_CTYPE for the ASCII Locale
+ * Standard LOCALE_CTYPE for the US-ASCII Locale
+ *
+ * $FreeBSD$
  */
 ENCODING        "NONE"
-VARIABLE        Strict 7bit ASCII locale
+VARIABLE        Strict 7bit US-ASCII locale
 
 ALPHA		'A' - 'Z' 'a' - 'z'
 CONTROL		0x00 - 0x1f 0x7f
@@ -15,14 +17,13 @@ UPPER		'A' - 'Z'
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t'
 PRINT		0x20 - 0x7e
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/ru_RU.CP866.src b/share/mklocale/ru_RU.CP866.src
index c4ef1bb..081f757 100644
--- a/share/mklocale/ru_RU.CP866.src
+++ b/share/mklocale/ru_RU.CP866.src
@@ -4,41 +4,53 @@
  * $FreeBSD$
  */
 ENCODING	"NONE"
-VARIABLE        Russian Alternative charset (CP866) by ache@astral.msk.su
+VARIABLE        Russian Alternative code table (CP866) by <ache@nagual.pp.ru>
 
 #
 # This is a comment
 #
-ALPHA           'A' - 'Z' 'a' - 'z' 0x80 - 0xaf 0xe0 - 0xf1
+ALPHA           'A' - 'Z' 'a' - 'z' 0x80 - 0xaf 0xe0 - 0xf7
 CONTROL		0x00 - 0x1f 0x7f
 DIGIT		'0' - '9'
-GRAPH           0x21 - 0x7e 0x80 - 0xff
-LOWER           'a' - 'z' 0xa0 - 0xaf 0xe0 - 0xef 0xf1
+GRAPH           0x21 - 0x7e 0x80 - 0xfe
+LOWER           'a' - 'z' 0xa0 - 0xaf 0xe0 - 0xef 0xf1 0xf3 0xf5 0xf7
 PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20
-UPPER           'A' - 'Z' 0x80 - 0x9f 0xf0
+PUNCT           0xb0 - 0xdf 0xf8 - 0xfe
+SPACE		0x09 - 0x0d 0x20 0xff
+UPPER           'A' - 'Z' 0x80 - 0x9f 0xf0 0xf2 0xf4 0xf6
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
-BLANK		' ' '\t'
+BLANK		' ' '\t' 0xff
 PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
 MAPLOWER        <0x80 - 0x8f : 0xa0>
 MAPLOWER        <0x90 - 0x9f : 0xe0>
-MAPLOWER        <0xf0  0xf1>
 MAPLOWER        <0xa0 - 0xaf : 0xa0>
 MAPLOWER        <0xe0 - 0xef : 0xe0>
+MAPLOWER        <0xf0  0xf1>
 MAPLOWER        <0xf1  0xf1>
+MAPLOWER        <0xf2  0xf3>
+MAPLOWER        <0xf3  0xf3>
+MAPLOWER        <0xf4  0xf5>
+MAPLOWER        <0xf5  0xf5>
+MAPLOWER        <0xf6  0xf7>
+MAPLOWER        <0xf7  0xf7>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER        <0x80 - 0x9f : 0x80>
-MAPUPPER        <0xf0  0xf0>
 MAPUPPER        <0xa0 - 0xaf : 0x80>
 MAPUPPER        <0xe0 - 0xef : 0x90>
+MAPUPPER        <0xf0  0xf0>
 MAPUPPER        <0xf1  0xf0>
+MAPUPPER        <0xf2  0xf2>
+MAPUPPER        <0xf3  0xf2>
+MAPUPPER        <0xf4  0xf4>
+MAPUPPER        <0xf5  0xf4>
+MAPUPPER        <0xf6  0xf6>
+MAPUPPER        <0xf7  0xf6>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/ru_RU.ISO8859-5.src b/share/mklocale/ru_RU.ISO8859-5.src
index 68b39e7..7efd7f8 100644
--- a/share/mklocale/ru_RU.ISO8859-5.src
+++ b/share/mklocale/ru_RU.ISO8859-5.src
@@ -5,43 +5,38 @@
  */
 
 ENCODING	"NONE"
-VARIABLE        Russian part of ISO8859-5 character set by nms@ethereal.ru
+VARIABLE        Russian part of ISO8859-5 character set by <nms@ethereal.ru>
 
-ALPHA		'A' - 'Z' 'a' - 'z' \
-		0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6 \
-		0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde \
-		0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 \
-		0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef \
-		0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6 \
-		0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe \
-		0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 \
-		0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
-BLANK		' ' '\t'
-CONTROL		0x00 - 0x1f 0x7f
+ALPHA           'A' - 'Z' 'a' - 'z'
+ALPHA           0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6
+ALPHA           0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde
+ALPHA           0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6
+ALPHA           0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
+ALPHA           0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6
+ALPHA           0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe
+ALPHA           0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6
+ALPHA           0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
+BLANK           ' ' '\t' 0xa0
+CONTROL         0x00 - 0x1f 0x7f - 0x9f
 DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e
-LOWER		'a' - 'z' \
-		0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6 \
-		0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde \
-		0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 \
-		0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
-PRINT		0x20 - 0x7e
+GRAPH           0x21 - 0x7e 0xa1 - 0xff
+LOWER           'a' - 'z'
+LOWER           0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6
+LOWER           0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde
+LOWER           0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6
+LOWER           0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
+PRINT           0x20 - 0x7e 0xa0 - 0xff
 PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20
-UPPER		'A' - 'Z' \
-		0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6 \
-		0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe \
-		0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 \
-		0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
+SPACE           0x09 - 0x0d 0x20 0xa0
+UPPER           'A' - 'Z'
+UPPER           0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6
+UPPER           0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe
+UPPER           0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6
+UPPER           0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
-
 MAPLOWER	<0xb0 0xd0>
 MAPLOWER	<0xb1 0xd1>
 MAPLOWER	<0xb2 0xd2>
@@ -75,7 +70,6 @@ MAPLOWER	<0xcc 0xec>
 MAPLOWER	<0xcd 0xed>
 MAPLOWER	<0xce 0xee>
 MAPLOWER	<0xcf 0xef>
-
 MAPLOWER	<0xd0 0xd0>
 MAPLOWER	<0xd1 0xd1>
 MAPLOWER	<0xd2 0xd2>
@@ -112,7 +106,6 @@ MAPLOWER	<0xef 0xef>
 
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
-
 MAPUPPER	<0xd0 0xb0>
 MAPUPPER	<0xd1 0xb1>
 MAPUPPER	<0xd2 0xb2>
@@ -146,7 +139,6 @@ MAPUPPER	<0xec 0xcc>
 MAPUPPER	<0xed 0xcd>
 MAPUPPER	<0xee 0xce>
 MAPUPPER	<0xef 0xcf>
-
 MAPUPPER	<0xb0 0xb0>
 MAPUPPER	<0xb1 0xb1>
 MAPUPPER	<0xb2 0xb2>
diff --git a/share/mklocale/ru_RU.KOI8-R.src b/share/mklocale/ru_RU.KOI8-R.src
index 2fb1aae..d9eac8f 100644
--- a/share/mklocale/ru_RU.KOI8-R.src
+++ b/share/mklocale/ru_RU.KOI8-R.src
@@ -4,7 +4,7 @@
  * $FreeBSD$
  */
 ENCODING	"NONE"
-VARIABLE        Russian koi8-r character set by ache@astral.msk.su
+VARIABLE        Russian KOI8-R character set by <ache@nagual.pp.ru>
 
 #
 # This is a comment
@@ -20,9 +20,6 @@ UPPER		'A' - 'Z' 0xb3 0xe0 - 0xff
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0x9a
 PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
@@ -30,12 +27,14 @@ MAPLOWER	<0xb3  0xa3>
 MAPLOWER        <0xa3  0xa3>
 MAPLOWER	<0xe0 - 0xff : 0xc0>
 MAPLOWER	<0xc0 - 0xdf : 0xc0>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER        <0xb3  0xb3>
 MAPUPPER	<0xa3  0xb3>
 MAPUPPER	<0xe0 - 0xff : 0xe0>
 MAPUPPER	<0xc0 - 0xdf : 0xe0>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/uk_UA.KOI8-U.src b/share/mklocale/uk_UA.KOI8-U.src
index 02453ae..6abe203 100644
--- a/share/mklocale/uk_UA.KOI8-U.src
+++ b/share/mklocale/uk_UA.KOI8-U.src
@@ -20,9 +20,6 @@ UPPER		'A' - 'Z' 0xb3 0xb4 0xb6 0xb7 0xbd 0xe0 - 0xff
 XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0x9a
 PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
 
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
@@ -38,6 +35,7 @@ MAPLOWER	<0xbd  0xad>
 MAPLOWER        <0xad  0xad>
 MAPLOWER	<0xe0 - 0xff : 0xc0>
 MAPLOWER	<0xc0 - 0xdf : 0xc0>
+
 MAPUPPER       	<'A' - 'Z' : 'A'>
 MAPUPPER       	<'a' - 'z' : 'A'>
 MAPUPPER        <0xb3  0xb3>
@@ -52,6 +50,7 @@ MAPUPPER        <0xbd  0xbd>
 MAPUPPER	<0xad  0xbd>
 MAPUPPER	<0xe0 - 0xff : 0xe0>
 MAPUPPER	<0xc0 - 0xdf : 0xe0>
+
 TODIGIT       	<'0' - '9' : 0>
 TODIGIT       	<'A' - 'F' : 10>
 TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/zh_TW.Big5.src b/share/mklocale/zh_TW.Big5.src
index 9a2d267..73077e8 100644
--- a/share/mklocale/zh_TW.Big5.src
+++ b/share/mklocale/zh_TW.Big5.src
@@ -60,6 +60,7 @@ MAPUPPER        < 0xa2e9 - 0xa2fe : 0xa2cf > < 0xa340 - 0xa343 : 0xa2e5 >
 /* ?XDIGIT          0xa2cf - 0xa2d4 0xa2e9 - 0xa2ee */
 
 SPACE           0xa3bc
+BLANK           0xa3bc
 /* bopomofo symbols */
 PHONOGRAM       0xa374 - 0xa37e 0xa3a1 - 0xa3bb
 /* tone symbols */