if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, ¤t_face, &fnt->size)<0)
#endif
{
- delete fnt;
eDebug("FTC_Manager_Lookup_Size failed!");
return 0;
}
if (!current_font)
return -1;
-
- if (cursor.y()==-1)
- {
- cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
- left=cursor.x();
- }
-
+
#ifdef HAVE_FREETYPE2
if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
current_font->scaler.face_id,
cache_current_font=¤t_font->font.font;
}
#endif
-
+
+ if (!current_face)
+ eFatal("eTextPara::renderString: no current_face");
+ if (!current_face->size)
+ eFatal("eTextPara::renderString: no current_face->size");
+
+ if (cursor.y()==-1)
+ {
+ cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
+ left=cursor.x();
+ }
+
std::vector<unsigned long> uc_string, uc_visual;
if (string)
uc_string.reserve(strlen(string));
shape(uc_shape, uc_string);
// now do the usual logical->visual reordering
-#ifdef HAVE_FRIBIDI
- FriBidiCharType dir=FRIBIDI_TYPE_ON;
+ int size=uc_shape.size();
+#ifdef HAVE_FRIBIDI
+ bool mustRealign=false;
+ int pos=0, spos=0;
+ uc_visual.resize(size);
+ // gaaanz lahm, aber anders geht das leider nicht, sorry.
+ FriBidiChar array[size], target[size];
+ std::copy(uc_shape.begin(), uc_shape.end(), array);
+
+ bool line_open = false;
+ while(pos < size)
{
- int size=uc_shape.size();
- uc_visual.resize(size);
- // gaaanz lahm, aber anders geht das leider nicht, sorry.
- FriBidiChar array[size], target[size];
- std::copy(uc_shape.begin(), uc_shape.end(), array);
- fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
- uc_visual.assign(target, target+size);
+ int incr=1;
+ bool line_end = false;
+ if (!line_open)
+ line_open = true;
+ switch((unsigned long)array[pos])
+ {
+ case '\\':
+ if (pos+1 == size || (unsigned long)array[pos+1] != 'n')
+ break;
+ ++incr;
+ case 0x8A:
+ case 0xE08A:
+ case '\n':
+ line_end = true;
+ default:
+ break;
+ }
+ if (line_end || pos+incr >= size)
+ {
+ int len = pos - spos;
+ if (len)
+ {
+ FriBidiCharType dir=FRIBIDI_TYPE_ON;
+ fribidi_log2vis(array+spos, len, &dir, target+spos, 0, 0, 0);
+ if (!mustRealign && dir&FRIBIDI_MASK_RTL)
+ mustRealign = true;
+ }
+ target[pos] = array[pos];
+ if (incr > 1)
+ target[pos+1] = array[pos+1];
+ spos = pos+incr;
+ line_open = false;
+ }
+ pos += incr;
}
+
+ uc_visual.assign(target, target+size);
#else
uc_visual=uc_shape;
#endif
- glyphs.reserve(uc_visual.size());
+ glyphs.reserve(size);
int nextflags = 0;
bboxValid=false;
calc_bbox();
#ifdef HAVE_FRIBIDI
- if (dir & FRIBIDI_MASK_RTL)
+ if (mustRealign)
realign(dirRight);
#endif
return 0;