X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ideo-trans.el;h=63755eb82d1b79f94a59b8f0b3ba7c4c6e2de02c;hb=0b80009075cff7c8c0796668f7b7033b6354b265;hp=e4f899855672e5396d53fb9f077083aed71a2c7c;hpb=3104b63492b02f9d9a031b507e4d0bf2191bf3f8;p=chise%2Ftomoyo-tools.git

diff --git a/ideo-trans.el b/ideo-trans.el
index e4f8998..63755eb 100644
--- a/ideo-trans.el
+++ b/ideo-trans.el
@@ -1,6 +1,6 @@
 ;;; ideo-trans.el --- Translation utility for Ideographic Strings
 
-;; Copyright (C) 2003,2004,2005,2008,2012 MORIOKA Tomohiko
+;; Copyright (C) 2003, 2004, 2005, 2008, 2012, 2013 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: Ideographs, Character Database, Chaon, CHISE
@@ -215,7 +215,7 @@
     (mapconcat
      (lambda (chr)
        (char-to-string
-	(cond ((car (char-feature chr '<-simplified))
+	(cond ((car (setq ret (char-feature chr '<-simplified@CN)))
 	       (if (cdr ret)
 		   (funcall selector ret)
 		 (car ret)))
@@ -266,7 +266,7 @@
 		 (setq ret (or (char-feature ret '<-simplified@JP/Jouyou)
 			       (char-feature ret '<-simplified@JP))))
 	       (if (cdr ret)
-		   (ideo-trans-select-char ret (format "%c => " chr))
+		   (funcall selector ret)
 		 (car ret)))
 	      ((setq ret (char-feature chr '=>ucs@jis))
 	       (decode-char '=ucs@jis ret))
@@ -281,9 +281,13 @@
   'japanese-traditionalize-string)
 
 ;;;###autoload
-(defun japanese-traditionalize-region (start end)
+(defun japanese-traditionalize-region (start end &optional selector)
   "Convert Japanese simplified Kanji in the region into traditional characters."
   (interactive "r")
+  (unless selector
+    (setq selector
+	  (lambda (chars)
+	    (ideo-trans-select-char chars (format "%c => " chr)))))
   (save-excursion
     (save-restriction
       (narrow-to-region start end)
@@ -300,7 +304,7 @@
 	      (progn
 		(if (cdr ret)
 		    (progn
-		      (setq rret (ideo-trans-select-char ret))
+		      (setq rret (funcall selector ret))
 		      (delete-char)
 		      (insert rret))
 		  (delete-char)