(coded-charset-entity-reference-alist): Add settings for

`==adobe-japan1-6', `==hanyo-denshi/*', `==gt', `==jis-x0208@1990',
`==jis-x0212', `==jis-x0213-1@2000', `==jis-x0213-2',
`==jis-x0213-1@2004', `==big5-cdp', `==gt-k', `==jis-x0208@1983',
`==jis-x0208@1978', `==ucs@iso', `==ucs@unicode', `=>>daikanwa/+p' and
`==shinjigen@rev'.

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 6c0a34b..c5e4872 100644 (file)
--- 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 MORIOKA Tomohiko
+;;   2010, 2011, 2012, 2013 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -189,6 +189,7 @@
   (setq coded-charset-entity-reference-alist
        '(((=adobe-japan1-6     . isolated)    "I-AJ1-" 5 d)
          ( =adobe-japan1-6                      "AJ1-" 5 d)
+         (==adobe-japan1-6                    "R-AJ1-" 5 d)
          ((=adobe-japan1-base  . isolated)    "I-AJ1-" 5 d)
          ( =adobe-japan1-base                 "I-AJ1-" 5 d)
          ((=hanyo-denshi/ja    . isolated)  "I-HD-JA-" 4 X)
@@ -203,19 +204,7 @@
          ((=hanyo-denshi/jt    . isolated)  "I-HD-JT-" 4 X)
          ((=hanyo-denshi/ks    . isolated)  "I-HD-KS-" 6 d)
          ((=hanyo-denshi/ks/mf . isolated)   "I-KSMF-" 5 d)
-         ( =hanyo-denshi/ja                   "HD-JA-" 4 X)
-         ( =hanyo-denshi/jb                   "HD-JB-" 4 X)
-         ( =hanyo-denshi/jc                   "HD-JC-" 4 X)
-         ( =hanyo-denshi/jd                   "HD-JD-" 4 X)
-         ( =hanyo-denshi/ft                   "HD-FT-" 4 X)
-         ( =hanyo-denshi/ia                   "HD-IA-" 4 X)
-         ( =hanyo-denshi/ib                   "HD-IB-" 4 X)
-         ( =hanyo-denshi/hg                   "HD-HG-" 4 X)
-         ( =hanyo-denshi/ip                   "HD-IP-" 4 X)
-         ( =hanyo-denshi/jt                   "HD-JT-" 4 X)
-         ( =hanyo-denshi/ks                   "HD-KS-" 6 d)
          ((=gt                 . isolated)     "I-GT-" 5 d)
-         ( =gt                                   "GT-" 5 d)
          ((=jis-x0208@1990     . isolated)    "I-J90-" 4 X)
          ((=jis-x0208@1983     . isolated)    "I-J83-" 4 X)
          ((=jis-x0213-1@2000   . isolated)    "I-JX1-" 4 X)
@@ -223,12 +212,7 @@
          ((=jis-x0213-1@2004   . isolated)    "I-JX3-" 4 X)
          ((=jis-x0212          . isolated)    "I-JSP-" 4 X)
          ((=jis-x0208@1978/1pr . isolated)    "I-J78-" 4 X)
-         ( =jis-x0208@1990                      "J90-" 4 X)
          ((=jis-x0208          . isolated)    "I-J90-" 4 X)
-         ( =jis-x0213-1@2000                    "JX1-" 4 X)
-         ( =jis-x0213-2                         "JX2-" 4 X)
-         ( =jis-x0213-1@2004                    "JX3-" 4 X)
-         ( =jis-x0212                           "JSP-" 4 X)
          ((chinese-cns11643-1  . isolated)     "I-C1-" 4 X)
          ((chinese-cns11643-2  . isolated)     "I-C2-" 4 X)
          ((chinese-cns11643-3  . isolated)     "I-C3-" 4 X)
@@ -236,15 +220,7 @@
          ((chinese-cns11643-5  . isolated)     "I-C5-" 4 X)
          ((chinese-cns11643-6  . isolated)     "I-C6-" 4 X)
          ((chinese-cns11643-7  . isolated)     "I-C7-" 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-gb2312      . isolated)     "I-G0-" 4 X)
-         ( chinese-gb2312                        "G0-" 4 X)
          ((=iso-ir165          . isolated)    "I-EGB-" 4 X)
          ((korean-ksc5601      . isolated)     "I-K0-" 4 X)
          ((=ruimoku-v6         . isolated)   "I-RUI6-" 4 X)
@@ -253,8 +229,6 @@
          ((=gt-k               . isolated)    "I-GT-K" 5 d)
          ((=cbeta              . isolated)      "I-CB" 5 d)
          ((=big5-cdp           . isolated)    "I-CDP-" 4 X)
-         ( =big5-cdp                            "CDP-" 4 X)
-         ((=big5-eten          . isolated)      "I-B-" 4 X)
          ((=hanziku-1          . isolated)  "I-HZK01-" 4 X)
          ((=hanziku-2          . isolated)  "I-HZK02-" 4 X)
          ((=hanziku-3          . isolated)  "I-HZK03-" 4 X)
@@ -288,6 +262,51 @@
          ((arabic-digit        . isolated) "I-MULE-ARBD-" 2 X)
          ((ipa                 . isolated) "I-MULE-IPA-" 2 X)
          ((china3-jef          . isolated)    "I-JC3-" 4 X)
+         ( =hanyo-denshi/ja                   "HD-JA-" 4 X)
+         ( =hanyo-denshi/jb                   "HD-JB-" 4 X)
+         ( =hanyo-denshi/jc                   "HD-JC-" 4 X)
+         ( =hanyo-denshi/jd                   "HD-JD-" 4 X)
+         ( =hanyo-denshi/ft                   "HD-FT-" 4 X)
+         ( =hanyo-denshi/ia                   "HD-IA-" 4 X)
+         ( =hanyo-denshi/ib                   "HD-IB-" 4 X)
+         ( =hanyo-denshi/hg                   "HD-HG-" 4 X)
+         ( =hanyo-denshi/ip                   "HD-IP-" 4 X)
+         ( =hanyo-denshi/jt                   "HD-JT-" 4 X)
+         ( =hanyo-denshi/ks                   "HD-KS-" 6 d)
+         (==hanyo-denshi/ja                 "R-HD-JA-" 4 X)
+         (==hanyo-denshi/jb                 "R-HD-JB-" 4 X)
+         (==hanyo-denshi/jc                 "R-HD-JC-" 4 X)
+         (==hanyo-denshi/jd                 "R-HD-JD-" 4 X)
+         (==hanyo-denshi/ft                 "R-HD-FT-" 4 X)
+         (==hanyo-denshi/ia                 "R-HD-IA-" 4 X)
+         (==hanyo-denshi/ib                 "R-HD-IB-" 4 X)
+         (==hanyo-denshi/hg                 "R-HD-HG-" 4 X)
+         (==hanyo-denshi/ip                 "R-HD-IP-" 4 X)
+         (==hanyo-denshi/jt                 "R-HD-JT-" 4 X)
+         (==hanyo-denshi/ks                 "R-HD-KS-" 6 d)
+         ( =gt                                   "GT-" 5 d)
+         (==gt                                 "R-GT-" 5 d)
+         ( =jis-x0208@1990                      "J90-" 4 X)
+         ( =jis-x0213-1@2000                    "JX1-" 4 X)
+         ( =jis-x0213-2                         "JX2-" 4 X)
+         ( =jis-x0213-1@2004                    "JX3-" 4 X)
+         ( =jis-x0212                           "JSP-" 4 X)
+         (==jis-x0208@1990                    "R-J90-" 4 X)
+         (==jis-x0212                         "R-JSP-" 4 X)
+         (==jis-x0213-1@2000                  "R-JX1-" 4 X)
+         (==jis-x0213-2                       "R-JX2-" 4 X)
+         (==jis-x0213-1@2004                  "R-JX3-" 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-gb2312                        "G0-" 4 X)
+         ( =big5-cdp                            "CDP-" 4 X)
+         (==big5-cdp                          "R-CDP-" 4 X)
+         ((=big5-eten          . isolated)      "I-B-" 4 X)
          ( =zinbun-oracle                       "ZOB-" 4 d)
          ( =daikanwa/ho                          "M-H" 4 d)
          ( =daikanwa/+p                          "M-p" 5 d)
@@ -300,6 +319,9 @@
          ( =jis-x0208@1983                      "J83-" 4 X)
          ( =jis-x0208@1978                      "J78-" 4 X)
          ( =gt-k                                "GT-K" 5 d)
+         (==gt-k                              "R-GT-K" 5 d)
+         (==jis-x0208@1983                    "R-J83-" 4 X)
+         (==jis-x0208@1978                    "R-J78-" 4 X)
          ( =cbeta                                 "CB" 5 d)
          ( =hanziku-1                         "HZK01-" 4 X)
          ( =hanziku-2                         "HZK02-" 4 X)
@@ -434,11 +456,14 @@
          ( =ucs@ks                               "KU-" 8 X)
          ( =ucs@JP                              "dJU+" 4 X)
          ( =ucs@JP/hanazono                  "hanaJU+" 4 X)
+         (==ucs@iso                             "R-U-" 8 X)
+         (==ucs@unicode                        "R-UU+" 4 X)
          ( china3-jef                           "JC3-" 4 X)
          ( =big5                                  "B-" 4 X)
          ( =big5                                 "C0-" 4 X)
          ( =big5-eten                            "BE-" 4 X)
-         (=>>daikanwa                           "G-M-" 5 d)
+         (=>>daikanwa                          "G-M-"  5 d)
+         (=>>daikanwa/+p                       "G-M-p" 5 d)
          (=>daikanwa                            "A-M-" 5 d)
          (=>daikanwa/ho                        "A-M-H" 4 d)
          (=>cns11643-7                         "A-C7-" 4 X)
@@ -446,6 +471,7 @@
          ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
          ( =shinjigen@rev                      "SJG2-" 4 d)
          ( =shinjigen@1ed                      "SJG1-" 4 d)
+         (==shinjigen@rev                    "R-SJG2-" 4 d)
          ))
 
   (make-coding-system