[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 test/shaping/fonts/sha1sum/MANIFEST       |    6 +++---
 test/shaping/tests/zero-width-marks.tests |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3fe0cf10401875f1e9b8b5fbaf59826e64ea61d2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 10 18:43:43 2016 +0700

    Fix previous commit!

diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index e8ba4c2..7bc0384 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -1,6 +1,5 @@
 0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf
 051d92f8bc6ff724511b296c27623f824de256e9.ttf
-0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf
 191826b9643e3f124d865d617ae609db6a2ce203.ttf
 1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf
 1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
@@ -18,6 +17,7 @@
 49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf
 4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
 5028afb650b1bb718ed2131e872fbcce57828fff.ttf
+56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf
 57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf
 5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf
 641bd9db850193064d17575053ae2bf8ec149ddc.ttf
@@ -28,9 +28,7 @@
 8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
 813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
 8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
-828114d00931885bc25abf7cdb878b2914a2e743.ttf
 8454d22037f892e76614e1645d066689a0200e61.ttf
-894e96a367f00c196d82e6243673a1d4414f4f6a.ttf
 8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
 a919b33197965846f21074b24e30250d67277bce.ttf
 b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
@@ -38,6 +36,7 @@ bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
 bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
 bb9473d2403488714043bcfb946c9f78b86ad627.ttf
 c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf
+cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf
 d629e7fedc0b350222d7987345fe61613fa3929a.ttf
 df768b9c257e0c9c35786c47cae15c46571d56be.ttf
 e207635780b42f898d58654b65098763e340f5c7.ttf
@@ -46,3 +45,4 @@ f499fbc23865022234775c43503bba2e63978fe1.ttf
 fab39d60d758cb586db5a504f218442cd1395725.ttf
 fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf
 fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
+ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf
diff --git a/test/shaping/tests/zero-width-marks.tests b/test/shaping/tests/zero-width-marks.tests
index 1cda3db..a9a7d95 100644
--- a/test/shaping/tests/zero-width-marks.tests
+++ b/test/shaping/tests/zero-width-marks.tests
@@ -4,7 +4,7 @@ fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf::U+0E01,U+0E34,U+0E01
 fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0 at 20,0+1000|gid1=2+1264]
 fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
 fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
-fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
-fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+1200|gid3=2+1083|gid6=2 at -992,0+1200|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+1200|gid5=8+528|gid6=8 at -693,0+1200|gid2=10+528|gid2=11+528]
+fonts/sha1sum/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
+fonts/sha1sum/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+1200|gid3=2+1083|gid6=2 at -992,0+1200|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+1200|gid5=8+528|gid6=8 at -693,0+1200|gid2=10+528|gid2=11+528]
 fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0+0|gid3=2+1083|gid6=2+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6+0|gid5=8+528|gid6=8+0|gid2=10+528|gid2=11+528]
-fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
+fonts/sha1sum/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]