From 02bebe42c1ffbd8e11b232c943317c8cd8141afb Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 28 Sep 2018 09:51:35 -0400
Subject: [PATCH] [test/text-rendering-tests] Update from upstream

---
 test/shaping/data/text-rendering-tests/DISABLED  |   4 ++++
 .../data/text-rendering-tests/Makefile.sources   |   4 ++++
 .../fonts/TestMORXThirtyone.ttf                  | Bin 0 -> 2964 bytes
 .../fonts/TestMORXThirtytwo.ttf                  | Bin 0 -> 2948 bytes
 .../fonts/TestMORXTwentynine.ttf                 | Bin 0 -> 3012 bytes
 .../text-rendering-tests/tests/MORX-29.tests     |   4 ++++
 .../text-rendering-tests/tests/MORX-30.tests     |   4 ++++
 .../text-rendering-tests/tests/MORX-31.tests     |   8 ++++++++
 .../text-rendering-tests/tests/MORX-32.tests     |   4 ++++
 9 files changed, 28 insertions(+)
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-29.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-30.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-31.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-32.tests

diff --git a/test/shaping/data/text-rendering-tests/DISABLED b/test/shaping/data/text-rendering-tests/DISABLED
index 58de258f8..1ce62e072 100644
--- a/test/shaping/data/text-rendering-tests/DISABLED
+++ b/test/shaping/data/text-rendering-tests/DISABLED
@@ -28,6 +28,10 @@ tests/MORX-25.tests
 tests/MORX-26.tests
 tests/MORX-27.tests
 tests/MORX-28.tests
+tests/MORX-29.tests
+tests/MORX-30.tests
+tests/MORX-31.tests
+tests/MORX-32.tests
 
 # Rounding differences
 tests/SHARAN-1.tests
diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shaping/data/text-rendering-tests/Makefile.sources
index 4be9d05d7..5c8cd03f9 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.sources
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -52,7 +52,11 @@ DISBALED_TESTS = \
 	tests/MORX-26.tests \
 	tests/MORX-27.tests \
 	tests/MORX-28.tests \
+	tests/MORX-29.tests \
 	tests/MORX-2.tests \
+	tests/MORX-30.tests \
+	tests/MORX-31.tests \
+	tests/MORX-32.tests \
 	tests/MORX-3.tests \
 	tests/MORX-4.tests \
 	tests/MORX-5.tests \
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c64c12c06957ef34e90ddeba7e18ad7b1acc0c84
GIT binary patch
literal 2964
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

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..07ed76c1b7738ddf0f841cbe2bf4a633c8829ce0
GIT binary patch
literal 2948
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

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9f015ca59c3d4fa5b8c8ae0a18c29f4f697a9c29
GIT binary patch
literal 3012
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
T>z3#G(?SDk=4^payxso?#Evu-

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-29.tests b/test/shaping/data/text-rendering-tests/tests/MORX-29.tests
new file mode 100644
index 000000000..82fd96300
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-29.tests
@@ -0,0 +1,4 @@
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0041,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|I@4268,0|N@5098,0|S@5928,0|M@6758,0|Y@7588,0|Y@7920,0|A@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0042,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|I@5098,0|N@5928,0|S@6758,0|Y@7588,0|Y@7920,0|B@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0043,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|I@5762,0|N@6592,0|S@7422,0|C@8252,0|Z@9082,0|Z@9404,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+004D,U+004D,U+0059,U+0059,U+0044,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|X@2710,0|X@3074,0|M@3438,0|M@4268,0|Y@5098,0|Y@5430,0|D@5762,0|I@6592,0|N@7422,0|S@8252,0|Z@9082,0|Z@9404,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-30.tests b/test/shaping/data/text-rendering-tests/tests/MORX-30.tests
new file mode 100644
index 000000000..ad4ab2170
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-30.tests
@@ -0,0 +1,4 @@
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|I@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|I@2710,0|N@3540,0|S@4370,0|N@5200,0|S@6030,0|M@6860,0|X@7690,0|X@8054,0|X@8418,0|A@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|I@1880,0|N@2710,0|S@3540,0|M@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|A@10276,0|Z@11106,0|Z@11428,0]
+../fonts/TestMORXTwentynine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+004D,U+004D,U+0058,U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A:[P|Q@333,0|R@699,0|M@1050,0|M@1880,0|I@2710,0|N@3540,0|S@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|X@8054,0|X@8418,0|B@8782,0|Y@9612,0|Y@9944,0|B@10276,0|Z@11106,0|Z@11428,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-31.tests b/test/shaping/data/text-rendering-tests/tests/MORX-31.tests
new file mode 100644
index 000000000..6cc40b6e1
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-31.tests
@@ -0,0 +1,8 @@
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0058,U+0041,U+0059,U+0059,U+0041,U+005A,U+005A:[X|X@364,0|I@728,0|N@1558,0|S@2388,0|A@3218,0|Y@4048,0|Y@4380,0|A@4712,0|Z@5542,0|Z@5864,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0058,U+0041,U+0059,U+0059,U+0042,U+0059,U+0059:[X|X@364,0|A@728,0|I@1558,0|N@2388,0|S@3218,0|Y@4048,0|Y@4380,0|B@4712,0|Y@5542,0|Y@5874,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0058,U+0042,U+0059,U+0059,U+0041,U+005A,U+005A:[X|X@364,0|I@728,0|N@1558,0|S@2388,0|B@3218,0|Y@4048,0|Y@4380,0|A@4712,0|Z@5542,0|Z@5864,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0058,U+0042,U+0059,U+0059,U+0042,U+005A,U+005A:[X|X@364,0|B@728,0|I@1558,0|N@2388,0|S@3218,0|Y@4048,0|Y@4380,0|B@4712,0|Z@5542,0|Z@5864,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0041:[I|N@830,0|S@1660,0|M@2490,0|P@3320,0|Q@3653,0|R@4019,0|I@4370,0|N@5200,0|S@6030,0|A@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004D,U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0042:[I|N@830,0|S@1660,0|M@2490,0|P@3320,0|Q@3653,0|R@4019,0|A@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0041:[M|I@830,0|N@1660,0|S@2490,0|P@3320,0|Q@3653,0|R@4019,0|I@4370,0|N@5200,0|S@6030,0|B@6860,0|X@7690,0|Y@8054,0|Z@8386,0|A@8708,0]
+../fonts/TestMORXThirtyone.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004D,U+0050,U+0051,U+0052,U+0042,U+0058,U+0059,U+005A,U+0042:[M|I@830,0|N@1660,0|S@2490,0|P@3320,0|Q@3653,0|R@4019,0|B@4370,0|I@5200,0|N@6030,0|S@6860,0|X@7690,0|Y@8054,0|Z@8386,0|B@8708,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-32.tests b/test/shaping/data/text-rendering-tests/tests/MORX-32.tests
new file mode 100644
index 000000000..6f3ae888e
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-32.tests
@@ -0,0 +1,4 @@
+../fonts/TestMORXThirtytwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041:[I|N@830,0|S@1660,0|A@2490,0]
+../fonts/TestMORXThirtytwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0041,U+0059:[I|N@830,0|S@1660,0|X@2490,0|A@2854,0|Y@3684,0]
+../fonts/TestMORXThirtytwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0042:[B|I@830,0|N@1660,0|S@2490,0]
+../fonts/TestMORXThirtytwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0042,U+0059:[X|I@364,0|N@1194,0|S@2024,0|B@2854,0|Y@3684,0]