From 8c7c7cec033127b9928e2d6dec42afbfd34da848 Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 9 Jul 2003 18:39:13 +0000 Subject: [PATCH] (mapping-table-read-file): Accept C1-HHHH and C2-HHHH; don't regard `=>ucs' as substitution for `=ucs-jis-1990'. --- lisp/utf-2000/read-maps.el | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el index 99751af..cef08e3 100644 --- a/lisp/utf-2000/read-maps.el +++ b/lisp/utf-2000/read-maps.el @@ -3,22 +3,22 @@ ;; Copyright (C) 2002,2003 MORIOKA Tomohiko ;; Author: MORIOKA Tomohiko -;; Keywords: UTF-2000, UCS-4, character, CCS, multiscript, multilingual +;; Keywords: mapping table, character, CCS, multiscript, multilingual -;; This file is part of XEmacs UTF-2000. +;; This file is part of XEmacs CHISE. -;; XEmacs UTF-2000 is free software; you can redistribute it and/or +;; XEmacs CHISE is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as ;; published by the Free Software Foundation; either version 2, or (at ;; your option) any later version. -;; XEmacs UTF-2000 is distributed in the hope that it will be useful, +;; XEmacs CHISE is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with XEmacs UTF-2000; see the file COPYING. If not, write to +;; along with XEmacs CHISE; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. @@ -62,6 +62,20 @@ ucs-ccs 'ucs-jis) (goto-char (match-end 0)) ) + ((looking-at "^C1-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)") + (setq ccs 'chinese-cns11643-1 + code (string-to-int (match-string 1) 16) + ucs-pat "\tCU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)" + ucs-ccs 'ucs-cns) + (goto-char (match-end 0)) + ) + ((looking-at "^C2-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)") + (setq ccs 'chinese-cns11643-2 + code (string-to-int (match-string 1) 16) + ucs-pat "\tCU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)" + ucs-ccs 'ucs-cns) + (goto-char (match-end 0)) + ) ((looking-at "^C3-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)") (setq ccs 'chinese-cns11643-3 code (string-to-int (match-string 1) 16) @@ -117,7 +131,8 @@ (put-char-attribute chr ucs-ccs ucs-code)) (when (and ucs (not (eq (or (encode-char chr '=ucs 'defined-only) - (and (not (eq ucs-ccs 'ucs-jis)) + (and (not (memq ucs-ccs '(ucs-jis + =ucs-jis-1990))) (get-char-attribute chr '=>ucs))) ucs))) (if (or ucs-code (null ucs-ccs)) -- 1.7.10.4