Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
183fdedb
Commit
183fdedb
authored
13 years ago
by
Aric Stewart
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
usp10: More properly handle the glyph properties on glyphs added by multiple substitutions.
parent
ceca7169
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/usp10/shape.c
+15
-21
15 additions, 21 deletions
dlls/usp10/shape.c
with
15 additions
and
21 deletions
dlls/usp10/shape.c
+
15
−
21
View file @
183fdedb
...
...
@@ -1269,7 +1269,7 @@ static VOID *load_gdef_table(HDC hdc)
return
GDEF_Table
;
}
static
void
GDEF_UpdateGlyphProps
(
HDC
hdc
,
ScriptCache
*
psc
,
const
WORD
*
pwGlyphs
,
const
WORD
cGlyphs
,
WORD
*
pwLogClust
,
SCRIPT_GLYPHPROP
*
pGlyphProp
)
static
void
GDEF_UpdateGlyphProps
(
HDC
hdc
,
ScriptCache
*
psc
,
const
WORD
*
pwGlyphs
,
const
WORD
cGlyphs
,
WORD
*
pwLogClust
,
const
WORD
cChars
,
SCRIPT_GLYPHPROP
*
pGlyphProp
)
{
int
i
;
...
...
@@ -1279,6 +1279,12 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph
for
(
i
=
0
;
i
<
cGlyphs
;
i
++
)
{
WORD
class
;
int
char_count
=
0
;
int
k
;
for
(
k
=
0
;
k
<
cChars
;
k
++
)
if
(
pwLogClust
[
k
]
==
i
)
char_count
++
;
class
=
GDEF_get_glyph_class
(
psc
->
GDEF_Table
,
pwGlyphs
[
i
]);
...
...
@@ -1311,6 +1317,9 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph
pGlyphProp
[
i
].
sva
.
fDiacritic
=
0
;
pGlyphProp
[
i
].
sva
.
fZeroWidth
=
0
;
}
if
(
char_count
==
0
)
pGlyphProp
[
i
].
sva
.
fClusterStart
=
0
;
}
}
...
...
@@ -2964,10 +2973,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS
}
if
(
char_count
==
0
)
{
FIXME
(
"No chars in this glyph? Must be an error
\n
"
);
continue
;
}
if
(
char_count
==
1
&&
pwcChars
[
char_index
[
0
]]
==
0x0020
)
/* space */
{
...
...
@@ -2978,7 +2984,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS
pGlyphProp
[
i
].
sva
.
uJustification
=
SCRIPT_JUSTIFY_CHARACTER
;
}
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
pGlyphProp
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
cChars
,
pGlyphProp
);
UpdateClustersFromGlyphProp
(
cGlyphs
,
cChars
,
pwLogClust
,
pGlyphProp
);
}
...
...
@@ -3036,10 +3042,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
isFinal
=
(
i
==
finaGlyph
||
(
i
+
dirL
>
0
&&
i
+
dirL
<
cGlyphs
&&
spaces
[
i
+
dirL
]));
if
(
char_count
==
0
)
{
FIXME
(
"No chars in this glyph? Must be an error
\n
"
);
continue
;
}
if
(
char_count
==
1
)
{
...
...
@@ -3092,7 +3095,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
pGlyphProp
[
i
].
sva
.
uJustification
=
SCRIPT_JUSTIFY_NONE
;
}
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
pGlyphProp
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
cChars
,
pGlyphProp
);
UpdateClustersFromGlyphProp
(
cGlyphs
,
cChars
,
pwLogClust
,
pGlyphProp
);
HeapFree
(
GetProcessHeap
(),
0
,
spaces
);
}
...
...
@@ -3143,10 +3146,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
}
if
(
char_count
==
0
)
{
FIXME
(
"No chars in this glyph? Must be an error
\n
"
);
continue
;
}
if
(
char_count
==
1
&&
pwcChars
[
char_index
[
0
]]
==
0x0020
)
/* space */
{
...
...
@@ -3160,7 +3160,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
}
HeapFree
(
GetProcessHeap
(),
0
,
spaces
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
pGlyphProp
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
cChars
,
pGlyphProp
);
UpdateClustersFromGlyphProp
(
cGlyphs
,
cChars
,
pwLogClust
,
pGlyphProp
);
/* Do not allow justification between marks and their base */
...
...
@@ -3190,10 +3190,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS*
}
if
(
char_count
==
0
)
{
FIXME
(
"No chars in this glyph? Must be an error
\n
"
);
continue
;
}
if
(
char_count
==
1
&&
pwcChars
[
char_index
[
0
]]
==
0x0020
)
/* space */
{
...
...
@@ -3203,7 +3200,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS*
else
pGlyphProp
[
i
].
sva
.
uJustification
=
SCRIPT_JUSTIFY_NONE
;
}
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
pGlyphProp
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
cChars
,
pGlyphProp
);
UpdateClustersFromGlyphProp
(
cGlyphs
,
cChars
,
pwLogClust
,
pGlyphProp
);
}
...
...
@@ -3226,10 +3223,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS
}
if
(
char_count
==
0
)
{
FIXME
(
"No chars in this glyph? Must be an error
\n
"
);
continue
;
}
if
(
char_count
==
1
&&
pwcChars
[
char_index
[
0
]]
==
0x0020
)
/* space */
{
...
...
@@ -3239,7 +3233,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS
else
pGlyphProp
[
i
].
sva
.
uJustification
=
SCRIPT_JUSTIFY_NONE
;
}
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
pGlyphProp
);
GDEF_UpdateGlyphProps
(
hdc
,
psc
,
pwGlyphs
,
cGlyphs
,
pwLogClust
,
cChars
,
pGlyphProp
);
UpdateClustersFromGlyphProp
(
cGlyphs
,
cChars
,
pwLogClust
,
pGlyphProp
);
/* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment