Update the list of allowed encodings.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 39879f8f1de67ec1abba23f3251fdcee60b3ef82..c424f6412255379fee3bb8f5d03738ca6388a4dc 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-12  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (Header Entry): Add ISO-8859-14, KOI8-T, GEORGIAN-PS to
+       the list of allowed encodings. Mention the languages Breton,
+       Cornish, Danish, Manx, Occitan, Tagalog, Uzbek, Walloon, Bosnian,
+       Maori, Welsh, Tajik, Georgian.
+
 2002-05-11  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.texi: Recommend AM_GNU_GETTEXT_VERSION(..) syntax.

diff --git a/doc/gettext.texi b/doc/gettext.texi
index 952e9534a1f5e308872287c21505e705220a1213..372bc083d71413a9e56e7f4d78dd84473e368bc4 100644 (file)
--- a/doc/gettext.texi
+++ b/doc/gettext.texi
@@ -2434,13 +2434,15 @@ are limited to those supported by both GNU @code{libc} and GNU
 @code{libiconv}. These are:
 @code{ASCII}, @code{ISO-8859-1}, @code{ISO-8859-2}, @code{ISO-8859-3},
 @code{ISO-8859-4}, @code{ISO-8859-5}, @code{ISO-8859-6}, @code{ISO-8859-7},
-@code{ISO-8859-8}, @code{ISO-8859-9}, @code{ISO-8859-13}, @code{ISO-8859-15},
-@code{KOI8-R}, @code{KOI8-U}, @code{CP850}, @code{CP866}, @code{CP874},
+@code{ISO-8859-8}, @code{ISO-8859-9}, @code{ISO-8859-13}, @code{ISO-8859-14},
+@code{ISO-8859-15},
+@code{KOI8-R}, @code{KOI8-U}, @code{KOI8-T},
+@code{CP850}, @code{CP866}, @code{CP874},
 @code{CP932}, @code{CP949}, @code{CP950}, @code{CP1250}, @code{CP1251},
 @code{CP1252}, @code{CP1253}, @code{CP1254}, @code{CP1255}, @code{CP1256},
 @code{CP1257}, @code{GB2312}, @code{EUC-JP}, @code{EUC-KR}, @code{EUC-TW},
 @code{BIG5}, @code{BIG5-HKSCS}, @code{GBK}, @code{GB18030}, @code{SHIFT_JIS},
-@code{JOHAB}, @code{TIS-620}, @code{VISCII}, @code{UTF-8}.
+@code{JOHAB}, @code{TIS-620}, @code{VISCII}, @code{GEORGIAN-PS}, @code{UTF-8}.
 
 @c This data is taken from glibc/localedata/SUPPORTED.
 @cindex Linux
@@ -2450,23 +2452,28 @@ corresponding languages.
 @cindex encoding for your language
 @itemize
 @item @code{ISO-8859-1} for
- Afrikaans, Albanian, Basque, Catalan, Dutch, English, Estonian, Faroese,
- Finnish, French, Galician, German, Greenlandic, Icelandic, Indonesian,
- Irish, Italian, Malay, Norwegian, Portuguese, Spanish, Swedish,
+ Afrikaans, Albanian, Basque, Breton, Catalan, Cornish, Danish, Dutch,
+ English, Estonian, Faroese, Finnish, French, Galician, German,
+ Greenlandic, Icelandic, Indonesian, Irish, Italian, Malay, Manx,
+ Norwegian, Occitan, Portuguese, Spanish, Swedish, Tagalog, Uzbek,
+ Walloon,
 @item @code{ISO-8859-2} for
- Croatian, Czech, Hungarian, Polish, Romanian, Serbian, Slovak, Slovenian,
+ Bosnian, Croatian, Czech, Hungarian, Polish, Romanian, Serbian, Slovak,
+ Slovenian,
 @item @code{ISO-8859-3} for Maltese,
 @item @code{ISO-8859-5} for Macedonian, Serbian,
 @item @code{ISO-8859-6} for Arabic,
 @item @code{ISO-8859-7} for Greek,
 @item @code{ISO-8859-8} for Hebrew,
 @item @code{ISO-8859-9} for Turkish,
-@item @code{ISO-8859-13} for Latvian, Lithuanian,
+@item @code{ISO-8859-13} for Latvian, Lithuanian, Maori,
+@item @code{ISO-8859-14} for Welsh,
 @item @code{ISO-8859-15} for
  Basque, Catalan, Dutch, English, Finnish, French, Galician, German, Irish,
- Italian, Portuguese, Spanish, Swedish,
+ Italian, Portuguese, Spanish, Swedish, Walloon,
 @item @code{KOI8-R} for Russian,
 @item @code{KOI8-U} for Ukrainian,
+@item @code{KOI8-T} for Tajik,
 @item @code{CP1251} for Bulgarian, Byelorussian,
 @item @code{GB2312}, @code{GBK}, @code{GB18030}
  for simplified writing of Chinese,
@@ -2475,6 +2482,7 @@ corresponding languages.
 @item @code{EUC-JP} for Japanese,
 @item @code{EUC-KR} for Korean,
 @item @code{TIS-620} for Thai,
+@item @code{GEORGIAN-PS} for Georgian,
 @item @code{UTF-8} for any language, including those listed above.
 @end itemize
 

diff --git a/misc/ChangeLog b/misc/ChangeLog
index a1a9873462c4215038ec3e975ecc8e2eedb66c2a..8086fe7f0009b3f9403d130f78fea6dcb9284477 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-12  Bruno Haible  <bruno@clisp.org>
+
+       * po-compat.el: Add ISO-8859-14, KOI8-T, GEORGIAN-PS to the list of
+       allowed encodings.
+
 2002-05-11  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.in: Recognize AM_GNU_GETTEXT_VERSION(..) syntax.

diff --git a/misc/po-compat.el b/misc/po-compat.el
index 83112bb8ca61806878422b51d0e41f02608a9b52..c05832a9f3ddfdda44135a1b7d379de68a7c14aa 100644 (file)
--- a/misc/po-compat.el
+++ b/misc/po-compat.el
@@ -94,10 +94,13 @@
     (ISO_8859-9 . iso-8859-9)
     ;(ISO-8859-13 . ??)
     ;(ISO_8859-13 . ??)
+    ;(ISO-8859-14 . ??)
+    ;(ISO_8859-14 . ??)
     (ISO-8859-15 . iso-8859-15) ; requires Emacs 21
     (ISO_8859-15 . iso-8859-15) ; requires Emacs 21
     (KOI8-R . koi8-r)
     ;(KOI8-U . ??)
+    ;(KOI8-T . ??)
     (CP437 . cp437) ; requires Emacs 20
     (CP775 . cp775) ; requires Emacs 20
     (CP850 . cp850) ; requires Emacs 20
@@ -141,6 +144,7 @@
     ;(JOHAB . ??)
     (TIS-620 . tis-620)    ; requires Emacs 20 or Emacs 21
     (VISCII . viscii)      ; requires Emacs 20 or Emacs 21
+    ;(GEORGIAN-PS . ??)
     (UTF-8 . utf-8)        ; requires Mule-UCS in Emacs 20, or Emacs 21
     )
   "How to convert a GNU libc/libiconv canonical charset name as seen in

diff --git a/src/ChangeLog b/src/ChangeLog
index c700b39080c11d4ac0905f1f2f754548555c30d6..1bf50035e4e82ce9abf0d244cfb4a1e213597989 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-12  Bruno Haible  <bruno@clisp.org>
+
+       * po-charset.c (po_charset_canonicalize): Add ISO-8859-14, KOI8-T,
+       GEORGIAN-PS to the list of allowed encodings.
+
 2002-04-30  Bruno Haible  <bruno@clisp.org>
 
        * hostname.c (ipv6_ntop): Provide a fallback definition for systems

diff --git a/src/po-charset.c b/src/po-charset.c
index 357fb5776394a875ad4c308174c150af1eed36a7..b75971664c498810e5d8c6a1402724534d2ab802 100644 (file)
--- a/src/po-charset.c
+++ b/src/po-charset.c
@@ -64,9 +64,11 @@ po_charset_canonicalize (charset)
     "ISO-8859-8", "ISO_8859-8",
     "ISO-8859-9", "ISO_8859-9",
     "ISO-8859-13", "ISO_8859-13",
-    "ISO-8859-15", "ISO_8859-15",              /* i = 23, 24 */
+    "ISO-8859-14", "ISO_8859-14",
+    "ISO-8859-15", "ISO_8859-15",              /* i = 25, 26 */
     "KOI8-R",
     "KOI8-U",
+    "KOI8-T",
     "CP850",
     "CP866",
     "CP874",
@@ -93,13 +95,14 @@ po_charset_canonicalize (charset)
     "JOHAB",
     "TIS-620",
     "VISCII",
+    "GEORGIAN-PS",
     "UTF-8"
   };
   size_t i;
 
   for (i = 0; i < SIZEOF (standard_charsets); i++)
     if (strcasecmp (charset, standard_charsets[i]) == 0)
-      return standard_charsets[i < 3 ? 0 : i < 25 ? ((i - 3) & ~1) + 3 : i];
+      return standard_charsets[i < 3 ? 0 : i < 27 ? ((i - 3) & ~1) + 3 : i];
   return NULL;
 }