Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
dbccf87e
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,发现更多精彩内容 >>
提交
dbccf87e
编写于
5月 09, 2012
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Indic] Make room for more reordering positions
上级
d4480ace
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
115 addition
and
110 deletion
+115
-110
src/hb-ot-shape-complex-indic-private.hh
src/hb-ot-shape-complex-indic-private.hh
+109
-104
src/hb-ot-shape-complex-indic.cc
src/hb-ot-shape-complex-indic.cc
+6
-6
未找到文件。
src/hb-ot-shape-complex-indic-private.hh
浏览文件 @
dbccf87e
...
...
@@ -62,19 +62,24 @@ enum indic_category_t {
/* Visual positions in a syllable from left to right. */
enum
indic_position_t
{
POS_LEFT_MATRA
=
0
,
POS_RA
,
POS_LEFT_MATRA
,
POS_PRE
=
1
,
POS_BASE
=
2
,
POS_ABOVE
=
3
,
POS_BELOW
=
4
,
POS_POST
=
5
,
POS_PRE_C
,
POS_MATRAS
=
6
,
POS_BEFORE_HALFS
,
POS_HALFS
,
POS_REPH
=
7
,
POS_BASE_C
,
POS_ABOVE_C
,
POS_BELOW_C
,
POS_POST_C
,
POS_SMVD
=
8
POS_MATRAS
,
POS_REPH
,
POS_SMVD
};
/* Categories used in IndicSyllabicCategory.txt from UCD */
...
...
@@ -106,7 +111,7 @@ enum indic_syllabic_category_t {
/* Categories used in IndicSMatraCategory.txt from UCD */
enum
indic_matra_category_t
{
INDIC_MATRA_CATEGORY_NOT_APPLICABLE
=
POS_BASE
,
INDIC_MATRA_CATEGORY_NOT_APPLICABLE
=
POS_BASE
_C
,
INDIC_MATRA_CATEGORY_LEFT
=
POS_LEFT_MATRA
,
INDIC_MATRA_CATEGORY_TOP
=
POS_MATRAS
,
...
...
@@ -155,100 +160,100 @@ static const struct consonant_position_t {
hb_codepoint_t
u
;
indic_position_t
position
;
}
consonant_positions
[]
=
{
{
0x0930
,
POS_BELOW
},
{
0x09AC
,
POS_BELOW
},
{
0x09AF
,
POS_POST
},
{
0x09B0
,
POS_BELOW
},
{
0x09F0
,
POS_BELOW
},
{
0x0A2F
,
POS_POST
},
{
0x0A30
,
POS_BELOW
},
{
0x0A35
,
POS_BELOW
},
{
0x0A39
,
POS_BELOW
},
{
0x0AB0
,
POS_BELOW
},
{
0x0B24
,
POS_BELOW
},
{
0x0B28
,
POS_BELOW
},
{
0x0B2C
,
POS_BELOW
},
{
0x0B2D
,
POS_BELOW
},
{
0x0B2E
,
POS_BELOW
},
{
0x0B2F
,
POS_POST
},
{
0x0B30
,
POS_BELOW
},
{
0x0B32
,
POS_BELOW
},
{
0x0B33
,
POS_BELOW
},
{
0x0B5F
,
POS_POST
},
{
0x0B71
,
POS_BELOW
},
{
0x0C15
,
POS_BELOW
},
{
0x0C16
,
POS_BELOW
},
{
0x0C17
,
POS_BELOW
},
{
0x0C18
,
POS_BELOW
},
{
0x0C19
,
POS_BELOW
},
{
0x0C1A
,
POS_BELOW
},
{
0x0C1B
,
POS_BELOW
},
{
0x0C1C
,
POS_BELOW
},
{
0x0C1D
,
POS_BELOW
},
{
0x0C1E
,
POS_BELOW
},
{
0x0C1F
,
POS_BELOW
},
{
0x0C20
,
POS_BELOW
},
{
0x0C21
,
POS_BELOW
},
{
0x0C22
,
POS_BELOW
},
{
0x0C23
,
POS_BELOW
},
{
0x0C24
,
POS_BELOW
},
{
0x0C25
,
POS_BELOW
},
{
0x0C26
,
POS_BELOW
},
{
0x0C27
,
POS_BELOW
},
{
0x0C28
,
POS_BELOW
},
{
0x0C2A
,
POS_BELOW
},
{
0x0C2B
,
POS_BELOW
},
{
0x0C2C
,
POS_BELOW
},
{
0x0C2D
,
POS_BELOW
},
{
0x0C2E
,
POS_BELOW
},
{
0x0C2F
,
POS_BELOW
},
{
0x0C30
,
POS_BELOW
},
{
0x0C32
,
POS_BELOW
},
{
0x0C33
,
POS_BELOW
},
{
0x0C35
,
POS_BELOW
},
{
0x0C36
,
POS_BELOW
},
{
0x0C37
,
POS_BELOW
},
{
0x0C38
,
POS_BELOW
},
{
0x0C39
,
POS_BELOW
},
{
0x0C95
,
POS_BELOW
},
{
0x0C96
,
POS_BELOW
},
{
0x0C97
,
POS_BELOW
},
{
0x0C98
,
POS_BELOW
},
{
0x0C99
,
POS_BELOW
},
{
0x0C9A
,
POS_BELOW
},
{
0x0C9B
,
POS_BELOW
},
{
0x0C9C
,
POS_BELOW
},
{
0x0C9D
,
POS_BELOW
},
{
0x0C9E
,
POS_BELOW
},
{
0x0C9F
,
POS_BELOW
},
{
0x0CA0
,
POS_BELOW
},
{
0x0CA1
,
POS_BELOW
},
{
0x0CA2
,
POS_BELOW
},
{
0x0CA3
,
POS_BELOW
},
{
0x0CA4
,
POS_BELOW
},
{
0x0CA5
,
POS_BELOW
},
{
0x0CA6
,
POS_BELOW
},
{
0x0CA7
,
POS_BELOW
},
{
0x0CA8
,
POS_BELOW
},
{
0x0CAA
,
POS_BELOW
},
{
0x0CAB
,
POS_BELOW
},
{
0x0CAC
,
POS_BELOW
},
{
0x0CAD
,
POS_BELOW
},
{
0x0CAE
,
POS_BELOW
},
{
0x0CAF
,
POS_BELOW
},
{
0x0CB0
,
POS_BELOW
},
{
0x0CB2
,
POS_BELOW
},
{
0x0CB3
,
POS_BELOW
},
{
0x0CB5
,
POS_BELOW
},
{
0x0CB6
,
POS_BELOW
},
{
0x0CB7
,
POS_BELOW
},
{
0x0CB8
,
POS_BELOW
},
{
0x0CB9
,
POS_BELOW
},
{
0x0CDE
,
POS_BELOW
},
{
0x0D2F
,
POS_POST
},
{
0x0D30
,
POS_POST
},
{
0x0D32
,
POS_BELOW
},
{
0x0D35
,
POS_POST
},
{
0x0930
,
POS_BELOW
_C
},
{
0x09AC
,
POS_BELOW
_C
},
{
0x09AF
,
POS_POST
_C
},
{
0x09B0
,
POS_BELOW
_C
},
{
0x09F0
,
POS_BELOW
_C
},
{
0x0A2F
,
POS_POST
_C
},
{
0x0A30
,
POS_BELOW
_C
},
{
0x0A35
,
POS_BELOW
_C
},
{
0x0A39
,
POS_BELOW
_C
},
{
0x0AB0
,
POS_BELOW
_C
},
{
0x0B24
,
POS_BELOW
_C
},
{
0x0B28
,
POS_BELOW
_C
},
{
0x0B2C
,
POS_BELOW
_C
},
{
0x0B2D
,
POS_BELOW
_C
},
{
0x0B2E
,
POS_BELOW
_C
},
{
0x0B2F
,
POS_POST
_C
},
{
0x0B30
,
POS_BELOW
_C
},
{
0x0B32
,
POS_BELOW
_C
},
{
0x0B33
,
POS_BELOW
_C
},
{
0x0B5F
,
POS_POST
_C
},
{
0x0B71
,
POS_BELOW
_C
},
{
0x0C15
,
POS_BELOW
_C
},
{
0x0C16
,
POS_BELOW
_C
},
{
0x0C17
,
POS_BELOW
_C
},
{
0x0C18
,
POS_BELOW
_C
},
{
0x0C19
,
POS_BELOW
_C
},
{
0x0C1A
,
POS_BELOW
_C
},
{
0x0C1B
,
POS_BELOW
_C
},
{
0x0C1C
,
POS_BELOW
_C
},
{
0x0C1D
,
POS_BELOW
_C
},
{
0x0C1E
,
POS_BELOW
_C
},
{
0x0C1F
,
POS_BELOW
_C
},
{
0x0C20
,
POS_BELOW
_C
},
{
0x0C21
,
POS_BELOW
_C
},
{
0x0C22
,
POS_BELOW
_C
},
{
0x0C23
,
POS_BELOW
_C
},
{
0x0C24
,
POS_BELOW
_C
},
{
0x0C25
,
POS_BELOW
_C
},
{
0x0C26
,
POS_BELOW
_C
},
{
0x0C27
,
POS_BELOW
_C
},
{
0x0C28
,
POS_BELOW
_C
},
{
0x0C2A
,
POS_BELOW
_C
},
{
0x0C2B
,
POS_BELOW
_C
},
{
0x0C2C
,
POS_BELOW
_C
},
{
0x0C2D
,
POS_BELOW
_C
},
{
0x0C2E
,
POS_BELOW
_C
},
{
0x0C2F
,
POS_BELOW
_C
},
{
0x0C30
,
POS_BELOW
_C
},
{
0x0C32
,
POS_BELOW
_C
},
{
0x0C33
,
POS_BELOW
_C
},
{
0x0C35
,
POS_BELOW
_C
},
{
0x0C36
,
POS_BELOW
_C
},
{
0x0C37
,
POS_BELOW
_C
},
{
0x0C38
,
POS_BELOW
_C
},
{
0x0C39
,
POS_BELOW
_C
},
{
0x0C95
,
POS_BELOW
_C
},
{
0x0C96
,
POS_BELOW
_C
},
{
0x0C97
,
POS_BELOW
_C
},
{
0x0C98
,
POS_BELOW
_C
},
{
0x0C99
,
POS_BELOW
_C
},
{
0x0C9A
,
POS_BELOW
_C
},
{
0x0C9B
,
POS_BELOW
_C
},
{
0x0C9C
,
POS_BELOW
_C
},
{
0x0C9D
,
POS_BELOW
_C
},
{
0x0C9E
,
POS_BELOW
_C
},
{
0x0C9F
,
POS_BELOW
_C
},
{
0x0CA0
,
POS_BELOW
_C
},
{
0x0CA1
,
POS_BELOW
_C
},
{
0x0CA2
,
POS_BELOW
_C
},
{
0x0CA3
,
POS_BELOW
_C
},
{
0x0CA4
,
POS_BELOW
_C
},
{
0x0CA5
,
POS_BELOW
_C
},
{
0x0CA6
,
POS_BELOW
_C
},
{
0x0CA7
,
POS_BELOW
_C
},
{
0x0CA8
,
POS_BELOW
_C
},
{
0x0CAA
,
POS_BELOW
_C
},
{
0x0CAB
,
POS_BELOW
_C
},
{
0x0CAC
,
POS_BELOW
_C
},
{
0x0CAD
,
POS_BELOW
_C
},
{
0x0CAE
,
POS_BELOW
_C
},
{
0x0CAF
,
POS_BELOW
_C
},
{
0x0CB0
,
POS_BELOW
_C
},
{
0x0CB2
,
POS_BELOW
_C
},
{
0x0CB3
,
POS_BELOW
_C
},
{
0x0CB5
,
POS_BELOW
_C
},
{
0x0CB6
,
POS_BELOW
_C
},
{
0x0CB7
,
POS_BELOW
_C
},
{
0x0CB8
,
POS_BELOW
_C
},
{
0x0CB9
,
POS_BELOW
_C
},
{
0x0CDE
,
POS_BELOW
_C
},
{
0x0D2F
,
POS_POST
_C
},
{
0x0D30
,
POS_POST
_C
},
{
0x0D32
,
POS_BELOW
_C
},
{
0x0D35
,
POS_POST
_C
},
};
/* XXX
...
...
src/hb-ot-shape-complex-indic.cc
浏览文件 @
dbccf87e
...
...
@@ -46,7 +46,7 @@ consonant_position (hb_codepoint_t u)
sizeof
(
consonant_positions
[
0
]),
compare_codepoint
);
return
record
?
record
->
position
:
POS_BASE
;
return
record
?
record
->
position
:
POS_BASE
_C
;
}
static
bool
...
...
@@ -189,7 +189,7 @@ _hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map, hb_buffer_t *buffer, h
if
(
unlikely
(
buffer
->
info
[
i
].
codepoint
==
0x0952
))
{
buffer
->
info
[
i
].
indic_category
()
=
OT_A
;
buffer
->
info
[
i
].
indic_position
()
=
POS_
BELOW
;
buffer
->
info
[
i
].
indic_position
()
=
POS_
SMVD
;
}
}
}
...
...
@@ -253,8 +253,8 @@ found_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t
{
/* -> that does not have a below-base or post-base form
* (post-base forms have to follow below-base forms), */
if
(
info
[
i
].
indic_position
()
!=
POS_BELOW
&&
info
[
i
].
indic_position
()
!=
POS_POST
)
if
(
info
[
i
].
indic_position
()
!=
POS_BELOW
_C
&&
info
[
i
].
indic_position
()
!=
POS_POST
_C
)
{
base
=
i
;
break
;
...
...
@@ -321,8 +321,8 @@ found_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t
/* Reorder characters */
for
(
i
=
start
;
i
<
base
;
i
++
)
info
[
i
].
indic_position
()
=
POS_PRE
;
info
[
base
].
indic_position
()
=
POS_BASE
;
info
[
i
].
indic_position
()
=
POS_PRE
_C
;
info
[
base
].
indic_position
()
=
POS_BASE
_C
;
/* Handle beginning Ra */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录