From eef0577c5e90ca5c48d58793945d2d8684644cc0 Mon Sep 17 00:00:00 2001 From: László Németh Date: Sat, 4 Jul 2015 15:06:01 +0200 Subject: tdf#52540 Revert "fdo#52540 refix graphite layout generally" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 12168aeea91a57e63159c3103c904d630c44c62e, because that caused a regression in hyphenation, see tdf#52540. Change-Id: I75613b17de241a5c4fa6da5df7fdaf05db1692b6 Reviewed-on: https://gerrit.libreoffice.org/16755 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/glyphs/graphite_layout.cxx | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 474756f9ae0b..a4aa99c4b807 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -561,36 +561,33 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) int limit = rArgs.mnEndCharPos; if (!(SalLayoutFlags::ComplexDisabled & rArgs.mnFlags)) { - int nSegCharMin = maximum(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH); - int nSegCharLimit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH); - while (nSegCharMin < mnSegCharOffset) + const int nSegCharMin = maximum(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH); + const int nSegCharLimit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH); + if (nSegCharMin < mnSegCharOffset) { - int sameDirEnd = nSegCharMin + findSameDirLimit(rArgs.mpStr + nSegCharMin, + int sameDirEnd = findSameDirLimit(rArgs.mpStr + nSegCharMin, rArgs.mnEndCharPos - nSegCharMin, bRtl); - if (sameDirEnd >= rArgs.mnMinCharPos) - { + if (sameDirEnd == rArgs.mnEndCharPos) mnSegCharOffset = nSegCharMin; - break; - } - else - nSegCharMin = sameDirEnd; } if (nSegCharLimit > limit) { limit += findSameDirLimit(rArgs.mpStr + rArgs.mnEndCharPos, nSegCharLimit - rArgs.mnEndCharPos, bRtl); - if (limit > rArgs.mnLength) - limit = rArgs.mnLength; } } - else - { - limit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH); - mnSegCharOffset = maximum(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH); - } size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset, - rArgs.mpStr + limit, NULL); + rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL); + static com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass; + if ( !xCharClass.is() ) + xCharClass = vcl::unohelper::CreateCharacterClassification(); + size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement, fdo#88051 layout problem + if (numchars > numchars2 && (rArgs.mpStr[mnSegCharOffset + numchars2] == '\t' || + xCharClass->getType(rArgs.mpStr + mnSegCharOffset, numchars2 + 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER)) + { + numchars = numchars2; + } if (mpFeatures) pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16, rArgs.mpStr + mnSegCharOffset, numchars, bRtl); -- cgit