From d138c3873408480a06a333cbdf4dca180554ec62 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 18 Jan 2016 16:56:31 +0900 Subject: [PATCH 1/1] (mapping-table-read-file): Modify for `char-feature'. --- lisp/utf-2000/read-maps.el | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el index 787bfde..40371c6 100644 --- a/lisp/utf-2000/read-maps.el +++ b/lisp/utf-2000/read-maps.el @@ -1,6 +1,6 @@ ;;; read-maps.el --- Read mapping-tables. -;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2012, 2014 +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2012, 2014, 2015 ;; MORIOKA Tomohiko ;; Author: MORIOKA Tomohiko @@ -178,7 +178,9 @@ UCS-REGEXP is a regular expression to match against ;; ((eq ucs-ccs '=ucs@ks) ;; (encode-char chr '=ucs@ks/fw 'defined-only)) (t - (char-feature chr '=>ucs)))) + (or (char-feature chr '=ucs) + (char-feature chr '=>ucs)) + ))) ucs-code))) (put-char-attribute chr ucs-ccs ucs-code)) (when (and ucs @@ -191,10 +193,14 @@ UCS-REGEXP is a regular expression to match against =ucs@big5 =ucs@ks ))) - (char-feature chr '=>ucs))) + (or (char-feature chr '=ucs) + (char-feature chr '=>ucs)) + )) ucs))) (if (or ucs-code (null ucs-ccs)) - (unless (eq (char-feature chr '=>ucs) ucs) + (unless (eq (or (char-feature chr '=ucs) + (char-feature chr '=>ucs)) + ucs) (put-char-attribute chr '=>ucs ucs)) (unless (eq (encode-char chr ucs-ccs 'defined-only) ucs) @@ -218,11 +224,15 @@ UCS-REGEXP is a regular expression to match against ==ucs@gb ==ucs@cns ==ucs@ks))) - (char-feature drep-chr '=>ucs)) + (or (char-feature drep-chr '=ucs) + (char-feature drep-chr '=>ucs)) + ) ucs)) (not (eq (char-feature drep-chr '=>ucs*) ucs))) (if (or ucs-code (null drep-ucs-ccs)) - (unless (eq (char-feature drep-chr '=>ucs) ucs) + (unless (eq (or (char-feature drep-chr '=ucs) + (char-feature drep-chr '=>ucs)) + ucs) (put-char-attribute drep-chr '=>ucs ucs)) (unless (eq (encode-char drep-chr drep-ucs-ccs 'defined-only) ucs) -- 1.7.10.4