system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwrite: Handle higher planes when setting DWRITE_SCRIPT_SHAPES_NO_VISUAL.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2022-09-03 11:13:32 +03:00 committed by Alexandre Julliard
parent f9b836b1c1
commit d8584a16ed
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlls/dwrite/analyzer.c
View file

@ -654,17 +654,22 @@ static DWRITE_SCRIPT_ANALYSIS get_char_sa(UINT32 c)
sa.script = get_char_script(c);
sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT;
if ((c >= 0x0001 && c <= 0x001f) ||
(c >= 0x007f && c <= 0x009f) ||
(c == 0x00ad) /* SOFT HYPHEN */ ||
(c >= 0x200b && c <= 0x200f) ||
(c >= 0x2028 && c <= 0x202e) ||
(c >= 0x2060 && c <= 0x2064) ||
(c >= 0x2066 && c <= 0x206f) ||
(c == 0xfeff) ||
(c == 0xfff9) ||
(c == 0xfffa) ||
(c == 0xfffb))
if ((c >= 0x0001 && c <= 0x001f) /* C0 controls */
|| (c >= 0x007f && c <= 0x009f) /* DELETE, C1 controls */
|| (c == 0x00ad) /* SOFT HYPHEN */
|| (c >= 0x200b && c <= 0x200f) /* ZWSP, ZWNJ, ZWJ, LRM, RLM */
|| (c >= 0x2028 && c <= 0x202e) /* Line/paragraph separators, LRE, RLE, PDF, LRO, RLO */
|| (c >= 0x2060 && c <= 0x2064) /* WJ, invisible operators */
|| (c >= 0x2066 && c <= 0x2069) /* LRI, RLI, FSI, PDI */
|| (c >= 0x206a && c <= 0x206f) /* Deprecated control characters */
|| (c == 0xfeff) /* ZWBNSP */
|| (c == 0xfff9) /* Interlinear annotation */
|| (c == 0xfffa)
|| (c == 0xfffb)
|| (c >= 0x1bca0 && c <= 0x1bca3) /* Shorthand format controls */
|| (c >= 0x1d173 && c <= 0x1d17a) /* Musical symbols: beams and slurs */
|| (c == 0xe0001) /* Language tag, deprecated */
|| (c >= 0xe0020 && c <= 0xe007f)) /* Tag components */
{
sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL;
}

10
dlls/dwrite/tests/analyzer.c
View file

@ -1026,6 +1026,16 @@ static struct sa_test sa_tests[] = {
{0xd805,0xde80,0}, 1,
{ { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } }
},
{
/* Musical symbols, U+1D173 */
{0xd834,0xdd73,0}, 1,
{ { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } }
},
{
/* Tags, U+E0020 */
{0xdb40,0xdc20,0}, 1,
{ { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } }
},
/* keep this as end test data marker */
{ {0} }
};