Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
ef24cc8c
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看板
提交
ef24cc8c
编写于
5月 09, 2012
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Indic] Towards multi-cluster syllables and final reordering
上级
a9844d41
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
51 addition
and
23 deletion
+51
-23
src/hb-ot-shape-complex-arabic.cc
src/hb-ot-shape-complex-arabic.cc
+1
-1
src/hb-ot-shape-complex-indic-machine.rl
src/hb-ot-shape-complex-indic-machine.rl
+14
-7
src/hb-ot-shape-complex-indic-private.hh
src/hb-ot-shape-complex-indic-private.hh
+1
-0
src/hb-ot-shape-complex-indic.cc
src/hb-ot-shape-complex-indic.cc
+33
-12
src/hb-ot-shape-complex-private.hh
src/hb-ot-shape-complex-private.hh
+2
-3
未找到文件。
src/hb-ot-shape-complex-arabic.cc
浏览文件 @
ef24cc8c
...
...
@@ -30,7 +30,7 @@
/* buffer var allocations */
#define arabic_shaping_action() complex_var_temporary_u
16
()
/* arabic shaping action */
#define arabic_shaping_action() complex_var_temporary_u
8
()
/* arabic shaping action */
/*
...
...
src/hb-ot-shape-complex-indic-machine.rl
浏览文件 @
ef24cc8c
...
...
@@ -59,12 +59,17 @@ z = ZWJ|ZWNJ;
matra_group = M N? H?;
syllable_tail = SM? (VD VD?)?;
action found_consonant_syllable { found_consonant_syllable (map, buffer, mask_array, last, p); }
action found_vowel_syllable { found_vowel_syllable (map, buffer, mask_array, last, p); }
action found_standalone_cluster { found_standalone_cluster (map, buffer, mask_array, last, p); }
action found_non_indic { found_non_indic (map, buffer, mask_array, last, p); }
action next_syllable { buffer->merge_clusters (last, p); last = p; }
action found_consonant_syllable { initial_reordering_consonant_syllable (map, buffer, mask_array, last, p); }
action found_vowel_syllable { initial_reordering_vowel_syllable (map, buffer, mask_array, last, p); }
action found_standalone_cluster { initial_reordering_standalone_cluster (map, buffer, mask_array, last, p); }
action found_non_indic { initial_reordering_non_indic (map, buffer, mask_array, last, p); }
action next_syllable {
for (unsigned int i = last; i < p; i++)
info[i].indic_syllable() = syllable_serial;
last = p;
syllable_serial++;
}
consonant_syllable = (c.N? (H.z?|z.H))* c.N? A? (H.z? | matra_group*)? syllable_tail %(found_consonant_syllable);
vowel_syllable = (Ra H)? V N? (z?.H.c | ZWJ.c)? matra_group* syllable_tail %(found_vowel_syllable);
...
...
@@ -88,15 +93,17 @@ find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_arr
{
unsigned int p, pe, eof;
int cs;
hb_glyph_info_t *info = buffer->info;
%%{
write init;
getkey
buffer->
info[p].indic_category();
getkey info[p].indic_category();
}%%
p = 0;
pe = eof = buffer->len;
unsigned int last = 0;
uint8_t syllable_serial = 0;
%%{
write exec;
}%%
...
...
src/hb-ot-shape-complex-indic-private.hh
浏览文件 @
ef24cc8c
...
...
@@ -36,6 +36,7 @@
/* buffer var allocations */
#define indic_category() complex_var_persistent_u8_0()
/* indic_category_t */
#define indic_position() complex_var_persistent_u8_1()
/* indic_matra_category_t */
#define indic_syllable() complex_var_persistent_u8_2()
/* serial */
#define INDIC_TABLE_ELEMENT_TYPE uint8_t
...
...
src/hb-ot-shape-complex-indic.cc
浏览文件 @
ef24cc8c
...
...
@@ -163,6 +163,7 @@ _hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map, hb_buffer_t *buffer, h
{
HB_BUFFER_ALLOCATE_VAR
(
buffer
,
indic_category
);
HB_BUFFER_ALLOCATE_VAR
(
buffer
,
indic_position
);
HB_BUFFER_ALLOCATE_VAR
(
buffer
,
indic_syllable
);
/* We cannot setup masks here. We save information about characters
* and setup masks later on in a pause-callback. */
...
...
@@ -205,8 +206,8 @@ compare_indic_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb)
}
static
void
found
_consonant_syllable
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
initial_reordering
_consonant_syllable
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
{
unsigned
int
i
;
hb_glyph_info_t
*
info
=
buffer
->
info
;
...
...
@@ -410,8 +411,8 @@ found_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t
static
void
found
_vowel_syllable
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
initial_reordering
_vowel_syllable
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
{
/* TODO
* Not clear to me how this should work. Do the matras move to before the
...
...
@@ -420,17 +421,17 @@ found_vowel_syllable (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *ma
}
static
void
found
_standalone_cluster
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
initial_reordering
_standalone_cluster
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
{
/* TODO
* Easiest thing to do here is to convert the NBSP to consonant and
* call
found
_consonant_syllable.
* call
initial_reordering
_consonant_syllable.
*/
}
static
void
found
_non_indic
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
initial_reordering
_non_indic
(
const
hb_ot_map_t
*
map
,
hb_buffer_t
*
buffer
,
hb_mask_t
*
mask_array
,
unsigned
int
start
,
unsigned
int
end
)
{
/* Nothing to do right now. If we ever switch to using the output
...
...
@@ -454,10 +455,8 @@ initial_reordering (const hb_ot_map_t *map,
}
static
void
final_reordering
(
const
hb_ot_map_t
*
map
,
hb_face_t
*
face
,
hb_buffer_t
*
buffer
,
void
*
user_data
HB_UNUSED
)
final_reordering_syllable
(
hb_buffer_t
*
buffer
,
unsigned
int
start
,
unsigned
int
end
)
{
/* 4. Final reordering:
*
...
...
@@ -533,9 +532,31 @@ final_reordering (const hb_ot_map_t *map,
*/
/* TODO */
buffer
->
merge_clusters
(
start
,
end
);
}
static
void
final_reordering
(
const
hb_ot_map_t
*
map
,
hb_face_t
*
face
,
hb_buffer_t
*
buffer
,
void
*
user_data
HB_UNUSED
)
{
unsigned
int
count
=
buffer
->
len
;
if
(
!
count
)
return
;
hb_glyph_info_t
*
info
=
buffer
->
info
;
unsigned
int
last
=
0
;
unsigned
int
last_syllable
=
info
[
0
].
indic_syllable
();
for
(
unsigned
int
i
=
1
;
i
<
count
;
i
++
)
if
(
last_syllable
!=
info
[
i
].
indic_syllable
())
{
final_reordering_syllable
(
buffer
,
last
,
i
);
last
=
i
;
last_syllable
=
info
[
last
].
indic_syllable
();
}
final_reordering_syllable
(
buffer
,
last
,
count
);
HB_BUFFER_DEALLOCATE_VAR
(
buffer
,
indic_syllable
);
HB_BUFFER_DEALLOCATE_VAR
(
buffer
,
indic_category
);
HB_BUFFER_DEALLOCATE_VAR
(
buffer
,
indic_position
);
}
...
...
src/hb-ot-shape-complex-private.hh
浏览文件 @
ef24cc8c
...
...
@@ -41,10 +41,9 @@
/* buffer var allocations, used by complex shapers */
#define complex_var_persistent_u8_0() var2.u8[0]
#define complex_var_persistent_u8_1() var2.u8[1]
#define complex_var_persistent_u8_2() var2.u8[2]
#define complex_var_persistent_u16() var2.u16[0]
#define complex_var_temporary_u8_0() var2.u8[2]
#define complex_var_temporary_u8_1() var2.u8[3]
#define complex_var_temporary_u16() var2.u16[1]
#define complex_var_temporary_u8() var2.u8[3]
#define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录