minor spacing tweak
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 2a3ebc9..85fcab9 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -161,7 +161,7 @@
}
void serialize_copy (hb_serialize_context_t *c, const void *base,
- const Value *values, const hb_map_t *layout_variation_idx_map) const
+ const Value *values, const hb_map_t *layout_variation_idx_map) const
{
unsigned int format = *this;
if (!format) return;
@@ -178,8 +178,8 @@
}
void collect_variation_indices (hb_collect_variation_indices_context_t *c,
- const void *base,
- const hb_array_t<const Value>& values) const
+ const void *base,
+ const hb_array_t<const Value>& values) const
{
unsigned format = *this;
unsigned i = 0;
@@ -243,7 +243,7 @@
}
bool copy_device (hb_serialize_context_t *c, const void *base,
- const Value *src_value, const hb_map_t *layout_variation_idx_map) const
+ const Value *src_value, const hb_map_t *layout_variation_idx_map) const
{
Value *dst_value = c->copy (*src_value);
@@ -324,7 +324,7 @@
const void *src,
Iterator it,
ValueFormat valFormat,
- const hb_map_t *layout_variation_idx_map);
+ const hb_map_t *layout_variation_idx_map);
struct AnchorFormat1
@@ -545,7 +545,7 @@
bool serialize (hb_serialize_context_t *c,
unsigned num_rows,
AnchorMatrix const *offset_matrix,
- const hb_map_t *layout_variation_idx_map,
+ const hb_map_t *layout_variation_idx_map,
Iterator index_iter)
{
TRACE_SERIALIZE (this);
@@ -558,9 +558,9 @@
auto *offset = c->embed (offset_matrix->matrixZ[i]);
if (!offset) return_trace (false);
offset->serialize_copy (c, offset_matrix->matrixZ[i],
- offset_matrix, c->to_bias (this),
- hb_serialize_context_t::Head,
- layout_variation_idx_map);
+ offset_matrix, c->to_bias (this),
+ hb_serialize_context_t::Head,
+ layout_variation_idx_map);
}
return_trace (true);
@@ -668,7 +668,7 @@
hb_requires (hb_is_source_of (Iterator, MarkRecord))>
bool serialize (hb_serialize_context_t *c,
const hb_map_t *klass_mapping,
- const hb_map_t *layout_variation_idx_map,
+ const hb_map_t *layout_variation_idx_map,
const void *base,
Iterator it)
{
@@ -732,7 +732,7 @@
const void *src,
Iterator it,
ValueFormat valFormat,
- const hb_map_t *layout_variation_idx_map)
+ const hb_map_t *layout_variation_idx_map)
{
auto out = c->extend_min (*this);
if (unlikely (!out)) return;
@@ -813,7 +813,7 @@
const hb_array_t<const Value> values_array = values.as_array (valueCount * sub_length);
for (unsigned i : + it
- | hb_map (hb_second))
+ | hb_map (hb_second))
valueFormat.collect_variation_indices (c, this, values_array.sub_array (i * sub_length, sub_length));
}
@@ -846,7 +846,7 @@
const void *src,
Iterator it,
ValueFormat valFormat,
- const hb_map_t *layout_variation_idx_map)
+ const hb_map_t *layout_variation_idx_map)
{
auto out = c->extend_min (*this);
if (unlikely (!out)) return;
@@ -937,7 +937,7 @@
const void *src,
Iterator glyph_val_iter_pairs,
ValueFormat valFormat,
- const hb_map_t *layout_variation_idx_map)
+ const hb_map_t *layout_variation_idx_map)
{
if (unlikely (!c->extend_min (u.format))) return;
unsigned format = 2;
@@ -980,7 +980,7 @@
const void *src,
Iterator it,
ValueFormat valFormat,
- const hb_map_t *layout_variation_idx_map)
+ const hb_map_t *layout_variation_idx_map)
{ c->start_embed<SinglePos> ()->serialize (c, src, it, valFormat, layout_variation_idx_map); }
@@ -1016,8 +1016,8 @@
}
void collect_variation_indices (hb_collect_variation_indices_context_t *c,
- const ValueFormat *valueFormats,
- const void *base) const
+ const ValueFormat *valueFormats,
+ const void *base) const
{
unsigned record1_len = valueFormats[0].get_len ();
unsigned record2_len = valueFormats[1].get_len ();
@@ -1074,7 +1074,7 @@
}
void collect_variation_indices (hb_collect_variation_indices_context_t *c,
- const ValueFormat *valueFormats) const
+ const ValueFormat *valueFormats) const
{
unsigned len1 = valueFormats[0].get_len ();
unsigned len2 = valueFormats[1].get_len ();
@@ -1355,12 +1355,12 @@
{
for (const unsigned class2_idx : class2_set.iter ())
{
- unsigned start_offset = (class1_idx * (unsigned) class2Count + class2_idx) * (len1 + len2);
- if (valueFormat1.has_device ())
- valueFormat1.collect_variation_indices (c, this, values_array.sub_array (start_offset, len1));
+ unsigned start_offset = (class1_idx * (unsigned) class2Count + class2_idx) * (len1 + len2);
+ if (valueFormat1.has_device ())
+ valueFormat1.collect_variation_indices (c, this, values_array.sub_array (start_offset, len1));
- if (valueFormat2.has_device ())
- valueFormat2.collect_variation_indices (c, this, values_array.sub_array (start_offset+len1, len2));
+ if (valueFormat2.has_device ())
+ valueFormat2.collect_variation_indices (c, this, values_array.sub_array (start_offset+len1, len2));
}
}
}
@@ -1428,17 +1428,17 @@
+ hb_range ((unsigned) class1Count)
| hb_filter (klass1_map)
| hb_apply ([&] (const unsigned class1_idx)
- {
- + hb_range ((unsigned) class2Count)
- | hb_filter (klass2_map)
- | hb_apply ([&] (const unsigned class2_idx)
- {
- unsigned idx = (class1_idx * (unsigned) class2Count + class2_idx) * (len1 + len2);
- valueFormat1.serialize_copy (c->serializer, this, &values[idx], c->plan->layout_variation_idx_map);
- valueFormat2.serialize_copy (c->serializer, this, &values[idx + len1], c->plan->layout_variation_idx_map);
- })
- ;
- })
+ {
+ + hb_range ((unsigned) class2Count)
+ | hb_filter (klass2_map)
+ | hb_apply ([&] (const unsigned class2_idx)
+ {
+ unsigned idx = (class1_idx * (unsigned) class2Count + class2_idx) * (len1 + len2);
+ valueFormat1.serialize_copy (c->serializer, this, &values[idx], c->plan->layout_variation_idx_map);
+ valueFormat2.serialize_copy (c->serializer, this, &values[idx + len1], c->plan->layout_variation_idx_map);
+ })
+ ;
+ })
;
const hb_set_t &glyphset = *c->plan->_glyphset_gsub;
@@ -1547,7 +1547,7 @@
EntryExitRecord* copy (hb_serialize_context_t *c,
const void *src_base,
const void *dst_base,
- const hb_map_t *layout_variation_idx_map) const
+ const hb_map_t *layout_variation_idx_map) const
{
TRACE_SERIALIZE (this);
auto *out = c->embed (this);
@@ -1707,7 +1707,7 @@
void serialize (hb_serialize_context_t *c,
Iterator it,
const void *src_base,
- const hb_map_t *layout_variation_idx_map)
+ const hb_map_t *layout_variation_idx_map)
{
if (unlikely (!c->extend_min ((*this)))) return;
this->format = 1;
@@ -2065,11 +2065,11 @@
unsigned row_count = lig_array[i].rows;
for (unsigned row : + hb_range (row_count))
{
- + hb_range ((unsigned) classCount)
- | hb_filter (klass_mapping)
- | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; })
- | hb_sink (lig_indexes)
- ;
+ + hb_range ((unsigned) classCount)
+ | hb_filter (klass_mapping)
+ | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; })
+ | hb_sink (lig_indexes)
+ ;
}
lig_array[i].collect_variation_indices (c, lig_indexes.iter ());
