diff options
author | Bill Yi <byi@google.com> | 2021-01-05 08:51:10 -0800 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2021-01-05 08:51:10 -0800 |
commit | d9ce24d28498d2ab554702793d1b9393afa874f6 (patch) | |
tree | 2b6060b23847b86c94771a3a30ce669abcfdd30f | |
parent | 84ef199b988c1b16bf820eef01fb70d880ade0e2 (diff) | |
parent | 6fb1803a0dd877b504535d5a954e4c0026f8de0e (diff) | |
download | minikin-d9ce24d28498d2ab554702793d1b9393afa874f6.tar.gz |
Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE
Merged-In: If2848630eca80dee3162ee7c81938cc17381ec61
Change-Id: I688dbcf929426ac7893401d996bec994280e94ca
-rw-r--r-- | libs/minikin/LayoutUtils.cpp | 5 | ||||
-rw-r--r-- | tests/unittest/LayoutSplitterTest.cpp | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/libs/minikin/LayoutUtils.cpp b/libs/minikin/LayoutUtils.cpp index 3c258cf..acf07e2 100644 --- a/libs/minikin/LayoutUtils.cpp +++ b/libs/minikin/LayoutUtils.cpp @@ -36,6 +36,11 @@ static bool isWordBreakAfter(uint16_t c) { // spaces return true; } + // Break layout context before and after BiDi control character. + if ((0x2066 <= c && c <= 0x2069) || (0x202A <= c && c <= 0x202E) || c == 0x200E || + c == 0x200F) { + return true; + } // Note: kana is not included, as sophisticated fonts may kern kana return false; } diff --git a/tests/unittest/LayoutSplitterTest.cpp b/tests/unittest/LayoutSplitterTest.cpp index 4b75d9c..9b88de0 100644 --- a/tests/unittest/LayoutSplitterTest.cpp +++ b/tests/unittest/LayoutSplitterTest.cpp @@ -323,5 +323,40 @@ TEST(LayoutSplitterTest, RTL_CJK) { } } +TEST(LayoutSplitterTest, BidiCtrl) { + struct TestCase { + std::string testStr; + std::vector<std::string> expects; + } testCases[] = { + {// Repeated Bidi sequence + "(a\u2066\u2069\u202A\u202E\u200E\u200Fb)", + { + "[(a)]\u2066\u2069\u202A\u202E\u200E\u200Fb", + "a[(\u2066)]\u2069\u202A\u202E\u200E\u200Fb", + "a\u2066[(\u2069)]\u202A\u202E\u200E\u200Fb", + "a\u2066\u2069[(\u202A)]\u202E\u200E\u200Fb", + "a\u2066\u2069\u202A[(\u202E)]\u200E\u200Fb", + "a\u2066\u2069\u202A\u202E[(\u200E)]\u200Fb", + "a\u2066\u2069\u202A\u202E\u200E[(\u200F)]b", + "a\u2066\u2069\u202A\u202E\u200E\u200F[(b)]", + }}, + }; + + for (const auto& testCase : testCases) { + auto [text, range] = parseTestString(testCase.testStr); + uint32_t expectationIndex = 0; + for (auto [acContext, acPiece] : LayoutSplitter(text, range, false /* isRtl */)) { + ASSERT_NE(expectationIndex, testCase.expects.size()); + const std::string expectString = testCase.expects[expectationIndex++]; + auto [exContext, exPiece] = parseExpectString(expectString); + EXPECT_EQ(acContext, exContext) + << expectString << " vs " << buildDebugString(text, acContext, acPiece); + EXPECT_EQ(acPiece, exPiece) + << expectString << " vs " << buildDebugString(text, acContext, acPiece); + } + EXPECT_EQ(expectationIndex, testCase.expects.size()) << "Expectations Remains"; + } +} + } // namespace } // namespace minikin |