s/complex_var/ot_shaper_var/g

This commit is contained in:
Behdad Esfahbod 2022-06-03 02:46:58 -06:00
parent 13fbed29e4
commit a560182cb3
7 changed files with 12 additions and 12 deletions

View File

@ -33,7 +33,7 @@
/* buffer var allocations */ /* buffer var allocations */
#define arabic_shaping_action() complex_var_u8_auxiliary() /* arabic shaping action */ #define arabic_shaping_action() ot_shaper_var_u8_auxiliary() /* arabic shaping action */
#define HB_BUFFER_SCRATCH_FLAG_ARABIC_HAS_STCH HB_BUFFER_SCRATCH_FLAG_COMPLEX0 #define HB_BUFFER_SCRATCH_FLAG_ARABIC_HAS_STCH HB_BUFFER_SCRATCH_FLAG_COMPLEX0

View File

@ -119,7 +119,7 @@ data_destroy_hangul (void *data)
#define isHangulTone(u) (hb_in_range<hb_codepoint_t> ((u), 0x302Eu, 0x302Fu)) #define isHangulTone(u) (hb_in_range<hb_codepoint_t> ((u), 0x302Eu, 0x302Fu))
/* buffer var allocations */ /* buffer var allocations */
#define hangul_shaping_feature() complex_var_u8_auxiliary() /* hangul jamo shaping feature */ #define hangul_shaping_feature() ot_shaper_var_u8_auxiliary() /* hangul jamo shaping feature */
static bool static bool
is_zero_width_char (hb_font_t *font, is_zero_width_char (hb_font_t *font,

View File

@ -33,8 +33,8 @@
/* buffer var allocations */ /* buffer var allocations */
#define indic_category() complex_var_u8_category() /* indic_category_t */ #define indic_category() ot_shaper_var_u8_category() /* indic_category_t */
#define indic_position() complex_var_u8_auxiliary() /* indic_position_t */ #define indic_position() ot_shaper_var_u8_auxiliary() /* indic_position_t */
/* Cateories used in the OpenType spec: /* Cateories used in the OpenType spec:

View File

@ -61,9 +61,9 @@ hb_syllabic_insert_dotted_circles (hb_font_t *font,
hb_glyph_info_t dottedcircle = {0}; hb_glyph_info_t dottedcircle = {0};
dottedcircle.codepoint = 0x25CCu; dottedcircle.codepoint = 0x25CCu;
dottedcircle.complex_var_u8_category() = dottedcircle_category; dottedcircle.ot_shaper_var_u8_category() = dottedcircle_category;
if (dottedcircle_position != -1) if (dottedcircle_position != -1)
dottedcircle.complex_var_u8_auxiliary() = dottedcircle_position; dottedcircle.ot_shaper_var_u8_auxiliary() = dottedcircle_position;
dottedcircle.codepoint = dottedcircle_glyph; dottedcircle.codepoint = dottedcircle_glyph;
buffer->clear_output (); buffer->clear_output ();
@ -87,7 +87,7 @@ hb_syllabic_insert_dotted_circles (hb_font_t *font,
{ {
while (buffer->idx < buffer->len && buffer->successful && while (buffer->idx < buffer->len && buffer->successful &&
last_syllable == buffer->cur().syllable() && last_syllable == buffer->cur().syllable() &&
buffer->cur().complex_var_u8_category() == (unsigned) repha_category) buffer->cur().ot_shaper_var_u8_category() == (unsigned) repha_category)
(void) buffer->next_glyph (); (void) buffer->next_glyph ();
} }

View File

@ -36,7 +36,7 @@
#include "hb-ot-shape-complex-syllabic.hh" #include "hb-ot-shape-complex-syllabic.hh"
/* buffer var allocations */ /* buffer var allocations */
#define use_category() complex_var_u8_category() #define use_category() ot_shaper_var_u8_category()
#define USE(Cat) use_syllable_machine_ex_##Cat #define USE(Cat) use_syllable_machine_ex_##Cat

View File

@ -34,7 +34,7 @@
#include "hb-ot-shape-complex-syllabic.hh" #include "hb-ot-shape-complex-syllabic.hh"
/* buffer var allocations */ /* buffer var allocations */
#define use_category() complex_var_u8_category() #define use_category() ot_shaper_var_u8_category()
#define USE(Cat) use_syllable_machine_ex_##Cat #define USE(Cat) use_syllable_machine_ex_##Cat

View File

@ -34,9 +34,9 @@
#include "hb-ot-shape-normalize.hh" #include "hb-ot-shape-normalize.hh"
/* buffer var allocations, used by complex shapers */ /* buffer var allocations, used by all OT shapers */
#define complex_var_u8_category() var2.u8[2] #define ot_shaper_var_u8_category() var2.u8[2]
#define complex_var_u8_auxiliary() var2.u8[3] #define ot_shaper_var_u8_auxiliary() var2.u8[3]
#define HB_OT_SHAPE_MAX_COMBINING_MARKS 32 #define HB_OT_SHAPE_MAX_COMBINING_MARKS 32