From 1e2e7748f8290e0f6fdd63ae4b14c011d4d27d7d Mon Sep 17 00:00:00 2001 From: nisikimi Date: Mon, 22 Sep 2008 06:26:56 +0000 Subject: [PATCH] *** empty log message *** --- FORMATS/IM.ja.txt | 17 +++++++++-------- FORMATS/IM.txt | 20 ++++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/FORMATS/IM.ja.txt b/FORMATS/IM.ja.txt index 0640c69..0b06da5 100644 --- a/FORMATS/IM.ja.txt +++ b/FORMATS/IM.ja.txt @@ -128,12 +128,12 @@ MACRO-ACTION ::= ACTION TAGS ::= `(` LANGUAGE NAME EXTRA-ID ? `)` -MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' ')' +MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' MACRO-NAME ? ')' @endverbatim -@c MACRO-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é -¤¹¤Ù¤Æ¤Î¥Þ¥¯¥í¤òÆɤ߹þ¤à¡£ +@c MACRO-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é¥Þ¥¯¥í¤ò +Æɤ߹þ¤à¡£@c MACRO-NAME ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢Á´¤Æ¤Î¥Þ¥¯¥í¤òÆɤࡣ @verbatim MAP-LIST ::= MAP-INCLUSION ? '(' 'map' MAP * ')' MAP-INCLUSION ? @@ -146,7 +146,7 @@ RULE ::= '(' KEYSEQ MAP-ACTION * ')' KEYSEQ ::= MTEXT | '(' [ SYMBOL | INTEGER ] * ')' -MAP-INCLUSION ::= '(' 'include' TAGS 'map' ')' +MAP-INCLUSION ::= '(' 'include' TAGS 'map' MAP-NAME ? ')' @endverbatim @@ -174,8 +174,8 @@ MTEXT @c KEYSEQ ÄêµÁÃæ¤Î @c INTEGER ¤Ï¡¢Í­¸ú¤Êʸ»ú¥³¡¼¥É¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ -@c MAP-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é -¤¹¤Ù¤Æ¤Î¥Þ¥Ã¥×¤òÆɤ߹þ¤à¡£ +@c MAP-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é¥Þ¥Ã¥×¤òÆÉ +¤ß¹þ¤à¡£@c MAP-NAME ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢Á´¤Æ¤Î¥Þ¥Ã¥×¤òÆɤࡣ @verbatim MAP-ACTION ::= ACTION @@ -212,8 +212,9 @@ STATE-INCLUSION ::= '(' 'include' TAGS 'state' STATE-NAME ? ')' ÆþÎϥ᥽¥Ã¥É¤¬¤½¤ìñÂΤÇÍøÍѤµ¤ì¤ë¤³¤È¤¬¤Ê¤¯¾ï¤Ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤ËÆÉ ¤ß¹þ¤Þ¤ì¤ÆÍѤ¤¤é¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢@c STATE-LIST ¤Ï¾Êά¤Ç¤­¤ë¡£ -@c STATE-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é -¤¹¤Ù¤Æ¤Î¥¹¥Æ¡¼¥È¤òÆɤ߹þ¤à¡£ +@c STATE-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é¥¹¥Æ¡¼¥È +¤òÆɤ߹þ¤à¡£@c STATE--NAME ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¤¹¤Ù¤Æ¤Î¥¹¥Æ¡¼¥È¤òÆÉ +¤à¡£ @c STATE-TITLE-TEXT ¤Ï¡¢¤â¤·»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢ÆþÎϥ᥽¥Ã¥É¤¬¤³¤Î ¾õÂ֤ˤ¢¤ë»þ¥¹¥¯¥ê¡¼¥ó¾å¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È¤Ç¤¢¤ë¡£¾Êά¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï diff --git a/FORMATS/IM.txt b/FORMATS/IM.txt index 56fee35..faeff2f 100644 --- a/FORMATS/IM.txt +++ b/FORMATS/IM.txt @@ -135,12 +135,13 @@ MACRO-ACTION ::= ACTION TAGS ::= `(` LANGUAGE NAME EXTRA-ID ? `)` -MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' ')' +MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' MACRO-NAME ? ')' @endverbatim -@c MACRO-INCLUSION includes macros from another input method specified by @c TAGS. - +@c MACRO-INCLUSION includes macros from another input method specified +by @c TAGS. When @c MACRO-NAME is not given, all macros from the +input method are included. @verbatim MAP-LIST ::= MAP-INCLUSION ? '(' 'map' MAP * ')' MAP-INCLUSION ? @@ -153,7 +154,7 @@ RULE ::= '(' KEYSEQ MAP-ACTION * ')' KEYSEQ ::= MTEXT | '(' [ SYMBOL | INTEGER ] * ')' -MAP-INCLUSION ::= '(' 'include' TAGS 'map' ')' +MAP-INCLUSION ::= '(' 'include' TAGS 'map' MAP-NAME ? ')' @endverbatim @@ -185,7 +186,9 @@ with shift with meta with hyper" is @c (M-H-A) . code. @c MAP-INCLUSION includes maps from another input method specified by -@c TAGS. +@c TAGS. When @c MAP-NAME is not given, all maps from the input method +are included. + @verbatim MAP-ACTION ::= ACTION @@ -216,15 +219,16 @@ BRANCH ::= '(' MAP-NAME BRANCH-ACTION * ')' | '(' nil BRANCH-ACTION * ')' | '(' t BRANCH-ACTION * ')' -STATE-INCLUSION ::= '(' 'include' TAGS 'state' ')' +STATE-INCLUSION ::= '(' 'include' TAGS 'state' STATE-NAME ? ')' @endverbatim When an input system is never standalone and always included in another system, @c STATE-LIST can be omitted. -@c STATE-INCLUSION includes states from -another input method specified by @c TAGS. +@c STATE-INCLUSION includes states from another input method specified +by @c TAGS. When @c STATE-NAME is not given, all states from the input +method are included. The optional @c STATE-TITLE-TEXT specifies a title text displayed on the screen when the input method is in this state. If @c -- 1.7.10.4