X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=e4b20d6e997b18b9f4890c2204c158ed7b2abb07;hb=ff9665bbac6ab27a4bc4eef401cad47aca2b100c;hp=cdb19f8ae94e35dbb8dfdb9ce4f6b98817a33004;hpb=c98af42086ea67e93793d95aa6828e503373bac8;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index cdb19f8..e4b20d6 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -172,26 +172,129 @@
    ))
 
 (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)
-	  (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)
+	'(((chinese-big5-cdp . isolated)       "I-CDP-" 4 X)
+	  ( chinese-big5-cdp		         "CDP-" 4 X)
+	  ((ideograph-daikanwa . isolated)       "I-M-" 5 d)
+	  ( ideograph-daikanwa                     "M-" 5 d)
+	  ((ideograph-cbeta . isolated)          "I-CB" 5 d)
+	  ( ideograph-cbeta   		           "CB" 5 d)
+	  ((ideograph-gt . isolated)            "I-GT-" 5 d)
+	  ( ideograph-gt   		          "GT-" 5 d)
+	  ((japanese-jisx0208-1990 . isolated) "I-J90-" 4 X)
+	  ( japanese-jisx0208-1990  	         "J90-" 4 X)
+	  ((japanese-jisx0208 . isolated)      "I-J83-" 4 X)
+	  ( japanese-jisx0208   		 "J83-" 4 X)
+	  ((japanese-jisx0213-1 . isolated)    "I-JX1-" 4 X)
+	  ( japanese-jisx0213-1   		 "JX1-" 4 X)
+	  ((japanese-jisx0213-2 . isolated)    "I-JX2-" 4 X)
+	  ( japanese-jisx0213-2   		 "JX2-" 4 X)
+	  ((chinese-cns11643-1 . isolated)      "I-C1-" 4 X)
+	  ( chinese-cns11643-1                    "C1-" 4 X)
+	  ((chinese-cns11643-2 . isolated)      "I-C2-" 4 X)
+	  ( chinese-cns11643-2                    "C2-" 4 X)
+	  ((chinese-cns11643-3 . isolated)      "I-C3-" 4 X)
+	  ( chinese-cns11643-3                    "C3-" 4 X)
+	  ((chinese-cns11643-4 . isolated)      "I-C4-" 4 X)
+	  ( chinese-cns11643-4                    "C4-" 4 X)
+	  ((chinese-cns11643-5 . isolated)      "I-C5-" 4 X)
+	  ( chinese-cns11643-5                    "C5-" 4 X)
+	  ((chinese-cns11643-6 . isolated)      "I-C6-" 4 X)
+	  ( chinese-cns11643-6                    "C6-" 4 X)
+	  ((chinese-cns11643-7 . isolated)      "I-C7-" 4 X)
+	  ( chinese-cns11643-7                    "C7-" 4 X)
 	  ))
+
+  (make-coding-system
+   'utf-8-mcs-er 'utf-8
+   "Coding-system of UTF-8 with entity-reference."
+   '(mnemonic "MTF8r" use-entity-reference t))
+
+  (make-coding-system
+   'utf-8-gb 'utf-8
+   "Coding-system of UTF-8 using GB mapping."
+   '(mnemonic "UTF8G"
+	      charset-g0 ucs
+	      charset-g1 =>ucs))
+
+  (make-coding-system
+   'utf-8-gb-er 'utf-8
+   "Coding-system of UTF-8 using GB mapping with entity-reference."
+   '(mnemonic "UTF8Gr"
+	      charset-g0 ucs
+	      charset-g1 =>ucs
+	      use-entity-reference t))
+
+  (make-coding-system
+   'utf-8-cns 'utf-8
+   "Coding-system of UTF-8 using CNS mapping."
+   '(mnemonic "UTF8C"
+	      charset-g0 ucs-cns
+	      charset-g1 =>ucs-cns
+	      charset-g2 =>ucs))
+
+  (make-coding-system
+   'utf-8-cns-er 'utf-8
+   "Coding-system of UTF-8 using CNS mapping with entity-reference."
+   '(mnemonic "UTF8Cr"
+	      charset-g0 ucs-cns
+	      charset-g1 =>ucs-cns
+	      charset-g2 =>ucs
+	      use-entity-reference t))
+
+  (make-coding-system
+   'utf-8-big5 'utf-8
+   "Coding-system of UTF-8 using Big5 mapping."
+   '(mnemonic "UTF8B"
+	      charset-g0 ucs-big5
+	      charset-g1 =>ucs-big5
+	      charset-g2 =>ucs))
+
+  (make-coding-system
+   'utf-8-big5-er 'utf-8
+   "Coding-system of UTF-8 using Big5 mapping with entity-reference."
+   '(mnemonic "UTF8Br"
+	      charset-g0 ucs-big5
+	      charset-g1 =>ucs-big5
+	      charset-g2 =>ucs
+	      use-entity-reference t))
+
+  (make-coding-system
+   'utf-8-jis 'utf-8
+   "Coding-system of UTF-8 using JIS mapping."
+   '(mnemonic "UTF8J"
+	      charset-g0 ucs-jis
+	      charset-g1 =>ucs-jis
+	      charset-g2 =>ucs))
+
+  (make-coding-system
+   'utf-8-jis-er 'utf-8
+   "Coding-system of UTF-8 using JIS mapping with entity-reference."
+   '(mnemonic "UTF8Jr"
+	      charset-g0 ucs-jis
+	      charset-g1 =>ucs-jis
+	      charset-g2 =>ucs
+	      use-entity-reference t))
+
+  (make-coding-system
+   'utf-8-ks 'utf-8
+   "Coding-system of UTF-8 using KS mapping."
+   '(mnemonic "UTF8K"
+	      charset-g0 ucs-ks
+	      charset-g1 =>ucs-ks
+	      charset-g2 =>ucs))
+
+  (make-coding-system
+   'utf-8-ks-er 'utf-8
+   "Coding-system of UTF-8 using KS mapping with entity-reference."
+   '(mnemonic "UTF8Kr"
+	      charset-g0 ucs-ks
+	      charset-g1 =>ucs-ks
+	      charset-g2 =>ucs
+	      use-entity-reference t))
+
+  (define-coding-system-alias 'utf-8 'utf-8-mcs)
+  (define-coding-system-alias 'utf-8-er 'utf-8-mcs-er)
   )
 
 ;; initialize the coding categories to something semi-reasonable