*** empty log message ***

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

diff --git a/input.txt b/input.txt
index 9db4123..628c73a 100644 (file)
--- a/input.txt
+++ b/input.txt
@@ -11,6 +11,12 @@ INPUT-METHOD =
   STATELIST ?
   '</input-method>'
 
+TAGS = '<tags>' LANG NAME EXTRA ? '</tags>'
+
+LANG = '<language>' LANGNAME '</language>'
+NAME = '<name>' NAME '</name>'
+EXTRA = '<extra-id>' EXTRANAME '</extra-id>'
+
 VARLIST = '<variable-list>' DEFVAR + '</variable-list>'
 CMDLIST = '<command-list>' COMMAND + '</command-list>'
 MODULELIST = '<module-list>' MODULE + '</module-list>'
@@ -33,7 +39,10 @@ RULE = '<rule>' [ KEYSEQ | CMDREF ] FUNCALL * '</rule>'
 
 CMDREF = '<command cname="' COMMANDNAME '"/>'
 
-STATE = '<state sname="' STATENAME '">' [ HOOK BRANCH CATCHALL ] * '</state>'
+STATE = '<state sname="' STATENAME '">' 
+        TITLE ? 
+       [ HOOK BRANCH CATCHALL ] * 
+       '</state>'
 
 HOOK = '<state-hook>' FUNCALL + '</state-hook>'
 
@@ -44,7 +53,7 @@ CATCHALL = '<catch-all-branch>' FUNCALL * '</catch-all-branch>'
 TERM += MIM-TERM
 PREDEFINED += MIM-PREDEFEIND
 
-MIM-TERM = KEYSEQ | MARKER 
+MIM-TERM = KEYSEQ | MARKER | SELECTOR
 
 KEYSEQ = '<keyseq>' [ INTTERM | STRTERM | SYMTERM ] + '</keyseq>'
 KEYSEQTERM = KEYSEQ | VAR (value is KEYSEQ) | FUNCALL (return KEYSEQ)
@@ -61,9 +70,9 @@ MIM-PREDEFINED
     | SHIFT | SHIFTBACK
 
 INSERT = '<insert>' [ INTTERM | STRTERM ] '</insert>'
-CANDIDATES = '<insert-candidates>' [ STRTERM | LISTTERM ] '</insert-candiates>'
+CANDIDATES = '<insert-candidates>' [ STRTERM | LISTTERM ] + '</insert-candiates>'
 DELETE = '<delete>' [ MARKERTERM | INTTERM ] '</delete>'
-SELECT = '<select>' [ SELECTTERM | INTTERM ] '</select>'
+SELECT = '<select>' [ SELECTORTERM | INTTERM ] '</select>'
 SHOW = '<show-candidates/>'
 HIDE = '<hide-candidates/>'
 MOVE = '<move>' [ MARKERTERM | INTTERM ] '</move>'