From: ntakahas <ntakahas>
Date: Fri, 19 Oct 2007 11:07:18 +0000 (+0000)
Subject: Handle ZWJ correctly even if the current font does not contain it.
X-Git-Tag: REL-1-5-0~26
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea4f0f62f1cc0ea558402e0cff9ac878bcd47eaa;p=m17n%2Fm17n-db.git

Handle ZWJ correctly even if the current font does not contain it.
---

diff --git a/FLT/GUJR-OTF.flt b/FLT/GUJR-OTF.flt
index c31a1d3..350d45d 100644
--- a/FLT/GUJR-OTF.flt
+++ b/FLT/GUJR-OTF.flt
@@ -146,17 +146,12 @@
   *)
 
  (gsub
-  otf:gujr=nukt,akhn,blwf,half,vatu,pres+)
- )
-
-;; ZWJ's are used to prevent consonant conjuncts, so they are removed
-;; only after 'vatu' and 'pres' have been applied.
-(generator
- (0
   (cond
-   ("J")
-   ("." =))
-  *))
+   ("([^J]*)J(.*)"
+    (1 otf:gujr=nukt,akhn,blwf,half,vatu,pres+) (2 gsub))
+   (".*"
+    otf:gujr=nukt,akhn,blwf,half,vatu,pres+)))
+ )
 
 ;; Apply other features.
 (generator