diff options
| author | László Németh <nemeth@numbertext.org> | 2014-02-04 19:10:44 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2014-04-09 16:53:41 +0200 |
| commit | 9f132a147c5d0f92b66837bb5816eb2a2b700f2c (patch) | |
| tree | 9c739192ffbc9124e597143a9de42a053c5a3752 /vcl | |
| parent | a5b68f520067219c5e571238eafe93d1d728ce38 (diff) | |
fdo#70666 fix Graphite ligature replacement at line breaks
Change-Id: I5b7c149f7f419ba18bd2cc59f4e77a0b61280caa
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 348c4e36cbcc..58f9b23bd3e8 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -48,6 +48,10 @@ #include <unicode/ubidi.h> #include <unicode/uscript.h> +#include <vcl/unohelp.hxx> +#include <com/sun/star/i18n/XCharacterClassification.hpp> +#include <com/sun/star/i18n/UnicodeType.hpp> + // Graphite Libraries (must be after vcl headers on windows) #include <graphite2/Segment.h> @@ -589,9 +593,13 @@ 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); - int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, FIXME + + static com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass; + if ( !xCharClass.is() ) + xCharClass = vcl::unohelper::CreateCharacterClassification(); + int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement + if (xCharClass->getType(rArgs.mpStr, numchars + 1) != ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER) + numchars += 64; if (mpFeatures) pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16, rArgs.mpStr + mnSegCharOffset, numchars, bRtl); |