Add three punctuations.

[m17n/m17n-db.git] / FLT / GJR2-OTF.flt

diff --git a/FLT/GJR2-OTF.flt b/FLT/GJR2-OTF.flt
index 422837a..c8327a1 100644 (file)
--- a/FLT/GJR2-OTF.flt
+++ b/FLT/GJR2-OTF.flt
@@ -56,15 +56,25 @@
   (cond
    ;; Syllables with an independent vowel
    ("(RH)?Vn?(J?HR)?m?u?b?p?n?a?A?"
-    < | (0 = *) | >)
+    < | = * | >)
 
    ;; Consonant-based syllables
    ("([CR]n?J?HJ?)*[CR]n?(H[NJ]?|m?u?b?p?n?)a?A?"
-    < | (0 = *) | >)
+    < | = * | >)
 
    ;; Combining marks are displayed with a DOTTED CIRCLE.
-   ("(m)|(n|H|u|b|p|a|A|JHR)"
-    < | (1 =) 0x25CC (2 :otf=gjr2=blwf+) | >)
+   ("m"
+    (cond
+     ((font-facility 0x25CC) < = 0x25CC >)
+     ("." [ = ])))
+   ("[nHubpaA]"
+    (cond
+     ((font-facility 0x25CC) < 0x25CC = >)
+     ("." [ = ])))
+   ("JHR"
+    (cond
+     ((font-facility 0x25CC) < 0x25CC :otf=gjr2=blwf+ >)
+     (".+" [ :otf=gjr2=blwf+ ])))
 
    ("." =))
   *))