(coded-charset-entity-reference-alist): Prefer `=ucs@FOO' to

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

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index de2e42b..43ffcf9 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, 2013, 2014 MORIOKA Tomohiko
+;;   2010, 2011, 2012, 2013, 2014, 2015 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -290,7 +290,9 @@
          (==hanyo-denshi/jt                "g2-HD-JT-" 4 X)
          (==hanyo-denshi/ks                "g2-HD-KS-" 6 d)
          (===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/ip                "R-HD-IP-" 4 X)
          (===hanyo-denshi/jt                "R-HD-JT-" 4 X)
          ( =gt                                   "GT-" 5 d)
          (==gt                                "g2-GT-" 5 d)
@@ -350,6 +352,7 @@
          (===jis-x0208@1978                   "R-J78-" 4 X)
          ( =koseki                           "KOSEKI-" 6 d)
          ( =cbeta                                 "CB" 5 d)
+         (=>cbeta                               "A-CB" 5 d)
          (==cbeta                              "g2-CB" 5 d)
          (===cbeta                              "R-CB" 5 d)
          ( =hanziku-1                         "HZK01-" 4 X)
@@ -446,15 +449,6 @@
          (=+>ucs@jis/1990                    "o-J90U+" 4 X)
          (=+>ucs@cns                           "o-CU+" 4 X)
          (=+>ucs@ks                            "o-KU+" 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@JP                           "G-dJU+" 4 X)
          ( =ucs@iso                               "U-" 8 X)
          ( =ucs@unicode                          "UU+" 4 X)
          ( =ucs@unicode                          "UU-" 8 X)
@@ -469,6 +463,15 @@
          ( =ucs@ks                               "KU-" 8 X)
          ( =ucs@JP                              "dJU+" 4 X)
          ( =ucs@JP/hanazono                  "hanaJU+" 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@JP                           "G-dJU+" 4 X)
          (==ucs@iso                           "g2-IU-" 8 X)
          (==ucs@unicode                       "g2-UU+" 4 X)
          (==ucs@cns                           "g2-CU+" 4 X)
@@ -492,6 +495,7 @@
          (===cns11643-7                        "R-C7-" 4 X)
          (==ucs@JP/hanazono               "g2-hanaJU+" 4 X)
          (==ruimoku-v6                      "g2-RUI6-" 4 X)
+         (===ruimoku-v6                      "R-RUI6-" 4 X)
          ( china3-jef                           "JC3-" 4 X)
          (==jef-china3                       "g2-JC3-" 4 X)
          (===jef-china3                       "R-JC3-" 4 X)