changeset 16535:467b3b7aeb1b

Merge
author ddehaven
date Fri, 20 Jan 2017 07:05:40 -0800
parents f1b7d60adc19 21c477f29e89
children d4150b065b15 82c5b8c63237 3b284913179c
files
diffstat 60 files changed, 4894 insertions(+), 3001 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -247,7 +247,7 @@
  * @destroy: callback to call when @data is not needed anymore.
  * @replace: whether to replace an existing data with the same key.
  *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -266,9 +266,9 @@
  * @blob: a blob.
  * @key: key for data to get.
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -284,7 +284,7 @@
  * hb_blob_make_immutable:
  * @blob: a blob.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -301,7 +301,7 @@
  * hb_blob_is_immutable:
  * @blob: a blob.
  *
- *
+ * 
  *
  * Return value: TODO
  *
@@ -318,7 +318,7 @@
  * hb_blob_get_length:
  * @blob: a blob.
  *
- *
+ * 
  *
  * Return value: the length of blob data in bytes.
  *
@@ -335,9 +335,9 @@
  * @blob: a blob.
  * @length: (out):
  *
+ * 
  *
- *
- * Returns: (transfer none) (array length=length):
+ * Returns: (transfer none) (array length=length): 
  *
  * Since: 0.9.2
  **/
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -34,397 +34,397 @@
 
 #line 36 "hb-buffer-deserialize-json.hh"
 static const unsigned char _deserialize_json_trans_keys[] = {
-        0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u,
-        48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u,
-        9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u,
-        120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u,
-        9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u,
+        0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 
+        48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 
+        9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, 
+        120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 
+        9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 
         65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 123u, 0u, 0u, 0
 };
 
 static const char _deserialize_json_key_spans[] = {
-        0, 115, 26, 7, 2, 1, 50, 49,
-        10, 117, 117, 117, 1, 50, 49, 10,
-        117, 117, 1, 1, 50, 49, 117, 117,
-        2, 1, 50, 49, 10, 117, 117, 1,
-        50, 49, 10, 117, 117, 1, 50, 49,
+        0, 115, 26, 7, 2, 1, 50, 49, 
+        10, 117, 117, 117, 1, 50, 49, 10, 
+        117, 117, 1, 1, 50, 49, 117, 117, 
+        2, 1, 50, 49, 10, 117, 117, 1, 
+        50, 49, 10, 117, 117, 1, 50, 49, 
         58, 89, 117, 117, 85, 115, 0
 };
 
 static const short _deserialize_json_index_offsets[] = {
-        0, 0, 116, 143, 151, 154, 156, 207,
-        257, 268, 386, 504, 622, 624, 675, 725,
-        736, 854, 972, 974, 976, 1027, 1077, 1195,
-        1313, 1316, 1318, 1369, 1419, 1430, 1548, 1666,
-        1668, 1719, 1769, 1780, 1898, 2016, 2018, 2069,
+        0, 0, 116, 143, 151, 154, 156, 207, 
+        257, 268, 386, 504, 622, 624, 675, 725, 
+        736, 854, 972, 974, 976, 1027, 1077, 1195, 
+        1313, 1316, 1318, 1369, 1419, 1430, 1548, 1666, 
+        1668, 1719, 1769, 1780, 1898, 2016, 2018, 2069, 
         2119, 2178, 2268, 2386, 2504, 2590, 2706
 };
 
 static const char _deserialize_json_indicies[] = {
-        0, 0, 0, 0, 0, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        0, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 2, 1, 3, 3, 3,
-        3, 3, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 3, 1, 4, 1,
-        5, 1, 6, 7, 1, 1, 8, 1,
-        9, 10, 1, 11, 1, 11, 11, 11,
-        11, 11, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 11, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 12, 1,
-        12, 12, 12, 12, 12, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 12,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 13, 1, 1, 14,
-        15, 15, 15, 15, 15, 15, 15, 15,
-        15, 1, 16, 17, 17, 17, 17, 17,
-        17, 17, 17, 17, 1, 18, 18, 18,
-        18, 18, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 18, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        19, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 20, 1, 21, 21, 21, 21, 21,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 21, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 3, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 22,
-        1, 18, 18, 18, 18, 18, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        18, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 19, 1, 1, 1,
-        17, 17, 17, 17, 17, 17, 17, 17,
-        17, 17, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 20, 1, 23,
-        1, 23, 23, 23, 23, 23, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        23, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 24, 1, 24, 24, 24, 24,
-        24, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 24, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        25, 1, 1, 26, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 1, 28, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        1, 30, 30, 30, 30, 30, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        30, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 31, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 32, 1, 30,
-        30, 30, 30, 30, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 30, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 31, 1, 1, 1, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 32, 1, 33, 1, 34,
-        1, 34, 34, 34, 34, 34, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        34, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 35, 1, 35, 35, 35, 35,
-        35, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 35, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 36, 37, 37, 37, 37,
-        37, 37, 37, 37, 37, 1, 38, 38,
-        38, 38, 38, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 38, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 39, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 40, 1, 38, 38, 38, 38,
-        38, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 38, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 39,
-        1, 1, 1, 41, 41, 41, 41, 41,
-        41, 41, 41, 41, 41, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        40, 1, 42, 43, 1, 44, 1, 44,
-        44, 44, 44, 44, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 44, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        45, 1, 45, 45, 45, 45, 45, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 45, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 46, 1,
-        1, 47, 48, 48, 48, 48, 48, 48,
-        48, 48, 48, 1, 49, 50, 50, 50,
-        50, 50, 50, 50, 50, 50, 1, 51,
-        51, 51, 51, 51, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 51, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 52, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 53, 1, 51, 51, 51,
-        51, 51, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 51, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        52, 1, 1, 1, 50, 50, 50, 50,
-        50, 50, 50, 50, 50, 50, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 53, 1, 54, 1, 54, 54, 54,
-        54, 54, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 54, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 55, 1,
-        55, 55, 55, 55, 55, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 55,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 56, 1, 1, 57,
-        58, 58, 58, 58, 58, 58, 58, 58,
-        58, 1, 59, 60, 60, 60, 60, 60,
-        60, 60, 60, 60, 1, 61, 61, 61,
-        61, 61, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 61, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        62, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 63, 1, 61, 61, 61, 61, 61,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 61, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 62, 1,
-        1, 1, 60, 60, 60, 60, 60, 60,
-        60, 60, 60, 60, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 63,
-        1, 64, 1, 64, 64, 64, 64, 64,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 64, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 65, 1, 65, 65,
-        65, 65, 65, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 65, 1, 66,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 67, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 1,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 1, 1, 1, 1, 1, 1,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 1, 70, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 71, 71,
-        1, 71, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 1, 1, 1, 1, 1,
-        1, 1, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 1, 1, 1, 1,
-        71, 1, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 71, 71, 71, 71,
-        71, 71, 71, 71, 1, 72, 72, 72,
-        72, 72, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 72, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        73, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 74, 1, 72, 72, 72, 72, 72,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 72, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 73, 1,
-        1, 1, 75, 75, 75, 75, 75, 75,
-        75, 75, 75, 75, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 74,
-        1, 76, 76, 76, 76, 76, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        76, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 77, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 78, 1, 0,
-        0, 0, 0, 0, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 0, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
+        0, 0, 0, 0, 0, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        0, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 2, 1, 3, 3, 3, 
+        3, 3, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 3, 1, 4, 1, 
+        5, 1, 6, 7, 1, 1, 8, 1, 
+        9, 10, 1, 11, 1, 11, 11, 11, 
+        11, 11, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 11, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 12, 1, 
+        12, 12, 12, 12, 12, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 12, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 13, 1, 1, 14, 
+        15, 15, 15, 15, 15, 15, 15, 15, 
+        15, 1, 16, 17, 17, 17, 17, 17, 
+        17, 17, 17, 17, 1, 18, 18, 18, 
+        18, 18, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 18, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        19, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 20, 1, 21, 21, 21, 21, 21, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 21, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 3, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 22, 
+        1, 18, 18, 18, 18, 18, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        18, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 19, 1, 1, 1, 
+        17, 17, 17, 17, 17, 17, 17, 17, 
+        17, 17, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 20, 1, 23, 
+        1, 23, 23, 23, 23, 23, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        23, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 24, 1, 24, 24, 24, 24, 
+        24, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 24, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        25, 1, 1, 26, 27, 27, 27, 27, 
+        27, 27, 27, 27, 27, 1, 28, 29, 
+        29, 29, 29, 29, 29, 29, 29, 29, 
+        1, 30, 30, 30, 30, 30, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        30, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 31, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 32, 1, 30, 
+        30, 30, 30, 30, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 30, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 31, 1, 1, 1, 29, 29, 
+        29, 29, 29, 29, 29, 29, 29, 29, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 32, 1, 33, 1, 34, 
+        1, 34, 34, 34, 34, 34, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        34, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 35, 1, 35, 35, 35, 35, 
+        35, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 35, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 36, 37, 37, 37, 37, 
+        37, 37, 37, 37, 37, 1, 38, 38, 
+        38, 38, 38, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 38, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 39, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 40, 1, 38, 38, 38, 38, 
+        38, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 38, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 39, 
+        1, 1, 1, 41, 41, 41, 41, 41, 
+        41, 41, 41, 41, 41, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        40, 1, 42, 43, 1, 44, 1, 44, 
+        44, 44, 44, 44, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 44, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        45, 1, 45, 45, 45, 45, 45, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 45, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 46, 1, 
+        1, 47, 48, 48, 48, 48, 48, 48, 
+        48, 48, 48, 1, 49, 50, 50, 50, 
+        50, 50, 50, 50, 50, 50, 1, 51, 
+        51, 51, 51, 51, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 51, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 52, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 53, 1, 51, 51, 51, 
+        51, 51, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 51, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        52, 1, 1, 1, 50, 50, 50, 50, 
+        50, 50, 50, 50, 50, 50, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 53, 1, 54, 1, 54, 54, 54, 
+        54, 54, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 54, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 55, 1, 
+        55, 55, 55, 55, 55, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 55, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 56, 1, 1, 57, 
+        58, 58, 58, 58, 58, 58, 58, 58, 
+        58, 1, 59, 60, 60, 60, 60, 60, 
+        60, 60, 60, 60, 1, 61, 61, 61, 
+        61, 61, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 61, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        62, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 63, 1, 61, 61, 61, 61, 61, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 61, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 62, 1, 
+        1, 1, 60, 60, 60, 60, 60, 60, 
+        60, 60, 60, 60, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 63, 
+        1, 64, 1, 64, 64, 64, 64, 64, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 64, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 65, 1, 65, 65, 
+        65, 65, 65, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 65, 1, 66, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 67, 68, 68, 
+        68, 68, 68, 68, 68, 68, 68, 1, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 1, 1, 1, 1, 1, 1, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 69, 69, 69, 69, 69, 69, 
+        69, 69, 1, 70, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 71, 71, 
+        1, 71, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 1, 1, 1, 1, 1, 
+        1, 1, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 1, 1, 1, 1, 
+        71, 1, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 71, 71, 71, 71, 
+        71, 71, 71, 71, 1, 72, 72, 72, 
+        72, 72, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 72, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        73, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 74, 1, 72, 72, 72, 72, 72, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 72, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 73, 1, 
+        1, 1, 75, 75, 75, 75, 75, 75, 
+        75, 75, 75, 75, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 74, 
+        1, 76, 76, 76, 76, 76, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        76, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 77, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 78, 1, 0, 
+        0, 0, 0, 0, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 0, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
         1, 2, 1, 1, 0
 };
 
 static const char _deserialize_json_trans_targs[] = {
-        1, 0, 2, 2, 3, 4, 18, 24,
-        37, 5, 12, 6, 7, 8, 9, 11,
-        9, 11, 10, 2, 44, 10, 44, 13,
-        14, 15, 16, 17, 16, 17, 10, 2,
-        44, 19, 20, 21, 22, 23, 10, 2,
-        44, 23, 25, 31, 26, 27, 28, 29,
-        30, 29, 30, 10, 2, 44, 32, 33,
-        34, 35, 36, 35, 36, 10, 2, 44,
-        38, 39, 40, 42, 43, 41, 10, 41,
+        1, 0, 2, 2, 3, 4, 18, 24, 
+        37, 5, 12, 6, 7, 8, 9, 11, 
+        9, 11, 10, 2, 44, 10, 44, 13, 
+        14, 15, 16, 17, 16, 17, 10, 2, 
+        44, 19, 20, 21, 22, 23, 10, 2, 
+        44, 23, 25, 31, 26, 27, 28, 29, 
+        30, 29, 30, 10, 2, 44, 32, 33, 
+        34, 35, 36, 35, 36, 10, 2, 44, 
+        38, 39, 40, 42, 43, 41, 10, 41, 
         10, 2, 44, 43, 44, 45, 46
 };
 
 static const char _deserialize_json_trans_actions[] = {
-        0, 0, 1, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 2, 2, 2,
-        0, 0, 3, 3, 4, 0, 5, 0,
-        0, 2, 2, 2, 0, 0, 6, 6,
-        7, 0, 0, 0, 2, 2, 8, 8,
-        9, 0, 0, 0, 0, 0, 2, 2,
-        2, 0, 0, 10, 10, 11, 0, 0,
-        2, 2, 2, 0, 0, 12, 12, 13,
-        0, 0, 0, 2, 2, 2, 14, 0,
+        0, 0, 1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 2, 2, 2, 
+        0, 0, 3, 3, 4, 0, 5, 0, 
+        0, 2, 2, 2, 0, 0, 6, 6, 
+        7, 0, 0, 0, 2, 2, 8, 8, 
+        9, 0, 0, 0, 0, 0, 2, 2, 
+        2, 0, 0, 10, 10, 11, 0, 0, 
+        2, 2, 2, 0, 0, 12, 12, 13, 
+        0, 0, 0, 2, 2, 2, 14, 0, 
         15, 15, 16, 0, 0, 0, 0
 };
 
@@ -461,7 +461,7 @@
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
-
+  
 #line 466 "hb-buffer-deserialize-json.hh"
         {
         cs = deserialize_json_start;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -34,274 +34,274 @@
 
 #line 36 "hb-buffer-deserialize-text.hh"
 static const unsigned char _deserialize_text_trans_keys[] = {
-        0u, 0u, 9u, 122u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u,
-        48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 9u, 124u, 9u, 124u, 0u, 0u,
-        9u, 122u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u,
+        0u, 0u, 9u, 122u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u, 
+        48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 9u, 124u, 9u, 124u, 0u, 0u, 
+        9u, 122u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 
         9u, 124u, 9u, 124u, 9u, 124u, 0
 };
 
 static const char _deserialize_text_key_spans[] = {
-        0, 114, 13, 10, 13, 10, 10, 13,
-        10, 1, 13, 10, 14, 116, 116, 0,
-        114, 116, 116, 116, 116, 116, 116, 116,
+        0, 114, 13, 10, 13, 10, 10, 13, 
+        10, 1, 13, 10, 14, 116, 116, 0, 
+        114, 116, 116, 116, 116, 116, 116, 116, 
         116, 116, 116
 };
 
 static const short _deserialize_text_index_offsets[] = {
-        0, 0, 115, 129, 140, 154, 165, 176,
-        190, 201, 203, 217, 228, 243, 360, 477,
-        478, 593, 710, 827, 944, 1061, 1178, 1295,
+        0, 0, 115, 129, 140, 154, 165, 176, 
+        190, 201, 203, 217, 228, 243, 360, 477, 
+        478, 593, 710, 827, 944, 1061, 1178, 1295, 
         1412, 1529, 1646
 };
 
 static const char _deserialize_text_indicies[] = {
-        0, 0, 0, 0, 0, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        0, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        2, 3, 3, 3, 3, 3, 3, 3,
-        3, 3, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 1, 5, 1, 1, 6,
-        7, 7, 7, 7, 7, 7, 7, 7,
-        7, 1, 8, 9, 9, 9, 9, 9,
-        9, 9, 9, 9, 1, 10, 1, 1,
-        11, 12, 12, 12, 12, 12, 12, 12,
-        12, 12, 1, 13, 14, 14, 14, 14,
-        14, 14, 14, 14, 14, 1, 15, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        1, 17, 1, 1, 18, 19, 19, 19,
-        19, 19, 19, 19, 19, 19, 1, 20,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 1, 22, 1, 23, 1, 1, 24,
-        25, 25, 25, 25, 25, 25, 25, 25,
-        25, 1, 26, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 1, 22, 1, 1,
-        1, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 1, 28, 28, 28, 28,
-        28, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 28, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 29, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        30, 1, 1, 31, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        32, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 33,
-        1, 34, 34, 34, 34, 34, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        34, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 35, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 36, 1, 1, 0,
-        0, 0, 0, 0, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 0, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 2, 3,
-        3, 3, 3, 3, 3, 3, 3, 3,
-        1, 1, 1, 1, 1, 1, 1, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 1, 1, 1, 1, 1, 1, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4,
-        4, 1, 28, 28, 28, 28, 28, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 28, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 29, 1, 1, 1,
-        1, 37, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 1, 1, 1, 30, 1,
-        1, 31, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 32, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 33, 1, 38,
-        38, 38, 38, 38, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 38, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 39, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 40, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 41, 1, 42, 42, 42, 42,
-        42, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 42, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        43, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 44,
-        1, 42, 42, 42, 42, 42, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        42, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        14, 14, 14, 14, 14, 14, 14, 14,
-        14, 14, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 43, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 44, 1, 38, 38,
-        38, 38, 38, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 38, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 39, 1, 1, 1, 9, 9, 9,
-        9, 9, 9, 9, 9, 9, 9, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 40, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 41, 1, 45, 45, 45, 45, 45,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 45, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 46, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 47, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 48,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 49, 1,
-        50, 50, 50, 50, 50, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 50,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 51, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 52, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 53, 1, 50, 50, 50,
-        50, 50, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 50, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 51,
-        1, 1, 1, 1, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 52, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        53, 1, 45, 45, 45, 45, 45, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 45, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 46, 1, 1, 1,
-        1, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 1, 1, 1, 1, 1,
-        1, 47, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 48, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 49, 1, 28,
-        28, 28, 28, 28, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 28, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 29, 1, 55, 55, 1, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        1, 1, 1, 30, 1, 1, 31, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 1, 1, 32, 1, 55, 1, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
+        0, 0, 0, 0, 0, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        0, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        2, 3, 3, 3, 3, 3, 3, 3, 
+        3, 3, 1, 1, 1, 1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 1, 1, 1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 1, 5, 1, 1, 6, 
+        7, 7, 7, 7, 7, 7, 7, 7, 
+        7, 1, 8, 9, 9, 9, 9, 9, 
+        9, 9, 9, 9, 1, 10, 1, 1, 
+        11, 12, 12, 12, 12, 12, 12, 12, 
+        12, 12, 1, 13, 14, 14, 14, 14, 
+        14, 14, 14, 14, 14, 1, 15, 16, 
+        16, 16, 16, 16, 16, 16, 16, 16, 
+        1, 17, 1, 1, 18, 19, 19, 19, 
+        19, 19, 19, 19, 19, 19, 1, 20, 
+        21, 21, 21, 21, 21, 21, 21, 21, 
+        21, 1, 22, 1, 23, 1, 1, 24, 
+        25, 25, 25, 25, 25, 25, 25, 25, 
+        25, 1, 26, 27, 27, 27, 27, 27, 
+        27, 27, 27, 27, 1, 22, 1, 1, 
+        1, 21, 21, 21, 21, 21, 21, 21, 
+        21, 21, 21, 1, 28, 28, 28, 28, 
+        28, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 28, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 29, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        30, 1, 1, 31, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        32, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 33, 
+        1, 34, 34, 34, 34, 34, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        34, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 35, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 36, 1, 1, 0, 
+        0, 0, 0, 0, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 0, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 2, 3, 
+        3, 3, 3, 3, 3, 3, 3, 3, 
+        1, 1, 1, 1, 1, 1, 1, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 1, 1, 1, 1, 1, 1, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 4, 4, 4, 4, 4, 4, 4, 
+        4, 1, 28, 28, 28, 28, 28, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 28, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 29, 1, 1, 1, 
+        1, 37, 37, 37, 37, 37, 37, 37, 
+        37, 37, 37, 1, 1, 1, 30, 1, 
+        1, 31, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 32, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 33, 1, 38, 
+        38, 38, 38, 38, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 38, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 39, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 40, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 41, 1, 42, 42, 42, 42, 
+        42, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 42, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        43, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 44, 
+        1, 42, 42, 42, 42, 42, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        42, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        14, 14, 14, 14, 14, 14, 14, 14, 
+        14, 14, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 43, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 44, 1, 38, 38, 
+        38, 38, 38, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 38, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 39, 1, 1, 1, 9, 9, 9, 
+        9, 9, 9, 9, 9, 9, 9, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 40, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 41, 1, 45, 45, 45, 45, 45, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 45, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 46, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 47, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 48, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 49, 1, 
+        50, 50, 50, 50, 50, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 50, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 51, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 52, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 53, 1, 50, 50, 50, 
+        50, 50, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 50, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 51, 
+        1, 1, 1, 1, 27, 27, 27, 27, 
+        27, 27, 27, 27, 27, 27, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 52, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        53, 1, 45, 45, 45, 45, 45, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 45, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 46, 1, 1, 1, 
+        1, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 1, 1, 1, 1, 1, 
+        1, 47, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 48, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 49, 1, 28, 
+        28, 28, 28, 28, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 28, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 29, 1, 55, 55, 1, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        1, 1, 1, 30, 1, 1, 31, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 1, 1, 32, 1, 55, 1, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
         55, 1, 33, 1, 0
 };
 
 static const char _deserialize_text_trans_targs[] = {
-        1, 0, 13, 17, 26, 3, 18, 21,
-        18, 21, 5, 19, 20, 19, 20, 22,
-        25, 8, 9, 12, 9, 12, 10, 11,
-        23, 24, 23, 24, 14, 2, 6, 7,
-        15, 16, 14, 15, 16, 17, 14, 4,
-        15, 16, 14, 15, 16, 14, 2, 7,
+        1, 0, 13, 17, 26, 3, 18, 21, 
+        18, 21, 5, 19, 20, 19, 20, 22, 
+        25, 8, 9, 12, 9, 12, 10, 11, 
+        23, 24, 23, 24, 14, 2, 6, 7, 
+        15, 16, 14, 15, 16, 17, 14, 4, 
+        15, 16, 14, 15, 16, 14, 2, 7, 
         15, 16, 14, 2, 15, 16, 25, 26
 };
 
 static const char _deserialize_text_trans_actions[] = {
-        0, 0, 1, 1, 1, 2, 2, 2,
-        0, 0, 2, 2, 2, 0, 0, 2,
-        2, 2, 2, 2, 0, 0, 3, 2,
-        2, 2, 0, 0, 4, 5, 5, 5,
-        4, 4, 0, 0, 0, 0, 6, 7,
-        6, 6, 8, 8, 8, 9, 10, 10,
+        0, 0, 1, 1, 1, 2, 2, 2, 
+        0, 0, 2, 2, 2, 0, 0, 2, 
+        2, 2, 2, 2, 0, 0, 3, 2, 
+        2, 2, 0, 0, 4, 5, 5, 5, 
+        4, 4, 0, 0, 0, 0, 6, 7, 
+        6, 6, 8, 8, 8, 9, 10, 10, 
         9, 9, 11, 12, 11, 11, 0, 0
 };
 
 static const char _deserialize_text_eof_actions[] = {
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 4, 0, 0,
-        0, 4, 6, 8, 8, 6, 9, 11,
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 4, 0, 0, 
+        0, 4, 6, 8, 8, 6, 9, 11, 
         11, 9, 4
 };
 
@@ -338,7 +338,7 @@
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
-
+  
 #line 343 "hb-buffer-deserialize-text.hh"
         {
         cs = deserialize_text_start;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -134,7 +134,7 @@
 #ifndef HB_NDEBUG
     unsigned int end = start + count;
     assert (end <= 8);
-    unsigned int bits = (1<<end) - (1<<start);
+    unsigned int bits = (1u<<end) - (1u<<start);
     assert (0 == (allocated_var_bits & bits));
     allocated_var_bits |= bits;
 #endif
@@ -144,7 +144,7 @@
 #ifndef HB_NDEBUG
     unsigned int end = start + count;
     assert (end <= 8);
-    unsigned int bits = (1<<end) - (1<<start);
+    unsigned int bits = (1u<<end) - (1u<<start);
     assert (bits == (allocated_var_bits & bits));
     allocated_var_bits &= ~bits;
 #endif
@@ -154,7 +154,7 @@
 #ifndef HB_NDEBUG
     unsigned int end = start + count;
     assert (end <= 8);
-    unsigned int bits = (1<<end) - (1<<start);
+    unsigned int bits = (1u<<end) - (1u<<start);
     assert (bits == (allocated_var_bits & bits));
 #endif
   }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -58,7 +58,7 @@
  * @str is a valid buffer serialization format, use
  * hb_buffer_serialize_list_formats() to get the list of supported formats.
  *
- * Return value:
+ * Return value: 
  * The parsed #hb_buffer_serialize_format_t.
  *
  * Since: 0.9.7
@@ -289,7 +289,7 @@
  * ## json
  * TODO.
  *
- * Return value:
+ * Return value: 
  * The number of serialized items.
  *
  * Since: 0.9.7
@@ -393,14 +393,14 @@
  * hb_buffer_deserialize_glyphs:
  * @buffer: an #hb_buffer_t buffer.
  * @buf: (array length=buf_len):
- * @buf_len:
+ * @buf_len: 
  * @end_ptr: (out):
- * @font:
- * @format:
+ * @font: 
+ * @format: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -703,7 +703,7 @@
 /**
  * hb_buffer_get_empty:
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -780,14 +780,14 @@
 /**
  * hb_buffer_set_user_data: (skip)
  * @buffer: an #hb_buffer_t.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -804,11 +804,11 @@
 /**
  * hb_buffer_get_user_data: (skip)
  * @buffer: an #hb_buffer_t.
- * @key:
+ * @key: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -858,9 +858,9 @@
 /**
  * hb_buffer_set_unicode_funcs:
  * @buffer: an #hb_buffer_t.
- * @unicode_funcs:
+ * @unicode_funcs: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -884,9 +884,9 @@
  * hb_buffer_get_unicode_funcs:
  * @buffer: an #hb_buffer_t.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1090,7 +1090,7 @@
  *
  * See hb_buffer_set_flags().
  *
- * Return value:
+ * Return value: 
  * The @buffer flags.
  *
  * Since: 0.9.7
@@ -1104,9 +1104,9 @@
 /**
  * hb_buffer_set_cluster_level:
  * @buffer: an #hb_buffer_t.
- * @cluster_level:
+ * @cluster_level: 
  *
- *
+ * 
  *
  * Since: 0.9.42
  **/
@@ -1124,9 +1124,9 @@
  * hb_buffer_get_cluster_level:
  * @buffer: an #hb_buffer_t.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.42
  **/
@@ -1165,7 +1165,7 @@
  *
  * See hb_buffer_set_replacement_codepoint().
  *
- * Return value:
+ * Return value: 
  * The @buffer replacement #hb_codepoint_t.
  *
  * Since: 0.9.31
@@ -1276,7 +1276,7 @@
  * Similar to hb_buffer_pre_allocate(), but clears any new items added at the
  * end.
  *
- * Return value:
+ * Return value: 
  * %true if @buffer memory allocation succeeded, %false otherwise.
  *
  * Since: 0.9.2
@@ -1786,7 +1786,7 @@
  * @user_data:
  * @destroy:
  *
- *
+ * 
  *
  * Since: 1.1.3
  **/
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -45,11 +45,11 @@
 
   inline bool get (unsigned int key, unsigned int *value)
   {
-    unsigned int k = key & ((1<<cache_bits)-1);
+    unsigned int k = key & ((1u<<cache_bits)-1);
     unsigned int v = values[k];
     if ((v >> value_bits) != (key >> cache_bits))
       return false;
-    *value = v & ((1<<value_bits)-1);
+    *value = v & ((1u<<value_bits)-1);
     return true;
   }
 
@@ -57,14 +57,14 @@
   {
     if (unlikely ((key >> key_bits) || (value >> value_bits)))
       return false; /* Overflows */
-    unsigned int k = key & ((1<<cache_bits)-1);
+    unsigned int k = key & ((1u<<cache_bits)-1);
     unsigned int v = ((key>>cache_bits)<<value_bits) | value;
     values[k] = v;
     return true;
   }
 
   private:
-  unsigned int values[1<<cache_bits];
+  unsigned int values[1u<<cache_bits];
 };
 
 typedef hb_cache_t<21, 16, 8> hb_cmap_cache_t;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -57,12 +57,12 @@
 
 /**
  * hb_tag_from_string:
- * @str: (array length=len) (element-type uint8_t):
- * @len:
+ * @str: (array length=len) (element-type uint8_t): 
+ * @len: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -87,10 +87,10 @@
 
 /**
  * hb_tag_to_string:
- * @tag:
- * @buf: (out caller-allocates) (array fixed-size=4) (element-type uint8_t):
+ * @tag: 
+ * @buf: (out caller-allocates) (array fixed-size=4) (element-type uint8_t): 
  *
- *
+ * 
  *
  * Since: 0.9.5
  **/
@@ -115,12 +115,12 @@
 
 /**
  * hb_direction_from_string:
- * @str: (array length=len) (element-type uint8_t):
- * @len:
+ * @str: (array length=len) (element-type uint8_t): 
+ * @len: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -143,11 +143,11 @@
 
 /**
  * hb_direction_to_string:
- * @direction:
+ * @direction: 
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -337,7 +337,7 @@
 /**
  * hb_language_get_default:
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
@@ -366,7 +366,7 @@
  *
  * Converts an ISO 15924 script tag to a corresponding #hb_script_t.
  *
- * Return value:
+ * Return value: 
  * An #hb_script_t corresponding to the ISO 15924 tag.
  *
  * Since: 0.9.2
@@ -415,7 +415,7 @@
  * corresponding #hb_script_t. Shorthand for hb_tag_from_string() then
  * hb_script_from_iso15924_tag().
  *
- * Return value:
+ * Return value: 
  * An #hb_script_t corresponding to the ISO 15924 tag.
  *
  * Since: 0.9.2
@@ -445,11 +445,11 @@
 
 /**
  * hb_script_get_horizontal_direction:
- * @script:
+ * @script: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -588,13 +588,13 @@
 
 /**
  * hb_version_atleast:
- * @major:
- * @minor:
- * @micro:
+ * @major: 
+ * @minor: 
+ * @micro: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.30
  **/
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -145,6 +145,22 @@
     DEBUG_MSG (CORETEXT, cg_font, "Font CTFontCreateWithGraphicsFont() failed");
     return NULL;
   }
+
+  /* crbug.com/576941 and crbug.com/625902 and the investigation in the latter
+   * bug indicate that the cascade list reconfiguration occasionally causes
+   * crashes in CoreText on OS X 10.9, thus let's skip this step on older
+   * operating system versions. Except for the emoji font, where _not_
+   * reconfiguring the cascade list causes CoreText crashes. For details, see
+   * crbug.com/549610 */
+  // 0x00070000 stands for "kCTVersionNumber10_10", see CoreText.h
+  if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() < 0x00070000) {
+    CFStringRef fontName = CTFontCopyPostScriptName (ct_font);
+    bool isEmojiFont = CFStringCompare (fontName, CFSTR("AppleColorEmoji"), 0) == kCFCompareEqualTo;
+    CFRelease (fontName);
+    if (!isEmojiFont)
+      return ct_font;
+  }
+
   CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, kCTFontURLAttribute);
 
   /* Create font copy with cascade list that has LastResort first; this speeds up CoreText
@@ -272,7 +288,9 @@
 hb_coretext_shaper_shape_plan_data_t *
 _hb_coretext_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan HB_UNUSED,
                                              const hb_feature_t *user_features HB_UNUSED,
-                                             unsigned int        num_user_features HB_UNUSED)
+                                             unsigned int        num_user_features HB_UNUSED,
+                                             const int          *coords HB_UNUSED,
+                                             unsigned int        num_coords HB_UNUSED)
 {
   return (hb_coretext_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
 }
@@ -717,7 +735,7 @@
       pchars[chars_len++] = 0xFFFDu;
     else {
       pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
-      pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
+      pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1u << 10) - 1));
     }
   }
 
@@ -1264,7 +1282,9 @@
 hb_coretext_aat_shaper_shape_plan_data_t *
 _hb_coretext_aat_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan HB_UNUSED,
                                              const hb_feature_t *user_features HB_UNUSED,
-                                             unsigned int        num_user_features HB_UNUSED)
+                                             unsigned int        num_user_features HB_UNUSED,
+                                             const int          *coords HB_UNUSED,
+                                             unsigned int        num_coords HB_UNUSED)
 {
   return (hb_coretext_aat_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
 }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -35,8 +35,6 @@
 #include "hb-ot-head-table.hh"
 #include "hb-ot-maxp-table.hh"
 
-#include "hb-cache-private.hh"
-
 #include <string.h>
 
 
@@ -70,10 +68,10 @@
 /**
  * hb_face_create_for_tables:
  * @reference_table_func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
+ * @user_data: 
+ * @destroy: 
  *
- *
+ * 
  *
  * Return value: (transfer full)
  *
@@ -150,10 +148,10 @@
 
 /**
  * hb_face_create: (Xconstructor)
- * @blob:
- * @index:
+ * @blob: 
+ * @index: 
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -185,7 +183,7 @@
 /**
  * hb_face_get_empty:
  *
- *
+ * 
  *
  * Return value: (transfer full)
  *
@@ -202,9 +200,9 @@
  * hb_face_reference: (skip)
  * @face: a face.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -218,7 +216,7 @@
  * hb_face_destroy: (skip)
  * @face: a face.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -248,14 +246,14 @@
 /**
  * hb_face_set_user_data: (skip)
  * @face: a face.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -272,9 +270,9 @@
 /**
  * hb_face_get_user_data: (skip)
  * @face: a face.
- * @key:
+ * @key: 
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
@@ -291,7 +289,7 @@
  * hb_face_make_immutable:
  * @face: a face.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -308,9 +306,9 @@
  * hb_face_is_immutable:
  * @face: a face.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -324,9 +322,9 @@
 /**
  * hb_face_reference_table:
  * @face: a face.
- * @tag:
+ * @tag: 
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -343,7 +341,7 @@
  * hb_face_reference_blob:
  * @face: a face.
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -358,9 +356,9 @@
 /**
  * hb_face_set_index:
  * @face: a face.
- * @index:
+ * @index: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -378,9 +376,9 @@
  * hb_face_get_index:
  * @face: a face.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -393,9 +391,9 @@
 /**
  * hb_face_set_upem:
  * @face: a face.
- * @upem:
+ * @upem: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -413,9 +411,9 @@
  * hb_face_get_upem:
  * @face: a face.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -437,9 +435,9 @@
 /**
  * hb_face_set_glyph_count:
  * @face: a face.
- * @glyph_count:
+ * @glyph_count: 
  *
- *
+ * 
  *
  * Since: 0.9.7
  **/
@@ -457,9 +455,9 @@
  * hb_face_get_glyph_count:
  * @face: a face.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -73,7 +73,9 @@
 hb_fallback_shaper_shape_plan_data_t *
 _hb_fallback_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan HB_UNUSED,
                                             const hb_feature_t *user_features HB_UNUSED,
-                                            unsigned int        num_user_features HB_UNUSED)
+                                            unsigned int        num_user_features HB_UNUSED,
+                                            const int          *coords HB_UNUSED,
+                                            unsigned int        num_coords HB_UNUSED)
 {
   return (hb_fallback_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
 }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -108,6 +108,10 @@
   unsigned int x_ppem;
   unsigned int y_ppem;
 
+  /* Font variation coordinates. */
+  unsigned int num_coords;
+  int *coords;
+
   hb_font_funcs_t   *klass;
   void              *user_data;
   hb_destroy_func_t  destroy;
@@ -116,8 +120,14 @@
 
 
   /* Convert from font-space to user-space */
-  inline hb_position_t em_scale_x (int16_t v) { return em_scale (v, this->x_scale); }
-  inline hb_position_t em_scale_y (int16_t v) { return em_scale (v, this->y_scale); }
+  inline int dir_scale (hb_direction_t direction)
+  { return HB_DIRECTION_IS_VERTICAL(direction) ? y_scale : x_scale; }
+  inline hb_position_t em_scale_x (int16_t v) { return em_scale (v, x_scale); }
+  inline hb_position_t em_scale_y (int16_t v) { return em_scale (v, y_scale); }
+  inline hb_position_t em_scalef_x (float v) { return em_scalef (v, this->x_scale); }
+  inline hb_position_t em_scalef_y (float v) { return em_scalef (v, this->y_scale); }
+  inline hb_position_t em_scale_dir (int16_t v, hb_direction_t direction)
+  { return em_scale (v, dir_scale (direction)); }
 
   /* Convert from parent-font user-space to our user-space */
   inline hb_position_t parent_scale_x_distance (hb_position_t v) {
@@ -292,24 +302,32 @@
 
   /* A bit higher-level, and with fallback */
 
+  inline void get_h_extents_with_fallback (hb_font_extents_t *extents)
+  {
+    if (!get_font_h_extents (extents))
+    {
+      extents->ascender = y_scale * .8;
+      extents->descender = extents->ascender - y_scale;
+      extents->line_gap = 0;
+    }
+  }
+  inline void get_v_extents_with_fallback (hb_font_extents_t *extents)
+  {
+    if (!get_font_v_extents (extents))
+    {
+      extents->ascender = x_scale / 2;
+      extents->descender = extents->ascender - x_scale;
+      extents->line_gap = 0;
+    }
+  }
+
   inline void get_extents_for_direction (hb_direction_t direction,
                                          hb_font_extents_t *extents)
   {
-    if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
-      if (!get_font_h_extents (extents))
-      {
-        extents->ascender = y_scale * .8;
-        extents->descender = y_scale - extents->ascender;
-        extents->line_gap = 0;
-      }
-    } else {
-      if (!get_font_v_extents (extents))
-      {
-        extents->ascender = x_scale / 2;
-        extents->descender = x_scale - extents->ascender;
-        extents->line_gap = 0;
-      }
-    }
+    if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
+      get_h_extents_with_fallback (extents);
+    else
+      get_v_extents_with_fallback (extents);
   }
 
   inline void get_glyph_advance_for_direction (hb_codepoint_t glyph,
@@ -325,14 +343,38 @@
     }
   }
 
-  /* Internal only */
   inline void guess_v_origin_minus_h_origin (hb_codepoint_t glyph,
                                              hb_position_t *x, hb_position_t *y)
   {
     *x = get_glyph_h_advance (glyph) / 2;
 
-    /* TODO use font_extents.ascender */
-    *y = y_scale;
+    /* TODO cache this somehow?! */
+    hb_font_extents_t extents;
+    get_h_extents_with_fallback (&extents);
+    *y = extents.ascender;
+  }
+
+  inline void get_glyph_h_origin_with_fallback (hb_codepoint_t glyph,
+                                                hb_position_t *x, hb_position_t *y)
+  {
+    if (!get_glyph_h_origin (glyph, x, y) &&
+         get_glyph_v_origin (glyph, x, y))
+    {
+      hb_position_t dx, dy;
+      guess_v_origin_minus_h_origin (glyph, &dx, &dy);
+      *x -= dx; *y -= dy;
+    }
+  }
+  inline void get_glyph_v_origin_with_fallback (hb_codepoint_t glyph,
+                                                hb_position_t *x, hb_position_t *y)
+  {
+    if (!get_glyph_v_origin (glyph, x, y) &&
+         get_glyph_h_origin (glyph, x, y))
+    {
+      hb_position_t dx, dy;
+      guess_v_origin_minus_h_origin (glyph, &dx, &dy);
+      *x += dx; *y += dy;
+    }
   }
 
   inline void get_glyph_origin_for_direction (hb_codepoint_t glyph,
@@ -340,25 +382,9 @@
                                               hb_position_t *x, hb_position_t *y)
   {
     if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
-    {
-      if (!get_glyph_h_origin (glyph, x, y) &&
-           get_glyph_v_origin (glyph, x, y))
-      {
-        hb_position_t dx, dy;
-        guess_v_origin_minus_h_origin (glyph, &dx, &dy);
-        *x -= dx; *y -= dy;
-      }
-    }
+      get_glyph_h_origin_with_fallback (glyph, x, y);
     else
-    {
-      if (!get_glyph_v_origin (glyph, x, y) &&
-           get_glyph_h_origin (glyph, x, y))
-      {
-        hb_position_t dx, dy;
-        guess_v_origin_minus_h_origin (glyph, &dx, &dy);
-        *x += dx; *y += dy;
-      }
-    }
+      get_glyph_v_origin_with_fallback (glyph, x, y);
   }
 
   inline void add_glyph_h_origin (hb_codepoint_t glyph,
@@ -366,7 +392,7 @@
   {
     hb_position_t origin_x, origin_y;
 
-    get_glyph_h_origin (glyph, &origin_x, &origin_y);
+    get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y);
 
     *x += origin_x;
     *y += origin_y;
@@ -376,7 +402,7 @@
   {
     hb_position_t origin_x, origin_y;
 
-    get_glyph_v_origin (glyph, &origin_x, &origin_y);
+    get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y);
 
     *x += origin_x;
     *y += origin_y;
@@ -398,7 +424,7 @@
   {
     hb_position_t origin_x, origin_y;
 
-    get_glyph_h_origin (glyph, &origin_x, &origin_y);
+    get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y);
 
     *x -= origin_x;
     *y -= origin_y;
@@ -408,7 +434,7 @@
   {
     hb_position_t origin_x, origin_y;
 
-    get_glyph_v_origin (glyph, &origin_x, &origin_y);
+    get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y);
 
     *x -= origin_x;
     *y -= origin_y;
@@ -504,7 +530,6 @@
     return false;
   }
 
-  private:
   inline hb_position_t em_scale (int16_t v, int scale)
   {
     int upem = face->get_upem ();
@@ -512,6 +537,10 @@
     scaled += scaled >= 0 ? upem/2 : -upem/2; /* Round. */
     return (hb_position_t) (scaled / upem);
   }
+  inline hb_position_t em_scalef (float v, int scale)
+  {
+    return (hb_position_t) (v * scale / face->get_upem ());
+  }
 };
 
 #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -35,8 +35,6 @@
 #include "hb-ot-head-table.hh"
 #include "hb-ot-maxp-table.hh"
 
-#include "hb-cache-private.hh"
-
 #include <string.h>
 
 
@@ -401,9 +399,9 @@
 /**
  * hb_font_funcs_create: (Xconstructor)
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  *
  * Since: 0.9.2
  **/
@@ -423,9 +421,9 @@
 /**
  * hb_font_funcs_get_empty:
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  *
  * Since: 0.9.2
  **/
@@ -439,9 +437,9 @@
  * hb_font_funcs_reference: (skip)
  * @ffuncs: font functions.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -455,7 +453,7 @@
  * hb_font_funcs_destroy: (skip)
  * @ffuncs: font functions.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -475,14 +473,14 @@
 /**
  * hb_font_funcs_set_user_data: (skip)
  * @ffuncs: font functions.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -499,11 +497,11 @@
 /**
  * hb_font_funcs_get_user_data: (skip)
  * @ffuncs: font functions.
- * @key:
+ * @key: 
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -519,7 +517,7 @@
  * hb_font_funcs_make_immutable:
  * @ffuncs: font functions.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -536,9 +534,9 @@
  * hb_font_funcs_is_immutable:
  * @ffuncs: font functions.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -629,13 +627,13 @@
 /**
  * hb_font_get_glyph:
  * @font: a font.
- * @unicode:
- * @variation_selector:
- * @glyph: (out):
+ * @unicode: 
+ * @variation_selector: 
+ * @glyph: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -652,12 +650,12 @@
 /**
  * hb_font_get_nominal_glyph:
  * @font: a font.
- * @unicode:
- * @glyph: (out):
+ * @unicode: 
+ * @glyph: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 1.2.3
  **/
@@ -672,13 +670,13 @@
 /**
  * hb_font_get_variation_glyph:
  * @font: a font.
- * @unicode:
- * @variation_selector:
- * @glyph: (out):
+ * @unicode: 
+ * @variation_selector: 
+ * @glyph: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 1.2.3
  **/
@@ -693,11 +691,11 @@
 /**
  * hb_font_get_glyph_h_advance:
  * @font: a font.
- * @glyph:
+ * @glyph: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -711,11 +709,11 @@
 /**
  * hb_font_get_glyph_v_advance:
  * @font: a font.
- * @glyph:
+ * @glyph: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -729,13 +727,13 @@
 /**
  * hb_font_get_glyph_h_origin:
  * @font: a font.
- * @glyph:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @x: (out): 
+ * @y: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -750,13 +748,13 @@
 /**
  * hb_font_get_glyph_v_origin:
  * @font: a font.
- * @glyph:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @x: (out): 
+ * @y: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -771,12 +769,12 @@
 /**
  * hb_font_get_glyph_h_kerning:
  * @font: a font.
- * @left_glyph:
- * @right_glyph:
+ * @left_glyph: 
+ * @right_glyph: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -790,12 +788,12 @@
 /**
  * hb_font_get_glyph_v_kerning:
  * @font: a font.
- * @top_glyph:
- * @bottom_glyph:
+ * @top_glyph: 
+ * @bottom_glyph: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -809,12 +807,12 @@
 /**
  * hb_font_get_glyph_extents:
  * @font: a font.
- * @glyph:
- * @extents: (out):
+ * @glyph: 
+ * @extents: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -829,14 +827,14 @@
 /**
  * hb_font_get_glyph_contour_point:
  * @font: a font.
- * @glyph:
- * @point_index:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @point_index: 
+ * @x: (out): 
+ * @y: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -851,13 +849,13 @@
 /**
  * hb_font_get_glyph_name:
  * @font: a font.
- * @glyph:
- * @name: (array length=size):
- * @size:
+ * @glyph: 
+ * @name: (array length=size): 
+ * @size: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -872,13 +870,13 @@
 /**
  * hb_font_get_glyph_from_name:
  * @font: a font.
- * @name: (array length=len):
- * @len:
- * @glyph: (out):
+ * @name: (array length=len): 
+ * @len: 
+ * @glyph: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -913,12 +911,12 @@
 /**
  * hb_font_get_glyph_advance_for_direction:
  * @font: a font.
- * @glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -934,12 +932,12 @@
 /**
  * hb_font_get_glyph_origin_for_direction:
  * @font: a font.
- * @glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -955,12 +953,12 @@
 /**
  * hb_font_add_glyph_origin_for_direction:
  * @font: a font.
- * @glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -976,12 +974,12 @@
 /**
  * hb_font_subtract_glyph_origin_for_direction:
  * @font: a font.
- * @glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -997,13 +995,13 @@
 /**
  * hb_font_get_glyph_kerning_for_direction:
  * @font: a font.
- * @first_glyph:
- * @second_glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @first_glyph: 
+ * @second_glyph: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1019,13 +1017,13 @@
 /**
  * hb_font_get_glyph_extents_for_origin:
  * @font: a font.
- * @glyph:
- * @direction:
- * @extents: (out):
+ * @glyph: 
+ * @direction: 
+ * @extents: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1041,15 +1039,15 @@
 /**
  * hb_font_get_glyph_contour_point_for_origin:
  * @font: a font.
- * @glyph:
- * @point_index:
- * @direction:
- * @x: (out):
- * @y: (out):
+ * @glyph: 
+ * @point_index: 
+ * @direction: 
+ * @x: (out): 
+ * @y: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1066,11 +1064,11 @@
 /**
  * hb_font_glyph_to_string:
  * @font: a font.
- * @glyph:
- * @s: (array length=size):
- * @size:
+ * @glyph: 
+ * @s: (array length=size): 
+ * @size: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1086,13 +1084,13 @@
 /**
  * hb_font_glyph_from_string:
  * @font: a font.
- * @s: (array length=len) (element-type uint8_t):
- * @len:
- * @glyph: (out):
+ * @s: (array length=len) (element-type uint8_t): 
+ * @len: 
+ * @glyph: (out): 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1113,9 +1111,9 @@
  * hb_font_create: (Xconstructor)
  * @face: a face.
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  *
  * Since: 0.9.2
  **/
@@ -1143,9 +1141,9 @@
  * hb_font_create_sub_font:
  * @parent: parent font.
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  *
  * Since: 0.9.2
  **/
@@ -1167,13 +1165,15 @@
   font->x_ppem = parent->x_ppem;
   font->y_ppem = parent->y_ppem;
 
+  /* TODO: copy variation coordinates. */
+
   return font;
 }
 
 /**
  * hb_font_get_empty:
  *
- *
+ * 
  *
  * Return value: (transfer full)
  *
@@ -1196,6 +1196,9 @@
     0, /* x_ppem */
     0, /* y_ppem */
 
+    0, /* num_coords */
+    NULL, /* coords */
+
     const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil), /* klass */
     NULL, /* user_data */
     NULL, /* destroy */
@@ -1214,9 +1217,9 @@
  * hb_font_reference: (skip)
  * @font: a font.
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  *
  * Since: 0.9.2
  **/
@@ -1230,7 +1233,7 @@
  * hb_font_destroy: (skip)
  * @font: a font.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1250,20 +1253,22 @@
   hb_face_destroy (font->face);
   hb_font_funcs_destroy (font->klass);
 
+  free (font->coords);
+
   free (font);
 }
 
 /**
  * hb_font_set_user_data: (skip)
  * @font: a font.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1280,11 +1285,11 @@
 /**
  * hb_font_get_user_data: (skip)
  * @font: a font.
- * @key:
+ * @key: 
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -1299,7 +1304,7 @@
  * hb_font_make_immutable:
  * @font: a font.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1319,9 +1324,9 @@
  * hb_font_is_immutable:
  * @font: a font.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -1361,9 +1366,9 @@
  * hb_font_get_parent:
  * @font: a font.
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -1377,9 +1382,9 @@
  * hb_font_get_face:
  * @font: a font.
  *
+ * 
  *
- *
- * Return value: (transfer none):
+ * Return value: (transfer none): 
  *
  * Since: 0.9.2
  **/
@@ -1394,10 +1399,10 @@
  * hb_font_set_funcs:
  * @font: a font.
  * @klass: (closure font_data) (destroy destroy) (scope notified):
- * @font_data:
- * @destroy:
+ * @font_data: 
+ * @destroy: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1430,9 +1435,9 @@
  * hb_font_set_funcs_data:
  * @font: a font.
  * @font_data: (destroy destroy) (scope notified):
- * @destroy:
+ * @destroy: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1459,10 +1464,10 @@
 /**
  * hb_font_set_scale:
  * @font: a font.
- * @x_scale:
- * @y_scale:
+ * @x_scale: 
+ * @y_scale: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1481,10 +1486,10 @@
 /**
  * hb_font_get_scale:
  * @font: a font.
- * @x_scale: (out):
- * @y_scale: (out):
+ * @x_scale: (out): 
+ * @y_scale: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1500,10 +1505,10 @@
 /**
  * hb_font_set_ppem:
  * @font: a font.
- * @x_ppem:
- * @y_ppem:
+ * @x_ppem: 
+ * @y_ppem: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1522,10 +1527,10 @@
 /**
  * hb_font_get_ppem:
  * @font: a font.
- * @x_ppem: (out):
- * @y_ppem: (out):
+ * @x_ppem: (out): 
+ * @y_ppem: (out): 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -1539,6 +1544,32 @@
 }
 
 
+void
+hb_font_set_var_coords_normalized (hb_font_t *font,
+                                   int *coords, /* XXX 2.14 normalized */
+                                   unsigned int coords_length)
+{
+  if (font->immutable)
+    return;
+
+  /* Skip tail zero entries. */
+  while (coords_length && !coords[coords_length - 1])
+    coords_length--;
+
+  int *copy = coords_length ? (int *) calloc (coords_length, sizeof (coords[0])) : NULL;
+  if (unlikely (coords_length && !copy))
+    return;
+
+  free (font->coords);
+
+  if (coords_length)
+    memcpy (copy, coords, coords_length * sizeof (coords[0]));
+
+  font->coords = copy;
+  font->num_coords = coords_length;
+}
+
+
 #ifndef HB_DISABLE_DEPRECATED
 
 /*
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h	Fri Jan 20 07:05:40 2017 -0800
@@ -604,6 +604,11 @@
                   unsigned int *y_ppem);
 
 
+HB_EXTERN void
+hb_font_set_var_coords_normalized (hb_font_t *font,
+                                   int *coords, /* XXX 2.14 normalized */
+                                   unsigned int coords_length);
+
 HB_END_DECLS
 
 #endif /* HB_FONT_H */
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -33,7 +33,10 @@
 
 #include "hb-font-private.hh"
 
+#include "hb-cache-private.hh" // Maybe use in the future?
+
 #include FT_ADVANCES_H
+#include FT_MULTIPLE_MASTERS_H
 #include FT_TRUETYPE_TABLES_H
 
 
@@ -111,7 +114,7 @@
  * @font:
  * @load_flags:
  *
- *
+ * 
  *
  * Since: 1.0.5
  **/
@@ -133,7 +136,7 @@
  * hb_ft_font_get_load_flags:
  * @font:
  *
- *
+ * 
  *
  * Return value:
  * Since: 1.0.5
@@ -504,12 +507,12 @@
 
 /**
  * hb_ft_face_create:
- * @ft_face: (destroy destroy) (scope notified):
+ * @ft_face: (destroy destroy) (scope notified): 
  * @destroy:
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  * Since: 0.9.2
  **/
 hb_face_t *
@@ -541,9 +544,9 @@
  * hb_ft_face_create_referenced:
  * @ft_face:
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  * Since: 0.9.38
  **/
 hb_face_t *
@@ -561,11 +564,11 @@
 
 /**
  * hb_ft_face_create_cached:
- * @ft_face:
+ * @ft_face: 
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  * Since: 0.9.2
  **/
 hb_face_t *
@@ -586,12 +589,12 @@
 
 /**
  * hb_ft_font_create:
- * @ft_face: (destroy destroy) (scope notified):
+ * @ft_face: (destroy destroy) (scope notified): 
  * @destroy:
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  * Since: 0.9.2
  **/
 hb_font_t *
@@ -606,14 +609,31 @@
   hb_face_destroy (face);
   _hb_ft_font_set_funcs (font, ft_face, false);
   hb_font_set_scale (font,
-                     (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16),
-                     (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16));
+                     (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16),
+                     (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16));
 #if 0 /* hb-ft works in no-hinting model */
   hb_font_set_ppem (font,
                     ft_face->size->metrics.x_ppem,
                     ft_face->size->metrics.y_ppem);
 #endif
 
+#ifdef HAVE_FT_GET_VAR_BLEND_COORDINATES
+  FT_MM_Var *mm_var = NULL;
+  if (!FT_Get_MM_Var (ft_face, &mm_var))
+  {
+    FT_Fixed coords[mm_var->num_axis];
+    int hbCoords[mm_var->num_axis];
+    if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, coords))
+    {
+      for (int i = 0; i < mm_var->num_axis; ++i)
+        hbCoords[i] = coords[i] >> 2;
+
+      hb_font_set_var_coords_normalized (font, hbCoords, mm_var->num_axis);
+    }
+  }
+  free (mm_var);
+#endif
+
   return font;
 }
 
@@ -621,9 +641,9 @@
  * hb_ft_font_create_referenced:
  * @ft_face:
  *
+ * 
  *
- *
- * Return value: (transfer full):
+ * Return value: (transfer full): 
  * Since: 0.9.38
  **/
 hb_font_t *
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -105,7 +105,7 @@
   inline unsigned int get_size (void) const { return (size); }
 
 #define DEFINE_SIZE_UNION(size, _member) \
-  DEFINE_INSTANCE_ASSERTION (this->u._member.static_size == (size)); \
+  DEFINE_INSTANCE_ASSERTION (0*sizeof(this->u._member.static_size) + sizeof(this->u._member) == (size)); \
   static const unsigned int min_size = (size)
 
 #define DEFINE_SIZE_MIN(size) \
@@ -650,7 +650,9 @@
   DEFINE_SIZE_STATIC (Size);
 };
 
+typedef IntType<int8_t  , 1> CHAR;      /* 8-bit signed integer. */
 typedef IntType<uint8_t , 1> BYTE;      /* 8-bit unsigned integer. */
+typedef IntType<int8_t  , 1> INT8;      /* 8-bit signed integer. */
 typedef IntType<uint16_t, 2> USHORT;    /* 16-bit unsigned integer. */
 typedef IntType<int16_t,  2> SHORT;     /* 16-bit signed integer. */
 typedef IntType<uint32_t, 4> ULONG;     /* 32-bit unsigned integer. */
@@ -805,6 +807,7 @@
     if (unlikely (!c->check_struct (this))) return_trace (false);
     unsigned int offset = *this;
     if (unlikely (!offset)) return_trace (true);
+    if (unlikely (!c->check_range (base, offset))) return_trace (false);
     const Type &obj = StructAtOffset<Type> (base, offset);
     return_trace (likely (obj.sanitize (c)) || neuter (c));
   }
@@ -815,6 +818,7 @@
     if (unlikely (!c->check_struct (this))) return_trace (false);
     unsigned int offset = *this;
     if (unlikely (!offset)) return_trace (true);
+    if (unlikely (!c->check_range (base, offset))) return_trace (false);
     const Type &obj = StructAtOffset<Type> (base, offset);
     return_trace (likely (obj.sanitize (c, user_data)) || neuter (c));
   }
@@ -948,8 +952,8 @@
 };
 
 /* Array of Offset's */
-template <typename Type>
-struct OffsetArrayOf : ArrayOf<OffsetTo<Type> > {};
+template <typename Type, typename OffsetType=USHORT>
+struct OffsetArrayOf : ArrayOf<OffsetTo<Type, OffsetType> > {};
 
 /* Array of offsets relative to the beginning of the array itself. */
 template <typename Type>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -0,0 +1,384 @@
+/*
+ * Copyright © 2016  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Seigo Nonaka
+ */
+
+#ifndef HB_OT_CBDT_TABLE_HH
+#define HB_OT_CBDT_TABLE_HH
+
+#include "hb-open-type-private.hh"
+
+namespace OT {
+
+struct SmallGlyphMetrics
+{
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  inline void get_extents (hb_glyph_extents_t *extents) const
+  {
+    extents->x_bearing = bearingX;
+    extents->y_bearing = bearingY;
+    extents->width = width;
+    extents->height = -height;
+  }
+
+  BYTE height;
+  BYTE width;
+  CHAR bearingX;
+  CHAR bearingY;
+  BYTE advance;
+
+  DEFINE_SIZE_STATIC(5);
+};
+
+struct BigGlyphMetrics : SmallGlyphMetrics
+{
+  CHAR vertBearingX;
+  CHAR vertBearingY;
+  BYTE vertAdvance;
+
+  DEFINE_SIZE_STATIC(8);
+};
+
+struct SBitLineMetrics
+{
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  CHAR ascender;
+  CHAR decender;
+  BYTE widthMax;
+  CHAR caretSlopeNumerator;
+  CHAR caretSlopeDenominator;
+  CHAR caretOffset;
+  CHAR minOriginSB;
+  CHAR minAdvanceSB;
+  CHAR maxBeforeBL;
+  CHAR minAfterBL;
+  CHAR padding1;
+  CHAR padding2;
+
+  DEFINE_SIZE_STATIC(12);
+};
+
+
+/*
+ * Index Subtables.
+ */
+
+struct IndexSubtableHeader
+{
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  USHORT indexFormat;
+  USHORT imageFormat;
+  ULONG imageDataOffset;
+
+  DEFINE_SIZE_STATIC(8);
+};
+
+template <typename OffsetType>
+struct IndexSubtableFormat1Or3
+{
+  inline bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  c->check_array (offsetArrayZ, offsetArrayZ[0].static_size, glyph_count + 1));
+  }
+
+  bool get_image_data (unsigned int idx,
+		       unsigned int *offset,
+		       unsigned int *length) const
+  {
+    if (unlikely (offsetArrayZ[idx + 1] <= offsetArrayZ[idx]))
+      return false;
+
+    *offset = header.imageDataOffset + offsetArrayZ[idx];
+    *length = offsetArrayZ[idx + 1] - offsetArrayZ[idx];
+    return true;
+  }
+
+  IndexSubtableHeader header;
+  Offset<OffsetType> offsetArrayZ[VAR];
+
+  DEFINE_SIZE_ARRAY(8, offsetArrayZ);
+};
+
+struct IndexSubtableFormat1 : IndexSubtableFormat1Or3<ULONG> {};
+struct IndexSubtableFormat3 : IndexSubtableFormat1Or3<USHORT> {};
+
+struct IndexSubtable
+{
+  inline bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const
+  {
+    TRACE_SANITIZE (this);
+    if (!u.header.sanitize (c)) return_trace (false);
+    switch (u.header.indexFormat) {
+    case 1: return_trace (u.format1.sanitize (c, glyph_count));
+    case 3: return_trace (u.format3.sanitize (c, glyph_count));
+    default:return_trace (true);
+    }
+  }
+
+  inline bool get_extents (hb_glyph_extents_t *extents) const
+  {
+    switch (u.header.indexFormat) {
+    case 2: case 5: /* TODO */
+    case 1: case 3: case 4: /* Variable-metrics formats do not have metrics here. */
+    default:return (false);
+    }
+  }
+
+  bool get_image_data (unsigned int idx,
+		       unsigned int *offset,
+		       unsigned int *length,
+		       unsigned int *format) const
+  {
+    *format = u.header.imageFormat;
+    switch (u.header.indexFormat) {
+    case 1: return u.format1.get_image_data (idx, offset, length);
+    case 3: return u.format3.get_image_data (idx, offset, length);
+    default: return false;
+    }
+  }
+
+  protected:
+  union {
+  IndexSubtableHeader	header;
+  IndexSubtableFormat1	format1;
+  IndexSubtableFormat3	format3;
+  /* TODO: Format 2, 4, 5. */
+  } u;
+  public:
+  DEFINE_SIZE_UNION (8, header);
+};
+
+struct IndexSubtableRecord
+{
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  firstGlyphIndex <= lastGlyphIndex &&
+		  offsetToSubtable.sanitize (c, this, lastGlyphIndex - firstGlyphIndex + 1));
+  }
+
+  inline bool get_extents (hb_glyph_extents_t *extents) const
+  {
+    return (this+offsetToSubtable).get_extents (extents);
+  }
+
+  bool get_image_data (unsigned int gid,
+		       unsigned int *offset,
+		       unsigned int *length,
+		       unsigned int *format) const
+  {
+    if (gid < firstGlyphIndex || gid > lastGlyphIndex)
+    {
+      return false;
+    }
+    return (this+offsetToSubtable).get_image_data (gid - firstGlyphIndex,
+						   offset, length, format);
+  }
+
+  USHORT firstGlyphIndex;
+  USHORT lastGlyphIndex;
+  OffsetTo<IndexSubtable, ULONG> offsetToSubtable;
+
+  DEFINE_SIZE_STATIC(8);
+};
+
+struct IndexSubtableArray
+{
+  inline bool sanitize (hb_sanitize_context_t *c, unsigned int count) const
+  {
+    TRACE_SANITIZE (this);
+    if (unlikely (!c->check_array (&indexSubtablesZ, indexSubtablesZ[0].static_size, count)))
+      return_trace (false);
+    for (unsigned int i = 0; i < count; i++)
+      if (unlikely (!indexSubtablesZ[i].sanitize (c, this)))
+	return_trace (false);
+    return_trace (true);
+  }
+
+  public:
+  const IndexSubtableRecord* find_table (hb_codepoint_t glyph, unsigned int numTables) const
+  {
+    for (unsigned int i = 0; i < numTables; ++i)
+    {
+      unsigned int firstGlyphIndex = indexSubtablesZ[i].firstGlyphIndex;
+      unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex;
+      if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) {
+        return &indexSubtablesZ[i];
+      }
+    }
+    return NULL;
+  }
+
+  protected:
+  IndexSubtableRecord indexSubtablesZ[VAR];
+
+  public:
+  DEFINE_SIZE_ARRAY(0, indexSubtablesZ);
+};
+
+struct BitmapSizeTable
+{
+  friend struct CBLC;
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) &&
+		  c->check_range (&(base+indexSubtableArrayOffset), indexTablesSize) &&
+		  horizontal.sanitize (c) &&
+		  vertical.sanitize (c));
+  }
+
+  const IndexSubtableRecord *find_table (hb_codepoint_t glyph, const void *base) const
+  {
+    return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
+  }
+
+  protected:
+  OffsetTo<IndexSubtableArray, ULONG> indexSubtableArrayOffset;
+  ULONG indexTablesSize;
+  ULONG numberOfIndexSubtables;
+  ULONG colorRef;
+  SBitLineMetrics horizontal;
+  SBitLineMetrics vertical;
+  USHORT startGlyphIndex;
+  USHORT endGlyphIndex;
+  BYTE ppemX;
+  BYTE ppemY;
+  BYTE bitDepth;
+  CHAR flags;
+
+public:
+  DEFINE_SIZE_STATIC(48);
+};
+
+
+/*
+ * Glyph Bitmap Data Formats.
+ */
+
+struct GlyphBitmapDataFormat17
+{
+  SmallGlyphMetrics glyphMetrics;
+  ULONG dataLen;
+  BYTE dataZ[VAR];
+
+  DEFINE_SIZE_ARRAY(9, dataZ);
+};
+
+
+/*
+ * CBLC -- Color Bitmap Location Table
+ */
+
+#define HB_OT_TAG_CBLC HB_TAG('C','B','L','C')
+
+struct CBLC
+{
+  static const hb_tag_t tableTag = HB_OT_TAG_CBLC;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  likely (version.major == 2 || version.major == 3) &&
+		  sizeTables.sanitize (c, this));
+  }
+
+  public:
+  const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
+					 unsigned int *x_ppem, unsigned int *y_ppem) const
+  {
+    /* TODO: Make it possible to select strike. */
+
+    unsigned int count = sizeTables.len;
+    for (uint32_t i = 0; i < count; ++i)
+    {
+      unsigned int startGlyphIndex = sizeTables.array[i].startGlyphIndex;
+      unsigned int endGlyphIndex = sizeTables.array[i].endGlyphIndex;
+      if (startGlyphIndex <= glyph && glyph <= endGlyphIndex)
+      {
+	*x_ppem = sizeTables[i].ppemX;
+	*y_ppem = sizeTables[i].ppemY;
+	return sizeTables[i].find_table (glyph, this);
+      }
+    }
+
+    return NULL;
+  }
+
+  protected:
+  FixedVersion<>version;
+  ArrayOf<BitmapSizeTable, ULONG> sizeTables;
+
+  public:
+  DEFINE_SIZE_ARRAY(8, sizeTables);
+};
+
+/*
+ * CBDT -- Color Bitmap Data Table
+ */
+#define HB_OT_TAG_CBDT HB_TAG('C','B','D','T')
+
+struct CBDT
+{
+  static const hb_tag_t tableTag = HB_OT_TAG_CBDT;
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+		  likely (version.major == 2 || version.major == 3));
+  }
+
+  protected:
+  FixedVersion<>version;
+  BYTE dataZ[VAR];
+
+  public:
+  DEFINE_SIZE_ARRAY(4, dataZ);
+};
+
+} /* namespace OT */
+
+#endif /* HB_OT_CBDT_TABLE_HH */
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -31,6 +31,7 @@
 #include "hb-font-private.hh"
 
 #include "hb-ot-cmap-table.hh"
+#include "hb-ot-cbdt-table.hh"
 #include "hb-ot-glyf-table.hh"
 #include "hb-ot-head-table.hh"
 #include "hb-ot-hhea-table.hh"
@@ -47,6 +48,7 @@
   unsigned short ascender;
   unsigned short descender;
   unsigned short line_gap;
+  bool has_font_extents;
 
   const OT::_mtx *table;
   hb_blob_t *blob;
@@ -54,9 +56,10 @@
   inline void init (hb_face_t *face,
                     hb_tag_t _hea_tag,
                     hb_tag_t _mtx_tag,
-                    hb_tag_t os2_tag)
+                    hb_tag_t os2_tag,
+                    unsigned int default_advance = 0)
   {
-    this->default_advance = face->get_upem ();
+    this->default_advance = default_advance ? default_advance : face->get_upem ();
 
     bool got_font_extents = false;
     if (os2_tag)
@@ -82,9 +85,12 @@
       this->ascender = _hea->ascender;
       this->descender = _hea->descender;
       this->line_gap = _hea->lineGap;
+      got_font_extents = (this->ascender | this->descender) != 0;
     }
     hb_blob_destroy (_hea_blob);
 
+    this->has_font_extents = got_font_extents;
+
     this->blob = OT::Sanitizer<OT::_mtx>::sanitize (face->reference_table (_mtx_tag));
 
     /* Cap num_metrics() and num_advances() based on table length. */
@@ -202,6 +208,91 @@
   }
 };
 
+struct hb_ot_face_cbdt_accelerator_t
+{
+  hb_blob_t *cblc_blob;
+  hb_blob_t *cbdt_blob;
+  const OT::CBLC *cblc;
+  const OT::CBDT *cbdt;
+
+  unsigned int cbdt_len;
+  float upem;
+
+  inline void init (hb_face_t *face)
+  {
+    upem = face->get_upem();
+
+    cblc_blob = OT::Sanitizer<OT::CBLC>::sanitize (face->reference_table (HB_OT_TAG_CBLC));
+    cbdt_blob = OT::Sanitizer<OT::CBDT>::sanitize (face->reference_table (HB_OT_TAG_CBDT));
+    cbdt_len = hb_blob_get_length (cbdt_blob);
+
+    if (hb_blob_get_length (cblc_blob) == 0) {
+      cblc = NULL;
+      cbdt = NULL;
+      return;  /* Not a bitmap font. */
+    }
+    cblc = OT::Sanitizer<OT::CBLC>::lock_instance (cblc_blob);
+    cbdt = OT::Sanitizer<OT::CBDT>::lock_instance (cbdt_blob);
+
+  }
+
+  inline void fini (void)
+  {
+    hb_blob_destroy (this->cblc_blob);
+    hb_blob_destroy (this->cbdt_blob);
+  }
+
+  inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
+  {
+    unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */
+
+    if (cblc == NULL)
+      return false;  // Not a color bitmap font.
+
+    const OT::IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem);
+    if (subtable_record == NULL)
+      return false;
+
+    if (subtable_record->get_extents (extents))
+      return true;
+
+    unsigned int image_offset = 0, image_length = 0, image_format = 0;
+    if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format))
+      return false;
+
+    {
+      /* TODO Move the following into CBDT struct when adding more formats. */
+
+      if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
+        return false;
+
+      switch (image_format)
+      {
+        case 17: {
+          if (unlikely (image_length < OT::GlyphBitmapDataFormat17::min_size))
+            return false;
+
+          const OT::GlyphBitmapDataFormat17& glyphFormat17 =
+              OT::StructAtOffset<OT::GlyphBitmapDataFormat17> (this->cbdt, image_offset);
+          glyphFormat17.glyphMetrics.get_extents (extents);
+        }
+        break;
+        default:
+          // TODO: Support other image formats.
+          return false;
+      }
+    }
+
+    /* Convert to the font units. */
+    extents->x_bearing *= upem / (float) x_ppem;
+    extents->y_bearing *= upem / (float) y_ppem;
+    extents->width *= upem / (float) x_ppem;
+    extents->height *= upem / (float) y_ppem;
+
+    return true;
+  }
+};
+
 typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
                                           hb_codepoint_t codepoint,
                                           hb_codepoint_t *glyph);
@@ -264,7 +355,11 @@
     if (!subtable) subtable = cmap->find_subtable (0, 2);
     if (!subtable) subtable = cmap->find_subtable (0, 1);
     if (!subtable) subtable = cmap->find_subtable (0, 0);
-    if (!subtable)(subtable = cmap->find_subtable (3, 0)) && (symbol = true);
+    if (!subtable)
+    {
+      subtable = cmap->find_subtable (3, 0);
+      if (subtable) symbol = true;
+    }
     /* Meh. */
     if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
 
@@ -374,6 +469,7 @@
   hb_ot_face_metrics_accelerator_t h_metrics;
   hb_ot_face_metrics_accelerator_t v_metrics;
   hb_lazy_loader_t<hb_ot_face_glyf_accelerator_t> glyf;
+  hb_lazy_loader_t<hb_ot_face_cbdt_accelerator_t> cbdt;
 };
 
 
@@ -387,8 +483,10 @@
 
   ot_font->cmap.init (face);
   ot_font->h_metrics.init (face, HB_OT_TAG_hhea, HB_OT_TAG_hmtx, HB_OT_TAG_os2);
-  ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_TAG_NONE); /* TODO Can we do this lazily? */
+  ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_TAG_NONE,
+                           ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
   ot_font->glyf.init (face);
+  ot_font->cbdt.init (face);
 
   return ot_font;
 }
@@ -400,6 +498,7 @@
   ot_font->h_metrics.fini ();
   ot_font->v_metrics.fini ();
   ot_font->glyf.fini ();
+  ot_font->cbdt.fini ();
 
   free (ot_font);
 }
@@ -458,6 +557,8 @@
 {
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   bool ret = ot_font->glyf->get_extents (glyph, extents);
+  if (!ret)
+    ret = ot_font->cbdt->get_extents (glyph, extents);
   extents->x_bearing = font->em_scale_x (extents->x_bearing);
   extents->y_bearing = font->em_scale_y (extents->y_bearing);
   extents->width     = font->em_scale_x (extents->width);
@@ -475,7 +576,7 @@
   metrics->ascender = font->em_scale_y (ot_font->h_metrics.ascender);
   metrics->descender = font->em_scale_y (ot_font->h_metrics.descender);
   metrics->line_gap = font->em_scale_y (ot_font->h_metrics.line_gap);
-  return true;
+  return ot_font->h_metrics.has_font_extents;
 }
 
 static hb_bool_t
@@ -488,7 +589,7 @@
   metrics->ascender = font->em_scale_x (ot_font->v_metrics.ascender);
   metrics->descender = font->em_scale_x (ot_font->v_metrics.descender);
   metrics->line_gap = font->em_scale_x (ot_font->v_metrics.line_gap);
-  return true;
+  return ot_font->v_metrics.has_font_extents;
 }
 
 static hb_font_funcs_t *static_ot_funcs = NULL;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -507,7 +507,7 @@
   { return this+featureParams; }
 
   inline bool sanitize (hb_sanitize_context_t *c,
-                        const Record<Feature>::sanitize_closure_t *closure) const
+                        const Record<Feature>::sanitize_closure_t *closure = NULL) const
   {
     TRACE_SANITIZE (this);
     if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
@@ -731,8 +731,8 @@
     inline void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; };
     inline bool more (void) { return i < c->glyphArray.len; }
     inline void next (void) { i++; }
-    inline uint16_t get_glyph (void) { return c->glyphArray[i]; }
-    inline uint16_t get_coverage (void) { return i; }
+    inline hb_codepoint_t get_glyph (void) { return c->glyphArray[i]; }
+    inline unsigned int get_coverage (void) { return i; }
 
     private:
     const struct CoverageFormat1 *c;
@@ -829,26 +829,33 @@
 
   public:
   /* Older compilers need this to be public. */
-  struct Iter {
-    inline void init (const CoverageFormat2 &c_) {
+  struct Iter
+  {
+    inline void init (const CoverageFormat2 &c_)
+    {
       c = &c_;
       coverage = 0;
       i = 0;
       j = c->rangeRecord.len ? c_.rangeRecord[0].start : 0;
     }
     inline bool more (void) { return i < c->rangeRecord.len; }
-    inline void next (void) {
-      coverage++;
-      if (j == c->rangeRecord[i].end) {
+    inline void next (void)
+    {
+      if (j >= c->rangeRecord[i].end)
+      {
         i++;
         if (more ())
+        {
           j = c->rangeRecord[i].start;
+          coverage = c->rangeRecord[i].value;
+        }
         return;
       }
+      coverage++;
       j++;
     }
-    inline uint16_t get_glyph (void) { return j; }
-    inline uint16_t get_coverage (void) { return coverage; }
+    inline hb_codepoint_t get_glyph (void) { return j; }
+    inline unsigned int get_coverage (void) { return coverage; }
 
     private:
     const struct CoverageFormat2 *c;
@@ -957,14 +964,14 @@
       default:                   break;
       }
     }
-    inline uint16_t get_glyph (void) {
+    inline hb_codepoint_t get_glyph (void) {
       switch (format) {
       case 1: return u.format1.get_glyph ();
       case 2: return u.format2.get_glyph ();
       default:return 0;
       }
     }
-    inline uint16_t get_coverage (void) {
+    inline unsigned int get_coverage (void) {
       switch (format) {
       case 1: return u.format1.get_coverage ();
       case 2: return u.format2.get_coverage ();
@@ -1162,11 +1169,380 @@
 
 
 /*
+ * Item Variation Store
+ */
+
+struct VarRegionAxis
+{
+  inline float evaluate (int coord) const
+  {
+    int start = startCoord, peak = peakCoord, end = endCoord;
+
+    /* TODO Move these to sanitize(). */
+    if (unlikely (start > peak || peak > end))
+      return 1.;
+    if (unlikely (start < 0 && end > 0 && peak != 0))
+      return 1.;
+
+    if (peak == 0 || coord == peak)
+      return 1.;
+
+    if (coord <= start || end <= coord)
+      return 0.;
+
+    /* Interpolate */
+    if (coord < peak)
+      return float (coord - start) / (peak - start);
+    else
+      return float (end - coord) / (end - peak);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+    /* TODO Handle invalid start/peak/end configs, so we don't
+     * have to do that at runtime. */
+  }
+
+  public:
+  F2DOT14       startCoord;
+  F2DOT14       peakCoord;
+  F2DOT14       endCoord;
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct VarRegionList
+{
+  inline float evaluate (unsigned int region_index,
+                         int *coords, unsigned int coord_len) const
+  {
+    if (unlikely (region_index >= regionCount))
+      return 0.;
+
+    const VarRegionAxis *axes = axesZ + (region_index * axisCount);
+
+    float v = 1.;
+    unsigned int count = MIN (coord_len, (unsigned int) axisCount);
+    for (unsigned int i = 0; i < count; i++)
+    {
+      float factor = axes[i].evaluate (coords[i]);
+      if (factor == 0.)
+        return 0.;
+      v *= factor;
+    }
+    return v;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  c->check_array (axesZ, axesZ[0].static_size,
+                                  (unsigned int) axisCount * (unsigned int) regionCount));
+  }
+
+  protected:
+  USHORT        axisCount;
+  USHORT        regionCount;
+  VarRegionAxis axesZ[VAR];
+  public:
+  DEFINE_SIZE_ARRAY (4, axesZ);
+};
+
+struct VarData
+{
+  inline unsigned int get_row_size (void) const
+  { return shortCount + regionIndices.len; }
+
+  inline unsigned int get_size (void) const
+  { return itemCount * get_row_size (); }
+
+  inline float get_delta (unsigned int inner,
+                          int *coords, unsigned int coord_count,
+                          const VarRegionList &regions) const
+  {
+    if (unlikely (inner >= itemCount))
+      return 0.;
+
+   unsigned int count = regionIndices.len;
+   unsigned int scount = shortCount;
+
+   const BYTE *bytes = &StructAfter<BYTE> (regionIndices);
+   const BYTE *row = bytes + inner * (scount + count);
+
+   float delta = 0.;
+   unsigned int i = 0;
+
+   const SHORT *scursor = reinterpret_cast<const SHORT *> (row);
+   for (; i < scount; i++)
+   {
+     float scalar = regions.evaluate (regionIndices.array[i], coords, coord_count);
+     delta += scalar * *scursor++;
+   }
+   const INT8 *bcursor = reinterpret_cast<const INT8 *> (scursor);
+   for (; i < count; i++)
+   {
+     float scalar = regions.evaluate (regionIndices.array[i], coords, coord_count);
+     delta += scalar * *bcursor++;
+   }
+
+   return delta;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  regionIndices.sanitize(c) &&
+                  shortCount <= regionIndices.len &&
+                  c->check_array (&StructAfter<BYTE> (regionIndices),
+                                  get_row_size (), itemCount));
+  }
+
+  protected:
+  USHORT                itemCount;
+  USHORT                shortCount;
+  ArrayOf<USHORT>       regionIndices;
+  BYTE                  bytesX[VAR];
+  public:
+  DEFINE_SIZE_ARRAY2 (6, regionIndices, bytesX);
+};
+
+struct VariationStore
+{
+  inline float get_delta (unsigned int outer, unsigned int inner,
+                          int *coords, unsigned int coord_count) const
+  {
+    if (unlikely (outer >= dataSets.len))
+      return 0.;
+
+    return (this+dataSets[outer]).get_delta (inner,
+                                             coords, coord_count,
+                                             this+regions);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  format == 1 &&
+                  regions.sanitize (c, this) &&
+                  dataSets.sanitize (c, this));
+  }
+
+  protected:
+  USHORT                                format;
+  OffsetTo<VarRegionList, ULONG>        regions;
+  OffsetArrayOf<VarData, ULONG>         dataSets;
+  public:
+  DEFINE_SIZE_ARRAY (8, dataSets);
+};
+
+/*
+ * Feature Variations
+ */
+
+struct ConditionFormat1
+{
+  friend struct Condition;
+
+  private:
+  inline bool evaluate (const int *coords, unsigned int coord_len) const
+  {
+    int coord = axisIndex < coord_len ? coords[axisIndex] : 0;
+    return filterRangeMinValue <= coord && coord <= filterRangeMaxValue;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  USHORT        format;         /* Format identifier--format = 1 */
+  USHORT        axisIndex;
+  F2DOT14       filterRangeMinValue;
+  F2DOT14       filterRangeMaxValue;
+  public:
+  DEFINE_SIZE_STATIC (8);
+};
+
+struct Condition
+{
+  inline bool evaluate (const int *coords, unsigned int coord_len) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.evaluate (coords, coord_len);
+    default:return false;
+    }
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!u.format.sanitize (c)) return_trace (false);
+    switch (u.format) {
+    case 1: return_trace (u.format1.sanitize (c));
+    default:return_trace (true);
+    }
+  }
+
+  protected:
+  union {
+  USHORT                format;         /* Format identifier */
+  ConditionFormat1      format1;
+  } u;
+  public:
+  DEFINE_SIZE_UNION (2, format);
+};
+
+struct ConditionSet
+{
+  inline bool evaluate (const int *coords, unsigned int coord_len) const
+  {
+    unsigned int count = conditions.len;
+    for (unsigned int i = 0; i < count; i++)
+      if (!(this+conditions.array[i]).evaluate (coords, coord_len))
+        return false;
+    return true;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (conditions.sanitize (c, this));
+  }
+
+  protected:
+  OffsetArrayOf<Condition, ULONG> conditions;
+  public:
+  DEFINE_SIZE_ARRAY (2, conditions);
+};
+
+struct FeatureTableSubstitutionRecord
+{
+  friend struct FeatureTableSubstitution;
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) && feature.sanitize (c, base));
+  }
+
+  protected:
+  USHORT                        featureIndex;
+  OffsetTo<Feature, ULONG>      feature;
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct FeatureTableSubstitution
+{
+  inline const Feature *find_substitute (unsigned int feature_index) const
+  {
+    unsigned int count = substitutions.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      const FeatureTableSubstitutionRecord &record = substitutions.array[i];
+      if (record.featureIndex == feature_index)
+        return &(this+record.feature);
+    }
+    return NULL;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (version.sanitize (c) &&
+                  likely (version.major == 1) &&
+                  substitutions.sanitize (c, this));
+  }
+
+  protected:
+  FixedVersion<>        version;        /* Version--0x00010000u */
+  ArrayOf<FeatureTableSubstitutionRecord>
+                        substitutions;
+  public:
+  DEFINE_SIZE_ARRAY (6, substitutions);
+};
+
+struct FeatureVariationRecord
+{
+  friend struct FeatureVariations;
+
+  inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (conditions.sanitize (c, base) &&
+                  substitutions.sanitize (c, base));
+  }
+
+  protected:
+  OffsetTo<ConditionSet, ULONG>
+                        conditions;
+  OffsetTo<FeatureTableSubstitution, ULONG>
+                        substitutions;
+  public:
+  DEFINE_SIZE_STATIC (8);
+};
+
+struct FeatureVariations
+{
+  static const unsigned int NOT_FOUND_INDEX = 0xFFFFFFFFu;
+
+  inline bool find_index (const int *coords, unsigned int coord_len,
+                          unsigned int *index) const
+  {
+    unsigned int count = varRecords.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      const FeatureVariationRecord &record = varRecords.array[i];
+      if ((this+record.conditions).evaluate (coords, coord_len))
+      {
+        *index = i;
+        return true;
+      }
+    }
+    *index = NOT_FOUND_INDEX;
+    return false;
+  }
+
+  inline const Feature *find_substitute (unsigned int variations_index,
+                                         unsigned int feature_index) const
+  {
+    const FeatureVariationRecord &record = varRecords[variations_index];
+    return (this+record.substitutions).find_substitute (feature_index);
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (version.sanitize (c) &&
+                  likely (version.major == 1) &&
+                  varRecords.sanitize (c, this));
+  }
+
+  protected:
+  FixedVersion<>        version;        /* Version--0x00010000u */
+  ArrayOf<FeatureVariationRecord, ULONG>
+                        varRecords;
+  public:
+  DEFINE_SIZE_ARRAY (8, varRecords);
+};
+
+
+/*
  * Device Tables
  */
 
-struct Device
+struct HintingDevice
 {
+  friend struct Device;
+
+  private:
 
   inline hb_position_t get_x_delta (hb_font_t *font) const
   { return get_delta (font->x_ppem, font->x_scale); }
@@ -1235,6 +1611,101 @@
   DEFINE_SIZE_ARRAY (6, deltaValue);
 };
 
+struct VariationDevice
+{
+  friend struct Device;
+
+  private:
+
+  inline hb_position_t get_x_delta (hb_font_t *font, const VariationStore &store) const
+  { return font->em_scalef_x (get_delta (font, store)); }
+
+  inline hb_position_t get_y_delta (hb_font_t *font, const VariationStore &store) const
+  { return font->em_scalef_y (get_delta (font, store)); }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  private:
+
+  inline float get_delta (hb_font_t *font, const VariationStore &store) const
+  {
+    return store.get_delta (outerIndex, innerIndex, font->coords, font->num_coords);
+  }
+
+  protected:
+  USHORT        outerIndex;
+  USHORT        innerIndex;
+  USHORT        deltaFormat;    /* Format identifier for this table: 0x0x8000 */
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct DeviceHeader
+{
+  protected:
+  USHORT                reserved1;
+  USHORT                reserved2;
+  public:
+  USHORT                format;         /* Format identifier */
+  public:
+  DEFINE_SIZE_STATIC (6);
+};
+
+struct Device
+{
+  inline hb_position_t get_x_delta (hb_font_t *font, const VariationStore &store=Null(VariationStore)) const
+  {
+    switch (u.b.format)
+    {
+    case 1: case 2: case 3:
+      return u.hinting.get_x_delta (font);
+    case 0x8000:
+      return u.variation.get_x_delta (font, store);
+    default:
+      return 0;
+    }
+  }
+  inline hb_position_t get_y_delta (hb_font_t *font, const VariationStore &store=Null(VariationStore)) const
+  {
+    switch (u.b.format)
+    {
+    case 1: case 2: case 3:
+      return u.hinting.get_y_delta (font);
+    case 0x8000:
+      return u.variation.get_y_delta (font, store);
+    default:
+      return 0;
+    }
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!u.b.format.sanitize (c)) return_trace (false);
+    switch (u.b.format) {
+    case 1: case 2: case 3:
+      return_trace (u.hinting.sanitize (c));
+    case 0x8000:
+      return_trace (u.variation.sanitize (c));
+    default:
+      return_trace (true);
+    }
+  }
+
+  protected:
+  union {
+  DeviceHeader          b;
+  HintingDevice         hinting;
+  VariationDevice       variation;
+  } u;
+  public:
+  DEFINE_SIZE_UNION (6, b);
+};
+
 
 } /* namespace OT */
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -97,7 +97,7 @@
   friend struct CaretValue;
 
   private:
-  inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const
+  inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction) const
   {
     return HB_DIRECTION_IS_HORIZONTAL (direction) ? font->em_scale_x (coordinate) : font->em_scale_y (coordinate);
   }
@@ -146,11 +146,11 @@
 {
   friend struct CaretValue;
 
-  inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const
+  inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, const VariationStore &var_store) const
   {
     return HB_DIRECTION_IS_HORIZONTAL (direction) ?
-           font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font) :
-           font->em_scale_y (coordinate) + (this+deviceTable).get_y_delta (font);
+           font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font, var_store) :
+           font->em_scale_y (coordinate) + (this+deviceTable).get_y_delta (font, var_store);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -172,12 +172,15 @@
 
 struct CaretValue
 {
-  inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id) const
+  inline hb_position_t get_caret_value (hb_font_t *font,
+                                        hb_direction_t direction,
+                                        hb_codepoint_t glyph_id,
+                                        const VariationStore &var_store) const
   {
     switch (u.format) {
-    case 1: return u.format1.get_caret_value (font, direction, glyph_id);
+    case 1: return u.format1.get_caret_value (font, direction);
     case 2: return u.format2.get_caret_value (font, direction, glyph_id);
-    case 3: return u.format3.get_caret_value (font, direction, glyph_id);
+    case 3: return u.format3.get_caret_value (font, direction, var_store);
     default:return 0;
     }
   }
@@ -210,6 +213,7 @@
   inline unsigned int get_lig_carets (hb_font_t *font,
                                       hb_direction_t direction,
                                       hb_codepoint_t glyph_id,
+                                      const VariationStore &var_store,
                                       unsigned int start_offset,
                                       unsigned int *caret_count /* IN/OUT */,
                                       hb_position_t *caret_array /* OUT */) const
@@ -218,7 +222,7 @@
       const OffsetTo<CaretValue> *array = carets.sub_array (start_offset, caret_count);
       unsigned int count = *caret_count;
       for (unsigned int i = 0; i < count; i++)
-        caret_array[i] = (this+array[i]).get_caret_value (font, direction, glyph_id);
+        caret_array[i] = (this+array[i]).get_caret_value (font, direction, glyph_id, var_store);
     }
 
     return carets.len;
@@ -244,6 +248,7 @@
   inline unsigned int get_lig_carets (hb_font_t *font,
                                       hb_direction_t direction,
                                       hb_codepoint_t glyph_id,
+                                      const VariationStore &var_store,
                                       unsigned int start_offset,
                                       unsigned int *caret_count /* IN/OUT */,
                                       hb_position_t *caret_array /* OUT */) const
@@ -256,7 +261,7 @@
       return 0;
     }
     const LigGlyph &lig_glyph = this+ligGlyph[index];
-    return lig_glyph.get_lig_carets (font, direction, glyph_id, start_offset, caret_count, caret_array);
+    return lig_glyph.get_lig_carets (font, direction, glyph_id, var_store, start_offset, caret_count, caret_array);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -367,11 +372,17 @@
                                       unsigned int start_offset,
                                       unsigned int *caret_count /* IN/OUT */,
                                       hb_position_t *caret_array /* OUT */) const
-  { return (this+ligCaretList).get_lig_carets (font, direction, glyph_id, start_offset, caret_count, caret_array); }
+  { return (this+ligCaretList).get_lig_carets (font,
+                                               direction, glyph_id, get_var_store(),
+                                               start_offset, caret_count, caret_array); }
 
-  inline bool has_mark_sets (void) const { return version.to_int () >= 0x00010002u && markGlyphSetsDef[0] != 0; }
+  inline bool has_mark_sets (void) const { return version.to_int () >= 0x00010002u && markGlyphSetsDef != 0; }
   inline bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const
-  { return version.to_int () >= 0x00010002u && (this+markGlyphSetsDef[0]).covers (set_index, glyph_id); }
+  { return version.to_int () >= 0x00010002u && (this+markGlyphSetsDef).covers (set_index, glyph_id); }
+
+  inline bool has_var_store (void) const { return version.to_int () >= 0x00010003u && varStore != 0; }
+  inline const VariationStore &get_var_store (void) const
+  { return version.to_int () >= 0x00010003u ? this+varStore : Null(VariationStore); }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -382,10 +393,10 @@
                   attachList.sanitize (c, this) &&
                   ligCaretList.sanitize (c, this) &&
                   markAttachClassDef.sanitize (c, this) &&
-                  (version.to_int () < 0x00010002u || markGlyphSetsDef[0].sanitize (c, this)));
+                  (version.to_int () < 0x00010002u || markGlyphSetsDef.sanitize (c, this)) &&
+                  (version.to_int () < 0x00010003u || varStore.sanitize (c, this)));
   }
 
-
   /* glyph_props is a 16-bit integer where the lower 8-bit have bits representing
    * glyph class and other bits, and high 8-bit gthe mark attachment type (if any).
    * Not to be confused with lookup_props which is very similar. */
@@ -410,7 +421,7 @@
 
   protected:
   FixedVersion<>version;                /* Version of the GDEF table--currently
-                                         * 0x00010002u */
+                                         * 0x00010003u */
   OffsetTo<ClassDef>
                 glyphClassDef;          /* Offset to class definition table
                                          * for glyph type--from beginning of
@@ -428,12 +439,17 @@
                                          * mark attachment type--from beginning
                                          * of GDEF header (may be Null) */
   OffsetTo<MarkGlyphSets>
-                markGlyphSetsDef[VAR];  /* Offset to the table of mark set
+                markGlyphSetsDef;       /* Offset to the table of mark set
                                          * definitions--from beginning of GDEF
                                          * header (may be NULL).  Introduced
-                                         * in version 00010002. */
+                                         * in version 0x00010002. */
+  OffsetTo<VariationStore, ULONG>
+                varStore;               /* Offset to the table of Item Variation
+                                         * Store--from beginning of GDEF
+                                         * header (may be NULL).  Introduced
+                                         * in version 0x00010003. */
   public:
-  DEFINE_SIZE_ARRAY (12, markGlyphSetsDef);
+  DEFINE_SIZE_MIN (12);
 };
 
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -103,17 +103,16 @@
   inline unsigned int get_size (void) const
   { return get_len () * Value::static_size; }
 
-  void apply_value (hb_font_t            *font,
-                    hb_direction_t        direction,
+  void apply_value (hb_apply_context_t   *c,
                     const void           *base,
                     const Value          *values,
                     hb_glyph_position_t  &glyph_pos) const
   {
-    unsigned int x_ppem, y_ppem;
     unsigned int format = *this;
-    hb_bool_t horizontal = HB_DIRECTION_IS_HORIZONTAL (direction);
+    if (!format) return;
 
-    if (!format) return;
+    hb_font_t *font = c->font;
+    hb_bool_t horizontal = HB_DIRECTION_IS_HORIZONTAL (c->direction);
 
     if (format & xPlacement) glyph_pos.x_offset  += font->em_scale_x (get_short (values++));
     if (format & yPlacement) glyph_pos.y_offset  += font->em_scale_y (get_short (values++));
@@ -129,27 +128,29 @@
 
     if (!has_device ()) return;
 
-    x_ppem = font->x_ppem;
-    y_ppem = font->y_ppem;
+    bool use_x_device = font->x_ppem || font->num_coords;
+    bool use_y_device = font->y_ppem || font->num_coords;
 
-    if (!x_ppem && !y_ppem) return;
+    if (!use_x_device && !use_y_device) return;
+
+    const VariationStore &store = c->var_store;
 
     /* pixel -> fractional pixel */
     if (format & xPlaDevice) {
-      if (x_ppem) glyph_pos.x_offset  += (base + get_device (values)).get_x_delta (font);
+      if (use_x_device) glyph_pos.x_offset  += (base + get_device (values)).get_x_delta (font, store);
       values++;
     }
     if (format & yPlaDevice) {
-      if (y_ppem) glyph_pos.y_offset  += (base + get_device (values)).get_y_delta (font);
+      if (use_y_device) glyph_pos.y_offset  += (base + get_device (values)).get_y_delta (font, store);
       values++;
     }
     if (format & xAdvDevice) {
-      if (horizontal && x_ppem) glyph_pos.x_advance += (base + get_device (values)).get_x_delta (font);
+      if (horizontal && use_x_device) glyph_pos.x_advance += (base + get_device (values)).get_x_delta (font, store);
       values++;
     }
     if (format & yAdvDevice) {
       /* y_advance values grow downward but font-space grows upward, hence negation */
-      if (!horizontal && y_ppem) glyph_pos.y_advance -= (base + get_device (values)).get_y_delta (font);
+      if (!horizontal && use_y_device) glyph_pos.y_advance -= (base + get_device (values)).get_y_delta (font, store);
       values++;
     }
   }
@@ -231,11 +232,12 @@
 
 struct AnchorFormat1
 {
-  inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id HB_UNUSED,
+  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
                           hb_position_t *x, hb_position_t *y) const
   {
-      *x = font->em_scale_x (xCoordinate);
-      *y = font->em_scale_y (yCoordinate);
+    hb_font_t *font = c->font;
+    *x = font->em_scale_x (xCoordinate);
+    *y = font->em_scale_y (yCoordinate);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -254,18 +256,19 @@
 
 struct AnchorFormat2
 {
-  inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id,
+  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id,
                           hb_position_t *x, hb_position_t *y) const
   {
-      unsigned int x_ppem = font->x_ppem;
-      unsigned int y_ppem = font->y_ppem;
-      hb_position_t cx, cy;
-      hb_bool_t ret;
+    hb_font_t *font = c->font;
+    unsigned int x_ppem = font->x_ppem;
+    unsigned int y_ppem = font->y_ppem;
+    hb_position_t cx, cy;
+    hb_bool_t ret;
 
-      ret = (x_ppem || y_ppem) &&
-             font->get_glyph_contour_point_for_origin (glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy);
-      *x = ret && x_ppem ? cx : font->em_scale_x (xCoordinate);
-      *y = ret && y_ppem ? cy : font->em_scale_y (yCoordinate);
+    ret = (x_ppem || y_ppem) &&
+           font->get_glyph_contour_point_for_origin (glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy);
+    *x = ret && x_ppem ? cx : font->em_scale_x (xCoordinate);
+    *y = ret && y_ppem ? cy : font->em_scale_y (yCoordinate);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -285,16 +288,17 @@
 
 struct AnchorFormat3
 {
-  inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id HB_UNUSED,
+  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id HB_UNUSED,
                           hb_position_t *x, hb_position_t *y) const
   {
-      *x = font->em_scale_x (xCoordinate);
-      *y = font->em_scale_y (yCoordinate);
+    hb_font_t *font = c->font;
+    *x = font->em_scale_x (xCoordinate);
+    *y = font->em_scale_y (yCoordinate);
 
-      if (font->x_ppem)
-        *x += (this+xDeviceTable).get_x_delta (font);
-      if (font->y_ppem)
-        *y += (this+yDeviceTable).get_x_delta (font);
+    if (font->x_ppem || font->num_coords)
+      *x += (this+xDeviceTable).get_x_delta (font, c->var_store);
+    if (font->y_ppem || font->num_coords)
+      *y += (this+yDeviceTable).get_y_delta (font, c->var_store);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -321,14 +325,14 @@
 
 struct Anchor
 {
-  inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id,
+  inline void get_anchor (hb_apply_context_t *c, hb_codepoint_t glyph_id,
                           hb_position_t *x, hb_position_t *y) const
   {
     *x = *y = 0;
     switch (u.format) {
-    case 1: u.format1.get_anchor (font, glyph_id, x, y); return;
-    case 2: u.format2.get_anchor (font, glyph_id, x, y); return;
-    case 3: u.format3.get_anchor (font, glyph_id, x, y); return;
+    case 1: u.format1.get_anchor (c, glyph_id, x, y); return;
+    case 2: u.format2.get_anchor (c, glyph_id, x, y); return;
+    case 3: u.format3.get_anchor (c, glyph_id, x, y); return;
     default:                                             return;
     }
   }
@@ -370,7 +374,7 @@
   {
     TRACE_SANITIZE (this);
     if (!c->check_struct (this)) return_trace (false);
-    if (unlikely (rows > 0 && cols >= ((unsigned int) -1) / rows)) return_trace (false);
+    if (unlikely (_hb_unsigned_int_mul_overflows (rows, cols))) return_trace (false);
     unsigned int count = rows * cols;
     if (!c->check_array (matrixZ, matrixZ[0].static_size, count)) return_trace (false);
     for (unsigned int i = 0; i < count; i++)
@@ -428,8 +432,8 @@
 
     hb_position_t mark_x, mark_y, base_x, base_y;
 
-    mark_anchor.get_anchor (c->font, buffer->cur().codepoint, &mark_x, &mark_y);
-    glyph_anchor.get_anchor (c->font, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
+    mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y);
+    glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
 
     hb_glyph_position_t &o = buffer->cur_pos();
     o.x_offset = base_x - mark_x;
@@ -472,8 +476,7 @@
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
     if (likely (index == NOT_COVERED)) return_trace (false);
 
-    valueFormat.apply_value (c->font, c->direction, this,
-                             values, buffer->cur_pos());
+    valueFormat.apply_value (c, this, values, buffer->cur_pos());
 
     buffer->idx++;
     return_trace (true);
@@ -523,7 +526,7 @@
 
     if (likely (index >= valueCount)) return_trace (false);
 
-    valueFormat.apply_value (c->font, c->direction, this,
+    valueFormat.apply_value (c, this,
                              &values[index * valueFormat.get_len ()],
                              buffer->cur_pos());
 
@@ -640,10 +643,8 @@
         min = mid + 1;
       else
       {
-        valueFormats[0].apply_value (c->font, c->direction, this,
-                                     &record->values[0], buffer->cur_pos());
-        valueFormats[1].apply_value (c->font, c->direction, this,
-                                     &record->values[len1], buffer->pos[pos]);
+        valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos());
+        valueFormats[1].apply_value (c, this, &record->values[len1], buffer->pos[pos]);
         if (len2)
           pos++;
         buffer->idx = pos;
@@ -689,7 +690,7 @@
     (this+coverage).add_coverage (c->input);
     unsigned int count = pairSet.len;
     for (unsigned int i = 0; i < count; i++)
-      (this+pairSet[i]).collect_glyphs (c, &valueFormat1);
+      (this+pairSet[i]).collect_glyphs (c, valueFormat);
   }
 
   inline const Coverage &get_coverage (void) const
@@ -708,7 +709,7 @@
     skippy_iter.reset (buffer->idx, 1);
     if (!skippy_iter.next ()) return_trace (false);
 
-    return_trace ((this+pairSet[index]).apply (c, &valueFormat1, skippy_iter.idx));
+    return_trace ((this+pairSet[index]).apply (c, valueFormat, skippy_iter.idx));
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -717,11 +718,11 @@
 
     if (!c->check_struct (this)) return_trace (false);
 
-    unsigned int len1 = valueFormat1.get_len ();
-    unsigned int len2 = valueFormat2.get_len ();
+    unsigned int len1 = valueFormat[0].get_len ();
+    unsigned int len2 = valueFormat[1].get_len ();
     PairSet::sanitize_closure_t closure = {
       this,
-      &valueFormat1,
+      valueFormat,
       len1,
       1 + len1 + len2
     };
@@ -734,10 +735,10 @@
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of subtable */
-  ValueFormat   valueFormat1;           /* Defines the types of data in
+  ValueFormat   valueFormat[2];         /* [0] Defines the types of data in
                                          * ValueRecord1--for the first glyph
                                          * in the pair--may be zero (0) */
-  ValueFormat   valueFormat2;           /* Defines the types of data in
+                                        /* [1] Defines the types of data in
                                          * ValueRecord2--for the second glyph
                                          * in the pair--may be zero (0) */
   OffsetArrayOf<PairSet>
@@ -790,10 +791,8 @@
     if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) return_trace (false);
 
     const Value *v = &values[record_len * (klass1 * class2Count + klass2)];
-    valueFormat1.apply_value (c->font, c->direction, this,
-                              v, buffer->cur_pos());
-    valueFormat2.apply_value (c->font, c->direction, this,
-                              v + len1, buffer->pos[skippy_iter.idx]);
+    valueFormat1.apply_value (c, this, v, buffer->cur_pos());
+    valueFormat2.apply_value (c, this, v + len1, buffer->pos[skippy_iter.idx]);
 
     buffer->idx = skippy_iter.idx;
     if (len2)
@@ -931,8 +930,8 @@
     unsigned int j = skippy_iter.idx;
 
     hb_position_t entry_x, entry_y, exit_x, exit_y;
-    (this+this_record.exitAnchor).get_anchor (c->font, buffer->info[i].codepoint, &exit_x, &exit_y);
-    (this+next_record.entryAnchor).get_anchor (c->font, buffer->info[j].codepoint, &entry_x, &entry_y);
+    (this+this_record.exitAnchor).get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y);
+    (this+next_record.entryAnchor).get_anchor (c, buffer->info[j].codepoint, &entry_x, &entry_y);
 
     hb_glyph_position_t *pos = buffer->pos;
 
@@ -1519,8 +1518,6 @@
     const OffsetTo<PosLookupList> &list = CastR<OffsetTo<PosLookupList> > (lookupList);
     return_trace (list.sanitize (c, this));
   }
-  public:
-  DEFINE_SIZE_STATIC (10);
 };
 
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -41,7 +41,10 @@
   {
     TRACE_CLOSURE (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      /* TODO Switch to range-based API to work around malicious fonts.
+       * https://github.com/behdad/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
       if (c->glyphs->has (glyph_id))
         c->glyphs->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
@@ -52,7 +55,10 @@
   {
     TRACE_COLLECT_GLYPHS (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      /* TODO Switch to range-based API to work around malicious fonts.
+       * https://github.com/behdad/harfbuzz/issues/363 */
       hb_codepoint_t glyph_id = iter.get_glyph ();
       c->input->add (glyph_id);
       c->output->add ((glyph_id + deltaGlyphID) & 0xFFFFu);
@@ -120,7 +126,11 @@
   {
     TRACE_CLOSURE (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = substitute.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -130,7 +140,11 @@
   {
     TRACE_COLLECT_GLYPHS (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = substitute.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       c->output->add (substitute[iter.get_coverage ()]);
     }
@@ -321,7 +335,11 @@
   {
     TRACE_CLOSURE (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = sequence.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         (this+sequence[iter.get_coverage ()]).closure (c);
     }
@@ -439,7 +457,11 @@
   {
     TRACE_CLOSURE (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = alternateSet.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ())) {
         const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
         unsigned int count = alt_set.len;
@@ -453,7 +475,11 @@
   {
     TRACE_COLLECT_GLYPHS (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = alternateSet.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
       unsigned int count = alt_set.len;
@@ -762,7 +788,11 @@
   {
     TRACE_CLOSURE (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = ligatureSet.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         (this+ligatureSet[iter.get_coverage ()]).closure (c);
     }
@@ -772,7 +802,11 @@
   {
     TRACE_COLLECT_GLYPHS (this);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    unsigned int count = ligatureSet.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       c->input->add (iter.get_glyph ());
       (this+ligatureSet[iter.get_coverage ()]).collect_glyphs (c);
     }
@@ -923,7 +957,11 @@
 
     const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
     Coverage::Iter iter;
-    for (iter.init (this+coverage); iter.more (); iter.next ()) {
+    count = substitute.len;
+    for (iter.init (this+coverage); iter.more (); iter.next ())
+    {
+      if (unlikely (iter.get_coverage () >= count))
+        break; /* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
       if (c->glyphs->has (iter.get_glyph ()))
         c->glyphs->add (substitute[iter.get_coverage ()]);
     }
@@ -1273,8 +1311,6 @@
     const OffsetTo<SubstLookupList> &list = CastR<OffsetTo<SubstLookupList> > (lookupList);
     return_trace (list.sanitize (c, this));
   }
-  public:
-  DEFINE_SIZE_STATIC (10);
 };
 
 
@@ -1285,28 +1321,10 @@
 
   const GDEF &gdef = *hb_ot_layout_from_face (font->face)->gdef;
   unsigned int count = buffer->len;
-  hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 0; i < count; i++)
   {
-    unsigned int props = gdef.get_glyph_props (info[i].codepoint);
-    if (!props)
-    {
-      /* Never mark default-ignorables as marks.
-       * They won't get in the way of lookups anyway,
-       * but having them as mark will cause them to be skipped
-       * over if the lookup-flag says so, but at least for the
-       * Mongolian variation selectors, looks like Uniscribe
-       * marks them as non-mark.  Some Mongolian fonts without
-       * GDEF rely on this.  Another notable character that
-       * this applies to is COMBINING GRAPHEME JOINER. */
-      props = (_hb_glyph_info_get_general_category (&info[i]) !=
-               HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK ||
-               _hb_glyph_info_is_default_ignorable (&info[i])) ?
-              HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH :
-              HB_OT_LAYOUT_GLYPH_PROPS_MARK;
-    }
-    _hb_glyph_info_set_glyph_props (&info[i], props);
-    _hb_glyph_info_clear_lig_props (&info[i]);
+    _hb_glyph_info_set_glyph_props (&buffer->info[i], gdef.get_glyph_props (buffer->info[i].codepoint));
+    _hb_glyph_info_clear_lig_props (&buffer->info[i]);
     buffer->info[i].syllable() = 0;
   }
 }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -469,6 +469,7 @@
   unsigned int lookup_props;
   const GDEF &gdef;
   bool has_glyph_classes;
+  const VariationStore &var_store;
   skipping_iterator_t iter_input, iter_context;
   unsigned int lookup_index;
   unsigned int debug_depth;
@@ -487,6 +488,7 @@
                         lookup_props (0),
                         gdef (*hb_ot_layout_from_face (face)->gdef),
                         has_glyph_classes (gdef.has_glyph_classes ()),
+                        var_store (gdef.get_var_store ()),
                         iter_input (),
                         iter_context (),
                         lookup_index ((unsigned int) -1),
@@ -999,8 +1001,12 @@
     end = int (end) + delta;
     if (end <= match_positions[idx])
     {
+      /* End might end up being smaller than match_positions[idx] if the recursed
+       * lookup ended up removing many items, more than we have had matched.
+       * Just never rewind end back and get out of here.
+       * https://bugs.chromium.org/p/chromium/issues/detail?id=659496 */
+      end = match_positions[idx];
       /* There can't be any further changes. */
-      assert (end == match_positions[idx]);
       break;
     }
 
@@ -2269,6 +2275,24 @@
   inline const Lookup& get_lookup (unsigned int i) const
   { return (this+lookupList)[i]; }
 
+  inline bool find_variations_index (const int *coords, unsigned int num_coords,
+                                     unsigned int *index) const
+  { return (version.to_int () >= 0x00010001u ? this+featureVars : Null(FeatureVariations))
+           .find_index (coords, num_coords, index); }
+  inline const Feature& get_feature_variation (unsigned int feature_index,
+                                               unsigned int variations_index) const
+  {
+    if (FeatureVariations::NOT_FOUND_INDEX != variations_index &&
+        version.to_int () >= 0x00010001u)
+    {
+      const Feature *feature = (this+featureVars).find_substitute (variations_index,
+                                                                   feature_index);
+      if (feature)
+        return *feature;
+    }
+    return get_feature (feature_index);
+  }
+
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -2276,7 +2300,8 @@
                   likely (version.major == 1) &&
                   scriptList.sanitize (c, this) &&
                   featureList.sanitize (c, this) &&
-                  lookupList.sanitize (c, this));
+                  lookupList.sanitize (c, this) &&
+                  (version.to_int () < 0x00010001u || featureVars.sanitize (c, this)));
   }
 
   protected:
@@ -2288,8 +2313,13 @@
                 featureList;    /* FeatureList table */
   OffsetTo<LookupList>
                 lookupList;     /* LookupList table */
+  OffsetTo<FeatureVariations, ULONG>
+                featureVars;    /* Offset to Feature Variations
+                                   table--from beginning of table
+                                 * (may be NULL).  Introduced
+                                 * in version 0x00010001. */
   public:
-  DEFINE_SIZE_STATIC (10);
+  DEFINE_SIZE_MIN (10);
 };
 
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -124,6 +124,7 @@
   struct GDEF;
   struct GSUB;
   struct GPOS;
+  struct MATH;
 }
 
 struct hb_ot_layout_lookup_accelerator_t
@@ -152,10 +153,12 @@
   hb_blob_t *gdef_blob;
   hb_blob_t *gsub_blob;
   hb_blob_t *gpos_blob;
+  hb_blob_t *math_blob;
 
   const struct OT::GDEF *gdef;
   const struct OT::GSUB *gsub;
   const struct OT::GPOS *gpos;
+  const struct OT::MATH *math;
 
   unsigned int gsub_lookup_count;
   unsigned int gpos_lookup_count;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -60,6 +60,10 @@
   layout->gpos_blob = OT::Sanitizer<OT::GPOS>::sanitize (face->reference_table (HB_OT_TAG_GPOS));
   layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob);
 
+  /* The MATH table is rarely used, so only try and load it in _get_math. */
+  layout->math_blob = NULL;
+  layout->math = NULL;
+
   {
     /*
      * The ugly business of blacklisting individual fonts' tables happen here!
@@ -120,6 +124,14 @@
       /* 2c0c90c6f6087ffbfea76589c93113a9cbb0e75f  cantarell-fonts-0.0.21/otf/Cantarell-Bold.otf */
       /* 55461f5b853c6da88069ffcdf7f4dd3f8d7e3e6b  cantarell-fonts-0.0.21/otf/Cantarell-Bold-Oblique.otf */
       || (188 == gdef_len && 3426 == gpos_len && 264 == gsub_len)
+      /* 6c93b63b64e8b2c93f5e824e78caca555dc887c7 padauk-2.80/Padauk-book.ttf */
+      || (1046 == gdef_len && 17112 == gpos_len && 71788 == gsub_len)
+      /* d89b1664058359b8ec82e35d3531931125991fb9 padauk-2.80/Padauk-bookbold.ttf */
+      || (1058 == gdef_len && 17514 == gpos_len && 71794 == gsub_len)
+      /* 824cfd193aaf6234b2b4dc0cf3c6ef576c0d00ef padauk-3.0/Padauk-book.ttf */
+      || (1330 == gdef_len && 57938 == gpos_len && 109904 == gsub_len)
+      /* 91fcc10cf15e012d27571e075b3b4dfe31754a8a padauk-3.0/Padauk-bookbold.ttf */
+      || (1330 == gdef_len && 58972 == gpos_len && 109904 == gsub_len)
     )
     {
       /* Many versions of Tahoma have bad GDEF tables that incorrectly classify some spacing marks
@@ -169,6 +181,7 @@
   hb_blob_destroy (layout->gdef_blob);
   hb_blob_destroy (layout->gsub_blob);
   hb_blob_destroy (layout->gpos_blob);
+  hb_blob_destroy (layout->math_blob);
 
   free (layout);
 }
@@ -192,7 +205,6 @@
   return *hb_ot_layout_from_face (face)->gpos;
 }
 
-
 /*
  * GDEF
  */
@@ -544,10 +556,13 @@
                                   unsigned int *lookup_count /* IN/OUT */,
                                   unsigned int *lookup_indexes /* OUT */)
 {
-  const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
-  const OT::Feature &f = g.get_feature (feature_index);
-
-  return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes);
+  return hb_ot_layout_feature_with_variations_get_lookups (face,
+                                                           table_tag,
+                                                           feature_index,
+                                                           HB_OT_LAYOUT_NO_VARIATIONS_INDEX,
+                                                           start_offset,
+                                                           lookup_count,
+                                                           lookup_indexes);
 }
 
 /**
@@ -798,6 +813,38 @@
 }
 
 
+/* Variations support */
+
+hb_bool_t
+hb_ot_layout_table_find_feature_variations (hb_face_t    *face,
+                                            hb_tag_t      table_tag,
+                                            const int    *coords,
+                                            unsigned int  num_coords,
+                                            unsigned int *variations_index /* out */)
+{
+  const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
+
+  return g.find_variations_index (coords, num_coords, variations_index);
+}
+
+unsigned int
+hb_ot_layout_feature_with_variations_get_lookups (hb_face_t    *face,
+                                                  hb_tag_t      table_tag,
+                                                  unsigned int  feature_index,
+                                                  unsigned int  variations_index,
+                                                  unsigned int  start_offset,
+                                                  unsigned int *lookup_count /* IN/OUT */,
+                                                  unsigned int *lookup_indexes /* OUT */)
+{
+  ASSERT_STATIC (OT::FeatureVariations::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_VARIATIONS_INDEX);
+  const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
+
+  const OT::Feature &f = g.get_feature_variation (feature_index, variations_index);
+
+  return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes);
+}
+
+
 /*
  * OT::GSUB
  */
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h	Fri Jan 20 07:05:40 2017 -0800
@@ -95,6 +95,7 @@
 #define HB_OT_LAYOUT_NO_SCRIPT_INDEX            0xFFFFu
 #define HB_OT_LAYOUT_NO_FEATURE_INDEX           0xFFFFu
 #define HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX     0xFFFFu
+#define HB_OT_LAYOUT_NO_VARIATIONS_INDEX        0xFFFFFFFFu
 
 HB_EXTERN unsigned int
 hb_ot_layout_table_get_script_tags (hb_face_t    *face,
@@ -236,6 +237,24 @@
                                          void         *user_data);
 #endif
 
+/* Variations support */
+
+HB_EXTERN hb_bool_t
+hb_ot_layout_table_find_feature_variations (hb_face_t    *face,
+                                            hb_tag_t      table_tag,
+                                            const int    *coords,
+                                            unsigned int  num_coords,
+                                            unsigned int *variations_index /* out */);
+
+HB_EXTERN unsigned int
+hb_ot_layout_feature_with_variations_get_lookups (hb_face_t    *face,
+                                                  hb_tag_t      table_tag,
+                                                  unsigned int  feature_index,
+                                                  unsigned int  variations_index,
+                                                  unsigned int  start_offset,
+                                                  unsigned int *lookup_count /* IN/OUT */,
+                                                  unsigned int *lookup_indexes /* OUT */);
+
 
 /*
  * GSUB
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -139,12 +139,6 @@
 
   private:
 
-  HB_INTERNAL void add_lookups (hb_face_t    *face,
-                                unsigned int  table_index,
-                                unsigned int  feature_index,
-                                hb_mask_t     mask,
-                                bool          auto_zwj);
-
   hb_mask_t global_mask;
 
   hb_prealloced_array_t<feature_map_t, 8> features;
@@ -182,7 +176,9 @@
   inline void add_gpos_pause (hb_ot_map_t::pause_func_t pause_func)
   { add_pause (1, pause_func); }
 
-  HB_INTERNAL void compile (struct hb_ot_map_t &m);
+  HB_INTERNAL void compile (hb_ot_map_t  &m,
+                            const int    *coords,
+                            unsigned int  num_coords);
 
   inline void finish (void) {
     feature_infos.finish ();
@@ -194,6 +190,14 @@
 
   private:
 
+  HB_INTERNAL void add_lookups (hb_ot_map_t  &m,
+                                hb_face_t    *face,
+                                unsigned int  table_index,
+                                unsigned int  feature_index,
+                                unsigned int  variations_index,
+                                hb_mask_t     mask,
+                                bool          auto_zwj);
+
   struct feature_info_t {
     hb_tag_t tag;
     unsigned int seq; /* sequence#, used for stable sorting only */
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -31,43 +31,12 @@
 #include "hb-ot-layout-private.hh"
 
 
-void
-hb_ot_map_t::add_lookups (hb_face_t    *face,
-                          unsigned int  table_index,
-                          unsigned int  feature_index,
-                          hb_mask_t     mask,
-                          bool          auto_zwj)
+void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const
 {
-  unsigned int lookup_indices[32];
-  unsigned int offset, len;
-  unsigned int table_lookup_count;
+  for (unsigned int i = 0; i < lookups[table_index].len; i++)
+    hb_set_add (lookups_out, lookups[table_index][i].index);
+}
 
-  table_lookup_count = hb_ot_layout_table_get_lookup_count (face, table_tags[table_index]);
-
-  offset = 0;
-  do {
-    len = ARRAY_LENGTH (lookup_indices);
-    hb_ot_layout_feature_get_lookups (face,
-                                      table_tags[table_index],
-                                      feature_index,
-                                      offset, &len,
-                                      lookup_indices);
-
-    for (unsigned int i = 0; i < len; i++)
-    {
-      if (lookup_indices[i] >= table_lookup_count)
-        continue;
-      hb_ot_map_t::lookup_map_t *lookup = lookups[table_index].push ();
-      if (unlikely (!lookup))
-        return;
-      lookup->mask = mask;
-      lookup->index = lookup_indices[i];
-      lookup->auto_zwj = auto_zwj;
-    }
-
-    offset += len;
-  } while (len == ARRAY_LENGTH (lookup_indices));
-}
 
 hb_ot_map_builder_t::hb_ot_map_builder_t (hb_face_t *face_,
                                           const hb_segment_properties_t *props_)
@@ -109,13 +78,48 @@
   info->stage[1] = current_stage[1];
 }
 
+void
+hb_ot_map_builder_t::add_lookups (hb_ot_map_t  &m,
+                                  hb_face_t    *face,
+                                  unsigned int  table_index,
+                                  unsigned int  feature_index,
+                                  unsigned int  variations_index,
+                                  hb_mask_t     mask,
+                                  bool          auto_zwj)
+{
+  unsigned int lookup_indices[32];
+  unsigned int offset, len;
+  unsigned int table_lookup_count;
 
-void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const
-{
-  for (unsigned int i = 0; i < lookups[table_index].len; i++)
-    hb_set_add (lookups_out, lookups[table_index][i].index);
+  table_lookup_count = hb_ot_layout_table_get_lookup_count (face, table_tags[table_index]);
+
+  offset = 0;
+  do {
+    len = ARRAY_LENGTH (lookup_indices);
+    hb_ot_layout_feature_with_variations_get_lookups (face,
+                                                      table_tags[table_index],
+                                                      feature_index,
+                                                      variations_index,
+                                                      offset, &len,
+                                                      lookup_indices);
+
+    for (unsigned int i = 0; i < len; i++)
+    {
+      if (lookup_indices[i] >= table_lookup_count)
+        continue;
+      hb_ot_map_t::lookup_map_t *lookup = m.lookups[table_index].push ();
+      if (unlikely (!lookup))
+        return;
+      lookup->mask = mask;
+      lookup->index = lookup_indices[i];
+      lookup->auto_zwj = auto_zwj;
+    }
+
+    offset += len;
+  } while (len == ARRAY_LENGTH (lookup_indices));
 }
 
+
 void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func)
 {
   stage_info_t *s = stages[table_index].push ();
@@ -128,7 +132,9 @@
 }
 
 void
-hb_ot_map_builder_t::compile (hb_ot_map_t &m)
+hb_ot_map_builder_t::compile (hb_ot_map_t  &m,
+                              const int    *coords,
+                              unsigned int  num_coords)
 {
   m.global_mask = 1;
 
@@ -193,7 +199,8 @@
       /* Uses the global bit */
       bits_needed = 0;
     else
-      bits_needed = _hb_bit_storage (info->max_value);
+      /* Limit to 8 bits per feature. */
+      bits_needed = MIN(8u, _hb_bit_storage (info->max_value));
 
     if (!info->max_value || next_bit + bits_needed > 8 * sizeof (hb_mask_t))
       continue; /* Feature disabled, or not enough bits. */
@@ -243,11 +250,11 @@
       map->mask = 1;
     } else {
       map->shift = next_bit;
-      map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit);
+      map->mask = (1u << (next_bit + bits_needed)) - (1u << next_bit);
       next_bit += bits_needed;
       m.global_mask |= (info->default_value << map->shift) & map->mask;
     }
-    map->_1_mask = (1 << map->shift) & map->mask;
+    map->_1_mask = (1u << map->shift) & map->mask;
     map->needs_fallback = !found;
 
   }
@@ -261,23 +268,32 @@
   {
     /* Collect lookup indices for features */
 
+    unsigned int variations_index;
+    hb_ot_layout_table_find_feature_variations (face,
+                                                table_tags[table_index],
+                                                coords,
+                                                num_coords,
+                                                &variations_index);
+
     unsigned int stage_index = 0;
     unsigned int last_num_lookups = 0;
     for (unsigned stage = 0; stage < current_stage[table_index]; stage++)
     {
       if (required_feature_index[table_index] != HB_OT_LAYOUT_NO_FEATURE_INDEX &&
           required_feature_stage[table_index] == stage)
-        m.add_lookups (face, table_index,
-                       required_feature_index[table_index],
-                       1 /* mask */,
-                       true /* auto_zwj */);
+        add_lookups (m, face, table_index,
+                     required_feature_index[table_index],
+                     variations_index,
+                     1 /* mask */,
+                     true /* auto_zwj */);
 
       for (unsigned i = 0; i < m.features.len; i++)
         if (m.features[i].stage[table_index] == stage)
-          m.add_lookups (face, table_index,
-                         m.features[i].index[table_index],
-                         m.features[i].mask,
-                         m.features[i].auto_zwj);
+          add_lookups (m, face, table_index,
+                       m.features[i].index[table_index],
+                       variations_index,
+                       m.features[i].mask,
+                       m.features[i].auto_zwj);
 
       /* Sort lookups and merge duplicates */
       if (last_num_lookups < m.lookups[table_index].len)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h	Fri Jan 20 07:05:40 2017 -0800
@@ -0,0 +1,209 @@
+/*
+ * Copyright © 2016  Igalia S.L.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Igalia Author(s): Frédéric Wang
+ */
+
+#ifndef HB_OT_H_IN
+#error "Include <hb-ot.h> instead."
+#endif
+
+#ifndef HB_OT_MATH_H
+#define HB_OT_MATH_H
+
+#include "hb.h"
+
+HB_BEGIN_DECLS
+
+
+/*
+ * MATH
+ */
+
+#define HB_OT_TAG_MATH HB_TAG('M','A','T','H')
+
+/* Use with hb_buffer_set_script() for math shaping. */
+#define HB_OT_MATH_SCRIPT HB_TAG('m','a','t','h')
+
+/* Types */
+
+/**
+ * hb_ot_math_constant_t:
+ *
+ * Since: 1.3.3
+ */
+typedef enum {
+  HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN = 0,
+  HB_OT_MATH_CONSTANT_SCRIPT_SCRIPT_PERCENT_SCALE_DOWN = 1,
+  HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT = 2,
+  HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT = 3,
+  HB_OT_MATH_CONSTANT_MATH_LEADING = 4,
+  HB_OT_MATH_CONSTANT_AXIS_HEIGHT = 5,
+  HB_OT_MATH_CONSTANT_ACCENT_BASE_HEIGHT = 6,
+  HB_OT_MATH_CONSTANT_FLATTENED_ACCENT_BASE_HEIGHT = 7,
+  HB_OT_MATH_CONSTANT_SUBSCRIPT_SHIFT_DOWN = 8,
+  HB_OT_MATH_CONSTANT_SUBSCRIPT_TOP_MAX = 9,
+  HB_OT_MATH_CONSTANT_SUBSCRIPT_BASELINE_DROP_MIN = 10,
+  HB_OT_MATH_CONSTANT_SUPERSCRIPT_SHIFT_UP = 11,
+  HB_OT_MATH_CONSTANT_SUPERSCRIPT_SHIFT_UP_CRAMPED = 12,
+  HB_OT_MATH_CONSTANT_SUPERSCRIPT_BOTTOM_MIN = 13,
+  HB_OT_MATH_CONSTANT_SUPERSCRIPT_BASELINE_DROP_MAX = 14,
+  HB_OT_MATH_CONSTANT_SUB_SUPERSCRIPT_GAP_MIN = 15,
+  HB_OT_MATH_CONSTANT_SUPERSCRIPT_BOTTOM_MAX_WITH_SUBSCRIPT = 16,
+  HB_OT_MATH_CONSTANT_SPACE_AFTER_SCRIPT = 17,
+  HB_OT_MATH_CONSTANT_UPPER_LIMIT_GAP_MIN = 18,
+  HB_OT_MATH_CONSTANT_UPPER_LIMIT_BASELINE_RISE_MIN = 19,
+  HB_OT_MATH_CONSTANT_LOWER_LIMIT_GAP_MIN = 20,
+  HB_OT_MATH_CONSTANT_LOWER_LIMIT_BASELINE_DROP_MIN = 21,
+  HB_OT_MATH_CONSTANT_STACK_TOP_SHIFT_UP = 22,
+  HB_OT_MATH_CONSTANT_STACK_TOP_DISPLAY_STYLE_SHIFT_UP = 23,
+  HB_OT_MATH_CONSTANT_STACK_BOTTOM_SHIFT_DOWN = 24,
+  HB_OT_MATH_CONSTANT_STACK_BOTTOM_DISPLAY_STYLE_SHIFT_DOWN = 25,
+  HB_OT_MATH_CONSTANT_STACK_GAP_MIN = 26,
+  HB_OT_MATH_CONSTANT_STACK_DISPLAY_STYLE_GAP_MIN = 27,
+  HB_OT_MATH_CONSTANT_STRETCH_STACK_TOP_SHIFT_UP = 28,
+  HB_OT_MATH_CONSTANT_STRETCH_STACK_BOTTOM_SHIFT_DOWN = 29,
+  HB_OT_MATH_CONSTANT_STRETCH_STACK_GAP_ABOVE_MIN = 30,
+  HB_OT_MATH_CONSTANT_STRETCH_STACK_GAP_BELOW_MIN = 31,
+  HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_SHIFT_UP = 32,
+  HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_DISPLAY_STYLE_SHIFT_UP = 33,
+  HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_SHIFT_DOWN = 34,
+  HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_DISPLAY_STYLE_SHIFT_DOWN = 35,
+  HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_GAP_MIN = 36,
+  HB_OT_MATH_CONSTANT_FRACTION_NUM_DISPLAY_STYLE_GAP_MIN = 37,
+  HB_OT_MATH_CONSTANT_FRACTION_RULE_THICKNESS = 38,
+  HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_GAP_MIN = 39,
+  HB_OT_MATH_CONSTANT_FRACTION_DENOM_DISPLAY_STYLE_GAP_MIN = 40,
+  HB_OT_MATH_CONSTANT_SKEWED_FRACTION_HORIZONTAL_GAP = 41,
+  HB_OT_MATH_CONSTANT_SKEWED_FRACTION_VERTICAL_GAP = 42,
+  HB_OT_MATH_CONSTANT_OVERBAR_VERTICAL_GAP = 43,
+  HB_OT_MATH_CONSTANT_OVERBAR_RULE_THICKNESS = 44,
+  HB_OT_MATH_CONSTANT_OVERBAR_EXTRA_ASCENDER = 45,
+  HB_OT_MATH_CONSTANT_UNDERBAR_VERTICAL_GAP = 46,
+  HB_OT_MATH_CONSTANT_UNDERBAR_RULE_THICKNESS = 47,
+  HB_OT_MATH_CONSTANT_UNDERBAR_EXTRA_DESCENDER = 48,
+  HB_OT_MATH_CONSTANT_RADICAL_VERTICAL_GAP = 49,
+  HB_OT_MATH_CONSTANT_RADICAL_DISPLAY_STYLE_VERTICAL_GAP = 50,
+  HB_OT_MATH_CONSTANT_RADICAL_RULE_THICKNESS = 51,
+  HB_OT_MATH_CONSTANT_RADICAL_EXTRA_ASCENDER = 52,
+  HB_OT_MATH_CONSTANT_RADICAL_KERN_BEFORE_DEGREE = 53,
+  HB_OT_MATH_CONSTANT_RADICAL_KERN_AFTER_DEGREE = 54,
+  HB_OT_MATH_CONSTANT_RADICAL_DEGREE_BOTTOM_RAISE_PERCENT = 55
+} hb_ot_math_constant_t;
+
+/**
+ * hb_ot_math_kern_t:
+ *
+ * Since: 1.3.3
+ */
+typedef enum {
+  HB_OT_MATH_KERN_TOP_RIGHT = 0,
+  HB_OT_MATH_KERN_TOP_LEFT = 1,
+  HB_OT_MATH_KERN_BOTTOM_RIGHT = 2,
+  HB_OT_MATH_KERN_BOTTOM_LEFT = 3
+} hb_ot_math_kern_t;
+
+/**
+ * hb_ot_math_glyph_variant_t:
+ *
+ * Since: 1.3.3
+ */
+typedef struct hb_ot_math_glyph_variant_t {
+  hb_codepoint_t glyph;
+  hb_position_t advance;
+} hb_ot_math_glyph_variant_t;
+
+/**
+ * hb_ot_math_glyph_part_flags_t:
+ *
+ * Since: 1.3.3
+ */
+typedef enum { /*< flags >*/
+  HB_MATH_GLYPH_PART_FLAG_EXTENDER      = 0x00000001u  /* Extender glyph */
+} hb_ot_math_glyph_part_flags_t;
+
+/**
+ * hb_ot_math_glyph_part_t:
+ *
+ * Since: 1.3.3
+ */
+typedef struct hb_ot_math_glyph_part_t {
+  hb_codepoint_t glyph;
+  hb_position_t start_connector_length;
+  hb_position_t end_connector_length;
+  hb_position_t full_advance;
+  hb_ot_math_glyph_part_flags_t flags;
+} hb_ot_math_glyph_part_t;
+
+/* Methods */
+
+HB_EXTERN hb_bool_t
+hb_ot_math_has_data (hb_face_t *face);
+
+HB_EXTERN hb_position_t
+hb_ot_math_get_constant (hb_font_t *font,
+                         hb_ot_math_constant_t constant);
+
+HB_EXTERN hb_position_t
+hb_ot_math_get_glyph_italics_correction (hb_font_t *font,
+                                         hb_codepoint_t glyph);
+
+HB_EXTERN hb_position_t
+hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font,
+                                            hb_codepoint_t glyph);
+
+HB_EXTERN hb_bool_t
+hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
+                                    hb_codepoint_t glyph);
+
+HB_EXTERN hb_position_t
+hb_ot_math_get_glyph_kerning (hb_font_t *font,
+                              hb_codepoint_t glyph,
+                              hb_ot_math_kern_t kern,
+                              hb_position_t correction_height);
+
+HB_EXTERN unsigned int
+hb_ot_math_get_glyph_variants (hb_font_t *font,
+                               hb_codepoint_t glyph,
+                               hb_direction_t direction,
+                               unsigned int start_offset,
+                               unsigned int *variants_count, /* IN/OUT */
+                               hb_ot_math_glyph_variant_t *variants /* OUT */);
+
+HB_EXTERN hb_position_t
+hb_ot_math_get_min_connector_overlap (hb_font_t *font,
+                                      hb_direction_t direction);
+
+HB_EXTERN unsigned int
+hb_ot_math_get_glyph_assembly (hb_font_t *font,
+                               hb_codepoint_t glyph,
+                               hb_direction_t direction,
+                               unsigned int start_offset,
+                               unsigned int *parts_count, /* IN/OUT */
+                               hb_ot_math_glyph_part_t *parts, /* OUT */
+                               hb_position_t *italics_correction /* OUT */);
+
+
+HB_END_DECLS
+
+#endif /* HB_OT_MATH_H */
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -618,6 +618,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   setup_masks_arabic,
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   true, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -40,6 +40,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   NULL, /* setup_masks */
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   true, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -419,6 +419,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   setup_masks_hangul,
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
   false, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -154,6 +154,18 @@
   return found;
 }
 
+static bool
+disable_otl_hebrew (const hb_ot_shape_plan_t *plan)
+{
+  /* For Hebrew shaper, use fallback if GPOS does not have 'hebr'
+   * script.  This matches Uniscribe better, and makes fonts like
+   * Arial that have GSUB/GPOS/GDEF but no data for Hebrew work.
+   * See:
+   * https://github.com/behdad/harfbuzz/issues/347#issuecomment-267838368
+   */
+  return plan->map.chosen_script[1] != HB_TAG ('h','e','b','r');
+}
+
 
 const hb_ot_complex_shaper_t _hb_ot_complex_shaper_hebrew =
 {
@@ -168,6 +180,7 @@
   NULL, /* decompose */
   compose_hebrew,
   NULL, /* setup_masks */
+  disable_otl_hebrew,
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   true, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -34,1316 +34,1316 @@
 
 #line 36 "hb-ot-shape-complex-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
-        8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u,
-        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u,
-        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u,
-        7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u,
-        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u,
-        8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
-        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
-        16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u,
-        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 5u, 8u, 4u, 14u, 4u, 14u, 5u, 8u,
-        5u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u,
-        5u, 7u, 7u, 7u, 8u, 8u, 1u, 16u, 8u, 13u, 4u, 8u, 6u, 6u, 16u, 16u,
-        4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u,
-        16u, 16u, 8u, 8u, 1u, 18u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
-        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
-        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u,
-        5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u,
-        3u, 10u, 5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u,
-        5u, 14u, 3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u,
-        1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
-        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
-        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u,
-        9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u,
-        5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u,
-        4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u,
-        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u,
-        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
-        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
-        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 3u, 17u, 4u, 14u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u,
-        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u,
-        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u,
-        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u,
-        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
-        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
-        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 1u, 17u, 3u, 17u,
-        1u, 17u, 4u, 14u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u,
-        5u, 10u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 3u, 17u, 3u, 17u, 1u, 16u,
-        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u,
-        5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u,
-        3u, 13u, 1u, 16u, 3u, 10u, 5u, 10u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u,
+        8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 
+        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 
+        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 
+        4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 
+        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u, 
+        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 
+        7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 
+        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 
+        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 
+        4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 
+        5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 
+        7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 
+        6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 
+        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 8u, 8u, 1u, 16u, 
+        8u, 13u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 
+        5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 
+        4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 
+        16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 
+        4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 5u, 8u, 4u, 14u, 4u, 14u, 5u, 8u, 
+        5u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 5u, 7u, 7u, 7u, 5u, 8u, 
+        5u, 7u, 7u, 7u, 8u, 8u, 1u, 16u, 8u, 13u, 4u, 8u, 6u, 6u, 16u, 16u, 
+        4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 
+        16u, 16u, 8u, 8u, 1u, 18u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 
+        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 
+        3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 
+        5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 
+        3u, 10u, 5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 
+        5u, 14u, 3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 
+        1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 
+        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 
+        4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 
+        9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 
+        5u, 10u, 3u, 10u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 
+        4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+        3u, 14u, 1u, 16u, 4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u, 
+        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u, 
+        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u, 
+        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 
+        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 
+        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 3u, 17u, 4u, 14u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 4u, 17u, 5u, 14u, 5u, 14u, 5u, 10u, 9u, 10u, 9u, 9u, 
+        9u, 10u, 9u, 10u, 9u, 9u, 5u, 10u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u, 
+        3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 1u, 16u, 
+        4u, 14u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 
+        3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 
+        3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 
+        1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 1u, 17u, 3u, 17u, 
+        1u, 17u, 4u, 14u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 9u, 10u, 9u, 9u, 
+        5u, 10u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 3u, 17u, 3u, 17u, 1u, 16u, 
+        3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 
+        5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 13u, 3u, 10u, 5u, 10u, 3u, 10u, 
+        3u, 13u, 1u, 16u, 3u, 10u, 5u, 10u, 5u, 10u, 9u, 10u, 9u, 9u, 9u, 10u, 
         9u, 10u, 9u, 9u, 5u, 10u, 0
 };
 
 static const char _indic_syllable_machine_key_spans[] = {
-        1, 16, 6, 4, 3, 1, 4, 3,
-        1, 4, 3, 1, 4, 3, 1, 5,
-        1, 1, 5, 1, 1, 5, 1, 1,
-        5, 1, 1, 11, 11, 11, 11, 11,
-        11, 11, 11, 11, 11, 1, 16, 6,
-        4, 3, 1, 4, 3, 1, 4, 3,
-        1, 4, 3, 1, 5, 1, 1, 5,
-        1, 1, 5, 1, 1, 5, 1, 1,
-        11, 11, 11, 11, 11, 11, 11, 11,
-        11, 11, 1, 16, 6, 4, 3, 1,
-        4, 3, 1, 4, 3, 1, 4, 3,
-        1, 5, 1, 1, 5, 1, 1, 5,
-        1, 1, 5, 1, 1, 11, 11, 11,
-        11, 11, 11, 11, 11, 11, 1, 16,
-        6, 4, 3, 1, 4, 3, 1, 4,
-        3, 1, 4, 3, 1, 5, 1, 1,
-        5, 1, 1, 5, 1, 1, 5, 1,
-        1, 11, 11, 11, 11, 11, 11, 11,
-        11, 11, 11, 11, 4, 11, 11, 4,
-        3, 4, 3, 1, 4, 3, 1, 4,
-        3, 1, 1, 16, 6, 5, 1, 1,
-        5, 1, 1, 5, 1, 1, 5, 1,
-        1, 1, 18, 15, 15, 14, 16, 15,
-        15, 14, 16, 15, 15, 14, 16, 15,
-        15, 14, 16, 15, 15, 14, 10, 10,
-        6, 2, 1, 2, 2, 1, 6, 11,
-        8, 6, 8, 11, 12, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 11,
-        10, 12, 16, 11, 15, 15, 16, 16,
-        16, 16, 16, 15, 15, 16, 16, 16,
-        16, 16, 15, 15, 16, 16, 16, 16,
-        16, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 15, 15, 14, 16, 15, 15,
-        14, 16, 15, 15, 14, 16, 15, 15,
-        14, 16, 15, 15, 14, 10, 10, 6,
-        2, 1, 2, 2, 1, 6, 11, 8,
-        6, 8, 11, 12, 12, 11, 10, 12,
-        11, 10, 12, 11, 10, 12, 11, 10,
-        12, 16, 11, 15, 15, 16, 16, 16,
-        16, 16, 15, 15, 16, 16, 16, 16,
-        16, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 11, 16,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 10, 10, 6, 2, 1,
-        2, 2, 1, 6, 11, 8, 6, 8,
-        11, 12, 12, 11, 10, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 16,
-        11, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 16, 15,
-        15, 16, 16, 16, 16, 16, 15, 15,
-        16, 16, 16, 16, 16, 11, 15, 11,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 16, 15, 15, 14, 16,
-        15, 15, 14, 10, 10, 6, 2, 1,
-        2, 2, 1, 6, 11, 8, 6, 8,
-        11, 12, 12, 11, 10, 12, 11, 10,
-        12, 11, 10, 12, 11, 10, 12, 16,
-        11, 15, 15, 16, 16, 16, 16, 16,
-        15, 15, 16, 16, 16, 16, 16, 15,
-        15, 16, 16, 16, 16, 16, 15, 15,
-        16, 16, 16, 16, 16, 15, 17, 15,
-        17, 11, 6, 2, 1, 2, 2, 1,
-        6, 16, 15, 15, 14, 15, 15, 16,
-        12, 11, 10, 12, 11, 10, 12, 11,
-        10, 12, 11, 10, 11, 8, 6, 8,
-        11, 16, 8, 6, 6, 2, 1, 2,
+        1, 16, 6, 4, 3, 1, 4, 3, 
+        1, 4, 3, 1, 4, 3, 1, 5, 
+        1, 1, 5, 1, 1, 5, 1, 1, 
+        5, 1, 1, 11, 11, 11, 11, 11, 
+        11, 11, 11, 11, 11, 1, 16, 6, 
+        4, 3, 1, 4, 3, 1, 4, 3, 
+        1, 4, 3, 1, 5, 1, 1, 5, 
+        1, 1, 5, 1, 1, 5, 1, 1, 
+        11, 11, 11, 11, 11, 11, 11, 11, 
+        11, 11, 1, 16, 6, 4, 3, 1, 
+        4, 3, 1, 4, 3, 1, 4, 3, 
+        1, 5, 1, 1, 5, 1, 1, 5, 
+        1, 1, 5, 1, 1, 11, 11, 11, 
+        11, 11, 11, 11, 11, 11, 1, 16, 
+        6, 4, 3, 1, 4, 3, 1, 4, 
+        3, 1, 4, 3, 1, 5, 1, 1, 
+        5, 1, 1, 5, 1, 1, 5, 1, 
+        1, 11, 11, 11, 11, 11, 11, 11, 
+        11, 11, 11, 11, 4, 11, 11, 4, 
+        3, 4, 3, 1, 4, 3, 1, 4, 
+        3, 1, 1, 16, 6, 5, 1, 1, 
+        5, 1, 1, 5, 1, 1, 5, 1, 
+        1, 1, 18, 15, 15, 14, 16, 15, 
+        15, 14, 16, 15, 15, 14, 16, 15, 
+        15, 14, 16, 15, 15, 14, 10, 10, 
+        6, 2, 1, 2, 2, 1, 6, 11, 
+        8, 6, 8, 11, 12, 12, 11, 10, 
+        12, 11, 10, 12, 11, 10, 12, 11, 
+        10, 12, 16, 11, 15, 15, 16, 16, 
+        16, 16, 16, 15, 15, 16, 16, 16, 
+        16, 16, 15, 15, 16, 16, 16, 16, 
+        16, 15, 15, 16, 16, 16, 16, 16, 
+        15, 15, 15, 15, 14, 16, 15, 15, 
+        14, 16, 15, 15, 14, 16, 15, 15, 
+        14, 16, 15, 15, 14, 10, 10, 6, 
+        2, 1, 2, 2, 1, 6, 11, 8, 
+        6, 8, 11, 12, 12, 11, 10, 12, 
+        11, 10, 12, 11, 10, 12, 11, 10, 
+        12, 16, 11, 15, 15, 16, 16, 16, 
+        16, 16, 15, 15, 16, 16, 16, 16, 
+        16, 15, 15, 16, 16, 16, 16, 16, 
+        15, 15, 16, 16, 16, 16, 11, 16, 
+        15, 15, 14, 16, 15, 15, 14, 16, 
+        15, 15, 14, 16, 15, 15, 14, 16, 
+        15, 15, 14, 10, 10, 6, 2, 1, 
+        2, 2, 1, 6, 11, 8, 6, 8, 
+        11, 12, 12, 11, 10, 12, 11, 10, 
+        12, 11, 10, 12, 11, 10, 12, 16, 
+        11, 15, 15, 16, 16, 16, 16, 16, 
+        15, 15, 16, 16, 16, 16, 16, 15, 
+        15, 16, 16, 16, 16, 16, 15, 15, 
+        16, 16, 16, 16, 16, 11, 15, 11, 
+        15, 15, 14, 16, 15, 15, 14, 16, 
+        15, 15, 14, 16, 15, 15, 14, 16, 
+        15, 15, 14, 10, 10, 6, 2, 1, 
+        2, 2, 1, 6, 11, 8, 6, 8, 
+        11, 12, 12, 11, 10, 12, 11, 10, 
+        12, 11, 10, 12, 11, 10, 12, 16, 
+        11, 15, 15, 16, 16, 16, 16, 16, 
+        15, 15, 16, 16, 16, 16, 16, 15, 
+        15, 16, 16, 16, 16, 16, 15, 15, 
+        16, 16, 16, 16, 16, 15, 17, 15, 
+        17, 11, 6, 2, 1, 2, 2, 1, 
+        6, 16, 15, 15, 14, 15, 15, 16, 
+        12, 11, 10, 12, 11, 10, 12, 11, 
+        10, 12, 11, 10, 11, 8, 6, 8, 
+        11, 16, 8, 6, 6, 2, 1, 2, 
         2, 1, 6
 };
 
 static const short _indic_syllable_machine_index_offsets[] = {
-        0, 2, 19, 26, 31, 35, 37, 42,
-        46, 48, 53, 57, 59, 64, 68, 70,
-        76, 78, 80, 86, 88, 90, 96, 98,
-        100, 106, 108, 110, 122, 134, 146, 158,
-        170, 182, 194, 206, 218, 230, 232, 249,
-        256, 261, 265, 267, 272, 276, 278, 283,
-        287, 289, 294, 298, 300, 306, 308, 310,
-        316, 318, 320, 326, 328, 330, 336, 338,
-        340, 352, 364, 376, 388, 400, 412, 424,
-        436, 448, 460, 462, 479, 486, 491, 495,
-        497, 502, 506, 508, 513, 517, 519, 524,
-        528, 530, 536, 538, 540, 546, 548, 550,
-        556, 558, 560, 566, 568, 570, 582, 594,
-        606, 618, 630, 642, 654, 666, 678, 680,
-        697, 704, 709, 713, 715, 720, 724, 726,
-        731, 735, 737, 742, 746, 748, 754, 756,
-        758, 764, 766, 768, 774, 776, 778, 784,
-        786, 788, 800, 812, 824, 836, 848, 860,
-        872, 884, 896, 908, 920, 925, 937, 949,
-        954, 958, 963, 967, 969, 974, 978, 980,
-        985, 989, 991, 993, 1010, 1017, 1023, 1025,
-        1027, 1033, 1035, 1037, 1043, 1045, 1047, 1053,
-        1055, 1057, 1059, 1078, 1094, 1110, 1125, 1142,
-        1158, 1174, 1189, 1206, 1222, 1238, 1253, 1270,
-        1286, 1302, 1317, 1334, 1350, 1366, 1381, 1392,
-        1403, 1410, 1413, 1415, 1418, 1421, 1423, 1430,
-        1442, 1451, 1458, 1467, 1479, 1492, 1505, 1517,
-        1528, 1541, 1553, 1564, 1577, 1589, 1600, 1613,
-        1625, 1636, 1649, 1666, 1678, 1694, 1710, 1727,
-        1744, 1761, 1778, 1795, 1811, 1827, 1844, 1861,
-        1878, 1895, 1912, 1928, 1944, 1961, 1978, 1995,
-        2012, 2029, 2045, 2061, 2078, 2095, 2112, 2129,
-        2146, 2162, 2178, 2194, 2210, 2225, 2242, 2258,
-        2274, 2289, 2306, 2322, 2338, 2353, 2370, 2386,
-        2402, 2417, 2434, 2450, 2466, 2481, 2492, 2503,
-        2510, 2513, 2515, 2518, 2521, 2523, 2530, 2542,
-        2551, 2558, 2567, 2579, 2592, 2605, 2617, 2628,
-        2641, 2653, 2664, 2677, 2689, 2700, 2713, 2725,
-        2736, 2749, 2766, 2778, 2794, 2810, 2827, 2844,
-        2861, 2878, 2895, 2911, 2927, 2944, 2961, 2978,
-        2995, 3012, 3028, 3044, 3061, 3078, 3095, 3112,
-        3129, 3145, 3161, 3178, 3195, 3212, 3229, 3241,
-        3258, 3274, 3290, 3305, 3322, 3338, 3354, 3369,
-        3386, 3402, 3418, 3433, 3450, 3466, 3482, 3497,
-        3514, 3530, 3546, 3561, 3572, 3583, 3590, 3593,
-        3595, 3598, 3601, 3603, 3610, 3622, 3631, 3638,
-        3647, 3659, 3672, 3685, 3697, 3708, 3721, 3733,
-        3744, 3757, 3769, 3780, 3793, 3805, 3816, 3829,
-        3846, 3858, 3874, 3890, 3907, 3924, 3941, 3958,
-        3975, 3991, 4007, 4024, 4041, 4058, 4075, 4092,
-        4108, 4124, 4141, 4158, 4175, 4192, 4209, 4225,
-        4241, 4258, 4275, 4292, 4309, 4326, 4338, 4354,
-        4366, 4382, 4398, 4413, 4430, 4446, 4462, 4477,
-        4494, 4510, 4526, 4541, 4558, 4574, 4590, 4605,
-        4622, 4638, 4654, 4669, 4680, 4691, 4698, 4701,
-        4703, 4706, 4709, 4711, 4718, 4730, 4739, 4746,
-        4755, 4767, 4780, 4793, 4805, 4816, 4829, 4841,
-        4852, 4865, 4877, 4888, 4901, 4913, 4924, 4937,
-        4954, 4966, 4982, 4998, 5015, 5032, 5049, 5066,
-        5083, 5099, 5115, 5132, 5149, 5166, 5183, 5200,
-        5216, 5232, 5249, 5266, 5283, 5300, 5317, 5333,
-        5349, 5366, 5383, 5400, 5417, 5434, 5450, 5468,
-        5484, 5502, 5514, 5521, 5524, 5526, 5529, 5532,
-        5534, 5541, 5558, 5574, 5590, 5605, 5621, 5637,
-        5654, 5667, 5679, 5690, 5703, 5715, 5726, 5739,
-        5751, 5762, 5775, 5787, 5798, 5810, 5819, 5826,
-        5835, 5847, 5864, 5873, 5880, 5887, 5890, 5892,
+        0, 2, 19, 26, 31, 35, 37, 42, 
+        46, 48, 53, 57, 59, 64, 68, 70, 
+        76, 78, 80, 86, 88, 90, 96, 98, 
+        100, 106, 108, 110, 122, 134, 146, 158, 
+        170, 182, 194, 206, 218, 230, 232, 249, 
+        256, 261, 265, 267, 272, 276, 278, 283, 
+        287, 289, 294, 298, 300, 306, 308, 310, 
+        316, 318, 320, 326, 328, 330, 336, 338, 
+        340, 352, 364, 376, 388, 400, 412, 424, 
+        436, 448, 460, 462, 479, 486, 491, 495, 
+        497, 502, 506, 508, 513, 517, 519, 524, 
+        528, 530, 536, 538, 540, 546, 548, 550, 
+        556, 558, 560, 566, 568, 570, 582, 594, 
+        606, 618, 630, 642, 654, 666, 678, 680, 
+        697, 704, 709, 713, 715, 720, 724, 726, 
+        731, 735, 737, 742, 746, 748, 754, 756, 
+        758, 764, 766, 768, 774, 776, 778, 784, 
+        786, 788, 800, 812, 824, 836, 848, 860, 
+        872, 884, 896, 908, 920, 925, 937, 949, 
+        954, 958, 963, 967, 969, 974, 978, 980, 
+        985, 989, 991, 993, 1010, 1017, 1023, 1025, 
+        1027, 1033, 1035, 1037, 1043, 1045, 1047, 1053, 
+        1055, 1057, 1059, 1078, 1094, 1110, 1125, 1142, 
+        1158, 1174, 1189, 1206, 1222, 1238, 1253, 1270, 
+        1286, 1302, 1317, 1334, 1350, 1366, 1381, 1392, 
+        1403, 1410, 1413, 1415, 1418, 1421, 1423, 1430, 
+        1442, 1451, 1458, 1467, 1479, 1492, 1505, 1517, 
+        1528, 1541, 1553, 1564, 1577, 1589, 1600, 1613, 
+        1625, 1636, 1649, 1666, 1678, 1694, 1710, 1727, 
+        1744, 1761, 1778, 1795, 1811, 1827, 1844, 1861, 
+        1878, 1895, 1912, 1928, 1944, 1961, 1978, 1995, 
+        2012, 2029, 2045, 2061, 2078, 2095, 2112, 2129, 
+        2146, 2162, 2178, 2194, 2210, 2225, 2242, 2258, 
+        2274, 2289, 2306, 2322, 2338, 2353, 2370, 2386, 
+        2402, 2417, 2434, 2450, 2466, 2481, 2492, 2503, 
+        2510, 2513, 2515, 2518, 2521, 2523, 2530, 2542, 
+        2551, 2558, 2567, 2579, 2592, 2605, 2617, 2628, 
+        2641, 2653, 2664, 2677, 2689, 2700, 2713, 2725, 
+        2736, 2749, 2766, 2778, 2794, 2810, 2827, 2844, 
+        2861, 2878, 2895, 2911, 2927, 2944, 2961, 2978, 
+        2995, 3012, 3028, 3044, 3061, 3078, 3095, 3112, 
+        3129, 3145, 3161, 3178, 3195, 3212, 3229, 3241, 
+        3258, 3274, 3290, 3305, 3322, 3338, 3354, 3369, 
+        3386, 3402, 3418, 3433, 3450, 3466, 3482, 3497, 
+        3514, 3530, 3546, 3561, 3572, 3583, 3590, 3593, 
+        3595, 3598, 3601, 3603, 3610, 3622, 3631, 3638, 
+        3647, 3659, 3672, 3685, 3697, 3708, 3721, 3733, 
+        3744, 3757, 3769, 3780, 3793, 3805, 3816, 3829, 
+        3846, 3858, 3874, 3890, 3907, 3924, 3941, 3958, 
+        3975, 3991, 4007, 4024, 4041, 4058, 4075, 4092, 
+        4108, 4124, 4141, 4158, 4175, 4192, 4209, 4225, 
+        4241, 4258, 4275, 4292, 4309, 4326, 4338, 4354, 
+        4366, 4382, 4398, 4413, 4430, 4446, 4462, 4477, 
+        4494, 4510, 4526, 4541, 4558, 4574, 4590, 4605, 
+        4622, 4638, 4654, 4669, 4680, 4691, 4698, 4701, 
+        4703, 4706, 4709, 4711, 4718, 4730, 4739, 4746, 
+        4755, 4767, 4780, 4793, 4805, 4816, 4829, 4841, 
+        4852, 4865, 4877, 4888, 4901, 4913, 4924, 4937, 
+        4954, 4966, 4982, 4998, 5015, 5032, 5049, 5066, 
+        5083, 5099, 5115, 5132, 5149, 5166, 5183, 5200, 
+        5216, 5232, 5249, 5266, 5283, 5300, 5317, 5333, 
+        5349, 5366, 5383, 5400, 5417, 5434, 5450, 5468, 
+        5484, 5502, 5514, 5521, 5524, 5526, 5529, 5532, 
+        5534, 5541, 5558, 5574, 5590, 5605, 5621, 5637, 
+        5654, 5667, 5679, 5690, 5703, 5715, 5726, 5739, 
+        5751, 5762, 5775, 5787, 5798, 5810, 5819, 5826, 
+        5835, 5847, 5864, 5873, 5880, 5887, 5890, 5892, 
         5895, 5898, 5900
 };
 
 static const short _indic_syllable_machine_indicies[] = {
-        1, 0, 2, 3, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 2, 0, 1, 0, 0, 0, 0,
-        4, 0, 5, 5, 6, 1, 0, 7,
-        7, 6, 0, 6, 0, 8, 8, 9,
-        1, 0, 10, 10, 9, 0, 9, 0,
-        11, 11, 12, 1, 0, 13, 13, 12,
-        0, 12, 0, 14, 14, 15, 1, 0,
-        16, 16, 15, 0, 15, 0, 17, 0,
-        0, 0, 1, 0, 18, 0, 19, 0,
-        20, 14, 14, 15, 1, 0, 21, 0,
-        22, 0, 23, 11, 11, 12, 1, 0,
-        24, 0, 25, 0, 26, 8, 8, 9,
-        1, 0, 27, 0, 28, 0, 29, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        29, 0, 29, 5, 5, 6, 1, 0,
-        0, 0, 0, 30, 29, 0, 31, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        31, 0, 31, 5, 5, 6, 1, 0,
-        0, 0, 0, 32, 31, 0, 33, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        33, 0, 33, 5, 5, 6, 1, 0,
-        0, 0, 0, 34, 33, 0, 35, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        35, 0, 35, 5, 5, 6, 1, 0,
-        0, 0, 0, 36, 35, 0, 37, 5,
-        5, 6, 1, 0, 0, 0, 0, 0,
-        37, 0, 37, 5, 5, 6, 1, 0,
-        0, 0, 0, 38, 37, 0, 40, 39,
-        41, 42, 39, 39, 39, 39, 39, 39,
-        39, 39, 39, 39, 39, 39, 39, 41,
-        39, 40, 39, 39, 39, 39, 43, 39,
-        44, 44, 45, 40, 39, 46, 46, 45,
-        39, 45, 39, 47, 47, 48, 40, 39,
-        49, 49, 48, 39, 48, 39, 50, 50,
-        51, 40, 39, 52, 52, 51, 39, 51,
-        39, 53, 53, 54, 40, 39, 55, 55,
-        54, 39, 54, 39, 56, 39, 39, 39,
-        40, 39, 57, 39, 58, 39, 59, 53,
-        53, 54, 40, 39, 60, 39, 61, 39,
-        62, 50, 50, 51, 40, 39, 63, 39,
-        64, 39, 65, 47, 47, 48, 40, 39,
-        66, 39, 67, 39, 68, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 68, 39,
-        68, 44, 44, 45, 40, 39, 39, 39,
-        39, 69, 68, 39, 70, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 70, 39,
-        70, 44, 44, 45, 40, 39, 39, 39,
-        39, 71, 70, 39, 72, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 72, 39,
-        72, 44, 44, 45, 40, 39, 39, 39,
-        39, 73, 72, 39, 74, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 74, 39,
-        74, 44, 44, 45, 40, 39, 39, 39,
-        39, 75, 74, 39, 76, 44, 44, 45,
-        40, 39, 39, 39, 39, 39, 76, 39,
-        76, 44, 44, 45, 40, 39, 39, 39,
-        39, 77, 76, 39, 79, 78, 80, 81,
-        78, 78, 78, 78, 78, 78, 78, 78,
-        78, 78, 78, 78, 78, 80, 78, 79,
-        78, 78, 78, 78, 82, 78, 83, 83,
-        84, 79, 78, 86, 86, 84, 85, 84,
-        85, 87, 87, 88, 79, 78, 89, 89,
-        88, 78, 88, 78, 90, 90, 91, 79,
-        78, 92, 92, 91, 78, 91, 78, 93,
-        93, 94, 79, 78, 95, 95, 94, 78,
-        94, 78, 96, 78, 78, 78, 79, 78,
-        97, 78, 98, 78, 99, 93, 93, 94,
-        79, 78, 100, 78, 101, 78, 102, 90,
-        90, 91, 79, 78, 103, 78, 104, 78,
-        105, 87, 87, 88, 79, 78, 106, 78,
-        107, 78, 108, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 108, 78, 108, 83,
-        83, 84, 79, 78, 78, 78, 78, 109,
-        108, 78, 110, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 110, 78, 110, 83,
-        83, 84, 79, 78, 78, 78, 78, 111,
-        110, 78, 112, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 112, 78, 112, 83,
-        83, 84, 79, 78, 78, 78, 78, 113,
-        112, 78, 114, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 114, 78, 114, 83,
-        83, 84, 79, 78, 78, 78, 78, 115,
-        114, 78, 116, 83, 83, 84, 79, 78,
-        78, 78, 78, 78, 116, 78, 118, 117,
-        119, 120, 117, 117, 117, 117, 117, 117,
-        117, 117, 117, 117, 117, 117, 117, 119,
-        117, 118, 117, 117, 117, 117, 121, 117,
-        122, 122, 123, 118, 117, 124, 124, 123,
-        117, 123, 117, 125, 125, 126, 118, 117,
-        127, 127, 126, 117, 126, 117, 128, 128,
-        129, 118, 117, 130, 130, 129, 117, 129,
-        117, 131, 131, 132, 118, 117, 133, 133,
-        132, 117, 132, 117, 134, 117, 117, 117,
-        118, 117, 135, 117, 136, 117, 137, 131,
-        131, 132, 118, 117, 138, 117, 139, 117,
-        140, 128, 128, 129, 118, 117, 141, 117,
-        142, 117, 143, 125, 125, 126, 118, 117,
-        144, 117, 145, 117, 146, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 146, 117,
-        146, 122, 122, 123, 118, 117, 117, 117,
-        117, 147, 146, 117, 148, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 148, 117,
-        148, 122, 122, 123, 118, 117, 117, 117,
-        117, 149, 148, 117, 150, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 150, 117,
-        150, 122, 122, 123, 118, 117, 117, 117,
-        117, 151, 150, 117, 152, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 152, 117,
-        152, 122, 122, 123, 118, 117, 117, 117,
-        117, 153, 152, 117, 154, 122, 122, 123,
-        118, 117, 117, 117, 117, 117, 154, 117,
-        154, 122, 122, 123, 118, 117, 117, 117,
-        117, 155, 154, 117, 116, 83, 83, 84,
-        79, 78, 78, 78, 78, 156, 116, 78,
-        86, 86, 84, 1, 0, 114, 83, 83,
-        84, 157, 0, 0, 0, 0, 0, 114,
-        0, 114, 83, 83, 84, 157, 0, 0,
-        0, 0, 158, 114, 0, 159, 159, 160,
-        1, 0, 7, 7, 160, 0, 161, 161,
-        162, 157, 0, 163, 163, 162, 0, 162,
-        0, 164, 164, 165, 157, 0, 166, 166,
-        165, 0, 165, 0, 167, 167, 168, 157,
-        0, 169, 169, 168, 0, 168, 0, 157,
-        0, 170, 171, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        170, 0, 157, 0, 0, 0, 0, 172,
-        0, 173, 0, 0, 0, 157, 0, 174,
-        0, 175, 0, 176, 167, 167, 168, 157,
-        0, 177, 0, 178, 0, 179, 164, 164,
-        165, 157, 0, 180, 0, 181, 0, 182,
-        161, 161, 162, 157, 0, 183, 0, 184,
-        0, 186, 185, 188, 189, 190, 191, 192,
-        193, 84, 79, 194, 195, 196, 196, 156,
-        197, 198, 199, 200, 201, 187, 203, 204,
-        205, 206, 6, 1, 207, 208, 202, 202,
-        38, 209, 202, 202, 210, 202, 211, 204,
-        212, 212, 6, 1, 207, 208, 202, 202,
-        202, 209, 202, 202, 210, 202, 204, 212,
-        212, 6, 1, 207, 208, 202, 202, 202,
-        209, 202, 202, 210, 202, 213, 202, 202,
-        202, 19, 214, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 213, 202, 216, 217,
-        218, 219, 6, 1, 207, 208, 202, 202,
-        36, 220, 202, 202, 210, 202, 221, 217,
-        222, 222, 6, 1, 207, 208, 202, 202,
-        202, 220, 202, 202, 210, 202, 217, 222,
-        222, 6, 1, 207, 208, 202, 202, 202,
-        220, 202, 202, 210, 202, 223, 202, 202,
-        202, 19, 224, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 223, 202, 225, 226,
-        227, 228, 6, 1, 207, 208, 202, 202,
-        34, 229, 202, 202, 210, 202, 230, 226,
-        231, 231, 6, 1, 207, 208, 202, 202,
-        202, 229, 202, 202, 210, 202, 226, 231,
-        231, 6, 1, 207, 208, 202, 202, 202,
-        229, 202, 202, 210, 202, 232, 202, 202,
-        202, 19, 233, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 232, 202, 234, 235,
-        236, 237, 6, 1, 207, 208, 202, 202,
-        32, 238, 202, 202, 210, 202, 239, 235,
-        240, 240, 6, 1, 207, 208, 202, 202,
-        202, 238, 202, 202, 210, 202, 235, 240,
-        240, 6, 1, 207, 208, 202, 202, 202,
-        238, 202, 202, 210, 202, 241, 202, 202,
-        202, 19, 242, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 241, 202, 243, 244,
-        245, 246, 6, 1, 207, 208, 202, 202,
-        30, 247, 202, 202, 210, 202, 248, 244,
-        249, 249, 6, 1, 207, 208, 202, 202,
-        202, 247, 202, 202, 210, 202, 244, 249,
-        249, 6, 1, 207, 208, 202, 202, 202,
-        247, 202, 202, 210, 202, 19, 250, 202,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        251, 251, 202, 1, 207, 208, 202, 202,
-        202, 215, 202, 252, 202, 202, 253, 207,
-        208, 202, 207, 208, 202, 254, 202, 207,
-        255, 202, 207, 256, 202, 207, 202, 252,
-        202, 202, 202, 207, 208, 202, 257, 202,
-        258, 259, 202, 1, 207, 208, 202, 202,
-        4, 202, 3, 202, 251, 251, 202, 1,
-        207, 208, 202, 251, 251, 202, 1, 207,
-        208, 202, 257, 202, 251, 251, 202, 1,
-        207, 208, 202, 257, 202, 258, 251, 202,
-        1, 207, 208, 202, 202, 4, 202, 19,
-        202, 260, 260, 6, 1, 207, 208, 202,
-        202, 202, 215, 202, 261, 28, 262, 263,
-        9, 1, 207, 208, 202, 202, 202, 215,
-        202, 28, 262, 263, 9, 1, 207, 208,
-        202, 202, 202, 215, 202, 262, 262, 9,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        264, 25, 265, 266, 12, 1, 207, 208,
-        202, 202, 202, 215, 202, 25, 265, 266,
-        12, 1, 207, 208, 202, 202, 202, 215,
-        202, 265, 265, 12, 1, 207, 208, 202,
-        202, 202, 215, 202, 267, 22, 268, 269,
-        15, 1, 207, 208, 202, 202, 202, 215,
-        202, 22, 268, 269, 15, 1, 207, 208,
-        202, 202, 202, 215, 202, 268, 268, 15,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        270, 19, 251, 271, 202, 1, 207, 208,
-        202, 202, 202, 215, 202, 19, 251, 271,
-        202, 1, 207, 208, 202, 202, 202, 215,
-        202, 251, 272, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 19, 202, 251, 251,
-        202, 1, 207, 208, 202, 202, 202, 215,
-        202, 2, 3, 202, 202, 19, 250, 202,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        2, 202, 244, 249, 249, 6, 1, 207,
-        208, 202, 202, 202, 247, 202, 243, 244,
-        249, 249, 6, 1, 207, 208, 202, 202,
-        202, 247, 202, 202, 210, 202, 243, 244,
-        245, 249, 6, 1, 207, 208, 202, 202,
-        30, 247, 202, 202, 210, 202, 241, 202,
-        273, 202, 260, 260, 6, 1, 207, 208,
-        202, 202, 202, 215, 202, 241, 202, 241,
-        202, 202, 202, 251, 251, 202, 1, 207,
-        208, 202, 202, 202, 215, 202, 241, 202,
-        241, 202, 202, 202, 251, 274, 202, 1,
-        207, 208, 202, 202, 202, 215, 202, 241,
-        202, 241, 202, 273, 202, 251, 251, 202,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        241, 202, 241, 3, 202, 202, 19, 242,
-        202, 1, 207, 208, 202, 202, 202, 215,
-        202, 241, 202, 234, 235, 240, 240, 6,
-        1, 207, 208, 202, 202, 202, 238, 202,
-        202, 210, 202, 234, 235, 236, 240, 6,
-        1, 207, 208, 202, 202, 32, 238, 202,
-        202, 210, 202, 232, 202, 275, 202, 260,
-        260, 6, 1, 207, 208, 202, 202, 202,
-        215, 202, 232, 202, 232, 202, 202, 202,
-        251, 251, 202, 1, 207, 208, 202, 202,
-        202, 215, 202, 232, 202, 232, 202, 202,
-        202, 251, 276, 202, 1, 207, 208, 202,
-        202, 202, 215, 202, 232, 202, 232, 202,
-        275, 202, 251, 251, 202, 1, 207, 208,
-        202, 202, 202, 215, 202, 232, 202, 232,
-        3, 202, 202, 19, 233, 202, 1, 207,
-        208, 202, 202, 202, 215, 202, 232, 202,
-        225, 226, 231, 231, 6, 1, 207, 208,
-        202, 202, 202, 229, 202, 202, 210, 202,
-        225, 226, 227, 231, 6, 1, 207, 208,
-        202, 202, 34, 229, 202, 202, 210, 202,
-        223, 202, 277, 202, 260, 260, 6, 1,
-        207, 208, 202, 202, 202, 215, 202, 223,
-        202, 223, 202, 202, 202, 251, 251, 202,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        223, 202, 223, 202, 202, 202, 251, 278,
-        202, 1, 207, 208, 202, 202, 202, 215,
-        202, 223, 202, 223, 202, 277, 202, 251,
-        251, 202, 1, 207, 208, 202, 202, 202,
-        215, 202, 223, 202, 223, 3, 202, 202,
-        19, 224, 202, 1, 207, 208, 202, 202,
-        202, 215, 202, 223, 202, 216, 217, 222,
-        222, 6, 1, 207, 208, 202, 202, 202,
-        220, 202, 202, 210, 202, 216, 217, 218,
-        222, 6, 1, 207, 208, 202, 202, 36,
-        220, 202, 202, 210, 202, 213, 202, 279,
-        202, 260, 260, 6, 1, 207, 208, 202,
-        202, 202, 215, 202, 213, 202, 213, 202,
-        202, 202, 251, 251, 202, 1, 207, 208,
-        202, 202, 202, 215, 202, 213, 202, 213,
-        202, 202, 202, 251, 280, 202, 1, 207,
-        208, 202, 202, 202, 215, 202, 213, 202,
-        213, 202, 279, 202, 251, 251, 202, 1,
-        207, 208, 202, 202, 202, 215, 202, 213,
-        202, 213, 3, 202, 202, 19, 214, 202,
-        1, 207, 208, 202, 202, 202, 215, 202,
-        213, 202, 203, 204, 212, 212, 6, 1,
-        207, 208, 202, 202, 202, 209, 202, 202,
-        210, 202, 203, 204, 205, 212, 6, 1,
-        207, 208, 202, 202, 38, 209, 202, 202,
-        210, 202, 282, 283, 284, 285, 45, 40,
-        286, 287, 281, 281, 77, 288, 281, 281,
-        289, 281, 290, 283, 291, 285, 45, 40,
-        286, 287, 281, 281, 281, 288, 281, 281,
-        289, 281, 283, 291, 285, 45, 40, 286,
-        287, 281, 281, 281, 288, 281, 281, 289,
-        281, 292, 281, 281, 281, 58, 293, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        292, 281, 295, 296, 297, 298, 45, 40,
-        286, 287, 281, 281, 75, 299, 281, 281,
-        289, 281, 300, 296, 301, 301, 45, 40,
-        286, 287, 281, 281, 281, 299, 281, 281,
-        289, 281, 296, 301, 301, 45, 40, 286,
-        287, 281, 281, 281, 299, 281, 281, 289,
-        281, 302, 281, 281, 281, 58, 303, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        302, 281, 304, 305, 306, 307, 45, 40,
-        286, 287, 281, 281, 73, 308, 281, 281,
-        289, 281, 309, 305, 310, 310, 45, 40,
-        286, 287, 281, 281, 281, 308, 281, 281,
-        289, 281, 305, 310, 310, 45, 40, 286,
-        287, 281, 281, 281, 308, 281, 281, 289,
-        281, 311, 281, 281, 281, 58, 312, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        311, 281, 313, 314, 315, 316, 45, 40,
-        286, 287, 281, 281, 71, 317, 281, 281,
-        289, 281, 318, 314, 319, 319, 45, 40,
-        286, 287, 281, 281, 281, 317, 281, 281,
-        289, 281, 314, 319, 319, 45, 40, 286,
-        287, 281, 281, 281, 317, 281, 281, 289,
-        281, 320, 281, 281, 281, 58, 321, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        320, 281, 322, 323, 324, 325, 45, 40,
-        286, 287, 281, 281, 69, 326, 281, 281,
-        289, 281, 327, 323, 328, 328, 45, 40,
-        286, 287, 281, 281, 281, 326, 281, 281,
-        289, 281, 323, 328, 328, 45, 40, 286,
-        287, 281, 281, 281, 326, 281, 281, 289,
-        281, 58, 329, 281, 40, 286, 287, 281,
-        281, 281, 294, 281, 330, 330, 281, 40,
-        286, 287, 281, 281, 281, 294, 281, 331,
-        281, 281, 332, 286, 287, 281, 286, 287,
-        281, 333, 281, 286, 334, 281, 286, 335,
-        281, 286, 281, 331, 281, 281, 281, 286,
-        287, 281, 336, 281, 337, 338, 281, 40,
-        286, 287, 281, 281, 43, 281, 42, 281,
-        330, 330, 281, 40, 286, 287, 281, 330,
-        330, 281, 40, 286, 287, 281, 336, 281,
-        330, 330, 281, 40, 286, 287, 281, 336,
-        281, 337, 330, 281, 40, 286, 287, 281,
-        281, 43, 281, 58, 281, 339, 339, 45,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        340, 67, 341, 342, 48, 40, 286, 287,
-        281, 281, 281, 294, 281, 67, 341, 342,
-        48, 40, 286, 287, 281, 281, 281, 294,
-        281, 341, 341, 48, 40, 286, 287, 281,
-        281, 281, 294, 281, 343, 64, 344, 345,
-        51, 40, 286, 287, 281, 281, 281, 294,
-        281, 64, 344, 345, 51, 40, 286, 287,
-        281, 281, 281, 294, 281, 344, 344, 51,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        346, 61, 347, 348, 54, 40, 286, 287,
-        281, 281, 281, 294, 281, 61, 347, 348,
-        54, 40, 286, 287, 281, 281, 281, 294,
-        281, 347, 347, 54, 40, 286, 287, 281,
-        281, 281, 294, 281, 349, 58, 330, 350,
-        281, 40, 286, 287, 281, 281, 281, 294,
-        281, 58, 330, 350, 281, 40, 286, 287,
-        281, 281, 281, 294, 281, 330, 351, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        58, 281, 330, 330, 281, 40, 286, 287,
-        281, 281, 281, 294, 281, 41, 42, 281,
-        281, 58, 329, 281, 40, 286, 287, 281,
-        281, 281, 294, 281, 41, 281, 323, 328,
-        328, 45, 40, 286, 287, 281, 281, 281,
-        326, 281, 322, 323, 328, 328, 45, 40,
-        286, 287, 281, 281, 281, 326, 281, 281,
-        289, 281, 322, 323, 324, 328, 45, 40,
-        286, 287, 281, 281, 69, 326, 281, 281,
-        289, 281, 320, 281, 352, 281, 339, 339,
-        45, 40, 286, 287, 281, 281, 281, 294,
-        281, 320, 281, 320, 281, 281, 281, 330,
-        330, 281, 40, 286, 287, 281, 281, 281,
-        294, 281, 320, 281, 320, 281, 281, 281,
-        330, 353, 281, 40, 286, 287, 281, 281,
-        281, 294, 281, 320, 281, 320, 281, 352,
-        281, 330, 330, 281, 40, 286, 287, 281,
-        281, 281, 294, 281, 320, 281, 320, 42,
-        281, 281, 58, 321, 281, 40, 286, 287,
-        281, 281, 281, 294, 281, 320, 281, 313,
-        314, 319, 319, 45, 40, 286, 287, 281,
-        281, 281, 317, 281, 281, 289, 281, 313,
-        314, 315, 319, 45, 40, 286, 287, 281,
-        281, 71, 317, 281, 281, 289, 281, 311,
-        281, 354, 281, 339, 339, 45, 40, 286,
-        287, 281, 281, 281, 294, 281, 311, 281,
-        311, 281, 281, 281, 330, 330, 281, 40,
-        286, 287, 281, 281, 281, 294, 281, 311,
-        281, 311, 281, 281, 281, 330, 355, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        311, 281, 311, 281, 354, 281, 330, 330,
-        281, 40, 286, 287, 281, 281, 281, 294,
-        281, 311, 281, 311, 42, 281, 281, 58,
-        312, 281, 40, 286, 287, 281, 281, 281,
-        294, 281, 311, 281, 304, 305, 310, 310,
-        45, 40, 286, 287, 281, 281, 281, 308,
-        281, 281, 289, 281, 304, 305, 306, 310,
-        45, 40, 286, 287, 281, 281, 73, 308,
-        281, 281, 289, 281, 302, 281, 356, 281,
-        339, 339, 45, 40, 286, 287, 281, 281,
-        281, 294, 281, 302, 281, 302, 281, 281,
-        281, 330, 330, 281, 40, 286, 287, 281,
-        281, 281, 294, 281, 302, 281, 302, 281,
-        281, 281, 330, 357, 281, 40, 286, 287,
-        281, 281, 281, 294, 281, 302, 281, 302,
-        281, 356, 281, 330, 330, 281, 40, 286,
-        287, 281, 281, 281, 294, 281, 302, 281,
-        302, 42, 281, 281, 58, 303, 281, 40,
-        286, 287, 281, 281, 281, 294, 281, 302,
-        281, 295, 296, 301, 301, 45, 40, 286,
-        287, 281, 281, 281, 299, 281, 281, 289,
-        281, 295, 296, 297, 301, 45, 40, 286,
-        287, 281, 281, 75, 299, 281, 281, 289,
-        281, 292, 281, 358, 281, 339, 339, 45,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        292, 281, 292, 281, 281, 281, 330, 330,
-        281, 40, 286, 287, 281, 281, 281, 294,
-        281, 292, 281, 292, 281, 281, 281, 330,
-        359, 281, 40, 286, 287, 281, 281, 281,
-        294, 281, 292, 281, 292, 281, 358, 281,
-        330, 330, 281, 40, 286, 287, 281, 281,
-        281, 294, 281, 292, 281, 76, 44, 44,
-        45, 40, 281, 281, 281, 281, 281, 76,
-        281, 292, 42, 281, 281, 58, 293, 281,
-        40, 286, 287, 281, 281, 281, 294, 281,
-        292, 281, 282, 283, 291, 285, 45, 40,
-        286, 287, 281, 281, 281, 288, 281, 281,
-        289, 281, 361, 191, 362, 362, 84, 79,
-        194, 195, 360, 360, 360, 197, 360, 360,
-        200, 360, 191, 362, 362, 84, 79, 194,
-        195, 360, 360, 360, 197, 360, 360, 200,
-        360, 363, 360, 360, 360, 98, 364, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        363, 360, 366, 367, 368, 369, 84, 79,
-        194, 195, 360, 360, 115, 370, 360, 360,
-        200, 360, 371, 367, 372, 372, 84, 79,
-        194, 195, 360, 360, 360, 370, 360, 360,
-        200, 360, 367, 372, 372, 84, 79, 194,
-        195, 360, 360, 360, 370, 360, 360, 200,
-        360, 373, 360, 360, 360, 98, 374, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        373, 360, 375, 376, 377, 378, 84, 79,
-        194, 195, 360, 360, 113, 379, 360, 360,
-        200, 360, 380, 376, 381, 381, 84, 79,
-        194, 195, 360, 360, 360, 379, 360, 360,
-        200, 360, 376, 381, 381, 84, 79, 194,
-        195, 360, 360, 360, 379, 360, 360, 200,
-        360, 382, 360, 360, 360, 98, 383, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        382, 360, 384, 385, 386, 387, 84, 79,
-        194, 195, 360, 360, 111, 388, 360, 360,
-        200, 360, 389, 385, 390, 390, 84, 79,
-        194, 195, 360, 360, 360, 388, 360, 360,
-        200, 360, 385, 390, 390, 84, 79, 194,
-        195, 360, 360, 360, 388, 360, 360, 200,
-        360, 391, 360, 360, 360, 98, 392, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        391, 360, 393, 394, 395, 396, 84, 79,
-        194, 195, 360, 360, 109, 397, 360, 360,
-        200, 360, 398, 394, 399, 399, 84, 79,
-        194, 195, 360, 360, 360, 397, 360, 360,
-        200, 360, 394, 399, 399, 84, 79, 194,
-        195, 360, 360, 360, 397, 360, 360, 200,
-        360, 98, 400, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 401, 401, 360, 79,
-        194, 195, 360, 360, 360, 365, 360, 402,
-        360, 360, 403, 194, 195, 360, 194, 195,
-        360, 404, 360, 194, 405, 360, 194, 406,
-        360, 194, 360, 402, 360, 360, 360, 194,
-        195, 360, 407, 360, 408, 409, 360, 79,
-        194, 195, 360, 360, 82, 360, 81, 360,
-        401, 401, 360, 79, 194, 195, 360, 401,
-        401, 360, 79, 194, 195, 360, 407, 360,
-        401, 401, 360, 79, 194, 195, 360, 407,
-        360, 408, 401, 360, 79, 194, 195, 360,
-        360, 82, 360, 98, 360, 410, 410, 84,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        411, 107, 412, 413, 88, 79, 194, 195,
-        360, 360, 360, 365, 360, 107, 412, 413,
-        88, 79, 194, 195, 360, 360, 360, 365,
-        360, 412, 412, 88, 79, 194, 195, 360,
-        360, 360, 365, 360, 414, 104, 415, 416,
-        91, 79, 194, 195, 360, 360, 360, 365,
-        360, 104, 415, 416, 91, 79, 194, 195,
-        360, 360, 360, 365, 360, 415, 415, 91,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        417, 101, 418, 419, 94, 79, 194, 195,
-        360, 360, 360, 365, 360, 101, 418, 419,
-        94, 79, 194, 195, 360, 360, 360, 365,
-        360, 418, 418, 94, 79, 194, 195, 360,
-        360, 360, 365, 360, 420, 98, 401, 421,
-        360, 79, 194, 195, 360, 360, 360, 365,
-        360, 98, 401, 421, 360, 79, 194, 195,
-        360, 360, 360, 365, 360, 401, 422, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        98, 360, 401, 401, 360, 79, 194, 195,
-        360, 360, 360, 365, 360, 80, 81, 360,
-        360, 98, 400, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 80, 360, 394, 399,
-        399, 84, 79, 194, 195, 360, 360, 360,
-        397, 360, 393, 394, 399, 399, 84, 79,
-        194, 195, 360, 360, 360, 397, 360, 360,
-        200, 360, 393, 394, 395, 399, 84, 79,
-        194, 195, 360, 360, 109, 397, 360, 360,
-        200, 360, 391, 360, 423, 360, 410, 410,
-        84, 79, 194, 195, 360, 360, 360, 365,
-        360, 391, 360, 391, 360, 360, 360, 401,
-        401, 360, 79, 194, 195, 360, 360, 360,
-        365, 360, 391, 360, 391, 360, 360, 360,
-        401, 424, 360, 79, 194, 195, 360, 360,
-        360, 365, 360, 391, 360, 391, 360, 423,
-        360, 401, 401, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 391, 360, 391, 81,
-        360, 360, 98, 392, 360, 79, 194, 195,
-        360, 360, 360, 365, 360, 391, 360, 384,
-        385, 390, 390, 84, 79, 194, 195, 360,
-        360, 360, 388, 360, 360, 200, 360, 384,
-        385, 386, 390, 84, 79, 194, 195, 360,
-        360, 111, 388, 360, 360, 200, 360, 382,
-        360, 425, 360, 410, 410, 84, 79, 194,
-        195, 360, 360, 360, 365, 360, 382, 360,
-        382, 360, 360, 360, 401, 401, 360, 79,
-        194, 195, 360, 360, 360, 365, 360, 382,
-        360, 382, 360, 360, 360, 401, 426, 360,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        382, 360, 382, 360, 425, 360, 401, 401,
-        360, 79, 194, 195, 360, 360, 360, 365,
-        360, 382, 360, 382, 81, 360, 360, 98,
-        383, 360, 79, 194, 195, 360, 360, 360,
-        365, 360, 382, 360, 375, 376, 381, 381,
-        84, 79, 194, 195, 360, 360, 360, 379,
-        360, 360, 200, 360, 375, 376, 377, 381,
-        84, 79, 194, 195, 360, 360, 113, 379,
-        360, 360, 200, 360, 373, 360, 427, 360,
-        410, 410, 84, 79, 194, 195, 360, 360,
-        360, 365, 360, 373, 360, 373, 360, 360,
-        360, 401, 401, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 373, 360, 373, 360,
-        360, 360, 401, 428, 360, 79, 194, 195,
-        360, 360, 360, 365, 360, 373, 360, 373,
-        360, 427, 360, 401, 401, 360, 79, 194,
-        195, 360, 360, 360, 365, 360, 373, 360,
-        373, 81, 360, 360, 98, 374, 360, 79,
-        194, 195, 360, 360, 360, 365, 360, 373,
-        360, 366, 367, 372, 372, 84, 79, 194,
-        195, 360, 360, 360, 370, 360, 360, 200,
-        360, 366, 367, 368, 372, 84, 79, 194,
-        195, 360, 360, 115, 370, 360, 360, 200,
-        360, 363, 360, 429, 360, 410, 410, 84,
-        79, 194, 195, 360, 360, 360, 365, 360,
-        363, 360, 363, 360, 360, 360, 401, 401,
-        360, 79, 194, 195, 360, 360, 360, 365,
-        360, 363, 360, 363, 360, 360, 360, 401,
-        430, 360, 79, 194, 195, 360, 360, 360,
-        365, 360, 363, 360, 363, 360, 429, 360,
-        401, 401, 360, 79, 194, 195, 360, 360,
-        360, 365, 360, 363, 360, 363, 81, 360,
-        360, 98, 364, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 363, 360, 116, 83,
-        83, 84, 79, 431, 431, 431, 431, 156,
-        116, 431, 190, 191, 362, 362, 84, 79,
-        194, 195, 360, 360, 360, 197, 360, 360,
-        200, 360, 116, 83, 83, 84, 79, 431,
-        431, 431, 431, 431, 116, 431, 433, 434,
-        435, 436, 123, 118, 437, 438, 432, 432,
-        155, 439, 432, 432, 440, 432, 441, 434,
-        436, 436, 123, 118, 437, 438, 432, 432,
-        432, 439, 432, 432, 440, 432, 434, 436,
-        436, 123, 118, 437, 438, 432, 432, 432,
-        439, 432, 432, 440, 432, 442, 432, 432,
-        432, 136, 443, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 442, 432, 445, 446,
-        447, 448, 123, 118, 437, 438, 432, 432,
-        153, 449, 432, 432, 440, 432, 450, 446,
-        451, 451, 123, 118, 437, 438, 432, 432,
-        432, 449, 432, 432, 440, 432, 446, 451,
-        451, 123, 118, 437, 438, 432, 432, 432,
-        449, 432, 432, 440, 432, 452, 432, 432,
-        432, 136, 453, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 452, 432, 454, 455,
-        456, 457, 123, 118, 437, 438, 432, 432,
-        151, 458, 432, 432, 440, 432, 459, 455,
-        460, 460, 123, 118, 437, 438, 432, 432,
-        432, 458, 432, 432, 440, 432, 455, 460,
-        460, 123, 118, 437, 438, 432, 432, 432,
-        458, 432, 432, 440, 432, 461, 432, 432,
-        432, 136, 462, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 461, 432, 463, 464,
-        465, 466, 123, 118, 437, 438, 432, 432,
-        149, 467, 432, 432, 440, 432, 468, 464,
-        469, 469, 123, 118, 437, 438, 432, 432,
-        432, 467, 432, 432, 440, 432, 464, 469,
-        469, 123, 118, 437, 438, 432, 432, 432,
-        467, 432, 432, 440, 432, 470, 432, 432,
-        432, 136, 471, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 470, 432, 472, 473,
-        474, 475, 123, 118, 437, 438, 432, 432,
-        147, 476, 432, 432, 440, 432, 477, 473,
-        478, 478, 123, 118, 437, 438, 432, 432,
-        432, 476, 432, 432, 440, 432, 473, 478,
-        478, 123, 118, 437, 438, 432, 432, 432,
-        476, 432, 432, 440, 432, 136, 479, 432,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        480, 480, 432, 118, 437, 438, 432, 432,
-        432, 444, 432, 481, 432, 432, 482, 437,
-        438, 432, 437, 438, 432, 483, 432, 437,
-        484, 432, 437, 485, 432, 437, 432, 481,
-        432, 432, 432, 437, 438, 432, 486, 432,
-        487, 488, 432, 118, 437, 438, 432, 432,
-        121, 432, 120, 432, 480, 480, 432, 118,
-        437, 438, 432, 480, 480, 432, 118, 437,
-        438, 432, 486, 432, 480, 480, 432, 118,
-        437, 438, 432, 486, 432, 487, 480, 432,
-        118, 437, 438, 432, 432, 121, 432, 136,
-        432, 489, 489, 123, 118, 437, 438, 432,
-        432, 432, 444, 432, 490, 145, 491, 492,
-        126, 118, 437, 438, 432, 432, 432, 444,
-        432, 145, 491, 492, 126, 118, 437, 438,
-        432, 432, 432, 444, 432, 491, 491, 126,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        493, 142, 494, 495, 129, 118, 437, 438,
-        432, 432, 432, 444, 432, 142, 494, 495,
-        129, 118, 437, 438, 432, 432, 432, 444,
-        432, 494, 494, 129, 118, 437, 438, 432,
-        432, 432, 444, 432, 496, 139, 497, 498,
-        132, 118, 437, 438, 432, 432, 432, 444,
-        432, 139, 497, 498, 132, 118, 437, 438,
-        432, 432, 432, 444, 432, 497, 497, 132,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        499, 136, 480, 500, 432, 118, 437, 438,
-        432, 432, 432, 444, 432, 136, 480, 500,
-        432, 118, 437, 438, 432, 432, 432, 444,
-        432, 480, 501, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 136, 432, 480, 480,
-        432, 118, 437, 438, 432, 432, 432, 444,
-        432, 119, 120, 432, 432, 136, 479, 432,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        119, 432, 473, 478, 478, 123, 118, 437,
-        438, 432, 432, 432, 476, 432, 472, 473,
-        478, 478, 123, 118, 437, 438, 432, 432,
-        432, 476, 432, 432, 440, 432, 472, 473,
-        474, 478, 123, 118, 437, 438, 432, 432,
-        147, 476, 432, 432, 440, 432, 470, 432,
-        502, 432, 489, 489, 123, 118, 437, 438,
-        432, 432, 432, 444, 432, 470, 432, 470,
-        432, 432, 432, 480, 480, 432, 118, 437,
-        438, 432, 432, 432, 444, 432, 470, 432,
-        470, 432, 432, 432, 480, 503, 432, 118,
-        437, 438, 432, 432, 432, 444, 432, 470,
-        432, 470, 432, 502, 432, 480, 480, 432,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        470, 432, 470, 120, 432, 432, 136, 471,
-        432, 118, 437, 438, 432, 432, 432, 444,
-        432, 470, 432, 463, 464, 469, 469, 123,
-        118, 437, 438, 432, 432, 432, 467, 432,
-        432, 440, 432, 463, 464, 465, 469, 123,
-        118, 437, 438, 432, 432, 149, 467, 432,
-        432, 440, 432, 461, 432, 504, 432, 489,
-        489, 123, 118, 437, 438, 432, 432, 432,
-        444, 432, 461, 432, 461, 432, 432, 432,
-        480, 480, 432, 118, 437, 438, 432, 432,
-        432, 444, 432, 461, 432, 461, 432, 432,
-        432, 480, 505, 432, 118, 437, 438, 432,
-        432, 432, 444, 432, 461, 432, 461, 432,
-        504, 432, 480, 480, 432, 118, 437, 438,
-        432, 432, 432, 444, 432, 461, 432, 461,
-        120, 432, 432, 136, 462, 432, 118, 437,
-        438, 432, 432, 432, 444, 432, 461, 432,
-        454, 455, 460, 460, 123, 118, 437, 438,
-        432, 432, 432, 458, 432, 432, 440, 432,
-        454, 455, 456, 460, 123, 118, 437, 438,
-        432, 432, 151, 458, 432, 432, 440, 432,
-        452, 432, 506, 432, 489, 489, 123, 118,
-        437, 438, 432, 432, 432, 444, 432, 452,
-        432, 452, 432, 432, 432, 480, 480, 432,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        452, 432, 452, 432, 432, 432, 480, 507,
-        432, 118, 437, 438, 432, 432, 432, 444,
-        432, 452, 432, 452, 432, 506, 432, 480,
-        480, 432, 118, 437, 438, 432, 432, 432,
-        444, 432, 452, 432, 452, 120, 432, 432,
-        136, 453, 432, 118, 437, 438, 432, 432,
-        432, 444, 432, 452, 432, 445, 446, 451,
-        451, 123, 118, 437, 438, 432, 432, 432,
-        449, 432, 432, 440, 432, 445, 446, 447,
-        451, 123, 118, 437, 438, 432, 432, 153,
-        449, 432, 432, 440, 432, 442, 432, 508,
-        432, 489, 489, 123, 118, 437, 438, 432,
-        432, 432, 444, 432, 442, 432, 442, 432,
-        432, 432, 480, 480, 432, 118, 437, 438,
-        432, 432, 432, 444, 432, 442, 432, 442,
-        432, 432, 432, 480, 509, 432, 118, 437,
-        438, 432, 432, 432, 444, 432, 442, 432,
-        442, 432, 508, 432, 480, 480, 432, 118,
-        437, 438, 432, 432, 432, 444, 432, 442,
-        432, 442, 120, 432, 432, 136, 443, 432,
-        118, 437, 438, 432, 432, 432, 444, 432,
-        442, 432, 433, 434, 436, 436, 123, 118,
-        437, 438, 432, 432, 432, 439, 432, 432,
-        440, 432, 188, 189, 190, 191, 510, 362,
-        84, 79, 194, 195, 196, 196, 156, 197,
-        360, 188, 200, 360, 203, 511, 205, 206,
-        6, 1, 207, 208, 202, 202, 38, 209,
-        202, 202, 210, 202, 213, 189, 190, 191,
-        512, 513, 84, 157, 514, 515, 202, 196,
-        156, 516, 202, 213, 200, 202, 116, 517,
-        517, 84, 157, 207, 208, 202, 202, 156,
-        518, 202, 519, 202, 202, 520, 514, 515,
-        202, 514, 515, 202, 254, 202, 514, 521,
-        202, 514, 522, 202, 514, 202, 519, 202,
-        202, 202, 514, 515, 202, 523, 3, 360,
-        360, 401, 430, 360, 79, 194, 195, 360,
-        360, 360, 365, 360, 523, 360, 524, 367,
-        525, 526, 84, 157, 514, 515, 202, 202,
-        158, 370, 202, 202, 200, 202, 527, 367,
-        528, 528, 84, 157, 514, 515, 202, 202,
-        202, 370, 202, 202, 200, 202, 367, 528,
-        528, 84, 157, 514, 515, 202, 202, 202,
-        370, 202, 202, 200, 202, 524, 367, 528,
-        528, 84, 157, 514, 515, 202, 202, 202,
-        370, 202, 202, 200, 202, 524, 367, 525,
-        528, 84, 157, 514, 515, 202, 202, 158,
-        370, 202, 202, 200, 202, 213, 202, 279,
-        116, 529, 529, 160, 157, 207, 208, 202,
-        202, 202, 518, 202, 213, 202, 530, 184,
-        531, 532, 162, 157, 514, 515, 202, 202,
-        202, 533, 202, 184, 531, 532, 162, 157,
-        514, 515, 202, 202, 202, 533, 202, 531,
-        531, 162, 157, 514, 515, 202, 202, 202,
-        533, 202, 534, 181, 535, 536, 165, 157,
-        514, 515, 202, 202, 202, 533, 202, 181,
-        535, 536, 165, 157, 514, 515, 202, 202,
-        202, 533, 202, 535, 535, 165, 157, 514,
-        515, 202, 202, 202, 533, 202, 537, 178,
-        538, 539, 168, 157, 514, 515, 202, 202,
-        202, 533, 202, 178, 538, 539, 168, 157,
-        514, 515, 202, 202, 202, 533, 202, 538,
-        538, 168, 157, 514, 515, 202, 202, 202,
-        533, 202, 540, 175, 541, 542, 202, 157,
-        514, 515, 202, 202, 202, 533, 202, 175,
-        541, 542, 202, 157, 514, 515, 202, 202,
-        202, 533, 202, 541, 541, 202, 157, 514,
-        515, 202, 202, 202, 533, 202, 543, 202,
-        544, 545, 202, 157, 514, 515, 202, 202,
-        172, 202, 171, 202, 541, 541, 202, 157,
-        514, 515, 202, 541, 541, 202, 157, 514,
-        515, 202, 543, 202, 541, 541, 202, 157,
-        514, 515, 202, 543, 202, 544, 541, 202,
-        157, 514, 515, 202, 202, 172, 202, 523,
-        171, 360, 360, 98, 364, 360, 79, 194,
-        195, 360, 360, 360, 365, 360, 523, 360,
-        547, 546, 548, 548, 546, 186, 549, 550,
-        546, 548, 548, 546, 186, 549, 550, 546,
-        551, 546, 546, 552, 549, 550, 546, 549,
-        550, 546, 553, 546, 549, 554, 546, 549,
-        555, 546, 549, 546, 551, 546, 546, 546,
+        1, 0, 2, 3, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 2, 0, 1, 0, 0, 0, 0, 
+        4, 0, 5, 5, 6, 1, 0, 7, 
+        7, 6, 0, 6, 0, 8, 8, 9, 
+        1, 0, 10, 10, 9, 0, 9, 0, 
+        11, 11, 12, 1, 0, 13, 13, 12, 
+        0, 12, 0, 14, 14, 15, 1, 0, 
+        16, 16, 15, 0, 15, 0, 17, 0, 
+        0, 0, 1, 0, 18, 0, 19, 0, 
+        20, 14, 14, 15, 1, 0, 21, 0, 
+        22, 0, 23, 11, 11, 12, 1, 0, 
+        24, 0, 25, 0, 26, 8, 8, 9, 
+        1, 0, 27, 0, 28, 0, 29, 5, 
+        5, 6, 1, 0, 0, 0, 0, 0, 
+        29, 0, 29, 5, 5, 6, 1, 0, 
+        0, 0, 0, 30, 29, 0, 31, 5, 
+        5, 6, 1, 0, 0, 0, 0, 0, 
+        31, 0, 31, 5, 5, 6, 1, 0, 
+        0, 0, 0, 32, 31, 0, 33, 5, 
+        5, 6, 1, 0, 0, 0, 0, 0, 
+        33, 0, 33, 5, 5, 6, 1, 0, 
+        0, 0, 0, 34, 33, 0, 35, 5, 
+        5, 6, 1, 0, 0, 0, 0, 0, 
+        35, 0, 35, 5, 5, 6, 1, 0, 
+        0, 0, 0, 36, 35, 0, 37, 5, 
+        5, 6, 1, 0, 0, 0, 0, 0, 
+        37, 0, 37, 5, 5, 6, 1, 0, 
+        0, 0, 0, 38, 37, 0, 40, 39, 
+        41, 42, 39, 39, 39, 39, 39, 39, 
+        39, 39, 39, 39, 39, 39, 39, 41, 
+        39, 40, 39, 39, 39, 39, 43, 39, 
+        44, 44, 45, 40, 39, 46, 46, 45, 
+        39, 45, 39, 47, 47, 48, 40, 39, 
+        49, 49, 48, 39, 48, 39, 50, 50, 
+        51, 40, 39, 52, 52, 51, 39, 51, 
+        39, 53, 53, 54, 40, 39, 55, 55, 
+        54, 39, 54, 39, 56, 39, 39, 39, 
+        40, 39, 57, 39, 58, 39, 59, 53, 
+        53, 54, 40, 39, 60, 39, 61, 39, 
+        62, 50, 50, 51, 40, 39, 63, 39, 
+        64, 39, 65, 47, 47, 48, 40, 39, 
+        66, 39, 67, 39, 68, 44, 44, 45, 
+        40, 39, 39, 39, 39, 39, 68, 39, 
+        68, 44, 44, 45, 40, 39, 39, 39, 
+        39, 69, 68, 39, 70, 44, 44, 45, 
+        40, 39, 39, 39, 39, 39, 70, 39, 
+        70, 44, 44, 45, 40, 39, 39, 39, 
+        39, 71, 70, 39, 72, 44, 44, 45, 
+        40, 39, 39, 39, 39, 39, 72, 39, 
+        72, 44, 44, 45, 40, 39, 39, 39, 
+        39, 73, 72, 39, 74, 44, 44, 45, 
+        40, 39, 39, 39, 39, 39, 74, 39, 
+        74, 44, 44, 45, 40, 39, 39, 39, 
+        39, 75, 74, 39, 76, 44, 44, 45, 
+        40, 39, 39, 39, 39, 39, 76, 39, 
+        76, 44, 44, 45, 40, 39, 39, 39, 
+        39, 77, 76, 39, 79, 78, 80, 81, 
+        78, 78, 78, 78, 78, 78, 78, 78, 
+        78, 78, 78, 78, 78, 80, 78, 79, 
+        78, 78, 78, 78, 82, 78, 83, 83, 
+        84, 79, 78, 86, 86, 84, 85, 84, 
+        85, 87, 87, 88, 79, 78, 89, 89, 
+        88, 78, 88, 78, 90, 90, 91, 79, 
+        78, 92, 92, 91, 78, 91, 78, 93, 
+        93, 94, 79, 78, 95, 95, 94, 78, 
+        94, 78, 96, 78, 78, 78, 79, 78, 
+        97, 78, 98, 78, 99, 93, 93, 94, 
+        79, 78, 100, 78, 101, 78, 102, 90, 
+        90, 91, 79, 78, 103, 78, 104, 78, 
+        105, 87, 87, 88, 79, 78, 106, 78, 
+        107, 78, 108, 83, 83, 84, 79, 78, 
+        78, 78, 78, 78, 108, 78, 108, 83, 
+        83, 84, 79, 78, 78, 78, 78, 109, 
+        108, 78, 110, 83, 83, 84, 79, 78, 
+        78, 78, 78, 78, 110, 78, 110, 83, 
+        83, 84, 79, 78, 78, 78, 78, 111, 
+        110, 78, 112, 83, 83, 84, 79, 78, 
+        78, 78, 78, 78, 112, 78, 112, 83, 
+        83, 84, 79, 78, 78, 78, 78, 113, 
+        112, 78, 114, 83, 83, 84, 79, 78, 
+        78, 78, 78, 78, 114, 78, 114, 83, 
+        83, 84, 79, 78, 78, 78, 78, 115, 
+        114, 78, 116, 83, 83, 84, 79, 78, 
+        78, 78, 78, 78, 116, 78, 118, 117, 
+        119, 120, 117, 117, 117, 117, 117, 117, 
+        117, 117, 117, 117, 117, 117, 117, 119, 
+        117, 118, 117, 117, 117, 117, 121, 117, 
+        122, 122, 123, 118, 117, 124, 124, 123, 
+        117, 123, 117, 125, 125, 126, 118, 117, 
+        127, 127, 126, 117, 126, 117, 128, 128, 
+        129, 118, 117, 130, 130, 129, 117, 129, 
+        117, 131, 131, 132, 118, 117, 133, 133, 
+        132, 117, 132, 117, 134, 117, 117, 117, 
+        118, 117, 135, 117, 136, 117, 137, 131, 
+        131, 132, 118, 117, 138, 117, 139, 117, 
+        140, 128, 128, 129, 118, 117, 141, 117, 
+        142, 117, 143, 125, 125, 126, 118, 117, 
+        144, 117, 145, 117, 146, 122, 122, 123, 
+        118, 117, 117, 117, 117, 117, 146, 117, 
+        146, 122, 122, 123, 118, 117, 117, 117, 
+        117, 147, 146, 117, 148, 122, 122, 123, 
+        118, 117, 117, 117, 117, 117, 148, 117, 
+        148, 122, 122, 123, 118, 117, 117, 117, 
+        117, 149, 148, 117, 150, 122, 122, 123, 
+        118, 117, 117, 117, 117, 117, 150, 117, 
+        150, 122, 122, 123, 118, 117, 117, 117, 
+        117, 151, 150, 117, 152, 122, 122, 123, 
+        118, 117, 117, 117, 117, 117, 152, 117, 
+        152, 122, 122, 123, 118, 117, 117, 117, 
+        117, 153, 152, 117, 154, 122, 122, 123, 
+        118, 117, 117, 117, 117, 117, 154, 117, 
+        154, 122, 122, 123, 118, 117, 117, 117, 
+        117, 155, 154, 117, 116, 83, 83, 84, 
+        79, 78, 78, 78, 78, 156, 116, 78, 
+        86, 86, 84, 1, 0, 114, 83, 83, 
+        84, 157, 0, 0, 0, 0, 0, 114, 
+        0, 114, 83, 83, 84, 157, 0, 0, 
+        0, 0, 158, 114, 0, 159, 159, 160, 
+        1, 0, 7, 7, 160, 0, 161, 161, 
+        162, 157, 0, 163, 163, 162, 0, 162, 
+        0, 164, 164, 165, 157, 0, 166, 166, 
+        165, 0, 165, 0, 167, 167, 168, 157, 
+        0, 169, 169, 168, 0, 168, 0, 157, 
+        0, 170, 171, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        170, 0, 157, 0, 0, 0, 0, 172, 
+        0, 173, 0, 0, 0, 157, 0, 174, 
+        0, 175, 0, 176, 167, 167, 168, 157, 
+        0, 177, 0, 178, 0, 179, 164, 164, 
+        165, 157, 0, 180, 0, 181, 0, 182, 
+        161, 161, 162, 157, 0, 183, 0, 184, 
+        0, 186, 185, 188, 189, 190, 191, 192, 
+        193, 84, 79, 194, 195, 196, 196, 156, 
+        197, 198, 199, 200, 201, 187, 203, 204, 
+        205, 206, 6, 1, 207, 208, 202, 202, 
+        38, 209, 202, 202, 210, 202, 211, 204, 
+        212, 212, 6, 1, 207, 208, 202, 202, 
+        202, 209, 202, 202, 210, 202, 204, 212, 
+        212, 6, 1, 207, 208, 202, 202, 202, 
+        209, 202, 202, 210, 202, 213, 202, 202, 
+        202, 19, 214, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 213, 202, 216, 217, 
+        218, 219, 6, 1, 207, 208, 202, 202, 
+        36, 220, 202, 202, 210, 202, 221, 217, 
+        222, 222, 6, 1, 207, 208, 202, 202, 
+        202, 220, 202, 202, 210, 202, 217, 222, 
+        222, 6, 1, 207, 208, 202, 202, 202, 
+        220, 202, 202, 210, 202, 223, 202, 202, 
+        202, 19, 224, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 223, 202, 225, 226, 
+        227, 228, 6, 1, 207, 208, 202, 202, 
+        34, 229, 202, 202, 210, 202, 230, 226, 
+        231, 231, 6, 1, 207, 208, 202, 202, 
+        202, 229, 202, 202, 210, 202, 226, 231, 
+        231, 6, 1, 207, 208, 202, 202, 202, 
+        229, 202, 202, 210, 202, 232, 202, 202, 
+        202, 19, 233, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 232, 202, 234, 235, 
+        236, 237, 6, 1, 207, 208, 202, 202, 
+        32, 238, 202, 202, 210, 202, 239, 235, 
+        240, 240, 6, 1, 207, 208, 202, 202, 
+        202, 238, 202, 202, 210, 202, 235, 240, 
+        240, 6, 1, 207, 208, 202, 202, 202, 
+        238, 202, 202, 210, 202, 241, 202, 202, 
+        202, 19, 242, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 241, 202, 243, 244, 
+        245, 246, 6, 1, 207, 208, 202, 202, 
+        30, 247, 202, 202, 210, 202, 248, 244, 
+        249, 249, 6, 1, 207, 208, 202, 202, 
+        202, 247, 202, 202, 210, 202, 244, 249, 
+        249, 6, 1, 207, 208, 202, 202, 202, 
+        247, 202, 202, 210, 202, 19, 250, 202, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        251, 251, 202, 1, 207, 208, 202, 202, 
+        202, 215, 202, 252, 202, 202, 253, 207, 
+        208, 202, 207, 208, 202, 254, 202, 207, 
+        255, 202, 207, 256, 202, 207, 202, 252, 
+        202, 202, 202, 207, 208, 202, 257, 202, 
+        258, 259, 202, 1, 207, 208, 202, 202, 
+        4, 202, 3, 202, 251, 251, 202, 1, 
+        207, 208, 202, 251, 251, 202, 1, 207, 
+        208, 202, 257, 202, 251, 251, 202, 1, 
+        207, 208, 202, 257, 202, 258, 251, 202, 
+        1, 207, 208, 202, 202, 4, 202, 19, 
+        202, 260, 260, 6, 1, 207, 208, 202, 
+        202, 202, 215, 202, 261, 28, 262, 263, 
+        9, 1, 207, 208, 202, 202, 202, 215, 
+        202, 28, 262, 263, 9, 1, 207, 208, 
+        202, 202, 202, 215, 202, 262, 262, 9, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        264, 25, 265, 266, 12, 1, 207, 208, 
+        202, 202, 202, 215, 202, 25, 265, 266, 
+        12, 1, 207, 208, 202, 202, 202, 215, 
+        202, 265, 265, 12, 1, 207, 208, 202, 
+        202, 202, 215, 202, 267, 22, 268, 269, 
+        15, 1, 207, 208, 202, 202, 202, 215, 
+        202, 22, 268, 269, 15, 1, 207, 208, 
+        202, 202, 202, 215, 202, 268, 268, 15, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        270, 19, 251, 271, 202, 1, 207, 208, 
+        202, 202, 202, 215, 202, 19, 251, 271, 
+        202, 1, 207, 208, 202, 202, 202, 215, 
+        202, 251, 272, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 19, 202, 251, 251, 
+        202, 1, 207, 208, 202, 202, 202, 215, 
+        202, 2, 3, 202, 202, 19, 250, 202, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        2, 202, 244, 249, 249, 6, 1, 207, 
+        208, 202, 202, 202, 247, 202, 243, 244, 
+        249, 249, 6, 1, 207, 208, 202, 202, 
+        202, 247, 202, 202, 210, 202, 243, 244, 
+        245, 249, 6, 1, 207, 208, 202, 202, 
+        30, 247, 202, 202, 210, 202, 241, 202, 
+        273, 202, 260, 260, 6, 1, 207, 208, 
+        202, 202, 202, 215, 202, 241, 202, 241, 
+        202, 202, 202, 251, 251, 202, 1, 207, 
+        208, 202, 202, 202, 215, 202, 241, 202, 
+        241, 202, 202, 202, 251, 274, 202, 1, 
+        207, 208, 202, 202, 202, 215, 202, 241, 
+        202, 241, 202, 273, 202, 251, 251, 202, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        241, 202, 241, 3, 202, 202, 19, 242, 
+        202, 1, 207, 208, 202, 202, 202, 215, 
+        202, 241, 202, 234, 235, 240, 240, 6, 
+        1, 207, 208, 202, 202, 202, 238, 202, 
+        202, 210, 202, 234, 235, 236, 240, 6, 
+        1, 207, 208, 202, 202, 32, 238, 202, 
+        202, 210, 202, 232, 202, 275, 202, 260, 
+        260, 6, 1, 207, 208, 202, 202, 202, 
+        215, 202, 232, 202, 232, 202, 202, 202, 
+        251, 251, 202, 1, 207, 208, 202, 202, 
+        202, 215, 202, 232, 202, 232, 202, 202, 
+        202, 251, 276, 202, 1, 207, 208, 202, 
+        202, 202, 215, 202, 232, 202, 232, 202, 
+        275, 202, 251, 251, 202, 1, 207, 208, 
+        202, 202, 202, 215, 202, 232, 202, 232, 
+        3, 202, 202, 19, 233, 202, 1, 207, 
+        208, 202, 202, 202, 215, 202, 232, 202, 
+        225, 226, 231, 231, 6, 1, 207, 208, 
+        202, 202, 202, 229, 202, 202, 210, 202, 
+        225, 226, 227, 231, 6, 1, 207, 208, 
+        202, 202, 34, 229, 202, 202, 210, 202, 
+        223, 202, 277, 202, 260, 260, 6, 1, 
+        207, 208, 202, 202, 202, 215, 202, 223, 
+        202, 223, 202, 202, 202, 251, 251, 202, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        223, 202, 223, 202, 202, 202, 251, 278, 
+        202, 1, 207, 208, 202, 202, 202, 215, 
+        202, 223, 202, 223, 202, 277, 202, 251, 
+        251, 202, 1, 207, 208, 202, 202, 202, 
+        215, 202, 223, 202, 223, 3, 202, 202, 
+        19, 224, 202, 1, 207, 208, 202, 202, 
+        202, 215, 202, 223, 202, 216, 217, 222, 
+        222, 6, 1, 207, 208, 202, 202, 202, 
+        220, 202, 202, 210, 202, 216, 217, 218, 
+        222, 6, 1, 207, 208, 202, 202, 36, 
+        220, 202, 202, 210, 202, 213, 202, 279, 
+        202, 260, 260, 6, 1, 207, 208, 202, 
+        202, 202, 215, 202, 213, 202, 213, 202, 
+        202, 202, 251, 251, 202, 1, 207, 208, 
+        202, 202, 202, 215, 202, 213, 202, 213, 
+        202, 202, 202, 251, 280, 202, 1, 207, 
+        208, 202, 202, 202, 215, 202, 213, 202, 
+        213, 202, 279, 202, 251, 251, 202, 1, 
+        207, 208, 202, 202, 202, 215, 202, 213, 
+        202, 213, 3, 202, 202, 19, 214, 202, 
+        1, 207, 208, 202, 202, 202, 215, 202, 
+        213, 202, 203, 204, 212, 212, 6, 1, 
+        207, 208, 202, 202, 202, 209, 202, 202, 
+        210, 202, 203, 204, 205, 212, 6, 1, 
+        207, 208, 202, 202, 38, 209, 202, 202, 
+        210, 202, 282, 283, 284, 285, 45, 40, 
+        286, 287, 281, 281, 77, 288, 281, 281, 
+        289, 281, 290, 283, 291, 285, 45, 40, 
+        286, 287, 281, 281, 281, 288, 281, 281, 
+        289, 281, 283, 291, 285, 45, 40, 286, 
+        287, 281, 281, 281, 288, 281, 281, 289, 
+        281, 292, 281, 281, 281, 58, 293, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        292, 281, 295, 296, 297, 298, 45, 40, 
+        286, 287, 281, 281, 75, 299, 281, 281, 
+        289, 281, 300, 296, 301, 301, 45, 40, 
+        286, 287, 281, 281, 281, 299, 281, 281, 
+        289, 281, 296, 301, 301, 45, 40, 286, 
+        287, 281, 281, 281, 299, 281, 281, 289, 
+        281, 302, 281, 281, 281, 58, 303, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        302, 281, 304, 305, 306, 307, 45, 40, 
+        286, 287, 281, 281, 73, 308, 281, 281, 
+        289, 281, 309, 305, 310, 310, 45, 40, 
+        286, 287, 281, 281, 281, 308, 281, 281, 
+        289, 281, 305, 310, 310, 45, 40, 286, 
+        287, 281, 281, 281, 308, 281, 281, 289, 
+        281, 311, 281, 281, 281, 58, 312, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        311, 281, 313, 314, 315, 316, 45, 40, 
+        286, 287, 281, 281, 71, 317, 281, 281, 
+        289, 281, 318, 314, 319, 319, 45, 40, 
+        286, 287, 281, 281, 281, 317, 281, 281, 
+        289, 281, 314, 319, 319, 45, 40, 286, 
+        287, 281, 281, 281, 317, 281, 281, 289, 
+        281, 320, 281, 281, 281, 58, 321, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        320, 281, 322, 323, 324, 325, 45, 40, 
+        286, 287, 281, 281, 69, 326, 281, 281, 
+        289, 281, 327, 323, 328, 328, 45, 40, 
+        286, 287, 281, 281, 281, 326, 281, 281, 
+        289, 281, 323, 328, 328, 45, 40, 286, 
+        287, 281, 281, 281, 326, 281, 281, 289, 
+        281, 58, 329, 281, 40, 286, 287, 281, 
+        281, 281, 294, 281, 330, 330, 281, 40, 
+        286, 287, 281, 281, 281, 294, 281, 331, 
+        281, 281, 332, 286, 287, 281, 286, 287, 
+        281, 333, 281, 286, 334, 281, 286, 335, 
+        281, 286, 281, 331, 281, 281, 281, 286, 
+        287, 281, 336, 281, 337, 338, 281, 40, 
+        286, 287, 281, 281, 43, 281, 42, 281, 
+        330, 330, 281, 40, 286, 287, 281, 330, 
+        330, 281, 40, 286, 287, 281, 336, 281, 
+        330, 330, 281, 40, 286, 287, 281, 336, 
+        281, 337, 330, 281, 40, 286, 287, 281, 
+        281, 43, 281, 58, 281, 339, 339, 45, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        340, 67, 341, 342, 48, 40, 286, 287, 
+        281, 281, 281, 294, 281, 67, 341, 342, 
+        48, 40, 286, 287, 281, 281, 281, 294, 
+        281, 341, 341, 48, 40, 286, 287, 281, 
+        281, 281, 294, 281, 343, 64, 344, 345, 
+        51, 40, 286, 287, 281, 281, 281, 294, 
+        281, 64, 344, 345, 51, 40, 286, 287, 
+        281, 281, 281, 294, 281, 344, 344, 51, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        346, 61, 347, 348, 54, 40, 286, 287, 
+        281, 281, 281, 294, 281, 61, 347, 348, 
+        54, 40, 286, 287, 281, 281, 281, 294, 
+        281, 347, 347, 54, 40, 286, 287, 281, 
+        281, 281, 294, 281, 349, 58, 330, 350, 
+        281, 40, 286, 287, 281, 281, 281, 294, 
+        281, 58, 330, 350, 281, 40, 286, 287, 
+        281, 281, 281, 294, 281, 330, 351, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        58, 281, 330, 330, 281, 40, 286, 287, 
+        281, 281, 281, 294, 281, 41, 42, 281, 
+        281, 58, 329, 281, 40, 286, 287, 281, 
+        281, 281, 294, 281, 41, 281, 323, 328, 
+        328, 45, 40, 286, 287, 281, 281, 281, 
+        326, 281, 322, 323, 328, 328, 45, 40, 
+        286, 287, 281, 281, 281, 326, 281, 281, 
+        289, 281, 322, 323, 324, 328, 45, 40, 
+        286, 287, 281, 281, 69, 326, 281, 281, 
+        289, 281, 320, 281, 352, 281, 339, 339, 
+        45, 40, 286, 287, 281, 281, 281, 294, 
+        281, 320, 281, 320, 281, 281, 281, 330, 
+        330, 281, 40, 286, 287, 281, 281, 281, 
+        294, 281, 320, 281, 320, 281, 281, 281, 
+        330, 353, 281, 40, 286, 287, 281, 281, 
+        281, 294, 281, 320, 281, 320, 281, 352, 
+        281, 330, 330, 281, 40, 286, 287, 281, 
+        281, 281, 294, 281, 320, 281, 320, 42, 
+        281, 281, 58, 321, 281, 40, 286, 287, 
+        281, 281, 281, 294, 281, 320, 281, 313, 
+        314, 319, 319, 45, 40, 286, 287, 281, 
+        281, 281, 317, 281, 281, 289, 281, 313, 
+        314, 315, 319, 45, 40, 286, 287, 281, 
+        281, 71, 317, 281, 281, 289, 281, 311, 
+        281, 354, 281, 339, 339, 45, 40, 286, 
+        287, 281, 281, 281, 294, 281, 311, 281, 
+        311, 281, 281, 281, 330, 330, 281, 40, 
+        286, 287, 281, 281, 281, 294, 281, 311, 
+        281, 311, 281, 281, 281, 330, 355, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        311, 281, 311, 281, 354, 281, 330, 330, 
+        281, 40, 286, 287, 281, 281, 281, 294, 
+        281, 311, 281, 311, 42, 281, 281, 58, 
+        312, 281, 40, 286, 287, 281, 281, 281, 
+        294, 281, 311, 281, 304, 305, 310, 310, 
+        45, 40, 286, 287, 281, 281, 281, 308, 
+        281, 281, 289, 281, 304, 305, 306, 310, 
+        45, 40, 286, 287, 281, 281, 73, 308, 
+        281, 281, 289, 281, 302, 281, 356, 281, 
+        339, 339, 45, 40, 286, 287, 281, 281, 
+        281, 294, 281, 302, 281, 302, 281, 281, 
+        281, 330, 330, 281, 40, 286, 287, 281, 
+        281, 281, 294, 281, 302, 281, 302, 281, 
+        281, 281, 330, 357, 281, 40, 286, 287, 
+        281, 281, 281, 294, 281, 302, 281, 302, 
+        281, 356, 281, 330, 330, 281, 40, 286, 
+        287, 281, 281, 281, 294, 281, 302, 281, 
+        302, 42, 281, 281, 58, 303, 281, 40, 
+        286, 287, 281, 281, 281, 294, 281, 302, 
+        281, 295, 296, 301, 301, 45, 40, 286, 
+        287, 281, 281, 281, 299, 281, 281, 289, 
+        281, 295, 296, 297, 301, 45, 40, 286, 
+        287, 281, 281, 75, 299, 281, 281, 289, 
+        281, 292, 281, 358, 281, 339, 339, 45, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        292, 281, 292, 281, 281, 281, 330, 330, 
+        281, 40, 286, 287, 281, 281, 281, 294, 
+        281, 292, 281, 292, 281, 281, 281, 330, 
+        359, 281, 40, 286, 287, 281, 281, 281, 
+        294, 281, 292, 281, 292, 281, 358, 281, 
+        330, 330, 281, 40, 286, 287, 281, 281, 
+        281, 294, 281, 292, 281, 76, 44, 44, 
+        45, 40, 281, 281, 281, 281, 281, 76, 
+        281, 292, 42, 281, 281, 58, 293, 281, 
+        40, 286, 287, 281, 281, 281, 294, 281, 
+        292, 281, 282, 283, 291, 285, 45, 40, 
+        286, 287, 281, 281, 281, 288, 281, 281, 
+        289, 281, 361, 191, 362, 362, 84, 79, 
+        194, 195, 360, 360, 360, 197, 360, 360, 
+        200, 360, 191, 362, 362, 84, 79, 194, 
+        195, 360, 360, 360, 197, 360, 360, 200, 
+        360, 363, 360, 360, 360, 98, 364, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        363, 360, 366, 367, 368, 369, 84, 79, 
+        194, 195, 360, 360, 115, 370, 360, 360, 
+        200, 360, 371, 367, 372, 372, 84, 79, 
+        194, 195, 360, 360, 360, 370, 360, 360, 
+        200, 360, 367, 372, 372, 84, 79, 194, 
+        195, 360, 360, 360, 370, 360, 360, 200, 
+        360, 373, 360, 360, 360, 98, 374, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        373, 360, 375, 376, 377, 378, 84, 79, 
+        194, 195, 360, 360, 113, 379, 360, 360, 
+        200, 360, 380, 376, 381, 381, 84, 79, 
+        194, 195, 360, 360, 360, 379, 360, 360, 
+        200, 360, 376, 381, 381, 84, 79, 194, 
+        195, 360, 360, 360, 379, 360, 360, 200, 
+        360, 382, 360, 360, 360, 98, 383, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        382, 360, 384, 385, 386, 387, 84, 79, 
+        194, 195, 360, 360, 111, 388, 360, 360, 
+        200, 360, 389, 385, 390, 390, 84, 79, 
+        194, 195, 360, 360, 360, 388, 360, 360, 
+        200, 360, 385, 390, 390, 84, 79, 194, 
+        195, 360, 360, 360, 388, 360, 360, 200, 
+        360, 391, 360, 360, 360, 98, 392, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        391, 360, 393, 394, 395, 396, 84, 79, 
+        194, 195, 360, 360, 109, 397, 360, 360, 
+        200, 360, 398, 394, 399, 399, 84, 79, 
+        194, 195, 360, 360, 360, 397, 360, 360, 
+        200, 360, 394, 399, 399, 84, 79, 194, 
+        195, 360, 360, 360, 397, 360, 360, 200, 
+        360, 98, 400, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 401, 401, 360, 79, 
+        194, 195, 360, 360, 360, 365, 360, 402, 
+        360, 360, 403, 194, 195, 360, 194, 195, 
+        360, 404, 360, 194, 405, 360, 194, 406, 
+        360, 194, 360, 402, 360, 360, 360, 194, 
+        195, 360, 407, 360, 408, 409, 360, 79, 
+        194, 195, 360, 360, 82, 360, 81, 360, 
+        401, 401, 360, 79, 194, 195, 360, 401, 
+        401, 360, 79, 194, 195, 360, 407, 360, 
+        401, 401, 360, 79, 194, 195, 360, 407, 
+        360, 408, 401, 360, 79, 194, 195, 360, 
+        360, 82, 360, 98, 360, 410, 410, 84, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        411, 107, 412, 413, 88, 79, 194, 195, 
+        360, 360, 360, 365, 360, 107, 412, 413, 
+        88, 79, 194, 195, 360, 360, 360, 365, 
+        360, 412, 412, 88, 79, 194, 195, 360, 
+        360, 360, 365, 360, 414, 104, 415, 416, 
+        91, 79, 194, 195, 360, 360, 360, 365, 
+        360, 104, 415, 416, 91, 79, 194, 195, 
+        360, 360, 360, 365, 360, 415, 415, 91, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        417, 101, 418, 419, 94, 79, 194, 195, 
+        360, 360, 360, 365, 360, 101, 418, 419, 
+        94, 79, 194, 195, 360, 360, 360, 365, 
+        360, 418, 418, 94, 79, 194, 195, 360, 
+        360, 360, 365, 360, 420, 98, 401, 421, 
+        360, 79, 194, 195, 360, 360, 360, 365, 
+        360, 98, 401, 421, 360, 79, 194, 195, 
+        360, 360, 360, 365, 360, 401, 422, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        98, 360, 401, 401, 360, 79, 194, 195, 
+        360, 360, 360, 365, 360, 80, 81, 360, 
+        360, 98, 400, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 80, 360, 394, 399, 
+        399, 84, 79, 194, 195, 360, 360, 360, 
+        397, 360, 393, 394, 399, 399, 84, 79, 
+        194, 195, 360, 360, 360, 397, 360, 360, 
+        200, 360, 393, 394, 395, 399, 84, 79, 
+        194, 195, 360, 360, 109, 397, 360, 360, 
+        200, 360, 391, 360, 423, 360, 410, 410, 
+        84, 79, 194, 195, 360, 360, 360, 365, 
+        360, 391, 360, 391, 360, 360, 360, 401, 
+        401, 360, 79, 194, 195, 360, 360, 360, 
+        365, 360, 391, 360, 391, 360, 360, 360, 
+        401, 424, 360, 79, 194, 195, 360, 360, 
+        360, 365, 360, 391, 360, 391, 360, 423, 
+        360, 401, 401, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 391, 360, 391, 81, 
+        360, 360, 98, 392, 360, 79, 194, 195, 
+        360, 360, 360, 365, 360, 391, 360, 384, 
+        385, 390, 390, 84, 79, 194, 195, 360, 
+        360, 360, 388, 360, 360, 200, 360, 384, 
+        385, 386, 390, 84, 79, 194, 195, 360, 
+        360, 111, 388, 360, 360, 200, 360, 382, 
+        360, 425, 360, 410, 410, 84, 79, 194, 
+        195, 360, 360, 360, 365, 360, 382, 360, 
+        382, 360, 360, 360, 401, 401, 360, 79, 
+        194, 195, 360, 360, 360, 365, 360, 382, 
+        360, 382, 360, 360, 360, 401, 426, 360, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        382, 360, 382, 360, 425, 360, 401, 401, 
+        360, 79, 194, 195, 360, 360, 360, 365, 
+        360, 382, 360, 382, 81, 360, 360, 98, 
+        383, 360, 79, 194, 195, 360, 360, 360, 
+        365, 360, 382, 360, 375, 376, 381, 381, 
+        84, 79, 194, 195, 360, 360, 360, 379, 
+        360, 360, 200, 360, 375, 376, 377, 381, 
+        84, 79, 194, 195, 360, 360, 113, 379, 
+        360, 360, 200, 360, 373, 360, 427, 360, 
+        410, 410, 84, 79, 194, 195, 360, 360, 
+        360, 365, 360, 373, 360, 373, 360, 360, 
+        360, 401, 401, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 373, 360, 373, 360, 
+        360, 360, 401, 428, 360, 79, 194, 195, 
+        360, 360, 360, 365, 360, 373, 360, 373, 
+        360, 427, 360, 401, 401, 360, 79, 194, 
+        195, 360, 360, 360, 365, 360, 373, 360, 
+        373, 81, 360, 360, 98, 374, 360, 79, 
+        194, 195, 360, 360, 360, 365, 360, 373, 
+        360, 366, 367, 372, 372, 84, 79, 194, 
+        195, 360, 360, 360, 370, 360, 360, 200, 
+        360, 366, 367, 368, 372, 84, 79, 194, 
+        195, 360, 360, 115, 370, 360, 360, 200, 
+        360, 363, 360, 429, 360, 410, 410, 84, 
+        79, 194, 195, 360, 360, 360, 365, 360, 
+        363, 360, 363, 360, 360, 360, 401, 401, 
+        360, 79, 194, 195, 360, 360, 360, 365, 
+        360, 363, 360, 363, 360, 360, 360, 401, 
+        430, 360, 79, 194, 195, 360, 360, 360, 
+        365, 360, 363, 360, 363, 360, 429, 360, 
+        401, 401, 360, 79, 194, 195, 360, 360, 
+        360, 365, 360, 363, 360, 363, 81, 360, 
+        360, 98, 364, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 363, 360, 116, 83, 
+        83, 84, 79, 431, 431, 431, 431, 156, 
+        116, 431, 190, 191, 362, 362, 84, 79, 
+        194, 195, 360, 360, 360, 197, 360, 360, 
+        200, 360, 116, 83, 83, 84, 79, 431, 
+        431, 431, 431, 431, 116, 431, 433, 434, 
+        435, 436, 123, 118, 437, 438, 432, 432, 
+        155, 439, 432, 432, 440, 432, 441, 434, 
+        436, 436, 123, 118, 437, 438, 432, 432, 
+        432, 439, 432, 432, 440, 432, 434, 436, 
+        436, 123, 118, 437, 438, 432, 432, 432, 
+        439, 432, 432, 440, 432, 442, 432, 432, 
+        432, 136, 443, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 442, 432, 445, 446, 
+        447, 448, 123, 118, 437, 438, 432, 432, 
+        153, 449, 432, 432, 440, 432, 450, 446, 
+        451, 451, 123, 118, 437, 438, 432, 432, 
+        432, 449, 432, 432, 440, 432, 446, 451, 
+        451, 123, 118, 437, 438, 432, 432, 432, 
+        449, 432, 432, 440, 432, 452, 432, 432, 
+        432, 136, 453, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 452, 432, 454, 455, 
+        456, 457, 123, 118, 437, 438, 432, 432, 
+        151, 458, 432, 432, 440, 432, 459, 455, 
+        460, 460, 123, 118, 437, 438, 432, 432, 
+        432, 458, 432, 432, 440, 432, 455, 460, 
+        460, 123, 118, 437, 438, 432, 432, 432, 
+        458, 432, 432, 440, 432, 461, 432, 432, 
+        432, 136, 462, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 461, 432, 463, 464, 
+        465, 466, 123, 118, 437, 438, 432, 432, 
+        149, 467, 432, 432, 440, 432, 468, 464, 
+        469, 469, 123, 118, 437, 438, 432, 432, 
+        432, 467, 432, 432, 440, 432, 464, 469, 
+        469, 123, 118, 437, 438, 432, 432, 432, 
+        467, 432, 432, 440, 432, 470, 432, 432, 
+        432, 136, 471, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 470, 432, 472, 473, 
+        474, 475, 123, 118, 437, 438, 432, 432, 
+        147, 476, 432, 432, 440, 432, 477, 473, 
+        478, 478, 123, 118, 437, 438, 432, 432, 
+        432, 476, 432, 432, 440, 432, 473, 478, 
+        478, 123, 118, 437, 438, 432, 432, 432, 
+        476, 432, 432, 440, 432, 136, 479, 432, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        480, 480, 432, 118, 437, 438, 432, 432, 
+        432, 444, 432, 481, 432, 432, 482, 437, 
+        438, 432, 437, 438, 432, 483, 432, 437, 
+        484, 432, 437, 485, 432, 437, 432, 481, 
+        432, 432, 432, 437, 438, 432, 486, 432, 
+        487, 488, 432, 118, 437, 438, 432, 432, 
+        121, 432, 120, 432, 480, 480, 432, 118, 
+        437, 438, 432, 480, 480, 432, 118, 437, 
+        438, 432, 486, 432, 480, 480, 432, 118, 
+        437, 438, 432, 486, 432, 487, 480, 432, 
+        118, 437, 438, 432, 432, 121, 432, 136, 
+        432, 489, 489, 123, 118, 437, 438, 432, 
+        432, 432, 444, 432, 490, 145, 491, 492, 
+        126, 118, 437, 438, 432, 432, 432, 444, 
+        432, 145, 491, 492, 126, 118, 437, 438, 
+        432, 432, 432, 444, 432, 491, 491, 126, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        493, 142, 494, 495, 129, 118, 437, 438, 
+        432, 432, 432, 444, 432, 142, 494, 495, 
+        129, 118, 437, 438, 432, 432, 432, 444, 
+        432, 494, 494, 129, 118, 437, 438, 432, 
+        432, 432, 444, 432, 496, 139, 497, 498, 
+        132, 118, 437, 438, 432, 432, 432, 444, 
+        432, 139, 497, 498, 132, 118, 437, 438, 
+        432, 432, 432, 444, 432, 497, 497, 132, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        499, 136, 480, 500, 432, 118, 437, 438, 
+        432, 432, 432, 444, 432, 136, 480, 500, 
+        432, 118, 437, 438, 432, 432, 432, 444, 
+        432, 480, 501, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 136, 432, 480, 480, 
+        432, 118, 437, 438, 432, 432, 432, 444, 
+        432, 119, 120, 432, 432, 136, 479, 432, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        119, 432, 473, 478, 478, 123, 118, 437, 
+        438, 432, 432, 432, 476, 432, 472, 473, 
+        478, 478, 123, 118, 437, 438, 432, 432, 
+        432, 476, 432, 432, 440, 432, 472, 473, 
+        474, 478, 123, 118, 437, 438, 432, 432, 
+        147, 476, 432, 432, 440, 432, 470, 432, 
+        502, 432, 489, 489, 123, 118, 437, 438, 
+        432, 432, 432, 444, 432, 470, 432, 470, 
+        432, 432, 432, 480, 480, 432, 118, 437, 
+        438, 432, 432, 432, 444, 432, 470, 432, 
+        470, 432, 432, 432, 480, 503, 432, 118, 
+        437, 438, 432, 432, 432, 444, 432, 470, 
+        432, 470, 432, 502, 432, 480, 480, 432, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        470, 432, 470, 120, 432, 432, 136, 471, 
+        432, 118, 437, 438, 432, 432, 432, 444, 
+        432, 470, 432, 463, 464, 469, 469, 123, 
+        118, 437, 438, 432, 432, 432, 467, 432, 
+        432, 440, 432, 463, 464, 465, 469, 123, 
+        118, 437, 438, 432, 432, 149, 467, 432, 
+        432, 440, 432, 461, 432, 504, 432, 489, 
+        489, 123, 118, 437, 438, 432, 432, 432, 
+        444, 432, 461, 432, 461, 432, 432, 432, 
+        480, 480, 432, 118, 437, 438, 432, 432, 
+        432, 444, 432, 461, 432, 461, 432, 432, 
+        432, 480, 505, 432, 118, 437, 438, 432, 
+        432, 432, 444, 432, 461, 432, 461, 432, 
+        504, 432, 480, 480, 432, 118, 437, 438, 
+        432, 432, 432, 444, 432, 461, 432, 461, 
+        120, 432, 432, 136, 462, 432, 118, 437, 
+        438, 432, 432, 432, 444, 432, 461, 432, 
+        454, 455, 460, 460, 123, 118, 437, 438, 
+        432, 432, 432, 458, 432, 432, 440, 432, 
+        454, 455, 456, 460, 123, 118, 437, 438, 
+        432, 432, 151, 458, 432, 432, 440, 432, 
+        452, 432, 506, 432, 489, 489, 123, 118, 
+        437, 438, 432, 432, 432, 444, 432, 452, 
+        432, 452, 432, 432, 432, 480, 480, 432, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        452, 432, 452, 432, 432, 432, 480, 507, 
+        432, 118, 437, 438, 432, 432, 432, 444, 
+        432, 452, 432, 452, 432, 506, 432, 480, 
+        480, 432, 118, 437, 438, 432, 432, 432, 
+        444, 432, 452, 432, 452, 120, 432, 432, 
+        136, 453, 432, 118, 437, 438, 432, 432, 
+        432, 444, 432, 452, 432, 445, 446, 451, 
+        451, 123, 118, 437, 438, 432, 432, 432, 
+        449, 432, 432, 440, 432, 445, 446, 447, 
+        451, 123, 118, 437, 438, 432, 432, 153, 
+        449, 432, 432, 440, 432, 442, 432, 508, 
+        432, 489, 489, 123, 118, 437, 438, 432, 
+        432, 432, 444, 432, 442, 432, 442, 432, 
+        432, 432, 480, 480, 432, 118, 437, 438, 
+        432, 432, 432, 444, 432, 442, 432, 442, 
+        432, 432, 432, 480, 509, 432, 118, 437, 
+        438, 432, 432, 432, 444, 432, 442, 432, 
+        442, 432, 508, 432, 480, 480, 432, 118, 
+        437, 438, 432, 432, 432, 444, 432, 442, 
+        432, 442, 120, 432, 432, 136, 443, 432, 
+        118, 437, 438, 432, 432, 432, 444, 432, 
+        442, 432, 433, 434, 436, 436, 123, 118, 
+        437, 438, 432, 432, 432, 439, 432, 432, 
+        440, 432, 188, 189, 190, 191, 510, 362, 
+        84, 79, 194, 195, 196, 196, 156, 197, 
+        360, 188, 200, 360, 203, 511, 205, 206, 
+        6, 1, 207, 208, 202, 202, 38, 209, 
+        202, 202, 210, 202, 213, 189, 190, 191, 
+        512, 513, 84, 157, 514, 515, 202, 196, 
+        156, 516, 202, 213, 200, 202, 116, 517, 
+        517, 84, 157, 207, 208, 202, 202, 156, 
+        518, 202, 519, 202, 202, 520, 514, 515, 
+        202, 514, 515, 202, 254, 202, 514, 521, 
+        202, 514, 522, 202, 514, 202, 519, 202, 
+        202, 202, 514, 515, 202, 523, 3, 360, 
+        360, 401, 430, 360, 79, 194, 195, 360, 
+        360, 360, 365, 360, 523, 360, 524, 367, 
+        525, 526, 84, 157, 514, 515, 202, 202, 
+        158, 370, 202, 202, 200, 202, 527, 367, 
+        528, 528, 84, 157, 514, 515, 202, 202, 
+        202, 370, 202, 202, 200, 202, 367, 528, 
+        528, 84, 157, 514, 515, 202, 202, 202, 
+        370, 202, 202, 200, 202, 524, 367, 528, 
+        528, 84, 157, 514, 515, 202, 202, 202, 
+        370, 202, 202, 200, 202, 524, 367, 525, 
+        528, 84, 157, 514, 515, 202, 202, 158, 
+        370, 202, 202, 200, 202, 213, 202, 279, 
+        116, 529, 529, 160, 157, 207, 208, 202, 
+        202, 202, 518, 202, 213, 202, 530, 184, 
+        531, 532, 162, 157, 514, 515, 202, 202, 
+        202, 533, 202, 184, 531, 532, 162, 157, 
+        514, 515, 202, 202, 202, 533, 202, 531, 
+        531, 162, 157, 514, 515, 202, 202, 202, 
+        533, 202, 534, 181, 535, 536, 165, 157, 
+        514, 515, 202, 202, 202, 533, 202, 181, 
+        535, 536, 165, 157, 514, 515, 202, 202, 
+        202, 533, 202, 535, 535, 165, 157, 514, 
+        515, 202, 202, 202, 533, 202, 537, 178, 
+        538, 539, 168, 157, 514, 515, 202, 202, 
+        202, 533, 202, 178, 538, 539, 168, 157, 
+        514, 515, 202, 202, 202, 533, 202, 538, 
+        538, 168, 157, 514, 515, 202, 202, 202, 
+        533, 202, 540, 175, 541, 542, 202, 157, 
+        514, 515, 202, 202, 202, 533, 202, 175, 
+        541, 542, 202, 157, 514, 515, 202, 202, 
+        202, 533, 202, 541, 541, 202, 157, 514, 
+        515, 202, 202, 202, 533, 202, 543, 202, 
+        544, 545, 202, 157, 514, 515, 202, 202, 
+        172, 202, 171, 202, 541, 541, 202, 157, 
+        514, 515, 202, 541, 541, 202, 157, 514, 
+        515, 202, 543, 202, 541, 541, 202, 157, 
+        514, 515, 202, 543, 202, 544, 541, 202, 
+        157, 514, 515, 202, 202, 172, 202, 523, 
+        171, 360, 360, 98, 364, 360, 79, 194, 
+        195, 360, 360, 360, 365, 360, 523, 360, 
+        547, 546, 548, 548, 546, 186, 549, 550, 
+        546, 548, 548, 546, 186, 549, 550, 546, 
+        551, 546, 546, 552, 549, 550, 546, 549, 
+        550, 546, 553, 546, 549, 554, 546, 549, 
+        555, 546, 549, 546, 551, 546, 546, 546, 
         549, 550, 546, 0
 };
 
 static const short _indic_syllable_machine_trans_targs[] = {
-        178, 200, 207, 209, 210, 4, 213, 5,
-        7, 216, 8, 10, 219, 11, 13, 222,
-        14, 16, 17, 199, 19, 20, 221, 22,
-        23, 218, 25, 26, 215, 224, 228, 232,
-        235, 239, 242, 246, 249, 253, 256, 178,
-        279, 286, 288, 289, 41, 292, 42, 44,
-        295, 45, 47, 298, 48, 50, 301, 51,
-        53, 54, 278, 56, 57, 300, 59, 60,
-        297, 62, 63, 294, 303, 307, 311, 314,
-        318, 321, 325, 328, 332, 336, 178, 357,
-        364, 366, 367, 78, 370, 178, 79, 81,
-        373, 82, 84, 376, 85, 87, 379, 88,
-        90, 91, 356, 93, 94, 378, 96, 97,
-        375, 99, 100, 372, 381, 385, 389, 392,
-        396, 399, 403, 406, 410, 178, 437, 444,
-        446, 447, 114, 450, 115, 117, 453, 118,
-        120, 456, 121, 123, 459, 124, 126, 127,
-        436, 129, 130, 458, 132, 133, 455, 135,
-        136, 452, 461, 465, 469, 472, 476, 479,
-        483, 486, 490, 493, 414, 498, 509, 152,
-        512, 154, 515, 155, 157, 518, 158, 160,
-        521, 161, 524, 526, 527, 166, 167, 523,
-        169, 170, 520, 172, 173, 517, 175, 176,
-        514, 178, 532, 178, 179, 258, 337, 339,
-        413, 415, 359, 360, 416, 412, 494, 495,
-        384, 530, 178, 180, 182, 36, 257, 202,
-        203, 255, 227, 181, 35, 183, 251, 1,
-        184, 186, 34, 250, 248, 185, 33, 187,
-        244, 188, 190, 32, 243, 241, 189, 31,
-        191, 237, 192, 194, 30, 236, 234, 193,
-        29, 195, 230, 196, 198, 28, 229, 226,
-        197, 27, 212, 0, 201, 206, 178, 204,
-        205, 208, 2, 211, 3, 214, 6, 24,
-        217, 9, 21, 220, 12, 18, 223, 15,
-        225, 231, 233, 238, 240, 245, 247, 252,
-        254, 178, 259, 261, 73, 334, 281, 282,
-        335, 306, 260, 72, 262, 330, 38, 263,
-        265, 71, 329, 327, 264, 70, 266, 323,
-        267, 269, 69, 322, 320, 268, 68, 270,
-        316, 271, 273, 67, 315, 313, 272, 66,
-        274, 309, 275, 277, 65, 308, 305, 276,
-        64, 291, 37, 280, 285, 178, 283, 284,
-        287, 39, 290, 40, 293, 43, 61, 296,
-        46, 58, 299, 49, 55, 302, 52, 304,
-        310, 312, 317, 319, 324, 326, 331, 333,
-        178, 338, 109, 340, 408, 75, 341, 343,
-        108, 407, 405, 342, 107, 344, 401, 345,
-        347, 106, 400, 398, 346, 105, 348, 394,
-        349, 351, 104, 393, 391, 350, 103, 352,
-        387, 353, 355, 102, 386, 383, 354, 101,
-        369, 74, 358, 363, 178, 361, 362, 365,
-        76, 368, 77, 371, 80, 98, 374, 83,
-        95, 377, 86, 92, 380, 89, 382, 388,
-        390, 395, 397, 402, 404, 409, 411, 178,
-        178, 417, 419, 146, 145, 439, 440, 492,
-        464, 418, 420, 488, 111, 421, 423, 144,
-        487, 485, 422, 143, 424, 481, 425, 427,
-        142, 480, 478, 426, 141, 428, 474, 429,
-        431, 140, 473, 471, 430, 139, 432, 467,
-        433, 435, 138, 466, 463, 434, 137, 449,
-        110, 438, 443, 178, 441, 442, 445, 112,
-        448, 113, 451, 116, 134, 454, 119, 131,
-        457, 122, 128, 460, 125, 462, 468, 470,
-        475, 477, 482, 484, 489, 491, 147, 496,
-        497, 511, 500, 501, 529, 148, 505, 499,
-        504, 502, 503, 506, 507, 150, 510, 508,
-        149, 151, 513, 153, 174, 163, 516, 156,
-        171, 519, 159, 168, 522, 162, 165, 525,
-        164, 528, 178, 531, 177, 534, 535, 533,
+        178, 200, 207, 209, 210, 4, 213, 5, 
+        7, 216, 8, 10, 219, 11, 13, 222, 
+        14, 16, 17, 199, 19, 20, 221, 22, 
+        23, 218, 25, 26, 215, 224, 228, 232, 
+        235, 239, 242, 246, 249, 253, 256, 178, 
+        279, 286, 288, 289, 41, 292, 42, 44, 
+        295, 45, 47, 298, 48, 50, 301, 51, 
+        53, 54, 278, 56, 57, 300, 59, 60, 
+        297, 62, 63, 294, 303, 307, 311, 314, 
+        318, 321, 325, 328, 332, 336, 178, 357, 
+        364, 366, 367, 78, 370, 178, 79, 81, 
+        373, 82, 84, 376, 85, 87, 379, 88, 
+        90, 91, 356, 93, 94, 378, 96, 97, 
+        375, 99, 100, 372, 381, 385, 389, 392, 
+        396, 399, 403, 406, 410, 178, 437, 444, 
+        446, 447, 114, 450, 115, 117, 453, 118, 
+        120, 456, 121, 123, 459, 124, 126, 127, 
+        436, 129, 130, 458, 132, 133, 455, 135, 
+        136, 452, 461, 465, 469, 472, 476, 479, 
+        483, 486, 490, 493, 414, 498, 509, 152, 
+        512, 154, 515, 155, 157, 518, 158, 160, 
+        521, 161, 524, 526, 527, 166, 167, 523, 
+        169, 170, 520, 172, 173, 517, 175, 176, 
+        514, 178, 532, 178, 179, 258, 337, 339, 
+        413, 415, 359, 360, 416, 412, 494, 495, 
+        384, 530, 178, 180, 182, 36, 257, 202, 
+        203, 255, 227, 181, 35, 183, 251, 1, 
+        184, 186, 34, 250, 248, 185, 33, 187, 
+        244, 188, 190, 32, 243, 241, 189, 31, 
+        191, 237, 192, 194, 30, 236, 234, 193, 
+        29, 195, 230, 196, 198, 28, 229, 226, 
+        197, 27, 212, 0, 201, 206, 178, 204, 
+        205, 208, 2, 211, 3, 214, 6, 24, 
+        217, 9, 21, 220, 12, 18, 223, 15, 
+        225, 231, 233, 238, 240, 245, 247, 252, 
+        254, 178, 259, 261, 73, 334, 281, 282, 
+        335, 306, 260, 72, 262, 330, 38, 263, 
+        265, 71, 329, 327, 264, 70, 266, 323, 
+        267, 269, 69, 322, 320, 268, 68, 270, 
+        316, 271, 273, 67, 315, 313, 272, 66, 
+        274, 309, 275, 277, 65, 308, 305, 276, 
+        64, 291, 37, 280, 285, 178, 283, 284, 
+        287, 39, 290, 40, 293, 43, 61, 296, 
+        46, 58, 299, 49, 55, 302, 52, 304, 
+        310, 312, 317, 319, 324, 326, 331, 333, 
+        178, 338, 109, 340, 408, 75, 341, 343, 
+        108, 407, 405, 342, 107, 344, 401, 345, 
+        347, 106, 400, 398, 346, 105, 348, 394, 
+        349, 351, 104, 393, 391, 350, 103, 352, 
+        387, 353, 355, 102, 386, 383, 354, 101, 
+        369, 74, 358, 363, 178, 361, 362, 365, 
+        76, 368, 77, 371, 80, 98, 374, 83, 
+        95, 377, 86, 92, 380, 89, 382, 388, 
+        390, 395, 397, 402, 404, 409, 411, 178, 
+        178, 417, 419, 146, 145, 439, 440, 492, 
+        464, 418, 420, 488, 111, 421, 423, 144, 
+        487, 485, 422, 143, 424, 481, 425, 427, 
+        142, 480, 478, 426, 141, 428, 474, 429, 
+        431, 140, 473, 471, 430, 139, 432, 467, 
+        433, 435, 138, 466, 463, 434, 137, 449, 
+        110, 438, 443, 178, 441, 442, 445, 112, 
+        448, 113, 451, 116, 134, 454, 119, 131, 
+        457, 122, 128, 460, 125, 462, 468, 470, 
+        475, 477, 482, 484, 489, 491, 147, 496, 
+        497, 511, 500, 501, 529, 148, 505, 499, 
+        504, 502, 503, 506, 507, 150, 510, 508, 
+        149, 151, 513, 153, 174, 163, 516, 156, 
+        171, 519, 159, 168, 522, 162, 165, 525, 
+        164, 528, 178, 531, 177, 534, 535, 533, 
         538, 178, 536, 537
 };
 
 static const char _indic_syllable_machine_trans_actions[] = {
-        1, 0, 2, 2, 2, 0, 2, 0,
-        0, 2, 0, 0, 2, 0, 0, 2,
-        0, 0, 0, 2, 0, 0, 2, 0,
-        0, 2, 0, 0, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 3,
-        0, 2, 2, 2, 0, 2, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        0, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 0, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 4, 0,
-        2, 2, 2, 0, 2, 5, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        0, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 0, 2, 2, 6, 2, 6,
-        2, 6, 2, 6, 2, 7, 0, 2,
-        2, 2, 0, 2, 0, 0, 2, 0,
-        0, 2, 0, 0, 2, 0, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        0, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 6, 0, 8, 0,
-        2, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 2, 2, 2, 0, 0, 2,
-        0, 0, 2, 0, 0, 2, 0, 0,
-        2, 9, 0, 12, 2, 2, 6, 2,
-        13, 13, 0, 0, 2, 2, 6, 2,
-        6, 2, 14, 2, 2, 0, 2, 0,
-        0, 2, 2, 2, 0, 2, 2, 0,
-        2, 2, 0, 2, 2, 2, 0, 2,
-        2, 2, 2, 0, 2, 2, 2, 0,
-        2, 2, 2, 2, 0, 2, 2, 2,
-        0, 2, 2, 2, 2, 0, 2, 2,
-        2, 0, 2, 0, 0, 0, 15, 0,
-        0, 2, 0, 2, 0, 2, 0, 0,
-        2, 0, 0, 2, 0, 0, 2, 0,
-        2, 2, 2, 2, 2, 2, 2, 2,
-        2, 16, 2, 2, 0, 2, 0, 0,
-        2, 2, 2, 0, 2, 2, 0, 2,
-        2, 0, 2, 2, 2, 0, 2, 2,
-        2, 2, 0, 2, 2, 2, 0, 2,
-        2, 2, 2, 0, 2, 2, 2, 0,
-        2, 2, 2, 2, 0, 2, 2, 2,
-        0, 2, 0, 0, 0, 17, 0, 0,
-        2, 0, 2, 0, 2, 0, 0, 2,
-        0, 0, 2, 0, 0, 2, 0, 2,
-        2, 2, 2, 2, 2, 2, 2, 2,
-        18, 6, 0, 6, 6, 0, 6, 2,
-        0, 6, 2, 6, 0, 6, 6, 6,
-        2, 0, 6, 2, 6, 0, 6, 6,
-        6, 2, 0, 6, 2, 6, 0, 6,
-        6, 6, 2, 0, 6, 2, 6, 0,
-        6, 0, 0, 0, 19, 0, 0, 2,
-        0, 2, 0, 2, 0, 0, 2, 0,
-        0, 2, 0, 0, 2, 0, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 20,
-        21, 2, 2, 0, 0, 0, 0, 2,
-        2, 2, 2, 2, 0, 2, 2, 0,
-        2, 2, 2, 0, 2, 2, 2, 2,
-        0, 2, 2, 2, 0, 2, 2, 2,
-        2, 0, 2, 2, 2, 0, 2, 2,
-        2, 2, 0, 2, 2, 2, 0, 2,
-        0, 0, 0, 22, 0, 0, 2, 0,
-        2, 0, 2, 0, 0, 2, 0, 0,
-        2, 0, 0, 2, 0, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 0, 0,
-        8, 2, 0, 0, 2, 0, 2, 0,
-        0, 0, 0, 8, 8, 0, 8, 8,
-        0, 0, 2, 0, 0, 0, 2, 0,
-        0, 2, 0, 0, 2, 0, 0, 2,
-        0, 2, 23, 2, 0, 0, 0, 0,
+        1, 0, 2, 2, 2, 0, 2, 0, 
+        0, 2, 0, 0, 2, 0, 0, 2, 
+        0, 0, 0, 2, 0, 0, 2, 0, 
+        0, 2, 0, 0, 2, 2, 2, 2, 
+        2, 2, 2, 2, 2, 2, 2, 3, 
+        0, 2, 2, 2, 0, 2, 0, 0, 
+        2, 0, 0, 2, 0, 0, 2, 0, 
+        0, 0, 2, 0, 0, 2, 0, 0, 
+        2, 0, 0, 2, 2, 2, 2, 2, 
+        2, 2, 2, 2, 2, 2, 4, 0, 
+        2, 2, 2, 0, 2, 5, 0, 0, 
+        2, 0, 0, 2, 0, 0, 2, 0, 
+        0, 0, 2, 0, 0, 2, 0, 0, 
+        2, 0, 0, 2, 2, 6, 2, 6, 
+        2, 6, 2, 6, 2, 7, 0, 2, 
+        2, 2, 0, 2, 0, 0, 2, 0, 
+        0, 2, 0, 0, 2, 0, 0, 0, 
+        2, 0, 0, 2, 0, 0, 2, 0, 
+        0, 2, 2, 2, 2, 2, 2, 2, 
+        2, 2, 2, 2, 6, 0, 8, 0, 
+        2, 0, 2, 0, 0, 2, 0, 0, 
+        2, 0, 2, 2, 2, 0, 0, 2, 
+        0, 0, 2, 0, 0, 2, 0, 0, 
+        2, 9, 0, 12, 2, 2, 6, 2, 
+        13, 13, 0, 0, 2, 2, 6, 2, 
+        6, 2, 14, 2, 2, 0, 2, 0, 
+        0, 2, 2, 2, 0, 2, 2, 0, 
+        2, 2, 0, 2, 2, 2, 0, 2, 
+        2, 2, 2, 0, 2, 2, 2, 0, 
+        2, 2, 2, 2, 0, 2, 2, 2, 
+        0, 2, 2, 2, 2, 0, 2, 2, 
+        2, 0, 2, 0, 0, 0, 15, 0, 
+        0, 2, 0, 2, 0, 2, 0, 0, 
+        2, 0, 0, 2, 0, 0, 2, 0, 
+        2, 2, 2, 2, 2, 2, 2, 2, 
+        2, 16, 2, 2, 0, 2, 0, 0, 
+        2, 2, 2, 0, 2, 2, 0, 2, 
+        2, 0, 2, 2, 2, 0, 2, 2, 
+        2, 2, 0, 2, 2, 2, 0, 2, 
+        2, 2, 2, 0, 2, 2, 2, 0, 
+        2, 2, 2, 2, 0, 2, 2, 2, 
+        0, 2, 0, 0, 0, 17, 0, 0, 
+        2, 0, 2, 0, 2, 0, 0, 2, 
+        0, 0, 2, 0, 0, 2, 0, 2, 
+        2, 2, 2, 2, 2, 2, 2, 2, 
+        18, 6, 0, 6, 6, 0, 6, 2, 
+        0, 6, 2, 6, 0, 6, 6, 6, 
+        2, 0, 6, 2, 6, 0, 6, 6, 
+        6, 2, 0, 6, 2, 6, 0, 6, 
+        6, 6, 2, 0, 6, 2, 6, 0, 
+        6, 0, 0, 0, 19, 0, 0, 2, 
+        0, 2, 0, 2, 0, 0, 2, 0, 
+        0, 2, 0, 0, 2, 0, 2, 2, 
+        2, 2, 2, 2, 2, 2, 2, 20, 
+        21, 2, 2, 0, 0, 0, 0, 2, 
+        2, 2, 2, 2, 0, 2, 2, 0, 
+        2, 2, 2, 0, 2, 2, 2, 2, 
+        0, 2, 2, 2, 0, 2, 2, 2, 
+        2, 0, 2, 2, 2, 0, 2, 2, 
+        2, 2, 0, 2, 2, 2, 0, 2, 
+        0, 0, 0, 22, 0, 0, 2, 0, 
+        2, 0, 2, 0, 0, 2, 0, 0, 
+        2, 0, 0, 2, 0, 2, 2, 2, 
+        2, 2, 2, 2, 2, 2, 0, 0, 
+        8, 2, 0, 0, 2, 0, 2, 0, 
+        0, 0, 0, 8, 8, 0, 8, 8, 
+        0, 0, 2, 0, 0, 0, 2, 0, 
+        0, 2, 0, 0, 2, 0, 0, 2, 
+        0, 2, 23, 2, 0, 0, 0, 0, 
         0, 24, 0, 0
 };
 
 static const char _indic_syllable_machine_to_state_actions[] = {
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 10, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 10, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0
 };
 
 static const char _indic_syllable_machine_from_state_actions[] = {
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 11, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0
 };
 
 static const short _indic_syllable_machine_eof_trans[] = {
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 40,
-        40, 40, 79, 79, 79, 79, 86, 86,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 79, 79,
-        79, 79, 79, 79, 79, 79, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 118, 118, 118, 118, 118,
-        118, 118, 118, 79, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 186, 0, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 282, 282, 282, 282, 282, 282, 282,
-        282, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 361, 361, 361,
-        361, 361, 361, 361, 361, 432, 361, 432,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 433, 433,
-        433, 433, 433, 433, 433, 433, 361, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 361, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 203, 203, 203, 203, 203, 203, 203,
-        203, 361, 547, 547, 547, 547, 547, 547,
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 40, 40, 40, 
+        40, 40, 40, 40, 40, 40, 40, 40, 
+        40, 40, 40, 40, 40, 40, 40, 40, 
+        40, 40, 40, 40, 40, 40, 40, 40, 
+        40, 40, 40, 40, 40, 40, 40, 40, 
+        40, 40, 79, 79, 79, 79, 86, 86, 
+        79, 79, 79, 79, 79, 79, 79, 79, 
+        79, 79, 79, 79, 79, 79, 79, 79, 
+        79, 79, 79, 79, 79, 79, 79, 79, 
+        79, 79, 79, 79, 79, 79, 118, 118, 
+        118, 118, 118, 118, 118, 118, 118, 118, 
+        118, 118, 118, 118, 118, 118, 118, 118, 
+        118, 118, 118, 118, 118, 118, 118, 118, 
+        118, 118, 118, 118, 118, 118, 118, 118, 
+        118, 118, 118, 79, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 1, 1, 1, 1, 1, 1, 1, 
+        1, 186, 0, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 282, 282, 282, 282, 282, 282, 282, 
+        282, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 361, 361, 361, 
+        361, 361, 361, 361, 361, 432, 361, 432, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 433, 433, 
+        433, 433, 433, 433, 433, 433, 361, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 361, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 203, 203, 203, 203, 203, 203, 203, 
+        203, 361, 547, 547, 547, 547, 547, 547, 
         547, 547, 547
 };
 
@@ -1377,7 +1377,7 @@
   unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED;
   int cs;
   hb_glyph_info_t *info = buffer->info;
-
+  
 #line 1382 "hb-ot-shape-complex-indic-machine.hh"
         {
         cs = indic_syllable_machine_start;
@@ -1394,7 +1394,7 @@
 
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
-
+  
 #line 1399 "hb-ot-shape-complex-indic-machine.hh"
         {
         int _slen;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -1713,33 +1713,28 @@
   switch (ab)
   {
     /* Don't decompose these. */
-    case 0x0931u  : return false;
-    case 0x0B94u  : return false;
+    case 0x0931u  : return false; /* DEVANAGARI LETTER RRA */
+    case 0x0B94u  : return false; /* TAMIL LETTER AU */
 
 
     /*
      * Decompose split matras that don't have Unicode decompositions.
      */
 
-    case 0x0F77u  : *a = 0x0FB2u; *b= 0x0F81u; return true;
-    case 0x0F79u  : *a = 0x0FB3u; *b= 0x0F81u; return true;
+    /* Khmer */
     case 0x17BEu  : *a = 0x17C1u; *b= 0x17BEu; return true;
     case 0x17BFu  : *a = 0x17C1u; *b= 0x17BFu; return true;
     case 0x17C0u  : *a = 0x17C1u; *b= 0x17C0u; return true;
     case 0x17C4u  : *a = 0x17C1u; *b= 0x17C4u; return true;
     case 0x17C5u  : *a = 0x17C1u; *b= 0x17C5u; return true;
-    case 0x1925u  : *a = 0x1920u; *b= 0x1923u; return true;
-    case 0x1926u  : *a = 0x1920u; *b= 0x1924u; return true;
-    case 0x1B3Cu  : *a = 0x1B42u; *b= 0x1B3Cu; return true;
-    case 0x1112Eu  : *a = 0x11127u; *b= 0x11131u; return true;
-    case 0x1112Fu  : *a = 0x11127u; *b= 0x11132u; return true;
+
 #if 0
+    /* Gujarati */
     /* This one has no decomposition in Unicode, but needs no decomposition either. */
     /* case 0x0AC9u  : return false; */
+
+    /* Oriya */
     case 0x0B57u  : *a = no decomp, -> RIGHT; return true;
-    case 0x1C29u  : *a = no decomp, -> LEFT; return true;
-    case 0xA9C0u  : *a = no decomp, -> RIGHT; return true;
-    case 0x111BuF  : *a = no decomp, -> ABOVE; return true;
 #endif
   }
 
@@ -1819,6 +1814,7 @@
   decompose_indic,
   compose_indic,
   setup_masks_indic,
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
   false, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -34,223 +34,223 @@
 
 #line 36 "../../src/hb-ot-shape-complex-myanmar-machine.hh.tmp"
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
-        1u, 31u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u,
-        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u,
-        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 5u, 8u,
-        5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
-        3u, 30u, 3u, 29u, 1u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
+        1u, 31u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 
+        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u, 
+        3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 5u, 8u, 
+        5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 
+        3u, 30u, 3u, 29u, 1u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 
         3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 8u, 8u, 0
 };
 
 static const char _myanmar_syllable_machine_key_spans[] = {
-        31, 28, 25, 4, 25, 23, 21, 21,
-        27, 27, 27, 27, 16, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 25, 4,
-        25, 23, 21, 21, 27, 27, 27, 27,
-        28, 27, 30, 27, 27, 27, 27, 27,
+        31, 28, 25, 4, 25, 23, 21, 21, 
+        27, 27, 27, 27, 16, 27, 27, 27, 
+        27, 27, 27, 27, 27, 27, 25, 4, 
+        25, 23, 21, 21, 27, 27, 27, 27, 
+        28, 27, 30, 27, 27, 27, 27, 27, 
         27, 27, 27, 27, 1
 };
 
 static const short _myanmar_syllable_machine_index_offsets[] = {
-        0, 32, 61, 87, 92, 118, 142, 164,
-        186, 214, 242, 270, 298, 315, 343, 371,
-        399, 427, 455, 483, 511, 539, 567, 593,
-        598, 624, 648, 670, 692, 720, 748, 776,
-        804, 833, 861, 892, 920, 948, 976, 1004,
+        0, 32, 61, 87, 92, 118, 142, 164, 
+        186, 214, 242, 270, 298, 315, 343, 371, 
+        399, 427, 455, 483, 511, 539, 567, 593, 
+        598, 624, 648, 670, 692, 720, 748, 776, 
+        804, 833, 861, 892, 920, 948, 976, 1004, 
         1032, 1060, 1088, 1116, 1144
 };
 
 static const char _myanmar_syllable_machine_indicies[] = {
-        1, 1, 2, 3, 4, 4, 0, 5,
-        0, 6, 1, 0, 0, 0, 0, 7,
-        0, 8, 1, 0, 9, 10, 11, 12,
-        13, 14, 15, 16, 17, 18, 19, 0,
-        21, 22, 23, 23, 20, 24, 20, 25,
-        20, 20, 20, 20, 20, 20, 20, 26,
-        20, 20, 27, 28, 29, 30, 31, 32,
-        33, 34, 35, 36, 20, 23, 23, 20,
-        24, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 37, 20, 20, 20, 20, 20,
-        20, 31, 20, 20, 20, 35, 20, 23,
-        23, 20, 24, 20, 23, 23, 20, 24,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        31, 20, 20, 20, 35, 20, 38, 20,
-        23, 23, 20, 24, 20, 31, 20, 20,
-        20, 20, 20, 20, 20, 39, 20, 20,
-        20, 20, 20, 20, 31, 20, 23, 23,
-        20, 24, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 39, 20, 20, 20, 20,
-        20, 20, 31, 20, 23, 23, 20, 24,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        31, 20, 21, 20, 23, 23, 20, 24,
-        20, 25, 20, 20, 20, 20, 20, 20,
-        20, 40, 20, 20, 40, 20, 20, 20,
-        31, 41, 20, 20, 35, 20, 21, 20,
-        23, 23, 20, 24, 20, 25, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 31, 20, 20, 20,
-        35, 20, 21, 20, 23, 23, 20, 24,
-        20, 25, 20, 20, 20, 20, 20, 20,
-        20, 40, 20, 20, 20, 20, 20, 20,
-        31, 41, 20, 20, 35, 20, 21, 20,
-        23, 23, 20, 24, 20, 25, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 31, 41, 20, 20,
-        35, 20, 1, 1, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 1, 20, 21, 20, 23, 23, 20,
-        24, 20, 25, 20, 20, 20, 20, 20,
-        20, 20, 26, 20, 20, 27, 28, 29,
-        30, 31, 32, 33, 34, 35, 20, 21,
-        20, 23, 23, 20, 24, 20, 25, 20,
-        20, 20, 20, 20, 20, 20, 34, 20,
-        20, 20, 20, 20, 20, 31, 32, 33,
-        34, 35, 20, 21, 20, 23, 23, 20,
-        24, 20, 25, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 31, 32, 33, 34, 35, 20, 21,
-        20, 23, 23, 20, 24, 20, 25, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 31, 32, 33,
-        20, 35, 20, 21, 20, 23, 23, 20,
-        24, 20, 25, 20, 20, 20, 20, 20,
-        20, 20, 20, 20, 20, 20, 20, 20,
-        20, 31, 20, 33, 20, 35, 20, 21,
-        20, 23, 23, 20, 24, 20, 25, 20,
-        20, 20, 20, 20, 20, 20, 34, 20,
-        20, 27, 20, 29, 20, 31, 32, 33,
-        34, 35, 20, 21, 20, 23, 23, 20,
-        24, 20, 25, 20, 20, 20, 20, 20,
-        20, 20, 34, 20, 20, 27, 20, 20,
-        20, 31, 32, 33, 34, 35, 20, 21,
-        20, 23, 23, 20, 24, 20, 25, 20,
-        20, 20, 20, 20, 20, 20, 34, 20,
-        20, 27, 28, 29, 20, 31, 32, 33,
-        34, 35, 20, 21, 22, 23, 23, 20,
-        24, 20, 25, 20, 20, 20, 20, 20,
-        20, 20, 26, 20, 20, 27, 28, 29,
-        30, 31, 32, 33, 34, 35, 20, 3,
-        3, 42, 5, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 43, 42, 42, 42,
-        42, 42, 42, 13, 42, 42, 42, 17,
-        42, 3, 3, 42, 5, 42, 3, 3,
-        42, 5, 42, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 13, 42, 42, 42, 17, 42,
-        44, 42, 3, 3, 42, 5, 42, 13,
-        42, 42, 42, 42, 42, 42, 42, 45,
-        42, 42, 42, 42, 42, 42, 13, 42,
-        3, 3, 42, 5, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 45, 42, 42,
-        42, 42, 42, 42, 13, 42, 3, 3,
-        42, 5, 42, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 13, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 46, 42, 42, 46, 42,
-        42, 42, 13, 47, 42, 42, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 13, 42,
-        42, 42, 17, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 46, 42, 42, 42, 42,
-        42, 42, 13, 47, 42, 42, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 13, 47,
-        42, 42, 17, 42, 21, 22, 23, 23,
-        20, 24, 20, 25, 20, 20, 20, 20,
-        20, 20, 20, 48, 20, 20, 27, 28,
-        29, 30, 31, 32, 33, 34, 35, 36,
-        20, 21, 49, 23, 23, 20, 24, 20,
-        25, 20, 20, 20, 20, 20, 20, 20,
-        26, 20, 20, 27, 28, 29, 30, 31,
-        32, 33, 34, 35, 20, 1, 1, 2,
-        3, 3, 3, 42, 5, 42, 6, 1,
-        42, 42, 42, 42, 1, 42, 8, 1,
-        42, 9, 10, 11, 12, 13, 14, 15,
-        16, 17, 18, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 8, 42, 42, 9, 10,
-        11, 12, 13, 14, 15, 16, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 16,
-        42, 42, 42, 42, 42, 42, 13, 14,
-        15, 16, 17, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 13, 14, 15, 16, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 13, 14,
-        15, 42, 17, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 42, 13, 42, 15, 42, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 16,
-        42, 42, 9, 42, 11, 42, 13, 14,
-        15, 16, 17, 42, 2, 42, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 16, 42, 42, 9, 42,
-        42, 42, 13, 14, 15, 16, 17, 42,
-        2, 42, 3, 3, 42, 5, 42, 6,
-        42, 42, 42, 42, 42, 42, 42, 16,
-        42, 42, 9, 10, 11, 42, 13, 14,
-        15, 16, 17, 42, 2, 3, 3, 3,
-        42, 5, 42, 6, 42, 42, 42, 42,
-        42, 42, 42, 8, 42, 42, 9, 10,
-        11, 12, 13, 14, 15, 16, 17, 42,
+        1, 1, 2, 3, 4, 4, 0, 5, 
+        0, 6, 1, 0, 0, 0, 0, 7, 
+        0, 8, 1, 0, 9, 10, 11, 12, 
+        13, 14, 15, 16, 17, 18, 19, 0, 
+        21, 22, 23, 23, 20, 24, 20, 25, 
+        20, 20, 20, 20, 20, 20, 20, 26, 
+        20, 20, 27, 28, 29, 30, 31, 32, 
+        33, 34, 35, 36, 20, 23, 23, 20, 
+        24, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 37, 20, 20, 20, 20, 20, 
+        20, 31, 20, 20, 20, 35, 20, 23, 
+        23, 20, 24, 20, 23, 23, 20, 24, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        31, 20, 20, 20, 35, 20, 38, 20, 
+        23, 23, 20, 24, 20, 31, 20, 20, 
+        20, 20, 20, 20, 20, 39, 20, 20, 
+        20, 20, 20, 20, 31, 20, 23, 23, 
+        20, 24, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 39, 20, 20, 20, 20, 
+        20, 20, 31, 20, 23, 23, 20, 24, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        31, 20, 21, 20, 23, 23, 20, 24, 
+        20, 25, 20, 20, 20, 20, 20, 20, 
+        20, 40, 20, 20, 40, 20, 20, 20, 
+        31, 41, 20, 20, 35, 20, 21, 20, 
+        23, 23, 20, 24, 20, 25, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 31, 20, 20, 20, 
+        35, 20, 21, 20, 23, 23, 20, 24, 
+        20, 25, 20, 20, 20, 20, 20, 20, 
+        20, 40, 20, 20, 20, 20, 20, 20, 
+        31, 41, 20, 20, 35, 20, 21, 20, 
+        23, 23, 20, 24, 20, 25, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 31, 41, 20, 20, 
+        35, 20, 1, 1, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 1, 20, 21, 20, 23, 23, 20, 
+        24, 20, 25, 20, 20, 20, 20, 20, 
+        20, 20, 26, 20, 20, 27, 28, 29, 
+        30, 31, 32, 33, 34, 35, 20, 21, 
+        20, 23, 23, 20, 24, 20, 25, 20, 
+        20, 20, 20, 20, 20, 20, 34, 20, 
+        20, 20, 20, 20, 20, 31, 32, 33, 
+        34, 35, 20, 21, 20, 23, 23, 20, 
+        24, 20, 25, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 31, 32, 33, 34, 35, 20, 21, 
+        20, 23, 23, 20, 24, 20, 25, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 31, 32, 33, 
+        20, 35, 20, 21, 20, 23, 23, 20, 
+        24, 20, 25, 20, 20, 20, 20, 20, 
+        20, 20, 20, 20, 20, 20, 20, 20, 
+        20, 31, 20, 33, 20, 35, 20, 21, 
+        20, 23, 23, 20, 24, 20, 25, 20, 
+        20, 20, 20, 20, 20, 20, 34, 20, 
+        20, 27, 20, 29, 20, 31, 32, 33, 
+        34, 35, 20, 21, 20, 23, 23, 20, 
+        24, 20, 25, 20, 20, 20, 20, 20, 
+        20, 20, 34, 20, 20, 27, 20, 20, 
+        20, 31, 32, 33, 34, 35, 20, 21, 
+        20, 23, 23, 20, 24, 20, 25, 20, 
+        20, 20, 20, 20, 20, 20, 34, 20, 
+        20, 27, 28, 29, 20, 31, 32, 33, 
+        34, 35, 20, 21, 22, 23, 23, 20, 
+        24, 20, 25, 20, 20, 20, 20, 20, 
+        20, 20, 26, 20, 20, 27, 28, 29, 
+        30, 31, 32, 33, 34, 35, 20, 3, 
+        3, 42, 5, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 43, 42, 42, 42, 
+        42, 42, 42, 13, 42, 42, 42, 17, 
+        42, 3, 3, 42, 5, 42, 3, 3, 
+        42, 5, 42, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 13, 42, 42, 42, 17, 42, 
+        44, 42, 3, 3, 42, 5, 42, 13, 
+        42, 42, 42, 42, 42, 42, 42, 45, 
+        42, 42, 42, 42, 42, 42, 13, 42, 
+        3, 3, 42, 5, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 45, 42, 42, 
+        42, 42, 42, 42, 13, 42, 3, 3, 
+        42, 5, 42, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 13, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 46, 42, 42, 46, 42, 
+        42, 42, 13, 47, 42, 42, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 13, 42, 
+        42, 42, 17, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 46, 42, 42, 42, 42, 
+        42, 42, 13, 47, 42, 42, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 13, 47, 
+        42, 42, 17, 42, 21, 22, 23, 23, 
+        20, 24, 20, 25, 20, 20, 20, 20, 
+        20, 20, 20, 48, 20, 20, 27, 28, 
+        29, 30, 31, 32, 33, 34, 35, 36, 
+        20, 21, 49, 23, 23, 20, 24, 20, 
+        25, 20, 20, 20, 20, 20, 20, 20, 
+        26, 20, 20, 27, 28, 29, 30, 31, 
+        32, 33, 34, 35, 20, 1, 1, 2, 
+        3, 3, 3, 42, 5, 42, 6, 1, 
+        42, 42, 42, 42, 1, 42, 8, 1, 
+        42, 9, 10, 11, 12, 13, 14, 15, 
+        16, 17, 18, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 8, 42, 42, 9, 10, 
+        11, 12, 13, 14, 15, 16, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 16, 
+        42, 42, 42, 42, 42, 42, 13, 14, 
+        15, 16, 17, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 13, 14, 15, 16, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 13, 14, 
+        15, 42, 17, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 42, 42, 42, 42, 42, 
+        42, 42, 13, 42, 15, 42, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 16, 
+        42, 42, 9, 42, 11, 42, 13, 14, 
+        15, 16, 17, 42, 2, 42, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 16, 42, 42, 9, 42, 
+        42, 42, 13, 14, 15, 16, 17, 42, 
+        2, 42, 3, 3, 42, 5, 42, 6, 
+        42, 42, 42, 42, 42, 42, 42, 16, 
+        42, 42, 9, 10, 11, 42, 13, 14, 
+        15, 16, 17, 42, 2, 3, 3, 3, 
+        42, 5, 42, 6, 42, 42, 42, 42, 
+        42, 42, 42, 8, 42, 42, 9, 10, 
+        11, 12, 13, 14, 15, 16, 17, 42, 
         51, 50, 0
 };
 
 static const char _myanmar_syllable_machine_trans_targs[] = {
-        0, 1, 22, 0, 0, 23, 29, 32,
-        35, 36, 40, 41, 42, 25, 38, 39,
-        37, 28, 43, 44, 0, 2, 12, 0,
-        3, 9, 13, 14, 18, 19, 20, 5,
-        16, 17, 15, 8, 21, 4, 6, 7,
-        10, 11, 0, 24, 26, 27, 30, 31,
+        0, 1, 22, 0, 0, 23, 29, 32, 
+        35, 36, 40, 41, 42, 25, 38, 39, 
+        37, 28, 43, 44, 0, 2, 12, 0, 
+        3, 9, 13, 14, 18, 19, 20, 5, 
+        16, 17, 15, 8, 21, 4, 6, 7, 
+        10, 11, 0, 24, 26, 27, 30, 31, 
         33, 34, 0, 0
 };
 
 static const char _myanmar_syllable_machine_trans_actions[] = {
-        3, 0, 0, 4, 5, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 6, 0, 0, 7,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 8, 0, 0, 0, 0, 0,
+        3, 0, 0, 4, 5, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 6, 0, 0, 7, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 8, 0, 0, 0, 0, 0, 
         0, 0, 9, 10
 };
 
 static const char _myanmar_syllable_machine_to_state_actions[] = {
-        1, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        1, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0
 };
 
 static const char _myanmar_syllable_machine_from_state_actions[] = {
-        2, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        2, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0
 };
 
 static const short _myanmar_syllable_machine_eof_trans[] = {
-        0, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 43, 43,
-        43, 43, 43, 43, 43, 43, 43, 43,
-        21, 21, 43, 43, 43, 43, 43, 43,
+        0, 21, 21, 21, 21, 21, 21, 21, 
+        21, 21, 21, 21, 21, 21, 21, 21, 
+        21, 21, 21, 21, 21, 21, 43, 43, 
+        43, 43, 43, 43, 43, 43, 43, 43, 
+        21, 21, 43, 43, 43, 43, 43, 43, 
         43, 43, 43, 43, 51
 };
 
@@ -284,7 +284,7 @@
   unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED;
   int cs;
   hb_glyph_info_t *info = buffer->info;
-
+  
 #line 289 "../../src/hb-ot-shape-complex-myanmar-machine.hh.tmp"
         {
         cs = myanmar_syllable_machine_start;
@@ -301,7 +301,7 @@
 
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
-
+  
 #line 306 "../../src/hb-ot-shape-complex-myanmar-machine.hh.tmp"
         {
         int _slen;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -521,6 +521,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   NULL, /* setup_masks */
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   true, /* fallback_position */
 };
@@ -538,6 +539,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   setup_masks_myanmar,
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY,
   false, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -146,6 +146,14 @@
                        hb_buffer_t              *buffer,
                        hb_font_t                *font);
 
+  /* disable_otl()
+   * Called during shape().
+   * If set and returns true, GDEF/GSUB/GPOS of the font are ignored
+   * and fallback operations used.
+   * May be NULL.
+   */
+  bool (*disable_otl) (const hb_ot_shape_plan_t *plan);
+
   hb_ot_shape_zero_width_marks_type_t zero_width_marks;
 
   bool fallback_position;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -376,6 +376,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   NULL, /* setup_masks */
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   false,/* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -57,6 +57,7 @@
   NULL, /* decompose */
   NULL, /* compose */
   NULL, /* setup_masks */
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
   true, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -36,247 +36,247 @@
 
 #line 38 "hb-ot-shape-complex-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
-        1u, 1u, 0u, 39u, 21u, 21u, 8u, 39u, 8u, 39u, 1u, 1u, 8u, 39u, 8u, 39u,
-        8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
-        8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 13u, 21u,
-        4u, 4u, 13u, 13u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u,
-        8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u,
-        8u, 39u, 8u, 39u, 8u, 39u, 1u, 1u, 1u, 39u, 8u, 39u, 21u, 42u, 41u, 42u,
+        1u, 1u, 0u, 39u, 21u, 21u, 8u, 39u, 8u, 39u, 1u, 1u, 8u, 39u, 8u, 39u, 
+        8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
+        8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 13u, 21u, 
+        4u, 4u, 13u, 13u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 
+        8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
+        8u, 39u, 8u, 39u, 8u, 39u, 1u, 1u, 1u, 39u, 8u, 39u, 21u, 42u, 41u, 42u, 
         42u, 42u, 0
 };
 
 static const char _use_syllable_machine_key_spans[] = {
-        1, 40, 1, 32, 32, 1, 32, 32,
-        32, 19, 19, 19, 32, 32, 32, 32,
-        32, 32, 32, 32, 32, 32, 32, 9,
-        1, 1, 32, 32, 32, 32, 19, 19,
-        19, 32, 32, 32, 32, 32, 32, 32,
-        32, 32, 32, 1, 39, 32, 22, 2,
+        1, 40, 1, 32, 32, 1, 32, 32, 
+        32, 19, 19, 19, 32, 32, 32, 32, 
+        32, 32, 32, 32, 32, 32, 32, 9, 
+        1, 1, 32, 32, 32, 32, 19, 19, 
+        19, 32, 32, 32, 32, 32, 32, 32, 
+        32, 32, 32, 1, 39, 32, 22, 2, 
         1
 };
 
 static const short _use_syllable_machine_index_offsets[] = {
-        0, 2, 43, 45, 78, 111, 113, 146,
-        179, 212, 232, 252, 272, 305, 338, 371,
-        404, 437, 470, 503, 536, 569, 602, 635,
-        645, 647, 649, 682, 715, 748, 781, 801,
-        821, 841, 874, 907, 940, 973, 1006, 1039,
-        1072, 1105, 1138, 1171, 1173, 1213, 1246, 1269,
+        0, 2, 43, 45, 78, 111, 113, 146, 
+        179, 212, 232, 252, 272, 305, 338, 371, 
+        404, 437, 470, 503, 536, 569, 602, 635, 
+        645, 647, 649, 682, 715, 748, 781, 801, 
+        821, 841, 874, 907, 940, 973, 1006, 1039, 
+        1072, 1105, 1138, 1171, 1173, 1213, 1246, 1269, 
         1272
 };
 
 static const char _use_syllable_machine_indicies[] = {
-        1, 0, 2, 3, 4, 2, 5, 3,
-        4, 4, 6, 4, 4, 1, 7, 4,
-        4, 4, 2, 2, 8, 9, 4, 4,
-        10, 11, 12, 13, 14, 15, 16, 10,
-        17, 18, 19, 20, 21, 22, 4, 23,
-        24, 25, 4, 27, 26, 29, 28, 28,
-        30, 31, 28, 28, 28, 28, 28, 28,
-        28, 28, 32, 33, 34, 35, 36, 37,
-        38, 39, 33, 40, 32, 41, 42, 43,
-        44, 28, 45, 46, 47, 28, 29, 28,
-        28, 30, 31, 28, 28, 28, 28, 28,
-        28, 28, 28, 48, 33, 34, 35, 36,
-        37, 38, 39, 33, 40, 41, 41, 42,
-        43, 44, 28, 45, 46, 47, 28, 30,
-        49, 29, 28, 28, 30, 31, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 33,
-        34, 35, 36, 37, 38, 39, 33, 40,
-        41, 41, 42, 43, 44, 28, 45, 46,
-        47, 28, 29, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        33, 34, 35, 36, 37, 28, 28, 28,
-        28, 28, 28, 42, 43, 44, 28, 45,
-        46, 47, 28, 29, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 34, 35, 36, 37, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        45, 46, 47, 28, 29, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 35, 36, 37, 28,
-        29, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 36, 37, 28, 29, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 37, 28,
-        29, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        35, 36, 37, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 45, 46, 47,
-        28, 29, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 35, 36, 37, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 46,
-        47, 28, 29, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 35, 36, 37, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 47, 28, 29, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 34, 35, 36, 37, 28, 28,
-        28, 28, 28, 28, 42, 43, 44, 28,
-        45, 46, 47, 28, 29, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 34, 35, 36, 37, 28,
-        28, 28, 28, 28, 28, 28, 43, 44,
-        28, 45, 46, 47, 28, 29, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 34, 35, 36, 37,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        44, 28, 45, 46, 47, 28, 29, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 33, 34, 35, 36,
-        37, 28, 39, 33, 28, 28, 28, 42,
-        43, 44, 28, 45, 46, 47, 28, 29,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 33, 34, 35,
-        36, 37, 28, 28, 33, 28, 28, 28,
-        42, 43, 44, 28, 45, 46, 47, 28,
-        29, 28, 28, 28, 28, 28, 28, 28,
-        28, 28, 28, 28, 28, 28, 33, 34,
-        35, 36, 37, 38, 39, 33, 28, 28,
-        28, 42, 43, 44, 28, 45, 46, 47,
-        28, 29, 28, 28, 30, 31, 28, 28,
-        28, 28, 28, 28, 28, 28, 28, 33,
-        34, 35, 36, 37, 38, 39, 33, 40,
-        28, 41, 42, 43, 44, 28, 45, 46,
-        47, 28, 29, 28, 28, 30, 31, 28,
-        28, 28, 28, 28, 28, 28, 28, 28,
-        33, 34, 35, 36, 37, 38, 39, 33,
-        40, 32, 41, 42, 43, 44, 28, 45,
-        46, 47, 28, 51, 50, 50, 50, 50,
-        50, 50, 50, 52, 50, 5, 53, 51,
-        50, 6, 54, 54, 1, 55, 54, 54,
-        54, 54, 54, 54, 54, 54, 56, 10,
-        11, 12, 13, 14, 15, 16, 10, 17,
-        19, 19, 20, 21, 22, 54, 23, 24,
-        25, 54, 6, 54, 54, 1, 55, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        10, 11, 12, 13, 14, 15, 16, 10,
-        17, 19, 19, 20, 21, 22, 54, 23,
-        24, 25, 54, 6, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 10, 11, 12, 13, 14, 54, 54,
-        54, 54, 54, 54, 20, 21, 22, 54,
-        23, 24, 25, 54, 6, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 11, 12, 13, 14, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 23, 24, 25, 54, 6, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 12, 13, 14,
-        54, 6, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 13, 14, 54, 6, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 14,
-        54, 6, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 12, 13, 14, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 23, 24,
-        25, 54, 6, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 12, 13, 14, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        24, 25, 54, 6, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 12, 13, 14, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 25, 54, 6, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 11, 12, 13, 14, 54,
-        54, 54, 54, 54, 54, 20, 21, 22,
-        54, 23, 24, 25, 54, 6, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 11, 12, 13, 14,
-        54, 54, 54, 54, 54, 54, 54, 21,
-        22, 54, 23, 24, 25, 54, 6, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 11, 12, 13,
-        14, 54, 54, 54, 54, 54, 54, 54,
-        54, 22, 54, 23, 24, 25, 54, 6,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 10, 11, 12,
-        13, 14, 54, 16, 10, 54, 54, 54,
-        20, 21, 22, 54, 23, 24, 25, 54,
-        6, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 10, 11,
-        12, 13, 14, 54, 54, 10, 54, 54,
-        54, 20, 21, 22, 54, 23, 24, 25,
-        54, 6, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 54, 54, 54, 54, 10,
-        11, 12, 13, 14, 15, 16, 10, 54,
-        54, 54, 20, 21, 22, 54, 23, 24,
-        25, 54, 6, 54, 54, 1, 55, 54,
-        54, 54, 54, 54, 54, 54, 54, 54,
-        10, 11, 12, 13, 14, 15, 16, 10,
-        17, 54, 19, 20, 21, 22, 54, 23,
-        24, 25, 54, 1, 57, 3, 54, 54,
-        54, 3, 54, 54, 6, 54, 54, 1,
-        55, 54, 54, 54, 54, 54, 54, 54,
-        54, 54, 10, 11, 12, 13, 14, 15,
-        16, 10, 17, 18, 19, 20, 21, 22,
-        54, 23, 24, 25, 54, 6, 54, 54,
-        1, 55, 54, 54, 54, 54, 54, 54,
-        54, 54, 54, 10, 11, 12, 13, 14,
-        15, 16, 10, 17, 18, 19, 20, 21,
-        22, 54, 23, 24, 25, 54, 59, 58,
-        58, 58, 58, 58, 58, 58, 58, 58,
-        58, 58, 58, 58, 58, 58, 58, 58,
-        58, 58, 59, 60, 58, 59, 60, 58,
+        1, 0, 2, 3, 4, 2, 5, 3, 
+        4, 4, 6, 4, 4, 1, 7, 4, 
+        4, 4, 2, 2, 8, 9, 4, 4, 
+        10, 11, 12, 13, 14, 15, 16, 10, 
+        17, 18, 19, 20, 21, 22, 4, 23, 
+        24, 25, 4, 27, 26, 29, 28, 28, 
+        30, 31, 28, 28, 28, 28, 28, 28, 
+        28, 28, 32, 33, 34, 35, 36, 37, 
+        38, 39, 33, 40, 32, 41, 42, 43, 
+        44, 28, 45, 46, 47, 28, 29, 28, 
+        28, 30, 31, 28, 28, 28, 28, 28, 
+        28, 28, 28, 48, 33, 34, 35, 36, 
+        37, 38, 39, 33, 40, 41, 41, 42, 
+        43, 44, 28, 45, 46, 47, 28, 30, 
+        49, 29, 28, 28, 30, 31, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 33, 
+        34, 35, 36, 37, 38, 39, 33, 40, 
+        41, 41, 42, 43, 44, 28, 45, 46, 
+        47, 28, 29, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        33, 34, 35, 36, 37, 28, 28, 28, 
+        28, 28, 28, 42, 43, 44, 28, 45, 
+        46, 47, 28, 29, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 34, 35, 36, 37, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        45, 46, 47, 28, 29, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 35, 36, 37, 28, 
+        29, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 36, 37, 28, 29, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 37, 28, 
+        29, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        35, 36, 37, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 45, 46, 47, 
+        28, 29, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 35, 36, 37, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 46, 
+        47, 28, 29, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 35, 36, 37, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 47, 28, 29, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 34, 35, 36, 37, 28, 28, 
+        28, 28, 28, 28, 42, 43, 44, 28, 
+        45, 46, 47, 28, 29, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 34, 35, 36, 37, 28, 
+        28, 28, 28, 28, 28, 28, 43, 44, 
+        28, 45, 46, 47, 28, 29, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 34, 35, 36, 37, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        44, 28, 45, 46, 47, 28, 29, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 33, 34, 35, 36, 
+        37, 28, 39, 33, 28, 28, 28, 42, 
+        43, 44, 28, 45, 46, 47, 28, 29, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 33, 34, 35, 
+        36, 37, 28, 28, 33, 28, 28, 28, 
+        42, 43, 44, 28, 45, 46, 47, 28, 
+        29, 28, 28, 28, 28, 28, 28, 28, 
+        28, 28, 28, 28, 28, 28, 33, 34, 
+        35, 36, 37, 38, 39, 33, 28, 28, 
+        28, 42, 43, 44, 28, 45, 46, 47, 
+        28, 29, 28, 28, 30, 31, 28, 28, 
+        28, 28, 28, 28, 28, 28, 28, 33, 
+        34, 35, 36, 37, 38, 39, 33, 40, 
+        28, 41, 42, 43, 44, 28, 45, 46, 
+        47, 28, 29, 28, 28, 30, 31, 28, 
+        28, 28, 28, 28, 28, 28, 28, 28, 
+        33, 34, 35, 36, 37, 38, 39, 33, 
+        40, 32, 41, 42, 43, 44, 28, 45, 
+        46, 47, 28, 51, 50, 50, 50, 50, 
+        50, 50, 50, 52, 50, 5, 53, 51, 
+        50, 6, 54, 54, 1, 55, 54, 54, 
+        54, 54, 54, 54, 54, 54, 56, 10, 
+        11, 12, 13, 14, 15, 16, 10, 17, 
+        19, 19, 20, 21, 22, 54, 23, 24, 
+        25, 54, 6, 54, 54, 1, 55, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        10, 11, 12, 13, 14, 15, 16, 10, 
+        17, 19, 19, 20, 21, 22, 54, 23, 
+        24, 25, 54, 6, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 10, 11, 12, 13, 14, 54, 54, 
+        54, 54, 54, 54, 20, 21, 22, 54, 
+        23, 24, 25, 54, 6, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 11, 12, 13, 14, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 23, 24, 25, 54, 6, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 12, 13, 14, 
+        54, 6, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 13, 14, 54, 6, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 14, 
+        54, 6, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 12, 13, 14, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 23, 24, 
+        25, 54, 6, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 12, 13, 14, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        24, 25, 54, 6, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 12, 13, 14, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 25, 54, 6, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 11, 12, 13, 14, 54, 
+        54, 54, 54, 54, 54, 20, 21, 22, 
+        54, 23, 24, 25, 54, 6, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 11, 12, 13, 14, 
+        54, 54, 54, 54, 54, 54, 54, 21, 
+        22, 54, 23, 24, 25, 54, 6, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 11, 12, 13, 
+        14, 54, 54, 54, 54, 54, 54, 54, 
+        54, 22, 54, 23, 24, 25, 54, 6, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 10, 11, 12, 
+        13, 14, 54, 16, 10, 54, 54, 54, 
+        20, 21, 22, 54, 23, 24, 25, 54, 
+        6, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 10, 11, 
+        12, 13, 14, 54, 54, 10, 54, 54, 
+        54, 20, 21, 22, 54, 23, 24, 25, 
+        54, 6, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 54, 54, 54, 54, 10, 
+        11, 12, 13, 14, 15, 16, 10, 54, 
+        54, 54, 20, 21, 22, 54, 23, 24, 
+        25, 54, 6, 54, 54, 1, 55, 54, 
+        54, 54, 54, 54, 54, 54, 54, 54, 
+        10, 11, 12, 13, 14, 15, 16, 10, 
+        17, 54, 19, 20, 21, 22, 54, 23, 
+        24, 25, 54, 1, 57, 3, 54, 54, 
+        54, 3, 54, 54, 6, 54, 54, 1, 
+        55, 54, 54, 54, 54, 54, 54, 54, 
+        54, 54, 10, 11, 12, 13, 14, 15, 
+        16, 10, 17, 18, 19, 20, 21, 22, 
+        54, 23, 24, 25, 54, 6, 54, 54, 
+        1, 55, 54, 54, 54, 54, 54, 54, 
+        54, 54, 54, 10, 11, 12, 13, 14, 
+        15, 16, 10, 17, 18, 19, 20, 21, 
+        22, 54, 23, 24, 25, 54, 59, 58, 
+        58, 58, 58, 58, 58, 58, 58, 58, 
+        58, 58, 58, 58, 58, 58, 58, 58, 
+        58, 58, 59, 60, 58, 59, 60, 58, 
         60, 58, 0
 };
 
 static const char _use_syllable_machine_trans_targs[] = {
-        1, 26, 2, 3, 1, 23, 1, 43,
-        44, 46, 28, 29, 30, 31, 32, 39,
-        40, 41, 45, 42, 36, 37, 38, 33,
-        34, 35, 1, 1, 1, 1, 4, 5,
-        22, 7, 8, 9, 10, 11, 18, 19,
-        20, 21, 15, 16, 17, 12, 13, 14,
-        6, 1, 1, 24, 25, 1, 1, 0,
+        1, 26, 2, 3, 1, 23, 1, 43, 
+        44, 46, 28, 29, 30, 31, 32, 39, 
+        40, 41, 45, 42, 36, 37, 38, 33, 
+        34, 35, 1, 1, 1, 1, 4, 5, 
+        22, 7, 8, 9, 10, 11, 18, 19, 
+        20, 21, 15, 16, 17, 12, 13, 14, 
+        6, 1, 1, 24, 25, 1, 1, 0, 
         27, 1, 1, 47, 48
 };
 
 static const char _use_syllable_machine_trans_actions[] = {
-        1, 2, 0, 0, 5, 0, 6, 0,
-        2, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 2, 2, 0, 0, 0, 0,
-        0, 0, 7, 8, 9, 10, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 11, 12, 0, 0, 13, 14, 0,
+        1, 2, 0, 0, 5, 0, 6, 0, 
+        2, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 2, 2, 0, 0, 0, 0, 
+        0, 0, 7, 8, 9, 10, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 11, 12, 0, 0, 13, 14, 0, 
         2, 15, 16, 0, 0
 };
 
 static const char _use_syllable_machine_to_state_actions[] = {
-        0, 3, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 3, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0
 };
 
 static const char _use_syllable_machine_from_state_actions[] = {
-        0, 4, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 4, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 
         0
 };
 
 static const short _use_syllable_machine_eof_trans[] = {
-        1, 0, 27, 29, 29, 50, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 29,
-        29, 29, 29, 29, 29, 29, 29, 51,
-        54, 51, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 55, 58, 55, 55, 59, 59,
+        1, 0, 27, 29, 29, 50, 29, 29, 
+        29, 29, 29, 29, 29, 29, 29, 29, 
+        29, 29, 29, 29, 29, 29, 29, 51, 
+        54, 51, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 55, 55, 55, 55, 55, 
+        55, 55, 55, 58, 55, 55, 59, 59, 
         59
 };
 
@@ -310,7 +310,7 @@
   unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED;
   int cs;
   hb_glyph_info_t *info = buffer->info;
-
+  
 #line 315 "hb-ot-shape-complex-use-machine.hh"
         {
         cs = use_syllable_machine_start;
@@ -327,7 +327,7 @@
 
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
-
+  
 #line 332 "hb-ot-shape-complex-use-machine.hh"
         {
         int _slen;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -559,6 +559,47 @@
 }
 
 static bool
+decompose_use (const hb_ot_shape_normalize_context_t *c,
+                hb_codepoint_t  ab,
+                hb_codepoint_t *a,
+                hb_codepoint_t *b)
+{
+  switch (ab)
+  {
+    /* Chakma:
+     * Special case where the Unicode decomp gives matras in the wrong order
+     * for cluster validation.
+     */
+    case 0x1112Eu : *a = 0x11127u; *b= 0x11131u; return true;
+    case 0x1112Fu : *a = 0x11127u; *b= 0x11132u; return true;
+
+    /*
+     * Decompose split matras that don't have Unicode decompositions.
+     */
+
+    /* Limbu */
+    case 0x1925u  : *a = 0x1920u; *b= 0x1923u; return true;
+    case 0x1926u  : *a = 0x1920u; *b= 0x1924u; return true;
+
+    /* Balinese */
+    case 0x1B3Cu  : *a = 0x1B42u; *b= 0x1B3Cu; return true;
+
+#if 0
+    /* Lepcha */
+    case 0x1C29u  : *a = no decomp, -> LEFT; return true;
+
+    /* Javanese */
+    case 0xA9C0u  : *a = no decomp, -> RIGHT; return true;
+
+    /* Sharada */
+    case 0x111BFu  : *a = no decomp, -> ABOVE; return true;
+#endif
+  }
+
+  return (bool) c->unicode->decompose (ab, a, b);
+}
+
+static bool
 compose_use (const hb_ot_shape_normalize_context_t *c,
              hb_codepoint_t  a,
              hb_codepoint_t  b,
@@ -582,9 +623,10 @@
   NULL, /* preprocess_text */
   NULL, /* postprocess_glyphs */
   HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT,
-  NULL, /* decompose */
+  decompose_use,
   compose_use,
   setup_masks_use,
+  NULL, /* disable_otl */
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY,
   false, /* fallback_position */
 };
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -77,11 +77,13 @@
                          map (face, &props) {}
   ~hb_ot_shape_planner_t (void) { map.finish (); }
 
-  inline void compile (hb_ot_shape_plan_t &plan)
+  inline void compile (hb_ot_shape_plan_t &plan,
+                       const int          *coords,
+                       unsigned int        num_coords)
   {
     plan.props = props;
     plan.shaper = shaper;
-    map.compile (plan.map);
+    map.compile (plan.map, coords, num_coords);
 
     plan.rtlm_mask = plan.map.get_1_mask (HB_TAG ('r','t','l','m'));
     plan.frac_mask = plan.map.get_1_mask (HB_TAG ('f','r','a','c'));
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -69,6 +69,9 @@
 {
   hb_ot_map_builder_t *map = &planner->map;
 
+  map->add_global_bool_feature (HB_TAG('r','v','r','n'));
+  map->add_gsub_pause (NULL);
+
   switch (props->direction) {
     case HB_DIRECTION_LTR:
       map->add_global_bool_feature (HB_TAG ('l','t','r','a'));
@@ -163,7 +166,9 @@
 hb_ot_shaper_shape_plan_data_t *
 _hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
                                       const hb_feature_t *user_features,
-                                      unsigned int        num_user_features)
+                                      unsigned int        num_user_features,
+                                      const int          *coords,
+                                      unsigned int        num_coords)
 {
   hb_ot_shape_plan_t *plan = (hb_ot_shape_plan_t *) calloc (1, sizeof (hb_ot_shape_plan_t));
   if (unlikely (!plan))
@@ -173,9 +178,10 @@
 
   planner.shaper = hb_ot_shape_complex_categorize (&planner);
 
-  hb_ot_shape_collect_features (&planner, &shape_plan->props, user_features, num_user_features);
+  hb_ot_shape_collect_features (&planner, &shape_plan->props,
+                                user_features, num_user_features);
 
-  planner.compile (*plan);
+  planner.compile (*plan, coords, num_coords);
 
   if (plan->shaper->data_create) {
     plan->data = plan->shaper->data_create (plan);
@@ -212,6 +218,8 @@
   unsigned int        num_user_features;
 
   /* Transient stuff */
+  bool fallback_positioning;
+  bool fallback_glyph_classes;
   hb_direction_t target_direction;
 };
 
@@ -524,6 +532,32 @@
 }
 
 static inline void
+hb_synthesize_glyph_classes (hb_ot_shape_context_t *c)
+{
+  unsigned int count = c->buffer->len;
+  hb_glyph_info_t *info = c->buffer->info;
+  for (unsigned int i = 0; i < count; i++)
+  {
+    hb_ot_layout_glyph_props_flags_t klass;
+
+    /* Never mark default-ignorables as marks.
+     * They won't get in the way of lookups anyway,
+     * but having them as mark will cause them to be skipped
+     * over if the lookup-flag says so, but at least for the
+     * Mongolian variation selectors, looks like Uniscribe
+     * marks them as non-mark.  Some Mongolian fonts without
+     * GDEF rely on this.  Another notable character that
+     * this applies to is COMBINING GRAPHEME JOINER. */
+    klass = (_hb_glyph_info_get_general_category (&info[i]) !=
+             HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK ||
+             _hb_glyph_info_is_default_ignorable (&info[i])) ?
+            HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH :
+            HB_OT_LAYOUT_GLYPH_PROPS_MARK;
+    _hb_glyph_info_set_glyph_props (&info[i], klass);
+  }
+}
+
+static inline void
 hb_ot_substitute_default (hb_ot_shape_context_t *c)
 {
   hb_buffer_t *buffer = c->buffer;
@@ -539,7 +573,7 @@
   hb_ot_shape_setup_masks (c);
 
   /* This is unfortunate to go here, but necessary... */
-  if (!hb_ot_layout_has_positioning (c->face))
+  if (c->fallback_positioning)
     _hb_ot_shape_fallback_position_recategorize_marks (c->plan, c->font, buffer);
 
   hb_ot_map_glyphs_fast (buffer);
@@ -554,6 +588,9 @@
 
   hb_ot_layout_substitute_start (c->font, buffer);
 
+  if (!hb_ot_layout_has_glyph_classes (c->face))
+    hb_synthesize_glyph_classes (c);
+
   c->plan->substitute (c->font, buffer);
 
   return;
@@ -632,14 +669,12 @@
     _hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer);
 }
 
-static inline bool
+static inline void
 hb_ot_position_complex (hb_ot_shape_context_t *c)
 {
   hb_ot_layout_position_start (c->font, c->buffer);
 
-  bool ret = false;
   unsigned int count = c->buffer->len;
-  bool has_positioning = (bool) hb_ot_layout_has_positioning (c->face);
 
   /* If the font has no GPOS, AND, no fallback positioning will
    * happen, AND, direction is forward, then when zeroing mark
@@ -650,8 +685,9 @@
    * If fallback positinoing happens or GPOS is present, we don't
    * care.
    */
-  bool adjust_offsets_when_zeroing = !(has_positioning || c->plan->shaper->fallback_position ||
-                                       HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction));
+  bool adjust_offsets_when_zeroing = c->fallback_positioning &&
+                                     !c->plan->shaper->fallback_position &&
+                                     HB_DIRECTION_IS_FORWARD (c->buffer->props.direction);
 
   switch (c->plan->shaper->zero_width_marks)
   {
@@ -665,7 +701,7 @@
       break;
   }
 
-  if (has_positioning)
+  if (likely (!c->fallback_positioning))
   {
     hb_glyph_info_t *info = c->buffer->info;
     hb_glyph_position_t *pos = c->buffer->pos;
@@ -688,7 +724,6 @@
                                           &pos[i].x_offset,
                                           &pos[i].y_offset);
 
-    ret = true;
   }
 
   switch (c->plan->shaper->zero_width_marks)
@@ -707,8 +742,6 @@
   hb_ot_layout_position_finish_advances (c->font, c->buffer);
   hb_ot_zero_width_default_ignorables (c);
   hb_ot_layout_position_finish_offsets (c->font, c->buffer);
-
-  return ret;
 }
 
 static inline void
@@ -718,9 +751,9 @@
 
   hb_ot_position_default (c);
 
-  hb_bool_t fallback = !hb_ot_position_complex (c);
+  hb_ot_position_complex (c);
 
-  if (fallback && c->plan->shaper->fallback_position)
+  if (c->fallback_positioning && c->plan->shaper->fallback_position)
     _hb_ot_shape_fallback_position (c->plan, c->font, c->buffer);
 
   if (HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction))
@@ -728,7 +761,7 @@
 
   /* Visual fallback goes here. */
 
-  if (fallback)
+  if (c->fallback_positioning)
     _hb_ot_shape_fallback_kern (c->plan, c->font, c->buffer);
 
   _hb_buffer_deallocate_gsubgpos_vars (c->buffer);
@@ -748,6 +781,11 @@
                               (unsigned) HB_BUFFER_MAX_LEN_MIN);
   }
 
+  bool disable_otl = c->plan->shaper->disable_otl && c->plan->shaper->disable_otl (c->plan);
+  //c->fallback_substitute     = disable_otl || !hb_ot_layout_has_substitution (c->face);
+  c->fallback_positioning    = disable_otl || !hb_ot_layout_has_positioning (c->face);
+  c->fallback_glyph_classes  = disable_otl || !hb_ot_layout_has_glyph_classes (c->face);
+
   /* Save the original direction, we use it later. */
   c->target_direction = c->buffer->props.direction;
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -826,16 +826,19 @@
 };
 
 typedef struct {
-  char language[8];
+  char language[11];
   hb_tag_t tag;
 } LangTagLong;
 static const LangTagLong ot_languages_zh[] = {
+  /* Store longest-first, if one is a prefix of another. */
   {"zh-cn",     HB_TAG('Z','H','S',' ')},       /* Chinese (China) */
   {"zh-hk",     HB_TAG('Z','H','H',' ')},       /* Chinese (Hong Kong) */
-  {"zh-mo",     HB_TAG('Z','H','T',' ')},       /* Chinese (Macao) */
+  {"zh-mo",     HB_TAG('Z','H','H',' ')},       /* Chinese (Macao) */
   {"zh-sg",     HB_TAG('Z','H','S',' ')},       /* Chinese (Singapore) */
   {"zh-tw",     HB_TAG('Z','H','T',' ')},       /* Chinese (Taiwan) */
   {"zh-hans",   HB_TAG('Z','H','S',' ')},       /* Chinese (Simplified) */
+  {"zh-hant-hk",HB_TAG('Z','H','H',' ')},       /* Chinese (Hong Kong) */
+  {"zh-hant-mo",HB_TAG('Z','H','H',' ')},       /* Chinese (Macao) */
   {"zh-hant",   HB_TAG('Z','H','T',' ')},       /* Chinese (Traditional) */
 };
 
@@ -889,13 +892,21 @@
   }
 
   /*
-   * The International Phonetic Alphabet is a variant tag in BCP-47,
-   * which can be applied to any language.
+   * "fonipa" is a variant tag in BCP-47, meaning the International Phonetic Alphabet.
+   * It can be applied to any language.
    */
   if (strstr (lang_str, "-fonipa")) {
     return HB_TAG('I','P','P','H');  /* Phonetic transcription—IPA conventions */
   }
 
+  /*
+   * "fonnapa" is a variant tag in BCP-47, meaning the North American Phonetic Alphabet
+   * also known as Americanist Phonetic Notation.  It can be applied to any language.
+   */
+  if (strstr (lang_str, "-fonnapa")) {
+    return HB_TAG('A','P','P','H');  /* Phonetic transcription—Americanist conventions */
+  }
+
   /* Find a language matching in the first component */
   {
     const LangTag *lang_tag;
@@ -937,7 +948,7 @@
 /**
  * hb_ot_tag_to_language:
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
@@ -967,6 +978,8 @@
 
   /* struct LangTag has only room for 3-letter language tags. */
   switch (tag) {
+  case HB_TAG('A','P','P','H'):  /* Phonetic transcription—Americanist conventions */
+    return hb_language_from_string ("und-fonnapa", -1);
   case HB_TAG('I','P','P','H'):  /* Phonetic transcription—IPA conventions */
     return hb_language_from_string ("und-fonipa", -1);
   }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h	Fri Jan 20 07:05:40 2017 -0800
@@ -32,6 +32,7 @@
 
 #include "hb-ot-font.h"
 #include "hb-ot-layout.h"
+#include "hb-ot-math.h"
 #include "hb-ot-tag.h"
 #include "hb-ot-shape.h"
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -689,17 +689,20 @@
     fprintf (stderr, " %*s  ", (unsigned int) (2 * sizeof (void *)), "");
 
   if (indented) {
-/* One may want to add ASCII version of these.  See:
- * https://bugs.freedesktop.org/show_bug.cgi?id=50970 */
 #define VBAR    "\342\224\202"  /* U+2502 BOX DRAWINGS LIGHT VERTICAL */
 #define VRBAR   "\342\224\234"  /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
 #define DLBAR   "\342\225\256"  /* U+256E BOX DRAWINGS LIGHT ARC DOWN AND LEFT */
 #define ULBAR   "\342\225\257"  /* U+256F BOX DRAWINGS LIGHT ARC UP AND LEFT */
 #define LBAR    "\342\225\264"  /* U+2574 BOX DRAWINGS LIGHT LEFT */
-    static const char bars[] = VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR;
+    static const char bars[] =
+      VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR
+      VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR
+      VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR
+      VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR
+      VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR;
     fprintf (stderr, "%2u %s" VRBAR "%s",
              level,
-             bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars), (unsigned int) (sizeof (VBAR) - 1) * level),
+             bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars) - 1, (unsigned int) (sizeof (VBAR) - 1) * level),
              level_dir ? (level_dir > 0 ? DLBAR : ULBAR) : LBAR);
   } else
     fprintf (stderr, "   " VRBAR LBAR);
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -313,7 +313,7 @@
     for (unsigned int i = 0; i < ELTS; i++)
       if (elts[i])
         for (unsigned int j = 0; j < BITS; j++)
-          if (elts[i] & (1 << j))
+          if (elts[i] & (1u << j))
             return i * BITS + j;
     return INVALID;
   }
@@ -322,7 +322,7 @@
     for (unsigned int i = ELTS; i; i--)
       if (elts[i - 1])
         for (unsigned int j = BITS; j; j--)
-          if (elts[i - 1] & (1 << (j - 1)))
+          if (elts[i - 1] & (1u << (j - 1)))
             return (i - 1) * BITS + (j - 1);
     return INVALID;
   }
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -143,9 +143,9 @@
  * hb_set_allocation_successful:
  * @set: a set.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -159,7 +159,7 @@
  * hb_set_clear:
  * @set: a set.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -173,9 +173,9 @@
  * hb_set_is_empty:
  * @set: a set.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
@@ -188,11 +188,11 @@
 /**
  * hb_set_has:
  * @set: a set.
- * @codepoint:
+ * @codepoint: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -206,9 +206,9 @@
 /**
  * hb_set_add:
  * @set: a set.
- * @codepoint:
+ * @codepoint: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -222,10 +222,10 @@
 /**
  * hb_set_add_range:
  * @set: a set.
- * @first:
- * @last:
+ * @first: 
+ * @last: 
  *
- *
+ * 
  *
  * Since: 0.9.7
  **/
@@ -240,9 +240,9 @@
 /**
  * hb_set_del:
  * @set: a set.
- * @codepoint:
+ * @codepoint: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -256,10 +256,10 @@
 /**
  * hb_set_del_range:
  * @set: a set.
- * @first:
- * @last:
+ * @first: 
+ * @last: 
  *
- *
+ * 
  *
  * Since: 0.9.7
  **/
@@ -274,11 +274,11 @@
 /**
  * hb_set_is_equal:
  * @set: a set.
- * @other:
+ * @other: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
@@ -292,9 +292,9 @@
 /**
  * hb_set_set:
  * @set: a set.
- * @other:
+ * @other: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -308,9 +308,9 @@
 /**
  * hb_set_union:
  * @set: a set.
- * @other:
+ * @other: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -324,9 +324,9 @@
 /**
  * hb_set_intersect:
  * @set: a set.
- * @other:
+ * @other: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -340,9 +340,9 @@
 /**
  * hb_set_subtract:
  * @set: a set.
- * @other:
+ * @other: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -356,9 +356,9 @@
 /**
  * hb_set_symmetric_difference:
  * @set: a set.
- * @other:
+ * @other: 
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -373,7 +373,7 @@
  * hb_set_invert:
  * @set: a set.
  *
- *
+ * 
  *
  * Since: 0.9.10
  **/
@@ -436,7 +436,7 @@
  * @set: a set.
  * @codepoint: (inout):
  *
- *
+ * 
  *
  * Return value: whether there was a next value.
  *
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh	Fri Jan 20 07:05:40 2017 -0800
@@ -47,12 +47,17 @@
   hb_feature_t *user_features;
   unsigned int num_user_features;
 
+  int *coords;
+  unsigned int num_coords;
+
   struct hb_shaper_data_t shaper_data;
 };
 
 #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS \
-        , const hb_feature_t            *user_features \
-        , unsigned int                   num_user_features
+        , const hb_feature_t *user_features \
+        , unsigned int        num_user_features \
+        , const int          *coords \
+        , unsigned int        num_coords
 #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, shape_plan);
 #include "hb-shaper-list.hh"
 #undef HB_SHAPER_IMPLEMENT
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -46,11 +46,14 @@
 hb_shape_plan_plan (hb_shape_plan_t    *shape_plan,
                     const hb_feature_t *user_features,
                     unsigned int        num_user_features,
+                    const int          *coords,
+                    unsigned int        num_coords,
                     const char * const *shaper_list)
 {
   DEBUG_MSG_FUNC (SHAPE_PLAN, shape_plan,
-                  "num_features=%d shaper_list=%p",
+                  "num_features=%d num_coords=%d shaper_list=%p",
                   num_user_features,
+                  num_coords,
                   shaper_list);
 
   const hb_shaper_pair_t *shapers = _hb_shapers_get ();
@@ -59,7 +62,9 @@
         HB_STMT_START { \
           if (hb_##shaper##_shaper_face_data_ensure (shape_plan->face_unsafe)) { \
             HB_SHAPER_DATA (shaper, shape_plan) = \
-              HB_SHAPER_DATA_CREATE_FUNC (shaper, shape_plan) (shape_plan, user_features, num_user_features); \
+              HB_SHAPER_DATA_CREATE_FUNC (shaper, shape_plan) (shape_plan, \
+                                                               user_features, num_user_features, \
+                                                               coords, num_coords); \
             shape_plan->shaper_func = _hb_##shaper##_shape; \
             shape_plan->shaper_name = #shaper; \
             return; \
@@ -96,13 +101,13 @@
 
 /**
  * hb_shape_plan_create: (Xconstructor)
- * @face:
- * @props:
+ * @face: 
+ * @props: 
  * @user_features: (array length=num_user_features):
- * @num_user_features:
+ * @num_user_features: 
  * @shaper_list: (array zero-terminated=1):
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -115,14 +120,31 @@
                       unsigned int                   num_user_features,
                       const char * const            *shaper_list)
 {
+  return hb_shape_plan_create2 (face, props,
+                                user_features, num_user_features,
+                                NULL, 0,
+                                shaper_list);
+}
+
+hb_shape_plan_t *
+hb_shape_plan_create2 (hb_face_t                     *face,
+                       const hb_segment_properties_t *props,
+                       const hb_feature_t            *user_features,
+                       unsigned int                   num_user_features,
+                       const int                     *orig_coords,
+                       unsigned int                   num_coords,
+                       const char * const            *shaper_list)
+{
   DEBUG_MSG_FUNC (SHAPE_PLAN, NULL,
-                  "face=%p num_features=%d shaper_list=%p",
+                  "face=%p num_features=%d num_coords=%d shaper_list=%p",
                   face,
                   num_user_features,
+                  num_coords,
                   shaper_list);
 
   hb_shape_plan_t *shape_plan;
   hb_feature_t *features = NULL;
+  int *coords = NULL;
 
   if (unlikely (!face))
     face = hb_face_get_empty ();
@@ -130,7 +152,14 @@
     return hb_shape_plan_get_empty ();
   if (num_user_features && !(features = (hb_feature_t *) calloc (num_user_features, sizeof (hb_feature_t))))
     return hb_shape_plan_get_empty ();
-  if (!(shape_plan = hb_object_create<hb_shape_plan_t> ())) {
+  if (num_coords && !(coords = (int *) calloc (num_coords, sizeof (int))))
+  {
+    free (features);
+    return hb_shape_plan_get_empty ();
+  }
+  if (!(shape_plan = hb_object_create<hb_shape_plan_t> ()))
+  {
+    free (coords);
     free (features);
     return hb_shape_plan_get_empty ();
   }
@@ -145,8 +174,15 @@
   shape_plan->user_features = features;
   if (num_user_features)
     memcpy (features, user_features, num_user_features * sizeof (hb_feature_t));
+  shape_plan->num_coords = num_coords;
+  shape_plan->coords = coords;
+  if (num_coords)
+    memcpy (coords, orig_coords, num_coords * sizeof (int));
 
-  hb_shape_plan_plan (shape_plan, user_features, num_user_features, shaper_list);
+  hb_shape_plan_plan (shape_plan,
+                      user_features, num_user_features,
+                      coords, num_coords,
+                      shaper_list);
 
   return shape_plan;
 }
@@ -154,7 +190,7 @@
 /**
  * hb_shape_plan_get_empty:
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -176,6 +212,9 @@
     NULL, /* user_features */
     0,    /* num_user_featurs */
 
+    NULL, /* coords */
+    0,    /* num_coords */
+
     {
 #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,
 #include "hb-shaper-list.hh"
@@ -190,7 +229,7 @@
  * hb_shape_plan_reference: (skip)
  * @shape_plan: a shape plan.
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -206,7 +245,7 @@
  * hb_shape_plan_destroy: (skip)
  * @shape_plan: a shape plan.
  *
- *
+ * 
  *
  * Since: 0.9.7
  **/
@@ -220,6 +259,7 @@
 #undef HB_SHAPER_IMPLEMENT
 
   free (shape_plan->user_features);
+  free (shape_plan->coords);
 
   free (shape_plan);
 }
@@ -227,14 +267,14 @@
 /**
  * hb_shape_plan_set_user_data: (skip)
  * @shape_plan: a shape plan.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
@@ -251,9 +291,9 @@
 /**
  * hb_shape_plan_get_user_data: (skip)
  * @shape_plan: a shape plan.
- * @key:
+ * @key: 
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
@@ -273,11 +313,11 @@
  * @font: a font.
  * @buffer: a buffer.
  * @features: (array length=num_features):
- * @num_features:
+ * @num_features: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.7
  **/
@@ -289,9 +329,10 @@
                        unsigned int        num_features)
 {
   DEBUG_MSG_FUNC (SHAPE_PLAN, shape_plan,
-                  "num_features=%d shaper_func=%p",
+                  "num_features=%d shaper_func=%p, shaper_name=%s",
                   num_features,
-                  shape_plan->shaper_func);
+                  shape_plan->shaper_func,
+                  shape_plan->shaper_name);
 
   if (unlikely (!buffer->len))
     return true;
@@ -350,6 +391,8 @@
   const char * const            *shaper_list;
   const hb_feature_t            *user_features;
   unsigned int                   num_user_features;
+  const int                     *coords;
+  unsigned int                   num_coords;
   hb_shape_func_t               *shaper_func;
 };
 
@@ -357,12 +400,26 @@
 hb_shape_plan_user_features_match (const hb_shape_plan_t          *shape_plan,
                                    const hb_shape_plan_proposal_t *proposal)
 {
-  if (proposal->num_user_features != shape_plan->num_user_features) return false;
+  if (proposal->num_user_features != shape_plan->num_user_features)
+    return false;
   for (unsigned int i = 0, n = proposal->num_user_features; i < n; i++)
     if (proposal->user_features[i].tag   != shape_plan->user_features[i].tag   ||
         proposal->user_features[i].value != shape_plan->user_features[i].value ||
         proposal->user_features[i].start != shape_plan->user_features[i].start ||
-        proposal->user_features[i].end   != shape_plan->user_features[i].end) return false;
+        proposal->user_features[i].end   != shape_plan->user_features[i].end)
+      return false;
+  return true;
+}
+
+static inline hb_bool_t
+hb_shape_plan_coords_match (const hb_shape_plan_t          *shape_plan,
+                            const hb_shape_plan_proposal_t *proposal)
+{
+  if (proposal->num_coords != shape_plan->num_coords)
+    return false;
+  for (unsigned int i = 0, n = proposal->num_coords; i < n; i++)
+    if (proposal->coords[i] != shape_plan->coords[i])
+      return false;
   return true;
 }
 
@@ -372,6 +429,7 @@
 {
   return hb_segment_properties_equal (&shape_plan->props, &proposal->props) &&
          hb_shape_plan_user_features_match (shape_plan, proposal) &&
+         hb_shape_plan_coords_match (shape_plan, proposal) &&
          ((shape_plan->default_shaper_list && proposal->shaper_list == NULL) ||
           (shape_plan->shaper_func == proposal->shaper_func));
 }
@@ -388,15 +446,22 @@
   return false;
 }
 
+static inline hb_bool_t
+hb_coords_present (const int *coords,
+                   unsigned int num_coords)
+{
+  return num_coords != 0;
+}
+
 /**
  * hb_shape_plan_create_cached:
- * @face:
- * @props:
+ * @face: 
+ * @props: 
  * @user_features: (array length=num_user_features):
- * @num_user_features:
+ * @num_user_features: 
  * @shaper_list: (array zero-terminated=1):
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -409,6 +474,21 @@
                              unsigned int                   num_user_features,
                              const char * const            *shaper_list)
 {
+  return hb_shape_plan_create_cached2 (face, props,
+                                       user_features, num_user_features,
+                                       NULL, 0,
+                                       shaper_list);
+}
+
+hb_shape_plan_t *
+hb_shape_plan_create_cached2 (hb_face_t                     *face,
+                              const hb_segment_properties_t *props,
+                              const hb_feature_t            *user_features,
+                              unsigned int                   num_user_features,
+                              const int                     *coords,
+                              unsigned int                   num_coords,
+                              const char * const            *shaper_list)
+{
   DEBUG_MSG_FUNC (SHAPE_PLAN, NULL,
                   "face=%p num_features=%d shaper_list=%p",
                   face,
@@ -455,16 +535,21 @@
 
   /* Not found. */
 
-  hb_shape_plan_t *shape_plan = hb_shape_plan_create (face, props, user_features, num_user_features, shaper_list);
+  hb_shape_plan_t *shape_plan = hb_shape_plan_create2 (face, props,
+                                                       user_features, num_user_features,
+                                                       coords, num_coords,
+                                                       shaper_list);
 
   /* Don't add to the cache if face is inert. */
   if (unlikely (hb_object_is_inert (face)))
     return shape_plan;
 
   /* Don't add the plan to the cache if there were user features with non-global ranges */
-
   if (hb_non_global_user_features_present (user_features, num_user_features))
     return shape_plan;
+  /* Don't add the plan to the cache if there were variation coordinates XXX Fix me. */
+  if (hb_coords_present (coords, num_coords))
+    return shape_plan;
 
   hb_face_t::plan_node_t *node = (hb_face_t::plan_node_t *) calloc (1, sizeof (hb_face_t::plan_node_t));
   if (unlikely (!node))
@@ -487,7 +572,7 @@
  * hb_shape_plan_get_shaper:
  * @shape_plan: a shape plan.
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h	Fri Jan 20 07:05:40 2017 -0800
@@ -53,6 +53,25 @@
                              const char * const            *shaper_list);
 
 HB_EXTERN hb_shape_plan_t *
+hb_shape_plan_create2 (hb_face_t                     *face,
+                       const hb_segment_properties_t *props,
+                       const hb_feature_t            *user_features,
+                       unsigned int                   num_user_features,
+                       const int                     *coords,
+                       unsigned int                   num_coords,
+                       const char * const            *shaper_list);
+
+HB_EXTERN hb_shape_plan_t *
+hb_shape_plan_create_cached2 (hb_face_t                     *face,
+                              const hb_segment_properties_t *props,
+                              const hb_feature_t            *user_features,
+                              unsigned int                   num_user_features,
+                              const int                     *coords,
+                              unsigned int                   num_coords,
+                              const char * const            *shaper_list);
+
+
+HB_EXTERN hb_shape_plan_t *
 hb_shape_plan_get_empty (void);
 
 HB_EXTERN hb_shape_plan_t *
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -373,7 +373,10 @@
                unsigned int        num_features,
                const char * const *shaper_list)
 {
-  hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, features, num_features, shaper_list);
+  hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached2 (font->face, &buffer->props,
+                                                              features, num_features,
+                                                              font->coords, font->num_coords,
+                                                              shaper_list);
   hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features);
   hb_shape_plan_destroy (shape_plan);
 
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc	Fri Jan 20 08:01:43 2017 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc	Fri Jan 20 07:05:40 2017 -0800
@@ -131,12 +131,12 @@
 #define HB_UNICODE_FUNCS_IMPLEMENT(set) \
   return hb_##set##_get_unicode_funcs ();
 
-#ifdef HAVE_GLIB
+#if defined(HAVE_UCDN)
+  HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
+#elif defined(HAVE_GLIB)
   HB_UNICODE_FUNCS_IMPLEMENT(glib)
 #elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
   HB_UNICODE_FUNCS_IMPLEMENT(icu)
-#elif defined(HAVE_UCDN)
-  HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
 #else
 #define HB_UNICODE_FUNCS_NIL 1
   HB_UNICODE_FUNCS_IMPLEMENT(nil)
@@ -154,7 +154,7 @@
  * hb_unicode_funcs_create: (Xconstructor)
  * @parent: (nullable):
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -200,7 +200,7 @@
 /**
  * hb_unicode_funcs_get_empty:
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -216,7 +216,7 @@
  * hb_unicode_funcs_reference: (skip)
  * @ufuncs: Unicode functions.
  *
- *
+ * 
  *
  * Return value: (transfer full):
  *
@@ -232,7 +232,7 @@
  * hb_unicode_funcs_destroy: (skip)
  * @ufuncs: Unicode functions.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -254,14 +254,14 @@
 /**
  * hb_unicode_funcs_set_user_data: (skip)
  * @ufuncs: Unicode functions.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key: 
+ * @data: 
+ * @destroy: 
+ * @replace: 
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -278,9 +278,9 @@
 /**
  * hb_unicode_funcs_get_user_data: (skip)
  * @ufuncs: Unicode functions.
- * @key:
+ * @key: 
  *
- *
+ * 
  *
  * Return value: (transfer none):
  *
@@ -298,7 +298,7 @@
  * hb_unicode_funcs_make_immutable:
  * @ufuncs: Unicode functions.
  *
- *
+ * 
  *
  * Since: 0.9.2
  **/
@@ -315,9 +315,9 @@
  * hb_unicode_funcs_is_immutable:
  * @ufuncs: Unicode functions.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -331,9 +331,9 @@
  * hb_unicode_funcs_get_parent:
  * @ufuncs: Unicode functions.
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -387,13 +387,13 @@
 /**
  * hb_unicode_compose:
  * @ufuncs: Unicode functions.
- * @a:
- * @b:
+ * @a: 
+ * @b: 
  * @ab: (out):
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -409,13 +409,13 @@
 /**
  * hb_unicode_decompose:
  * @ufuncs: Unicode functions.
- * @ab:
+ * @ab: 
  * @a: (out):
  * @b: (out):
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *
  * Since: 0.9.2
  **/
@@ -431,12 +431,12 @@
 /**
  * hb_unicode_decompose_compatibility:
  * @ufuncs: Unicode functions.
- * @u:
+ * @u: 
  * @decomposed: (out):
  *
+ * 
  *
- *
- * Return value:
+ * Return value: 
  *