From: handa Date: Tue, 20 Dec 2005 06:32:16 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: REL-1-3-0~10 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=277d236948414de57c00c4f9f20cba8db30e187f;p=m17n%2Fm17n-db.git *** empty log message *** --- diff --git a/FORMATS/IM.txt b/FORMATS/IM.txt index 05365bd..809c5ec 100644 --- a/FORMATS/IM.txt +++ b/FORMATS/IM.txt @@ -101,7 +101,7 @@ code. MAP-ACTION ::= ACTION ACTION ::= INSERT | DELETE | SELECT | MOVE | MARK - | SHOW | HIDE | PUSHBACK | UNDO | SHIFT | CALL + | SHOW | HIDE | PUSHBACK | UNDO | UNHANDLE | SHIFT | CALL | SET | IF | COND | '(' MACRO-NAME ')' PREDEFINED-SYMBOL ::= @@ -360,6 +360,13 @@ If there's a symbol argument, it must be resolved to an integer number and the number is treated as the actual argument as above. @verbatim +UNHANDLE :: = '(unhandle)' +@endverbatim + +This action commit the current preedit and return the last key as +unhandled. + +@verbatim SHIFT :: = '(' 'shift' STATE-NAME ')' @endverbatim @@ -395,7 +402,8 @@ CMD ::= 'set' | 'add' | 'sub' | 'mul' | 'div' EXPRESSION ::= INTEGER | SYMBOL2 | '(' OPERAND EXPRESSION * ')' -OPERAND ::= '+' | '-' | '*' | '/' | '|' | '&' | '!' | '=' | '<' | '>' +OPERAND ::= '+' | '-' | '*' | '/' | '|' | '&' | '!' + | '=' | '<' | '>' | '<=' | '>=' @endverbatim @@ -420,7 +428,7 @@ If @c CMD is 'div', it divides the value of @c SYMBOL1 by the value of @verbatim IF ::= '(' CONDITION ACTION-LIST1 ACTION-LIST2 ')' -CONDITION ::= [ '=' | '<' | '>' ] EXPRESSION1 EXPRESSION2 +CONDITION ::= [ '=' | '<' | '>' | '<=' | '>=' ] EXPRESSION1 EXPRESSION2 ACTION-LIST1 ::= '(' ACTION * ')' diff --git a/icons/Makefile.am b/icons/Makefile.am index 7eec1fc..9173f06 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -22,5 +22,6 @@ # 02111-1307, USA. pkgdata_DATA = @ICONS@ - pkgdatadir=$(datadir)/m17n/icons + +EXTRA_DIST = @ICONS@