diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-11-05 15:32:38 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-06 13:07:38 (GMT) |
| commit | 6f9ae6917d0b278df72ec74cee4a62b86cd81cc7 (patch) | |
| tree | b8628c295f8af56dff48a6a93210dc5babd3489d | |
| parent | ddd5379f8581553734c6ecb3b25f7130ec95f64d (diff) | |
| download | Qt-6f9ae6917d0b278df72ec74cee4a62b86cd81cc7.zip Qt-6f9ae6917d0b278df72ec74cee4a62b86cd81cc7.tar.gz Qt-6f9ae6917d0b278df72ec74cee4a62b86cd81cc7.tar.bz2 | |
Fix a bug in malayalam rendering
Updated to harfbuzz e6636cadacf220785fca12b741b4587ff1ee42ec.
Fixes a bug with the rendering of samvruthokaram (combination of
0xd41 + 0xd4d) in malayalam.
Task-number: Parts of QTBUG-1887
Reviewed-by: Eskil
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/tests/shaping/main.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp index df447e6..3008fca 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp @@ -1746,6 +1746,10 @@ static int indic_nextSyllableBoundary(HB_Script script, const HB_UChar16 *s, int ++pos; continue; } + if (script == HB_Script_Malayalam && state == Matra && uc[pos-1] == 0x0d41) { + ++pos; + continue; + } goto finish; case Nukta: if (state == Consonant) diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp index 9b6aa31..41f2dbb 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp @@ -979,6 +979,8 @@ void tst_QScriptEngine::malayalam() { 0x5e, 0x34, 0x65, 0x0 } }, { { 0xd15, 0xd57, 0x0 }, { 0x34, 0x65, 0x0 } }, + { { 0xd1f, 0xd4d, 0xd1f, 0xd41, 0xd4d, 0x0 }, + { 0x69, 0x5b, 0x64, 0x0 } }, { {0}, {0} } }; |