for (i = 0; i < glyphs->num_glyphs; i++)
{
- FT_Pos x_pos = positions[i].x_pos;
- FT_Pos y_pos = positions[i].y_pos;
+ FT_Pos x_offset = positions[i].x_offset;
+ FT_Pos y_offset = positions[i].y_offset;
int back = i;
int j;
int adjustment;
while (positions[back].back != 0)
{
back -= positions[back].back;
- x_pos += positions[back].x_pos;
- y_pos += positions[back].y_pos;
+ x_offset += positions[back].x_offset;
+ y_offset += positions[back].y_offset;
}
for (j = back; j < i; j++)
glyphs->glyphs[i].geometry.x_offset -= glyphs->glyphs[j].geometry.width;
- glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
- glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+ glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_offset);
+ glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_offset);
}
}
int i_rev = glyphs->num_glyphs - i - 1;
int back_rev = i_rev;
int back;
- FT_Pos x_pos = positions[i_rev].x_pos;
- FT_Pos y_pos = positions[i_rev].y_pos;
+ FT_Pos x_offset = positions[i_rev].x_offset;
+ FT_Pos y_offset = positions[i_rev].y_offset;
int j;
int adjustment;
while (positions[back_rev].back != 0)
{
back_rev -= positions[back_rev].back;
- x_pos += positions[back_rev].x_pos;
- y_pos += positions[back_rev].y_pos;
+ x_offset += positions[back_rev].x_offset;
+ y_offset += positions[back_rev].y_offset;
}
back = glyphs->num_glyphs - back_rev - 1;
for (j = i; j < back; j++)
glyphs->glyphs[i].geometry.x_offset += glyphs->glyphs[j].geometry.width;
- glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
- glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+ glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_offset);
+ glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_offset);
}
}
for (j = 0; j < len; j++)
{
if (positions[j].cursive_chain > 0)
- positions[j].y_pos += positions[j - positions[j].cursive_chain].y_pos;
+ positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset;
}
/* Then handle all right-to-left connections */
j = i - 1;
if (positions[j].cursive_chain < 0)
- positions[j].y_pos += positions[j - positions[j].cursive_chain].y_pos;
+ positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset;
}
}