harfbuzz-ng roll

third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh

 /*
  * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
  * all copies of this software.
@@ skipping 14 matching lines @@
  */
 
 #ifndef HB_OT_SHAPE_NORMALIZE_PRIVATE_HH
 #define HB_OT_SHAPE_NORMALIZE_PRIVATE_HH
 
 #include "hb-private.hh"
 
 #include "hb-font.h"
 #include "hb-buffer.h"
 
+/* buffer var allocations, used during the normalization process */
+#define glyph_index()   var1.u32
 
 enum hb_ot_shape_normalization_mode_t {
   HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED,
   HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS, /* never composes base-to-base */
-  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL /* including base-to-base composition */
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT, /* always fully decomposes and then recompose back */
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL, /* including base-to-base composition */
+
+  HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS
 };
 
 HB_INTERNAL void _hb_ot_shape_normalize (hb_font_t *font,
                                          hb_buffer_t *buffer,
                                          hb_ot_shape_normalization_mode_t mode);
 
 #endif /* HB_OT_SHAPE_NORMALIZE_PRIVATE_HH */