Aric Stewart : usp10: Add N'Ko script.

[Alexandre Julliard]

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

Author: Aric Stewart <aric at codeweavers.com>
Date:   Wed Dec 14 07:28:56 2011 -0600

usp10: Add N'Ko script.

---

 dlls/usp10/shape.c          |    1 +
 dlls/usp10/tests/usp10.c    |   10 ++++++++++
 dlls/usp10/usp10.c          |    8 +++++++-
 dlls/usp10/usp10_internal.h |    1 +
 4 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 67397b4..69ac076 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -667,6 +667,7 @@ static const ScriptShapeData ShapingData[] =
     {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL},
     {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL},
     {{ no_features, 0}, NULL, "tfng", "", NULL, NULL},
+    {{ no_features, 0}, NULL, "nko ", "", NULL, NULL},
 };
 
 static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph)
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 080cc4c..6516fb8 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -161,6 +161,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString,
 #define ethi_tag MS_MAKE_TAG('e','t','h','i')
 #define mong_tag MS_MAKE_TAG('m','o','n','g')
 #define tfng_tag MS_MAKE_TAG('t','f','n','g')
+#define nko_tag MS_MAKE_TAG('n','k','o',' ')
 
 static void test_ScriptItemize( void )
 {
@@ -386,6 +387,11 @@ static void test_ScriptItemize( void )
     static const itemTest t361[2] = {{{0,0,0,0,0},0,0,0,0,tfng_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}};
     static const itemTest t362[2] = {{{0,0,0,0,0},0,0,0,2,tfng_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}};
 
+    /* N'Ko */
+    static const WCHAR test37[] = {0x07d2,0x07de,0x07cf};
+    static const itemTest t371[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,0,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}};
+    static const itemTest t372[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,2,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}};
+
     SCRIPT_ITEM items[15];
     SCRIPT_CONTROL  Control;
     SCRIPT_STATE    State;
@@ -455,6 +461,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test34,3,NULL,NULL,1,t341,FALSE,0);
     test_items_ok(test35,13,NULL,NULL,1,t351,FALSE,b351);
     test_items_ok(test36,7,NULL,NULL,1,t361,FALSE,0);
+    test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0);
 
     State.uBidiLevel = 0;
     test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0);
@@ -498,6 +505,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test34,3,&Control,&State,1,t341,FALSE,0);
     test_items_ok(test35,13,&Control,&State,1,t351,FALSE,b351);
     test_items_ok(test36,7,&Control,&State,1,t361,FALSE,0);
+    test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0);
 
     State.uBidiLevel = 1;
     test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0);
@@ -541,6 +549,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342);
     test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352);
     test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0);
+    test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0);
 
     State.uBidiLevel = 1;
     Control.fMergeNeutralItems = TRUE;
@@ -585,6 +594,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342);
     test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352);
     test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0);
+    test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0);
 }
 
 static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index ed482fe..37e94e4 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -81,6 +81,8 @@ static const scriptRange scriptRanges[] = {
     { Script_Arabic,     0x750,  0x77f,  0, 0},
     /* Thaana: U+0780–U+07BF */
     { Script_Thaana,     0x780,  0x7bf,  0, 0},
+    /* N’Ko: U+07C0–U+07FF */
+    { Script_NKo,        0x7c0,  0x7ff,  0, 0},
     /* Devanagari: U+0900–U+097F */
     { Script_Devanagari, 0x900,  0x97f,  Script_Devanagari_Numeric, 0},
     /* Bengali: U+0980–U+09FF */
@@ -538,6 +540,10 @@ static const scriptData scriptInformation[] = {
      {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0},
      MS_MAKE_TAG('t','f','n','g'),
      {'E','b','r','i','m','a'}},
+    {{Script_NKo, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}},
+     {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     MS_MAKE_TAG('n','k','o',' '),
+     {0}},
 };
 
 static const SCRIPT_PROPERTIES *script_props[] =
@@ -574,7 +580,7 @@ static const SCRIPT_PROPERTIES *script_props[] =
     &scriptInformation[58].props, &scriptInformation[59].props,
     &scriptInformation[60].props, &scriptInformation[61].props,
     &scriptInformation[62].props, &scriptInformation[63].props,
-    &scriptInformation[64].props
+    &scriptInformation[64].props, &scriptInformation[65].props
 };
 
 typedef struct {
diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h
index d8e710d..e2a5c15 100644
--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -96,6 +96,7 @@
 #define Script_Mongolian 62
 #define Script_Mongolian_Numeric 63
 #define Script_Tifinagh 64
+#define Script_NKo 65
 
 #define GLYPH_BLOCK_SHIFT 8
 #define GLYPH_BLOCK_SIZE  (1UL << GLYPH_BLOCK_SHIFT)