summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2004-10-08 22:57:56 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2004-10-08 22:57:56 +0000
commitd80237db627bf71ad5615ff4ba05e6ab436aa740 (patch)
treee6acfb67253ea8ed5939c0397ab8d2a1d1059c4e
parentd1f76d17ecf418396627b1a58319f2b9b255548a (diff)
downloadxorg-lib-libX11-d80237db627bf71ad5615ff4ba05e6ab436aa740.tar.gz
Fri Oct 8 18:53:11 2004 Soeren Sandmann <sandmann@redhat.com>
Move iso10646 last so the "fallback" fonts will actually be used if they are better matches.
-rw-r--r--nls/en_US.UTF-8/XLC_LOCALE.pre43
1 files changed, 21 insertions, 22 deletions
diff --git a/nls/en_US.UTF-8/XLC_LOCALE.pre b/nls/en_US.UTF-8/XLC_LOCALE.pre
index 3af71e25..5bb70bbc 100644
--- a/nls/en_US.UTF-8/XLC_LOCALE.pre
+++ b/nls/en_US.UTF-8/XLC_LOCALE.pre
@@ -11,20 +11,9 @@ on_demand_loading True
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
}
font {
@@ -32,8 +21,8 @@ fs1 {
vertical_rotate all
}
}
-XCOMM fs2 class (ISO8859 families)
-fs2 {
+XCOMM fs1 class (ISO8859 families)
+fs1 {
charset {
name ISO8859-1:GR
}
@@ -41,8 +30,8 @@ fs2 {
primary ISO8859-1:GR
}
}
-XCOMM fs3 class (Kanji)
-fs3 {
+XCOMM fs2 class (Kanji)
+fs2 {
charset {
name JISX0208.1983-0:GL
}
@@ -50,8 +39,8 @@ fs3 {
primary JISX0208.1983-0:GL
}
}
-XCOMM fs4 class (Korean Character)
-fs4 {
+XCOMM fs3 class (Korean Character)
+fs3 {
charset {
name KSC5601.1987-0:GL
}
@@ -59,8 +48,8 @@ fs4 {
primary KSC5601.1987-0:GL
}
}
-XCOMM fs5 class (Chinese Han Character)
-fs5 {
+XCOMM fs4 class (Chinese Han Character)
+fs4 {
charset {
name GB2312.1980-0:GL
}
@@ -68,8 +57,8 @@ fs5 {
primary GB2312.1980-0:GL
}
}
-XCOMM fs6 class (Half Kana)
-fs6 {
+XCOMM fs5 class (Half Kana)
+fs5 {
charset {
name JISX0201.1976-0:GR
}
@@ -78,6 +67,16 @@ fs6 {
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