Skip to content

Commit f94accb

Browse files
khaledhosnykhaledhosny
committed
Update to HarfBuzz 11.0.0
1 parent 1c3debc commit f94accb

16 files changed

+169
-304
lines changed

‎harfbuzz

Submodule harfbuzz updated 325 files

‎setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,12 @@ def _configure_extensions_with_vendored_libs() -> List[Extension]:
101101
include_dirs=["harfbuzz/src"],
102102
sources=[
103103
"harfbuzz/src/harfbuzz-subset.cc",
104+
"harfbuzz/src/hb-coretext.cc",
105+
"harfbuzz/src/hb-coretext-font.cc",
104106
"harfbuzz/src/hb-coretext-shape.cc",
105107
"harfbuzz/src/hb-directwrite.cc",
108+
"harfbuzz/src/hb-directwrite-font.cc",
109+
"harfbuzz/src/hb-directwrite-shape.cc",
106110
"harfbuzz/src/hb-uniscribe.cc",
107111
"src/uharfbuzz/_harfbuzz.pyx",
108112
],

‎src/uharfbuzz/_harfbuzz.pyx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class BufferClusterLevel(IntEnum):
133133
MONOTONE_GRAPHEMES = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES
134134
MONOTONE_CHARACTERS = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS
135135
CHARACTERS = HB_BUFFER_CLUSTER_LEVEL_CHARACTERS
136+
GRAPHEMES = HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES
136137
DEFAULT = HB_BUFFER_CLUSTER_LEVEL_DEFAULT
137138

138139
class BufferContentType(IntEnum):

‎src/uharfbuzz/charfbuzz.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ cdef extern from "hb.h":
139139
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES
140140
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS
141141
HB_BUFFER_CLUSTER_LEVEL_CHARACTERS
142+
HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES
142143
HB_BUFFER_CLUSTER_LEVEL_DEFAULT
143144

144145
ctypedef enum hb_buffer_flags_t:
@@ -470,13 +471,13 @@ cdef extern from "hb.h":
470471
float path_start_y
471472
float current_x
472473
float current_y
474+
float slant_xy
473475
hb_var_num_t reserved1
474476
hb_var_num_t reserved2
475477
hb_var_num_t reserved3
476478
hb_var_num_t reserved4
477479
hb_var_num_t reserved5
478480
hb_var_num_t reserved6
479-
hb_var_num_t reserved7
480481

481482
ctypedef struct hb_draw_funcs_t:
482483
pass

‎tests/data/expected/hand-10

Lines changed: 87 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,97 @@
1-
# random seed: R02Se2b1d61d9c4fd31724517ef138cff8f6
2-
# Start of hb tests
3-
# Start of paint tests
4-
# Start of ot tests
51
start clip rectangle 64 -224 1.22e+03 928
62
start transform 1 0 0 1 0 0
7-
push group
8-
start transform 1 0 -0 1 0 0
9-
start clip glyph 13
10-
start transform 1 0 0 1 0 0
11-
start transform 1 0 0 0.977 0 0
12-
radial gradient
13-
p0 280 440 radius 0
14-
p1 280 440 radius 467
15-
colors 0
16-
0 186 141 104 255
17-
0.449 183 138 103 255
18-
0.809 173 130 100 255
19-
1 164 123 98 255
20-
end transform
21-
end transform
22-
end clip
23-
end transform
24-
pop group mode 3
25-
push group
26-
start transform 1 0 -0 1 0 0
27-
start clip glyph 14
28-
start transform 1 0 0 1 0 0
29-
linear gradient
30-
p0 231 -27
31-
p1 1.02e+03 -27
32-
p2 231 -815
3+
start transform 1 0 -0 1 0 0
4+
start clip glyph 13
5+
start transform 1 0 0 1 0 0
6+
start transform 1 0 0 0.977 0 0
7+
radial gradient
8+
p0 280 440 radius 0
9+
p1 280 440 radius 467
3310
colors 0
34-
0 164 123 98 255
11+
0 186 141 104 255
12+
0.449 183 138 103 255
13+
0.809 173 130 100 255
3514
1 164 123 98 255
3615
end transform
37-
end clip
38-
end transform
39-
pop group mode 3
40-
push group
41-
start transform 1 0 -0 1 0 0
42-
start clip glyph 15
43-
start transform 1 0 0 1 0 0
44-
solid 145 103 77 255
45-
end transform
46-
end clip
47-
end transform
48-
pop group mode 3
49-
push group
50-
start transform 1 0 -0 1 0 0
51-
start clip glyph 16
52-
start transform 1 0 0 1 0 0
53-
solid 30 136 229 255
54-
end transform
55-
end clip
56-
end transform
57-
pop group mode 3
58-
push group
59-
start transform 1 0 -0 1 0 0
60-
start clip glyph 21
61-
start transform 1 0 0 1 0 0
62-
solid 145 103 77 255
63-
end transform
64-
end clip
65-
end transform
66-
pop group mode 3
67-
push group
68-
push group
69-
start transform 1 0 -0 1 0 0
70-
start clip glyph 16
71-
start transform 1 0 0 1 0 0
72-
linear gradient
73-
p0 669 776
74-
p1 180 -106
75-
p2 -212 1.26e+03
76-
colors 0
77-
0 100 181 246 255
78-
1 33 150 243 255
79-
end transform
80-
end clip
8116
end transform
82-
pop group mode 3
83-
push group
84-
start transform 1 0 -0 1 0 0
85-
start clip glyph 18
86-
start transform 1 0 0 1 0 0
87-
solid 66 66 66 51
88-
end transform
89-
end clip
17+
end clip
18+
end transform
19+
start transform 1 0 -0 1 0 0
20+
start clip glyph 14
21+
start transform 1 0 0 1 0 0
22+
linear gradient
23+
p0 231 -27
24+
p1 1.02e+03 -27
25+
p2 231 -815
26+
colors 0
27+
0 164 123 98 255
28+
1 164 123 98 255
9029
end transform
91-
pop group mode 3
92-
pop group mode 3
93-
push group
94-
start transform 1 0 -0 1 0 0
95-
start clip glyph 19
96-
start transform 1 0 0 1 0 0
97-
start transform 1 0 0 0.969 0 0
98-
radial gradient
99-
p0 588 198 radius 0
100-
p1 588 198 radius 342
101-
colors 0
102-
0 186 141 104 255
103-
0.449 183 138 103 255
104-
0.809 173 130 100 255
105-
1 164 123 98 255
106-
end transform
107-
end transform
108-
end clip
109-
end transform
110-
pop group mode 3
111-
push group
112-
start transform 1 0 -0 1 0 0
113-
start clip glyph 20
114-
start transform 1 0 0 1 0 0
115-
solid 145 103 77 255
30+
end clip
31+
end transform
32+
start transform 1 0 -0 1 0 0
33+
start clip glyph 15
34+
start transform 1 0 0 1 0 0
35+
solid 145 103 77 255
36+
end transform
37+
end clip
38+
end transform
39+
start transform 1 0 -0 1 0 0
40+
start clip glyph 16
41+
start transform 1 0 0 1 0 0
42+
solid 30 136 229 255
43+
end transform
44+
end clip
45+
end transform
46+
start transform 1 0 -0 1 0 0
47+
start clip glyph 21
48+
start transform 1 0 0 1 0 0
49+
solid 145 103 77 255
50+
end transform
51+
end clip
52+
end transform
53+
start transform 1 0 -0 1 0 0
54+
start clip glyph 16
55+
start transform 1 0 0 1 0 0
56+
linear gradient
57+
p0 669 776
58+
p1 180 -106
59+
p2 -212 1.26e+03
60+
colors 0
61+
0 100 181 246 255
62+
1 33 150 243 255
63+
end transform
64+
end clip
65+
end transform
66+
start transform 1 0 -0 1 0 0
67+
start clip glyph 18
68+
start transform 1 0 0 1 0 0
69+
solid 66 66 66 51
70+
end transform
71+
end clip
72+
end transform
73+
start transform 1 0 -0 1 0 0
74+
start clip glyph 19
75+
start transform 1 0 0 1 0 0
76+
start transform 1 0 0 0.969 0 0
77+
radial gradient
78+
p0 588 198 radius 0
79+
p1 588 198 radius 342
80+
colors 0
81+
0 186 141 104 255
82+
0.449 183 138 103 255
83+
0.809 173 130 100 255
84+
1 164 123 98 255
11685
end transform
117-
end clip
118-
end transform
119-
pop group mode 3
86+
end transform
87+
end clip
88+
end transform
89+
start transform 1 0 -0 1 0 0
90+
start clip glyph 20
91+
start transform 1 0 0 1 0 0
92+
solid 145 103 77 255
93+
end transform
94+
end clip
95+
end transform
12096
end transform
12197
end clip

‎tests/data/expected/test-10

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
# random seed: R02S730db577e65f80492e3e3eacc21152fa
2-
# Start of hb tests
3-
# Start of paint tests
4-
# Start of ot tests
5-
start clip rectangle 0 0 1e+03 1e+03
1+
start clip rectangle 100 250 900 950
62
start transform 1 0 0 1 0 0
73
start transform 1 0 -0 1 0 0
8-
start clip glyph 174
4+
start clip glyph 10
95
start transform 1 0 0 1 0 0
10-
sweep gradient
11-
center 500 600
12-
angles 0 6.28
13-
colors 0
14-
0.25 250 240 230 255
15-
0.417 0 0 255 255
16-
0.583 255 0 0 255
17-
0.75 47 79 79 255
6+
linear gradient
7+
p0 100 250
8+
p1 900 250
9+
p2 100 300
10+
colors 1
11+
0 255 0 0 255
12+
1.5 0 0 255 255
1813
end transform
1914
end clip
2015
end transform

‎tests/data/expected/test-106

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
# random seed: R02S33079790f9ab4f19e7151add3612840f
2-
# Start of hb tests
3-
# Start of paint tests
4-
# Start of ot tests
5-
start clip rectangle 118 -22.9 750 750
1+
start clip rectangle 250 183 750 817
62
start transform 1 0 0 1 0 0
7-
start transform 1 0 -0 1 0 0
8-
start clip glyph 3
9-
start transform 1 0 0 1 0 0
10-
solid 0 0 255 127
11-
end transform
12-
end clip
13-
end transform
143
push group
15-
start transform 1 0 0 1 1e+03 1e+03
16-
start transform 1 0.364 0.176 1 0 0
17-
start transform 1 0 0 1 -1e+03 -1e+03
18-
start transform 1 0 -0 1 0 0
19-
start clip glyph 3
20-
start transform 1 0 0 1 0 0
21-
solid 255 165 0 178
22-
end transform
23-
end clip
4+
start transform 1 0 -0 1 0 0
5+
start clip glyph 3
6+
start transform 1 0 0 1 0 0
7+
solid 0 0 255 127
8+
end transform
9+
end clip
10+
end transform
11+
push group
12+
start transform 1 0 0 1 500 500
13+
start transform 1 0.268 -0 1 0 0
14+
start transform 1 0 0 1 -500 -500
15+
start transform 1 0 -0 1 0 0
16+
start clip glyph 3
17+
start transform 1 0 0 1 0 0
18+
solid 255 165 0 178
19+
end transform
20+
end clip
21+
end transform
2422
end transform
2523
end transform
2624
end transform
27-
end transform
28-
pop group mode 4
25+
pop group mode 4
26+
pop group mode 3
2927
end transform
3028
end clip

‎tests/data/expected/test-116

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
# random seed: R02S7f8abf2d360ae53f6acb756fc1d06756
2-
# Start of hb tests
3-
# Start of paint tests
4-
# Start of ot tests
5-
start clip rectangle 250 250 950 950
1+
start clip rectangle 250 250 850 750
62
start transform 1 0 0 1 0 0
7-
start transform 1 0 -0 1 0 0
8-
start clip glyph 3
9-
start transform 1 0 0 1 0 0
10-
solid 0 0 255 127
11-
end transform
12-
end clip
13-
end transform
143
push group
15-
start transform 1 0 0 1 200 200
16-
start transform 1 0 -0 1 0 0
17-
start clip glyph 3
18-
start transform 1 0 0 1 0 0
19-
solid 255 165 0 178
20-
end transform
21-
end clip
22-
end transform
4+
start transform 1 0 -0 1 0 0
5+
start clip glyph 3
6+
start transform 1 0 0 1 0 0
7+
solid 0 0 255 127
8+
end transform
9+
end clip
2310
end transform
24-
pop group mode 4
11+
push group
12+
start transform 1 0 0 1 100 0
13+
start transform 1 0 -0 1 0 0
14+
start clip glyph 3
15+
start transform 1 0 0 1 0 0
16+
solid 255 165 0 178
17+
end transform
18+
end clip
19+
end transform
20+
end transform
21+
pop group mode 4
22+
pop group mode 3
2523
end transform
2624
end clip

0 commit comments

Comments
 (0)