diff options
-rw-r--r-- | apps/lang/english.lang | 2 | ||||
-rw-r--r-- | apps/lang/korean.lang | 4 | ||||
-rw-r--r-- | apps/lang/norsk.lang | 4 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | tools/codepage_tables.c | 19 | ||||
-rw-r--r-- | tools/codepage_tables.h | 1 | ||||
-rw-r--r-- | tools/codepages.c | 8 |
7 files changed, 30 insertions, 10 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 08060fffd6..8feccef0ff 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3427,7 +3427,7 @@ new: | |||
3427 | 3427 | ||
3428 | id: LANG_CODEPAGE_ARABIC | 3428 | id: LANG_CODEPAGE_ARABIC |
3429 | desc: in codepage setting menu | 3429 | desc: in codepage setting menu |
3430 | eng: "Arabic (ISO-8859-6)" | 3430 | eng: "Arabic (CP1256)" |
3431 | voice: | 3431 | voice: |
3432 | new: | 3432 | new: |
3433 | 3433 | ||
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 78440ef035..f83cc30b31 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang | |||
@@ -3414,9 +3414,9 @@ new: "태국어 (ISO-8859-11)" | |||
3414 | 3414 | ||
3415 | id: LANG_CODEPAGE_ARABIC | 3415 | id: LANG_CODEPAGE_ARABIC |
3416 | desc: in codepage setting menu | 3416 | desc: in codepage setting menu |
3417 | eng: "Arabic (ISO-8859-6)" | 3417 | eng: "Arabic (CP1256)" |
3418 | voice: | 3418 | voice: |
3419 | new: "아랍어 (ISO-8859-6)" | 3419 | new: "아랍어 (CP1256)" |
3420 | 3420 | ||
3421 | id: LANG_CODEPAGE_TURKISH | 3421 | id: LANG_CODEPAGE_TURKISH |
3422 | desc: in codepage setting menu | 3422 | desc: in codepage setting menu |
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index d01d70c363..26965fe212 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang | |||
@@ -3392,9 +3392,9 @@ new: "Thai (ISO-8859-11)" | |||
3392 | 3392 | ||
3393 | id: LANG_CODEPAGE_ARABIC | 3393 | id: LANG_CODEPAGE_ARABIC |
3394 | desc: in codepage setting menu | 3394 | desc: in codepage setting menu |
3395 | eng: "Arabic (ISO-8859-6)" | 3395 | eng: "Arabic (CP1256)" |
3396 | voice: | 3396 | voice: |
3397 | new: "Arabisk (ISO-8859-6)" | 3397 | new: "Arabisk (CP1256)" |
3398 | 3398 | ||
3399 | id: LANG_CODEPAGE_TURKISH | 3399 | id: LANG_CODEPAGE_TURKISH |
3400 | desc: in codepage setting menu | 3400 | desc: in codepage setting menu |
diff --git a/apps/settings.c b/apps/settings.c index 8e266b19f1..7088cee950 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -486,7 +486,7 @@ static const struct bit_entry hd_bits[] = | |||
486 | {1, S_O(remote_caption_backlight), false, | 486 | {1, S_O(remote_caption_backlight), false, |
487 | "remote caption backlight", off_on }, | 487 | "remote caption backlight", off_on }, |
488 | #endif | 488 | #endif |
489 | {4, S_O(default_codepage), 0, "default codepage", "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,iso8859-6,iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8" }, | 489 | {4, S_O(default_codepage), 0, "default codepage", "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,cp1256,iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8,cp1256" }, |
490 | 490 | ||
491 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 491 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
492 | {4, S_O(brightness), 9, "brightness", NULL }, | 492 | {4, S_O(brightness), 9, "brightness", NULL }, |
diff --git a/tools/codepage_tables.c b/tools/codepage_tables.c index 45e3d529ab..5f5bec9bf3 100644 --- a/tools/codepage_tables.c +++ b/tools/codepage_tables.c | |||
@@ -36,6 +36,25 @@ const unsigned short cp1251_to_uni[] = { | |||
36 | 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457 /* B8-BF */ | 36 | 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457 /* B8-BF */ |
37 | }; | 37 | }; |
38 | 38 | ||
39 | const unsigned short cp1256_to_uni[] = { | ||
40 | 0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, | ||
41 | 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, | ||
42 | 0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, | ||
43 | 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, | ||
44 | 0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, | ||
45 | 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, | ||
46 | 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, | ||
47 | 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F, | ||
48 | 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, | ||
49 | 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, | ||
50 | 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, | ||
51 | 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, | ||
52 | 0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, | ||
53 | 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, | ||
54 | 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, | ||
55 | 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2 | ||
56 | }; | ||
57 | |||
39 | const unsigned short iso8859_2_to_uni[] = { | 58 | const unsigned short iso8859_2_to_uni[] = { |
40 | 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, /* A1-A7 */ | 59 | 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, /* A1-A7 */ |
41 | 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, /* A8-AF */ | 60 | 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, /* A8-AF */ |
diff --git a/tools/codepage_tables.h b/tools/codepage_tables.h index 40f9847264..4e16ec5150 100644 --- a/tools/codepage_tables.h +++ b/tools/codepage_tables.h | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | extern const unsigned short iso8859_7_to_uni[]; | 20 | extern const unsigned short iso8859_7_to_uni[]; |
21 | extern const unsigned short cp1251_to_uni[]; | 21 | extern const unsigned short cp1251_to_uni[]; |
22 | extern const unsigned short cp1256_to_uni[]; | ||
22 | extern const unsigned short iso8859_2_to_uni[]; | 23 | extern const unsigned short iso8859_2_to_uni[]; |
23 | extern const unsigned short cp932_table[]; | 24 | extern const unsigned short cp932_table[]; |
24 | extern const unsigned short cp936_table[]; | 25 | extern const unsigned short cp936_table[]; |
diff --git a/tools/codepages.c b/tools/codepages.c index af181a7b7d..023a741e30 100644 --- a/tools/codepages.c +++ b/tools/codepages.c | |||
@@ -84,13 +84,13 @@ unsigned short iso_decode(unsigned char *latin1, int cp, int count) | |||
84 | } | 84 | } |
85 | break; | 85 | break; |
86 | 86 | ||
87 | case 0x05: /* Arabic (ISO-8859-6) */ | 87 | case 0x05: /* Arabic (CP1256) */ |
88 | while (count--) { | 88 | while (count--) { |
89 | /* first convert to unicode */ | 89 | /* first convert to unicode */ |
90 | if (*latin1 < 0xAC || *latin1 == 0xAD) | 90 | if (*latin1 < 0x80) |
91 | ucs = *latin1++; | 91 | ucs = *latin1++; |
92 | else | 92 | else |
93 | ucs = *latin1++ + 0x0560; | 93 | ucs = cp1256_to_uni[*latin1++ - 0x80]; |
94 | } | 94 | } |
95 | break; | 95 | break; |
96 | 96 | ||