Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: third_party/harfbuzz-ng/src/hb-ot-shape-complex-arabic.cc

Issue 10510004: Roll harfbuzz-ng 3b8fd9c48f4bde368bf2d465c148b9743a9216ee (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright © 2010 Google, Inc. 2 * Copyright © 2010 Google, Inc.
3 * 3 *
4 * This is part of HarfBuzz, a text shaping library. 4 * This is part of HarfBuzz, a text shaping library.
5 * 5 *
6 * Permission is hereby granted, without written agreement and without 6 * Permission is hereby granted, without written agreement and without
7 * license or royalty fees, to use, copy, modify, and distribute this 7 * license or royalty fees, to use, copy, modify, and distribute this
8 * software and its documentation for any purpose, provided that the 8 * software and its documentation for any purpose, provided that the
9 * above copyright notice and the following two paragraphs appear in 9 * above copyright notice and the following two paragraphs appear in
10 * all copies of this software. 10 * all copies of this software.
11 * 11 *
12 * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR 12 * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
13 * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES 13 * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
14 * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN 14 * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
15 * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 15 * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
16 * DAMAGE. 16 * DAMAGE.
17 * 17 *
18 * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, 18 * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
19 * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 19 * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
20 * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS 20 * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
21 * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO 21 * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
22 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 22 * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
23 * 23 *
24 * Google Author(s): Behdad Esfahbod 24 * Google Author(s): Behdad Esfahbod
25 */ 25 */
26 26
27 #include "hb-ot-shape-complex-private.hh" 27 #include "hb-ot-shape-complex-private.hh"
28 #include "hb-ot-shape-private.hh"
28 29
29 30
30 31
31 /* buffer var allocations */ 32 /* buffer var allocations */
32 #define arabic_shaping_action() complex_var_temporary_u16() /* arabic shaping ac tion */ 33 #define arabic_shaping_action() complex_var_temporary_u8() /* arabic shaping act ion */
33 34
34 35
35 /* 36 /*
36 * Bits used in the joining tables 37 * Bits used in the joining tables
37 */ 38 */
38 enum { 39 enum {
39 JOINING_TYPE_U = 0, 40 JOINING_TYPE_U = 0,
40 JOINING_TYPE_R = 1, 41 JOINING_TYPE_R = 1,
41 JOINING_TYPE_D = 2, 42 JOINING_TYPE_D = 2,
42 JOINING_TYPE_C = JOINING_TYPE_D, 43 JOINING_TYPE_C = JOINING_TYPE_D,
43 JOINING_GROUP_ALAPH = 3, 44 JOINING_GROUP_ALAPH = 3,
44 JOINING_GROUP_DALATH_RISH = 4, 45 JOINING_GROUP_DALATH_RISH = 4,
45 NUM_STATE_MACHINE_COLS = 5, 46 NUM_STATE_MACHINE_COLS = 5,
46 47
47 /* We deliberately don't have a JOINING_TYPE_L since that's unused in Unicode. */ 48 /* We deliberately don't have a JOINING_TYPE_L since that's unused in Unicode. */
48 49
49 JOINING_TYPE_T = 6, 50 JOINING_TYPE_T = 6,
50 JOINING_TYPE_X = 7 /* means: use general-category to choose between U or T. * / 51 JOINING_TYPE_X = 7 /* means: use general-category to choose between U or T. * /
51 }; 52 };
52 53
53 /* 54 /*
54 * Joining types: 55 * Joining types:
55 */ 56 */
56 57
57 #include "hb-ot-shape-complex-arabic-table.hh" 58 #include "hb-ot-shape-complex-arabic-table.hh"
58 59
59 static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_categ ory_t gen_cat) 60 static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_categ ory_t gen_cat)
60 { 61 {
61 /* TODO Macroize the magic bit operations */
62
63 if (likely (hb_in_range<hb_codepoint_t> (u, JOINING_TABLE_FIRST, JOINING_TABLE _LAST))) { 62 if (likely (hb_in_range<hb_codepoint_t> (u, JOINING_TABLE_FIRST, JOINING_TABLE _LAST))) {
64 unsigned int j_type = joining_table[u - JOINING_TABLE_FIRST]; 63 unsigned int j_type = joining_table[u - JOINING_TABLE_FIRST];
65 if (likely (j_type != JOINING_TYPE_X)) 64 if (likely (j_type != JOINING_TYPE_X))
66 return j_type; 65 return j_type;
67 } 66 }
68 67
69 /* Mongolian joining data is not in ArabicJoining.txt yet */ 68 /* Mongolian joining data is not in ArabicJoining.txt yet */
70 if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1800, 0x18AF))) 69 if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1800, 0x18AF)))
71 { 70 {
72 /* All letters, SIBE SYLLABLE BOUNDARY MARKER, and NIRUGU are D */ 71 /* All letters, SIBE SYLLABLE BOUNDARY MARKER, and NIRUGU are D */
73 if (gen_cat == HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER || u == 0x1807 || u == 0x180A) 72 if (gen_cat == HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER || u == 0x1807 || u == 0x180A)
74 return JOINING_TYPE_D; 73 return JOINING_TYPE_D;
75 } 74 }
76 75
77 if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x200C, 0x200D))) { 76 if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x200C, 0x200D))) {
78 return u == 0x200C ? JOINING_TYPE_U : JOINING_TYPE_C; 77 return u == 0x200C ? JOINING_TYPE_U : JOINING_TYPE_C;
79 } 78 }
80 79
81 return (FLAG(gen_cat) & (FLAG(HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEG ORY_FORMAT))) ? 80 return (FLAG(gen_cat) & (FLAG(HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEG ORY_FORMAT))) ?
82 JOINING_TYPE_T : JOINING_TYPE_U; 81 JOINING_TYPE_T : JOINING_TYPE_U;
83 } 82 }
84 83
84 static hb_codepoint_t get_arabic_shape (hb_codepoint_t u, unsigned int shape)
85 {
86 if (likely (hb_in_range<hb_codepoint_t> (u, SHAPING_TABLE_FIRST, SHAPING_TABLE _LAST)) && shape < 4)
87 return shaping_table[u - SHAPING_TABLE_FIRST][shape];
88 return u;
89 }
85 90
91 static uint16_t get_ligature (hb_codepoint_t first, hb_codepoint_t second)
92 {
93 if (unlikely (!second)) return 0;
94 for (unsigned i = 0; i < ARRAY_LENGTH (ligature_table); i++)
95 if (ligature_table[i].first == first)
96 for (unsigned j = 0; j < ARRAY_LENGTH (ligature_table[i].ligatures); j++)
97 if (ligature_table[i].ligatures[j].second == second)
98 return ligature_table[i].ligatures[j].ligature;
99 return 0;
100 }
86 101
87 static const hb_tag_t arabic_syriac_features[] = 102 static const hb_tag_t arabic_syriac_features[] =
88 { 103 {
89 HB_TAG('i','n','i','t'), 104 HB_TAG('i','n','i','t'),
90 HB_TAG('m','e','d','i'), 105 HB_TAG('m','e','d','i'),
91 HB_TAG('f','i','n','a'), 106 HB_TAG('f','i','n','a'),
92 HB_TAG('i','s','o','l'), 107 HB_TAG('i','s','o','l'),
93 /* Syriac */ 108 /* Syriac */
94 HB_TAG('m','e','d','2'), 109 HB_TAG('m','e','d','2'),
95 HB_TAG('f','i','n','2'), 110 HB_TAG('f','i','n','2'),
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 /* State 5: prev was FIN2/FIN3 ALAPH, not willing to join. */ 158 /* State 5: prev was FIN2/FIN3 ALAPH, not willing to join. */
144 { {NONE,NONE,0}, {ISOL,ISOL,1}, {ISOL,ISOL,2}, {ISOL,FIN2,5}, {ISOL,ISOL,6}, } , 159 { {NONE,NONE,0}, {ISOL,ISOL,1}, {ISOL,ISOL,2}, {ISOL,FIN2,5}, {ISOL,ISOL,6}, } ,
145 160
146 /* State 6: prev was DALATH/RISH, not willing to join. */ 161 /* State 6: prev was DALATH/RISH, not willing to join. */
147 { {NONE,NONE,0}, {NONE,ISOL,1}, {NONE,ISOL,2}, {NONE,FIN3,5}, {NONE,ISOL,6}, } 162 { {NONE,NONE,0}, {NONE,ISOL,1}, {NONE,ISOL,2}, {NONE,FIN3,5}, {NONE,ISOL,6}, }
148 }; 163 };
149 164
150 165
151 166
152 void 167 void
153 _hb_ot_shape_complex_collect_features_arabic (hb_ot_map_builder_t *map, const hb _segment_properties_t *props) 168 _hb_ot_shape_complex_collect_features_arabic (hb_ot_map_builder_t *map,
169 » » » » » const hb_segment_properties_t *pro ps)
154 { 170 {
155 /* For Language forms (in ArabicOT speak), we do the iso/fina/medi/init togeth er, 171 /* For Language forms (in ArabicOT speak), we do the iso/fina/medi/init togeth er,
156 * then rlig and calt each in their own stage. This makes IranNastaliq's ALLA H 172 * then rlig and calt each in their own stage. This makes IranNastaliq's ALLA H
157 * ligature work correctly. It's unfortunate though... 173 * ligature work correctly. It's unfortunate though...
158 * 174 *
159 * This also makes Arial Bold in Windows7 work. See: 175 * This also makes Arial Bold in Windows7 work. See:
160 * https://bugzilla.mozilla.org/show_bug.cgi?id=644184 176 * https://bugzilla.mozilla.org/show_bug.cgi?id=644184
161 * 177 *
162 * TODO: Add test cases for these two. 178 * TODO: Add test cases for these two.
163 */ 179 */
(...skipping 12 matching lines...) Expand all
176 map->add_bool_feature (HB_TAG('r','l','i','g')); 192 map->add_bool_feature (HB_TAG('r','l','i','g'));
177 map->add_gsub_pause (NULL, NULL); 193 map->add_gsub_pause (NULL, NULL);
178 194
179 map->add_bool_feature (HB_TAG('c','a','l','t')); 195 map->add_bool_feature (HB_TAG('c','a','l','t'));
180 map->add_gsub_pause (NULL, NULL); 196 map->add_gsub_pause (NULL, NULL);
181 197
182 /* ArabicOT spec enables 'cswh' for Arabic where as for basic shaper it's disa bled by default. */ 198 /* ArabicOT spec enables 'cswh' for Arabic where as for basic shaper it's disa bled by default. */
183 map->add_bool_feature (HB_TAG('c','s','w','h')); 199 map->add_bool_feature (HB_TAG('c','s','w','h'));
184 } 200 }
185 201
186 bool 202 hb_ot_shape_normalization_mode_t
187 _hb_ot_shape_complex_prefer_decomposed_arabic (void) 203 _hb_ot_shape_complex_normalization_preference_arabic (void)
188 { 204 {
189 return FALSE; 205 return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
206 }
207
208
209 static void
210 arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
211 {
212 unsigned int count = buffer->len;
213 hb_codepoint_t glyph;
214
215 /* Shape to presentation forms */
216 for (unsigned int i = 0; i < count; i++) {
217 hb_codepoint_t u = buffer->info[i].codepoint;
218 hb_codepoint_t shaped = get_arabic_shape (u, buffer->info[i].arabic_shaping_ action());
219 if (shaped != u && hb_font_get_glyph (font, shaped, 0, &glyph))
220 buffer->info[i].codepoint = shaped;
221 }
222
223 /* Mandatory ligatures */
224 buffer->clear_output ();
225 for (buffer->idx = 0; buffer->idx + 1 < count;) {
226 hb_codepoint_t ligature = get_ligature (buffer->cur().codepoint,
227 » » » » » buffer->cur(+1).codepoint);
228 if (likely (!ligature) || !(hb_font_get_glyph (font, ligature, 0, &glyph))) {
229 buffer->next_glyph ();
230 continue;
231 }
232
233 buffer->replace_glyphs (2, 1, &ligature);
234
235 /* Technically speaking we can skip marks and stuff, like the GSUB path does .
236 * But who cares, we're in fallback! */
237 }
238 for (; buffer->idx < count;)
239 buffer->next_glyph ();
240 buffer->swap_buffers ();
190 } 241 }
191 242
192 void 243 void
193 _hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map, hb_buffer_t *buffer) 244 _hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map,
245 » » » » » hb_buffer_t *buffer,
246 » » » » » hb_font_t *font)
194 { 247 {
195 unsigned int count = buffer->len; 248 unsigned int count = buffer->len;
196 unsigned int prev = 0, state = 0; 249 unsigned int prev = 0, state = 0;
197 250
198 HB_BUFFER_ALLOCATE_VAR (buffer, arabic_shaping_action); 251 HB_BUFFER_ALLOCATE_VAR (buffer, arabic_shaping_action);
199 252
200 for (unsigned int i = 0; i < count; i++) 253 for (unsigned int i = 0; i < count; i++)
201 { 254 {
202 unsigned int this_type = get_joining_type (buffer->info[i].codepoint, (hb_un icode_general_category_t) buffer->info[i].general_category()); 255 unsigned int this_type = get_joining_type (buffer->info[i].codepoint, _hb_gl yph_info_get_general_category (&buffer->info[i]));
203 256
204 if (unlikely (this_type == JOINING_TYPE_T)) { 257 if (unlikely (this_type == JOINING_TYPE_T)) {
205 buffer->info[i].arabic_shaping_action() = NONE; 258 buffer->info[i].arabic_shaping_action() = NONE;
206 continue; 259 continue;
207 } 260 }
208 261
209 const arabic_state_table_entry *entry = &arabic_state_table[state][this_type ]; 262 const arabic_state_table_entry *entry = &arabic_state_table[state][this_type ];
210 263
211 if (entry->prev_action != NONE) 264 if (entry->prev_action != NONE)
212 buffer->info[prev].arabic_shaping_action() = entry->prev_action; 265 buffer->info[prev].arabic_shaping_action() = entry->prev_action;
213 266
214 buffer->info[i].arabic_shaping_action() = entry->curr_action; 267 buffer->info[i].arabic_shaping_action() = entry->curr_action;
215 268
216 prev = i; 269 prev = i;
217 state = entry->next_state; 270 state = entry->next_state;
218 } 271 }
219 272
220 hb_mask_t mask_array[TOTAL_NUM_FEATURES + 1] = {0}; 273 hb_mask_t mask_array[TOTAL_NUM_FEATURES + 1] = {0};
274 hb_mask_t total_masks = 0;
221 unsigned int num_masks = buffer->props.script == HB_SCRIPT_SYRIAC ? SYRIAC_NUM _FEATURES : COMMON_NUM_FEATURES; 275 unsigned int num_masks = buffer->props.script == HB_SCRIPT_SYRIAC ? SYRIAC_NUM _FEATURES : COMMON_NUM_FEATURES;
222 for (unsigned int i = 0; i < num_masks; i++) 276 for (unsigned int i = 0; i < num_masks; i++) {
223 mask_array[i] = map->get_1_mask (arabic_syriac_features[i]); 277 mask_array[i] = map->get_1_mask (arabic_syriac_features[i]);
278 total_masks |= mask_array[i];
279 }
224 280
225 for (unsigned int i = 0; i < count; i++) 281 if (total_masks) {
226 buffer->info[i].mask |= mask_array[buffer->info[i].arabic_shaping_action()]; 282 /* Has OpenType tables */
283 for (unsigned int i = 0; i < count; i++)
284 buffer->info[i].mask |= mask_array[buffer->info[i].arabic_shaping_action() ];
285 } else if (buffer->props.script == HB_SCRIPT_ARABIC) {
286 /* Fallback Arabic shaping to Presentation Forms */
287 /* Pitfalls:
288 * - This path fires if user force-set init/medi/fina/isol off,
289 * - If font does not declare script 'arab', well, what to do?
290 * Most probably it's safe to assume that init/medi/fina/isol
291 * still mean Arabic shaping, although they do not have to.
292 */
293 arabic_fallback_shape (font, buffer);
294 }
227 295
228 HB_BUFFER_DEALLOCATE_VAR (buffer, arabic_shaping_action); 296 HB_BUFFER_DEALLOCATE_VAR (buffer, arabic_shaping_action);
229 } 297 }
230 298
231 299
OLDNEW
« no previous file with comments | « third_party/harfbuzz-ng/src/hb-ot-shape.cc ('k') | third_party/harfbuzz-ng/src/hb-ot-shape-complex-arabic-table.hh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698