[AC21.5] Minor update to charset_table used by Xft

[Stephen J. Turnbull]

APPROVE COMMIT 21.5

Another in a series of patches from old branches I have lying around.

diff -r c1784fd59d7d src/ChangeLog
--- a/src/ChangeLog	Wed Nov 18 01:10:56 2009 +0900
+++ b/src/ChangeLog	Wed Nov 18 11:09:41 2009 +0900
@@ -1,3 +1,8 @@
+2008-07-23  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* objects-xlike-inc.c (charset_table): Add names and ISO 639 codes
+	for Arabic, Russian, and Thai.  Regional variants are lower-cased.
+
 2009-11-16  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	Remove C asserts from test-format-data-conversion.
diff -r c1784fd59d7d src/objects-xlike-inc.c
--- a/src/objects-xlike-inc.c	Wed Nov 18 01:10:56 2009 +0900
+++ b/src/objects-xlike-inc.c	Wed Nov 18 11:09:41 2009 +0900
@@ -347,22 +347,29 @@
     { &Vcharset_greek_iso8859_7, "Greek", "el" },
     /* #### all the Chinese need checking
        Damn the blood-sucking ISO anyway. */
-    { &Vcharset_chinese_gb2312, "simplified Chinese", "zh-CN" },
+    { &Vcharset_chinese_gb2312, "simplified Chinese", "zh-cn" },
     { &Vcharset_korean_ksc5601, "Korean", "ko" },
-    { &Vcharset_chinese_cns11643_1, "traditional Chinese", "zh-TW" },
-    { &Vcharset_chinese_cns11643_2, "traditional Chinese", "zh-TW" },
+    { &Vcharset_chinese_cns11643_1, "traditional Chinese", "zh-tw" },
+    { &Vcharset_chinese_cns11643_2, "traditional Chinese", "zh-tw" },
+    /* #### not obvious how to handle these
+       We could (for experimental purposes) make the last element into
+       an array of ISO 639 codes, and check for all of them.  If a font
+       provides some but not others, warn. */
     { &Vcharset_latin_iso8859_1, NULL, NULL },
     { &Vcharset_latin_iso8859_2, NULL, NULL },
     { &Vcharset_latin_iso8859_3, NULL, NULL },
     { &Vcharset_latin_iso8859_4, NULL, NULL },
     { &Vcharset_latin_iso8859_9, NULL, NULL },
     { &Vcharset_latin_iso8859_15, NULL, NULL },
-    { &Vcharset_thai_tis620, NULL, NULL },
+    { &Vcharset_thai_tis620, "Thai", "th" },
+    /* We don't have an arabic charset.  bidi issues, I guess? */
+    /* { &Vcharset_arabic_iso8859_6, "Arabic", "ar" }, */
     { &Vcharset_hebrew_iso8859_8, "Hebrew", "he" },
-    { &Vcharset_cyrillic_iso8859_5, NULL, NULL },
+    /* #### probably close enough for Ukraine? */
+    { &Vcharset_cyrillic_iso8859_5, "Russian", "ru" },
     /* #### these probably are not quite right */
-    { &Vcharset_chinese_big5_1, "traditional Chinese", "zh-TW" },
-    { &Vcharset_chinese_big5_2, "traditional Chinese", "zh-TW" },
+    { &Vcharset_chinese_big5_1, "traditional Chinese", "zh-tw" },
+    { &Vcharset_chinese_big5_2, "traditional Chinese", "zh-tw" },
     { NULL, NULL, NULL }
   };