Sync up with egg-980712.

[elisp/egg.git] / its / kata.el

diff --git a/its/kata.el b/its/kata.el
index 9c11905..69ce3f6 100644 (file)
--- a/its/kata.el
+++ b/its/kata.el
@@ -50,7 +50,7 @@
 (defvar its-kata-horizontal  "\e$B!<\e(B" "*-")    ; "\e$B!]\e(B"
 
 (define-its-state-machine its-kata-map
-  "roma-kata" "\e$B%"\e(B" 'Japanese
+  "roma-kata" "\e$B%"\e(B" Japanese
   "Map for Romaji-Katakana translation. (Japanese)"
 
   (defconst its-zenkaku-escape "Z")  ;; Escape character to Zenkaku inputs
@@ -72,12 +72,9 @@
   (dolist (q1 '("b" "m" "p"))
     (its-defrule (concat "m" q1) "\e$B%s\e(B" -1))
 
-  (its-defrule "N" "\e$B%s\e(B")
-
-  (let ((state (its-goto-state "n" nil t)))
-    (its-make-next-state state -1 "n" "\e$B%s\e(B")
-    (its-make-next-state state ?' "n" "\e$B%s\e(B")
-    (its-defrule-otherwise state "\e$B%s\e(B"))
+  (its-defrule* "n"  "\e$B%s\e(B")
+  (its-defrule  "n'" "\e$B%s\e(B")
+  (its-defrule  "N"  "\e$B%s\e(B")
 
   (let ((small '"x" ))
     (its-defrule (concat small "a") "\e$B%!\e(B")
@@ -440,8 +437,7 @@
 
 (define-its-state-machine-append its-kata-map
   (if its-kata-enable-double-n
-      (its-defrule "nn" "\e$B%s\e(B")
-    (its-defrule "nn" "\e$B%s\e(B" -1))
+      (its-defrule "nn" "\e$B%s\e(B"))
 
   (its-defrule "-" its-kata-horizontal)
   (its-defrule "[" its-kata-open-bracket)