From: nisikimi <nisikimi>
Date: Wed, 14 May 2008 05:59:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-5-2~34
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0eb396dbd3e3e14e6d2e73f84c3de7216737e06;p=m17n%2Fm17n-db.git

*** empty log message ***
---

diff --git a/FORMATS/IM.txt b/FORMATS/IM.txt
index ce72f93..b67d3d7 100644
--- a/FORMATS/IM.txt
+++ b/FORMATS/IM.txt
@@ -27,7 +27,7 @@ INPUT-METHOD ::=
     IM-DECLARATION ? DESCRIPTION ? VARIABLE-LIST ? COMMAND-LIST ?
     TITLE MAP-LIST MACRO-LIST ? MODULE-LIST ? STATE-LIST
 
-IM-DECLARATION ::= '(' 'input-method' LANGUAGE NAME VERSION ? ')'
+IM-DECLARATION ::= '(' 'input-method' LANGUAGE NAME EXTRA-ID ? VERSION ? ')'
 VERSION ::= '(' 'version' VERSION-NUMBER ')'
 DESCRIPTION ::= '(' 'description' [ MTEXT-OR-GETTEXT | nil] ')'
 VARIABLE-LIST ::= '(' 'variable' VARIABLE-DECLARATION * ')'
@@ -45,6 +45,7 @@ MTEXT-OR-GETTEXT ::=
 
 LANGUAGE ::= SYMBOL
 NAME ::= SYMBOL
+EXTRA-ID ::= SYMBOL
 VERSION ::= MTEXT
 IM-DESCRIPTION ::= MTEXT
 VAR-NAME ::= SYMBOL
@@ -61,6 +62,13 @@ TITLE-TEXT ::= MTEXT
 @c IM-DECLARATION specifies the language and name of this input
 method.
 
+When @c LANGUAGE is @c t, the use of the input method is not limited
+to one language.
+
+When @c NAME is @c nil, the input method is not standalone, but
+is expected to be used in other input methods.  In such cases,
+@EXTRA-ID is required to identify the input method.
+
 @c VERSION specifies the required minimum version number of the m17n
 library.  The format is "XX.YY.ZZ" where XX is a major version
 number, YY is a minor version number, and ZZ is a patch level.
@@ -457,9 +465,9 @@ SET ::= '(' CMD SYMBOL1 EXPRESSION ')'
 
 CMD ::= 'set' | 'add' | 'sub' | 'mul' | 'div'
 
-EXPRESSION ::= INTEGER | SYMBOL2 | '(' OPERAND EXPRESSION * ')'
+EXPRESSION ::= INTEGER | SYMBOL2 | '(' OPERATOR EXPRESSION * ')'
 
-OPERAND ::= '+' | '-' | '*' | '/' | '|' | '&' | '!'
+OPERATOR ::= '+' | '-' | '*' | '/' | '|' | '&' | '!'
             | '=' | '<' | '>' | '<=' | '>='
 
 @endverbatim