From 3e7e06500a2fa28d0b4ccabab58963767021ad69 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Wed, 17 Sep 2008 12:36:45 +0000
Subject: [PATCH] *** empty log message ***

---
 FORMATS/IM.ja.txt |   19 ++++++++-----------
 FORMATS/IM.txt    |   25 +++++++++++--------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/FORMATS/IM.ja.txt b/FORMATS/IM.ja.txt
index 10a28a5..0640c69 100644
--- a/FORMATS/IM.ja.txt
+++ b/FORMATS/IM.ja.txt
@@ -128,13 +128,12 @@ MACRO-ACTION ::= ACTION
 
 TAGS ::= `(` LANGUAGE NAME EXTRA-ID ? `)`
 
-MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' MACRO-NAME ? ')'
+MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' ')'
 
 @endverbatim
 
-@c MACRO-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é@c
-MACRO-NAME ¤Ç»ØÄꤵ¤ì¤¿¥Þ¥¯¥í¤òÆɤ߹þ¤à¡£@c MACRO-NAME ¤¬Í¿¤¨¤é¤ì¤Ê¤¤¾ì
-¹ç¤Ï¡¢¤½¤ÎÆþÎϥ᥽¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥Þ¥¯¥í¤òÆɤ߹þ¤à¡£
+@c MACRO-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é
+¤¹¤Ù¤Æ¤Î¥Þ¥¯¥í¤òÆɤ߹þ¤à¡£
 
 @verbatim
 MAP-LIST ::= MAP-INCLUSION ? '(' 'map' MAP * ')' MAP-INCLUSION ?
@@ -147,7 +146,7 @@ RULE ::= '(' KEYSEQ MAP-ACTION * ')'
 
 KEYSEQ ::= MTEXT | '(' [ SYMBOL | INTEGER ] * ')'
 
-MAP-INCLUSION ::= '(' 'include' TAGS 'map' MAP-NAME ? ')'
+MAP-INCLUSION ::= '(' 'include' TAGS 'map' ')'
 
 @endverbatim
 
@@ -175,9 +174,8 @@ MTEXT 
 
 @c KEYSEQ ÄêµÁÃæ¤Î @c INTEGER ¤Ï¡¢Í­¸ú¤Êʸ»ú¥³¡¼¥É¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
 
-@c MAP-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é@c
-MAP-NAME ¤Ç»ØÄꤵ¤ì¤¿¥Þ¥Ã¥×¤òÆɤ߹þ¤à¡£@c MAP-NAME ¤¬Í¿¤¨¤é¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢
-¤½¤ÎÆþÎϥ᥽¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥Þ¥Ã¥×¤òÆɤ߹þ¤à¡£
+@c MAP-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é
+¤¹¤Ù¤Æ¤Î¥Þ¥Ã¥×¤òÆɤ߹þ¤à¡£
 
 @verbatim
 MAP-ACTION ::= ACTION
@@ -214,9 +212,8 @@ STATE-INCLUSION ::= '(' 'include' TAGS 'state' STATE-NAME ? ')'
 ÆþÎϥ᥽¥Ã¥É¤¬¤½¤ìñÂΤÇÍøÍѤµ¤ì¤ë¤³¤È¤¬¤Ê¤¯¾ï¤Ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤ËÆÉ
 ¤ß¹þ¤Þ¤ì¤ÆÍѤ¤¤é¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢@c STATE-LIST ¤Ï¾Êά¤Ç¤­¤ë¡£
 
-@c STATE-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é@c
-STATE-NAME ¤Ç»ØÄꤵ¤ì¤¿¥¹¥Æ¡¼¥È¤òÆɤ߹þ¤à¡£@c STATE-NAME ¤¬Í¿¤¨¤é¤ì¤Ê¤¤
-¾ì¹ç¤Ï¡¢¤½¤ÎÆþÎϥ᥽¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥¹¥Æ¡¼¥È¤òÆɤ߹þ¤à¡£
+@c STATE-INCLUSION ¤Ï¡¢@c TAGS ¤Ç»ØÄꤵ¤ì¤ë¾¤ÎÆþÎϥ᥽¥Ã¥É¤«¤é
+¤¹¤Ù¤Æ¤Î¥¹¥Æ¡¼¥È¤òÆɤ߹þ¤à¡£
 
 @c STATE-TITLE-TEXT ¤Ï¡¢¤â¤·»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢ÆþÎϥ᥽¥Ã¥É¤¬¤³¤Î
 ¾õÂ֤ˤ¢¤ë»þ¥¹¥¯¥ê¡¼¥ó¾å¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È¤Ç¤¢¤ë¡£¾Êά¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï
diff --git a/FORMATS/IM.txt b/FORMATS/IM.txt
index ba95b14..56fee35 100644
--- a/FORMATS/IM.txt
+++ b/FORMATS/IM.txt
@@ -135,16 +135,15 @@ MACRO-ACTION ::= ACTION
 
 TAGS ::= `(` LANGUAGE NAME EXTRA-ID ? `)`
 
-MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' MACRO-NAME ? ')'
+MACRO-INCLUSION ::= '(' 'include' TAGS 'macro' ')'
 
 @endverbatim
 
-@c MACRO-INCLUSION includes macros specified by @c MACRO-NAME, from
-another input method specified by @c TAGS.  When @c MACRO-NAME is not
-given, all macros from the input method are included.
+@c MACRO-INCLUSION includes macros from another input method specified by @c TAGS. 
 
-@verbatim
-MAP-LIST ::= MAP-INCLUSION ? '(' 'map' MAP * ')' MAP-INCLUSION ?
+
+@verbatim MAP-LIST ::= MAP-INCLUSION ? '(' 'map' MAP * ')'
+MAP-INCLUSION ?
 
 MAP ::= '(' MAP-NAME RULE * ')'
 
@@ -154,7 +153,7 @@ RULE ::= '(' KEYSEQ MAP-ACTION * ')'
 
 KEYSEQ ::= MTEXT | '(' [ SYMBOL | INTEGER ] * ')'
 
-MAP-INCLUSION ::= '(' 'include' TAGS 'map' MAP-NAME ? ')'
+MAP-INCLUSION ::= '(' 'include' TAGS 'map' ')'
 
 @endverbatim
 
@@ -185,9 +184,8 @@ with shift with meta with hyper" is @c (M-H-A) .
 @c INTEGER in the definition of @c KEYSEQ must be a valid character
 code.
 
-@c MAP-INCLUSION includes maps specified by @c MAP-NAME, from another
-input method specified by @c TAGS.  When @c MAP-NAME is not given, all
-maps from the input method are included.
+@c MAP-INCLUSION includes maps from another input method specified by
+@c TAGS. 
 
 @verbatim
 MAP-ACTION ::= ACTION
@@ -218,16 +216,15 @@ BRANCH ::= '(' MAP-NAME BRANCH-ACTION * ')'
 	   | '(' nil BRANCH-ACTION * ')'
 	   | '(' t BRANCH-ACTION * ')'
 
-STATE-INCLUSION ::= '(' 'include' TAGS 'state' STATE-NAME ? ')'
+STATE-INCLUSION ::= '(' 'include' TAGS 'state' ')'
 
 @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 specified by @c STATE-NAME, from
-another input method specified by @c TAGS.  When @c STATE-NAME is not
-given, all states from the input method are included.
+@c STATE-INCLUSION includes states from
+another input method specified by @c TAGS. 
 
 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