change the arabic codepage from ISO-8859-6 to CP1256

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8323 a1c6a512-1295-4272-9138-f99709370657

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:
 
 id: LANG_CODEPAGE_ARABIC
 desc: in codepage setting menu
-eng: "Arabic (ISO-8859-6)"
+eng: "Arabic (CP1256)"
 voice:
 new:
 
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)"
 
 id: LANG_CODEPAGE_ARABIC
 desc: in codepage setting menu
-eng: "Arabic (ISO-8859-6)"
+eng: "Arabic (CP1256)"
 voice:
-new: "아랍어 (ISO-8859-6)"
+new: "아랍어 (CP1256)"
 
 id: LANG_CODEPAGE_TURKISH
 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)"
 
 id: LANG_CODEPAGE_ARABIC
 desc: in codepage setting menu
-eng: "Arabic (ISO-8859-6)"
+eng: "Arabic (CP1256)"
 voice: 
-new: "Arabisk (ISO-8859-6)"
+new: "Arabisk (CP1256)"
 
 id: LANG_CODEPAGE_TURKISH
 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[] =
     {1, S_O(remote_caption_backlight), false, 
         "remote caption backlight", off_on },
 #endif
-    {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" },
+    {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" },
     
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     {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[] = {
   0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457  /* B8-BF */
 };
 
+const unsigned short cp1256_to_uni[] = {
+  0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+  0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+  0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+  0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+  0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+  0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+  0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+  0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+  0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+  0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+  0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
+  0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
+  0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
+  0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+  0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
+  0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
+};
+
 const unsigned short iso8859_2_to_uni[] = {
           0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, /* A1-A7 */
   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 @@
 
 extern const unsigned short iso8859_7_to_uni[];
 extern const unsigned short cp1251_to_uni[];
+extern const unsigned short cp1256_to_uni[];
 extern const unsigned short iso8859_2_to_uni[];
 extern const unsigned short cp932_table[];
 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)
             }
             break;
 
-        case 0x05: /* Arabic (ISO-8859-6) */
+        case 0x05: /* Arabic (CP1256) */
             while (count--) {
                 /* first convert to unicode */
-                if (*latin1 < 0xAC || *latin1 == 0xAD)
+                if (*latin1 < 0x80)
                     ucs = *latin1++;
-                else                    
-                    ucs = *latin1++ + 0x0560;
+                else
+                    ucs = cp1256_to_uni[*latin1++ - 0x80];
             }
             break;