more encoding names for AIX/Solaris/IRIX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index b6d16c53a9c0f8c7897dec28ead31a2adadd571b..2c15cb5e6544f03fa23f14c14ad351b39636327b 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -154,51 +154,57 @@ static const wxChar* gs_encodingDescs[] =
 // and the internal names (these are not translated on purpose!)
 static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] =
 {
 // and the internal names (these are not translated on purpose!)
 static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] =
 {

-    { wxT( "iso-8859-1" ), NULL },
-    { wxT( "iso-8859-2" ), NULL },
-    { wxT( "iso-8859-3" ), NULL },
-    { wxT( "iso-8859-4" ), NULL },
-    { wxT( "iso-8859-5" ), NULL },
-    { wxT( "iso-8859-6" ), NULL },
-    { wxT( "iso-8859-7" ), NULL },
-    { wxT( "iso-8859-8" ), NULL },
-    { wxT( "iso-8859-9" ), NULL },
-    { wxT( "iso-8859-10" ), NULL },
-    { wxT( "iso-8859-11" ), NULL },
-    { wxT( "iso-8859-12" ), NULL },
-    { wxT( "iso-8859-13" ), NULL },
-    { wxT( "iso-8859-14" ), NULL },
-    { wxT( "iso-8859-15" ), NULL },
+    // names from the first column are used under Linux, from the second one
+    // under Solaris and IRIX and from the third one -- under AIX
+    { wxT( "ISO-8859-1" ), wxT( "ISO8859-1" ), wxT( "8859-1" ), wxT("iso_8859_1"), NULL },
+    { wxT( "ISO-8859-2" ), wxT( "ISO8859-2" ), wxT( "8859-2" ), NULL },
+    { wxT( "ISO-8859-3" ), wxT( "ISO8859-3" ), wxT( "8859-3" ), NULL },
+    { wxT( "ISO-8859-4" ), wxT( "ISO8859-4" ), wxT( "8859-4" ), NULL },
+    { wxT( "ISO-8859-5" ), wxT( "ISO8859-5" ), wxT( "8859-5" ), NULL },
+    { wxT( "ISO-8859-6" ), wxT( "ISO8859-6" ), wxT( "8859-6" ), NULL },
+    { wxT( "ISO-8859-7" ), wxT( "ISO8859-7" ), wxT( "8859-7" ), NULL },
+    { wxT( "ISO-8859-8" ), wxT( "ISO8859-8" ), wxT( "8859-8" ), NULL },
+    { wxT( "ISO-8859-9" ), wxT( "ISO8859-9" ), wxT( "8859-9" ), NULL },
+    { wxT( "ISO-8859-10" ), wxT( "ISO8859-10" ), wxT( "8859-10" ), NULL },
+    { wxT( "ISO-8859-11" ), wxT( "ISO8859-11" ), wxT( "8859-11" ), NULL },
+    { wxT( "ISO-8859-12" ), wxT( "ISO8859-12" ), wxT( "8859-12" ), NULL },
+    { wxT( "ISO-8859-13" ), wxT( "ISO8859-13" ), wxT( "8859-13" ), NULL },
+    { wxT( "ISO-8859-14" ), wxT( "ISO8859-14" ), wxT( "8859-14" ), NULL },
+    { wxT( "ISO-8859-15" ), wxT( "ISO8859-15" ), wxT( "8859-15" ), NULL },
+

     // although koi8-ru is not strictly speaking the same as koi8-r,
     // they are similar enough to make mapping it to koi8 better than
     // not recognizing it at all
     // although koi8-ru is not strictly speaking the same as koi8-r,
     // they are similar enough to make mapping it to koi8 better than
     // not recognizing it at all

-    { wxT( "koi8-r" ), wxT( "koi8-ru" ), NULL },
-    { wxT( "koi8-u" ), NULL },
-    { wxT( "windows-874" ), NULL },
-    { wxT( "windows-932" ), NULL },
-    { wxT( "windows-936" ), NULL },
-    { wxT( "windows-949" ), wxT( "euc-kr" ),
-      wxT( "euckr" ), wxT( "euc_kr" ), NULL },
-    { wxT( "windows-950" ), NULL },
-    { wxT( "windows-1250" ), NULL },
-    { wxT( "windows-1251" ), NULL },
-    { wxT( "windows-1252" ), NULL },
-    { wxT( "windows-1253" ), NULL },
-    { wxT( "windows-1254" ), NULL },
-    { wxT( "windows-1255" ), NULL },
-    { wxT( "windows-1256" ), NULL },
-    { wxT( "windows-1257" ), NULL },
-    { wxT( "windows-437" ), NULL },
+    { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL },
+    { wxT( "KOI8-U" ), NULL },
+
+    { wxT( "WINDOWS-874" ), NULL },
+    { wxT( "WINDOWS-932" ), NULL },
+    { wxT( "WINDOWS-936" ), NULL },
+    { wxT( "WINDOWS-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
+    { wxT( "WINDOWS-950" ), NULL },
+    { wxT( "WINDOWS-1250" ), NULL },
+    { wxT( "WINDOWS-1251" ), NULL },
+    { wxT( "WINDOWS-1252" ), wxT("IBM-1252"), NULL },
+    { wxT( "WINDOWS-1253" ), NULL },
+    { wxT( "WINDOWS-1254" ), NULL },
+    { wxT( "WINDOWS-1255" ), NULL },
+    { wxT( "WINDOWS-1256" ), NULL },
+    { wxT( "WINDOWS-1257" ), NULL },
+    { wxT( "WINDOWS-437" ), NULL },
+

     { wxT( "UTF-7" ), NULL },
     { wxT( "UTF-8" ), NULL },
     { wxT( "UTF-16" ), NULL },
     { wxT( "UTF-7" ), NULL },
     { wxT( "UTF-8" ), NULL },
     { wxT( "UTF-16" ), NULL },

-    { wxT( "UTF-16be" ), NULL },
-    { wxT( "UTF-16le" ), NULL },
+    { wxT( "UTF-16BE" ), NULL },
+    { wxT( "UTF-16LE" ), NULL },

     { wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
     { wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },

-    { wxT( "UTF-32be" ), wxT( "UCS-4be" ), NULL },
-    { wxT( "UTF-32le" ), wxT( "UCS-4le" ), NULL },
-    { wxT( "euc-jp" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
-    { wxT( "us-ascii" ), wxT( "ascii" ), wxT("ANSI_X3.4-1968"),
+    { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
+    { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
+
+    { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
+
+    { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("ANSI_X3.4-1968"),

 #ifdef __SOLARIS__
       wxT("646"),
 #endif
 #ifdef __SOLARIS__
       wxT("646"),
 #endif


@@ -206,9 +212,9 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] =
       wxT("roman8"),
 #endif
       wxT( "" ), NULL },
       wxT("roman8"),
 #endif
       wxT( "" ), NULL },

-    { wxT( "big5" ), NULL },
+    { wxT( "BIG5" ), NULL },

     { wxT( "shift-jis" ), wxT( "shift_jis" ), wxT( "sjis" ), NULL },
     { wxT( "shift-jis" ), wxT( "shift_jis" ), wxT( "sjis" ), NULL },

-    { wxT( "gb2312" ), NULL },
+    { wxT( "GB2312" ), NULL },

 };
 
 wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
 };
 
 wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );