graphite2 1.2.1

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

95 files changed, 236 insertions, 167 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index e3ae771d18c..1989fbcc7fd 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -22,7 +22,7 @@ gd 2.0.35 - unchecked 10may12, libgd still down
   http://www.boutell.com/gd/
   https://bitbucket.org/pierrejoye/gd-libgd/overview
 
-graphite2 1.2.0 - checked 4dec12
+graphite2 1.2.1 - checked 7mar13
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 harfbuzz 0.9.13 - checked 27feb19
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index e722a758ce5..35edee406b5 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import graphite2-1.2.1.
+	* version.ac: Adjust.
+
 2013-01-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Allow subdir-objects.
diff --git a/Build/source/libs/graphite2/configure b/Build/source/libs/graphite2/configure
index 8d7af740dbb..bfcefac07d2 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 for TeX Live 1.2.0.
+# Generated by GNU Autoconf 2.69 for graphite2 for TeX Live 1.2.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='graphite2 for TeX Live'
 PACKAGE_TARNAME='graphite2-for-tex-live'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='graphite2 for TeX Live 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='graphite2 for TeX Live 1.2.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="graphite2-1.2.0/graphite2.pc.in"
+ac_unique_file="graphite2-1.2.1/graphite2.pc.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1339,7 +1339,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 for TeX Live 1.2.0 to adapt to many kinds of systems.
+\`configure' configures graphite2 for TeX Live 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1410,7 +1410,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of graphite2 for TeX Live 1.2.0:";;
+     short | recursive ) echo "Configuration of graphite2 for TeX Live 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-graphite2 for TeX Live configure 1.2.0
+graphite2 for TeX Live configure 1.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1923,7 +1923,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 for TeX Live $as_me 1.2.0, which was
+It was created by graphite2 for TeX Live $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3787,7 +3787,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='graphite2-for-tex-live'
- VERSION='1.2.0'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15983,7 +15983,7 @@ $as_echo "#define GRAPHITE2_NTRACING 1" >>confdefs.h
 
 fi
 
-GRAPHITE2_TREE=graphite2-1.2.0
+GRAPHITE2_TREE=graphite2-1.2.1
 
 
 ac_config_files="$ac_config_files Makefile include/graphite2/Makefile"
@@ -16551,7 +16551,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 for TeX Live $as_me 1.2.0, which was
+This file was extended by graphite2 for TeX Live $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16617,7 +16617,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 for TeX Live config.status 1.2.0
+graphite2 for TeX Live config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-01-case-sensitive b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-01-case-sensitive
deleted file mode 100644
index aa2986c38cf..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-01-case-sensitive
+++ /dev/null
@@ -1,14 +0,0 @@
-	Required for case-sensitive filesystems.
-
-diff -ur graphite2-1.2.0.orig/src/gr_logging.cpp graphite2-1.2.0/src/gr_logging.cpp
---- graphite2-1.2.0.orig/src/gr_logging.cpp	2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/gr_logging.cpp	2012-12-04 12:19:51.657709606 +0100
-@@ -33,7 +33,7 @@
- #include "inc/Segment.h"
- 
- #if defined _WIN32
--#include "Windows.h"
-+#include "windows.h"
- #endif
- 
- using namespace graphite2;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-02-attribute-hot b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-02-attribute-hot
deleted file mode 100644
index 1eaa4a69d4e..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-02-attribute-hot
+++ /dev/null
@@ -1,14 +0,0 @@
-	The attribute requires in gcc-4.3 or better.
-
-diff -ur graphite2-1.2.0.orig/src/inc/Machine.h graphite2-1.2.0/src/inc/Machine.h
---- graphite2-1.2.0.orig/src/inc/Machine.h	2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Machine.h	2012-12-04 13:10:33.000000000 +0100
-@@ -36,7 +36,7 @@
- #include "inc/Main.h"
- 
- #if defined(__GNUC__)
--#if defined(__clang__)
-+#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__) < 403
- #define     HOT
- #if defined(__x86_64)
- #define     REGPARM(n)      __attribute__((regparm(n)))
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/.hg_archival.txt b/Build/source/libs/graphite2/graphite2-1.2.0/.hg_archival.txt
deleted file mode 100644
index 0e511bd458c..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.2.0/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: 999e2033695c3bcf2f65d611737ac9008805bd58
-node: 8d2a85a546653a795d39cab287a1965a785cfbf8
-branch: default
-latesttag: 1.2.0
-latesttagdistance: 1
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog
index 83602914a2a..52de1e7063e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported graphite2-1.2.1 source tree from:
+	  http://sourceforge.net/projects/silgraphite/files/graphite2/
+
+	* patch-02-attribute-hot (removed): Now in graphite2-1.2.1.
+	* patch-01-case-sensitive: Adapted.
+
 2012-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-03-old-gcc (removed): No longer needed since HarfBuzz
@@ -5,7 +13,7 @@
 
 2012-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	Imported graphite-1.2.0 source tree from:
+	Imported graphite2-1.2.0 source tree from:
 	  http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 	* patch-01-case-sensitive (new): Windows.h => windows.h.
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/TL-Changes b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/TL-Changes
index 21e4d312e90..e1c90c4155c 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/TL-Changes
+++ b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the graphite-1.2.0/ tree as obtained from:
+Changes applied to the graphite2-1.2.1/ tree as obtained from:
 	http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 Removed unused dirs:
diff --git a/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-01-case-sensitive b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-01-case-sensitive
new file mode 100644
index 00000000000..8aa3e1af313
--- /dev/null
+++ b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-01-case-sensitive
@@ -0,0 +1,14 @@
+	Required for case-sensitive filesystems.
+
+diff -ur graphite2-1.2.1.orig/src/gr_logging.cpp graphite2-1.2.1/src/gr_logging.cpp
+--- graphite2-1.2.1.orig/src/gr_logging.cpp	2013-02-27 20:32:04.000000000 +0100
++++ graphite2-1.2.1/src/gr_logging.cpp	2013-03-07 15:26:32.000000000 +0100
+@@ -33,7 +33,7 @@
+ #include "inc/Segment.h"
+ 
+ #if defined _WIN32
+-#include "Windows.h"
++#include "windows.h"
+ #endif
+ 
+ using namespace graphite2;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.1/.hg_archival.txt b/Build/source/libs/graphite2/graphite2-1.2.1/.hg_archival.txt
new file mode 100644
index 00000000000..039e20ac0da
--- /dev/null
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/.hg_archival.txt
@@ -0,0 +1,4 @@
+repo: 999e2033695c3bcf2f65d611737ac9008805bd58
+node: 9ca2c8c1469f6107cd366e4be2035ce0dfa09b65
+branch: default
+tag: 1.2.1
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/.hgeol b/Build/source/libs/graphite2/graphite2-1.2.1/.hgeol
index 5eb1fc19d0f..5eb1fc19d0f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/.hgeol
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/.hgeol
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/.hgignore b/Build/source/libs/graphite2/graphite2-1.2.1/.hgignore
index 5934da4b3c8..5934da4b3c8 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/.hgignore
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/.hgignore
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/.hgtags b/Build/source/libs/graphite2/graphite2-1.2.1/.hgtags
index 164d8ba9a73..164d8ba9a73 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/.hgtags
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/.hgtags
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/CMakeLists.txt b/Build/source/libs/graphite2/graphite2-1.2.1/CMakeLists.txt
index 043a9f4e8ec..c142371f063 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/CMakeLists.txt
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/CMakeLists.txt
@@ -63,7 +63,7 @@ if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
     add_subdirectory(gr2fonttest)
 endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
 
-set(version 2.1.0)
+set(version 3.0.1)
 set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 set(includedir ${CMAKE_INSTALL_PREFIX}/include)
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/COPYING b/Build/source/libs/graphite2/graphite2-1.2.1/COPYING
index d40f2d84587..d40f2d84587 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/COPYING
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/COPYING
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/ChangeLog b/Build/source/libs/graphite2/graphite2-1.2.1/ChangeLog
index 03629e97f80..f6cd4b369f0 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/ChangeLog
@@ -1,3 +1,10 @@
+1.2.1
+    . Bug fixes:
+        . Allow glyph reattachment
+        . Allow signed glyph attributes
+        . Various build problems with MacOS, old gcc versions, etc.
+        . Various overrun read errors fixed
+
 1.2.0
     . API Changes:
         . Added Windows friendly gr_start_logging and gr_stop_logging, now per face
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/Graphite.cmake b/Build/source/libs/graphite2/graphite2-1.2.1/Graphite.cmake
index b6fe7cfc66e..54f765aded7 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/Graphite.cmake
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/Graphite.cmake
@@ -32,11 +32,12 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _install_DIR)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0)
   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes)
-  GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
+  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(_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")
@@ -44,14 +45,18 @@ 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")
-  FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_age}.${_target_revision} ${_soname}.${_target_current} ${_soname}'\n\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")
+  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")
   FILE(APPEND ${_laname} "# The name of the static archive.\n")
   FILE(APPEND ${_laname} "old_library='${_target_static_lib}'\n\n")
   FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
   FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n")
   FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n")
   FILE(APPEND ${_laname} "weak_library_names=\n\n")
-  FILE(APPEND ${_laname} "# Version information for ${_laname}.\n")
+  FILE(APPEND ${_laname} "# Version information for ${_lanamewe}.\n")
   FILE(APPEND ${_laname} "current=${_target_current}\n")
   FILE(APPEND ${_laname} "age=${_target_age}\n")
   FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/LICENSE b/Build/source/libs/graphite2/graphite2-1.2.1/LICENSE
index 2d2d780e601..2d2d780e601 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/LICENSE
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/LICENSE
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/Todo.txt b/Build/source/libs/graphite2/graphite2-1.2.1/Todo.txt
index 52f7509f87a..52f7509f87a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/Todo.txt
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/Todo.txt
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/graphite2.pc.in b/Build/source/libs/graphite2/graphite2-1.2.1/graphite2.pc.in
index a4f19b39ce4..a4f19b39ce4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/graphite2.pc.in
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/graphite2.pc.in
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Font.h b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Font.h
index 39e4dcf7a19..7fc3e6ee8b7 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Font.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Font.h
@@ -30,7 +30,7 @@
 
 #define GR2_VERSION_MAJOR   1
 #define GR2_VERSION_MINOR   2
-#define GR2_VERSION_BUGFIX  0
+#define GR2_VERSION_BUGFIX  1
 
 #ifdef __cplusplus
 extern "C"
@@ -63,7 +63,7 @@ enum gr_face_options {
     /** Cache the lookup from code point to glyph ID at construction time */
     gr_face_cacheCmap = 4,
     /** Preload everything */
-    gr_face_preloadAll = 6
+    gr_face_preloadAll = gr_face_preloadGlyphs | gr_face_cacheCmap
 };
 
 /** Holds information about a particular Graphite silf table that has been loaded */
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Log.h b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Log.h
index d1c6f0fe36f..d1c6f0fe36f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Log.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Log.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Segment.h b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Segment.h
index 051c8ed7783..580f83763f9 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Segment.h
@@ -155,13 +155,22 @@ 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.
+  * 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
+  * > 0, then the value is this character's contribution to the overall breakweight after it.
+  * The overall breakweight between two characters is the maximum of the breakweight
+  * contributions from the characters either side of it. If a character makes no
+  * contribution to the breakweight on one side of it, the contribution is considered
+  * to be 0.
   * @param p Pointer to charinfo to return information on.
   */
 GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/);
 
 /** Returns the slot index that after this character is after in the slot stream
   *
+  * In effect each character is associated with a set of slots and this returns
+  * the index of the last slot in the segment this character is associated with.
+  *
   * @return after slot index between 0 and gr_seg_n_slots()
   * @param p Pointer to charinfo to return information on.
   */
@@ -169,6 +178,9 @@ GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/);
 
 /** Returns the slot index that before this character is before in the slot stream
   *
+  * In effect each character is associated with a set of slots and this returns
+  * the index of the first slot in the segment this character is associated with.
+  *
   * @return before slot index between 0 and gr_seg_n_slots()
   * @param p Pointer to charinfo to return information on.
   */
@@ -340,34 +352,42 @@ GR2_API float gr_slot_origin_Y(const gr_slot* p);
   *
   * @param p    Slot to give results for
   * @param face gr_face of the glyphs. May be NULL if unhinted advances used
-  * @param font gr_font to scale for pixel results. If NULL returns design units advance. If not NULL then returns pixel advance based on hinted or scaled glyph advances in the font. face must be passed for hinted advances to be used.
+  * @param font gr_font to scale for pixel results. If NULL returns design
+  *             units advance. If not NULL then returns pixel advance based
+  *             on hinted or scaled glyph advances in the font. face must be
+  *             passed for hinted advances to be used.
   */
 GR2_API float gr_slot_advance_X(const gr_slot* p, const gr_face* face, const gr_font *font);
 
 /** Returns the vertical advance for the glyph in the slot adjusted for kerning
   *
-  * Returns design units unless font is not NULL in which case the pixel value is returned scaled for the given font
+  * Returns design units unless font is not NULL in which case the pixel value
+  * is returned scaled for the given font
   */
 GR2_API float gr_slot_advance_Y(const gr_slot* p, const gr_face* face, const gr_font *font);
 
 /** Returns the gr_char_info index before us
   *
   * Returns the index of the gr_char_info that a cursor before this slot, would put
-  * an underlying cursor before.
+  * an underlying cursor before. This may also be interpretted as each slot holding
+  * a set of char_infos that it is associated with and this function returning the
+  * index of the char_info with lowest index, from this set.
   */
 GR2_API int gr_slot_before(const gr_slot* p/*not NULL*/);
 
 /** Returns the gr_char_info index after us
   *
   * Returns the index of the gr_char_info that a cursor after this slot would put an
-  * underlying cursor after.
+  * underlying cursor after. This may also be interpretted as each slot holding a set
+  * of char_infos that it is associated with and this function returning the index of
+  * the char_info with the highest index, from this set.
   */
 GR2_API int gr_slot_after(const gr_slot* p/*not NULL*/);
 
 /** Returns the index of this slot in the segment
   *
-  * Returns the index given to this slot during final positioning. This corresponds to the value returned br gr_cinfo_before()
-  * and gr_cinfo_after()
+  * Returns the index given to this slot during final positioning. This corresponds
+  * to the value returned br gr_cinfo_before() and gr_cinfo_after()
   */
 GR2_API unsigned int gr_slot_index(const gr_slot* p/*not NULL*/);
 
@@ -383,8 +403,8 @@ GR2_API int gr_slot_can_insert_before(const gr_slot* p);
 
 /** Returns the original gr_char_info index this slot refers to.
   *
-  * Each Slot has a gr_char_info that it originates from. This is that gr_char_info. The index is passed to gr_seg_cinfo(). This
-  * information is useful for testing.
+  * Each Slot has a gr_char_info that it originates from. This is that gr_char_info.
+  * The index is passed to gr_seg_cinfo(). This information is useful for testing.
   */
 GR2_API int gr_slot_original(const gr_slot* p/*not NULL*/);
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Types.h b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Types.h
index 268bee7a975..268bee7a975 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/include/graphite2/Types.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/include/graphite2/Types.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Bidi.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp
index b612a81e647..b612a81e647 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Bidi.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/CMakeLists.txt b/Build/source/libs/graphite2/graphite2-1.2.1/src/CMakeLists.txt
index 1b485463555..ef0f8a7b6dd 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/CMakeLists.txt
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/CMakeLists.txt
@@ -103,7 +103,7 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
 
 if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set_target_properties(graphite2 PROPERTIES 
-        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fdiagnostics-show-option -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
         LINK_FLAGS      "-nodefaultlibs" 
         LINKER_LANGUAGE C)
     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
@@ -119,7 +119,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 -fdiagnostics-show-option -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+        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"
         LINK_FLAGS      "-nodefaultlibs" 
         LINKER_LANGUAGE C)
     target_link_libraries(graphite2 c)
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/CachedFace.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/CachedFace.cpp
index 3642768854b..3642768854b 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/CachedFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/CachedFace.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/CmapCache.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/CmapCache.cpp
index c5e4be0366f..c5e4be0366f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/CmapCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/CmapCache.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Code.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Code.cpp
index 01f9d511e95..01f9d511e95 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Code.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Code.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Face.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Face.cpp
index 4566025de92..3428aeaccf4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Face.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Face.cpp
@@ -53,7 +53,7 @@ Face::Face(const void* appFaceHandle/*non-NULL*/, const gr_face_ops & ops)
   m_descent(0)
 {
     memset(&m_ops, 0, sizeof m_ops);
-    memcpy(&m_ops, &ops, std::min(sizeof m_ops, ops.size));
+    memcpy(&m_ops, &ops, min(sizeof m_ops, ops.size));
 }
 
 
@@ -91,7 +91,7 @@ bool Face::readGlyphs(uint32 faceOptions)
     	return false;
 
     if (faceOptions & gr_face_preloadGlyphs)
-        nameTable();        // preload the name table along with the glyphs, heh.
+        nameTable();        // preload the name table along with the glyphs.
 
     return true;
 }
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/FeatureMap.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/FeatureMap.cpp
index c625950b8a8..aa638d5cb4c 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/FeatureMap.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/FeatureMap.cpp
@@ -185,23 +185,23 @@ bool SillMap::readFace(const Face & face)
 bool SillMap::readSill(const Face & face)
 {
 	const Face::Table sill(face, TtfUtil::Tag::Sill);
-    const byte *pSill = sill;
+    const byte *p = sill;
 
-    if (!pSill) return true;
+    if (!p) return true;
     if (sill.size() < 12) return false;
-    if (be::read<uint32>(pSill) != 0x00010000UL) return false;
-    m_numLanguages = be::read<uint16>(pSill);
+    if (be::read<uint32>(p) != 0x00010000UL) return false;
+    m_numLanguages = be::read<uint16>(p);
     m_langFeats = new LangFeaturePair[m_numLanguages];
     if (!m_langFeats || !m_FeatureMap.m_numFeats) { m_numLanguages = 0; return true; }        //defensive
 
-    pSill += 6;     // skip the fast search
+    p += 6;     // skip the fast search
     if (sill.size() < m_numLanguages * 8U + 12) return false;
 
     for (int i = 0; i < m_numLanguages; i++)
     {
-        uint32 langid = be::read<uint32>(pSill);
-        uint16 numSettings = be::read<uint16>(pSill);
-        uint16 offset = be::read<uint16>(pSill);
+        uint32 langid = be::read<uint32>(p);
+        uint16 numSettings = be::read<uint16>(p);
+        uint16 offset = be::read<uint16>(p);
         if (offset + 8U * numSettings > sill.size() && numSettings > 0) return false;
         Features* feats = new Features(*m_FeatureMap.m_defaultFeatures);
         const byte *pLSet = sill + offset;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/FileFace.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/FileFace.cpp
index 1e37763fb6a..dc2f017ed00 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/FileFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/FileFace.cpp
@@ -25,20 +25,13 @@ License, as published by the Free Software Foundation, either version 2
 of the License or (at your option) any later version.
 */
 #include <cstring>
-//#include "graphite2/Segment.h"
-//#include "inc/CmapCache.h"
-//#include "inc/Endian.h"
 #include "inc/FileFace.h"
-//#include "inc/GlyphFace.h"
-//#include "inc/SegCacheStore.h"
-//#include "inc/Segment.h"
-//#include "inc/NameTable.h"
 
 
-using namespace graphite2;
-
 #ifndef GRAPHITE2_NFILEFACE
 
+using namespace graphite2;
+
 FileFace::FileFace(const char *filename)
 : _file(fopen(filename, "rb")),
   _file_len(0),
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Font.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Font.cpp
index b090bb0fa80..8860d3b58be 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Font.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Font.cpp
@@ -24,7 +24,6 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
 License, as published by the Free Software Foundation, either version 2
 of the License or (at your option) any later version.
 */
-#include <algorithm>
 #include "inc/Face.h"
 #include "inc/Font.h"
 #include "inc/GlyphCache.h"
@@ -39,7 +38,7 @@ Font::Font(float ppm, const Face & f, const void * appFontHandle, const gr_font_
 {
     memset(&m_ops, 0, sizeof m_ops);
     if (m_hinted)
-        memcpy(&m_ops, ops, std::min(sizeof m_ops, ops->size));
+        memcpy(&m_ops, ops, min(sizeof m_ops, ops->size));
     else
         m_ops.glyph_advance_x = &Face::default_glyph_advance;
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/GlyphCache.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/GlyphCache.cpp
index 7f304479281..457397b7505 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/GlyphCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/GlyphCache.cpp
@@ -24,8 +24,6 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
 License, as published by the Free Software Foundation, either version 2
 of the License or (at your option) any later version.
 */
-#include <algorithm>
-
 #include "graphite2/Font.h"
 
 #include "inc/Main.h"
@@ -175,17 +173,15 @@ const GlyphFace *GlyphCache::glyph(unsigned short glyphid) const      //result m
     {
         GlyphFace * g = new GlyphFace();
         if (g)  p = _glyph_loader->read_glyph(glyphid, *g);
+        if (!p)
+        {
+            delete g;
+            return *_glyphs;
+        }
     }
     return p;
 }
 
-uint16 GlyphCache::glyphAttr(uint16 gid, uint16 gattr) const
-{
-	const GlyphFace * p = glyphSafe(gid);
-
-	return p && gattr < _num_attrs ? p->attrs()[gattr] : 0;
-}
-
 
 
 GlyphCache::Loader::Loader(const Face & face, const bool dumb_font)
@@ -236,7 +232,7 @@ GlyphCache::Loader::Loader(const Face & face, const bool dumb_font)
                                        / (_long_fmt ? sizeof(uint32) : sizeof(uint16)) - 1;
 
         if (version != 0x00010000
-            || _num_attrs == 0 || _num_attrs > 0x1000  // is this hard limit appropriate?
+            || _num_attrs == 0 || _num_attrs > 0x3000  // is this hard limit appropriate?
             || _num_glyphs_graphics > _num_glyphs_attributes)
         {
             _head = Face::Table();
@@ -260,7 +256,7 @@ unsigned short int GlyphCache::Loader::units_per_em() const throw()
 inline
 unsigned short int GlyphCache::Loader::num_glyphs() const throw()
 {
-    return std::max(_num_glyphs_graphics, _num_glyphs_attributes);
+    return max(_num_glyphs_graphics, _num_glyphs_attributes);
 }
 
 inline
@@ -308,7 +304,7 @@ const GlyphFace * GlyphCache::Loader::read_glyph(unsigned short glyphid, GlyphFa
             gloce = be::peek<uint16>(gloc);
         }
 
-        if (glocs >= m_pGlat.size() && gloce > m_pGlat.size())
+        if (glocs >= m_pGlat.size() || gloce > m_pGlat.size())
             return 0;
 
         const uint32 glat_version = be::peek<uint32>(m_pGlat);
@@ -333,11 +329,8 @@ const GlyphFace * GlyphCache::Loader::read_glyph(unsigned short glyphid, GlyphFa
             new (&glyph) GlyphFace(bbox, advance, glat2_iterator(m_pGlat + glocs), glat2_iterator(m_pGlat + gloce));
         }
 
-        if (glyph.attrs().size() > _num_attrs)
-        {
-            glyph.~GlyphFace();
+        if (glyph.attrs().capacity() > _num_attrs)
             return 0;
-        }
     }
 
     return &glyph;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/GlyphFace.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/GlyphFace.cpp
index 9fc11b2157e..9fc11b2157e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/GlyphFace.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/GlyphFace.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Justifier.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Justifier.cpp
index fc667dca1ab..fc667dca1ab 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Justifier.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Justifier.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/NameTable.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/NameTable.cpp
index d29b92bc40e..d29b92bc40e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/NameTable.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/NameTable.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Pass.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Pass.cpp
index 51fabc8e8b0..a44648a85a6 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Pass.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Pass.cpp
@@ -275,16 +275,19 @@ bool Pass::readRanges(const byte * ranges, size_t num_ranges)
     memset(m_cols, 0xFF, m_numGlyphs * sizeof(uint16));
     for (size_t n = num_ranges; n; --n)
     {
-        const uint16 first = be::read<uint16>(ranges),
-                     last  = be::read<uint16>(ranges),
-                     col   = be::read<uint16>(ranges);
-        uint16 *p;
+        uint16     * ci     = m_cols + be::read<uint16>(ranges),
+                   * ci_end = m_cols + be::read<uint16>(ranges) + 1,
+                     col    = be::read<uint16>(ranges);
 
-        if (first > last || last >= m_numGlyphs || col >= m_sColumns)
+        if (ci >= ci_end || ci_end > m_cols+m_numGlyphs || col >= m_sColumns)
             return false;
 
-        for (p = m_cols + first; p <= m_cols + last; )
-            *p++ = col;
+        // A glyph must only belong to one column at a time
+        while (ci != ci_end && *ci == 0xffff)
+            *ci++ = col;
+
+        if (ci != ci_end)
+            return false;
     }
     return true;
 }
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Rule.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Rule.cpp
index afdab495f53..afdab495f53 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Rule.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Rule.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCache.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCache.cpp
index 446dfbec43f..446dfbec43f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCache.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCache.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCacheEntry.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCacheEntry.cpp
index 5e87646185a..5e87646185a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCacheEntry.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCacheEntry.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCacheStore.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCacheStore.cpp
index 236fb707ffa..236fb707ffa 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/SegCacheStore.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/SegCacheStore.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Segment.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Segment.cpp
index 8b54198b023..6893c31c9b1 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Segment.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Segment.cpp
@@ -139,14 +139,7 @@ void Segment::appendSlot(int id, int cid, int gid, int iFeats, size_t coffset)
     m_charinfo[id].feats(iFeats);
     m_charinfo[id].base(coffset);
     const GlyphFace * theGlyph = m_face->glyphs().glyphSafe(gid);
-    if (theGlyph)
-    {
-        m_charinfo[id].breakWeight(theGlyph->attrs()[m_silf->aBreak()]);
-    }
-    else
-    {
-        m_charinfo[id].breakWeight(0);
-    }
+    m_charinfo[id].breakWeight(theGlyph ? theGlyph->attrs()[m_silf->aBreak()] : 0);
     
     aSlot->child(NULL);
     aSlot->setGlyph(this, gid, theGlyph);
@@ -192,6 +185,13 @@ void Segment::freeSlot(Slot *aSlot)
 {
     if (m_last == aSlot) m_last = aSlot->prev();
     if (m_first == aSlot) m_first = aSlot->next();
+    if (aSlot->attachedTo())
+        aSlot->attachedTo()->removeChild(aSlot);
+    while (aSlot->firstChild())
+    {
+        aSlot->firstChild()->attachTo(NULL);
+        aSlot->removeChild(aSlot->firstChild());
+    }
     // reset the slot incase it is reused
     ::new (aSlot) Slot;
     memset(aSlot->userAttrs(), 0, m_silf->numUser() * sizeof(int16));
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Silf.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Silf.cpp
index 96d78e77549..53c13841937 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Silf.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Silf.cpp
@@ -133,8 +133,8 @@ bool Silf::readGraphite(const byte * const silf_start, size_t lSilf, const Face&
     be::skip<byte>(p);							// reserved
     if (p >= silf_end)   { releaseBuffers(); return false; }
     be::skip<uint32>(p, be::read<uint8>(p));	// don't use scriptTag array.
+    if (p + sizeof(uint16) + sizeof(uint32) >= silf_end)  { releaseBuffers(); return false; }
     m_gEndLine  = be::read<uint16>(p);          // lbGID
-    if (p >= silf_end)   { releaseBuffers(); return false; }
     const byte * o_passes = p,
                * const passes_start = silf_start + be::read<uint32>(p);
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Slot.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Slot.cpp
index f78fee73264..d7e07780942 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Slot.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Slot.cpp
@@ -144,7 +144,7 @@ Position Slot::finalise(const Segment *seg, const Font *font, Position & base, R
     return res;
 }
 
-uint32 Slot::clusterMetric(const Segment *seg, uint8 metric, uint8 attrLevel)
+int32 Slot::clusterMetric(const Segment *seg, uint8 metric, uint8 attrLevel)
 {
     Position base;
     Rect bbox = seg->theGlyphBBoxTemporary(gid());
@@ -247,7 +247,9 @@ void Slot::setAttr(Segment *seg, attrCode ind, uint8 subindex, int16 value, cons
         if (idx < map.size() && map[idx])
         {
             Slot *other = map[idx];
-            if (other != this && other->child(this))
+            if (other == this) break;
+            if (m_parent) m_parent->removeChild(this);
+            if (other->child(this))
             {
                 attachTo(other);
                 if (((seg->dir() & 1) != 0) ^ (idx > subindex))
@@ -345,6 +347,34 @@ bool Slot::sibling(Slot *ap)
     return true;
 }
 
+bool Slot::removeChild(Slot *ap)
+{
+    if (this == ap || !m_child) return false;
+    else if (ap == m_child)
+    {
+        Slot *nSibling = m_child->nextSibling();
+        m_child->sibling(NULL);
+        m_child = nSibling;
+        return true;
+    }
+    else
+        return m_child->removeSibling(ap);
+    return true;
+}
+
+bool Slot::removeSibling(Slot *ap)
+{
+    if (this == ap || !m_sibling) return false;
+    else if (ap == m_sibling)
+    {
+        m_sibling = m_sibling->nextSibling();
+        return true;
+    }
+    else
+        return m_sibling->removeSibling(ap);
+    return true;
+}
+
 void Slot::setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph)
 {
     m_glyphid = glyphid;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/Sparse.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Sparse.cpp
index 64675a2939d..a3eb52a1942 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/Sparse.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Sparse.cpp
@@ -39,15 +39,16 @@ sparse::~sparse() throw()
 
 sparse::mapped_type sparse::operator [] (const key_type k) const throw()
 {
-	const chunk & 		c = m_array.map[k/SIZEOF_CHUNK];
+    mapped_type         g = key_type(k/SIZEOF_CHUNK - m_nchunks) >> (sizeof k*8 - 1);
+	const chunk & 		c = m_array.map[g*k/SIZEOF_CHUNK];
 	const mask_t 		m = c.mask >> (SIZEOF_CHUNK - 1 - (k%SIZEOF_CHUNK));
-	const mapped_type   g = m & 1;
+	g *= m & 1;
 
 	return g*m_array.values[g*(c.offset + bit_set_count(m >> 1))];
 }
 
 
-size_t sparse::size() const throw()
+size_t sparse::capacity() const throw()
 {
 	size_t n = m_nchunks,
 		   s = 0;
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/TtfUtil.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/TtfUtil.cpp
index dbd1d5bb274..9ede99e9145 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/TtfUtil.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/TtfUtil.cpp
@@ -709,10 +709,8 @@ int PostLookup(const void * pPost, size_t lPostSize, const void * pMaxp,
 				if (be::swap(pTable2->glyph_name_index[nGlyphId]) == iPostName)
 					return nGlyphId;
 			}
-			return -1; // no glyph with this standard name
 		}
 
-		else
 		{ // did not match a standard name, search font specific names
 			size_t nStrSizeGoal = strlen(pPostName);
 			const char * pFirstGlyphName = reinterpret_cast<const char *>(
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/UtfCodec.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/UtfCodec.cpp
index ca3c0c0a700..ca3c0c0a700 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/UtfCodec.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/UtfCodec.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/call_machine.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/call_machine.cpp
index f06f43cbda3..f06f43cbda3 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/call_machine.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/call_machine.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/direct_machine.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/direct_machine.cpp
index 09709c30336..09709c30336 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/direct_machine.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/direct_machine.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/files.mk b/Build/source/libs/graphite2/graphite2-1.2.1/src/files.mk
index 358acef62df..358acef62df 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/files.mk
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/files.mk
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_char_info.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_char_info.cpp
index ebcb68e593f..ebcb68e593f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_char_info.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_char_info.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_face.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_face.cpp
index e0f24335522..e0f24335522 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_face.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_face.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_features.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_features.cpp
index 63c5564ffdd..63c5564ffdd 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_features.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_features.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_font.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_font.cpp
index 22e4ec9c157..22e4ec9c157 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_font.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_font.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_logging.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_logging.cpp
index 2fa6d128b1d..2fa6d128b1d 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_logging.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_logging.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_segment.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_segment.cpp
index 6eca66b4a0b..6eca66b4a0b 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_segment.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_segment.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_slot.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_slot.cpp
index c615e40ffe5..c615e40ffe5 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/gr_slot.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/gr_slot.cpp
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CachedFace.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CachedFace.h
index 53674754ee2..53674754ee2 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CachedFace.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CachedFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CharInfo.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CharInfo.h
index 2debaf73477..2debaf73477 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CharInfo.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CharInfo.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CmapCache.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CmapCache.h
index a7df78ea568..a7df78ea568 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/CmapCache.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/CmapCache.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Code.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Code.h
index d9539b0da24..d9539b0da24 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Code.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Code.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Endian.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Endian.h
index 16ff79f5519..16ff79f5519 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Endian.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Endian.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Face.h
index d84ea92fc07..d84ea92fc07 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Face.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FeatureMap.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FeatureMap.h
index ffc58c9b19a..dc5175c3054 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FeatureMap.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FeatureMap.h
@@ -25,9 +25,6 @@ License, as published by the Free Software Foundation, either version 2
 of the License or (at your option) any later version.
 */
 #pragma once
-// #include <cstring>
-// #include "graphite2/Types.h"
-//#include "graphite2/Font.h"
 #include "inc/Main.h"
 #include "inc/FeatureVal.h"
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FeatureVal.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FeatureVal.h
index 8c9298c76cf..8c9298c76cf 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FeatureVal.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FeatureVal.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FileFace.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FileFace.h
index 05e56d64543..05e56d64543 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/FileFace.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/FileFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Font.h
index 650bc7cd8c4..650bc7cd8c4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Font.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/GlyphCache.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/GlyphCache.h
index 4f000dca698..74457152916 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/GlyphCache.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/GlyphCache.h
@@ -48,13 +48,12 @@ public:
     GlyphCache(const Face & face, const uint32 face_options);
     ~GlyphCache();
 
-    size_t numGlyphs() const throw();
-    size_t numAttrs() const throw();
-    size_t unitsPerEm() const throw();
+    unsigned short  numGlyphs() const throw();
+    unsigned short  numAttrs() const throw();
+    unsigned short  unitsPerEm() const throw();
 
     const GlyphFace *glyph(unsigned short glyphid) const;      //result may be changed by subsequent call with a different glyphid
     const GlyphFace *glyphSafe(unsigned short glyphid) const;
-    uint16 glyphAttr(uint16 gid, uint16 gattr) const;
 
     CLASS_NEW_DELETE;
     
@@ -67,19 +66,19 @@ private:
 };
 
 inline
-size_t GlyphCache::numGlyphs() const throw()
+unsigned short GlyphCache::numGlyphs() const throw()
 {
     return _num_glyphs;
 }
 
 inline
-size_t GlyphCache::numAttrs() const throw()
+unsigned short GlyphCache::numAttrs() const throw()
 {
     return _num_attrs;
 }
 
 inline
-size_t GlyphCache::unitsPerEm() const throw()
+unsigned short  GlyphCache::unitsPerEm() const throw()
 {
     return _upem;
 }
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/GlyphFace.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/GlyphFace.h
index 89ed5aea91a..89ed5aea91a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/GlyphFace.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/GlyphFace.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/List.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/List.h
index f99036912d8..f99036912d8 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/List.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/List.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Machine.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Machine.h
index 72a7e761681..f6af44329fa 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Machine.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Machine.h
@@ -36,7 +36,7 @@ of the License or (at your option) any later version.
 #include "inc/Main.h"
 
 #if defined(__GNUC__)
-#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__) < 403
+#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ * 10) < 430
 #define     HOT
 #if defined(__x86_64)
 #define     REGPARM(n)      __attribute__((regparm(n)))
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Main.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Main.h
index 6ddaf37dfaf..674af80e854 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Main.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Main.h
@@ -56,6 +56,18 @@ template <typename T> T * grzeroalloc(size_t n)
     return reinterpret_cast<T*>(calloc(n, sizeof(T)));
 }
 
+template <typename T>
+inline T min(const T a, const T b)
+{
+    return a < b ? a : b;
+}
+
+template <typename T>
+inline T max(const T a, const T b)
+{
+    return a > b ? a : b;
+}
+
 } // namespace graphite2
 
 #define CLASS_NEW_DELETE \
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/NameTable.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/NameTable.h
index 0fdbeb4d85f..0fdbeb4d85f 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/NameTable.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/NameTable.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Pass.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Pass.h
index 64d071636d5..6554d937f0e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Pass.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Pass.h
@@ -56,7 +56,6 @@ private:
     int   	doAction(const vm::Machine::Code* codeptr, Slot * & slot_out, vm::Machine &) const;
     bool   	testPassConstraint(vm::Machine & m) const;
     bool   	testConstraint(const Rule & r, vm::Machine &) const;
-    bool   	readFSM(const byte* p, const byte*const pass_start, const size_t max_offset);
     bool   	readRules(const byte * rule_map, const size_t num_entries,
                      const byte *precontext, const uint16 * sort_key,
                      const uint16 * o_constraint, const byte *constraint_data, 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Position.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Position.h
index c6f1b755644..c6f1b755644 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Position.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Position.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Rule.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Rule.h
index 69442658e4d..69442658e4d 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Rule.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Rule.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCache.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCache.h
index ac09966589c..ac09966589c 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCache.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCache.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCacheEntry.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCacheEntry.h
index 9a7d930677c..9a7d930677c 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCacheEntry.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCacheEntry.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCacheStore.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCacheStore.h
index 1e6a6e216e7..1e6a6e216e7 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/SegCacheStore.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/SegCacheStore.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Segment.h
index a2ff6d08482..a36fb73d500 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Segment.h
@@ -123,8 +123,8 @@ public:
     int addFeatures(const Features& feats) { m_feats.push_back(feats); return m_feats.size() - 1; }
     uint32 getFeature(int index, uint8 findex) const { const FeatureRef* pFR=m_face->theSill().theFeatureMap().featureRef(findex); if (!pFR) return 0; else return pFR->getFeatureVal(m_feats[index]); }
     void dir(int8 val) { m_dir = val; }
-    uint16 glyphAttr(uint16 gid, uint16 gattr) const { return m_face->glyphs().glyphAttr(gid, gattr); }
-    uint16 getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel) const;
+    int16 glyphAttr(uint16 gid, uint16 gattr) const { const GlyphFace * p = m_face->glyphs().glyphSafe(gid); return p ? p->attrs()[gattr] : 0; }
+    int32 getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel) const;
     float glyphAdvance(uint16 gid) const { return m_face->glyphs().glyph(gid)->theAdvance().x; }
     const Rect &theGlyphBBoxTemporary(uint16 gid) const { return m_face->glyphs().glyph(gid)->theBBox(); }   //warning value may become invalid when another glyph is accessed
     Slot *findRoot(Slot *is) const { return is->attachedTo() ? findRoot(is->attachedTo()) : is; }
@@ -150,8 +150,8 @@ public:       //only used by: GrSegment* makeAndInitialize(const GrFont *font, c
 private:
     Rect            m_bbox;             // ink box of the segment
     Position        m_advance;          // whole segment advance
-    SlotRope        m_slots;            // std::vector of slot buffers
-    AttributeRope   m_userAttrs;        // std::vector of userAttrs buffers
+    SlotRope        m_slots;            // Vector of slot buffers
+    AttributeRope   m_userAttrs;        // Vector of userAttrs buffers
     JustifyRope     m_justifies;        // Slot justification info buffers
     FeatureList     m_feats;            // feature settings referenced by charinfos in this segment
     Slot          * m_freeSlots;        // linked list of free slots
@@ -181,7 +181,7 @@ void Segment::finalise(const Font *font)
 }
 
 inline
-uint16 Segment::getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel) const {
+int32 Segment::getGlyphMetric(Slot *iSlot, uint8 metric, uint8 attrLevel) const {
     if (attrLevel > 0)
     {
         Slot *is = findRoot(iSlot);
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Silf.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Silf.h
index 72459077708..652f084c8ec 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Silf.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Silf.h
@@ -78,7 +78,7 @@ public:
     uint16 findClassIndex(uint16 cid, uint16 gid) const;
     uint16 getClassGlyph(uint16 cid, unsigned int index) const;
     uint16 findPseudo(uint32 uid) const;
-    size_t numUser() const { return m_aUser; }
+    uint8 numUser() const { return m_aUser; }
     uint8 aPseudo() const { return m_aPseudo; }
     uint8 aBreak() const { return m_aBreak; }
     uint8 aMirror() const {return m_aMirror; }
@@ -86,11 +86,11 @@ public:
     uint8 positionPass() const { return m_pPass; }
     uint8 justificationPass() const { return m_jPass; }
     uint8 bidiPass() const { return m_bPass; }
-    size_t numPasses() const { return m_numPasses; }
-    size_t maxCompPerLig() const { return m_iMaxComp; }
-    size_t numClasses() const { return m_nClass; }
-    uint8 flags() const { return m_flags; }
-    size_t numJustLevels() const { return m_numJusts; }
+    uint8 numPasses() const { return m_numPasses; }
+    uint8 maxCompPerLig() const { return m_iMaxComp; }
+    uint16 numClasses() const { return m_nClass; }
+    byte  flags() const { return m_flags; }
+    uint8 numJustLevels() const { return m_numJusts; }
     Justinfo *justAttrs() const { return m_justs; }
     uint16 endLineGlyphid() const { return m_gEndLine; }
     const gr_faceinfo *silfInfo() const { return &m_silfinfo; }
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Slot.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Slot.h
index 285d7f10567..3f0c473889a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Slot.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Slot.h
@@ -125,7 +125,9 @@ public:
     bool child(Slot *ap);
     Slot* nextSibling() const { return m_sibling; }
     bool sibling(Slot *ap);
-    uint32 clusterMetric(const Segment* seg, uint8 metric, uint8 attrLevel);
+    bool removeChild(Slot *ap);
+    bool removeSibling(Slot *ap);
+    int32 clusterMetric(const Segment* seg, uint8 metric, uint8 attrLevel);
     void positionShift(Position a) { m_position += a; }
     void floodShift(Position adj);
     float just() const { return m_just; }
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Sparse.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Sparse.h
index 2eca5b6161c..bbe6bcfb95c 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Sparse.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/Sparse.h
@@ -33,7 +33,11 @@ of the License or (at your option) any later version.
 namespace graphite2 {
 
 
-
+// A read-only packed fast sparse array of uint16 with uint16 keys.
+// Like most container classes this has capacity and size properties and these
+// refer to the number of stored entries and the number of addressable entries
+// as normal. However due the sparse nature the capacity is always <= than the
+// size.
 class sparse
 {
 public:
@@ -64,6 +68,7 @@ public:
 	operator bool () const throw();
 	mapped_type 	operator [] (const key_type k) const throw();
 
+	size_t capacity() const throw();
 	size_t size()     const throw();
 
 	size_t _sizeof() const throw();
@@ -137,11 +142,16 @@ sparse::operator bool () const throw()
 	return m_array.map != 0;
 }
 
+inline
+size_t sparse::size() const throw()
+{
+    return m_nchunks*SIZEOF_CHUNK;
+}
 
 inline
 size_t sparse::_sizeof() const throw()
 {
-	return sizeof(sparse) + size()*sizeof(mapped_type) + m_nchunks*sizeof(chunk);
+	return sizeof(sparse) + capacity()*sizeof(mapped_type) + m_nchunks*sizeof(chunk);
 }
 
 } // namespace graphite2
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/TtfTypes.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/TtfTypes.h
index 49ffa39229e..49ffa39229e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/TtfTypes.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/TtfTypes.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/TtfUtil.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/TtfUtil.h
index 7fafb69cf29..7fafb69cf29 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/TtfUtil.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/TtfUtil.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/UtfCodec.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/UtfCodec.h
index 1a49179aafa..1a49179aafa 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/UtfCodec.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/UtfCodec.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/bits.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/bits.h
index aec2a005fed..56b2d10224e 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/bits.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/bits.h
@@ -26,6 +26,9 @@ of the License or (at your option) any later version.
 */
 #pragma once
 
+namespace graphite2
+{
+
 template<typename T>
 inline unsigned int bit_set_count(T v)
 {
@@ -72,16 +75,16 @@ inline unsigned int log_binary(T v)
 }
 
 template<typename T>
-inline T haszero(const T x)
+inline T has_zero(const T x)
 {
 	return (x - T(~T(0)/255)) & ~x & T(~T(0)/255*128);
 }
 
 template<typename T>
-inline T zerobytes(const T x, unsigned char n)
+inline T zero_bytes(const T x, unsigned char n)
 {
 	const T t = T(~T(0)/255*n);
-	return T((haszero(x^t) >> 7)*n);
+	return T((has_zero(x^t) >> 7)*n);
 }
 
-
+}
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/debug.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/debug.h
index 6c733c6a5a4..6c733c6a5a4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/debug.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/debug.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/json.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/json.h
index 80ff5b5cbf8..80ff5b5cbf8 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/json.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/json.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/locale2lcid.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/locale2lcid.h
index fc2d384b444..fc2d384b444 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/locale2lcid.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/locale2lcid.h
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/opcode_table.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/opcode_table.h
index efab472a207..06916f6c875 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/opcode_table.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/opcode_table.h
@@ -55,8 +55,8 @@ static const opcode_t opcode_table[] =
     {{do2(sub)},                                    0, "SUB"},
     {{do2(mul)},                                    0, "MUL"},
     {{do2(div_)},                                   0, "DIV"},
-    {{do2(min)},                                    0, "MIN"},
-    {{do2(max)},                                    0, "MAX"},
+    {{do2(min_)},                                   0, "MIN"},
+    {{do2(max_)},                                   0, "MAX"},
     {{do2(neg)},                                    0, "NEG"},
     {{do2(trunc8)},                                 0, "TRUNC8"},
     {{do2(trunc16)},                                0, "TRUNC16"},
@@ -114,7 +114,7 @@ static const opcode_t opcode_table[] =
     {{do_(put_glyph), NILOP},                       2, "PUT_GLYPH"},                // output_class output_class
     {{do2(push_glyph_attr)},                        3, "PUSH_GLYPH_ATTR"},          // gattrnum gattrnum slot
     {{do2(push_att_to_glyph_attr)},                 3, "PUSH_ATT_TO_GLYPH_ATTR"},   // gattrnum gattrnum slot
-    // private internal private opcodes for internal use only, comes after all other on disk opcodes.
+    // private opcodes for internal use only, comes after all other on disk opcodes.
     {{do_(temp_copy), NILOP},                       0, "TEMP_COPY"}
 };
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/opcodes.h b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/opcodes.h
index 6127c8ff359..835e89351ff 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/opcodes.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/inc/opcodes.h
@@ -132,12 +132,12 @@ STARTOP(div_)
     binop(/);
 ENDOP
 
-STARTOP(min)
+STARTOP(min_)
     const int32 a = pop(), b = *sp;
     if (a < b) *sp = a;
 ENDOP
 
-STARTOP(max)
+STARTOP(max_)
     const int32 a = pop(), b = *sp;
     if (a > b) *sp = a;
 ENDOP
@@ -443,7 +443,7 @@ STARTOP(push_glyph_attr_obs)
     const int           slot_ref   = int8(param[1]);
     slotref slot = slotat(slot_ref);
     if (slot)
-        push(seg.glyphAttr(slot->gid(), glyph_attr));
+        push(int32(seg.glyphAttr(slot->gid(), glyph_attr)));
 ENDOP
 
 STARTOP(push_glyph_metric)
@@ -477,7 +477,7 @@ STARTOP(push_att_to_gattr_obs)
     {
         slotref att = slot->attachedTo();
         if (att) slot = att;
-        push(seg.glyphAttr(slot->gid(), glyph_attr));
+        push(int32(seg.glyphAttr(slot->gid(), glyph_attr)));
     }
 ENDOP
 
@@ -491,7 +491,7 @@ STARTOP(push_att_to_glyph_metric)
     {
         slotref att = slot->attachedTo();
         if (att) slot = att;
-        push(seg.getGlyphMetric(slot, glyph_attr, attr_level));
+        push(int32(seg.getGlyphMetric(slot, glyph_attr, attr_level)));
     }
 ENDOP
 
@@ -616,7 +616,7 @@ STARTOP(push_glyph_attr)
     const int           slot_ref    = int8(param[2]);
     slotref slot = slotat(slot_ref);
     if (slot)
-        push(seg.glyphAttr(slot->gid(), glyph_attr));
+        push(int32(seg.glyphAttr(slot->gid(), glyph_attr)));
 ENDOP
 
 STARTOP(push_att_to_glyph_attr)
@@ -629,7 +629,7 @@ STARTOP(push_att_to_glyph_attr)
     {
         slotref att = slot->attachedTo();
         if (att) slot = att;
-        push(seg.glyphAttr(slot->gid(), glyph_attr));
+        push(int32(seg.glyphAttr(slot->gid(), glyph_attr)));
     }
 ENDOP
 
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/json.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/json.cpp
index c10037f3afe..c10037f3afe 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/json.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/json.cpp
diff --git a/Build/source/libs/graphite2/version.ac b/Build/source/libs/graphite2/version.ac
index d4a32558577..67fb56741f1 100644
--- a/Build/source/libs/graphite2/version.ac
+++ b/Build/source/libs/graphite2/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current graphite2 version
-m4_define([graphite2_version], [1.2.0])
+m4_define([graphite2_version], [1.2.1])