#include <stdlib.h>
+// conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
+#ifdef __BORLANDC__
+#include "../common/unictabl.inc"
+#else
#include "unictabl.inc"
-// conversion tables, generated by scripts in $(WXWIN)/misc/unictabl
+#endif
-static wxUint16 *GetEncTable(wxFontEncoding enc)
+static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
{
for (int i = 0; encodings_list[i].table != NULL; i++)
{
-static int CompareCharsetItems(const void *i1, const void *i2)
+static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
{
return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
}
-static CharsetItem* BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
{
CharsetItem *rev = new CharsetItem[128];
wxEncodingConverter::wxEncodingConverter()
{
m_Table = NULL;
- m_UnicodeInput = FALSE;
+ m_UnicodeInput = m_UnicodeOutput = FALSE;
m_JustCopy = FALSE;
}
if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
+ m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
m_JustCopy = FALSE;
if (input_enc == wxFONTENCODING_UNICODE)
}
+
void wxEncodingConverter::Convert(const wxChar* input, wxChar* output)
{
if (m_JustCopy)
}
+#if wxUSE_UNICODE // otherwise wxChar === char
+
+void wxEncodingConverter::Convert(const char* input, wxChar* output)
+{
+ wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
+
+ const char *i;
+ wxChar *o;
+
+ if (m_JustCopy)
+ {
+ for (i = input, o = output; *i != 0;)
+ *(o++) = (wxChar)(*(i++));
+ *o = 0;
+ return;
+ }
+
+ wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+ for (i = input, o = output; *i != 0;)
+ *(o++) = (wxChar)(m_Table[(wxUint8)*(i++)]);
+ *o = 0;
+}
+
+
+
+void wxEncodingConverter::Convert(const wxChar* input, char* output)
+{
+ wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
+
+ const wxChar *i;
+ char *o;
+
+ if (m_JustCopy)
+ {
+ for (i = input, o = output; *i != 0;)
+ *(o++) = (char)(*(i++));
+ *o = 0;
+ return;
+ }
+
+ wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+ if (m_UnicodeInput)
+ for (i = input, o = output; *i != 0; i++, o++)
+ *o = (char)(m_Table[(wxUint16)*i]);
+ else
+ for (i = input, o = output; *i != 0; i++, o++)
+ *o = (char)(m_Table[(wxUint8)*i]);
+ *o = 0;
+}
+
+
+
+void wxEncodingConverter::Convert(const char* input, char* output)
+{
+ wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
+ wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
+
+ const char *i;
+ char *o;
+
+ if (m_JustCopy)
+ {
+ strcpy(output, input);
+ return;
+ }
+
+ wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+ for (i = input, o = output; *i != 0;)
+ *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
+ *o = 0;
+}
+
+#endif // wxUSE_UNICODE
+
wxString wxEncodingConverter::Convert(const wxString& input)
{
+
+
+
// Following tables describe classes of encoding equivalence.
//
#define STOP wxFONTENCODING_SYSTEM
#define NUM_OF_PLATFORMS 4 /*must conform to enum wxPLATFORM_XXXX !!!*/
-#define ENC_PER_PLATFORM 3
+#define ENC_PER_PLATFORM 5
// max no. of encodings for one language used on one platform
- // Anybody thinks 3 is not enough? ;-)
+ // Anybody thinks 5 is not enough? ;-)
static wxFontEncoding
EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
- // West European (Latin1)
+ // *** Please put more common encodings as first! ***
+
+ // West European
{
/* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
/* windows */ {wxFONTENCODING_CP1252, STOP},
/* mac */ {STOP}
},
- // Central European (Latin2)
+ // Central European
{
/* unix */ {wxFONTENCODING_ISO8859_2, STOP},
/* windows */ {wxFONTENCODING_CP1250, STOP},
/* os2 */ {STOP},
/* mac */ {STOP}
},
+
+ // Baltic
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_13, STOP},
+ /* windows */ {wxFONTENCODING_CP1257, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Hebrew
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_8, STOP},
+ /* windows */ {wxFONTENCODING_CP1255, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Greek
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_7, STOP},
+ /* windows */ {wxFONTENCODING_CP1253, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Arabic
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_6, STOP},
+ /* windows */ {wxFONTENCODING_CP1256, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Turkish
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_9, STOP},
+ /* windows */ {wxFONTENCODING_CP1254, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Cyrillic
+ {
+ /* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4,
+ wxFONTENCODING_ISO8859_15, wxFONTENCODING_ISO8859_1, STOP},
+ /* windows */ {wxFONTENCODING_CP1257, wxFONTENCODING_CP1252, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
+
+ // Russia and other KOI-8 users:
+ {
+ /* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
+ /* windows */ {wxFONTENCODING_CP1251, STOP},
+ /* os2 */ {STOP},
+ /* mac */ {STOP}
+ },
{{STOP},{STOP},{STOP},{STOP}} /* Terminator */
/* no, _not_ Arnold! */
for (e = 0; EquivalentEncodings[clas][i][e] != STOP; e++)
if (EquivalentEncodings[clas][i][e] == enc)
{
- for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
+ for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
+ if (*f == enc) arr.Add(enc);
+ for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
i = NUM_OF_PLATFORMS/*hack*/; break;
}
int i, clas, e, j ;
wxFontEncoding *f;
wxFontEncodingArray arr;
+
+ arr = GetPlatformEquivalents(enc); // we want them to be first items in array
clas = 0;
while (EquivalentEncodings[clas][0][0] != STOP)