Implement 'rand'

This commit is contained in:
David Corbett 2018-01-25 14:22:03 -05:00 committed by Behdad Esfahbod
parent 96471fe859
commit c2a75e07e5
6 changed files with 37 additions and 10 deletions

View File

@ -534,6 +534,10 @@ struct AlternateSet
if (unlikely (!count)) return_trace (false); if (unlikely (!count)) return_trace (false);
if (c->random) {
c->random_state = (0x5DEECE66Dull * c->random_state + 11) & (((uint64_t) 1 << 48) - 1);
c->replace_glyph (alternates[(c->random_state >> 32) % count]);
} else {
hb_mask_t glyph_mask = c->buffer->cur().mask; hb_mask_t glyph_mask = c->buffer->cur().mask;
hb_mask_t lookup_mask = c->lookup_mask; hb_mask_t lookup_mask = c->lookup_mask;
@ -544,6 +548,7 @@ struct AlternateSet
if (unlikely (alt_index > count || alt_index == 0)) return_trace (false); if (unlikely (alt_index > count || alt_index == 0)) return_trace (false);
c->replace_glyph (alternates[alt_index - 1]); c->replace_glyph (alternates[alt_index - 1]);
}
return_trace (true); return_trace (true);
} }

View File

@ -480,6 +480,8 @@ struct hb_ot_apply_context_t :
bool auto_zwnj; bool auto_zwnj;
bool auto_zwj; bool auto_zwj;
bool random;
uint64_t random_state;
bool has_glyph_classes; bool has_glyph_classes;
@ -500,11 +502,17 @@ struct hb_ot_apply_context_t :
debug_depth (0), debug_depth (0),
auto_zwnj (true), auto_zwnj (true),
auto_zwj (true), auto_zwj (true),
random (false),
random_state (0),
has_glyph_classes (gdef.has_glyph_classes ()) {} has_glyph_classes (gdef.has_glyph_classes ()) {}
inline void set_lookup_mask (hb_mask_t mask) { lookup_mask = mask; } inline void set_lookup_mask (hb_mask_t mask) { lookup_mask = mask; }
inline void set_auto_zwj (bool auto_zwj_) { auto_zwj = auto_zwj_; } inline void set_auto_zwj (bool auto_zwj_) { auto_zwj = auto_zwj_; }
inline void set_auto_zwnj (bool auto_zwnj_) { auto_zwnj = auto_zwnj_; } inline void set_auto_zwnj (bool auto_zwnj_) { auto_zwnj = auto_zwnj_; }
inline void set_random_state (uint64_t random_state_) {
random = true;
random_state = random_state_;
}
inline void set_recurse_func (recurse_func_t func) { recurse_func = func; } inline void set_recurse_func (recurse_func_t func) { recurse_func = func; }
inline void set_lookup_index (unsigned int lookup_index_) { lookup_index = lookup_index_; } inline void set_lookup_index (unsigned int lookup_index_) { lookup_index = lookup_index_; }
inline void set_lookup_props (unsigned int lookup_props_) inline void set_lookup_props (unsigned int lookup_props_)

View File

@ -1268,6 +1268,14 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
c.set_lookup_mask (lookups[table_index][i].mask); c.set_lookup_mask (lookups[table_index][i].mask);
c.set_auto_zwj (lookups[table_index][i].auto_zwj); c.set_auto_zwj (lookups[table_index][i].auto_zwj);
c.set_auto_zwnj (lookups[table_index][i].auto_zwnj); c.set_auto_zwnj (lookups[table_index][i].auto_zwnj);
if (lookups[table_index][i].random)
{
uint64_t random_state = 1;
for (unsigned int j = 0; j < buffer->len; j++)
random_state = 31 * random_state + buffer->info[j].codepoint;
c.set_random_state (random_state);
buffer->unsafe_to_break_all ();
}
apply_string<Proxy> (&c, apply_string<Proxy> (&c,
proxy.table.get_lookup (lookup_index), proxy.table.get_lookup (lookup_index),
proxy.accels[lookup_index]); proxy.accels[lookup_index]);

View File

@ -95,7 +95,8 @@ hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m,
unsigned int variations_index, unsigned int variations_index,
hb_mask_t mask, hb_mask_t mask,
bool auto_zwnj, bool auto_zwnj,
bool auto_zwj) bool auto_zwj,
bool random)
{ {
unsigned int lookup_indices[32]; unsigned int lookup_indices[32];
unsigned int offset, len; unsigned int offset, len;
@ -122,6 +123,7 @@ hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m,
lookup->index = lookup_indices[i]; lookup->index = lookup_indices[i];
lookup->auto_zwnj = auto_zwnj; lookup->auto_zwnj = auto_zwnj;
lookup->auto_zwj = auto_zwj; lookup->auto_zwj = auto_zwj;
lookup->random = random;
} }
offset += len; offset += len;
@ -301,7 +303,8 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m,
variations_index, variations_index,
m.features[i].mask, m.features[i].mask,
m.features[i].auto_zwnj, m.features[i].auto_zwnj,
m.features[i].auto_zwj); m.features[i].auto_zwj,
m.features[i].tag == HB_TAG ('r','a','n','d'));
/* Sort lookups and merge duplicates */ /* Sort lookups and merge duplicates */
if (last_num_lookups < m.lookups[table_index].len) if (last_num_lookups < m.lookups[table_index].len)

View File

@ -61,6 +61,7 @@ struct hb_ot_map_t
unsigned short index; unsigned short index;
unsigned short auto_zwnj : 1; unsigned short auto_zwnj : 1;
unsigned short auto_zwj : 1; unsigned short auto_zwj : 1;
unsigned short random : 1;
hb_mask_t mask; hb_mask_t mask;
static int cmp (const void *pa, const void *pb) static int cmp (const void *pa, const void *pb)
@ -206,7 +207,8 @@ struct hb_ot_map_builder_t
unsigned int variations_index, unsigned int variations_index,
hb_mask_t mask, hb_mask_t mask,
bool auto_zwnj = true, bool auto_zwnj = true,
bool auto_zwj = true); bool auto_zwj = true,
bool random = false);
struct feature_info_t { struct feature_info_t {
hb_tag_t tag; hb_tag_t tag;

View File

@ -49,6 +49,7 @@ static hb_tag_t common_features[] = {
HB_TAG('m','a','r','k'), HB_TAG('m','a','r','k'),
HB_TAG('m','k','m','k'), HB_TAG('m','k','m','k'),
HB_TAG('r','l','i','g'), HB_TAG('r','l','i','g'),
HB_TAG('r','a','n','d'),
}; };