Merge from origin/emacs-24

[gnu-emacs] / leim / CXTERM-DIC / TONEPY.tit

diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index a93bf9dcb6467b7d3b651219b0987b2215d2c3b1..4471222204703a9f570680a9e0df009830a64fc2 100644 (file)
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -1,9 +1,29 @@
+# Header added for Emacs -*- coding: euc-china -*-
+#
+# This file is included in the directory contrib/clients/cxterm of the
+# distribution of X11R6.  As the file itself doesn't contain copyright
+# and license notices, the following statements in the section 6 of
+# the file .../cxterm/README covers it.
+#
+# X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+# X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+# 
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose is hereby granted without fee,
+# provided that this entire copyright and permission notice appear
+# in all such copies, and that the name of the authors may not be
+# used to endorse or promote products derived from this material
+# without specific prior written permission.  The authors make no
+# representations about the suitability of this software for any
+# purpose.  It is provided "as is" without express or implied warranty.
+#
+# End of header added for Emacs
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:        GB
-MULTICHOICE:   YES
-PROMPT:        ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë£ 
+AUTOSELECT:    NO
+PROMPT:        ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë\040
 #
 COMMENT        ´øµ÷Æ´Òô·½°¸
 COMMENT
@@ -11,6 +31,8 @@ COMMENT СдӢ
 COMMENT Òôµ÷ÓÃÊý×Ö±íʾ£¬ 12345 ·Ö±ð´ú±íÒõƽ¡¢Ñôƽ¡¢ÉÏÉù¡¢ÏÂÉù¼°ÇáÉù
 # define keys
 VALIDINPUTKEY: 12345:abcdefghijklmnopqrstuvwxyz
+WILDCARDKEY:   *
+WILDCHARKEY:   ?
 SELECTKEY:     1\040
 SELECTKEY:     2
 SELECTKEY:     3
@@ -2097,5 +2119,3 @@ zuo2      
 zuo3   ´é×ó×ô
 zuo4   Ôä×õ×ö×÷×ø×ùÚèßòâôëÑìñõ¡
 zuo5   
-
-# arch-tag: 6a2668ac-399a-4504-bb7a-5c641cb8e0ef