Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
a1f7b285
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
接近 2 年 前同步成功
通知
1
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看板
提交
a1f7b285
编写于
10月 18, 2013
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[otlayout] Switch over from old is_a_ligature() to IS_LIGATED
Impact should be minimal and positive.
上级
09675a81
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
8 deletion
+14
-8
src/hb-ot-layout-gsubgpos-private.hh
src/hb-ot-layout-gsubgpos-private.hh
+1
-1
src/hb-ot-layout-private.hh
src/hb-ot-layout-private.hh
+9
-3
src/hb-ot-shape-complex-indic.cc
src/hb-ot-shape-complex-indic.cc
+2
-2
src/hb-ot-shape-complex-myanmar.cc
src/hb-ot-shape-complex-myanmar.cc
+1
-1
src/hb-ot-shape.cc
src/hb-ot-shape.cc
+1
-1
未找到文件。
src/hb-ot-layout-gsubgpos-private.hh
浏览文件 @
a1f7b285
...
@@ -409,7 +409,7 @@ struct hb_apply_context_t
...
@@ -409,7 +409,7 @@ struct hb_apply_context_t
if
(
unlikely
(
_hb_glyph_info_is_default_ignorable
(
&
info
)
&&
if
(
unlikely
(
_hb_glyph_info_is_default_ignorable
(
&
info
)
&&
(
ignore_zwnj
||
!
_hb_glyph_info_is_zwnj
(
&
info
))
&&
(
ignore_zwnj
||
!
_hb_glyph_info_is_zwnj
(
&
info
))
&&
(
ignore_zwj
||
!
_hb_glyph_info_is_zwj
(
&
info
))
&&
(
ignore_zwj
||
!
_hb_glyph_info_is_zwj
(
&
info
))
&&
!
_hb_glyph_info_
is_
ligated
(
&
info
)))
!
_hb_glyph_info_ligated
(
&
info
)))
return
SKIP_MAYBE
;
return
SKIP_MAYBE
;
return
SKIP_NO
;
return
SKIP_NO
;
...
...
src/hb-ot-layout-private.hh
浏览文件 @
a1f7b285
...
@@ -306,7 +306,7 @@ _hb_glyph_info_get_lig_id (const hb_glyph_info_t *info)
...
@@ -306,7 +306,7 @@ _hb_glyph_info_get_lig_id (const hb_glyph_info_t *info)
}
}
static
inline
bool
static
inline
bool
_hb_glyph_info_
is_ligated
(
const
hb_glyph_info_t
*
info
)
_hb_glyph_info_
ligated_internal
(
const
hb_glyph_info_t
*
info
)
{
{
return
!!
(
info
->
lig_props
()
&
IS_LIG_BASE
);
return
!!
(
info
->
lig_props
()
&
IS_LIG_BASE
);
}
}
...
@@ -314,7 +314,7 @@ _hb_glyph_info_is_ligated (const hb_glyph_info_t *info)
...
@@ -314,7 +314,7 @@ _hb_glyph_info_is_ligated (const hb_glyph_info_t *info)
static
inline
unsigned
int
static
inline
unsigned
int
_hb_glyph_info_get_lig_comp
(
const
hb_glyph_info_t
*
info
)
_hb_glyph_info_get_lig_comp
(
const
hb_glyph_info_t
*
info
)
{
{
if
(
_hb_glyph_info_
is_ligated
(
info
))
if
(
_hb_glyph_info_
ligated_internal
(
info
))
return
0
;
return
0
;
else
else
return
info
->
lig_props
()
&
0x0F
;
return
info
->
lig_props
()
&
0x0F
;
...
@@ -324,7 +324,7 @@ static inline unsigned int
...
@@ -324,7 +324,7 @@ static inline unsigned int
_hb_glyph_info_get_lig_num_comps
(
const
hb_glyph_info_t
*
info
)
_hb_glyph_info_get_lig_num_comps
(
const
hb_glyph_info_t
*
info
)
{
{
if
((
info
->
glyph_props
()
&
HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE
)
&&
if
((
info
->
glyph_props
()
&
HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE
)
&&
_hb_glyph_info_
is_ligated
(
info
))
_hb_glyph_info_
ligated_internal
(
info
))
return
info
->
lig_props
()
&
0x0F
;
return
info
->
lig_props
()
&
0x0F
;
else
else
return
1
;
return
1
;
...
@@ -370,6 +370,12 @@ _hb_glyph_info_is_mark (const hb_glyph_info_t *info)
...
@@ -370,6 +370,12 @@ _hb_glyph_info_is_mark (const hb_glyph_info_t *info)
return
!!
(
info
->
glyph_props
()
&
HB_OT_LAYOUT_GLYPH_PROPS_MARK
);
return
!!
(
info
->
glyph_props
()
&
HB_OT_LAYOUT_GLYPH_PROPS_MARK
);
}
}
static
inline
bool
_hb_glyph_info_ligated
(
const
hb_glyph_info_t
*
info
)
{
return
!!
(
info
->
glyph_props
()
&
HB_OT_LAYOUT_GLYPH_PROPS_LIGATED
);
}
/* Allocation / deallocation. */
/* Allocation / deallocation. */
inline
void
inline
void
...
...
src/hb-ot-shape-complex-indic.cc
浏览文件 @
a1f7b285
...
@@ -141,7 +141,7 @@ static inline bool
...
@@ -141,7 +141,7 @@ static inline bool
is_one_of
(
const
hb_glyph_info_t
&
info
,
unsigned
int
flags
)
is_one_of
(
const
hb_glyph_info_t
&
info
,
unsigned
int
flags
)
{
{
/* If it ligated, all bets are off. */
/* If it ligated, all bets are off. */
if
(
_hb_glyph_info_
is_
ligated
(
&
info
))
return
false
;
if
(
_hb_glyph_info_ligated
(
&
info
))
return
false
;
return
!!
(
FLAG
(
info
.
indic_category
())
&
flags
);
return
!!
(
FLAG
(
info
.
indic_category
())
&
flags
);
}
}
...
@@ -1406,7 +1406,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
...
@@ -1406,7 +1406,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
if
(
start
+
1
<
end
&&
if
(
start
+
1
<
end
&&
info
[
start
].
indic_position
()
==
POS_RA_TO_BECOME_REPH
&&
info
[
start
].
indic_position
()
==
POS_RA_TO_BECOME_REPH
&&
((
info
[
start
].
indic_category
()
==
OT_Repha
)
^
((
info
[
start
].
indic_category
()
==
OT_Repha
)
^
_hb_glyph_info_
is_
ligated
(
&
info
[
start
])))
_hb_glyph_info_ligated
(
&
info
[
start
])))
{
{
unsigned
int
new_reph_pos
;
unsigned
int
new_reph_pos
;
reph_position_t
reph_pos
=
indic_plan
->
config
->
reph_pos
;
reph_position_t
reph_pos
=
indic_plan
->
config
->
reph_pos
;
...
...
src/hb-ot-shape-complex-myanmar.cc
浏览文件 @
a1f7b285
...
@@ -151,7 +151,7 @@ static inline bool
...
@@ -151,7 +151,7 @@ static inline bool
is_one_of
(
const
hb_glyph_info_t
&
info
,
unsigned
int
flags
)
is_one_of
(
const
hb_glyph_info_t
&
info
,
unsigned
int
flags
)
{
{
/* If it ligated, all bets are off. */
/* If it ligated, all bets are off. */
if
(
_hb_glyph_info_
is_
ligated
(
&
info
))
return
false
;
if
(
_hb_glyph_info_ligated
(
&
info
))
return
false
;
return
!!
(
FLAG
(
info
.
myanmar_category
())
&
flags
);
return
!!
(
FLAG
(
info
.
myanmar_category
())
&
flags
);
}
}
...
...
src/hb-ot-shape.cc
浏览文件 @
a1f7b285
...
@@ -548,7 +548,7 @@ hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c)
...
@@ -548,7 +548,7 @@ hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c)
unsigned
int
j
=
0
;
unsigned
int
j
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
count
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
count
;
i
++
)
{
{
if
(
unlikely
(
!
_hb_glyph_info_
is_
ligated
(
&
info
[
i
])
&&
if
(
unlikely
(
!
_hb_glyph_info_ligated
(
&
info
[
i
])
&&
_hb_glyph_info_is_default_ignorable
(
&
info
[
i
])))
_hb_glyph_info_is_default_ignorable
(
&
info
[
i
])))
{
{
if
(
space_status
==
SPACE_DONT_KNOW
)
if
(
space_status
==
SPACE_DONT_KNOW
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录