graphite2 1.3.5

git-svn-id: svn://tug.org/texlive/trunk@39433 c570f23f-e606-0410-a88d-b1316a301751

100 files changed, 181 insertions, 168 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 342d6cb6356..4f5865e6137 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -21,7 +21,7 @@ gd 2.1.1 - checked 14jan15
 gmp 6.1.0 - checked 28dec15
   http://ftp.gnu.org/gnu/gmp/
 
-graphite2 1.3.3 - checked 27sep15
+graphite2 1.3.5 - checked 20jan16
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 harfbuzz 1.1.3 - checked 12jan16
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index bea2c3874cb..4a5098a3001 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-20  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import graphite2-1.3.5.
+	* version.ac: Adjusted.
+	* configure.ac: New convention for source tree.
+
 2015-09-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import graphite2-1.3.3.
diff --git a/Build/source/libs/graphite2/configure b/Build/source/libs/graphite2/configure
index 82ab029dcc4..007b001d54a 100755
--- a/Build/source/libs/graphite2/configure
+++ b/Build/source/libs/graphite2/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for graphite2 (TeX Live) 1.3.3.
+# Generated by GNU Autoconf 2.69 for graphite2 (TeX Live) 1.3.5.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,12 +579,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='graphite2 (TeX Live)'
 PACKAGE_TARNAME='graphite2--tex-live-'
-PACKAGE_VERSION='1.3.3'
-PACKAGE_STRING='graphite2 (TeX Live) 1.3.3'
+PACKAGE_VERSION='1.3.5'
+PACKAGE_STRING='graphite2 (TeX Live) 1.3.5'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="graphite2-1.3.3/graphite2.pc.in"
+ac_unique_file="graphite2-src/graphite2.pc.in"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -1254,7 +1254,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures graphite2 (TeX Live) 1.3.3 to adapt to many kinds of systems.
+\`configure' configures graphite2 (TeX Live) 1.3.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1321,7 +1321,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of graphite2 (TeX Live) 1.3.3:";;
+     short | recursive ) echo "Configuration of graphite2 (TeX Live) 1.3.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1419,7 +1419,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-graphite2 (TeX Live) configure 1.3.3
+graphite2 (TeX Live) configure 1.3.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1558,7 +1558,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by graphite2 (TeX Live) $as_me 1.3.3, which was
+It was created by graphite2 (TeX Live) $as_me 1.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3481,7 +3481,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='graphite2--tex-live-'
- VERSION='1.3.3'
+ VERSION='1.3.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5009,7 +5009,7 @@ $as_echo "#define GRAPHITE2_NTRACING 1" >>confdefs.h
 
 fi
 
-GRAPHITE2_TREE=graphite2-1.3.3
+GRAPHITE2_TREE=graphite2-src
 
 
 ac_config_files="$ac_config_files Makefile include/graphite2/Makefile"
@@ -5577,7 +5577,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by graphite2 (TeX Live) $as_me 1.3.3, which was
+This file was extended by graphite2 (TeX Live) $as_me 1.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5643,7 +5643,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-graphite2 (TeX Live) config.status 1.3.3
+graphite2 (TeX Live) config.status 1.3.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/graphite2/configure.ac b/Build/source/libs/graphite2/configure.ac
index c71e0455a7b..3a3a3af20ed 100644
--- a/Build/source/libs/graphite2/configure.ac
+++ b/Build/source/libs/graphite2/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define graphite2_version
 AC_INIT([graphite2 (TeX Live)], graphite2_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([graphite2-]graphite2_version[/graphite2.pc.in])
+AC_CONFIG_SRCDIR([graphite2-src/graphite2.pc.in])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -47,7 +47,7 @@ if test "x$enable_tracing" = no; then
             [Define to 1 to disable tracing support.])
 fi
 
-AC_SUBST([GRAPHITE2_TREE], [graphite2-]graphite2_version)
+AC_SUBST([GRAPHITE2_TREE], [graphite2-src])
 
 AC_CONFIG_FILES([Makefile include/graphite2/Makefile])
 
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/.hg_archival.txt b/Build/source/libs/graphite2/graphite2-1.3.3/.hg_archival.txt
deleted file mode 100644
index de4c9cc26ee..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.3.3/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: 999e2033695c3bcf2f65d611737ac9008805bd58
-node: ff457b44c490e38901c7a064ff54cdbc4d3487b4
-branch: default
-latesttag: 1.3.3
-latesttagdistance: 1
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/.hgeol b/Build/source/libs/graphite2/graphite2-1.3.3/.hgeol
deleted file mode 100644
index 5eb1fc19d0f..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.3.3/.hgeol
+++ /dev/null
@@ -1,15 +0,0 @@
-[patterns]

-**.c = native

-**.cfg = native

-**.cpp = native

-**.gdh = native

-**.h = native

-**.json = native

-**.log = native

-**.pdf = BIN

-**.sh = native

-**.txt = native

-**.ttf = BIN

-

-[repository]

-native=LF

diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/.hgignore b/Build/source/libs/graphite2/graphite2-1.3.3/.hgignore
deleted file mode 100644
index 59c168c2179..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.3.3/.hgignore
+++ /dev/null
@@ -1,36 +0,0 @@
-syntax:glob
-*~
-*.bak
-m4
-autom4te.cache
-config
-configure
-config.status
-config.log
-aclocal.m4
-libtool
-Makefile.in
-Makefile
-msvs9
-vs9
-nmake*
-*.o
-*.lo
-*.Plo
-*.swp
-*.la
-*.kdev4
-*.orig
-*.pyc
-.cproject
-.project
-.pydevproject
-
-syntax:regexp
-\.libs/
-\.deps/
-\.externalToolBuilders
-build*/
-release/
-debug/
-dev/
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/.hgtags b/Build/source/libs/graphite2/graphite2-1.3.3/.hgtags
deleted file mode 100644
index ef318023552..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.3.3/.hgtags
+++ /dev/null
@@ -1,39 +0,0 @@
-c36cd69f32ac9daace9f8784063567d81328e778 base
-e0db725d6db85c49389176f2ee460366f080c023 Release 0.9
-3a92b51d7167e16c31b963924bd01964d6eb7e63 r0.9.1
-5369cdd121206c950113de37f4886152aa86cc98 0.9.2
-3ec0de96c2229e975b1452f9a92c4ab3845c0ad2 0.9.3
-50901246031365c63fb826a18a5ca52099201d93 0.9.4
-b8a64c4a89f5d742553a7cc3cfddb6b3e08e1fa0 1.0.0
-bedb05f72d56f24ca0fc333fd14eabb1ec553902 1.0.1
-bedb05f72d56f24ca0fc333fd14eabb1ec553902 1.0.1
-0000000000000000000000000000000000000000 1.0.1
-0000000000000000000000000000000000000000 1.0.1
-01df4f7cc7b0f31f8490b4246b298ac10d92675e 1.0.1
-0fa690ff089ce0bc382a553cc01c0b721fbdee5c 1.0.2
-0fa690ff089ce0bc382a553cc01c0b721fbdee5c 1.0.2
-b10bcaf1302411513a5961d1854ff8c02e5ad5e6 1.0.2
-8795e344f7964bdf8ef4607004f01b94c41e5775 1.0.3
-8795e344f7964bdf8ef4607004f01b94c41e5775 1.0.3
-0000000000000000000000000000000000000000 1.0.3
-0000000000000000000000000000000000000000 1.0.3
-f148746a0d99d2f9bc050906ce78815565a0d0b4 1.0.3
-afdc9c2e4cf341560dfcb985b66e52793d1987af 1.1.0
-afdc9c2e4cf341560dfcb985b66e52793d1987af 1.1.0
-22dfbf9cd047667eef87602eacf2ac1e84ec20d7 1.1.0
-e095cd8b635aa985c8054717761555b6d46dbdb6 1.1.1
-1ffaabe61f501b7a0b9217f4b82f21ac6a7af212 1.1.2
-d8c8ce7898a9e73a9cb11c25b9ff6a198fdf8d80 1.1.3
-fb4b0c347a953f6aa656a4e414f8e42e91c00c2b 1.2.0
-9ca2c8c1469f6107cd366e4be2035ce0dfa09b65 1.2.1
-7b0a153b4873117ff726ac8c780f7bd994845285 1.2.2
-4605b74e26f3a119753b700524c49b98e7e45639 1.2.3
-89895200933d3b0ce799b2d230dd6840106750b1 1.2.4
-5f1e36a3b3b8a7c115ec334741fd83f33b59811c collisions.phase1
-4c5cb2d670c991e6fc13f42d2180b6d693c21dad coll_1
-9766cf4dec9c25358d01a074ec64408f257fff74 1.3.0
-1c1f050f234665cba946f3f4624baf55e3e54299 1.3.1
-1c1f050f234665cba946f3f4624baf55e3e54299 1.3.1
-07d926106a065faba719db1829c59ec836ec1ded 1.3.1
-158e147bfb47d9f5b292230a841ff65466c8669d 1.3.2
-57f777f15780a83462fd714b6c76d9b163b8f3d0 1.3.3
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-src-PATCHES/ChangeLog
index 8d3061edbaf..a50f2b72941 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-src-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-20  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Imported graphite2-1.3.5 source tree from:
+	  http://sourceforge.net/projects/silgraphite/files/graphite2/
+
 2013-12-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported graphite2-1.2.4 source tree from:
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3-PATCHES/TL-Changes b/Build/source/libs/graphite2/graphite2-src-PATCHES/TL-Changes
index ff34dd7a00d..56d22845393 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3-PATCHES/TL-Changes
+++ b/Build/source/libs/graphite2/graphite2-src-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the graphite2-1.3.3/ tree as obtained from:
+Changes applied to the graphite2-1.3.5/ tree as obtained from:
 	http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 Removed unused dirs:
@@ -7,4 +7,3 @@ Removed unused dirs:
 	doc
 	gr2fonttest
 	tests
-
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/CMakeLists.txt b/Build/source/libs/graphite2/graphite2-src/CMakeLists.txt
index bb8d75bd63a..bb8d75bd63a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/CMakeLists.txt
+++ b/Build/source/libs/graphite2/graphite2-src/CMakeLists.txt
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/COPYING b/Build/source/libs/graphite2/graphite2-src/COPYING
index d40f2d84587..d40f2d84587 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/COPYING
+++ b/Build/source/libs/graphite2/graphite2-src/COPYING
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/ChangeLog b/Build/source/libs/graphite2/graphite2-src/ChangeLog
index a2dddc1de25..40f8fd4a7ef 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-src/ChangeLog
@@ -1,3 +1,18 @@
+1.3.5
+    . Bug fixes
+        . Security bug fix
+        . Fix ARM misalignment problem
+        . Track latest cmake
+
+1.3.4
+    . Transition from Mercurial to Git
+    . Bug fixes
+        . Fix Collision Kerning ignoring some diacritics
+        . Handle pass bits 16-31 to speed up fonts with > 16 passes
+        . Various minor fuzz bug fixes
+        . Make Coverity happy
+        . Add GR_FALLTHROUGH macro for clang c++11
+
 1.3.3
     . Slight speed up in Collision Avoidance
     . Remove dead bidi code
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/Graphite.cmake b/Build/source/libs/graphite2/graphite2-src/Graphite.cmake
index 30980a506c7..4ccf202c831 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/Graphite.cmake
+++ b/Build/source/libs/graphite2/graphite2-src/Graphite.cmake
@@ -25,7 +25,6 @@ ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
 
 
 FUNCTION(CREATE_LIBTOOL_FILE _target _install_DIR)
-  GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
@@ -35,9 +34,10 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _install_DIR)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK no)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
-  GET_FILENAME_COMPONENT(_lanamewe ${_target_location} NAME_WE)
-  GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
-  GET_FILENAME_COMPONENT(_soext ${_target_location} EXT)
+  
+  SET(_lanamewe ${CMAKE_SHARED_LIBRARY_PREFIX}${_target})
+  SET(_soname ${_lanamewe}${CMAKE_SHARED_LIBRARY_SUFFIX})
+  SET(_soext ${CMAKE_SHARED_LIBRARY_SUFFIX})
   SET(_laname ${PROJECT_BINARY_DIR}/${_lanamewe}.la)
   FILE(WRITE ${_laname} "# ${_lanamewe}.la - a libtool library file\n")
   FILE(APPEND ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
@@ -45,8 +45,8 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _install_DIR)
   FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
   FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
   FILE(APPEND ${_laname} "# Names of this library.\n")
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-    FILE(APPEND ${_laname} "library_names='${_lanamwe}.${_target_current}.${_target_revision}.${_target_age}.${_soext} ${_lanamewe}.${_target_current}.${_soext} ${_soname}'\n\n")
+    if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+    FILE(APPEND ${_laname} "library_names='${_lanamewe}.${_target_current}.${_target_revision}.${_target_age}${_soext} ${_lanamewe}.${_target_current}${_soext} ${_soname}'\n\n")
   else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
     FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_revision}.${_target_age} ${_soname}.${_target_current} ${_soname}'\n\n")
   endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/LICENSE b/Build/source/libs/graphite2/graphite2-src/LICENSE
index 2d2d780e601..2d2d780e601 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/LICENSE
+++ b/Build/source/libs/graphite2/graphite2-src/LICENSE
diff --git a/Build/source/libs/graphite2/graphite2-src/README.md b/Build/source/libs/graphite2/graphite2-src/README.md
new file mode 100644
index 00000000000..2c4ecf58d8a
--- /dev/null
+++ b/Build/source/libs/graphite2/graphite2-src/README.md
@@ -0,0 +1,32 @@
+# Graphite engine
+
+## What is Graphite?
+
+Graphite is a system that can be used to create “smart fonts” capable of displaying writing systems with various complex behaviors. A smart font contains not only letter shapes but also additional instructions indicating how to combine and position the letters in complex ways.
+
+Graphite was primarily developed to provide the flexibility needed for minority languages which often need to be written according to slightly different rules than well-known languages that use the same script.
+
+Examples of complex script behaviors Graphite can handle include:
+
+* contextual shaping
+* ligatures
+* reordering
+* split glyphs
+* bidirectionality
+* stacking diacritics
+* complex positioning
+* shape aware kerning
+* automatic diacritic collision avoidance
+
+See [examples of scripts with complex rendering](http://scripts.sil.org/CmplxRndExamples).
+
+## Graphite system overview
+The Graphite system consists of:
+
+* A rule-based programming language [Graphite Description Language](http://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_devFont#gdl) (GDL) that can be used to describe the behavior of a writing system
+* A compiler for that language
+* A rendering engine that can serve as the layout component of a text-processing application
+
+Graphite renders TrueType fonts that have been extended by means of compiling a GDL program.
+
+Further technical information is available on the [Graphite technical overview](http://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_techAbout) page.
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/Todo.txt b/Build/source/libs/graphite2/graphite2-src/Todo.txt
index 72ab26feb0e..72ab26feb0e 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/Todo.txt
+++ b/Build/source/libs/graphite2/graphite2-src/Todo.txt
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/graphite2.pc.in b/Build/source/libs/graphite2/graphite2-src/graphite2.pc.in
index a4f19b39ce4..a4f19b39ce4 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/graphite2.pc.in
+++ b/Build/source/libs/graphite2/graphite2-src/graphite2.pc.in
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Font.h b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Font.h
index 665685beb74..8c96ec3cc7b 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Font.h
+++ b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Font.h
@@ -30,7 +30,7 @@
 
 #define GR2_VERSION_MAJOR   1
 #define GR2_VERSION_MINOR   3
-#define GR2_VERSION_BUGFIX  3
+#define GR2_VERSION_BUGFIX  5
 
 #ifdef __cplusplus
 extern "C"
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Log.h b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Log.h
index d1c6f0fe36f..d1c6f0fe36f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Log.h
+++ b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Log.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Segment.h b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Segment.h
index 0c3c49a3acf..0c3c49a3acf 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Segment.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Types.h b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Types.h
index e8e45c1ff8f..e8e45c1ff8f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/include/graphite2/Types.h
+++ b/Build/source/libs/graphite2/graphite2-src/include/graphite2/Types.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/CMakeLists.txt b/Build/source/libs/graphite2/graphite2-src/src/CMakeLists.txt
index 9983e019705..4f1e7e5dbf8 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/CMakeLists.txt
+++ b/Build/source/libs/graphite2/graphite2-src/src/CMakeLists.txt
@@ -114,6 +114,10 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     if (CMAKE_COMPILER_IS_GNUCXX)
         add_definitions(-Wdouble-promotion)
     endif (CMAKE_COMPILER_IS_GNUCXX)
+    message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
+    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+        add_definitions(-Wimplicit-fallthrough)
+    endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
@@ -131,7 +135,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 
 if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
     set_target_properties(graphite2 PROPERTIES 
-        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
         LINK_FLAGS      "-nodefaultlibs" 
         LINKER_LANGUAGE C)
     target_link_libraries(graphite2 c)
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/CachedFace.cpp b/Build/source/libs/graphite2/graphite2-src/src/CachedFace.cpp
index fd599bde8aa..fd599bde8aa 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/CachedFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/CachedFace.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/CmapCache.cpp b/Build/source/libs/graphite2/graphite2-src/src/CmapCache.cpp
index a945ef23443..a945ef23443 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/CmapCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/CmapCache.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Code.cpp b/Build/source/libs/graphite2/graphite2-src/src/Code.cpp
index a83cf0c8546..02ad54d7dcd 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Code.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Code.cpp
@@ -120,6 +120,7 @@ private:
     analysis            _analysis;
     enum passtype       _passtype;
     int                 _stack_depth;
+    bool                _in_ctxt_item;
 };
 
 
@@ -139,7 +140,8 @@ inline Machine::Code::decoder::decoder(limits & lims, Code &code, enum passtype
   _pre_context(code._constraint ? 0 : lims.pre_context), 
   _rule_length(code._constraint ? 1 : lims.rule_length), 
   _instr(code._code), _data(code._data), _max(lims), _passtype(pt),
-  _stack_depth(0)
+  _stack_depth(0),
+  _in_ctxt_item(false)
 { }
     
 
@@ -356,8 +358,8 @@ opcode Machine::Code::decoder::fetch_opcode(const byte * bc)
             break;
         case CNTXT_ITEM :
             valid_upto(_max.rule_length, _max.pre_context + int8(bc[0]));
-            if (bc + 2 + bc[1] >= _max.bytecode)  failure(jump_past_end);
-            if (_pre_context != 0)                failure(nested_context_item);
+            if (bc + 2 + bc[1] >= _max.bytecode)    failure(jump_past_end);
+            if (_in_ctxt_item)                      failure(nested_context_item);
             break;
         case ATTR_SET :
         case ATTR_ADD :
@@ -421,6 +423,7 @@ opcode Machine::Code::decoder::fetch_opcode(const byte * bc)
         case POP_RET :
             if (--_stack_depth < 0)
                 failure(underfull_stack);
+            GR_FALLTHROUGH;
             // no break
         case RET_ZERO :
         case RET_TRUE :
@@ -504,6 +507,7 @@ void Machine::Code::decoder::analyse_opcode(const opcode opc, const int8  * arg)
     case PUT_SUBS : 
       _code._modify = true;
       _analysis.set_changed(0);
+      GR_FALLTHROUGH;
       // no break
     case PUT_COPY :
     {
@@ -516,6 +520,7 @@ void Machine::Code::decoder::analyse_opcode(const opcode opc, const int8  * arg)
     }
     case PUSH_ATT_TO_GATTR_OBS : // slotref on 2nd parameter
         if (_code._constraint) return;
+        GR_FALLTHROUGH;
         // no break
     case PUSH_GLYPH_ATTR_OBS :
     case PUSH_SLOT_ATTR :
@@ -530,6 +535,7 @@ void Machine::Code::decoder::analyse_opcode(const opcode opc, const int8  * arg)
       break;
     case PUSH_ATT_TO_GLYPH_ATTR :
         if (_code._constraint) return;
+        GR_FALLTHROUGH;
         // no break
     case PUSH_GLYPH_ATTR :
       if (arg[2] <= 0 && -arg[2] <= _analysis.slotref - _analysis.contexts[_analysis.slotref].flags.inserted)
@@ -574,6 +580,7 @@ bool Machine::Code::decoder::emit_opcode(opcode opc, const byte * & bc)
     if (opc == CNTXT_ITEM)
     {
         assert(_pre_context == 0);
+        _in_ctxt_item = true;
         _pre_context = _max.pre_context + int8(_data[-2]);
         _rule_length = _max.rule_length;
 
@@ -592,9 +599,13 @@ bool Machine::Code::decoder::emit_opcode(opcode opc, const byte * & bc)
 
             _rule_length = 1;
             _pre_context = 0;
+            _in_ctxt_item = false;
         }
         else
+        {
+            _pre_context = 0;
             return false;
+        }
     }
     
     return bool(_code);
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Collider.cpp b/Build/source/libs/graphite2/graphite2-src/src/Collider.cpp
index 51873a2841f..87f067d3f7c 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Collider.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Collider.cpp
@@ -896,7 +896,7 @@ bool KernCollider::initSlot(Segment *seg, Slot *aSlot, const Rect &limit, float
             float y = _miny - 1 + (i + .5f) * _sliceWidth; // vertical center of slice
             if ((dir & 1) && x < _edges[i])
             {
-                t = get_edge(seg, s, currShift, y, _sliceWidth, false);
+                t = get_edge(seg, s, c->shift(), y, _sliceWidth, false);
                 if (t < _edges[i])
                 {
                     _edges[i] = t;
@@ -906,7 +906,7 @@ bool KernCollider::initSlot(Segment *seg, Slot *aSlot, const Rect &limit, float
             }
             else if (!(dir & 1) && x > _edges[i])
             {
-                t = get_edge(seg, s, currShift, y, _sliceWidth, true);
+                t = get_edge(seg, s, c->shift(), y, _sliceWidth, true);
                 if (t > _edges[i])
                 {
                     _edges[i] = t;
@@ -993,6 +993,9 @@ Position KernCollider::resolve(GR_MAYBE_UNUSED Segment *seg, GR_MAYBE_UNUSED Slo
 				<< "gid" << _target->gid()
                 << "margin" << _margin
                 << "limit" << _limit
+                << "miny" << _miny
+                << "maxy" << _maxy
+                << "slicewidth" << _sliceWidth
                 << "target" << json::object
                     << "origin" << _target->origin()
                     //<< "currShift" << _currShift
@@ -1000,8 +1003,6 @@ Position KernCollider::resolve(GR_MAYBE_UNUSED Segment *seg, GR_MAYBE_UNUSED Slo
                     << "bbox" << seg->theGlyphBBoxTemporary(_target->gid())
                     << "slantBox" << seg->getFace()->glyphs().slant(_target->gid())
                     << "fix" << "kern"
-                    << "slices" << _edges.size()
-                    << "sliceWidth" << _sliceWidth
                     << json::close; // target object
         
         *dbgout << "slices" << json::array;
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Decompressor.cpp b/Build/source/libs/graphite2/graphite2-src/src/Decompressor.cpp
index b49c8d9982d..084570ff3c3 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Decompressor.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Decompressor.cpp
@@ -85,7 +85,7 @@ int lz4::decompress(void const *in, size_t in_size, void *out, size_t out_size)
         {
             // Copy in literal. At this point the last full sequence must be at
             // least MINMATCH + 5 from the end of the output buffer.
-            if (dst + align(literal_len) > dst_end - MINMATCH+5)
+            if (dst + align(literal_len) > dst_end - (MINMATCH+5))
                 return -1;
             dst = overrun_copy(dst, literal, literal_len);
         }
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Face.cpp b/Build/source/libs/graphite2/graphite2-src/src/Face.cpp
index 834eec0fb9c..7aefdb98de0 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Face.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Face.cpp
@@ -195,7 +195,6 @@ bool Face::runGraphite(Segment *seg, const Silf *aSilf) const
                 << "output" << json::array;
         for(Slot * s = seg->first(); s; s = s->next())
             *dbgout     << dslot(seg, s);
-        seg->finalise(0);                   // Call this here to fix up charinfo back indexes.
         *dbgout         << json::close
                 << "advance" << seg->advance()
                 << "chars"   << json::array;
@@ -330,9 +329,9 @@ Error Face::Table::decompress()
     {
         uncompressed_size  = hdr & 0x07ffffff;
         uncompressed_table = gralloc<byte>(uncompressed_size);
-        //TODO: Coverty: 1315803: FORWARD_NULL
         if (!e.test(!uncompressed_table, E_OUTOFMEM))
-            //TODO: Coverty: 1315800: CHECKED_RETURN
+            // coverity[forward_null : FALSE] - uncompressed_table has been checked so can't be null
+            // coverity[checked_return : FALSE] - we test e later
             e.test(lz4::decompress(p, _sz - 2*sizeof(uint32), uncompressed_table, uncompressed_size) != signed(uncompressed_size), E_SHRINKERFAILED);
         break;
     }
@@ -343,7 +342,8 @@ Error Face::Table::decompress()
 
     // Check the uncompressed version number against the original.
     if (!e)
-        //TODO: Coverty: 1315800: CHECKED_RETURN
+        // coverity[forward_null : FALSE] - uncompressed_table has already been tested so can't be null
+        // coverity[checked_return : FALSE] - we test e later
         e.test(be::peek<uint32>(uncompressed_table) != version, E_SHRINKERFAILED);
 
     // Tell the provider to release the compressed form since were replacing
@@ -358,7 +358,7 @@ Error Face::Table::decompress()
     }
 
     _p = uncompressed_table;
-    _sz = uncompressed_size + sizeof(uint32);
+    _sz = uncompressed_size;
     _compressed = true;
 
     return e;
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/FeatureMap.cpp b/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp
index b8c8405276a..b8c8405276a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/FeatureMap.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/FileFace.cpp b/Build/source/libs/graphite2/graphite2-src/src/FileFace.cpp
index 43aff71a719..43aff71a719 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/FileFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/FileFace.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Font.cpp b/Build/source/libs/graphite2/graphite2-src/src/Font.cpp
index 5cec362bfc6..5cec362bfc6 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Font.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Font.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/GlyphCache.cpp b/Build/source/libs/graphite2/graphite2-src/src/GlyphCache.cpp
index d1e2b48fbd7..1cd5054f71f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/GlyphCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/GlyphCache.cpp
@@ -299,7 +299,13 @@ GlyphCache::Loader::Loader(const Face & face, const bool dumb_font)
             _head = Face::Table();
             return;
         }
-        _has_boxes = (version == 0x00030000);
+        else if (version >= 0x00030000)
+        {
+            unsigned int glatflags = be::read<uint32>(p);
+            _has_boxes = glatflags & 1;
+            // delete this once the compiler is fixed
+            _has_boxes = true;
+        }
     }
 }
 
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/GlyphFace.cpp b/Build/source/libs/graphite2/graphite2-src/src/GlyphFace.cpp
index 9fc11b2157e..9fc11b2157e 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/GlyphFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/GlyphFace.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Intervals.cpp b/Build/source/libs/graphite2/graphite2-src/src/Intervals.cpp
index 917da5add3c..1e34e598715 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Intervals.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Intervals.cpp
@@ -155,6 +155,7 @@ void Zones::remove(float x, float xm)
         {
         case 0:     // i completely covers e
             if (separated(i->x, x))  { i = _exclusions.insert(i,i->split_at(x)); ++i; }
+            GR_FALLTHROUGH;
             // no break
         case 1:     // i overlaps on the rhs of e
             i->left_trim(xm);
@@ -162,6 +163,7 @@ void Zones::remove(float x, float xm)
         case 2:     // i overlaps on the lhs of e
             i->xm = x;
             if (separated(i->x, i->xm)) break;
+            GR_FALLTHROUGH;
             // no break
         case 3:     // e completely covers i
             i = _exclusions.erase(i);
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Justifier.cpp b/Build/source/libs/graphite2/graphite2-src/src/Justifier.cpp
index e75d7508f0d..e40e0290216 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Justifier.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Justifier.cpp
@@ -165,7 +165,7 @@ float Segment::justify(Slot *pSlot, const Font *font, float width, GR_MAYBE_UNUS
                     if (-pref > max) pref = -max;
                     else tWeight += w;
                 }
-                int actual = step ? int(pref / step) * step : int(pref);
+                int actual = int(pref / step) * step;
 
                 if (actual)
                 {
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/NameTable.cpp b/Build/source/libs/graphite2/graphite2-src/src/NameTable.cpp
index f83adb09cd8..f83adb09cd8 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/NameTable.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/NameTable.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Pass.cpp b/Build/source/libs/graphite2/graphite2-src/src/Pass.cpp
index 656c424fc76..f6d269931d6 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Pass.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Pass.cpp
@@ -126,7 +126,8 @@ bool Pass::readPass(const byte * const pass_start, size_t pass_length, size_t su
     if ( e.test(m_numTransition > m_numStates, E_BADNUMTRANS)
             || e.test(m_numSuccess > m_numStates, E_BADNUMSUCCESS)
             || e.test(m_numSuccess + m_numTransition < m_numStates, E_BADNUMSTATES)
-            || e.test(m_numRules && numRanges == 0, E_NORANGES))
+            || e.test(m_numRules && numRanges == 0, E_NORANGES)
+            || e.test(m_numColumns > 0x7FFF, E_BADNUMCOLUMNS))
         return face.error(e);
 
     m_successStart = m_numStates - m_numSuccess;
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Position.cpp b/Build/source/libs/graphite2/graphite2-src/src/Position.cpp
index 17247987591..17247987591 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Position.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Position.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCache.cpp b/Build/source/libs/graphite2/graphite2-src/src/SegCache.cpp
index b577efa270a..b577efa270a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/SegCache.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCacheEntry.cpp b/Build/source/libs/graphite2/graphite2-src/src/SegCacheEntry.cpp
index d35912d5aed..d35912d5aed 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCacheEntry.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/SegCacheEntry.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCacheStore.cpp b/Build/source/libs/graphite2/graphite2-src/src/SegCacheStore.cpp
index 236fb707ffa..236fb707ffa 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/SegCacheStore.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/SegCacheStore.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Segment.cpp b/Build/source/libs/graphite2/graphite2-src/src/Segment.cpp
index ddbc45fc46f..980f68c3cbc 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Segment.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Segment.cpp
@@ -57,7 +57,7 @@ Segment::Segment(unsigned int numchars, const Face* face, uint32 script, int tex
   m_passBits(m_silf->aPassBits() ? -1 : 0),
   m_defaultOriginal(0),
   m_dir(textDir),
-  m_flags(0)
+  m_flags(((m_silf->flags() & 0x20) != 0) << 1)
 {
     freeSlot(newSlot());
     m_bufSize = log_binary(numchars)+1;
@@ -72,6 +72,7 @@ Segment::~Segment()
     for (JustifyRope::iterator i = m_justifies.begin(); i != m_justifies.end(); ++i)
         free(*i);
     delete[] m_charinfo;
+    free(m_collisions);
 }
 
 #ifndef GRAPHITE2_NSEGCACHE
@@ -176,8 +177,13 @@ Slot *Segment::newSlot()
         if (m_face->logger()) ++numUser;
 #endif
         Slot *newSlots = grzeroalloc<Slot>(m_bufSize);
-        int16 *newAttrs = grzeroalloc<int16>(numUser * m_bufSize);
-        if (!newSlots || !newAttrs) return NULL;
+        int16 *newAttrs = grzeroalloc<int16>(m_bufSize * numUser);
+        if (!newSlots || !newAttrs)
+        {
+            free(newSlots);
+            free(newAttrs);
+            return NULL;
+        }
         for (size_t i = 0; i < m_bufSize; i++)
         {
             ::new (newSlots + i) Slot(newAttrs + i * numUser);
@@ -516,14 +522,10 @@ void Segment::doMirror(uint16 aMirror)
 
 bool Segment::initCollisions()
 {
-    if (m_collisions) free(m_collisions);
-    Slot *p = m_first;
-    m_collisions = gralloc<SlotCollision>(slotCount());
+    m_collisions = grzeroalloc<SlotCollision>(slotCount());
     if (!m_collisions) return false;
-    for (unsigned short i = 0; i < slotCount(); ++i)
-    {
-        ::new (m_collisions + p->index()) SlotCollision(this, p);
-        p = p->next();
-    }
+
+    for (Slot *p = m_first; p; p = p->next())
+        ::new (collisionInfo(p)) SlotCollision(this, p);
     return true;
 }
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Silf.cpp b/Build/source/libs/graphite2/graphite2-src/src/Silf.cpp
index a5a0efc75b3..adfad4029a0 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Silf.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Silf.cpp
@@ -394,7 +394,7 @@ bool Silf::runGraphite(Segment *seg, uint8 firstPass, uint8 lastPass, int dobidi
                             << json::close;
             }
 #endif
-            if (seg->currdir() != m_dir)
+            if (seg->currdir() != (m_dir & 1))
                 seg->reverseSlots();
             if (m_aMirror && (seg->dir() & 3) == 3)
                 seg->doMirror(m_aMirror);
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Slot.cpp b/Build/source/libs/graphite2/graphite2-src/src/Slot.cpp
index dd2a89bc9cd..551bec977e5 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Slot.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Slot.cpp
@@ -46,7 +46,7 @@ Slot::Slot(int16 *user_attrs) :
 }
 
 // take care, this does not copy any of the GrSlot pointer fields
-void Slot::set(const Slot & orig, int charOffset, size_t numUserAttr, size_t justLevels, size_t numChars)
+void Slot::set(const Slot & orig, int charOffset, size_t sizeAttr, size_t justLevels, size_t numChars)
 {
     // leave m_next and m_prev unchanged
     m_glyphid = orig.m_glyphid;
@@ -73,7 +73,7 @@ void Slot::set(const Slot & orig, int charOffset, size_t numUserAttr, size_t jus
     m_bidiCls = orig.m_bidiCls;
     m_bidiLevel = orig.m_bidiLevel;
     if (m_userAttr && orig.m_userAttr)
-        memcpy(m_userAttr, orig.m_userAttr, numUserAttr * sizeof(*m_userAttr));
+        memcpy(m_userAttr, orig.m_userAttr, sizeAttr * sizeof(*m_userAttr));
     if (m_justs && orig.m_justs)
         memcpy(m_justs, orig.m_justs, SlotJustify::size_of(justLevels));
 }
@@ -469,7 +469,11 @@ void Slot::setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph)
     }
     m_advance = Position(aGlyph->theAdvance().x, 0.);
     if (seg->silf()->aPassBits())
+    {
         seg->mergePassBits(theGlyph->attrs()[seg->silf()->aPassBits()]);
+        if (seg->silf()->numPasses() > 16)
+            seg->mergePassBits(theGlyph->attrs()[seg->silf()->aPassBits()+1] << 16);
+    }
 }
 
 void Slot::floodShift(Position adj)
@@ -501,7 +505,8 @@ Slot * Slot::nextInCluster(const Slot *s) const
         return s->nextSibling();
     while ((base = s->attachedTo()))
     {
-        if (base->firstChild() == s && base->nextSibling())
+        // if (base->firstChild() == s && base->nextSibling())
+        if (base->nextSibling())
             return base->nextSibling();
         s = base;
     }
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/Sparse.cpp b/Build/source/libs/graphite2/graphite2-src/src/Sparse.cpp
index aa43113669b..aa43113669b 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/Sparse.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/Sparse.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/TtfUtil.cpp b/Build/source/libs/graphite2/graphite2-src/src/TtfUtil.cpp
index 9248e9af879..90ced6aee6a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/TtfUtil.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/TtfUtil.cpp
@@ -852,11 +852,11 @@ const void * FindCmapSubtable(const void * pCmap, int nPlatformId, /* =3 */ int
             const uint8 * pRtn = reinterpret_cast<const uint8 *>(pCmap) + offset;
             if (length)
             {
-                if (offset + 2 > length) return NULL;
+                if (offset > length - 2) return NULL;
                 uint16 format = be::read<uint16>(pRtn);
                 if (format == 4)
                 {
-                    if (offset + 4 > length) return NULL;
+                    if (offset > length - 4) return NULL;
                     uint16 subTableLength = be::peek<uint16>(pRtn);
                     if (i + 1 == csuPlatforms)
                     {
@@ -868,7 +868,7 @@ const void * FindCmapSubtable(const void * pCmap, int nPlatformId, /* =3 */ int
                 }
                 if (format == 12)
                 {
-                    if (offset + 6 > length) return NULL;
+                    if (offset > length - 6) return NULL;
                     uint32 subTableLength = be::peek<uint32>(pRtn);
                     if (i + 1 == csuPlatforms)
                     {
@@ -952,7 +952,7 @@ gid16 CmapSubtable4Lookup(const void * pCmapSubtabel4, unsigned int nUnicodeId,
     uint16 nSeg = be::swap(pTable->seg_count_x2) >> 1;
   
     uint16 n;
-        const uint16 * pLeft, * pMid;
+    const uint16 * pLeft, * pMid;
     uint16 cMid, chStart, chEnd;
 
     if (rangeKey)
@@ -1210,7 +1210,7 @@ size_t LocaLookup(gid16 nGlyphId,
     // CheckTable verifies the index_to_loc_format is valid
     if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::ShortIndexLocFormat)
     { // loca entries are two bytes and have been divided by two
-        if (nGlyphId < (lLocaSize >> 1) - 1) // allow sentinel value to be accessed
+        if (lLocaSize > 1 && nGlyphId + 1u < lLocaSize >> 1) // allow sentinel value to be accessed
         {
             const uint16 * pShortTable = reinterpret_cast<const uint16 *>(pLoca);
             res = be::peek<uint16>(pShortTable + nGlyphId) << 1;
@@ -1220,7 +1220,7 @@ size_t LocaLookup(gid16 nGlyphId,
     }
     else if (be::swap(pTable->index_to_loc_format) == Sfnt::FontHeader::LongIndexLocFormat)
     { // loca entries are four bytes
-        if (nGlyphId < (lLocaSize >> 2) - 1)
+        if (lLocaSize > 3 && nGlyphId + 1u < lLocaSize >> 2)
         {
             const uint32 * pLongTable = reinterpret_cast<const uint32 *>(pLoca);
             res = be::peek<uint32>(pLongTable + nGlyphId);
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/UtfCodec.cpp b/Build/source/libs/graphite2/graphite2-src/src/UtfCodec.cpp
index d1db5fa11f1..d1db5fa11f1 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/UtfCodec.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/UtfCodec.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/call_machine.cpp b/Build/source/libs/graphite2/graphite2-src/src/call_machine.cpp
index e1d0ce5d2ff..e1d0ce5d2ff 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/call_machine.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/call_machine.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/direct_machine.cpp b/Build/source/libs/graphite2/graphite2-src/src/direct_machine.cpp
index b6b9ee04235..b6b9ee04235 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/direct_machine.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/direct_machine.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/files.mk b/Build/source/libs/graphite2/graphite2-src/src/files.mk
index fde83761c56..fde83761c56 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/files.mk
+++ b/Build/source/libs/graphite2/graphite2-src/src/files.mk
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_char_info.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_char_info.cpp
index ebcb68e593f..ebcb68e593f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_char_info.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_char_info.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_face.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_face.cpp
index fe1eb838207..fe1eb838207 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_face.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_face.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_features.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp
index 38cebb7b5db..38cebb7b5db 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_features.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_font.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_font.cpp
index ed70ab7381e..ed70ab7381e 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_font.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_font.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_logging.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_logging.cpp
index 3e453ba8e2c..3e453ba8e2c 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_logging.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_logging.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_segment.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_segment.cpp
index 0ab7a0854cc..0ab7a0854cc 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_segment.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_segment.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_slot.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_slot.cpp
index 0e41f6cb519..0e41f6cb519 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/gr_slot.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/gr_slot.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CachedFace.h b/Build/source/libs/graphite2/graphite2-src/src/inc/CachedFace.h
index 53674754ee2..53674754ee2 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CachedFace.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/CachedFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CharInfo.h b/Build/source/libs/graphite2/graphite2-src/src/inc/CharInfo.h
index d9e56eeed64..d9e56eeed64 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CharInfo.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/CharInfo.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CmapCache.h b/Build/source/libs/graphite2/graphite2-src/src/inc/CmapCache.h
index 7820c958b0e..7820c958b0e 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/CmapCache.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/CmapCache.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Code.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Code.h
index 02d09a109d6..02d09a109d6 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Code.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Code.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Collider.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
index bcbf3a22490..bcbf3a22490 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Collider.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Compression.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Compression.h
index 61351c416ea..61351c416ea 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Compression.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Compression.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Decompressor.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Decompressor.h
index 3d81864d108..3d81864d108 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Decompressor.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Decompressor.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Endian.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Endian.h
index fc84ec27898..fc84ec27898 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Endian.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Endian.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Error.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Error.h
index 899b44fd2c9..07d70b78e7b 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Error.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Error.h
@@ -115,6 +115,7 @@ enum errors {
     E_BADEMPTYPASS = 54,    // Can't have empty passes (no rules) except for collision passes
     E_BADSILFVERSION = 55,  // The Silf table has a bad version (probably too high)
     E_BADCOLLISIONPASS = 56,    // Collision flags set on a non positioning pass
+    E_BADNUMCOLUMNS = 57,   // Arbitrarily limit number of columns in fsm
 // Code errors
     E_CODEFAILURE = 60,     // Base code error. The following subcodes must align with Machine::Code::status_t in Code.h
     E_CODEALLOC = 61,       // Out of memory
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Face.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Face.h
index 7682dfaca3e..7682dfaca3e 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Face.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Face.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FeatureMap.h b/Build/source/libs/graphite2/graphite2-src/src/inc/FeatureMap.h
index fc845f6e165..fc845f6e165 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FeatureMap.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/FeatureMap.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FeatureVal.h b/Build/source/libs/graphite2/graphite2-src/src/inc/FeatureVal.h
index 5fbcf082063..5fbcf082063 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FeatureVal.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/FeatureVal.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FileFace.h b/Build/source/libs/graphite2/graphite2-src/src/inc/FileFace.h
index 81e501bab25..81e501bab25 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/FileFace.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/FileFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Font.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Font.h
index bc7084050e5..bc7084050e5 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Font.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Font.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/GlyphCache.h b/Build/source/libs/graphite2/graphite2-src/src/inc/GlyphCache.h
index cf7c2469c3c..cf7c2469c3c 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/GlyphCache.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/GlyphCache.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/GlyphFace.h b/Build/source/libs/graphite2/graphite2-src/src/inc/GlyphFace.h
index 89ed5aea91a..89ed5aea91a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/GlyphFace.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/GlyphFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Intervals.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Intervals.h
index 34fecce1795..34fecce1795 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Intervals.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Intervals.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/List.h b/Build/source/libs/graphite2/graphite2-src/src/inc/List.h
index 020560235c1..020560235c1 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/List.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/List.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Machine.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Machine.h
index 4efb70cd946..4efb70cd946 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Machine.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Machine.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Main.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Main.h
index 5c654691688..deeffcccd5a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Main.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Main.h
@@ -120,12 +120,26 @@ inline T max(const T a, const T b)
     void operator delete[] (void * p)throw() { free(p); } \
     void operator delete[] (void *, void *) throw() {}
 
-#ifdef __GNUC__
+#if defined(__GNUC__)  || defined(__clang__)
 #define GR_MAYBE_UNUSED __attribute__((unused))
 #else
 #define GR_MAYBE_UNUSED
 #endif
 
+#if defined(__clang__) && __cplusplus >= 201103L
+   /* clang's fallthrough annotations are only available starting in C++11. */
+    #define GR_FALLTHROUGH [[clang::fallthrough]]
+#elif defined(_MSC_VER)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+    #include <sal.h>
+    #define GR_FALLTHROUGH __fallthrough
+#else
+    #define GR_FALLTHROUGH /* fallthrough */
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(disable: 4800)
 #pragma warning(disable: 4355)
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/NameTable.h b/Build/source/libs/graphite2/graphite2-src/src/inc/NameTable.h
index 0fdbeb4d85f..0fdbeb4d85f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/NameTable.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/NameTable.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Pass.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Pass.h
index c8f1aa20ba5..c8f1aa20ba5 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Pass.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Pass.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Position.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Position.h
index 97bc1cdf7a8..97bc1cdf7a8 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Position.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Position.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Rule.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Rule.h
index 36c8d89a63d..36c8d89a63d 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Rule.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Rule.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCache.h b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCache.h
index b360f7c9337..b360f7c9337 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCache.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCache.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCacheEntry.h b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCacheEntry.h
index 9a7d930677c..9a7d930677c 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCacheEntry.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCacheEntry.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCacheStore.h b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCacheStore.h
index 1e6a6e216e7..1e6a6e216e7 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/SegCacheStore.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/SegCacheStore.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Segment.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Segment.h
index 056b0daea51..7d72f98eda4 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Segment.h
@@ -87,7 +87,8 @@ class Segment
 public:
 
     enum {
-        SEG_INITCOLLISIONS = 1
+        SEG_INITCOLLISIONS = 1,
+        SEG_HASCOLLISIONS = 2
     };
 
     unsigned int slotCount() const { return m_numGlyphs; }      //one slot per glyph
@@ -158,9 +159,8 @@ public:
     void reverseSlots();
 
     bool isWhitespace(const int cid) const;
-    bool hasCollisionInfo() const { return m_collisions != 0; }
-    SlotCollision *collisionInfo(const Slot *s) const { return m_collisions ? m_collisions + s->index() : NULL; }
-
+    bool hasCollisionInfo() const { return (m_flags & SEG_HASCOLLISIONS); }
+    SlotCollision *collisionInfo(const Slot *s) const { return m_collisions ? m_collisions + s->index() : 0; }
     CLASS_NEW_DELETE
 
 public:       //only used by: GrSegment* makeAndInitialize(const GrFont *font, const GrFace *face, uint32 script, const FeaturesHandle& pFeats/*must not be IsNull*/, encform enc, const void* pStart, size_t nChars, int dir);
@@ -178,7 +178,7 @@ private:
     Slot          * m_freeSlots;        // linked list of free slots
     SlotJustify   * m_freeJustifies;    // Slot justification blocks free list
     CharInfo      * m_charinfo;         // character info, one per input character
-    SlotCollision * m_collisions;       // Array of SlotCollisions for each slot
+    SlotCollision * m_collisions;
     const Face    * m_face;             // GrFace
     const Silf    * m_silf;
     Slot          * m_first;            // first slot in segment
@@ -197,7 +197,7 @@ int8 Segment::getSlotBidiClass(Slot *s) const
 {
     int8 res = s->getBidiClass();
     if (res != -1) return res;
-    res = glyphAttr(s->gid(), m_silf->aBidi());
+    res = int8(glyphAttr(s->gid(), m_silf->aBidi()));
     s->setBidiClass(res);
     return res;
 }
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Silf.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Silf.h
index 8e49f70c942..8e49f70c942 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Silf.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Silf.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Slot.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Slot.h
index a6e05491c6d..a6e05491c6d 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Slot.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Slot.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Sparse.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Sparse.h
index 2c9248f3272..4a8e3fa7d1f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/Sparse.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Sparse.h
@@ -127,6 +127,7 @@ sparse::sparse(I attr, const I last)
         return;
     }
 
+    // coverity[forward_null : FALSE] Since m_array is union and m_array.values is not NULL
     chunk * ci = m_array.map;
     ci->offset = (m_nchunks*sizeof(chunk) + sizeof(mapped_type)-1)/sizeof(mapped_type);
     mapped_type * vi = m_array.values + ci->offset;
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/TtfTypes.h b/Build/source/libs/graphite2/graphite2-src/src/inc/TtfTypes.h
index ea20e5775fc..ea20e5775fc 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/TtfTypes.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/TtfTypes.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/TtfUtil.h b/Build/source/libs/graphite2/graphite2-src/src/inc/TtfUtil.h
index 43ef2daa9ed..43ef2daa9ed 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/TtfUtil.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/TtfUtil.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/UtfCodec.h b/Build/source/libs/graphite2/graphite2-src/src/inc/UtfCodec.h
index c60ba41e72e..66384ae182a 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/UtfCodec.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/UtfCodec.h
@@ -131,9 +131,12 @@ public:
         bool toolong = false;
 
         switch(seq_sz) {
-            case 4:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong  = (u < 0x10); // no break
-            case 3:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x20); // no break
-            case 2:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x80); // no break
+            case 4:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong  = (u < 0x10); GR_FALLTHROUGH;
+                // no break
+            case 3:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x20); GR_FALLTHROUGH;
+                // no break
+            case 2:     u <<= 6; u |= *++cp & 0x3F; if (*cp >> 6 != 2) break; ++l; toolong |= (u < 0x80); GR_FALLTHROUGH;
+                // no break
             case 1:     break;
             case 0:     l = -1; return 0xFFFD;
         }
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/bits.h b/Build/source/libs/graphite2/graphite2-src/src/inc/bits.h
index 615c6cba67f..615c6cba67f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/bits.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/bits.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/debug.h b/Build/source/libs/graphite2/graphite2-src/src/inc/debug.h
index 97175eb2cc4..97175eb2cc4 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/debug.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/debug.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/json.h b/Build/source/libs/graphite2/graphite2-src/src/inc/json.h
index 90b8573d655..90b8573d655 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/json.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/json.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/locale2lcid.h b/Build/source/libs/graphite2/graphite2-src/src/inc/locale2lcid.h
index bc3e3d83047..bc3e3d83047 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/locale2lcid.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/locale2lcid.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/opcode_table.h b/Build/source/libs/graphite2/graphite2-src/src/inc/opcode_table.h
index 73a99c82043..73a99c82043 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/opcode_table.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/opcode_table.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/opcodes.h b/Build/source/libs/graphite2/graphite2-src/src/inc/opcodes.h
index ce87092b64f..ce87092b64f 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/inc/opcodes.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/opcodes.h
diff --git a/Build/source/libs/graphite2/graphite2-1.3.3/src/json.cpp b/Build/source/libs/graphite2/graphite2-src/src/json.cpp
index d6e5518a1c3..d6e5518a1c3 100644
--- a/Build/source/libs/graphite2/graphite2-1.3.3/src/json.cpp
+++ b/Build/source/libs/graphite2/graphite2-src/src/json.cpp
diff --git a/Build/source/libs/graphite2/version.ac b/Build/source/libs/graphite2/version.ac
index 5a151ce3b24..ed721a18c23 100644
--- a/Build/source/libs/graphite2/version.ac
+++ b/Build/source/libs/graphite2/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current graphite2 version
-m4_define([graphite2_version], [1.3.3])
+m4_define([graphite2_version], [1.3.5])