language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the composable pattern.

2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c242b6feb78..41492031d82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-10  Kenichi Handa  <handa@m17n.org>
+
+        * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the
+        composable pattern.
+
 2010-08-09  Kenichi Handa  <handa@m17n.org>
 
         * language/hebrew.el: Exclude U+05BD (Hebrew MAQAF) from the
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 589412ad385..24ddfb2c11f 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -237,17 +237,24 @@ Bidirectional editing is supported.")))
           (setq idx (1+ idx))))))
     gstring))
 
-(let ((pattern1 "[\u05D0-\u05F2][\u0591-\u05BD\u05BF\u05C1-\u05C5\u05C7]+")
-      (pattern2 "[\u05D0-\u05F2]\u200D[\u0591-\u05BD\u05BF\u05C1-\u05C5\u05C7]+"))
+(let* ((base "[\u05D0-\u05F2]")
+       (combining "[\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7]+")
+       (pattern1 (concat base combining))
+       (pattern2 (concat base "\u200D" combining)))
   (set-char-table-range
    composition-function-table '(#x591 . #x5C7)
    (list (vector pattern2 3 'hebrew-shape-gstring)
          (vector pattern2 2 'hebrew-shape-gstring)
          (vector pattern1 1 'hebrew-shape-gstring)
          [nil 0 hebrew-shape-gstring]))
+  ;; Exclude non-combining characters.
+  (set-char-table-range
+   composition-function-table #x5BE nil)
   (set-char-table-range
    composition-function-table #x5C0 nil)
   (set-char-table-range
+   composition-function-table #x5C3 nil)
+  (set-char-table-range
    composition-function-table #x5C6 nil))
 
 (provide 'hebrew)