Skip to content

W
wine-winehq
Commit e5ab22d6 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

ups10: Mark to Base, Mark and Ligature are not cumulative offsets.

parent b6bc92aa
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
dlls/usp10/opentype.c
View file @ e5ab22d6
......@@ -1734,10 +1734,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c
if (desU.x || desU.y)
{
GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY);
if (!analysis->fRTL) pGoffset[glyph_index].du -= piAdvance[glyph_index-1];
else if (analysis->fLogicalOrder) devX *= -1;
pGoffset[glyph_index].du += round(devX);
pGoffset[glyph_index].dv += round(devY);
if (!analysis->fRTL) pGoffset[glyph_index].du = round(devX) - piAdvance[glyph_index-1];
else
{
if (analysis->fLogicalOrder) devX *= -1;
pGoffset[glyph_index].du = round(devX);
}
pGoffset[glyph_index].dv = round(devY);
}
break;
}
......@@ -1749,8 +1752,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c
if (desU.x || desU.y)
{
GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY);
pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]);
pGoffset[glyph_index].dv += round(devY);
pGoffset[glyph_index].du = (round(devX) - piAdvance[glyph_index-1]);
pGoffset[glyph_index].dv = round(devY);
}
break;
}
......@@ -1764,8 +1767,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c
{
GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY);
if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1;
pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index - write_dir].du;
pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index - write_dir].dv;
pGoffset[glyph_index].du = round(devX) + pGoffset[glyph_index - write_dir].du;
pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index - write_dir].dv;
}
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment