egg-980703.

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

diff --git a/its/hankata.el b/its/hankata.el
index e701c1a..897ebc1 100644 (file)
--- a/its/hankata.el
+++ b/its/hankata.el
@@ -44,7 +44,7 @@
 (defvar its-han-kata-horizontal  "\e(I0\e(B" "*-")    ; "\e$B!]\e(B"
 
 (define-its-state-machine its-han-kata-map
-  "roma-han-kata" "\e(I11\e(B" "Japanese"
+  "roma-han-kata" "\e(I11\e(B" Japanese
   "Map for Romaji-Hankaku-Katakana translation. (Japanese)"
 
   (defconst its-hankaku-escape "~")  ;; Escape character to Hankaku inputs
@@ -64,12 +64,9 @@
   (dolist (q1 '("b" "m" "p"))
     (its-defrule (concat "m" q1) "\e(I]\e(B" -1))
 
-  (its-defrule "N" "\e(I]\e(B")
-
-  (let ((state (its-goto-state "n" nil t)))
-    (its-make-next-state state -1 "n" "\e(I]\e(B")
-    (its-make-next-state state ?' "n" "\e(I]\e(B")
-    (its-defrule-otherwise state "\e(I]\e(B"))
+  (its-defrule* "n"  "\e(I]\e(B")
+  (its-defrule  "n'" "\e(I]\e(B")
+  (its-defrule  "N"  "\e(I]\e(B")
 
   (let ((small '"x" ))
     (its-defrule (concat small "a") "\e(I'\e(B")
@@ -277,8 +274,7 @@
 
 (define-its-state-machine-append its-han-kata-map
   (if its-han-kata-enable-double-n
-      (its-defrule "nn" "\e(I]\e(B")
-    (its-defrule "nn" "\e(I]\e(B" -1))
+      (its-defrule "nn" "\e(I]\e(B"))
 
   (its-defrule "-" its-han-kata-horizontal)
   (its-defrule "[" its-han-kata-open-bracket)