summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2013-09-06 15:46:58 +0200
committerLászló Németh <nemeth@numbertext.org>2013-09-06 15:46:58 +0200
commit58e1112a6a974b96bb8595e3ee9d08e915d4fd14 (patch)
tree698a5a32477976092439fbf73fd2895bcf49ebc7
parente7dd69d97af1e12b15fd82eaea2e2b51f9dca40b (diff)
fdo#52540 fix Graphite hyphenation (ligat. + combining diac.)
Change-Id: Idc3d9c40793f6f1c1b7883ca47f04ced36cabc48
m---------helpcontent20
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx15
2 files changed, 3 insertions, 12 deletions
diff --git a/helpcontent2 b/helpcontent2
-Subproject dddb2f331c390253ae76d0be4f621d50c3f3db6
+Subproject 0d8b37cd9e0b89d1136b09a81671c88fc91fee3
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index e61da7c75c34..348c4e36cbcc 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,18 +589,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
nSegCharLimit - rArgs.mnEndCharPos, bRtl);
}
}
- int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
- rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
- if (mnSegCharOffset + numchars > limit)
- {
- int combining_char = 0;
- for (int i = mnSegCharOffset; i < numchars; i++) {
- int ch = rArgs.mpStr[i];
- if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 0x1DFF) ||
- (ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch <= 0xFE26)) combining_char++;
- }
- numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, fdo#68313
- }
+// int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
+// rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
+ int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, FIXME
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,
rArgs.mpStr + mnSegCharOffset, numchars, bRtl);