diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 02:16:30 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 02:16:30 +0000 |
| commit | 6bf5be4dff4f5869d5fbfb4f35731e6cf85e4084 (patch) | |
| tree | c1f670032e22770111116a675934c0a10dc37bd2 /third_party/harfbuzz | |
| parent | 84954ce77558a87d6bd20d5691bbc4ce9bfb6887 (diff) | |
| download | chromium_src-6bf5be4dff4f5869d5fbfb4f35731e6cf85e4084.zip chromium_src-6bf5be4dff4f5869d5fbfb4f35731e6cf85e4084.tar.gz chromium_src-6bf5be4dff4f5869d5fbfb4f35731e6cf85e4084.tar.bz2 | |
linux: tweak combining characters slightly
This fixes Arabic and a Cyrillic test.
Behdad has promised to rewrite all of this for WebKit, but
for now, this new behavior is less broken than before.
BUG=22872,22367
Review URL: http://codereview.chromium.org/327006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/harfbuzz')
| -rw-r--r-- | third_party/harfbuzz/contrib/harfbuzz-unicode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/harfbuzz/contrib/harfbuzz-unicode.c b/third_party/harfbuzz/contrib/harfbuzz-unicode.c index 51dd4ea..cb7a85b 100644 --- a/third_party/harfbuzz/contrib/harfbuzz-unicode.c +++ b/third_party/harfbuzz/contrib/harfbuzz-unicode.c @@ -171,7 +171,10 @@ hb_utf16_script_run_prev(unsigned *num_code_points, HB_ScriptItem *output, current_script = script; continue; } else if (script == HB_Script_Inherited) { - current_script = script; + // Just assume that whatever follows this combining character is within + // the same script. This is incorrect if you had language1 + combining + // char + language 2, but that is rare and this code is suspicious + // anyway. continue; } else { *iter = prev_iter; |