Fix shaping of Sinhala text

* lisp/language/sinhala.el (composition-function-table): Allow
U+200D U+0DCA as well as U+0DCA U+200D between consonants.
Suggested by Richard Wordingham <richard.wordingham@ntlworld.com>.
(Bug#67828)

diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index bf3205060010d0b0087b4f5017a88a39f8dde936..a5c379b3aae03b484e178e9fb3fb66c960a4f306 100644 (file)
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -36,11 +36,11 @@
  composition-function-table
  '(#xD80 . #xDFF)
  (list (vector
-       ;; C:consonant, H:HALANT, J:ZWJ, v:vowel sign,
+       ;; C:consonant, H:HALANTA, J:ZWJ, v:vowel sign,
        ;; V:independent vowel, a:ANUSVARA .. VISARGA
        (concat
-        ;; C(HJC)*v*H?a?, or
-        "[\u0D9A-\u0DC6]\\(?:\u0DCA\u200D[\u0D9A-\u0DC6]\\)*[\u0DCF-\u0DDF\u0DF2-\u0DF3]*\u0DCA?[\u0D82-\u0D83]?\\|"
+        ;; C(HJ|JH)C)*v*H?a?, or
+        "[\u0D9A-\u0DC6]\\(?:\\(\u0DCA\u200D\\|\u200D\u0DCA\\)[\u0D9A-\u0DC6]\\)*[\u0DCF-\u0DDF\u0DF2-\u0DF3]*\u0DCA?[\u0D82-\u0D83]?\\|"
         ;; Va?, or
         "[\u0D85-\u0D96][\u0D82-\u0D83]?\\|"
         ;; any other singleton characters