From 4a115fe7fe71e381decb7c894208540663419f75 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 4 Jun 2018 15:40:43 -0700
Subject: [PATCH] [sinhala] Move reph to after post-consonants

Apparently this changed between Win 7 and Win 10.

Fixes https://github.com/harfbuzz/harfbuzz/issues/967

To be continued in https://github.com/harfbuzz/harfbuzz/issues/1044
---
 src/hb-ot-shape-complex-indic.cc                 |   2 +-
 test/shaping/data/in-house/Makefile.sources      |   1 +
 .../5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf | Bin 0 -> 3152 bytes
 test/shaping/data/in-house/tests/sinhala.tests   |   1 +
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf
 create mode 100644 test/shaping/data/in-house/tests/sinhala.tests

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index f08876b8f..447e36cc4 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -86,7 +86,7 @@ static const indic_config_t indic_configs[] =
   {HB_SCRIPT_KANNADA,	true, 0x0CCDu,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_IMPLICIT, BLWF_MODE_POST_ONLY},
   {HB_SCRIPT_MALAYALAM,	true, 0x0D4Du,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_LOG_REPHA,BLWF_MODE_PRE_AND_POST},
   {HB_SCRIPT_SINHALA,	false,0x0DCAu,BASE_POS_LAST_SINHALA,
-						     REPH_POS_AFTER_MAIN, REPH_MODE_EXPLICIT, BLWF_MODE_PRE_AND_POST},
+						     REPH_POS_AFTER_POST, REPH_MODE_EXPLICIT, BLWF_MODE_PRE_AND_POST},
 };
 
 
diff --git a/test/shaping/data/in-house/Makefile.sources b/test/shaping/data/in-house/Makefile.sources
index bf4df2018..ef16faed4 100644
--- a/test/shaping/data/in-house/Makefile.sources
+++ b/test/shaping/data/in-house/Makefile.sources
@@ -34,6 +34,7 @@ TESTS = \
 	tests/none-directional.tests \
 	tests/spaces.tests \
 	tests/simple.tests \
+	tests/sinhala.tests \
 	tests/tibetan-contractions-1.tests \
 	tests/tibetan-contractions-2.tests \
 	tests/tibetan-vowels.tests \
diff --git a/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf b/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..72c5244a3ea816b10336ea3f6f830afacf233866
GIT binary patch
literal 3152
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
QDrt?Acnal7q%qt74d=+2+W-In

literal 0
HcmV?d00001

diff --git a/test/shaping/data/in-house/tests/sinhala.tests b/test/shaping/data/in-house/tests/sinhala.tests
new file mode 100644
index 000000000..9541754dc
--- /dev/null
+++ b/test/shaping/data/in-house/tests/sinhala.tests
@@ -0,0 +1 @@
+../fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf::U+0DBB,U+0DCA,U+200D,U+0DBA,U+0DCA,U+200D,U+0DBA:[gid8=0+1343|gid4=0+1130]