[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 dev/null                                                                |binary
 test/shaping/fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf |binary
 test/shaping/tests/fallback-positioning.tests                           |    3 +--
 test/shaping/tests/indic-consonant-with-stacker.tests                   |    8 ++++----
 test/shaping/tests/indic-script-extensions.tests                        |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit b68fba4dc81ce2e7552c5d50a93013281889a65b
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Nov 3 14:27:33 2017 +0200

    [test] Use glyph ids instead of forcing ft funcs
    
    We were using ft funcs because these are CFF fonts, but we can avoid
    glyph names instead and keep testing both ot and ft.

diff --git a/test/shaping/tests/indic-consonant-with-stacker.tests b/test/shaping/tests/indic-consonant-with-stacker.tests
index 6a6ea7c1..97dc0404 100644
--- a/test/shaping/tests/indic-consonant-with-stacker.tests
+++ b/test/shaping/tests/indic-consonant-with-stacker.tests
@@ -1,4 +1,4 @@
-fonts/sha1sum/a014549f766436cf55b2ceb40e462038938ee899.ttf:--font-funcs=ft:U+0CF1,U+0C95:[uni0CF1=0+1129|uni0C95_uni0CCD.blwf=1+358]
-fonts/sha1sum/55c88ebbe938680b08f92c3de20713183e0c7481.ttf:--font-funcs=ft:U+0CF2,U+0CAA:[uni0CF2=0+1539|uni0CAA_uni0CCD.blwf=1+245]
-fonts/sha1sum/341421e629668b1a1242245d39238ca48432d35d.ttf:--font-funcs=ft:U+0CF1:[uni0CF1=0+1129]
-fonts/sha1sum/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf:--font-funcs=ft:U+0CF2:[uni0CF2=0+1539]
+fonts/sha1sum/a014549f766436cf55b2ceb40e462038938ee899.ttf:--no-glyph-names:U+0CF1,U+0C95:[2=0+1129|3=1+358]
+fonts/sha1sum/55c88ebbe938680b08f92c3de20713183e0c7481.ttf:--no-glyph-names:U+0CF2,U+0CAA:[2=0+1539|3=1+245]
+fonts/sha1sum/341421e629668b1a1242245d39238ca48432d35d.ttf:--no-glyph-names:U+0CF1:[1=0+1129]
+fonts/sha1sum/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf:--no-glyph-names:U+0CF2:[1=0+1539]
diff --git a/test/shaping/tests/indic-script-extensions.tests b/test/shaping/tests/indic-script-extensions.tests
index e336bfcc..92bb978d 100644
--- a/test/shaping/tests/indic-script-extensions.tests
+++ b/test/shaping/tests/indic-script-extensions.tests
@@ -1,2 +1,2 @@
 fonts/sha1sum/3493e92eaded2661cadde752a39f9d58b11f0326.ttf::U+0BA4,U+0BC6,U+1133C,U+0BAA,U+1133C,U+0BC6,U+1133C:[u0BC6=0+2093|u1133C=0+0|u0BA4=0+1863|u0BC6=3+2093|u1133C=3+0|u0BAA=3+1706|u1133C=3+0]
-fonts/sha1sum/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf:--font-funcs=ft:U+0BAA,U+11301,U+11303:[uni0BAA=0+535|u11301=0+0|u11303=0+310]
+fonts/sha1sum/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf:--no-glyph-names:U+0BAA,U+11301,U+11303:[1=0+535|2=0+0|3=0+310]
commit 2fcfbcf8052bba0db7590a5f057730075fdbd5e1
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Nov 2 09:45:06 2017 +0200

    [test] Fix another instance of component rounding
    
    See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341194673

diff --git a/test/shaping/fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf b/test/shaping/fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf
deleted file mode 100644
index fb4534ab..00000000
Binary files a/test/shaping/fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf and /dev/null differ
diff --git a/test/shaping/fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf b/test/shaping/fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf
new file mode 100644
index 00000000..a5415467
Binary files /dev/null and b/test/shaping/fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf differ
diff --git a/test/shaping/tests/fallback-positioning.tests b/test/shaping/tests/fallback-positioning.tests
index 0529b24b..3eace30c 100644
--- a/test/shaping/tests/fallback-positioning.tests
+++ b/test/shaping/tests/fallback-positioning.tests
@@ -1,2 +1 @@
-fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ft:U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0 at -45,-32+0|X=2+1295|acutecomb=2 at -171,310+0]
-fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ot:U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0 at -21,-27+0|X=2+1295|acutecomb=2 at -147,321+0]
+fonts/sha1sum/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf::U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0 at -21,-27+0|X=2+1295|acutecomb=2 at -147,320+0]