Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
c2709119
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
c2709119
编写于
10月 27, 2010
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move things around some more
上级
194d4566
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
15 deletion
+19
-15
src/hb-ot-layout-gpos-private.hh
src/hb-ot-layout-gpos-private.hh
+4
-4
src/hb-ot-layout-gsub-private.hh
src/hb-ot-layout-gsub-private.hh
+2
-2
src/hb-ot-layout-gsubgpos-private.hh
src/hb-ot-layout-gsubgpos-private.hh
+7
-2
src/hb-ot-layout-private.hh
src/hb-ot-layout-private.hh
+3
-4
src/hb-ot-layout.cc
src/hb-ot-layout.cc
+3
-3
未找到文件。
src/hb-ot-layout-gpos-private.hh
浏览文件 @
c2709119
...
...
@@ -1100,9 +1100,9 @@ struct MarkLigPosFormat1
* is identical to the ligature ID of the found ligature. If yes, we
* can directly use the component index. If not, we attach the mark
* glyph to the last component of the ligature. */
if
(
c
->
buffer
->
info
[
j
].
lig_id
()
&&
c
->
buffer
->
info
[
j
].
lig_id
()
==
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()
&&
c
->
buffer
->
info
[
c
->
buffer
->
i
].
component
())
if
(
c
->
buffer
->
info
[
j
].
lig_id
()
&&
c
->
buffer
->
info
[
j
].
lig_id
()
==
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()
&&
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_comp
())
{
comp_index
=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
component
()
-
1
;
comp_index
=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_comp
()
-
1
;
if
(
comp_index
>=
comp_count
)
comp_index
=
comp_count
-
1
;
}
...
...
@@ -1205,8 +1205,8 @@ struct MarkMarkPosFormat1
/* Two marks match only if they belong to the same base, or same component
* of the same ligature. That is, the component numbers must match, and
* if those are non-zero, the ligid number should also match. */
if
((
c
->
buffer
->
info
[
j
].
component
()
!=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
component
())
||
(
c
->
buffer
->
info
[
j
].
component
()
&&
c
->
buffer
->
info
[
j
].
lig_id
()
!=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()))
if
((
c
->
buffer
->
info
[
j
].
lig_comp
()
!=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_comp
())
||
(
c
->
buffer
->
info
[
j
].
lig_comp
()
&&
c
->
buffer
->
info
[
j
].
lig_id
()
!=
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()))
return
false
;
unsigned
int
mark2_index
=
(
this
+
mark2Coverage
)
(
c
->
buffer
->
info
[
j
].
codepoint
);
...
...
src/hb-ot-layout-gsub-private.hh
浏览文件 @
c2709119
...
...
@@ -372,7 +372,7 @@ struct Ligature
/* Allocate new ligature id */
unsigned
int
lig_id
=
allocate_lig_id
(
c
->
buffer
);
c
->
buffer
->
info
[
c
->
buffer
->
i
].
component
()
=
0
;
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_comp
()
=
0
;
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()
=
lig_id
;
if
(
j
==
c
->
buffer
->
i
+
i
)
/* No input glyphs skipped */
...
...
@@ -394,7 +394,7 @@ struct Ligature
{
while
(
_hb_ot_layout_skip_mark
(
c
->
layout
->
face
,
&
c
->
buffer
->
info
[
c
->
buffer
->
i
],
c
->
lookup_props
,
NULL
))
{
c
->
buffer
->
info
[
c
->
buffer
->
i
].
component
()
=
i
;
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_comp
()
=
i
;
c
->
buffer
->
info
[
c
->
buffer
->
i
].
lig_id
()
=
lig_id
;
c
->
replace_glyph
(
c
->
buffer
->
info
[
c
->
buffer
->
i
].
codepoint
);
}
...
...
src/hb-ot-layout-gsubgpos-private.hh
浏览文件 @
c2709119
...
...
@@ -35,6 +35,11 @@
HB_BEGIN_DECLS
/* buffer var allocations */
#define lig_id() var2.u16[0]
/* unique ligature id */
#define lig_comp() var2.u16[1]
/* component number in the ligature (0 = base) */
#ifndef HB_DEBUG_APPLY
#define HB_DEBUG_APPLY HB_DEBUG+0
#endif
...
...
@@ -72,13 +77,13 @@ struct hb_apply_context_t
inline
void
guess_glyph_class
(
unsigned
int
klass
)
{
// buffer->info[buffer->i].
gproperty
() = klass;
// buffer->info[buffer->i].
props_cache
() = klass;
}
private:
inline
void
clear_property
(
void
)
const
{
buffer
->
info
[
buffer
->
i
].
gproperty
()
=
0
;
buffer
->
info
[
buffer
->
i
].
props_cache
()
=
0
;
}
};
...
...
src/hb-ot-layout-private.hh
浏览文件 @
c2709119
...
...
@@ -38,10 +38,9 @@
HB_BEGIN_DECLS
/* XXX */
#define component() var1.u16[0]
#define lig_id() var1.u16[1]
#define gproperty() var2.u32
/* buffer var allocations */
#define props_cache() var1.u16[0]
/* glyph_props cache */
typedef
enum
{
HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED
=
0x0001
,
...
...
src/hb-ot-layout.cc
浏览文件 @
c2709119
...
...
@@ -106,13 +106,13 @@ unsigned int
_hb_ot_layout_get_glyph_property
(
hb_face_t
*
face
,
hb_glyph_info_t
*
info
)
{
if
(
!
info
->
gproperty
())
if
(
!
info
->
props_cache
())
{
const
GDEF
&
gdef
=
_get_gdef
(
face
);
info
->
gproperty
()
=
gdef
.
get_glyph_props
(
info
->
codepoint
);
info
->
props_cache
()
=
gdef
.
get_glyph_props
(
info
->
codepoint
);
}
return
info
->
gproperty
();
return
info
->
props_cache
();
}
hb_bool_t
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录