Module: wine Branch: master Commit: 51b5e6090a59744629d9d4430f0bcdc8296ab6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b5e6090a59744629d9d4430f...
Author: Aric Stewart aric@codeweavers.com Date: Mon Dec 12 07:31:56 2011 -0600
usp10: Add script Tai Le.
---
dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 11 +++++++++++ dlls/usp10/usp10.c | 8 +++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 675765a..f2b2a7b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -606,6 +606,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, + {{ standard_features, 2}, NULL, "tale", "", 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 74fe334..7ae232a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -150,6 +150,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define knda_tag MS_MAKE_TAG('k','n','d','a') #define mlym_tag MS_MAKE_TAG('m','l','y','m') #define mymr_tag MS_MAKE_TAG('m','y','m','r') +#define tale_tag MS_MAKE_TAG('t','a','l','e')
static void test_ScriptItemize( void ) { @@ -304,6 +305,12 @@ static void test_ScriptItemize( void ) static const itemTest t241[2] = {{{0,0,0,0,0},0,0,0,0,mymr_tag,FALSE},{{0,0,0,0,0},12,0,0,0,-1,FALSE}}; static const itemTest t242[2] = {{{0,0,0,0,0},0,0,0,2,mymr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},12,0,0,0,-1,FALSE}};
+ /* Tai Le */ + static const WCHAR test25[] = {0x1956,0x196d,0x1970,0x1956,0x196c,0x1973,0x1951,0x1968,0x1952,0x1970}; + static const itemTest t251[2] = {{{0,0,0,0,0},0,0,0,0,tale_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + static const itemTest t252[2] = {{{0,0,0,0,0},0,0,0,2,tale_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + +
SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -362,6 +369,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,NULL,NULL,2,t221,FALSE,0); test_items_ok(test23,6,NULL,NULL,2,t231,FALSE,0); test_items_ok(test24,12,NULL,NULL,1,t241,FALSE,0); + test_items_ok(test25,10,NULL,NULL,1,t251,FALSE,0);
State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -393,6 +401,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,2,t221,FALSE,0); test_items_ok(test23,6,&Control,&State,2,t231,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t241,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t251,FALSE,0);
State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -424,6 +433,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,2,t222,FALSE,1); test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0);
State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -456,6 +466,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,1,t223,FALSE,2); test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t252,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 1f225b0..5782591 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -111,6 +111,8 @@ static const scriptRange scriptRanges[] = { { Script_Myanmar, 0x1000, 0x109f, Script_Myanmar_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, + /* Tai Le: U+1950–U+197F */ + { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, /* Vedic Extensions: U+1CD0-U+1CFF */ { Script_Devanagari, 0x1cd0, 0x1cff, Script_Devanagari_Numeric, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -389,6 +391,10 @@ static const scriptData scriptInformation[] = { {0x55, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), {0}}, + {{Script_Tai_Le, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','a','l','e'), + {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e'}}, };
static const SCRIPT_PROPERTIES *script_props[] = @@ -417,7 +423,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[42].props, &scriptInformation[43].props, &scriptInformation[44].props, &scriptInformation[45].props, &scriptInformation[46].props, &scriptInformation[47].props, - &scriptInformation[48].props + &scriptInformation[48].props, &scriptInformation[49].props };
typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bade039..2a385d5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -78,6 +78,7 @@ /* Unicode Chapter 11 continued */ #define Script_Myanmar 47 #define Script_Myanmar_Numeric 48 +#define Script_Tai_Le 49
#define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)