xorg/xc/nls/XLC_LOCALE

[Saren Sandmann Pedersen]

CVS commit by sandmann: 

Fri Oct  8 18:53:11 2004  Soeren Sandmann  <sandmann at redhat.com>

	* nls/XLC_LOCALE/en_US.UTF-8: Move iso10646 last so the "fallback"
	fonts will actually be used if they are better matches.


  M +21 -22    xorg/xc/nls/XLC_LOCALE/en_US.UTF-8   1.3


--- xorg/xc/nls/XLC_LOCALE/en_US.UTF-8  #1.2:1.3
@@ -12,18 +12,7 @@
 object_name             generic
 
-XCOMM   fs0 class
+XCOMM   fs0 class (7 bit ASCII)
 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
         }
@@ -33,6 +22,6 @@
         }
 }
-XCOMM   fs2 class (ISO8859 families)
-fs2     {
+XCOMM   fs1 class (ISO8859 families)
+fs1     {
         charset {
                 name    ISO8859-1:GR
@@ -42,6 +31,6 @@
         }
 }
-XCOMM   fs3 class (Kanji)
-fs3     {
+XCOMM   fs2 class (Kanji)
+fs2     {
         charset {
                 name    JISX0208.1983-0:GL
@@ -51,6 +40,6 @@
         }
 }
-XCOMM   fs4 class (Korean Character)
-fs4     {
+XCOMM   fs3 class (Korean Character)
+fs3     {
         charset {
                 name    KSC5601.1987-0:GL
@@ -60,6 +49,6 @@
         }
 }
-XCOMM   fs5 class (Chinese Han Character)
-fs5     {
+XCOMM   fs4 class (Chinese Han Character)
+fs4     {
         charset {
                 name    GB2312.1980-0:GL
@@ -69,6 +58,6 @@
         }
 }
-XCOMM   fs6 class (Half Kana)
-fs6     {
+XCOMM   fs5 class (Half Kana)
+fs5     {
         charset {
                 name    JISX0201.1976-0:GR
@@ -79,4 +68,14 @@
         }
 }
+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