Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
93814ca7
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
大约 1 年 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
93814ca7
编写于
8月 28, 2012
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Start converging Ligature and match_input
上级
2eef7173
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
42 deletion
+78
-42
src/hb-ot-layout-gsub-table.hh
src/hb-ot-layout-gsub-table.hh
+30
-28
src/hb-ot-layout-gsubgpos-private.hh
src/hb-ot-layout-gsubgpos-private.hh
+48
-14
未找到文件。
src/hb-ot-layout-gsub-table.hh
浏览文件 @
93814ca7
...
...
@@ -495,38 +495,12 @@ struct Ligature
if
(
skippy_iter
.
has_no_chance
())
return
TRACE_RETURN
(
false
);
/*
* This is perhaps the trickiest part of
GSUB
... Remarks:
* This is perhaps the trickiest part of
OpenType
... Remarks:
*
* - If all components of the ligature were marks, we call this a mark ligature.
*
* - If there is no GDEF, and the ligature is NOT a mark ligature, we categorize
* it as a ligature glyph. Though, really, this will not really be used...
*
* - If it *is* a mark ligature, we don't allocate a new ligature id, and leave
* the ligature to keep its old ligature id. This will allow it to attach to
* a base ligature in GPOS. Eg. if the sequence is: LAM,LAM,SHADDA,FATHA,HEH,
* and LAM,LAM,HEH for a ligature, they will leave SHADDA and FATHA wit a
* ligature id and component value of 2. Then if SHADDA,FATHA form a ligature
* later, we don't want them to lose their ligature id/component, otherwise
* GPOS will fail to correctly position the mark ligature on top of the
* LAM,LAM,HEH ligature. See:
* https://bugzilla.gnome.org/show_bug.cgi?id=676343
*
* - If a ligature is formed of components that some of which are also ligatures
* themselves, and those ligature components had marks attached to *their*
* components, we have to attach the marks to the new ligature component
* positions! Now *that*'s tricky! And these marks may be following the
* last component of the whole sequence, so we should loop forward looking
* for them and update them.
*
* Eg. the sequence is LAM,LAM,SHADDA,FATHA,HEH, and the font first forms a
* 'calt' ligature of LAM,HEH, leaving the SHADDA and FATHA with a ligature
* id and component == 1. Now, during 'liga', the LAM and the LAM-HEH ligature
* form a LAM-LAM-HEH ligature. We need to reassign the SHADDA and FATHA to
* the new ligature with a component value of 2.
*
* This in fact happened to a font... See:
* https://bugzilla.gnome.org/show_bug.cgi?id=437633
* it as a ligature glyph.
*
* - Ligatures cannot be formed across glyphs attached to different components
* of previous ligatures. Eg. the sequence is LAM,SHADDA,LAM,FATHA,HEH, and
...
...
@@ -578,6 +552,34 @@ struct Ligature
/* Deal, we are forming the ligature. */
c
->
buffer
->
merge_clusters
(
c
->
buffer
->
idx
,
skippy_iter
.
idx
+
1
);
/*
* - If it *is* a mark ligature, we don't allocate a new ligature id, and leave
* the ligature to keep its old ligature id. This will allow it to attach to
* a base ligature in GPOS. Eg. if the sequence is: LAM,LAM,SHADDA,FATHA,HEH,
* and LAM,LAM,HEH for a ligature, they will leave SHADDA and FATHA wit a
* ligature id and component value of 2. Then if SHADDA,FATHA form a ligature
* later, we don't want them to lose their ligature id/component, otherwise
* GPOS will fail to correctly position the mark ligature on top of the
* LAM,LAM,HEH ligature. See:
* https://bugzilla.gnome.org/show_bug.cgi?id=676343
*
* - If a ligature is formed of components that some of which are also ligatures
* themselves, and those ligature components had marks attached to *their*
* components, we have to attach the marks to the new ligature component
* positions! Now *that*'s tricky! And these marks may be following the
* last component of the whole sequence, so we should loop forward looking
* for them and update them.
*
* Eg. the sequence is LAM,LAM,SHADDA,FATHA,HEH, and the font first forms a
* 'calt' ligature of LAM,HEH, leaving the SHADDA and FATHA with a ligature
* id and component == 1. Now, during 'liga', the LAM and the LAM-HEH ligature
* form a LAM-LAM-HEH ligature. We need to reassign the SHADDA and FATHA to
* the new ligature with a component value of 2.
*
* This in fact happened to a font... See:
* https://bugzilla.gnome.org/show_bug.cgi?id=437633
*/
unsigned
int
klass
=
is_mark_ligature
?
0
:
HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE
;
unsigned
int
lig_id
=
is_mark_ligature
?
0
:
allocate_lig_id
(
c
->
buffer
);
unsigned
int
last_lig_id
=
get_lig_id
(
c
->
buffer
->
cur
());
...
...
src/hb-ot-layout-gsubgpos-private.hh
浏览文件 @
93814ca7
...
...
@@ -423,17 +423,47 @@ static inline bool match_input (hb_apply_context_t *c,
const
void
*
match_data
,
unsigned
int
*
end_offset
=
NULL
)
{
hb_auto_trace_t
<
HB_DEBUG_APPLY
>
trace
(
&
c
->
debug_depth
,
"APPLY"
,
NULL
,
HB_FUNC
,
"idx %d codepoint %u"
,
c
->
buffer
->
idx
,
c
->
buffer
->
cur
().
codepoint
);
hb_apply_context_t
::
mark_skipping_forward_iterator_t
skippy_iter
(
c
,
c
->
buffer
->
idx
,
count
-
1
);
if
(
skippy_iter
.
has_no_chance
())
return
false
;
if
(
skippy_iter
.
has_no_chance
())
return
TRACE_RETURN
(
false
);
bool
is_mark_ligature
=
!!
(
c
->
property
&
HB_OT_LAYOUT_GLYPH_CLASS_MARK
);
unsigned
int
total_component_count
=
0
;
total_component_count
+=
get_lig_num_comps
(
c
->
buffer
->
cur
());
unsigned
int
first_lig_id
=
get_lig_id
(
c
->
buffer
->
cur
());
unsigned
int
first_lig_comp
=
get_lig_comp
(
c
->
buffer
->
cur
());
for
(
unsigned
int
i
=
1
;
i
<
count
;
i
++
)
{
if
(
!
skippy_iter
.
next
())
return
false
;
unsigned
int
property
;
if
(
likely
(
!
match_func
(
c
->
buffer
->
info
[
skippy_iter
.
idx
].
codepoint
,
input
[
i
-
1
],
match_data
)))
return
false
;
if
(
!
skippy_iter
.
next
(
&
property
))
return
TRACE_RETURN
(
false
);
if
(
likely
(
!
match_func
(
c
->
buffer
->
info
[
skippy_iter
.
idx
].
codepoint
,
input
[
i
-
1
],
match_data
)))
return
false
;
// if (likely (c->buffer->info[skippy_iter.idx].codepoint != component[i])) return TRACE_RETURN (false);
unsigned
int
this_lig_id
=
get_lig_id
(
c
->
buffer
->
info
[
skippy_iter
.
idx
]);
unsigned
int
this_lig_comp
=
get_lig_comp
(
c
->
buffer
->
info
[
skippy_iter
.
idx
]);
if
(
first_lig_id
&&
first_lig_comp
)
{
/* If first component was attached to a previous ligature component,
* all subsequent components should be attached to the same ligature
* component, otherwise we shouldn't ligate them. */
if
(
first_lig_id
!=
this_lig_id
||
first_lig_comp
!=
this_lig_comp
)
return
TRACE_RETURN
(
false
);
}
else
{
/* If first component was NOT attached to a previous ligature component,
* all subsequent components should also NOT be attached to any ligature
* component, unless they are attached to the first component itself! */
if
(
this_lig_id
&&
this_lig_comp
&&
(
this_lig_id
!=
first_lig_id
))
return
TRACE_RETURN
(
false
);
}
is_mark_ligature
=
is_mark_ligature
&&
(
property
&
HB_OT_LAYOUT_GLYPH_CLASS_MARK
);
total_component_count
+=
get_lig_num_comps
(
c
->
buffer
->
info
[
skippy_iter
.
idx
]);
}
if
(
end_offset
)
...
...
@@ -448,20 +478,22 @@ static inline bool match_backtrack (hb_apply_context_t *c,
match_func_t
match_func
,
const
void
*
match_data
)
{
hb_auto_trace_t
<
HB_DEBUG_APPLY
>
trace
(
&
c
->
debug_depth
,
"APPLY"
,
NULL
,
HB_FUNC
,
"idx %d codepoint %u"
,
c
->
buffer
->
idx
,
c
->
buffer
->
cur
().
codepoint
);
hb_apply_context_t
::
mark_skipping_backward_iterator_t
skippy_iter
(
c
,
c
->
buffer
->
backtrack_len
(),
count
,
true
);
if
(
skippy_iter
.
has_no_chance
())
return
false
;
return
TRACE_RETURN
(
false
)
;
for
(
unsigned
int
i
=
0
;
i
<
count
;
i
++
)
{
if
(
!
skippy_iter
.
prev
())
return
false
;
return
TRACE_RETURN
(
false
)
;
if
(
likely
(
!
match_func
(
c
->
buffer
->
out_info
[
skippy_iter
.
idx
].
codepoint
,
backtrack
[
i
],
match_data
)))
return
false
;
return
TRACE_RETURN
(
false
)
;
}
return
true
;
return
TRACE_RETURN
(
true
)
;
}
static
inline
bool
match_lookahead
(
hb_apply_context_t
*
c
,
...
...
@@ -471,20 +503,22 @@ static inline bool match_lookahead (hb_apply_context_t *c,
const
void
*
match_data
,
unsigned
int
offset
)
{
hb_auto_trace_t
<
HB_DEBUG_APPLY
>
trace
(
&
c
->
debug_depth
,
"APPLY"
,
NULL
,
HB_FUNC
,
"idx %d codepoint %u"
,
c
->
buffer
->
idx
,
c
->
buffer
->
cur
().
codepoint
);
hb_apply_context_t
::
mark_skipping_forward_iterator_t
skippy_iter
(
c
,
c
->
buffer
->
idx
+
offset
-
1
,
count
,
true
);
if
(
skippy_iter
.
has_no_chance
())
return
false
;
return
TRACE_RETURN
(
false
)
;
for
(
unsigned
int
i
=
0
;
i
<
count
;
i
++
)
{
if
(
!
skippy_iter
.
next
())
return
false
;
return
TRACE_RETURN
(
false
)
;
if
(
likely
(
!
match_func
(
c
->
buffer
->
info
[
skippy_iter
.
idx
].
codepoint
,
lookahead
[
i
],
match_data
)))
return
false
;
return
TRACE_RETURN
(
false
)
;
}
return
true
;
return
TRACE_RETURN
(
true
)
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录