From ceb9a8232ca0fe9bc823b61ee3ca8bcdc0aa01c5 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 26 Aug 2012 04:09:09 +0300 Subject: A step out from Harfbuzz (reduce dependency) Introduce QCharAttributes and use it instead of HB_CharAttributes everywhere in Qt (in Harfbuzz, the HB_CharAttributes is only used in the text segmentation algorithm which has been moved from HB to Qt (well, most of it)). Rename some members to better reflect their meaning, remember to keep HB_CharAttributes in sync with QCharAttributes. Also replace HB_ScriptItem with a (temporary) QUnicodeTools::ScriptItem struct that will be replaced with a more efficient/friendly solution a bit later. The soft hyphen and the mandatory break detection has been factored out of the default text breaking algorithm to a higher level in order to refactor the QCharAttributes bitfields and to optimize the implementation for the common case. Change-Id: Ieb365623ae954430f1c8b2dfcd65c82973143eec Reviewed-by: Lars Knoll --- src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c') diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c b/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c index e0c263d426..c3570974b3 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c @@ -260,12 +260,12 @@ void HB_TibetanAttributes(HB_Script script, const HB_UChar16 *text, hb_uint32 fr HB_Bool invalid; hb_uint32 boundary = tibetan_nextSyllableBoundary(text, from+i, end, &invalid) - from; - attributes[i].charStop = TRUE; + attributes[i].graphemeBoundary = TRUE; if (boundary > len-1) boundary = len; i++; while (i < boundary) { - attributes[i].charStop = FALSE; + attributes[i].graphemeBoundary = FALSE; ++uc; ++i; } -- cgit v1.2.3