[Emacs-diffs] /srv/bzr/emacs/trunk r101039: language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the composable pattern.

[Kenichi Handa]

------------------------------------------------------------
revno: 101039 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-10 10:25:16 +0900
message:
  language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the        
composable pattern.
modified:
  lisp/ChangeLog
  lisp/language/hebrew.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-09 18:05:56 +0000
+++ b/lisp/ChangeLog    2010-08-10 01:24:32 +0000
@@ -1,3 +1,8 @@
+2010-08-10  Kenichi Handa  <address@hidden>
+
+       * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the
+       composable pattern.
+
 2010-08-09  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package.el (package-version-split)

=== modified file 'lisp/language/hebrew.el'
--- a/lisp/language/hebrew.el   2010-08-09 08:12:49 +0000
+++ b/lisp/language/hebrew.el   2010-08-10 01:20:58 +0000
@@ -237,17 +237,24 @@
          (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)