X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mcs-xm.el;h=cc484ebfa5298717e018b372825b0fa4de49e2a0;hb=1c90eac9bf24c5232775f610b94900605e5c6d12;hp=3497be1e214bba5f562f5fdde6b9d678b9c5afc1;hpb=adcfb89838ec120edc85f02248a490c4e7a8647f;p=elisp%2Fapel.git

diff --git a/mcs-xm.el b/mcs-xm.el
index 3497be1..cc484eb 100644
--- a/mcs-xm.el
+++ b/mcs-xm.el
@@ -1,9 +1,9 @@
 ;;; mcs-xm.el --- MIME charset implementation for XEmacs-mule
 
-;; Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997,1998,1999,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: emulation, compatibility, Mule
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
+;; Keywords: MIME-charset, coding-system, emulation, compatibility, Mule
 
 ;; This file is part of APEL (A Portable Emacs Library).
 
@@ -29,7 +29,7 @@
 
 ;;; Code:
 
-(require 'mcs-20)
+(require 'poem)
 
 
 (defun encode-mime-charset-region (start end charset &optional lbt)
@@ -61,57 +61,7 @@
       )))
 
 (unless (featurep 'utf-2000)
-  (defcustom mime-iso646-character-unification-alist
-    (eval-when-compile
-      (let (dest
-	    (i 33))
-	(while (< i 92)
-	  (setq dest
-		(cons (cons (char-to-string (make-char 'latin-jisx0201 i))
-			    (format "%c" i))
-		      dest))
-	  (setq i (1+ i)))
-	(setq i 93)
-	(while (< i 126)
-	  (setq dest
-		(cons (cons (char-to-string (make-char 'latin-jisx0201 i))
-			    (format "%c" i))
-		      dest))
-	  (setq i (1+ i)))
-	(nreverse dest)))
-    "Alist unified string vs. canonical string."
-    :group 'i18n
-    :type '(repeat (cons string string)))
-
-  (defcustom mime-unified-character-face nil
-    "*Face of unified character."
-    :group 'i18n
-    :type 'face)
-
-  (defcustom mime-character-unification-limit-size 2048
-    "*Limit size to unify characters."
-    :group 'i18n
-    :type 'integer)
-
-  (defun decode-mime-charset-region-with-iso646-unification (start end charset
-								   lbt)
-    (decode-mime-charset-region-default start end charset lbt)
-    (if (<= (- end start) mime-character-unification-limit-size)
-	(save-excursion
-	  (let ((rest mime-iso646-character-unification-alist))
-	    (while rest
-	      (let ((pair (car rest)))
-		(goto-char start)
-		(while (search-forward (car pair) end t)
-		  (let ((str (cdr pair)))
-		    (put-text-property 0 (length str)
-				       'face mime-unified-character-face str)
-		    (replace-match str 'fixed-case 'literal)
-		    )
-		  ))
-	      (setq rest (cdr rest)))))
-      ))
-  )
+  (require 'mcs-xmu))
 
 (defun decode-mime-charset-region-for-hz (start end charset lbt)
   (if lbt
@@ -153,7 +103,7 @@
 
 
 (defvar charsets-mime-charset-alist
-  '(((ascii)						. us-ascii)
+  `(((ascii)						. us-ascii)
     ((ascii latin-iso8859-1)				. iso-8859-1)
     ((ascii latin-iso8859-2)				. iso-8859-2)
     ((ascii latin-iso8859-3)				. iso-8859-3)
@@ -164,18 +114,48 @@
     ((ascii greek-iso8859-7)				. iso-8859-7)
     ((ascii hebrew-iso8859-8)				. iso-8859-8)
     ((ascii latin-iso8859-9)				. iso-8859-9)
-    ((ascii latin-jisx0201
-	    japanese-jisx0208-1978 japanese-jisx0208)	. iso-2022-jp)
-    ((ascii latin-jisx0201
-	    katakana-jisx0201 japanese-jisx0208)	. shift_jis)
+    ,(if (featurep 'utf-2000)
+	 '((ascii latin-jisx0201
+		  japanese-jisx0208-1978
+		  japanese-jisx0208
+		  japanese-jisx0208-1990)		. iso-2022-jp)
+       '((ascii latin-jisx0201
+		japanese-jisx0208-1978 japanese-jisx0208)
+	 . iso-2022-jp))
+    ,(if (featurep 'utf-2000)
+	 '((ascii latin-jisx0201
+		  japanese-jisx0208-1978
+		  japanese-jisx0208
+		  japanese-jisx0208-1990
+		  japanese-jisx0213-1
+		  japanese-jisx0213-2)			. iso-2022-jp-3)
+       '((ascii latin-jisx0201
+		japanese-jisx0208-1978 japanese-jisx0208
+		japanese-jisx0213-1
+		japanese-jisx0213-2)			. iso-2022-jp-3))
+    ,(if (featurep 'utf-2000)
+	 '((ascii latin-jisx0201 katakana-jisx0201
+		  japanese-jisx0208-1990)		. shift_jis)
+       '((ascii latin-jisx0201
+		katakana-jisx0201 japanese-jisx0208)	. shift_jis))
     ((ascii korean-ksc5601)				. euc-kr)
     ((ascii chinese-gb2312)				. gb2312)
     ((ascii chinese-big5-1 chinese-big5-2)		. big5)
     ((ascii thai-xtis)					. tis-620)
-    ((ascii latin-iso8859-1 greek-iso8859-7
-	    latin-jisx0201 japanese-jisx0208-1978
-	    chinese-gb2312 japanese-jisx0208
-	    korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
+    ,(if (featurep 'utf-2000)
+	 '((ascii latin-jisx0201 latin-iso8859-1
+		  greek-iso8859-7
+		  japanese-jisx0208-1978 japanese-jisx0208
+		  japanese-jisx0208-1990
+		  japanese-jisx0212
+		  chinese-gb2312
+		  korean-ksc5601)		. iso-2022-jp-2)
+       '((ascii latin-jisx0201 latin-iso8859-1
+		greek-iso8859-7
+		japanese-jisx0208-1978 japanese-jisx0208
+		japanese-jisx0212
+		chinese-gb2312
+		korean-ksc5601)			. iso-2022-jp-2))
     ;; ((ascii latin-iso8859-1 greek-iso8859-7
     ;;         latin-jisx0201 japanese-jisx0208-1978
     ;;         chinese-gb2312 japanese-jisx0208
@@ -209,6 +189,7 @@ Return nil if corresponding MIME-charset is not found."
 ;;; @ end
 ;;;
 
-(provide 'mcs-xm)
+(require 'product)
+(product-provide (provide 'mcs-xm) (require 'apel-ver))
 
 ;;; mcs-xm.el ends here