/* === S Y N F I G ========================================================= */
/*! \file lyr_freetype.cpp
-** \brief Template Header
+** \brief Implementation of the "Text" layer
**
** $Id$
**
SYNFIG_LAYER_INIT(Layer_Freetype);
SYNFIG_LAYER_SET_NAME(Layer_Freetype,"text");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Freetype,_("Text"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_Freetype,_("Other"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Freetype,N_("Text"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_Freetype,N_("Other"));
SYNFIG_LAYER_SET_VERSION(Layer_Freetype,"0.2");
SYNFIG_LAYER_SET_CVS_ID(Layer_Freetype,"$Id$");
FcResult result;
if( !FcInit() )
{
- synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialise"));
+ synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialize"));
error = 1;
} else {
FcPattern* pat = FcNameParse((FcChar8 *) newfont.c_str());
IMPORT_PLUS(size, if(old_version){size/=2.0;} needs_sync_=true );
IMPORT_PLUS(text,needs_sync_=true);
IMPORT_PLUS(pos,needs_sync_=true);
- IMPORT(color);
+ IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+ set_blend_method(Color::BLEND_ALPHA_OVER);
+ color.set_a(1); } else transparent_color_ = true; });
IMPORT(invert);
IMPORT_PLUS(orient,needs_sync_=true);
IMPORT_PLUS(compress,needs_sync_=true);
-- ** -- CREATE GLYPHS -------------------------------------------------------
*/
+ mbstate_t ps;
+ memset(&ps, 0, sizeof(ps));
+
lines.push_front(TextLine());
string::const_iterator iter;
for (iter=text.begin(); iter!=text.end(); ++iter)
glyph_index = FT_Get_Char_Index( face, ' ' );
}
else
- glyph_index = FT_Get_Char_Index( face, *iter );
+ {
+ wchar_t wc;
+ size_t converted = mbrtowc(&wc, &(*iter), text.end() - iter, &ps);
+
+ if(converted == (size_t)(-1))
+ {
+ synfig::warning("Layer_Freetype: multibyte: %s",
+ _("Invalid multibyte sequence - is the locale set?\n"));
+ continue;
+ }
+
+ if(converted == (size_t)(-2))
+ {
+ synfig::warning("Layer_Freetype: multibyte: %s",
+ _("Can't parse multibyte character.\n"));
+ continue;
+ }
+
+ glyph_index = FT_Get_Char_Index( face, wc );
+
+ if(converted > 1)
+ iter += converted - 1;
+ }
// retrieve kerning distance and move pen position
if ( FT_HAS_KERNING(face) && use_kerning && previous && glyph_index )
float line_height;
line_height=vcompress*((float)face->height*(((float)face->size->metrics.y_scale/METRICS_SCALE_ONE)));
+ // This module sees to expect pixel height to be negative, as it
+ // usually is. But rendering to .bmp format causes ph to be
+ // positive, which was causing text to be rendered upside down.
+ if (ph>0) line_height = -line_height;
+
int string_height;
string_height=round_to_int(((lines.size()-1)*line_height+lines.back().actual_height()));
//synfig::info("string_height=%d",string_height);
for(curr_line=0,iter=lines.begin();iter!=lines.end();++iter,curr_line++)
{
bx=round_to_int((pos[0]-renddesc.get_tl()[0])*pw*CHAR_RESOLUTION-orient[0]*iter->width);
- by=round_to_int((pos[1]-renddesc.get_tl()[1])*ph*CHAR_RESOLUTION+(1.0-orient[1])*string_height-line_height*curr_line);
+ // I've no idea why 1.5, but it kind of works. Otherwise,
+ // rendering to .bmp (which renders from bottom to top, due to
+ // the .bmp format describing the image from bottom to top,
+ // renders text in the wrong place.
+ by=round_to_int((pos[1]-renddesc.get_tl()[1])*ph*CHAR_RESOLUTION +
+ (1.0-orient[1])*string_height-line_height*curr_line +
+ ((ph>0) ? line_height/1.5 : 0));
+
//by=round_to_int(vcompress*((pos[1]-renddesc.get_tl()[1])*ph*64+(1.0-orient[1])*string_height-face->size->metrics.height*curr_line));
//synfig::info("curr_line=%d, bx=%d, by=%d",curr_line,bx,by);
for(u=0;u<bit->bitmap.width;u++)
{
int x=u+((pen.x+32)>>6)+ bit->left;
- int y=v+((pen.y+32)>>6)- bit->top;
+ int y=((pen.y+32)>>6) + (bit->top - v) * ((ph<0) ? -1 : 1);
if( y>=0 &&
x>=0 &&
y<surface->get_h() &&