X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-lib-cs.git;a=blobdiff_plain;f=input.txt;h=6537e65ef2adff3e7ddb8521141b554708c04de4;hp=afb1483e8b7263e80557abfbc64041bc156572f1;hb=HEAD;hpb=9f1a256ace369fa1b3444485575eb667bf7922fb

diff --git a/input.txt b/input.txt
index afb1483..6537e65 100644
--- a/input.txt
+++ b/input.txt
@@ -24,7 +24,7 @@ MACROLIST = '<macro-list>' DEFUN + '</macro-list>'
 MAPLIST = '<map-list>' MAP + '</map-list>'
 STATELIST = '<state-list>' STATE + '</state-list>'
 
-MODULE = '<module>' DEFUN-NAME + '</module>'
+MODULE = '<module id="' MODULENAME '">' DEFUN-NAME + '</module>'
 DEFUN-NAME = '<defun fname="' FNAME '"/>'
 
 COMMAND
@@ -61,16 +61,16 @@ KEYSEQTERM = KEYSEQ | VAR (value is KEYSEQ) | FUNCALL (return KEYSEQ)
 MARKER = '<marker>' STRING '</marker>'
 MARKERTERM = MARKER | VAR (value is MARKER) | FUNCALL (return MARKER)
 
-SELECTOR = '<selector>' STRING '</selector>'
+SELECTOR = '<selector>' "@..." '</selector>'
 SELECTORTERM = SELECTOR | VAR (value is SELECTOR) | FUNCALL (return SELECTOR)
 
 MIM-PREDEFINED
   = INSERT | CANDIDATES | DELETE | SELECT | SHOW | HIDE
     | MARK | MOVE | PUSHBACK | POP | UNDO | COMMIT | UNHANDLE
-    | SHIFT | SHIFTBACK
+    | SHIFT | SHIFTBACK | CHAR-AT | KEY-COUNT | SURROUNDING-TEXT-FLAG
 
 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>' [ SELECTORTERM | INTTERM ] '</select>'
 SHOW = '<show-candidates/>'
@@ -84,3 +84,11 @@ COMMIT = '<commit/>'
 UNHANDLE = '<unhandle/>'
 SHIFT = '<shift>' SYMTERM '</shift>'
 SHIFTBACK = '<shiftback/>'
+CHAR-AT = '<char-at>' MARKERTERM '</char-at>'
+  => <integer>C</integer>, where C is the character in the preedit text
+     or the surrounding text at the postion specified by MARKERTERM.
+KEY-COUNT = '<key-count/>'
+  => <integer>N</integer>, where N is the number of currently handled keys
+SURROUNDING-TEXT-FLAG = '<surrounding-text-flag/>'
+  => <integer>1</integer> if surrounding text handling is supported
+     or <integer>0</integer> if not.