Merge branch 'master' into aci

[chise/xemacs-chise.git.1] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index b90ed3d..0dbd4b2 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011, 2012 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010, 2011, 2012, 2013 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -264,7 +264,9 @@
     =ruimoku-v6
     =>>ruimoku-v6
     =jef-china3
-    =shinjigen))
+    =shinjigen
+    =big5-cdp-var-3
+    =big5-cdp-var-5))
 
 
 ;;; @ char-db formatters
@@ -563,7 +565,9 @@
             ;; (string-match "^=adobe-" (symbol-name name))
            )
        "(%-18s . %05d)\t; %c")
-       ((memq name '(=hanyo-denshi/ks =>>>hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
+       ((memq name '(=hanyo-denshi/ks
+                    =>>>hanyo-denshi/ks =>>hanyo-denshi/ks
+                    =zihai mojikyo))
        "(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)
        "(%-18s . #x%04X)\t; %c")