Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[bpt/emacs.git] / lisp / language / chinese.el

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 8bb0451..5be4e34 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,7 +1,6 @@
-;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
+;;; chinese.el --- support for Chinese -*- coding: utf-8; -*-
 
-;; Copyright (C) 2001-2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -111,10 +110,11 @@
                                    (use-cjk-char-width-table 'zh_CN)))
                (exit-function . use-default-char-width-table)
                (coding-system chinese-iso-8bit iso-2022-cn chinese-hz)
-               (coding-priority chinese-iso-8bit chinese-big5 iso-2022-cn)
+               (coding-priority chinese-iso-8bit chinese-gbk chinese-big5
+                                iso-2022-cn)
                (input-method . "chinese-py-punct")
                (features china-util)
-               (sample-text . "Chinese (\e$AVPND\e(B,\e$AFUM(;0\e(B,\e$A::So\e(B)    \e$ADc:C\e(B")
+               (sample-text . "Chinese (中文,普通话,汉语)       你好")
                (documentation . "Support for Chinese GB2312 character set.")
                (tutorial . "TUTORIAL.cn"))
  '("Chinese"))
@@ -126,7 +126,7 @@
 (define-coding-system 'chinese-big5
   "BIG5 8-bit encoding for Chinese (MIME:Big5)"
   :coding-type 'big5
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5)
   :mime-charset 'big5)
 
@@ -141,11 +141,12 @@
                                      (use-cjk-char-width-table 'zh_HK)))
                  (exit-function . use-default-char-width-table)
                  (coding-system chinese-big5 chinese-iso-7bit)
-                 (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit)
+                 (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit
+                                  chinese-gbk)
                  (input-method . "chinese-py-punct-b5")
                  (ctext-non-standard-encodings "big5-0")
                  (features china-util)
-                 (sample-text . "Cantonese (\e$(0GnM$\e(B,\e$(0N]0*Hd\e(B) \e$(0*/=(\e(B, \e$(0+$)p\e(B")
+                 (sample-text . "Cantonese (粵語,廣東話)  早晨, 你好")
                  (documentation . "Support for Chinese Big5 character set.")
                  (tutorial . "TUTORIAL.zh"))
  '("Chinese"))
@@ -153,7 +154,7 @@
 (define-coding-system 'chinese-big5-hkscs
   "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement (MIME:Big5-HKSCS)"
   :coding-type 'charset
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5-hkscs)
   :mime-charset 'big5-hkscs)
 (define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs)
@@ -192,12 +193,12 @@
                          chinese-cns11643-5 chinese-cns11643-6
                          chinese-cns11643-7)
                 (iso639-language . zh)
-                (setup-function . (lambda () 
+                (setup-function . (lambda ()
                                     (use-cjk-char-width-table 'zh_TW)))
                 (exit-function . use-default-char-width-table)
                 (coding-system iso-2022-cn euc-tw)
                 (coding-priority iso-2022-cn euc-tw chinese-big5
-                                 chinese-iso-8bit)
+                                 chinese-iso-8bit chinese-gbk)
                 (features china-util)
                 (input-method . "chinese-cns-quick")
                 ;; Fixme: presumably it won't accept big5 now.
@@ -212,16 +213,16 @@ accepts Big5 for input also (which is then converted to CNS)."))
                             chinese-cns11643-5 chinese-cns11643-6
                             chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
                    (iso639-language . zh)
-                   (setup-function . (lambda () 
+                   (setup-function . (lambda ()
                                        (use-cjk-char-width-table 'zh_TW)))
                    (exit-function . use-default-char-width-table)
                    (coding-system euc-tw iso-2022-cn)
                    (coding-priority euc-tw chinese-big5 iso-2022-cn
-                                    chinese-iso-8bit)
+                                    chinese-iso-8bit chinese-gbk)
                    (features china-util)
                    (input-method . "chinese-cns-quick")
                    (documentation . "\
-Support for Chinese, prefering the EUC-TW character set.  Note that
+Support for Chinese, preferring the EUC-TW character set.  Note that
 the EUC-TW coding system accepts Big5 for input also (which is then
 converted to CNS)."))
  '("Chinese"))
@@ -242,15 +243,15 @@ converted to CNS)."))
 (set-language-info-alist
  "Chinese-GBK" '((charset chinese-gbk)
                 (iso639-language . zh)
-                (setup-function . (lambda () 
+                (setup-function . (lambda ()
                                     (use-cjk-char-width-table 'zh_CN)))
                 (exit-function . use-default-char-width-table)
                 (coding-system chinese-gbk)
                 (coding-priority gbk iso-2022-cn chinese-big5
                                  chinese-iso-8bit) ; fixme?
-                (ctext-non-standard-encodings "gbk-0")          
+                (ctext-non-standard-encodings "gbk-0")
                 (input-method . "chinese-py-punct") ; fixme?
-                (sample-text . "Chinese (\e$BCfJ8\e(B,\e$BIaDL\e$A;0\e(B,\e$A::So\e(B) \e$(D95\e$B9%\e(B")
+                (sample-text . "Chinese (中文,普通话,汉语) 妳好")
                 (features china-util)
                 (documentation . "Support for Chinese GBK character set.")
                 (tutorial . "TUTORIAL.cn"))
@@ -276,7 +277,7 @@ converted to CNS)."))
                     (coding-priority gb18030 gbk iso-2022-cn chinese-big5
                                      chinese-iso-8bit) ; fixme?
                     (input-method . "chinese-py-punct") ; fixme?
-                    (sample-text . "Chinese (\e$BCfJ8\e(B,\e$BIaDL\e$A;0\e(B,\e$A::So\e(B) \e$(D0_\e$B9%\e(B")
+                    (sample-text . "Chinese (中文,普通话,汉语) 你好")
                     (features china-util)
                     (documentation
                      . "Support for Chinese GB18030 character set.")