mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-27 11:06:50 +01:00
TextEncoding fixes, added reverse encodings
This commit is contained in:
Guenter Obiltschnig
@@ -32,6 +32,7 @@ const char* Latin1Encoding::_names[] =
|
||||
|
||||
const TextEncoding::CharacterMap Latin1Encoding::_charMap =
|
||||
{
|
||||
/* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f */
|
||||
/* 00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
|
||||
/* 10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
|
||||
/* 20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// Latin2Encoding.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/Latin2Encoding.cpp#12 $
|
||||
// $Id: //poco/1.4/Foundation/src/Latin2Encoding.cpp#1 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Text
|
||||
@@ -32,6 +32,7 @@ const char* Latin2Encoding::_names[] =
|
||||
|
||||
const TextEncoding::CharacterMap Latin2Encoding::_charMap =
|
||||
{
|
||||
/* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f */
|
||||
/* 00 */ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
|
||||
/* 10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
|
||||
/* 20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
|
||||
@@ -98,9 +99,69 @@ int Latin2Encoding::convert(int ch, unsigned char* bytes, int length) const
|
||||
*bytes = (unsigned char) ch;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
switch(ch)
|
||||
{
|
||||
case 0x0104: if (bytes && length >= 1) *bytes = 0xa1; return 1;
|
||||
case 0x02d8: if (bytes && length >= 1) *bytes = 0xa2; return 1;
|
||||
case 0x0141: if (bytes && length >= 1) *bytes = 0xa3; return 1;
|
||||
case 0x013d: if (bytes && length >= 1) *bytes = 0xa5; return 1;
|
||||
case 0x015a: if (bytes && length >= 1) *bytes = 0xa6; return 1;
|
||||
case 0x0160: if (bytes && length >= 1) *bytes = 0xa9; return 1;
|
||||
case 0x015e: if (bytes && length >= 1) *bytes = 0xaa; return 1;
|
||||
case 0x0164: if (bytes && length >= 1) *bytes = 0xab; return 1;
|
||||
case 0x0179: if (bytes && length >= 1) *bytes = 0xac; return 1;
|
||||
case 0x017d: if (bytes && length >= 1) *bytes = 0xae; return 1;
|
||||
case 0x017b: if (bytes && length >= 1) *bytes = 0xaf; return 1;
|
||||
case 0x0105: if (bytes && length >= 1) *bytes = 0xb1; return 1;
|
||||
case 0x02db: if (bytes && length >= 1) *bytes = 0xb2; return 1;
|
||||
case 0x0142: if (bytes && length >= 1) *bytes = 0xb3; return 1;
|
||||
case 0x013e: if (bytes && length >= 1) *bytes = 0xb5; return 1;
|
||||
case 0x015b: if (bytes && length >= 1) *bytes = 0xb6; return 1;
|
||||
case 0x02c7: if (bytes && length >= 1) *bytes = 0xb7; return 1;
|
||||
case 0x0161: if (bytes && length >= 1) *bytes = 0xb9; return 1;
|
||||
case 0x015f: if (bytes && length >= 1) *bytes = 0xba; return 1;
|
||||
case 0x0165: if (bytes && length >= 1) *bytes = 0xbb; return 1;
|
||||
case 0x017a: if (bytes && length >= 1) *bytes = 0xbc; return 1;
|
||||
case 0x02dd: if (bytes && length >= 1) *bytes = 0xbd; return 1;
|
||||
case 0x017e: if (bytes && length >= 1) *bytes = 0xbe; return 1;
|
||||
case 0x017c: if (bytes && length >= 1) *bytes = 0xbf; return 1;
|
||||
case 0x0154: if (bytes && length >= 1) *bytes = 0xc0; return 1;
|
||||
case 0x0102: if (bytes && length >= 1) *bytes = 0xc3; return 1;
|
||||
case 0x0139: if (bytes && length >= 1) *bytes = 0xc5; return 1;
|
||||
case 0x0106: if (bytes && length >= 1) *bytes = 0xc6; return 1;
|
||||
case 0x010c: if (bytes && length >= 1) *bytes = 0xc8; return 1;
|
||||
case 0x0118: if (bytes && length >= 1) *bytes = 0xca; return 1;
|
||||
case 0x011a: if (bytes && length >= 1) *bytes = 0xcc; return 1;
|
||||
case 0x010e: if (bytes && length >= 1) *bytes = 0xcf; return 1;
|
||||
case 0x0110: if (bytes && length >= 1) *bytes = 0xd0; return 1;
|
||||
case 0x0143: if (bytes && length >= 1) *bytes = 0xd1; return 1;
|
||||
case 0x0147: if (bytes && length >= 1) *bytes = 0xd2; return 1;
|
||||
case 0x0150: if (bytes && length >= 1) *bytes = 0xd5; return 1;
|
||||
case 0x0158: if (bytes && length >= 1) *bytes = 0xd8; return 1;
|
||||
case 0x016e: if (bytes && length >= 1) *bytes = 0xd9; return 1;
|
||||
case 0x0170: if (bytes && length >= 1) *bytes = 0xdb; return 1;
|
||||
case 0x0162: if (bytes && length >= 1) *bytes = 0xde; return 1;
|
||||
case 0x0155: if (bytes && length >= 1) *bytes = 0xe0; return 1;
|
||||
case 0x0103: if (bytes && length >= 1) *bytes = 0xe3; return 1;
|
||||
case 0x013a: if (bytes && length >= 1) *bytes = 0xe5; return 1;
|
||||
case 0x0107: if (bytes && length >= 1) *bytes = 0xe6; return 1;
|
||||
case 0x010d: if (bytes && length >= 1) *bytes = 0xe8; return 1;
|
||||
case 0x0119: if (bytes && length >= 1) *bytes = 0xea; return 1;
|
||||
case 0x011b: if (bytes && length >= 1) *bytes = 0xec; return 1;
|
||||
case 0x010f: if (bytes && length >= 1) *bytes = 0xef; return 1;
|
||||
case 0x0111: if (bytes && length >= 1) *bytes = 0xf0; return 1;
|
||||
case 0x0144: if (bytes && length >= 1) *bytes = 0xf1; return 1;
|
||||
case 0x0148: if (bytes && length >= 1) *bytes = 0xf2; return 1;
|
||||
case 0x0151: if (bytes && length >= 1) *bytes = 0xf5; return 1;
|
||||
case 0x0159: if (bytes && length >= 1) *bytes = 0xf8; return 1;
|
||||
case 0x016f: if (bytes && length >= 1) *bytes = 0xf9; return 1;
|
||||
case 0x0171: if (bytes && length >= 1) *bytes = 0xfb; return 1;
|
||||
case 0x0163: if (bytes && length >= 1) *bytes = 0xfe; return 1;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int Latin2Encoding::queryConvert(const unsigned char* bytes, int length) const
|
||||
{
|
||||
if (1 <= length)
|
||||
|
||||
@@ -32,6 +32,7 @@ const char* Latin9Encoding::_names[] =
|
||||
|
||||
const TextEncoding::CharacterMap Latin9Encoding::_charMap =
|
||||
{
|
||||
/* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f */
|
||||
/* 00 */ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
|
||||
/* 10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
|
||||
/* 20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// Windows1250Encoding.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/Windows1250Encoding.cpp#7 $
|
||||
// $Id: //poco/1.4/Foundation/src/Windows1250Encoding.cpp#1 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Text
|
||||
@@ -40,8 +40,8 @@ const TextEncoding::CharacterMap Windows1250Encoding::_charMap =
|
||||
/* 50 */ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
|
||||
/* 60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
|
||||
/* 70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
|
||||
/* 80 */ 0x20AC, 0x0081, 0x201A, 0x0083, 0x201e, 0x2026, 0x2020, 0x2021, 0x0088, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179,
|
||||
/* 90 */ 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0098, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a,
|
||||
/* 80 */ 0x20ac, 0xfffe, 0x201a, 0xfffe, 0x201e, 0x2026, 0x2020, 0x2021, 0xfffe, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179,
|
||||
/* 90 */ 0xfffe, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0xfffe, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a,
|
||||
/* a0 */ 0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b,
|
||||
/* b0 */ 0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c,
|
||||
/* c0 */ 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
|
||||
@@ -98,9 +98,86 @@ int Windows1250Encoding::convert(int ch, unsigned char* bytes, int length) const
|
||||
*bytes = (unsigned char) ch;
|
||||
return 1;
|
||||
}
|
||||
else return 0;
|
||||
else switch(ch)
|
||||
{
|
||||
case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1;
|
||||
case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1;
|
||||
case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1;
|
||||
case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1;
|
||||
case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1;
|
||||
case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1;
|
||||
case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1;
|
||||
case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1;
|
||||
case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1;
|
||||
case 0x015a: if (bytes && length >= 1) *bytes = 0x8c; return 1;
|
||||
case 0x0164: if (bytes && length >= 1) *bytes = 0x8d; return 1;
|
||||
case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1;
|
||||
case 0x0179: if (bytes && length >= 1) *bytes = 0x8f; return 1;
|
||||
case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1;
|
||||
case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1;
|
||||
case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1;
|
||||
case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1;
|
||||
case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1;
|
||||
case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1;
|
||||
case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1;
|
||||
case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1;
|
||||
case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1;
|
||||
case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1;
|
||||
case 0x015b: if (bytes && length >= 1) *bytes = 0x9c; return 1;
|
||||
case 0x0165: if (bytes && length >= 1) *bytes = 0x9d; return 1;
|
||||
case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1;
|
||||
case 0x017a: if (bytes && length >= 1) *bytes = 0x9f; return 1;
|
||||
case 0x02c7: if (bytes && length >= 1) *bytes = 0xa1; return 1;
|
||||
case 0x02d8: if (bytes && length >= 1) *bytes = 0xa2; return 1;
|
||||
case 0x0141: if (bytes && length >= 1) *bytes = 0xa3; return 1;
|
||||
case 0x0104: if (bytes && length >= 1) *bytes = 0xa5; return 1;
|
||||
case 0x015e: if (bytes && length >= 1) *bytes = 0xaa; return 1;
|
||||
case 0x017b: if (bytes && length >= 1) *bytes = 0xaf; return 1;
|
||||
case 0x02db: if (bytes && length >= 1) *bytes = 0xb2; return 1;
|
||||
case 0x0142: if (bytes && length >= 1) *bytes = 0xb3; return 1;
|
||||
case 0x0105: if (bytes && length >= 1) *bytes = 0xb9; return 1;
|
||||
case 0x015f: if (bytes && length >= 1) *bytes = 0xba; return 1;
|
||||
case 0x013d: if (bytes && length >= 1) *bytes = 0xbc; return 1;
|
||||
case 0x02dd: if (bytes && length >= 1) *bytes = 0xbd; return 1;
|
||||
case 0x013e: if (bytes && length >= 1) *bytes = 0xbe; return 1;
|
||||
case 0x017c: if (bytes && length >= 1) *bytes = 0xbf; return 1;
|
||||
case 0x0154: if (bytes && length >= 1) *bytes = 0xc0; return 1;
|
||||
case 0x0102: if (bytes && length >= 1) *bytes = 0xc3; return 1;
|
||||
case 0x0139: if (bytes && length >= 1) *bytes = 0xc5; return 1;
|
||||
case 0x0106: if (bytes && length >= 1) *bytes = 0xc6; return 1;
|
||||
case 0x010c: if (bytes && length >= 1) *bytes = 0xc8; return 1;
|
||||
case 0x0118: if (bytes && length >= 1) *bytes = 0xca; return 1;
|
||||
case 0x011a: if (bytes && length >= 1) *bytes = 0xcc; return 1;
|
||||
case 0x010e: if (bytes && length >= 1) *bytes = 0xcf; return 1;
|
||||
case 0x0110: if (bytes && length >= 1) *bytes = 0xd0; return 1;
|
||||
case 0x0143: if (bytes && length >= 1) *bytes = 0xd1; return 1;
|
||||
case 0x0147: if (bytes && length >= 1) *bytes = 0xd2; return 1;
|
||||
case 0x0150: if (bytes && length >= 1) *bytes = 0xd5; return 1;
|
||||
case 0x0158: if (bytes && length >= 1) *bytes = 0xd8; return 1;
|
||||
case 0x016e: if (bytes && length >= 1) *bytes = 0xd9; return 1;
|
||||
case 0x0170: if (bytes && length >= 1) *bytes = 0xdb; return 1;
|
||||
case 0x0162: if (bytes && length >= 1) *bytes = 0xde; return 1;
|
||||
case 0x0155: if (bytes && length >= 1) *bytes = 0xe0; return 1;
|
||||
case 0x0103: if (bytes && length >= 1) *bytes = 0xe3; return 1;
|
||||
case 0x013a: if (bytes && length >= 1) *bytes = 0xe5; return 1;
|
||||
case 0x0107: if (bytes && length >= 1) *bytes = 0xe6; return 1;
|
||||
case 0x010d: if (bytes && length >= 1) *bytes = 0xe8; return 1;
|
||||
case 0x0119: if (bytes && length >= 1) *bytes = 0xea; return 1;
|
||||
case 0x011b: if (bytes && length >= 1) *bytes = 0xec; return 1;
|
||||
case 0x010f: if (bytes && length >= 1) *bytes = 0xef; return 1;
|
||||
case 0x0111: if (bytes && length >= 1) *bytes = 0xf0; return 1;
|
||||
case 0x0144: if (bytes && length >= 1) *bytes = 0xf1; return 1;
|
||||
case 0x0148: if (bytes && length >= 1) *bytes = 0xf2; return 1;
|
||||
case 0x0151: if (bytes && length >= 1) *bytes = 0xf5; return 1;
|
||||
case 0x0159: if (bytes && length >= 1) *bytes = 0xf8; return 1;
|
||||
case 0x016f: if (bytes && length >= 1) *bytes = 0xf9; return 1;
|
||||
case 0x0171: if (bytes && length >= 1) *bytes = 0xfb; return 1;
|
||||
case 0x0163: if (bytes && length >= 1) *bytes = 0xfe; return 1;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int Windows1250Encoding::queryConvert(const unsigned char* bytes, int length) const
|
||||
{
|
||||
if (1 <= length)
|
||||
@@ -116,5 +193,4 @@ int Windows1250Encoding::sequenceLength(const unsigned char* bytes, int length)
|
||||
}
|
||||
|
||||
|
||||
|
||||
} // namespace Poco
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// Windows1251Encoding.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/Windows1251Encoding.cpp#7 $
|
||||
// $Id: //poco/1.4/Foundation/src/Windows1251Encoding.cpp#1 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Text
|
||||
@@ -40,11 +40,11 @@ const TextEncoding::CharacterMap Windows1251Encoding::_charMap =
|
||||
/* 50 */ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
|
||||
/* 60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
|
||||
/* 70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
|
||||
/* 80 */ 0x0402, 0x0403, 0x201A, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, 0x20AC, 0x2030, 0x0409, 0x040A, 0x2039, 0x040C, 0x040B, 0x040F,
|
||||
/* 90 */ 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0098, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
|
||||
/* a0 */ 0x00a0, 0x040E, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
|
||||
/* b0 */ 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x457c,
|
||||
/* c0 */ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041d, 0x041e, 0x041f,
|
||||
/* 80 */ 0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f,
|
||||
/* 90 */ 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0xfffe, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
|
||||
/* a0 */ 0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
|
||||
/* b0 */ 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457,
|
||||
/* c0 */ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
|
||||
/* d0 */ 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
|
||||
/* e0 */ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
|
||||
/* f0 */ 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
|
||||
@@ -98,9 +98,125 @@ int Windows1251Encoding::convert(int ch, unsigned char* bytes, int length) const
|
||||
*bytes = (unsigned char) ch;
|
||||
return 1;
|
||||
}
|
||||
else return 0;
|
||||
else switch(ch)
|
||||
{
|
||||
case 0x0402: if (bytes && length >= 1) *bytes = 0x80; return 1;
|
||||
case 0x0403: if (bytes && length >= 1) *bytes = 0x81; return 1;
|
||||
case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1;
|
||||
case 0x0453: if (bytes && length >= 1) *bytes = 0x83; return 1;
|
||||
case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1;
|
||||
case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1;
|
||||
case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1;
|
||||
case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1;
|
||||
case 0x20ac: if (bytes && length >= 1) *bytes = 0x88; return 1;
|
||||
case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1;
|
||||
case 0x0409: if (bytes && length >= 1) *bytes = 0x8a; return 1;
|
||||
case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1;
|
||||
case 0x040a: if (bytes && length >= 1) *bytes = 0x8c; return 1;
|
||||
case 0x040c: if (bytes && length >= 1) *bytes = 0x8d; return 1;
|
||||
case 0x040b: if (bytes && length >= 1) *bytes = 0x8e; return 1;
|
||||
case 0x040f: if (bytes && length >= 1) *bytes = 0x8f; return 1;
|
||||
case 0x0452: if (bytes && length >= 1) *bytes = 0x90; return 1;
|
||||
case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1;
|
||||
case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1;
|
||||
case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1;
|
||||
case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1;
|
||||
case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1;
|
||||
case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1;
|
||||
case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1;
|
||||
case 0xfffe: if (bytes && length >= 1) *bytes = 0x98; return 1;
|
||||
case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1;
|
||||
case 0x0459: if (bytes && length >= 1) *bytes = 0x9a; return 1;
|
||||
case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1;
|
||||
case 0x045a: if (bytes && length >= 1) *bytes = 0x9c; return 1;
|
||||
case 0x045c: if (bytes && length >= 1) *bytes = 0x9d; return 1;
|
||||
case 0x045b: if (bytes && length >= 1) *bytes = 0x9e; return 1;
|
||||
case 0x045f: if (bytes && length >= 1) *bytes = 0x9f; return 1;
|
||||
case 0x040e: if (bytes && length >= 1) *bytes = 0xa1; return 1;
|
||||
case 0x045e: if (bytes && length >= 1) *bytes = 0xa2; return 1;
|
||||
case 0x0408: if (bytes && length >= 1) *bytes = 0xa3; return 1;
|
||||
case 0x0490: if (bytes && length >= 1) *bytes = 0xa5; return 1;
|
||||
case 0x0401: if (bytes && length >= 1) *bytes = 0xa8; return 1;
|
||||
case 0x0404: if (bytes && length >= 1) *bytes = 0xaa; return 1;
|
||||
case 0x0407: if (bytes && length >= 1) *bytes = 0xaf; return 1;
|
||||
case 0x0406: if (bytes && length >= 1) *bytes = 0xb2; return 1;
|
||||
case 0x0456: if (bytes && length >= 1) *bytes = 0xb3; return 1;
|
||||
case 0x0491: if (bytes && length >= 1) *bytes = 0xb4; return 1;
|
||||
case 0x0451: if (bytes && length >= 1) *bytes = 0xb8; return 1;
|
||||
case 0x2116: if (bytes && length >= 1) *bytes = 0xb9; return 1;
|
||||
case 0x0454: if (bytes && length >= 1) *bytes = 0xba; return 1;
|
||||
case 0x0458: if (bytes && length >= 1) *bytes = 0xbc; return 1;
|
||||
case 0x0405: if (bytes && length >= 1) *bytes = 0xbd; return 1;
|
||||
case 0x0455: if (bytes && length >= 1) *bytes = 0xbe; return 1;
|
||||
case 0x0457: if (bytes && length >= 1) *bytes = 0xbf; return 1;
|
||||
case 0x0410: if (bytes && length >= 1) *bytes = 0xc0; return 1;
|
||||
case 0x0411: if (bytes && length >= 1) *bytes = 0xc1; return 1;
|
||||
case 0x0412: if (bytes && length >= 1) *bytes = 0xc2; return 1;
|
||||
case 0x0413: if (bytes && length >= 1) *bytes = 0xc3; return 1;
|
||||
case 0x0414: if (bytes && length >= 1) *bytes = 0xc4; return 1;
|
||||
case 0x0415: if (bytes && length >= 1) *bytes = 0xc5; return 1;
|
||||
case 0x0416: if (bytes && length >= 1) *bytes = 0xc6; return 1;
|
||||
case 0x0417: if (bytes && length >= 1) *bytes = 0xc7; return 1;
|
||||
case 0x0418: if (bytes && length >= 1) *bytes = 0xc8; return 1;
|
||||
case 0x0419: if (bytes && length >= 1) *bytes = 0xc9; return 1;
|
||||
case 0x041a: if (bytes && length >= 1) *bytes = 0xca; return 1;
|
||||
case 0x041b: if (bytes && length >= 1) *bytes = 0xcb; return 1;
|
||||
case 0x041c: if (bytes && length >= 1) *bytes = 0xcc; return 1;
|
||||
case 0x041d: if (bytes && length >= 1) *bytes = 0xcd; return 1;
|
||||
case 0x041e: if (bytes && length >= 1) *bytes = 0xce; return 1;
|
||||
case 0x041f: if (bytes && length >= 1) *bytes = 0xcf; return 1;
|
||||
case 0x0420: if (bytes && length >= 1) *bytes = 0xd0; return 1;
|
||||
case 0x0421: if (bytes && length >= 1) *bytes = 0xd1; return 1;
|
||||
case 0x0422: if (bytes && length >= 1) *bytes = 0xd2; return 1;
|
||||
case 0x0423: if (bytes && length >= 1) *bytes = 0xd3; return 1;
|
||||
case 0x0424: if (bytes && length >= 1) *bytes = 0xd4; return 1;
|
||||
case 0x0425: if (bytes && length >= 1) *bytes = 0xd5; return 1;
|
||||
case 0x0426: if (bytes && length >= 1) *bytes = 0xd6; return 1;
|
||||
case 0x0427: if (bytes && length >= 1) *bytes = 0xd7; return 1;
|
||||
case 0x0428: if (bytes && length >= 1) *bytes = 0xd8; return 1;
|
||||
case 0x0429: if (bytes && length >= 1) *bytes = 0xd9; return 1;
|
||||
case 0x042a: if (bytes && length >= 1) *bytes = 0xda; return 1;
|
||||
case 0x042b: if (bytes && length >= 1) *bytes = 0xdb; return 1;
|
||||
case 0x042c: if (bytes && length >= 1) *bytes = 0xdc; return 1;
|
||||
case 0x042d: if (bytes && length >= 1) *bytes = 0xdd; return 1;
|
||||
case 0x042e: if (bytes && length >= 1) *bytes = 0xde; return 1;
|
||||
case 0x042f: if (bytes && length >= 1) *bytes = 0xdf; return 1;
|
||||
case 0x0430: if (bytes && length >= 1) *bytes = 0xe0; return 1;
|
||||
case 0x0431: if (bytes && length >= 1) *bytes = 0xe1; return 1;
|
||||
case 0x0432: if (bytes && length >= 1) *bytes = 0xe2; return 1;
|
||||
case 0x0433: if (bytes && length >= 1) *bytes = 0xe3; return 1;
|
||||
case 0x0434: if (bytes && length >= 1) *bytes = 0xe4; return 1;
|
||||
case 0x0435: if (bytes && length >= 1) *bytes = 0xe5; return 1;
|
||||
case 0x0436: if (bytes && length >= 1) *bytes = 0xe6; return 1;
|
||||
case 0x0437: if (bytes && length >= 1) *bytes = 0xe7; return 1;
|
||||
case 0x0438: if (bytes && length >= 1) *bytes = 0xe8; return 1;
|
||||
case 0x0439: if (bytes && length >= 1) *bytes = 0xe9; return 1;
|
||||
case 0x043a: if (bytes && length >= 1) *bytes = 0xea; return 1;
|
||||
case 0x043b: if (bytes && length >= 1) *bytes = 0xeb; return 1;
|
||||
case 0x043c: if (bytes && length >= 1) *bytes = 0xec; return 1;
|
||||
case 0x043d: if (bytes && length >= 1) *bytes = 0xed; return 1;
|
||||
case 0x043e: if (bytes && length >= 1) *bytes = 0xee; return 1;
|
||||
case 0x043f: if (bytes && length >= 1) *bytes = 0xef; return 1;
|
||||
case 0x0440: if (bytes && length >= 1) *bytes = 0xf0; return 1;
|
||||
case 0x0441: if (bytes && length >= 1) *bytes = 0xf1; return 1;
|
||||
case 0x0442: if (bytes && length >= 1) *bytes = 0xf2; return 1;
|
||||
case 0x0443: if (bytes && length >= 1) *bytes = 0xf3; return 1;
|
||||
case 0x0444: if (bytes && length >= 1) *bytes = 0xf4; return 1;
|
||||
case 0x0445: if (bytes && length >= 1) *bytes = 0xf5; return 1;
|
||||
case 0x0446: if (bytes && length >= 1) *bytes = 0xf6; return 1;
|
||||
case 0x0447: if (bytes && length >= 1) *bytes = 0xf7; return 1;
|
||||
case 0x0448: if (bytes && length >= 1) *bytes = 0xf8; return 1;
|
||||
case 0x0449: if (bytes && length >= 1) *bytes = 0xf9; return 1;
|
||||
case 0x044a: if (bytes && length >= 1) *bytes = 0xfa; return 1;
|
||||
case 0x044b: if (bytes && length >= 1) *bytes = 0xfb; return 1;
|
||||
case 0x044c: if (bytes && length >= 1) *bytes = 0xfc; return 1;
|
||||
case 0x044d: if (bytes && length >= 1) *bytes = 0xfd; return 1;
|
||||
case 0x044e: if (bytes && length >= 1) *bytes = 0xfe; return 1;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int Windows1251Encoding::queryConvert(const unsigned char* bytes, int length) const
|
||||
{
|
||||
if (1 <= length)
|
||||
@@ -117,3 +233,4 @@ int Windows1251Encoding::sequenceLength(const unsigned char* bytes, int length)
|
||||
|
||||
|
||||
} // namespace Poco
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ const TextEncoding::CharacterMap Windows1252Encoding::_charMap =
|
||||
/* 50 */ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
|
||||
/* 60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
|
||||
/* 70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
|
||||
/* 80 */ 0x20AC, 0x0081, 0x201A, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
|
||||
/* 80 */ 0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
|
||||
/* 90 */ 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178,
|
||||
/* a0 */ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
|
||||
/* b0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
|
||||
|
||||
Reference in New Issue
Block a user