--- xc/nls/XLC_LOCALE/en_US.UTF-8.orig	2004-12-13 17:14:37 +0300
+++ xc/nls/XLC_LOCALE/en_US.UTF-8	2004-04-23 22:44:34 +0400
@@ -11,9 +11,20 @@
 
 object_name		generic
 
-XCOMM 	fs0 class (7 bit ASCII)
+XCOMM	fs0 class
 fs0	{
 	charset	{
+		name	ISO10646-1
+	}
+	font	{
+		primary	ISO10646-1
+	}
+}
+XCOMM	We leave the legacy encodings in for the moment, because we don't
+XCOMM	have that many ISO10646 fonts yet.
+XCOMM 	fs1 class (7 bit ASCII)
+fs1	{
+	charset	{
 		name	ISO8859-1:GL
 	}
 	font	{
@@ -21,8 +32,8 @@
 		vertical_rotate	all
 	}
 }
-XCOMM	fs1 class (ISO8859 families)
-fs1	{
+XCOMM	fs2 class (ISO8859 families)
+fs2	{
 	charset	{
 		name	ISO8859-1:GR
 	}
@@ -30,8 +41,8 @@
 		primary	ISO8859-1:GR
 	}
 }
-XCOMM 	fs2 class (Kanji)
-fs2	{
+XCOMM 	fs3 class (Kanji)
+fs3	{
 	charset	{
 		name	JISX0208.1983-0:GL
 	}
@@ -39,8 +50,8 @@
 		primary	JISX0208.1983-0:GL
 	}
 }
-XCOMM   fs3 class (Korean Character)
-fs3	{
+XCOMM   fs4 class (Korean Character)
+fs4	{
 	charset	{
 		name	KSC5601.1987-0:GL
 	}
@@ -48,8 +59,8 @@
 		primary	KSC5601.1987-0:GL
 	}
 }
-XCOMM   fs4 class (Chinese Han Character)
-fs4	{
+XCOMM   fs5 class (Chinese Han Character)
+fs5	{
 	charset	{
 		name	GB2312.1980-0:GL
 	}
@@ -57,8 +68,8 @@
 		primary	GB2312.1980-0:GL
 	}
 }
-XCOMM	fs5 class (Half Kana)
-fs5	{
+XCOMM	fs6 class (Half Kana)
+fs6	{
 	charset	{
 		name	JISX0201.1976-0:GR
 	}
@@ -67,16 +78,6 @@
 		vertical_rotate	all
 	}
 }
-XCOMM	ISO10646 should come last so the fonts above will actually be used
-XCOMM	fs6 class
-fs6	{
-	charset	{
-		name	ISO10646-1
-	}
-	font	{
-		primary	ISO10646-1
-	}
-}
 END XLC_FONTSET
 
 XCOMM