From 552d19b7a11f7dff888587fce4d56d9f8e47e819 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 18 Jul 2012 16:00:49 -0400 Subject: [PATCH] [Indic] Treat Register Shifters like Nukta Really this time. Fixes another 18 Khmer tests. --- src/hb-ot-shape-complex-indic-machine.rl | 2 +- src/hb-ot-shape-complex-indic.cc | 2 -- .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shape-complex-indic-machine.rl index 0943b4db5..a266a12ad 100644 --- a/src/hb-ot-shape-complex-indic-machine.rl +++ b/src/hb-ot-shape-complex-indic-machine.rl @@ -57,7 +57,7 @@ Repha = 15; Ra = 16; c = (C | Ra); # is_consonant -n = (N.N? | ZWNJ?.RS); # is_consonant_modifier +n = ((ZWNJ?.RS)? (N.N?)?); # is_consonant_modifier z = ZWJ|ZWNJ; # is_joiner h = H | Coeng; # is_halant_or_coeng reph = (Ra H | Repha); # possible reph diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 3f1faec68..9b5b499fc 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -299,8 +299,6 @@ _hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map HB_UNUSED, info.indic_position() = consonant_position (info.codepoint); if (is_ra (info.codepoint)) info.indic_category() = OT_Ra; - } else if (info.indic_category() == OT_RS) { - info.indic_position() = POS_ABOVE_M; } else if (info.indic_category() == OT_SM || info.indic_category() == OT_VD) { info.indic_position() = POS_SMVD; diff --git a/test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt b/test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt index c9e5443f0..46a80730e 100644 --- a/test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt +++ b/test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt @@ -14,3 +14,4 @@ ង្រ្គ ម៉្លេះ ម‌៉្លេះ +ប៊័