ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Update glyph component count on multiple substitution. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-05-28 14:54:28 +03:00 committed by Alexandre Julliard
parent 9f31bf0e1c
commit 2e4d71c721
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/dwrite/dwrite_private.h
View File

@ -468,6 +468,17 @@ struct shaping_glyph_info
unsigned int props; unsigned int props;
}; };
struct shaping_glyph_properties
{
UINT16 justification : 4;
UINT16 isClusterStart : 1;
UINT16 isDiacritic : 1;
UINT16 isZeroWidthSpace : 1;
UINT16 reserved : 1;
UINT16 components : 4;
UINT16 reserved2 : 4;
};
struct scriptshaping_context struct scriptshaping_context
{ {
struct scriptshaping_cache *cache; struct scriptshaping_cache *cache;
@ -498,7 +509,7 @@ struct scriptshaping_context
struct struct
{ {
UINT16 *glyphs; UINT16 *glyphs;
DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; struct shaping_glyph_properties *glyph_props;
UINT16 *clustermap; UINT16 *clustermap;
} buffer; } buffer;
} u; } u;

10
dlls/dwrite/opentype.c
View File

@ -4648,7 +4648,10 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co
glyph = GET_BE_WORD(glyphs[i]); glyph = GET_BE_WORD(glyphs[i]);
context->u.subst.glyphs[idx + i] = glyph; context->u.subst.glyphs[idx + i] = glyph;
if (i) if (i)
{
context->u.subst.glyph_props[idx + i].isClusterStart = 0; context->u.subst.glyph_props[idx + i].isClusterStart = 0;
context->u.buffer.glyph_props[idx + i].components = 0;
}
opentype_set_subst_glyph_props(context, idx + i, glyph); opentype_set_subst_glyph_props(context, idx + i, glyph);
/* Inherit feature mask from original matched glyph. */ /* Inherit feature mask from original matched glyph. */
context->glyph_infos[idx + i].mask = mask; context->glyph_infos[idx + i].mask = mask;
@ -5081,11 +5084,12 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c
codepoint = context->u.subst.digits[codepoint - '0']; codepoint = context->u.subst.digits[codepoint - '0'];
context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint);
context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER;
context->u.subst.glyph_props[g].isClusterStart = 1; context->u.buffer.glyph_props[g].isClusterStart = 1;
opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]);
if (opentype_is_default_ignorable(codepoint)) if (opentype_is_default_ignorable(codepoint))
context->u.subst.glyph_props[g].isZeroWidthSpace = 1; context->u.buffer.glyph_props[g].isZeroWidthSpace = 1;
context->u.buffer.glyph_props[g].components = 1;
context->glyph_count++; context->glyph_count++;
clustermap[i] = i; clustermap[i] = i;