Sync up with r21-4-11-chise-0_20-=ucs-big5.

[chise/xemacs-chise.git-] / lisp / mule / mule-coding.el

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 3919545..61306aa 100644 (file)
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -4,7 +4,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 1997 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -19,7 +19,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the 
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -31,8 +31,7 @@
 
 (defun coding-system-force-on-output (coding-system register)
   "Return the 'force-on-output property of CODING-SYSTEM for the specified REGISTER."
-  (unless (integerp register)
-    (signal 'wrong-type-argument (list 'integerp register)))
+  (check-type register integer)
   (coding-system-property
    coding-system
    (case register
@@ -172,15 +171,58 @@
    mnemonic "ISO7/Lock"
    ))
 
+(when (featurep 'utf-2000)
+  (make-coding-system
+   'utf-8-er 'utf-8
+   "Coding-system of ISO/IEC 10646 UTF-8 with entity-reference."
+   '(mnemonic "UTF8" use-entity-reference t))
+
+  (setq coded-charset-entity-reference-alist
+       '((chinese-big5-cdp "CDP-" 4 X)
+         (ideograph-daikanwa "M-" 5 d)
+         (ideograph-cbeta "CB" 5 d)
+         (ideograph-gt "GT-" 5 d)
+         (japanese-jisx0208-1990 "J90-" 4 X)
+         (japanese-jisx0208 "J83-" 4 X)
+         (japanese-jisx0213-1 "JX1-" 4 X)
+         (japanese-jisx0213-2 "JX2-" 4 X)
+         (chinese-cns11643-1 "C1-" 4 X)
+         (chinese-cns11643-2 "C2-" 4 X)
+         (chinese-cns11643-3 "C3-" 4 X)
+         (chinese-cns11643-4 "C4-" 4 X)
+         (chinese-cns11643-5 "C5-" 4 X)
+         (chinese-cns11643-6 "C6-" 4 X)
+         (chinese-cns11643-7 "C7-" 4 X)
+         ))
+  )
+
 ;; initialize the coding categories to something semi-reasonable
 ;; so that the remaining Lisp files can contain extended characters.
 ;; (They will be in ISO-7 format)
+;; #### This list needs to be synched with the ones in mule-cmds.el.
 
 (if (featurep 'utf-2000)
-    (set-coding-priority-list '(iso-8-2 iso-8-designate iso-8-1
-                               iso-7 iso-lock-shift utf-8 no-conversion))
-  (set-coding-priority-list '(iso-8-2 iso-8-designate iso-8-1
-                             iso-7 iso-lock-shift no-conversion)))
+    (set-coding-priority-list '(iso-7
+                               no-conversion
+                               utf-8
+                               iso-8-1
+                               iso-8-2
+                               iso-8-designate
+                               iso-lock-shift
+                               shift-jis
+                               big5
+                               ucs-4))
+  (set-coding-priority-list '(iso-7
+                             no-conversion
+                             ;; utf-8
+                             iso-8-1
+                             iso-8-2
+                             iso-8-designate
+                             iso-lock-shift
+                             shift-jis
+                             big5
+                             ;; ucs-4
+                             )))
 
 (set-coding-category-system 'iso-7 'iso-2022-7)
 (set-coding-category-system 'iso-8-designate 'ctext)