diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c
index 173bd2e5d66e..f9984d542383 100644
--- a/lib/libc/locale/runetable.c
+++ b/lib/libc/locale/runetable.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: runetable.c,v 1.4 2000/12/28 05:22:27 itojun Exp $	*/
+/*	$NetBSD: runetable.c,v 1.5 2001/01/21 04:34:47 itojun Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
 #else
-__RCSID("$NetBSD: runetable.c,v 1.4 2000/12/28 05:22:27 itojun Exp $");
+__RCSID("$NetBSD: runetable.c,v 1.5 2001/01/21 04:34:47 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -101,101 +101,101 @@ _RuneLocale _DefaultRuneLocale = {
 		_CTYPE_C,
 		_CTYPE_C,
 		_CTYPE_C,
-	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
-	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|0,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|1,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|2,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|3,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|4,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|5,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|6,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|7,
+	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|8,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|_CTYPE_SW1|9,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|10,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|11,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|12,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|13,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|14,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|15,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|10,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|11,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|12,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|13,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|14,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1|15,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G|_CTYPE_SW1,
 		_CTYPE_C,
     },
     {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,