[PATCH 4/5] usp10: Set the base embedding level for Script_Arabic_Numeric to 2.

[Aric Stewart]

Signed-off-by: Aric Stewart <aric at codeweavers.com>


On 6/7/16 2:18 PM, Henri Verbeet wrote:
> Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
> ---
>  dlls/usp10/tests/usp10.c | 22 ++++++++--------------
>  dlls/usp10/usp10.c       |  2 +-
>  2 files changed, 9 insertions(+), 15 deletions(-)
> 
> diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
> index 996f30c..0a0ac2d 100644
> --- a/dlls/usp10/tests/usp10.c
> +++ b/dlls/usp10/tests/usp10.c
> @@ -572,9 +572,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE},
>      /* Persian numerals and punctuation. */
>      static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c,  /* ۱۲٬۳۴۵٬ */
>                                     0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0};         /* ۶۷۸٫۹۰ */
> -    static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0},10,0,1,2,0,arab_tag,FALSE},
> +    static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,1,2,0,arab_tag,FALSE},
> +                                    {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,1,2,0,arab_tag,FALSE},
> +                                    {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,1,2,0,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
>      static const itemTest t572[] = {{{0,0,0,0,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE},
> @@ -584,19 +584,13 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE},
>                                      {{0,0,0,0,0,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
> -    static const itemTest t574[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
>      /* Arabic numerals and punctuation. */
>      static const WCHAR test58[] = {0x0661, 0x0662, 0x066c, 0x0663, 0x0664, 0x0665, 0x066c,  /* ١٢٬٣٤٥٬ */
>                                     0x0666, 0x0667, 0x0668, 0x066b, 0x0669, 0x0660};         /* ٦٧٨٫٩٠ */
> -    static const itemTest t581[] = {{{0,0,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE},
> +    static const itemTest t581[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
>      static const itemTest t582[] = {{{0,0,1,1,0,1}, 0,0,0,0,1,arab_tag,FALSE},
>                                      {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
> -    static const itemTest t583[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},
> -                                    {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}};
>  
>      SCRIPT_ITEM items[15];
>      SCRIPT_CONTROL  Control;
> @@ -801,8 +795,8 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE},
>      test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0);
>      test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0);
>      test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0);
> -    test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0);
> -    test_items_ok(test58,13,&Control,&State,1,t583,FALSE,0);
> +    test_items_ok(test57,13,&Control,&State,7,t571,FALSE,0);
> +    test_items_ok(test58,13,&Control,&State,1,t581,FALSE,0);
>  
>      State.uBidiLevel = 1;
>      Control.fMergeNeutralItems = TRUE;
> @@ -859,8 +853,8 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE},
>      test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0);
>      test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0);
>      test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0);
> -    test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0);
> -    test_items_ok(test58,13,&Control,&State,1,t583,FALSE,0);
> +    test_items_ok(test57,13,&Control,&State,7,t571,FALSE,0);
> +    test_items_ok(test58,13,&Control,&State,1,t581,FALSE,0);
>  
>      State.uBidiLevel = 0;
>      Control.fMergeNeutralItems = FALSE;
> diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
> index d654cc8..74250ea 100644
> --- a/dlls/usp10/usp10.c
> +++ b/dlls/usp10/usp10.c
> @@ -330,7 +330,7 @@ const scriptData scriptInformation[] = {
>       {LANG_ARABIC, 0, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 1, 0},
>       MS_MAKE_TAG('a','r','a','b'),
>       {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},
> -    {{Script_Arabic_Numeric, 0, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}},
> +    {{Script_Arabic_Numeric, 0, 1, 0, 0, 0, 0, { 2,0,0,0,0,0,0,0,0,0,0}},
>       {LANG_ARABIC, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0},
>       MS_MAKE_TAG('a','r','a','b'),
>       {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},
>