X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=de3fafc06e1ec9e90bc88371dc11450824cb47bb;hb=1c7710cf1afb474cc661cd7f21a98d6ce48d9531;hp=4377dc5c8a7bb86ebb333447d8c750ea8280fd66;hpb=905e15ed7bd1fa4132ea64b93f79d2de787231e9;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 4377dc5..de3fafc 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -182,7 +182,8 @@
 
 (when (featurep 'utf-2000)
   (setq coded-charset-entity-reference-alist
-	'(((=gt			. isolated)     "I-GT-" 5 d)
+	'(((=adobe-japan1-base	. isolated)    "I-AJ1-" 5 d)
+	  ((=gt			. isolated)     "I-GT-" 5 d)
 	  ((=ruimoku-v6		. isolated)   "I-RUI6-" 4 X)
 	  ((chinese-big5-cdp	. isolated)    "I-CDP-" 4 X)
 	  ((=gt-k		. isolated)    "I-GT-K" 5 d)
@@ -239,14 +240,14 @@
 	  ((arabic-digit	. isolated) "I-MULE-ARBD-" 2 X)
 	  ((ipa			. isolated) "I-MULE-IPA-" 2 X)
 	  ((china3-jef		. isolated)    "I-JC3-" 4 X)
+	  ( =adobe-japan1-6			 "AJ1-" 5 d)
+	  ( =adobe-japan1-base		       "I-AJ1-" 5 d)
 	  ( =gt					  "GT-" 5 d)
-	  (=>>gt				"G-GT-" 5 d)
-	  (=>>gt				 "aGT-" 5 d)
 	  ( =zinbun-oracle                       "ZOB-" 4 d)
-	  (=>zinbun-oracle                     "A-ZOB-" 4 d)
 	  ( =ruimoku-v6				"RUI6-" 4 X)
-	  ( chinese-big5-cdp		         "CDP-" 4 X)
-	  ( ideograph-daikanwa                     "M-" 5 d)
+	  ( =big5-cdp			         "CDP-" 4 X)
+	  ( =daikanwa				   "M-" 5 d)
+	  ( =daikanwa@rev1			 "r1M-" 5 d)
 	  ( =gt-k				 "GT-K" 5 d)
 	  ( ideograph-cbeta   		           "CB" 5 d)
 	  ( ideograph-hanziku-1                "HZK01-" 4 X)
@@ -272,19 +273,6 @@
 	  ( =jis-x0213-1@2004			 "JX3-" 4 X)
 	  ( =jis-x0212				 "JSP-" 4 X)
 	  ( =jis-x0208@1978			 "J78-" 4 X)
-	  (=>>jis-x0208@1990		       "G-J90-" 4 X)
-	  (=>>jis-x0213-1@2000		       "G-JX1-" 4 X)
-	  (=>>jis-x0213-2	   	       "G-JX2-" 4 X)
-	  (=>>jis-x0213-1@2004		       "G-JX3-" 4 X)
-	  (=>>jis-x0213-1@2000		        "aJX1-" 4 X)
-	  (=>>jis-x0213-2	   		"aJX2-" 4 X)
-	  (=>>jis-x0213-1@2004		        "aJX3-" 4 X)
-	  (=>>jis-x0208@1978		       "G-J78-" 4 X)
-	  ( =>jis-x0208@1997			 "J97-" 4 X)
-	  ( =>jis-x0208@1997			"A-J0-" 4 X)
-	  ( =>jis-x0213-1@2000		       "A-JX1-" 4 X)
-	  ( =>jis-x0213-2		       "A-JX2-" 4 X)
-	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
 	  ( chinese-cns11643-1                    "C1-" 4 X)
 	  ( chinese-cns11643-2                    "C2-" 4 X)
 	  ( chinese-cns11643-3                    "C3-" 4 X)
@@ -316,24 +304,61 @@
 	  ( arabic-2-column                "MULE-ARB2-" 2 X)
 	  ( arabic-digit		   "MULE-ARBD-" 2 X)
 	  ( ipa                             "MULE-IPA-" 2 X)
-	  ( china3-jef                    	 "JC3-" 4 X)
-	  ( chinese-big5                    	   "B-" 4 X)
-	  ( chinese-big5                    	  "C0-" 4 X)
-	  ( =ucs@iso                    	   "U-" 8 X)
-	  ( =ucs@unicode                    	  "UU+" 4 X)
-	  ( =ucs@unicode                    	  "UU-" 8 X)
-	  ( =ucs@iso                    	   "U+" 4 X)
-	  ( =ucs@gb	                    	  "GU+" 4 X)
-	  ( =ucs@gb	                    	  "GU-" 8 X)
-	  ( =ucs@jis	                    	  "JU+" 4 X)
-	  ( =ucs@jis	                    	  "JU-" 8 X)
-	  ( =ucs@cns	                    	  "CU+" 4 X)
-	  ( =ucs@cns	                    	  "CU-" 8 X)
-	  ( =ucs@ks	                    	  "KU+" 4 X)
-	  ( =ucs@ks	                    	  "KU-" 8 X)
-	  ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
-	  ( =shinjigen@rev                      "SJG2-" 4 d)
-	  ( =shinjigen@1ed                      "SJG1-" 4 d)
+	  (=>>gt				"G-GT-" 5 d)
+	  (=>>gt				 "aGT-" 5 d)
+	  (=>>jis-x0208				"G-J0-" 4 X)
+	  (=>>jis-x0213-1@2000		       "G-JX1-" 4 X)
+	  (=>>jis-x0213-2	   	       "G-JX2-" 4 X)
+	  (=>>jis-x0213-1@2004		       "G-JX3-" 4 X)
+	  (=>>jis-x0213-1@2000		        "aJX1-" 4 X)
+	  (=>>jis-x0213-2	   		"aJX2-" 4 X)
+	  (=>>jis-x0213-1@2004		        "aJX3-" 4 X)
+	  (=>>jis-x0208@1978		       "G-J78-" 4 X)
+	  (=>>big5-cdp			       "G-CDP-" 4 X)
+	  (=>>gt-k			       "G-GT-K" 5 d)
+	  ( =>jis-x0208@usual			"o-J0-" 4 X)
+	  ( =>jis-x0208@1997			 "J97-" 4 X)
+	  ( =>jis-x0208@1997			"A-J0-" 4 X)
+	  ( =>jis-x0213-1@2000		       "A-JX1-" 4 X)
+	  ( =>jis-x0213-2@usual		       "o-JX2-" 4 X)
+	  ( =>jis-x0213-2		       "A-JX2-" 4 X)
+	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
+	  ( =>gt				"A-GT-" 5 d)
+	  ( =>zinbun-oracle		       "A-ZOB-" 4 d)
+	  (==>ucs@bucs				"BUCS+" 4 X)
+	  ( =>ucs@iso				"A-IU+" 4 X)
+	  ( =>ucs@unicode			"A-UU+" 4 X)
+	  ( =>ucs@jis				"A-JU+" 4 X)
+	  ( =>ucs@cns				"A-CU+" 4 X)
+	  ( =>ucs@JP				"o-JU+" 4 X)
+	  (=>>ucs@iso				"G-IU+" 4 X)
+	  (=>>ucs@unicode			"G-UU+" 4 X)
+	  (=>>ucs@jis				"G-JU+" 4 X)
+	  (=>>ucs@ks				"G-KU+" 4 X)
+	  (=>>ucs@cns				"G-CU+" 4 X)
+	  (=>>ucs@jis/2004		      "G-J04U+" 4 X)
+	  (=>>ucs@jis/2000		      "G-J00U+" 4 X)
+	  (=>>ucs@jis/1990		      "G-J90U+" 4 X)
+	  ( =ucs@iso				   "U-" 8 X)
+	  ( =ucs@unicode			  "UU+" 4 X)
+	  ( =ucs@unicode			  "UU-" 8 X)
+	  ( =ucs@iso				   "U+" 4 X)
+	  ( =ucs@gb				  "GU+" 4 X)
+	  ( =ucs@gb				  "GU-" 8 X)
+	  ( =ucs@jis				  "JU+" 4 X)
+	  ( =ucs@jis				  "JU-" 8 X)
+	  ( =ucs@cns				  "CU+" 4 X)
+	  ( =ucs@cns				  "CU-" 8 X)
+	  ( =ucs@ks				  "KU+" 4 X)
+	  ( =ucs@ks				  "KU-" 8 X)
+	  ( china3-jef				 "JC3-" 4 X)
+	  ( chinese-big5			   "B-" 4 X)
+	  ( chinese-big5			  "C0-" 4 X)
+	  ( =>big5-cdp			       "A-CDP-" 4 X)
+	  ( =>daikanwa				 "A-M-" 5 d)
+	  ( =jis-x0208@1978/i1		       "J78i1-" 4 X)
+	  ( =shinjigen@rev			"SJG2-" 4 d)
+	  ( =shinjigen@1ed			"SJG1-" 4 d)
 	  ))
 
   (make-coding-system