sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ applied patch from itayperl (bidi-mirroring-SVN-r3110.patch)

Browse source
This commit is contained in:
Artem Pavlenko 2011-09-08 15:08:17 +00:00
parent 6575e34973
commit aba5f21936
2 changed files with 24 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/font_engine_freetype.hpp
View file

@ -61,6 +61,7 @@ extern "C"
// icu // icu
#include <unicode/ubidi.h> #include <unicode/ubidi.h>
#include <unicode/ushape.h> #include <unicode/ushape.h>
#include <unicode/schriter.h>
namespace mapnik namespace mapnik
{ {

89
src/font_engine_freetype.cpp
View file

@ -230,82 +230,39 @@ void font_face_set::get_string_info(string_info & info)
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
UnicodeString reordered;
UnicodeString shaped;
UnicodeString const& ustr = info.get_string(); UnicodeString const& ustr = info.get_string();
const UChar * text = ustr.getBuffer(); int32_t length = ustr.length();
UBiDi * bidi = ubidi_openSized(ustr.length(),0,&err);
if (U_SUCCESS(err)) UBiDi *bidi = ubidi_openSized(length, 0, &err);
{ ubidi_setPara(bidi, ustr.getBuffer(), length, UBIDI_DEFAULT_LTR, 0, &err);
ubidi_setPara(bidi,text,ustr.length(), UBIDI_DEFAULT_LTR,0,&err);
if (U_SUCCESS(err)) ubidi_writeReordered(bidi, reordered.getBuffer(length),
{ length, UBIDI_DO_MIRRORING, &err);
int32_t count = ubidi_countRuns(bidi,&err);
int32_t logicalStart;
int32_t length;
for (int32_t i=0; i< count;++i) reordered.releaseBuffer(length);
{
if (UBIDI_LTR == ubidi_getVisualRun(bidi,i,&logicalStart,&length))
{
do {
UChar ch = text[logicalStart++];
dimension_t char_dim = character_dimensions(ch);
info.add_info(ch, char_dim.width, char_dim.height);
width += char_dim.width;
height = char_dim.height > height ? char_dim.height : height;
} while (--length > 0); u_shapeArabic(reordered.getBuffer(), length,
} shaped.getBuffer(length), length,
else U_SHAPE_LETTERS_SHAPE | U_SHAPE_LENGTH_FIXED_SPACES_NEAR |
{ U_SHAPE_TEXT_DIRECTION_VISUAL_LTR, &err);
logicalStart += length;
int32_t j=0,i=length; shaped.releaseBuffer(length);
UnicodeString arabic;
UChar * buf = arabic.getBuffer(length);
do {
UChar ch = text[--logicalStart];
buf[j++] = ch;
} while (--i > 0);
arabic.releaseBuffer(length); if (U_SUCCESS(err)) {
if ( *arabic.getBuffer() >= 0x0600 && *arabic.getBuffer() <= 0x06ff) StringCharacterIterator iter(shaped);
{ for (iter.setToStart(); iter.hasNext();) {
UnicodeString shaped; UChar ch = iter.nextPostInc();
u_shapeArabic(arabic.getBuffer(),arabic.length(),shaped.getBuffer(arabic.length()),arabic.length(), dimension_t char_dim = character_dimensions(ch);
U_SHAPE_LETTERS_SHAPE|U_SHAPE_LENGTH_FIXED_SPACES_NEAR| info.add_info(ch, char_dim.width, char_dim.height);
U_SHAPE_TEXT_DIRECTION_VISUAL_LTR width += char_dim.width;
,&err); height = (char_dim.height > height) ? char_dim.height : height;
shaped.releaseBuffer(arabic.length());
if (U_SUCCESS(err))
{
for (int j=0;j<shaped.length();++j)
{
dimension_t char_dim = character_dimensions(shaped[j]);
info.add_info(shaped[j], char_dim.width, char_dim.height);
width += char_dim.width;
height = char_dim.height > height ? char_dim.height : height;
}
}
} else {
// Non-Arabic RTL
for (int j=0;j<arabic.length();++j)
{
dimension_t char_dim = character_dimensions(arabic[j]);
info.add_info(arabic[j], char_dim.width, char_dim.height);
width += char_dim.width;
height = char_dim.height > height ? char_dim.height : height;
}
}
}
}
} }
ubidi_close(bidi);
} }
ubidi_close(bidi);
info.set_dimensions(width, height); info.set_dimensions(width, height);
} }