summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-11-05 15:32:38 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2009-11-05 15:32:38 (GMT)
commitf7b457e3d72b412b1d5ce080a40f290ab9bf46ab (patch)
tree943a88812649c4eddf1650a58d9f88596b07c703 /src
parent154f7142bc264866519257f2d4e62982671e3b12 (diff)
downloadQt-f7b457e3d72b412b1d5ce080a40f290ab9bf46ab.zip
Qt-f7b457e3d72b412b1d5ce080a40f290ab9bf46ab.tar.gz
Qt-f7b457e3d72b412b1d5ce080a40f290ab9bf46ab.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
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp4
-rw-r--r--src/3rdparty/harfbuzz/tests/shaping/main.cpp2
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} }
};