Update (old) harfbuzz to ToT

third_party/harfbuzz/src/harfbuzz-indic.cpp

 /*
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This is part of HarfBuzz, an OpenType Layout engine 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 1089 matching lines @@
     memmove(reordered + matra + added_chars, reordered + matra, (len-matra)*sizeof(unsigned short));
     reordered[matra] = split[0];
     reordered[matra+1] = split[1];
     if(added_chars == 2)
         reordered[matra+2] = split[2];
     len += added_chars;
 }
 
 #ifndef NO_OPENTYPE
 static const HB_OpenTypeFeature indic_features[] = {
+    { HB_MAKE_TAG('l', 'o', 'c', 'a'), LocaProperty },
     { HB_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     { HB_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
     { HB_MAKE_TAG('n', 'u', 'k', 't'), NuktaProperty },
     { HB_MAKE_TAG('a', 'k', 'h', 'n'), AkhantProperty },
     { HB_MAKE_TAG('r', 'p', 'h', 'f'), RephProperty },
     { HB_MAKE_TAG('b', 'l', 'w', 'f'), BelowFormProperty },
     { HB_MAKE_TAG('h', 'a', 'l', 'f'), HalfFormProperty },
     { HB_MAKE_TAG('p', 's', 't', 'f'), PostFormProperty },
+    { HB_MAKE_TAG('c', 'j', 'c', 't'), ConjunctFormProperty },
     { HB_MAKE_TAG('v', 'a', 't', 'u'), VattuProperty },
     { HB_MAKE_TAG('p', 'r', 'e', 's'), PreSubstProperty },
     { HB_MAKE_TAG('b', 'l', 'w', 's'), BelowSubstProperty },
     { HB_MAKE_TAG('a', 'b', 'v', 's'), AboveSubstProperty },
     { HB_MAKE_TAG('p', 's', 't', 's'), PostSubstProperty },
     { HB_MAKE_TAG('h', 'a', 'l', 'n'), HalantProperty },
+    { HB_MAKE_TAG('c', 'a', 'l', 't'), IndicCaltProperty },
     { 0, 0 }
 };
 #endif
 
 // #define INDIC_DEBUG
 #ifdef INDIC_DEBUG
 #define IDEBUG hb_debug
 #include <stdarg.h>
 
 static void hb_debug(const char *msg, ...)
 {
     va_list ap;
     va_start(ap, msg); // use variable arg list
     vfprintf(stderr, msg, ap);
     va_end(ap);
     fprintf(stderr, "\n");
 }
 
 #else
 #define IDEBUG if(0) printf
 #endif
 
 #if 0 //def INDIC_DEBUG
 static QString propertiesToString(int properties)
 {
     QString res;
     properties = ~properties;
+    if (properties & LocaProperty)
+        res += "Loca ";
     if (properties & CcmpProperty)
         res += "Ccmp ";
     if (properties & InitProperty)
         res += "Init ";
     if (properties & NuktaProperty)
         res += "Nukta ";
     if (properties & AkhantProperty)
         res += "Akhant ";
     if (properties & RephProperty)
         res += "Reph ";
     if (properties & PreFormProperty)
         res += "PreForm ";
     if (properties & BelowFormProperty)
         res += "BelowForm ";
     if (properties & AboveFormProperty)
         res += "AboveForm ";
     if (properties & HalfFormProperty)
         res += "HalfForm ";
     if (properties & PostFormProperty)
         res += "PostForm ";
+    if (properties & ConjunctFormProperty)
+        res += "PostForm ";
     if (properties & VattuProperty)
         res += "Vattu ";
     if (properties & PreSubstProperty)
         res += "PreSubst ";
     if (properties & BelowSubstProperty)
         res += "BelowSubst ";
     if (properties & AboveSubstProperty)
         res += "AboveSubst ";
     if (properties & PostSubstProperty)
         res += "PostSubst ";
     if (properties & HalantProperty)
         res += "Halant ";
     if (properties & CligProperty)
         res += "Clig ";
+    if (properties & IndicCaltProperty)
+        res += "Calt ";
     return res;
 }
 #endif
 
 static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool invalid)
 {
     HB_Script script = item->item.script;
     assert(script >= HB_Script_Devanagari && script <= HB_Script_Sinhala);
     const unsigned short script_base = 0x0900 + 0x80*(script-HB_Script_Devanagari);
     const unsigned short ra = script_base + 0x30;
@@ skipping 94 matching lines @@
                 for (i = base; i < len; ++i) {
                     position[i] = form(uc[i]);
                     if (position[i] == Consonant)
                         lastConsonant = i;
                     else if (matra < 0 && position[i] == Matra)
                         matra = i;
                 }
             }
             int skipped = 0;
             Position pos = Post;
-            for (i = len-1; i > base; i--) {
+            for (i = len-1; i >= base; i--) {
                 if (position[i] != Consonant && (position[i] != Control || script == HB_Script_Kannada))
                     continue;
 
+                if (i < len-1 && position[i] == Control && position[i+1] == Consonant) {
+                    base = i+1;
+                    break;
+                }
+
                 Position charPosition = indic_position(uc[i]);
                 if (pos == Post && charPosition == Post) {
                     pos = Post;
                 } else if ((pos == Post || pos == Below) && charPosition == Below) {
                     if (script == HB_Script_Devanagari || script == HB_Script_Gujarati)
                         base = i;
                     pos = Below;
                 } else {
                     base = i;
                     break;
@@ skipping 225 matching lines @@
         // is rather simple, as all chars just point to the first
         // glyph in the syllable.
         HB_STACKARRAY(unsigned short, clusters, len);
         HB_STACKARRAY(unsigned int, properties, len);
 
         for (i = 0; i < len; ++i)
             clusters[i] = i;
 
         // features we should always apply
         for (i = 0; i < len; ++i)
-            properties[i] = ~(CcmpProperty
+            properties[i] = ~(LocaProperty
+                              | CcmpProperty
                               | NuktaProperty
                               | VattuProperty
+                              | ConjunctFormProperty
                               | PreSubstProperty
                               | BelowSubstProperty
                               | AboveSubstProperty
                               | PostSubstProperty
                               | HalantProperty
+                              | IndicCaltProperty
                               | PositioningProperties);
 
+        // Loca always applies
         // Ccmp always applies
         // Init
         if (item->item.pos == 0
             || !(isLetter(item->string[item->item.pos-1]) || isMark(item->string[item->item.pos-1])))
             properties[0] &= ~InitProperty;
 
         // Nukta always applies
         // Akhant
         for (i = 0; i <= base; ++i)
             properties[i] &= ~AkhantProperty;
@@ skipping 36 matching lines @@
         }
         // PostFormProperty
         for (i = base+1; i < len; ++i)
             properties[i] &= ~PostFormProperty;
         // vattu always applies
         // pres always applies
         // blws always applies
         // abvs always applies
         // psts always applies
         // halant always applies
+        // calt always applies
 
 #ifdef INDIC_DEBUG
 //        {
 //            IDEBUG("OT properties:");
 //            for (int i = 0; i < len; ++i)
 //                qDebug("    i: %s", ::propertiesToString(properties[i]).toLatin1().data());
 //        }
 #endif
 
         // initialize
@@ skipping 240 matching lines @@
             ++uc;
             ++i;
         }
         assert(i == boundary);
     }
 
 
 }