Update graphite library to 1.3.13 (also fixes LT-21731)

Author: jasonleenaylor

Lib/src/graphite2/README

@@ -1,5 +1,3 @@
-This directory contains the Graphite2 library from http://hg.palaso.org/graphitedev
-Current version derived from upstream changeset 0f9edca71849
+This directory contains the Graphite2 library from https://github.com/silnrsi/graphite
+Current version derived from upstream a7096fa Allow labels to return None from graphite
 See update.sh for update procedure.
-
-For more recent graphite code, see https://github.com/silnrsi/graphite

Lib/src/graphite2/include/graphite2/Font.h

@@ -30,7 +30,7 @@
 
 #define GR2_VERSION_MAJOR   1
 #define GR2_VERSION_MINOR   3
-#define GR2_VERSION_BUGFIX  2
+#define GR2_VERSION_BUGFIX  13
 
 #ifdef __cplusplus
 extern "C"
@@ -51,12 +51,12 @@ GR2_API void gr_engine_version(int *nMajor, int *nMinor, int *nBugFix);
 * The Face Options allow the application to require that certain tables are
 * read during face construction. This may be of concern if the appFaceHandle
 * used in the gr_get_table_fn may change.
-* The values can be combined 
+* The values can be combined
 */
 enum gr_face_options {
     /** No preload, no cmap caching, fail if the graphite tables are invalid */
     gr_face_default = 0,
-    /** Dumb rendering will be enabled if the graphite tables are invalid */
+    /** Dumb rendering will be enabled if the graphite tables are invalid. @deprecated Since 1.311 */
     gr_face_dumbRendering = 1,
     /** preload glyphs at construction time */
     gr_face_preloadGlyphs = 2,
@@ -113,7 +113,7 @@ struct gr_face_ops
 	gr_get_table_fn 	get_table;
         /** is a pointer to a function to notify the client the a table can be released.
           * This can be NULL to signify that the client does not wish to do any release handling. */
-	gr_release_table_fn	release_table;  
+	gr_release_table_fn	release_table;
 };
 typedef struct gr_face_ops	gr_face_ops;
 
@@ -130,8 +130,8 @@ typedef struct gr_face_ops	gr_face_ops;
   */
 GR2_API gr_face* gr_make_face_with_ops(const void* appFaceHandle/*non-NULL*/, const gr_face_ops *face_ops, unsigned int faceOptions);
 
-/** Create a gr_face object given application information and a getTable function. This function is deprecated as of v1.2.0 in
-  * favour of gr_make_face_with_ops.
+/** @deprecated Since v1.2.0 in favour of gr_make_face_with_ops.
+  * Create a gr_face object given application information and a getTable function.
   *
   * @return gr_face or NULL if the font fails to load for some reason.
   * @param appFaceHandle This is application specific information that is passed
@@ -140,22 +140,25 @@ GR2_API gr_face* gr_make_face_with_ops(const void* appFaceHandle/*non-NULL*/, co
   * @param getTable      Callback function to get table data.
   * @param faceOptions   Bitfield describing various options. See enum gr_face_options for details.
   */
-GR2_API gr_face* gr_make_face(const void* appFaceHandle/*non-NULL*/, gr_get_table_fn getTable, unsigned int faceOptions);
+GR2_DEPRECATED_API gr_face* gr_make_face(const void* appFaceHandle/*non-NULL*/, gr_get_table_fn getTable, unsigned int faceOptions);
 
-//#ifndef GRAPHITE2_NSEGCACHE
-/** Create a gr_face object given application information, with subsegmental caching support
+/** @deprecated   Since 1.3.7 this function is now an alias for gr_make_face_with_ops().
+  *
+  * Create a gr_face object given application information, with subsegmental caching support
   *
   * @return gr_face or NULL if the font fails to load.
   * @param appFaceHandle is a pointer to application specific information that is passed to getTable.
   *                      This may not be NULL and must stay alive as long as the gr_face is alive.
   * @param face_ops      Pointer to face specific callback structure for table management. Must stay
   *                      alive for the duration of the call only.
-  * @param segCacheMaxSize   How large the segment cache is.
+  * @param segCacheMaxSize Unused.
   * @param faceOptions   Bitfield of values from enum gr_face_options
   */
-GR2_API gr_face* gr_make_face_with_seg_cache_and_ops(const void* appFaceHandle, const gr_face_ops *face_ops, unsigned int segCacheMaxSize, unsigned int faceOptions);
+GR2_DEPRECATED_API gr_face* gr_make_face_with_seg_cache_and_ops(const void* appFaceHandle, const gr_face_ops *face_ops, unsigned int segCacheMaxSize, unsigned int faceOptions);
 
-/** Create a gr_face object given application information, with subsegmental caching support.
+/** @deprecated   Since 1.3.7 this function is now an alias for gr_make_face().
+  *
+  * Create a gr_face object given application information, with subsegmental caching support.
   * This function is deprecated as of v1.2.0 in favour of gr_make_face_with_seg_cache_and_ops.
   *
   * @return gr_face or NULL if the font fails to load.
@@ -165,8 +168,7 @@ GR2_API gr_face* gr_make_face_with_seg_cache_and_ops(const void* appFaceHandle,
   * @param segCacheMaxSize   How large the segment cache is.
   * @param faceOptions   Bitfield of values from enum gr_face_options
   */
-GR2_API gr_face* gr_make_face_with_seg_cache(const void* appFaceHandle, gr_get_table_fn getTable, unsigned int segCacheMaxSize, unsigned int faceOptions);
-//#endif
+GR2_DEPRECATED_API gr_face* gr_make_face_with_seg_cache(const void* appFaceHandle, gr_get_table_fn getTable, unsigned int segCacheMaxSize, unsigned int faceOptions);
 
 /** Convert a tag in a string into a gr_uint32
   *
@@ -243,16 +245,16 @@ GR2_API int gr_face_is_char_supported(const gr_face *pFace, gr_uint32 usv, gr_ui
   */
 GR2_API gr_face* gr_make_file_face(const char *filename, unsigned int faceOptions);
 
-//#ifndef GRAPHITE2_NSEGCACHE
-/** Create gr_face from a font file, with subsegment caching support.
+/** @deprecated   Since 1.3.7. This function is now an alias for gr_make_file_face().
+  *
+  * Create gr_face from a font file, with subsegment caching support.
   *
   * @return gr_face that accesses a font file directly. Returns NULL on failure.
   * @param filename Full path and filename to font file
   * @param segCacheMaxSize Specifies how big to make the cache in segments.
   * @param faceOptions   Bitfield from enum gr_face_options to control face options.
   */
-GR2_API gr_face* gr_make_file_face_with_seg_cache(const char *filename, unsigned int segCacheMaxSize, unsigned int faceOptions);
-//#endif
+GR2_DEPRECATED_API gr_face* gr_make_file_face_with_seg_cache(const char *filename, unsigned int segCacheMaxSize, unsigned int faceOptions);
 #endif      // !GRAPHITE2_NFILEFACE
 
 /** Create a font from a face
@@ -347,7 +349,7 @@ GR2_API gr_uint16 gr_fref_n_values(const gr_feature_ref* pfeatureref);
   * @param pfeatureref gr_feature_ref of the feature of interest
   * @param settingno   Index up to the return value of gr_fref_n_values() of the value
   */
-GR2_API gr_int16 gr_fref_value(const gr_feature_ref* pfeatureref, gr_uint16 settingno);   
+GR2_API gr_int16 gr_fref_value(const gr_feature_ref* pfeatureref, gr_uint16 settingno);
 
 /** Returns a string of the UI name of a feature
   *
@@ -385,4 +387,3 @@ GR2_API void gr_featureval_destroy(gr_feature_val *pfeatures);
 #ifdef __cplusplus
 }
 #endif
-

Lib/src/graphite2/include/graphite2/Log.h

@@ -42,7 +42,7 @@ typedef enum {
     GRLOG_SEGMENT = 0x02,
     GRLOG_PASS = 0x04,
     GRLOG_CACHE = 0x08,
-    
+
     GRLOG_OPCODE = 0x80,
     GRLOG_ALL = 0xFF
 } GrLogMask;

Lib/src/graphite2/include/graphite2/Segment.h

@@ -62,63 +62,63 @@ enum gr_justFlags {
 /** Used for looking up slot attributes. Most are already available in other functions **/
 enum gr_attrCode {
     /// adjusted glyph advance in x direction in design units
-    gr_slatAdvX = 0,        
+    gr_slatAdvX = 0,
     /// adjusted glyph advance in y direction (usually 0) in design units
-    gr_slatAdvY,            
+    gr_slatAdvY,
     /// returns 0. Deprecated.
-    gr_slatAttTo,           
+    gr_slatAttTo,
     /// This slot attaches to its parent at the given design units in the x direction
-    gr_slatAttX,            
+    gr_slatAttX,
     /// This slot attaches to its parent at the given design units in the y direction
-    gr_slatAttY,            
+    gr_slatAttY,
     /// This slot attaches to its parent at the given glyph point (not implemented)
-    gr_slatAttGpt,          
+    gr_slatAttGpt,
     /// x-direction adjustment from the given glyph point (not implemented)
-    gr_slatAttXOff,         
+    gr_slatAttXOff,
     /// y-direction adjustment from the given glyph point (not implemented)
-    gr_slatAttYOff,         
+    gr_slatAttYOff,
     /// Where on this glyph should align with the attachment point on the parent glyph in the x-direction.
-    gr_slatAttWithX,        
+    gr_slatAttWithX,
     /// Where on this glyph should align with the attachment point on the parent glyph in the y-direction
-    gr_slatAttWithY,        
+    gr_slatAttWithY,
     /// Which glyph point on this glyph should align with the attachment point on the parent glyph (not implemented).
-    gr_slatWithGpt,         
+    gr_slatWithGpt,
     /// Adjustment to gr_slatWithGpt in x-direction (not implemented)
-    gr_slatAttWithXOff,     
+    gr_slatAttWithXOff,
     /// Adjustment to gr_slatWithGpt in y-direction (not implemented)
-    gr_slatAttWithYOff,     
+    gr_slatAttWithYOff,
     /// Attach at given nesting level (not implemented)
-    gr_slatAttLevel,        
+    gr_slatAttLevel,
     /// Line break breakweight for this glyph
-    gr_slatBreak,           
+    gr_slatBreak,
     /// Ligature component reference (not implemented)
-    gr_slatCompRef,         
+    gr_slatCompRef,
     /// bidi directionality of this glyph (not implemented)
-    gr_slatDir,             
+    gr_slatDir,
     /// Whether insertion is allowed before this glyph
     gr_slatInsert,
     /// Final positioned position of this glyph relative to its parent in x-direction in pixels
-    gr_slatPosX,            
+    gr_slatPosX,
     /// Final positioned position of this glyph relative to its parent in y-direction in pixels
-    gr_slatPosY,            
+    gr_slatPosY,
     /// Amount to shift glyph by in x-direction design units
-    gr_slatShiftX,          
+    gr_slatShiftX,
     /// Amount to shift glyph by in y-direction design units
-    gr_slatShiftY,          
+    gr_slatShiftY,
     /// attribute user1
-    gr_slatUserDefnV1,      
+    gr_slatUserDefnV1,
     /// not implemented
-    gr_slatMeasureSol,      
+    gr_slatMeasureSol,
     /// not implemented
-    gr_slatMeasureEol,      
+    gr_slatMeasureEol,
     /// Amount this slot can stretch (not implemented)
-    gr_slatJStretch,        
+    gr_slatJStretch,
     /// Amount this slot can shrink (not implemented)
-    gr_slatJShrink,         
+    gr_slatJShrink,
     /// Granularity by which this slot can stretch or shrink (not implemented)
-    gr_slatJStep,           
+    gr_slatJStep,
     /// Justification weight for this glyph (not implemented)
-    gr_slatJWeight,         
+    gr_slatJWeight,
     /// Amount this slot mush shrink or stretch in design units
     gr_slatJWidth = 29,
     /// SubSegment split point
@@ -159,11 +159,11 @@ enum gr_attrCode {
     gr_slatSeqBelowWt,
     gr_slatSeqValignHt,
     gr_slatSeqValignWt,
-                            
+
     /// not implemented
-    gr_slatMax,             
+    gr_slatMax,
     /// not implemented
-    gr_slatNoEffect = gr_slatMax + 1    
+    gr_slatNoEffect = gr_slatMax + 1
 };
 
 enum gr_bidirtl {
@@ -182,13 +182,13 @@ typedef struct gr_segment       gr_segment;
 typedef struct gr_slot          gr_slot;
 
 /** Returns Unicode character for a charinfo.
-  * 
+  *
   * @param p Pointer to charinfo to return information on.
   */
 GR2_API unsigned int gr_cinfo_unicode_char(const gr_char_info* p/*not NULL*/);
 
 /** Returns breakweight for a charinfo.
-  * 
+  *
   * @return Breakweight is a number between -50 and 50 indicating the cost of a
   * break before or after this character. If the value < 0, the absolute value
   * is this character's contribution to the overall breakweight before it. If the value

Lib/src/graphite2/include/graphite2/Types.h

@@ -40,33 +40,40 @@ enum gr_encform {
   gr_utf8 = 1/*sizeof(uint8)*/, gr_utf16 = 2/*sizeof(uint16)*/, gr_utf32 = 4/*sizeof(uint32)*/
 };
 
-// Definitions for library publicly exported symbols
+
+// Define API function declspec/attributes and how each supported compiler or OS
+// allows us to specify them.
+#if defined __GNUC__
+  #define _gr2_and ,
+  #define _gr2_tag_fn(a)        __attribute__((a))
+  #define _gr2_deprecated_flag  deprecated
+  #define _gr2_export_flag      visibility("default")
+  #define _gr2_import_flag      visibility("default")
+  #define _gr2_static_flag      visibility("hidden")
+#endif
+
 #if defined _WIN32 || defined __CYGWIN__
-  #if defined GRAPHITE2_STATIC
-    #define GR2_API
-  #elif defined GRAPHITE2_EXPORTING
-    #if defined __GNUC__
-      #define GR2_API    __attribute__((dllexport))
-    #else
-      #define GR2_API    __declspec(dllexport)
-    #endif
-  #else
-    #if defined __GNUC__
-      #define GR2_API    __attribute__((dllimport))
-    #else
-      #define GR2_API    __declspec(dllimport)
-    #endif
-  #endif
-  #define GR2_LOCAL
-#elif __GNUC__ >= 4
-  #if defined GRAPHITE2_STATIC
-    #define GR2_API      __attribute__ ((visibility("hidden")))
-  #else
-    #define GR2_API      __attribute__ ((visibility("default")))
+  #if defined __GNUC__  // These three will be redefined for Windows
+    #undef _gr2_export_flag
+    #undef _gr2_import_flag
+    #undef _gr2_static_flag
+  #else  // How MSVC sepcifies function level attributes adn deprecation
+    #define _gr2_and
+    #define _gr2_tag_fn(a)       __declspec(a)
+    #define _gr2_deprecated_flag deprecated
   #endif
-  #define GR2_LOCAL      __attribute__ ((visibility("hidden")))
-#else
-  #define GR2_API
-  #define GR2_LOCAL
+  #define _gr2_export_flag     dllexport
+  #define _gr2_import_flag     dllimport
+  #define _gr2_static_flag
 #endif
 
+#if defined GRAPHITE2_STATIC
+  #define GR2_API             _gr2_tag_fn(_gr2_static_flag)
+  #define GR2_DEPRECATED_API  _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_static_flag)
+#elif defined GRAPHITE2_EXPORTING
+  #define GR2_API             _gr2_tag_fn(_gr2_export_flag)
+  #define GR2_DEPRECATED_API  _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_export_flag)
+#else
+  #define GR2_API             _gr2_tag_fn(_gr2_import_flag)
+  #define GR2_DEPRECATED_API  _gr2_tag_fn(_gr2_deprecated_flag _gr2_and _gr2_import_flag)
+#endif