Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various fixes for converting cp1252, cp1251, cp1250 characters to and from utf-8 #1288

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Various fixes for converting cp1252, cp1251, cp1250 characters to and from utf-8 #1288

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4cfdff
Fixed cp1252 characters from 0x80-0x9f not being converted to unicode…
Lord-Nightmare Mar 14, 2021
27a1503
fix compile
Lord-Nightmare Mar 14, 2021
4b6c735
Update as suggested to use 0x80-long tables for all three supported c…
Lord-Nightmare Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 126 additions & 63 deletions NWNXLib/Encoding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,65 @@ void SetDefaultLocale(const std::string& locale)
}
}

static uint16_t map_unknown[0x80] =
{
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f
};

static uint16_t map_cp1252[0x80] =
{
0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178,
0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
};

static uint16_t map_cp1251[0x80] =
{
0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021,
0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f,
0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
0x0098, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7,
0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7,
0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457,
0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f
};

static uint16_t map_cp1250[0x80] =
{
Expand All @@ -71,7 +130,7 @@ static uint16_t map_cp1250[0x80] =
0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7,
0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f,
0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7,
0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9
};

std::string ToUTF8(const char *str, Locale locale)
Expand All @@ -85,44 +144,55 @@ std::string ToUTF8(const char *str, Locale locale)
if (locale == Default)
locale = GetDefaultLocale();

uint16_t *map_locale;
switch (locale)
{
case cp1252:
map_locale = map_cp1252;
break;
case cp1251:
map_locale = map_cp1251;
break;
case cp1250:
map_locale = map_cp1250;
break;
default:
map_locale = map_unknown;
break;
}

const char *tmp = str;

for (; *str; ++str)
{
if (!(*str & 0x80))
int codepoint = static_cast<uint8_t>(*str);
if (codepoint >= 0x80)
{
codepoint = map_locale[codepoint & 0x7f];
}

if (codepoint <= 0x7f)
utf8.push_back(*str);
else if (codepoint <= 0x7ff)
{
utf8.push_back(0xc0 | static_cast<char>((codepoint >> 6) & 0x1f));
utf8.push_back(0x80 | static_cast<char>(codepoint & 0x3f));
}
else
else if (codepoint <= 0xffff)
{
int codepoint = static_cast<uint8_t>(*str);
switch (locale)
{
case cp1252:
utf8.push_back(0xc2 | static_cast<char>(codepoint >> 6));
utf8.push_back(0xbf & static_cast<char>(codepoint & 0xFF));
break;
case cp1251:
if (codepoint == 168)
codepoint = 177;
if (codepoint > 176 && codepoint < 256)
{
codepoint += 848;
}
utf8.push_back(0xc0 | static_cast<char>(codepoint >> 6));
utf8.push_back((0xbf & static_cast<char>(codepoint & 0xFF)) | 0x80);
break;
case cp1250:
codepoint = map_cp1250[codepoint & 0x7f];
utf8.push_back(0xc0 | static_cast<char>(codepoint >> 6));
utf8.push_back((0xbf & static_cast<char>(codepoint & 0xFF)) | 0x80);
break;
default:
utf8.push_back('?');
ASSERT_FAIL_MSG("Unknown locale");
break;
}
utf8.push_back(0xe0 | static_cast<char>((codepoint >> 12) & 0xf));
utf8.push_back(0x80 | static_cast<char>((codepoint >> 6) & 0x3f));
utf8.push_back(0x80 | static_cast<char>(codepoint & 0x3f));
}
else // codepoint >= 0x10000
{
utf8.push_back(0xf0 | static_cast<char>((codepoint >> 18) & 0x7));
utf8.push_back(0x80 | static_cast<char>((codepoint >> 12) & 0x3f));
utf8.push_back(0x80 | static_cast<char>((codepoint >> 6) & 0x3f));
utf8.push_back(0x80 | static_cast<char>(codepoint & 0x3f));
}
if (map_locale == map_unknown)
ASSERT_FAIL_MSG("Unknown locale");
}
LOG_DEBUG("ToUTF: \"%s\" -> \"%s\"", tmp, utf8);
return utf8;
Expand All @@ -140,6 +210,23 @@ std::string FromUTF8(const char *str, Locale locale)
if (locale == Default)
locale = GetDefaultLocale();

uint16_t *map_locale;
switch (locale)
{
case cp1252:
map_locale = map_cp1252;
break;
case cp1251:
map_locale = map_cp1251;
break;
case cp1250:
map_locale = map_cp1250;
break;
default:
map_locale = map_unknown;
break;
}

const char *tmp = str;
uint32_t codepoint = 0;
for (; *str; ++str)
Expand All @@ -165,42 +252,18 @@ std::string FromUTF8(const char *str, Locale locale)
else // Special character out of bounds
{
int i;
switch (locale)
for (i = 0; i < 0x80; i++)
{
case cp1252:
iso8859.push_back('?');
break;
case cp1251:
if (codepoint > 1024 && codepoint < 1106)
{
if (codepoint == 1025)
codepoint = 1016;

iso8859.push_back(static_cast<char>(codepoint - 848));
}
else
{
iso8859.push_back('?');
}
break;
case cp1250:
for (i = 0; i < 0x80; i++)
{
if (map_cp1250[i] == codepoint)
{
iso8859.push_back(static_cast<char>(i | 0x80));
break;
}
}
if (i == 0x80)
iso8859.push_back('?');
break;

default:
iso8859.push_back('?');
ASSERT_FAIL_MSG("Unknown locale");
if (map_locale[i] == codepoint)
{
iso8859.push_back(static_cast<char>(i | 0x80));
break;
}
}
if (i == 0x80)
iso8859.push_back('?');
if (map_locale == map_unknown)
ASSERT_FAIL_MSG("Unknown locale");
}
}
}
Expand Down