Streamline debugging infrastructure even more

[framework/uifw/harfbuzz.git] / src / hb-ot-shape-complex-indic.cc

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 8619b56..cf5a049 100644 (file)
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -281,22 +281,44 @@ static const hb_tag_t indic_other_features[] =
   HB_TAG('b','l','w','m'),
 };
 
+static void
+final_reordering (const hb_ot_map_t *map,
+                 hb_face_t *face,
+                 hb_buffer_t *buffer,
+                 void *user_data HB_UNUSED)
+{
+}
 
 void
-_hb_ot_shape_complex_collect_features_indic (hb_ot_shape_planner_t *planner, const hb_segment_properties_t *props HB_UNUSED)
+_hb_ot_shape_complex_collect_features_indic (hb_ot_map_builder_t *map, const hb_segment_properties_t  *props)
 {
+  map->add_bool_feature (HB_TAG('l','o','c','l'));
+  /* The Indic specs do not require ccmp, but we apply it here since if
+   * there is a use of it, it's typically at the beginning. */
+  map->add_bool_feature (HB_TAG('c','c','m','p'));
+
+  map->add_gsub_pause (NULL, NULL);
+
   for (unsigned int i = 0; i < ARRAY_LENGTH (indic_basic_features); i++)
-    planner->map.add_bool_feature (indic_basic_features[i].tag, indic_basic_features[i].is_global);
+    map->add_bool_feature (indic_basic_features[i].tag, indic_basic_features[i].is_global);
+
+  map->add_gsub_pause (final_reordering, NULL);
 
   for (unsigned int i = 0; i < ARRAY_LENGTH (indic_other_features); i++)
-    planner->map.add_bool_feature (indic_other_features[i], true);
+    map->add_bool_feature (indic_other_features[i], true);
 }
 
 
+bool
+_hb_ot_shape_complex_prefer_decomposed_indic (void)
+{
+  /* We want split matras decomposed by the common shaping logic. */
+  return TRUE;
+}
+
 static void
-matched_syllable (hb_ot_shape_context_t *c,
-                 unsigned int start,
-                 unsigned int end)
+found_syllable (hb_ot_map_t *map, hb_buffer_t *buffer,
+               unsigned int start, unsigned int end)
 {
   //fprintf (stderr, "%d %d\n", start, end);
 }
@@ -305,24 +327,24 @@ matched_syllable (hb_ot_shape_context_t *c,
 
 
 void
-_hb_ot_shape_complex_setup_masks_indic (hb_ot_shape_context_t *c)
+_hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map, hb_buffer_t *buffer)
 {
-  unsigned int count = c->buffer->len;
+  unsigned int count = buffer->len;
 
   for (unsigned int i = 0; i < count; i++)
   {
-    unsigned int type = get_indic_categories (c->buffer->info[i].codepoint);
+    unsigned int type = get_indic_categories (buffer->info[i].codepoint);
 
-    c->buffer->info[i].indic_category() = type & 0x0F;
-    c->buffer->info[i].indic_position() = type >> 4;
+    buffer->info[i].indic_category() = type & 0x0F;
+    buffer->info[i].indic_position() = type >> 4;
   }
 
-  find_syllables (c);
+  find_syllables (map, buffer);
 
   hb_mask_t mask_array[ARRAY_LENGTH (indic_basic_features)] = {0};
   unsigned int num_masks = ARRAY_LENGTH (indic_basic_features);
   for (unsigned int i = 0; i < num_masks; i++)
-    mask_array[i] = c->plan->map.get_1_mask (indic_basic_features[i].tag);
+    mask_array[i] = map->get_1_mask (indic_basic_features[i].tag);
 }