Add a number of characters for Unicode 5.1.

[m17n/m17n-db.git] / FORMATS / IM.ja.txt

diff --git a/FORMATS/IM.ja.txt b/FORMATS/IM.ja.txt
index f353e19..e2149bf 100644 (file)
--- a/FORMATS/IM.ja.txt
+++ b/FORMATS/IM.ja.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 ')'
+IM-DECLARATION ::= '(' 'input-method' LANGUAGE NAME [ '(version' VERSION ')'] ')'
 DESCRIPTION ::= '(' 'description' [ MTEXT-OR-GETTEXT | nil] ')'
 VARIABLE-LIST ::= '(' 'variable' VARIABLE-DECLARATION * ')'
 COMMAND-LIST ::= '(' 'command' COMMAND-DECLARATION * ')'
@@ -44,6 +44,7 @@ MTEXT-OR-GETTEXT ::=
 
 LANGUAGE ::= SYMBOL
 NAME ::= SYMBOL
+VERSION ::= MTEXT
 VAR-NAME ::= SYMBOL
 VAR-DESCRIPTION ::= MTEXT
 VALUE ::= MTEXT | SYMBOL | INTEGER
@@ -57,6 +58,10 @@ TITLE-TEXT ::= MTEXT
 
 @c IM-DECLARATION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤Î¸À¸ì¤È̾Á°¤ò»ØÄꤹ¤ë¡£
 
+@c VERSION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤¬É¬ÍפȤ¹¤ë m17n ¥é¥¤¥Ö¥é¥ê¤ÎºÇ¾®¥Ð¡¼¥¸¥ç
+¥ó¤ò»ØÄꤹ¤ë¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï "XX.YY.ZZ" ¤Ç¤¢¤ê¡¢XX ¤Ï¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç
+¥ó¡¢ YY ¤Ï¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¡¢ZZ ¤Ï¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤òɽ¤¹¡£
+
 @c DESCRIPTION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤ÎÀâÌÀ¤ò @c MTEXT-OR-GETTEXT ¤Ç»ØÄꤹ
 ¤ë¡£¤â¤·¤³¤ì¤¬£²ÈÖÌܤηÁ¼°¤ò¼è¤Ã¤Æ¤¤¤ì¤Ð¡¢ @c MTEXT ¤Ï¸½ºß¤Î¥í¥±¡¼¥ë¤Ë
 ½¾¤Ã¤Æ "gettext" ¤Ë¤è¤Ã¤ÆËÝÌõ¤µ¤ì¤ë¡ÊËÝÌõʸ¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡Ë¡£
@@ -92,8 +97,16 @@ KEYSEQ ::= MTEXT | '(' [ SYMBOL | INTEGER ] * ')'
 ¤¬¤¿¤È¤¨¤ÐÀ¾¥è¡¼¥í¥Ã¥ÑÍÑ¥­¡¼¥Ü¡¼¥É¤ò»È¤¦¤³¤È¤òÁÛÄꤷ¤¿¤â¤Î¤Ç¤¢¤ì¤Ð¡¢@c
 MTEXT ¤Ï Latin-1 ʸ»ú¤ò´Þ¤ó¤Ç¤â¤è¤¤¡£
 
-@c KEYSEQ ÄêµÁÃæ¤Î @c SYMBOL ¤Ï¡¢´Ø¿ô minput_event_to_key () ¤ÎÌá¤êÃÍ
-¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+@c KEYSEQ ÄêµÁÃæ¤Î @c SYMBOL ¤Ï¡¢´Ø¿ô minput_event_to_key () ¤ÎÌá¤êÃͤÇ
+¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£X ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Î¸µ¤Ç¤Ï¡¢ @c xev ¥³¥Þ¥ó¥É¤òÍѤ¤
+¤ÆÃͤò´Êñ¤Ë¥Á¥§¥Ã¥¯¤Ç¤­¤ë¡£¤¿¤È¤¨¤Ð¡¢ ¥ê¥¿¡¼¥ó¥­¡¼¡¢¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¥­¡¼¡¢
+¥­¡¼¥Ñ¥Ã¥É¤Î0¤Î¥­¡¼¤Ê¤É¤Ï¡¢¤½¤ì¤¾¤ì@c (Return) , @c (BackSpace) , @c
+(KP_0) ¤È¤·¤Æ¤¢¤é¤ï¤µ¤ì¤ë¡£¥·¥Õ¥È¡¢¥³¥ó¥È¥í¡¼¥ë¡¢¥á¥¿¡¢¥¢¥ë¥È¡¢¥¹¡¼¥Ñ¡¼¡¢
+¥Ï¥¤¥Ñ¡¼¤â²¡¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤ì¤¾¤ìS- , C- , M- , A- , s- , H- ¤¬
+Á°¤Ë¤³¤Î½ç¤ËÃÖ¤«¤ì¤ë¡£¤·¤¿¤¬¤Ã¤Æ "¥ê¥¿¡¼¥ó¥­¡¼¤ò¥·¥Õ¥È¤·¤Æ¥á¥¿¤·¤Æ¥Ï¥¤
+¥Ñ¡¼¤·¤¿¤â¤Î" ¤Ï@c (S-M-H-Return) ¤Ç¤¢¤ë¡£"a ¤ò¥·¥Õ¥È" ¤«¤é "z ¤ò¥·¥Õ¥È
+" ¤Þ¤Ç¤Ï¡¢Ã±¤Ë A ¤«¤é Z ¤È¤·¤Æɽ¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¡£¤·¤¿¤¬¤Ã¤Æ¡¢ "a ¤ò¥·
+¥Õ¥È¤·¤Æ¥á¥¿¤·¤Æ¥Ï¥¤¥Ñ¡¼¤·¤¿¤â¤Î" ¤Ï @c (M-H-A) ¤È¤Ê¤ë¡£
 
 @c KEYSEQ ÄêµÁÃæ¤Î @c INTEGER ¤Ï¡¢Í­¸ú¤Êʸ»ú¥³¡¼¥É¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
 
@@ -101,14 +114,14 @@ MTEXT 
 MAP-ACTION ::= ACTION
 
 ACTION ::= INSERT | DELETE | SELECT | MOVE | MARK
-           | SHOW | HIDE | PUSHBACK | UNDO | UNHANDLE | SHIFT | CALL
+           | SHOW | HIDE | PUSHBACK | POP | UNDO | UNHANDLE | SHIFT | CALL
           | SET | IF | COND | '(' MACRO-NAME ')'
 PREDEFINED-SYMBOL ::=
     '@0' | '@1' | '@2' | '@3' | '@4'
     | '@5' | '@6' | '@7' | '@8' | '@9'
     | '@<' | '@=' | '@>' | '@-' | '@+' | '@[' | '@]'
-    | '@@
-    | '@-N | '@+N
+    | '@@'
+    | '@-0' | '@-N' | '@+N'
 @endverbatim
 @verbatim
 MACRO-LIST ::= '(' 'macro' MACRO * ')'
@@ -150,9 +163,9 @@ BRANCH ::= '(' MAP-NAME BRANCH-ACTION * ')'
           | '(' t BRANCH-ACTION * ')'
 @endverbatim
 
-@STATE-TITLE-TEXT ¤Ï¡¢¤â¤·»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¤¬¤³¤Î¾õ
-Â֤ˤ¢¤ë»þ¥¹¥¯¥ê¡¼¥ó¾å¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È¤Ç¤¢¤ë¡£¾Êά¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï
-@STATE-TITLE-TEXT ¤¬ÍѤ¤¤é¤ì¤ë¡£
+@c STATE-TITLE-TEXT ¤Ï¡¢¤â¤·»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¤¬¤³¤Î
+¾õÂ֤ˤ¢¤ë»þ¥¹¥¯¥ê¡¼¥ó¾å¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È¤Ç¤¢¤ë¡£¾Êά¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï
+@c TITLE-TEXT ¤¬ÍѤ¤¤é¤ì¤ë¡£
 
 @c BRANCH ¤ÎÂè°ì¤Î·Á¼°¤Ç¤Ï¡¢@c MAP-NAME ¤Ï @c MAP ¤Ë¸½¤ï¤ì¤ë¤â¤Î¤Ç¤Ê¤¯
 ¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢@c MAP-NAME ¤Î @c KEYSEQ ¤Î°ì¤Ä¤Ë¹çÃפ¹¤ë¥­¡¼Îó
@@ -242,19 +255,25 @@ MARK 
 °Ê²¼¤Ï¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È½èÍý¤ËÍѤ¤¤é¤ì¤ë¡£
 
 <ul>
+<li> @c @@-0
+
+¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ì¤Ð -1 ¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð -2 ¡£
+
 <li> @c @@-N
 
-¤³¤³¤Ç @c N ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£¤³¤ÎÊÑ¿ô¤ÎÃͤϡ¢¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È¤Î¸½ºß
-¤Î caret ¤«¤é¿ô¤¨¤Æ @c N ¤À¤±Á°¤Î°ÌÃÖ¤Îʸ»ú¤Ç¤¢¤ë¡£@c delete ¥¢¥¯¥·¥ç¥ó¤Î
-°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤¿¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤Ï¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È¤ÎÃæ¤ÎÀè¹Ô¤¹¤ë²¿
-ʸ»ú¤òºï½ü¤¹¤ë¤«¤ò»ØÄꤹ¤ë¡£
+¤³¤³¤Ç @c N ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£¤³¤ÎÊÑ¿ô¤ÎÃͤϡ¢¥×¥ê¥¨¥Ç¥Ã¥ÈÃæ¤Î¸½ºß¤Î°Ì
+ÃÖ¤«¤é @c N ʸ»úÁ°¤Îʸ»ú¤Ç¤¢¤ë¡£¤â¤·¥×¥ê¥¨¥Ç¥£¥Ã¥ÈÃæ¤ÇÀè¹Ô¤¹¤ëʸ»ú¤¬M
+(M<N) ʸ»ú¤·¤«¤Ê¤±¤ì¤Ð¡¢¤½¤ÎÃͤÏÆþÎÏ¥¹¥Ý¥Ã¥È¤«¤é¿ô¤¨¤Æ (N-M) ʸ»úÁ°¤Îʸ
+»ú¤È¤Ê¤ë¡£@c delete ¥¢¥¯¥·¥ç¥ó¤Î°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤¿¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤Ïºï
+½ü¤¹¤ëʸ»ú¿ô¤ò»ØÄꤹ¤ë¡£
 
 <li> @c @@+N
 
-¤³¤³¤Ç @c N ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£¤³¤ÎÊÑ¿ô¤ÎÃͤϡ¢¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È¤Î¸½ºß
-¤Î caret ¤«¤é¿ô¤¨¤Æ @c N ¤À¤±Àè¤Î°ÌÃÖ¤Îʸ»ú¤Ç¤¢¤ë¡£@c delete ¥¢¥¯¥·¥ç¥ó
-¤Î°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤¿¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤Ï¥µ¥é¥¦¥ó¥É¥Æ¥­¥¹¥È¤ÎÃæ¤Î¸å³¤Î²¿
-ʸ»ú¤òºï½ü¤¹¤ë¤«¤ò»ØÄꤹ¤ë¡£
+¤³¤³¤Ç @c N ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£¤³¤ÎÊÑ¿ô¤ÎÃͤϡ¢¥×¥ê¥¨¥Ç¥Ã¥ÈÃæ¤Î¸½ºß¤Î°Ì
+ÃÖ¤«¤é @c N ʸ»ú¸å¤Îʸ»ú¤Ç¤¢¤ë¡£¤â¤·¥×¥ê¥¨¥Ç¥£¥Ã¥ÈÃæ¤Ç¸å³¤¹¤ëʸ»ú¤¬M
+(M<N) ʸ»ú¤·¤«¤Ê¤±¤ì¤Ð¡¢¤½¤ÎÃͤÏÆþÎÏ¥¹¥Ý¥Ã¥È¤«¤é¿ô¤¨¤Æ (N-M) ʸ»ú¸å¤Îʸ
+»ú¤È¤Ê¤ë¡£@c delete ¥¢¥¯¥·¥ç¥ó¤Î°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤¿¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤Ïºï
+½ü¤¹¤ëʸ»ú¿ô¤ò»ØÄꤹ¤ë¡£
 
 </ul>
 
@@ -358,6 +377,13 @@ PUSHBACK :: = '(' 'pushback' INTEGER ')'
 ÂèÆó¤Î·Á¼°¤Ï¡¢@c KEYSEQ Ãæ¤Î¥­¡¼¤ò¥¤¥Ù¥ó¥È¥­¥å¡¼¤Ëº¹¤·Ì᤹¡£
 
 @verbatim
+POP ::= '(' 'pop' ')'
+@endverbatim
+
+¤³¤Î¥¢¥¯¥·¥ç¥ó¤Ï¤Þ¤À½èÍý¤µ¤ì¤Æ¤¤¤Ê¤¤ºÇ½é¤Î¥¤¥Ù¥ó¥È¤ò¥¤¥Ù¥ó¥È¥­¥å¡¼¤«¤é
+¼è¤ê½Ð¤·ÇË´þ¤¹¤ë¡£
+
+@verbatim
 UNDO :: = '(' 'undo' [ INTEGER | SYMBOL ] ')'
 @endverbatim
 
@@ -454,8 +480,6 @@ COND ::= '(' 'cond' [ '(' EXPRESSION ACTION * ') ] * ')'
 ¤³¤Î¥¢¥¯¥·¥ç¥ó¤ÏÂбþ¤¹¤ë @c EXPRESSION ¤¬ 0 ¤Ç¤Ê¤¤Ãͤò¤È¤ëºÇ½é¤Î¥¢¥¯¥·¥ç
 ¥ó @c ACTION ¤ò¼Â¹Ô¤¹¤ë¡£
 
-@ifnot FOR-MAN
-
 @section im-seealso SEE ALSO
 
 @ref mim-list "Input Methods provided by the m17n database",