Module: wine Branch: master Commit: 1c40824572a2bfb48d2b9d094558356b08c0f49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c40824572a2bfb48d2b9d0945...
Author: Aric Stewart aric@codeweavers.com Date: Wed Dec 14 07:29:19 2011 -0600
usp10: Add Canadian Aboriginal Syllabics script.
---
dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 10 +++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ff1a229..b8caed2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -671,6 +671,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "cher", "", NULL, NULL}, + {{ no_features, 0}, NULL, "cans", "", 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 0d520c7..c8906c9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -164,6 +164,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define nko_tag MS_MAKE_TAG('n','k','o',' ') #define vai_tag MS_MAKE_TAG('v','a','i',' ') #define cher_tag MS_MAKE_TAG('c','h','e','r') +#define cans_tag MS_MAKE_TAG('c','a','n','s')
static void test_ScriptItemize( void ) { @@ -404,6 +405,11 @@ static void test_ScriptItemize( void ) static const itemTest t391[2] = {{{0,0,0,0,0},0,0,0,0,cher_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; static const itemTest t392[2] = {{{0,0,0,0,0},0,0,0,2,cher_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}};
+ /* Canadian Aboriginal Syllabics */ + static const WCHAR test40[] = {0x1403,0x14c4,0x1483,0x144e,0x1450,0x1466}; + static const itemTest t401[2] = {{{0,0,0,0,0},0,0,0,0,cans_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t402[2] = {{{0,0,0,0,0},0,0,0,2,cans_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -476,6 +482,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0); test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0); test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0); + test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0);
State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -522,6 +529,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0);
State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -568,6 +576,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0);
State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -615,6 +624,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t402,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 d69ce06..4d0e52b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -120,10 +120,14 @@ static const scriptRange scriptRanges[] = { { Script_Ethiopic, 0x1200, 0x139f, 0, 0}, /* Cherokee: U+13A0–U+13FF */ { Script_Cherokee, 0x13a0, 0x13ff, 0, 0}, + /* Canadian Aboriginal Syllabics: U+1400–U+167F */ + { Script_Canadian, 0x1400, 0x167f, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Mongolian: U+1800–U+18AF */ { Script_Mongolian, 0x1800, 0x18af, Script_Mongolian_Numeric, 0}, + /* Canadian Aboriginal Syllabics Extended: U+18B0–U+18FF */ + { Script_Canadian, 0x18b0, 0x18ff, 0, 0}, /* Tai Le: U+1950–U+197F */ { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, /* New Tai Lue: U+1980–U+19DF */ @@ -560,6 +564,10 @@ static const scriptData scriptInformation[] = { {0x5c, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','h','e','r'), {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e'}}, + {{Script_Canadian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('c','a','n','s'), + {'E','u','p','h','e','m','i','a'}}, };
static const SCRIPT_PROPERTIES *script_props[] = @@ -598,7 +606,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[62].props, &scriptInformation[63].props, &scriptInformation[64].props, &scriptInformation[65].props, &scriptInformation[66].props, &scriptInformation[67].props, - &scriptInformation[68].props + &scriptInformation[68].props, &scriptInformation[69].props };
typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 969fb4e..696189b 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -100,6 +100,7 @@ #define Script_Vai 66 #define Script_Vai_Numeric 67 #define Script_Cherokee 68 +#define Script_Canadian 69
#define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)