--- base	2008-05-10 02:22:14.000000000 +0300
+++ base.new	2008-07-28 14:15:11.000000000 +0300
@@ -183,9 +183,10 @@
   *		ogham		is434laptop		=	pc+ie(ogam_is434)
   *		ori		basic		=	pc+in(ori)
   *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std_comma)
-  *		ro		std		=	pc+ro(std_cedilla)
-  *		ro		academic		=	pc+ro(std_comma)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma	=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
   *		ru		os		=	pc+ru(os_legacy)
   *		sapmi		basic		=	pc+no(smi)
   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
@@ -261,9 +262,10 @@
   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
   *		ori(basic)			=	pc+in(ori)
   *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std_comma)
-  *		ro(std)			=	pc+ro(std_cedilla)
-  *		ro(academic)			=	pc+ro(std_comma)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)		=	pc+ro(std)
+  *		ro(comma)		=	pc+ro(basic)
   *		ru(os)			=	pc+ru(os_legacy)
   *		sapmi(basic)			=	pc+no(smi)
   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
@@ -362,9 +364,10 @@
   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
   *		ori(basic)			=	pc+in(ori)
   *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std_comma)
-  *		ro(std)			=	pc+ro(std_cedilla)
-  *		ro(academic)			=	pc+ro(std_comma)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)		=	pc+ro(std)
+  *		ro(comma)		=	pc+ro(basic)
   *		ru(os)			=	pc+ru(os_legacy)
   *		sapmi(basic)			=	pc+no(smi)
   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
@@ -420,9 +423,10 @@
   *		ogham		is434laptop		=	pc+ie(ogam_is434)
   *		ori		basic		=	pc+in(ori)
   *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std_comma)
-  *		ro		std		=	pc+ro(std_cedilla)
-  *		ro		academic		=	pc+ro(std_comma)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma	=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
   *		ru		os		=	pc+ru(os_legacy)
   *		sapmi		basic		=	pc+no(smi)
   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
@@ -495,9 +499,10 @@
   ogham(is434laptop)	=	+ie(ogam_is434):2
   ori(basic)	=	+in(ori):2
   ro(de)	=	+ro(winkeys):2
-  ro(us)	=	+ro(std_comma):2
-  ro(std)	=	+ro(std_cedilla):2
-  ro(academic)	=	+ro(std_comma):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
+  ro(std_comma)	=	+ro(std):2
+  ro(comma)	=	+ro(basic):2
   ru(os)	=	+ru(os_legacy):2
   sapmi(basic)	=	+no(smi):2
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
@@ -571,9 +576,10 @@
   ogham(is434laptop)	=	+ie(ogam_is434):3
   ori(basic)	=	+in(ori):3
   ro(de)	=	+ro(winkeys):3
-  ro(us)	=	+ro(std_comma):3
-  ro(std)	=	+ro(std_cedilla):3
-  ro(academic)	=	+ro(std_comma):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
+  ro(std_comma)	=	+ro(std):3
+  ro(comma)	=	+ro(basic):3
   ru(os)	=	+ru(os_legacy):3
   sapmi(basic)	=	+no(smi):3
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
@@ -647,9 +653,10 @@
   ogham(is434laptop)	=	+ie(ogam_is434):4
   ori(basic)	=	+in(ori):4
   ro(de)	=	+ro(winkeys):4
-  ro(us)	=	+ro(std_comma):4
-  ro(std)	=	+ro(std_cedilla):4
-  ro(academic)	=	+ro(std_comma):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
+  ro(std_comma)	=	+ro(std):4
+  ro(comma)	=	+ro(basic):4
   ru(os)	=	+ru(os_legacy):4
   sapmi(basic)	=	+no(smi):4
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
@@ -696,9 +703,10 @@
   ogham		is434laptop	=	+ie(ogam_is434):2
   ori		basic	=	+in(ori):2
   ro		de	=	+ro(winkeys):2
-  ro		us	=	+ro(std_comma):2
-  ro		std	=	+ro(std_cedilla):2
-  ro		academic	=	+ro(std_comma):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
+  ro		std_comma	=	+ro(std):2
+  ro		comma	=	+ro(basic)
   ru		os	=	+ru(os_legacy):2
   sapmi		basic	=	+no(smi):2
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
@@ -744,9 +752,10 @@
   ogham		is434laptop	=	+ie(ogam_is434):3
   ori		basic	=	+in(ori):3
   ro		de	=	+ro(winkeys):3
-  ro		us	=	+ro(std_comma):3
-  ro		std	=	+ro(std_cedilla):3
-  ro		academic	=	+ro(std_comma):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
+  ro		std_comma	=	+ro(std):3
+  ro		comma	=	+ro(basic):3
   ru		os	=	+ru(os_legacy):3
   sapmi		basic	=	+no(smi):3
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
@@ -792,9 +801,10 @@
   ogham		is434laptop	=	+ie(ogam_is434):4
   ori		basic	=	+in(ori):4
   ro		de	=	+ro(winkeys):4
-  ro		us	=	+ro(std_comma):4
-  ro		std	=	+ro(std_cedilla):4
-  ro		academic	=	+ro(std_comma):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
+  ro		std_comma	=	+ro(std):4
+  ro		comma	=	+ro(basic)
   ru		os	=	+ru(os_legacy):4
   sapmi		basic	=	+no(smi):4
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4