sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempting to pacify some compilers with an extra pair of brackets.

Browse source
This commit is contained in:
artemp 2017-03-02 14:55:00 +01:00
parent 4509f23c94
commit f1de5758b2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/unit/text/shaping.cpp
View file

@ -66,7 +66,7 @@ TEST_CASE("shaping")
{
std::vector<std::tuple<unsigned, unsigned>> expected =
{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
{{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}}};
// with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
//std::vector<std::tuple<unsigned, unsigned>> expected =
// {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
@ -76,26 +76,28 @@ TEST_CASE("shaping")
{
std::vector<std::tuple<unsigned, unsigned>> expected =
{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
{{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}};
test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
}
{
std::vector<std::tuple<unsigned, unsigned>> expected =
{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
{{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}}};
test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
}
{
std::vector<std::tuple<unsigned, unsigned>> expected =
{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
{{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}}};
test_shaping(fontset, fm, expected, "abc (abc)");
}
{
// "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
std::vector<std::tuple<unsigned, unsigned>> expected =
{{0, 0},{0, 1},{0, 2},{3, 3},{0, 4},{0, 5},{0, 6},{0, 7},{0, 8},{0, 9},{3, 10},{509, 22},{481, 21},{438, 20},{503, 19},{470, 18},{496, 17},{43, 16},{3, 15},{509, 14},{454, 13},{496, 12},{43, 11}};
{{{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
{0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
{470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}}};
test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
}