diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-06-06 18:00:21 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 21:18:36 +0200 |
| commit | 88e735c9c92487f7ff51a06cfd66746afa655b2d (patch) | |
| tree | c7cf46412839749e4a9af5413dc17a7a810d0029 /src/3rdparty/harfbuzz/src | |
| parent | 8aac04f705c8f9e4193444b904f9819aea85b326 (diff) | |
Shift positions for lineBreakType
to keep them consistent with positions for all other flags.
This changes the internal behavior so that attributes[0].lineBreakType now means
"break opportunity at start of the text (before the first character in the string)"
and is always assigned with HB_NoBreak to conform rule LB2
(see http://www.unicode.org/reports/tr14/#LB2).
The current implementation is based on the sample implementation from tr14
that aimed to be as simple as possible rather than to be optimal.
From now, we can use pieces of the attributes array "as is"
without having to adjust some positions. Or we can analize some long text
by chunks (e.g. paragraph by paragraph) and consume less memory.
This introduces a minor overhead that will be eliminated shortly.
Change-Id: Ic873a05a9d5203b1c3d5aff2e4445a3f034c4bd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/3rdparty/harfbuzz/src')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c | 3 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c index 4b68e64d85..1327b185b0 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c @@ -521,8 +521,7 @@ void HB_MyanmarAttributes(HB_Script script, const HB_UChar16 *text, hb_uint32 fr hb_uint32 boundary = myanmar_nextSyllableBoundary(text, from+i, end, &invalid) - from; attributes[i].charStop = TRUE; - if (i) - attributes[i-1].lineBreakType = HB_Break; + attributes[i].lineBreakType = HB_Break; if (boundary > len-1) boundary = len; diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index 039394a5a2..54fb9537a4 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -414,8 +414,7 @@ static void HB_ThaiAssignAttributes(const HB_UChar16 *string, hb_uint32 len, HB_ numbreaks = th_brk((const unsigned char *)cstr, break_positions, brp_size); for (i = 0; i < numbreaks; ++i) { attributes[break_positions[i]].wordBoundary = TRUE; - if (break_positions[i] > 0) - attributes[break_positions[i]-1].lineBreakType = HB_Break; + attributes[break_positions[i]].lineBreakType = HB_Break; } if (break_positions != brp) |