X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=4f344b6d228e39e92ba1539684cbfa813fd92b1c;hb=70d046c32fe6a05f14bb070cd3dfa6e654057cc6;hp=f8b021db43858aaa5a0858a2315300ddf98b161f;hpb=ed2763044e342ed87389d0c2072f41482531a2cb;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index f8b021d..4f344b6 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -5,7 +5,7 @@
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
 ;; Copyright (C) 1997, 1999, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-;;   2010, 2011, 2012, 2013 MORIOKA Tomohiko
+;;   2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -187,8 +187,11 @@
 	  =decomposition@hanyo-denshi))
 
   (setq coded-charset-entity-reference-alist
-	'(((=adobe-japan1-6	. isolated)    "I-AJ1-" 5 d)
+	'(((=mj			. isolated)      "I-MJ" 6 d)
+	  ((=adobe-japan1-6	. isolated)    "I-AJ1-" 5 d)
+	  ( =mj					   "MJ" 6 d)
 	  ( =adobe-japan1-6			 "AJ1-" 5 d)
+	  (==mj					 "R-MJ" 6 d)
 	  (==adobe-japan1-6		       "R-AJ1-" 5 d)
 	  ((=adobe-japan1-base	. isolated)    "I-AJ1-" 5 d)
 	  ( =adobe-japan1-base		       "I-AJ1-" 5 d)
@@ -314,6 +317,8 @@
 	  ( =daikanwa				  "M-"  5 d)
 	  ( =daikanwa@rev2			"r2M-"  5 d)
 	  ( =daikanwa@rev1			"r1M-"  5 d)
+	  (==daikanwa/+p			"R-M-p" 5 d)
+	  (==daikanwa				"R-M-"  5 d)
 	  ( =ks-x1001                    	  "K0-" 4 X)
 	  (==ks-x1001			        "R-K0-" 4 X)
 	  ( =iso-ir165			         "EGB-" 4 X)
@@ -323,6 +328,7 @@
 	  (==gt-k			       "R-GT-K" 5 d)
 	  (==jis-x0208@1983		       "R-J83-" 4 X)
 	  (==jis-x0208@1978		       "R-J78-" 4 X)
+	  ( =koseki			      "KOSEKI-" 6 d)
 	  ( =cbeta				   "CB" 5 d)
 	  ( =hanziku-1			       "HZK01-" 4 X)
 	  ( =hanziku-2			       "HZK02-" 4 X)
@@ -409,6 +415,8 @@
 	  ( =>gt-k			       "A-GT-K" 5 d)
 	  ( =>zinbun-oracle		       "A-ZOB-" 4 d)
 	  (==>ucs@bucs				"BUCS+" 4 X)
+	  ( =>ucs@hanyo-denshi		       "A-HDU+" 4 X)
+	  ( =>ucs@hanyo-denshi		    "A-HD-UCS+" 4 X)
 	  ( =>ucs@iso				"A-IU+" 4 X)
 	  ( =>ucs@unicode			"A-UU+" 4 X)
 	  ( =>ucs@jis				"A-JU+" 4 X)
@@ -430,12 +438,6 @@
 	  (=>>ucs@jis/2000		      "G-J00U+" 4 X)
 	  (=>>ucs@jis/1990		      "G-J90U+" 4 X)
 	  (=>>ucs@JP			       "G-dJU+" 4 X)
-	  (=>>>ucs@iso			       "g2-IU+" 4 X)
-	  (=>>>ucs@iso			       "GI-IU+" 4 X)
-	  (=>>>ucs@unicode		       "g2-UU+" 4 X)
-	  (=>>>ucs@unicode		       "GI-UU+" 4 X)
-	  (=>>>ucs@jis			       "g2-JU+" 4 X)
-	  (=>>>ucs@jis			       "GI-JU+" 4 X)
 	  ( =ucs@iso				   "U-" 8 X)
 	  ( =ucs@unicode			  "UU+" 4 X)
 	  ( =ucs@unicode			  "UU-" 8 X)
@@ -456,6 +458,11 @@
 	  (==cns11643-1				"R-C1-" 4 X)
 	  (==cns11643-2				"R-C2-" 4 X)
 	  (==cns11643-3				"R-C3-" 4 X)
+	  (==cns11643-4				"R-C4-" 4 X)
+	  (==cns11643-5				"R-C5-" 4 X)
+	  (==cns11643-6				"R-C6-" 4 X)
+	  (==cns11643-7				"R-C7-" 4 X)
+	  (==ucs@JP/hanazono		    "R-hanaJU+" 4 X)
 	  ( china3-jef				 "JC3-" 4 X)
 	  ( =big5				   "B-" 4 X)
 	  ( =big5				  "C0-" 4 X)
@@ -470,8 +477,15 @@
 	  ( =shinjigen@rev			"SJG2-" 4 d)
 	  ( =shinjigen@1ed			"SJG1-" 4 d)
 	  (==shinjigen@rev		      "R-SJG2-" 4 d)
+	  (==shinjigen@1ed		      "R-SJG1-" 4 d)
+	  (=>>>ucs@iso			       "g2-IU+" 4 X)
+	  (=>>>ucs@iso			       "GI-IU+" 4 X)
+	  (=>>>ucs@unicode		       "g2-UU+" 4 X)
+	  (=>>>ucs@unicode		       "GI-UU+" 4 X)
 	  (=>>>ucs@cns			       "g2-CU+" 4 X)
 	  (=>>>ucs@cns			       "GI-CU+" 4 X)
+	  (=>>>ucs@jis			       "g2-JU+" 4 X)
+	  (=>>>ucs@jis			       "GI-JU+" 4 X)
 	  (=>>>ucs@jis/2004		     "g2-J04U+" 4 X)
 	  (=>>>ucs@jis/2004		     "GI-J04U+" 4 X)
 	  (=>>>ucs@jis/1990		     "g2-J90U+" 4 X)