From 111523f030b52e5bfbc74af100551123f9331500 Mon Sep 17 00:00:00 2001 From: tomo Date: Tue, 2 Mar 2010 14:11:02 +0000 Subject: [PATCH] (coded-charset-entity-reference-alist): - Use `=gt' instead of `ideograph-gt'. - Use `=gt-k' instead of `ideograph-gt-k'. - Use `=jis-x0208@1990' instead of `japanese-jisx0208-1990'. - Use `=jis-x0208@1983' instead of `japanese-jisx0208'. - Use `=jis-x0213-1@2000' instead of `japanese-jisx0213-1'. - Use `=jis-x0213-2' instead of `japanese-jisx0213-2'. - Use `=jis-x0212' instead of `japanese-jisx0212'. - Use `=jis-x0208@1978' instead of `japanese-jisx0208-1978'. - Use `=>>gt' instead of `<=>gt'. - Use &G-GT-ddddd; instead of &aGT-ddddd for `=>>gt'. - Add setting for `=>>jis-x0208@1990'. - Use &G-JX1-hhhh; instead of &aJX1-hhhh; for `=>>jis-x0213-1@2000'. - Use &G-JX2-hhhh; instead of &aJX2-hhhh; for `=>>jis-x0213-2'. - Use &G-JX3-hhhh; instead of &aJX3-hhhh; for `=>>jis-x0213-1@2004'. - Add setting for `=>>jis-x0208@1978'. - Decode &A-J0-hhhh; as `=>jis-x0208@1997'. --- lisp/mule/mule-coding.el | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index aaaf8b2..8f55228 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -4,7 +4,8 @@ ;; Licensed to the Free Software Foundation. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. -;; Copyright (C) 1997,1999,2002,2003,2004,2005,2006,2008,2009 MORIOKA Tomohiko +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, 2005, 2006, 2008, 2009, +;; 2010 MORIOKA Tomohiko ;; This file is part of XEmacs. @@ -181,10 +182,10 @@ (when (featurep 'utf-2000) (setq coded-charset-entity-reference-alist - '(((ideograph-gt . isolated) "I-GT-" 5 d) + '(((=gt . isolated) "I-GT-" 5 d) ((=ruimoku-v6 . isolated) "I-RUI6-" 4 X) ((chinese-big5-cdp . isolated) "I-CDP-" 4 X) - ((ideograph-gt-k . isolated) "I-GT-K" 5 d) + ((=gt-k . isolated) "I-GT-K" 5 d) ((ideograph-cbeta . isolated) "I-CB" 5 d) ((ideograph-hanziku-1 . isolated) "I-HZK01-" 4 X) ((ideograph-hanziku-2 . isolated) "I-HZK02-" 4 X) @@ -198,13 +199,13 @@ ((ideograph-hanziku-10 . isolated) "I-HZK10-" 4 X) ((ideograph-hanziku-11 . isolated) "I-HZK11-" 4 X) ((ideograph-hanziku-12 . isolated) "I-HZK12-" 4 X) - ((japanese-jisx0208-1990 . isolated) "I-J90-" 4 X) - ((japanese-jisx0208 . isolated) "I-J83-" 4 X) - ((japanese-jisx0213-1 . isolated) "I-JX1-" 4 X) - ((japanese-jisx0213-2 . isolated) "I-JX2-" 4 X) + ((=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) + ((=jis-x0213-2 . isolated) "I-JX2-" 4 X) ((=jis-x0213-1@2004 . isolated) "I-JX3-" 4 X) - ((japanese-jisx0212 . isolated) "I-JSP-" 4 X) - ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X) + ((=jis-x0212 . isolated) "I-JSP-" 4 X) + ((=jis-x0208@1978 . isolated) "I-J78-" 4 X) ((chinese-gb2312 . isolated) "I-G0-" 4 X) ((chinese-cns11643-1 . isolated) "I-C1-" 4 X) ((chinese-cns11643-2 . isolated) "I-C2-" 4 X) @@ -238,13 +239,14 @@ ((arabic-digit . isolated) "I-MULE-ARBD-" 2 X) ((ipa . isolated) "I-MULE-IPA-" 2 X) ((china3-jef . isolated) "I-JC3-" 4 X) - ( ideograph-gt "GT-" 5 d) - (<=>gt "aGT-" 5 d) + ( =gt "GT-" 5 d) + (=>>gt "G-GT-" 5 d) + (=>>gt "aGT-" 5 d) ( =zinbun-oracle "ZOB-" 4 d) ( =ruimoku-v6 "RUI6-" 4 X) ( chinese-big5-cdp "CDP-" 4 X) ( ideograph-daikanwa "M-" 5 d) - ( ideograph-gt-k "GT-K" 5 d) + ( =gt-k "GT-K" 5 d) ( ideograph-cbeta "CB" 5 d) ( ideograph-hanziku-1 "HZK01-" 4 X) ( ideograph-hanziku-2 "HZK02-" 4 X) @@ -262,20 +264,26 @@ ( ideograph-hanziku-1 "HZK1-" 4 X) ((ideograph-hanziku-2 . isolated) "I-HZK2-" 4 X) ( ideograph-hanziku-2 "HZK2-" 4 X) - ( japanese-jisx0208-1990 "J90-" 4 X) - ( japanese-jisx0208 "J83-" 4 X) + ( =jis-x0208@1990 "J90-" 4 X) + ( =jis-x0208@1983 "J83-" 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@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) - ( japanese-jisx0212 "JSP-" 4 X) - ( japanese-jisx0208-1978 "J78-" 4 X) ( chinese-cns11643-1 "C1-" 4 X) ( chinese-cns11643-2 "C2-" 4 X) ( chinese-cns11643-3 "C3-" 4 X) -- 1.7.10.4