*** empty log message ***

[m17n/m17n-lib-cs.git] / input.txt

diff --git a/input.txt b/input.txt
index 3317850..5408c20 100644 (file)
--- a/input.txt
+++ b/input.txt
@@ -11,12 +11,12 @@ INPUT-METHOD =
   STATELIST ?
   '</input-method>'
 
-VARLIST = '<variable-list>' DEFVAR * '</variable-list>'
-CMDLIST = '<command-list>' COMMAND * '</command-list>'
-MODULELIST = '<module-list>' MODULE * '</module-list>'
-MACROLIST = '<macro-list>' DEFUN * '</macro-list>'
-MAPLIST = '<map-list>' MAP * '</map-list>'
-STATELIST = '<state-list>' STATE * '</state-list>'
+VARLIST = '<variable-list>' DEFVAR + '</variable-list>'
+CMDLIST = '<command-list>' COMMAND + '</command-list>'
+MODULELIST = '<module-list>' MODULE + '</module-list>'
+MACROLIST = '<macro-list>' DEFUN + '</macro-list>'
+MAPLIST = '<map-list>' MAP + '</map-list>'
+STATELIST = '<state-list>' STATE + '</state-list>'
 
 MODULE = '<module>' DEFUN-NAME + '</module>'
 DEFUN-NAME = '<defun fname="' FNAME '"/>'
@@ -27,15 +27,19 @@ COMMAND
     KEYSEQ *
     '</defcmd>'
 
-MAP = '<map id="' MAPNAME '">' RULE * '</map>'
+MAP = '<map mname="' MAPNAME '">' RULE * '</map>'
 
 RULE = '<rule>' [ KEYSEQ | CMDREF ] FUNCALL * '</rule>'
 
 CMDREF = '<command cname="' COMMANDNAME '"/>'
 
-STATE = '<state id="' STATENAME '">' BRANCH * '</state>'
+STATE = '<state sname="' STATENAME '">' HOOK BRANCH CATCHALL * '</state>'
 
-BRANCH = ...
+HOOK = '<state-hook>' FUNCALL + '</state-hook>'
+
+BRANCH = '<branch mname="' MAPNAME '">' FUNCALL * '</branch>'
+
+CATCHALL = '<catch-all-branch>' FUNCALL * '</catch-all-branch>'
 
 TERM += MIM-TERM
 PREDEFINED += MIM-PREDEFEIND