Aric Stewart : usp10: Add Thaana script.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2585d41eeb358b39ba06233bded1031a69ca59f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2585d41eeb358b39ba06233bde...

Author: Aric Stewart 
Date:   Mon Aug 23 13:57:52 2010 -0500

usp10: Add Thaana script.

---

dlls/usp10/shape.c          |    1 +
 dlls/usp10/usp10.c          |    7 +++++--
 dlls/usp10/usp10_internal.h |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index cc0a3c0..3644069 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -305,6 +305,7 @@ static const ScriptShapeData ShapingData[] =
     {{ hebrew_features, 1}, "hebr", NULL},
     {{ syriac_features, 4}, "syrc", ContextualShape_Syriac},
     {{ arabic_features, 6}, "arab", ContextualShape_Arabic},
+    {{ NULL, 0}, "thaa", NULL},
 };

static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph)
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index a601a02..d084bc0 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -50,7 +50,6 @@ typedef struct _scriptRange
 } scriptRange;

static const scriptRange scriptRanges[] = {
-
     /* Basic Latin: U+0000–U+007A */
     /* Latin-1 Supplement: U+0080–U+00FF */
     /* Latin Extended-A: U+0100–U+017F */
@@ -69,6 +68,8 @@ static const scriptRange scriptRanges[] = {
     { Script_Syriac,     0x700,  0x74f,  0, 0},
     /* Arabic Supplement: U+0750–U+077F */
     { Script_Arabic,     0x750,  0x77f,  0, 0},
+    /* Thaana: U+0780–U+07BF */
+    { Script_Thaana,     0x780,  0x7bf,  0, 0},
     /* Phonetic Extensions: U+1D00–U+1DBF */
     { Script_Latin,      0x1d00, 0x1dbf, 0, 0},
     /* Latin Extended Additional: U+1E00–U+1EFF */
@@ -120,6 +121,8 @@ static const scriptData scriptInformation[] = {
      {LANG_SYRIAC, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 1, 0}},
     {{Script_Persian, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}},
      {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
+    {{Script_Thaana, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}},
+     {LANG_DIVEHI, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
 };

static const SCRIPT_PROPERTIES *script_props[] =
@@ -129,7 +132,7 @@ static const SCRIPT_PROPERTIES *script_props[] =
     &scriptInformation[4].props, &scriptInformation[5].props,
     &scriptInformation[6].props, &scriptInformation[7].props,
     &scriptInformation[8].props, &scriptInformation[9].props,
-    &scriptInformation[10].props
+    &scriptInformation[10].props, &scriptInformation[11].props
 };

typedef struct {
diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h
index fe796b0..6e05365 100644
--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -29,6 +29,7 @@
 #define Script_Hebrew  8
 #define Script_Syriac  9
 #define Script_Persian 10
+#define Script_Thaana  11

#define GLYPH_BLOCK_SHIFT 8
 #define GLYPH_BLOCK_SIZE  (1UL << GLYPH_BLOCK_SHIFT)