diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-08-26 04:09:09 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-22 00:47:40 +0200 |
| commit | ceb9a8232ca0fe9bc823b61ee3ca8bcdc0aa01c5 (patch) | |
| tree | d088f6fa8e4025b75ddd034240c74fb987fd7ebe /src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | |
| parent | ed5fe1b95e818101d00e9415d8881ac836c505eb (diff) | |
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 <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-shaper.h')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h index 6dfcdd20a7..2ff52eaf30 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h @@ -126,21 +126,14 @@ typedef struct hb_uint8 bidiLevel; } HB_ScriptItem; -typedef enum { - HB_NoBreak, - HB_SoftHyphen, - HB_Break, - HB_ForcedBreak -} HB_LineBreakType; - typedef struct { - /*HB_LineBreakType*/ hb_bitfield lineBreakType :2; - /*HB_Bool*/ hb_bitfield whiteSpace :1; /* A unicode whitespace character, except NBSP, ZWNBSP */ - /*HB_Bool*/ hb_bitfield charStop :1; /* Valid cursor position (for left/right arrow) */ - /*HB_Bool*/ hb_bitfield wordBoundary :1; - /*HB_Bool*/ hb_bitfield sentenceBoundary :1; - hb_bitfield unused :2; + hb_bitfield graphemeBoundary : 1; /* Valid cursor position (for left/right arrow) */ + hb_bitfield wordBreak : 1; + hb_bitfield sentenceBoundary : 1; + hb_bitfield lineBreak : 1; + hb_bitfield whiteSpace : 1; /* A unicode whitespace character */ + hb_bitfield unused : 3; } HB_CharAttributes; void HB_GetTailoredCharAttributes(const HB_UChar16 *string, hb_uint32 stringLength, |