|
|
|
@ -36,29 +36,27 @@ |
|
|
|
#include "hb-aat-layout-feat-table.hh" |
|
|
|
#include "hb-aat-layout-feat-table.hh" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void hb_aat_map_builder_t::add_feature (const hb_feature_t &feature) |
|
|
|
void hb_aat_map_builder_t::add_feature (hb_tag_t tag, unsigned value) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!face->table.feat->has_data ()) return; |
|
|
|
if (!face->table.feat->has_data ()) return; |
|
|
|
|
|
|
|
|
|
|
|
if (feature.tag == HB_TAG ('a','a','l','t')) |
|
|
|
if (tag == HB_TAG ('a','a','l','t')) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!face->table.feat->exposes_feature (HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES)) |
|
|
|
if (!face->table.feat->exposes_feature (HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES)) |
|
|
|
return; |
|
|
|
return; |
|
|
|
feature_range_t *range = features.push(); |
|
|
|
feature_info_t *info = features.push(); |
|
|
|
range->start = feature.start; |
|
|
|
info->type = HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES; |
|
|
|
range->end = feature.end; |
|
|
|
info->setting = (hb_aat_layout_feature_selector_t) value; |
|
|
|
range->info.type = HB_AAT_LAYOUT_FEATURE_TYPE_CHARACTER_ALTERNATIVES; |
|
|
|
info->seq = features.length; |
|
|
|
range->info.setting = (hb_aat_layout_feature_selector_t) feature.value; |
|
|
|
info->is_exclusive = true; |
|
|
|
range->info.seq = features.length; |
|
|
|
|
|
|
|
range->info.is_exclusive = true; |
|
|
|
|
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const hb_aat_feature_mapping_t *mapping = hb_aat_layout_find_feature_mapping (feature.tag); |
|
|
|
const hb_aat_feature_mapping_t *mapping = hb_aat_layout_find_feature_mapping (tag); |
|
|
|
if (!mapping) return; |
|
|
|
if (!mapping) return; |
|
|
|
|
|
|
|
|
|
|
|
const AAT::FeatureName* feature_name = &face->table.feat->get_feature (mapping->aatFeatureType); |
|
|
|
const AAT::FeatureName* feature = &face->table.feat->get_feature (mapping->aatFeatureType); |
|
|
|
if (!feature_name->has_data ()) |
|
|
|
if (!feature->has_data ()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
/* Special case: Chain::compile_flags will fall back to the deprecated version of
|
|
|
|
/* Special case: Chain::compile_flags will fall back to the deprecated version of
|
|
|
|
* small-caps if necessary, so we need to check for that possibility. |
|
|
|
* small-caps if necessary, so we need to check for that possibility. |
|
|
|
@ -66,101 +64,38 @@ void hb_aat_map_builder_t::add_feature (const hb_feature_t &feature) |
|
|
|
if (mapping->aatFeatureType == HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE && |
|
|
|
if (mapping->aatFeatureType == HB_AAT_LAYOUT_FEATURE_TYPE_LOWER_CASE && |
|
|
|
mapping->selectorToEnable == HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_SMALL_CAPS) |
|
|
|
mapping->selectorToEnable == HB_AAT_LAYOUT_FEATURE_SELECTOR_LOWER_CASE_SMALL_CAPS) |
|
|
|
{ |
|
|
|
{ |
|
|
|
feature_name = &face->table.feat->get_feature (HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE); |
|
|
|
feature = &face->table.feat->get_feature (HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE); |
|
|
|
if (!feature_name->has_data ()) return; |
|
|
|
if (!feature->has_data ()) return; |
|
|
|
} |
|
|
|
} |
|
|
|
else return; |
|
|
|
else return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
feature_range_t *range = features.push(); |
|
|
|
feature_info_t *info = features.push(); |
|
|
|
range->start = feature.start; |
|
|
|
info->type = mapping->aatFeatureType; |
|
|
|
range->end = feature.end; |
|
|
|
info->setting = value ? mapping->selectorToEnable : mapping->selectorToDisable; |
|
|
|
range->info.type = mapping->aatFeatureType; |
|
|
|
info->seq = features.length; |
|
|
|
range->info.setting = feature.value ? mapping->selectorToEnable : mapping->selectorToDisable; |
|
|
|
info->is_exclusive = feature->is_exclusive (); |
|
|
|
range->info.seq = features.length; |
|
|
|
|
|
|
|
range->info.is_exclusive = feature_name->is_exclusive (); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
|
void |
|
|
|
hb_aat_map_builder_t::compile (hb_aat_map_t &m) |
|
|
|
hb_aat_map_builder_t::compile (hb_aat_map_t &m) |
|
|
|
{ |
|
|
|
{ |
|
|
|
/* Compute active features per range, and compile each. */ |
|
|
|
|
|
|
|
if (features.length) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
/* Sort features by start/end events. */ |
|
|
|
|
|
|
|
hb_vector_t<feature_event_t> feature_events; |
|
|
|
|
|
|
|
for (unsigned int i = 0; i < features.length; i++) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
auto &feature = features[i]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
feature_event_t *event; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
event = feature_events.push (); |
|
|
|
|
|
|
|
event->index = features[i].start; |
|
|
|
|
|
|
|
event->start = true; |
|
|
|
|
|
|
|
event->feature = feature.info; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
event = feature_events.push (); |
|
|
|
|
|
|
|
event->index = features[i].end; |
|
|
|
|
|
|
|
event->start = false; |
|
|
|
|
|
|
|
event->feature = feature.info; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
feature_events.qsort (); |
|
|
|
|
|
|
|
/* Add a strategic final event. */ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
feature_info_t feature; |
|
|
|
|
|
|
|
feature.seq = features.length + 1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
feature_event_t *event = feature_events.push (); |
|
|
|
|
|
|
|
event->index = 0; /* This value does magic. */ |
|
|
|
|
|
|
|
event->start = false; |
|
|
|
|
|
|
|
event->feature = feature; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Scan events and save features for each range. */ |
|
|
|
|
|
|
|
hb_sorted_vector_t<feature_info_t> active_features; |
|
|
|
|
|
|
|
unsigned int last_index = 0; |
|
|
|
|
|
|
|
for (unsigned int i = 0; i < feature_events.length; i++) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
feature_event_t *event = &feature_events[i]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (event->index != last_index) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
/* Save a snapshot of active features and the range. */ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Sort features and merge duplicates */ |
|
|
|
/* Sort features and merge duplicates */ |
|
|
|
current_features = active_features; |
|
|
|
if (features.length) |
|
|
|
range_first = last_index; |
|
|
|
|
|
|
|
range_last = event->index - 1; |
|
|
|
|
|
|
|
if (current_features.length) |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
current_features.qsort (); |
|
|
|
features.qsort (); |
|
|
|
unsigned int j = 0; |
|
|
|
unsigned int j = 0; |
|
|
|
for (unsigned int i = 1; i < current_features.length; i++) |
|
|
|
for (unsigned int i = 1; i < features.length; i++) |
|
|
|
if (current_features[i].type != current_features[j].type || |
|
|
|
if (features[i].type != features[j].type || |
|
|
|
/* Nonexclusive feature selectors come in even/odd pairs to turn a setting on/off
|
|
|
|
/* Nonexclusive feature selectors come in even/odd pairs to turn a setting on/off
|
|
|
|
* respectively, so we mask out the low-order bit when checking for "duplicates" |
|
|
|
* respectively, so we mask out the low-order bit when checking for "duplicates" |
|
|
|
* (selectors referring to the same feature setting) here. */ |
|
|
|
* (selectors referring to the same feature setting) here. */ |
|
|
|
(!current_features[i].is_exclusive && ((current_features[i].setting & ~1) != (current_features[j].setting & ~1)))) |
|
|
|
(!features[i].is_exclusive && ((features[i].setting & ~1) != (features[j].setting & ~1)))) |
|
|
|
current_features[++j] = current_features[i]; |
|
|
|
features[++j] = features[i]; |
|
|
|
current_features.shrink (j + 1); |
|
|
|
features.shrink (j + 1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
hb_aat_layout_compile_map (this, &m); |
|
|
|
hb_aat_layout_compile_map (this, &m); |
|
|
|
|
|
|
|
|
|
|
|
last_index = event->index; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (event->start) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
active_features.push (event->feature); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
feature_info_t *feature = active_features.lsearch (event->feature); |
|
|
|
|
|
|
|
if (feature) |
|
|
|
|
|
|
|
active_features.remove_ordered (feature - active_features.arrayZ); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Behdad Esfahbod
2 years ago