X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mel.el;h=c8764a9cd04873a76337e64fc38170248da95677;hb=3c07ee018fb2fa3178e4eef483aee0326a2a52a6;hp=a0cbaf717c62ca3e1032ac4b3b07d24abc283796;hpb=24138394dd4e1acb3ac5f44d0446a2f8cc18663c;p=elisp%2Fflim.git

diff --git a/mel.el b/mel.el
index a0cbaf7..c8764a9 100644
--- a/mel.el
+++ b/mel.el
@@ -3,11 +3,10 @@
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; modified by Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;; Created: 1995/6/25
 ;; Keywords: MIME, Base64, Quoted-Printable, uuencode, gzip64
 
-;; This file is part of MEL (MIME Encoding Library).
+;; This file is part of FLIM (Faithful Library about Internet Message).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -26,477 +25,237 @@
 
 ;;; Code:
 
-(require 'pccl)
+(require 'mime-def)
+(require 'poem)
+
+(defcustom mime-encoding-list
+  '("7bit" "8bit" "binary" "base64" "quoted-printable")
+  "List of Content-Transfer-Encoding.  Each encoding must be string."
+  :group 'mime
+  :type '(repeat string))
+
+(defun mime-encoding-list (&optional service)
+  "Return list of Content-Transfer-Encoding.
+If SERVICE is specified, it returns available list of
+Content-Transfer-Encoding for it."
+  (if service
+      (let (dest)
+	(mapatoms (lambda (sym)
+		    (or (eq sym nil)
+			(setq dest (cons (symbol-name sym) dest)))
+		    )
+		  (symbol-value (intern (format "%s-obarray" service))))
+	(let ((rest mel-encoding-module-alist)
+	      pair)
+	  (while (setq pair (car rest))
+	    (let ((key (car pair)))
+	      (or (member key dest)
+		  (<= (length key) 1)
+		  (setq dest (cons key dest))))
+	    (setq rest (cdr rest)))
+	  )
+	dest)
+    mime-encoding-list))
+
+(defun mime-encoding-alist (&optional service)
+  "Return table of Content-Transfer-Encoding for completion."
+  (mapcar #'list (mime-encoding-list service))
+  )
+
+(defsubst mel-use-module (name encodings)
+  (let (encoding)
+    (while (setq encoding (car encodings))
+      (set-alist 'mel-encoding-module-alist
+		 encoding
+		 (cons name (cdr (assoc encoding mel-encoding-module-alist))))
+      (setq encodings (cdr encodings))
+      )))
 
+(defsubst mel-find-function (service encoding)
+  (mel-find-function-from-obarray
+   (symbol-value (intern (format "%s-obarray" service))) encoding))
 
-;;; @ encoder/decoder selection framework
-;;;
 
-(defconst mel-stems '(dl ccl int-ext internal external)
-  "List of encoder/decoder stems. First stem is most prefered.")
-
-(defmacro mel-call-next (fun formal-args)
-  (let ((caller 'funcall)
-        actual-args)
-    (while formal-args
-      (cond
-       ((eq (car formal-args) '&optional) nil)
-       ((eq (car formal-args) '&rest) (setq caller 'apply))
-       (t (setq actual-args (cons (car formal-args) actual-args))))
-      (setq formal-args (cdr formal-args)))
-    `(,caller ',fun ,@(nreverse actual-args))))
-
-(put 'mel-defgeneric 'lisp-indent-function 4)
-(defmacro mel-defgeneric (prefix suffix formal-args
-				 &rest docstring-interactive)
-  "Define a generic function named PREFIX-SUFFIX for mel.
-Arguments for the function is specified as FORMAL-ARGS as usual.
-Rest of arguments DOCSTRING-INTERACTIVE should be DOCSTRING and/or
-interactive specification placed at front of a function body.
-
-Before a generic function is called, at least one methods must be
-defined by `mel-defmethod'.  If more than one methods is defined,
-preferest implementation is choosed by `mel-defpreference' and
-`mel-stems'."
-  (let ((name (intern (format "%s-%s" prefix suffix)))
-        (tmp (make-symbol "tmp")))
-    (put name 'prefix prefix)
-    (put name 'suffix suffix)
-    `(progn
-       (put ',name 'prefix ',prefix)
-       (put ',name 'suffix ',suffix)
-       (defun ,name ,formal-args
-	 ,@docstring-interactive
-	 (catch 'return
-	   (let ((,tmp (or (get ',name 'stems)
-                           (get ',prefix 'stems)
-                           mel-stems))
-                 method)
-	     (while ,tmp
-	       (when (setq method (get ',name (car ,tmp)))
-		 (fset ',name method)
-		 (throw 'return (mel-call-next ,name ,formal-args)))
-	       (setq ,tmp (cdr ,tmp))))
-	   (error ,(format "%s: no method" name)))))))
-
-(defun mel-defpreference (stems prefix &optional suffix)
-  "Define a preference for a generic functions PREFIX-*
-(or PREFIX-SUFFIX if SUFFIX is non-nil) as STEMS."
-  (let ((name (if suffix (intern (format "%s-%s" prefix suffix)) prefix)))
-    (put name 'stems stems)))
-
-(defmacro mel-usemodule (file prefix stem &optional condition)
-  "Declare that FILE defines functions PREFIX-STEM-*.
-
-If the form CONDITION is non-nil, it is evaluated for each methods
-PREFIX-STEM-*.  If the value of CONDITION is nil, the method is NOT
-defined.  In CONDITION, five variables `prefix', `stem', `suffix',
-`prefix-stem' and `prefix-stem-suffix' is available."
-  (let ((prefix-stem (intern (format "%s-%s" prefix stem))))
-    `(progn
-      (put ',prefix-stem 'mel-condition ',(or condition t))
-      (put ',prefix ',stem ,file))))
-
-(defmacro mel-defmethod (name stem &optional condition file)
-  "Declare that NAME is implemented by STEM in FILE.
-
-If the form CONDITION is non-nil and evaluated to nil, 
-the method is NOT declared.  In CONDITION, five variables `prefix',
-`stem', `suffix', `prefix-stem' and `prefix-stem-suffix' is available.
-
-If FILE is nil, module declared with `mel-usemodule' is used."
-  (let* ((prefix (get name 'prefix))
-         (suffix (get name 'suffix))
-         (prefix-stem (intern (format "%s-%s" prefix stem)))
-         (prefix-stem-suffix (intern (format "%s-%s-%s" prefix stem suffix))))
-    `(when (let ((prefix ',prefix)
-                 (suffix ',suffix)
-                 (stem ',stem)
-                 (prefix-stem ',prefix-stem)
-                 (prefix-stem-suffix ',prefix-stem-suffix))
-            (and ,(or condition 't)
-                 (eval (get prefix-stem 'mel-condition))))
-       (autoload ',prefix-stem-suffix ,(or file `(get ',prefix ',stem)))
-       (put ',name ',stem ',prefix-stem-suffix))))
-
-
-;;; @ generic
+;;; @ setting for modules
 ;;;
 
-(mel-defgeneric base64 encode-string (string)
-  "Encode STRING with base64.")
-(mel-defgeneric base64 decode-string (string)
-  "Decode STRING with base64.")
-(mel-defgeneric base64 encode-region (start end)
-  "Encode current region with base64."
-  (interactive "r"))
-(mel-defgeneric base64 decode-region (start end)
-  "Decode current region with base64."
-  (interactive "r"))
-(mel-defgeneric base64 insert-encoded-file (filename)
-  "Insert a file named FILENAME as base64 encoded form."
-  (interactive (list (read-file-name "Insert encoded file: "))))
-(mel-defgeneric base64 write-decoded-region (start end filename)
-  "Decode and write base64 encoded current region to a file named FILENAME."
-  (interactive
-   (list (region-beginning) (region-end)
-	 (read-file-name "Write decoded region to file: "))))
-(mel-defgeneric base64 encoded-length (string))
-
-(mel-defgeneric quoted-printable encode-string (string)
-  "Encode STRING with quoted-printable.")
-(mel-defgeneric quoted-printable decode-string (string)
-  "Decode STRING with quoted-printable.")
-(mel-defgeneric quoted-printable encode-region (start end)
-  "Encode current region with quoted-printable."
-  (interactive "r"))
-(mel-defgeneric quoted-printable decode-region (start end)
-  "Decode current region with quoted-printable."
-  (interactive "r"))
-(mel-defgeneric quoted-printable insert-encoded-file (filename)
-  "Insert a file named FILENAME as quoted-printable encoded form."
-  (interactive (list (read-file-name "Insert encoded file: "))))
-(mel-defgeneric quoted-printable write-decoded-region (start end filename)
-  "Decode and write quoted-printable encoded current region to a file
-named FILENAME."
-  (interactive
-   (list (region-beginning) (region-end)
-	 (read-file-name "Write decoded region to file: "))))
-
-(mel-defgeneric q-encoding encode-string (string &optional mode)
-  "Encode STRING with Q-encoding.
-If MODE is `text', `comment' or `phrase', the result is appropriate for
-unstructured field, comment or phrase in structured field.
-If MODE is nil, the result is appropriate for phrase.")
-(mel-defgeneric q-encoding decode-string (string)
-  "Decode STRING with Q-encoding.")
-(mel-defgeneric q-encoding encoded-length (string &optional mode))
-
-(mel-defgeneric uuencode encode-region (start end)
-  "Encode current region by unofficial uuencode format."
-  (interactive "*r"))
-(mel-defgeneric uuencode decode-region (start end)
-  "Decode current region by unofficial uuencode format."
-  (interactive "*r"))
-(mel-defgeneric uuencode insert-encoded-file (filename)
-  "Insert file encoded by unofficial uuencode format."
-  (interactive (list (read-file-name "Insert encoded file: "))))
-(mel-defgeneric uuencode write-decoded-region (start end filename)
-  "Decode and write current region encoded by uuencode into FILENAME."
-  (interactive
-   (list (region-beginning) (region-end)
-         (read-file-name "Write decoded region to file: "))))
-
-(mel-defgeneric gzip64 encode-region (start end)
-  "Encode current region by unofficial gzip64 format."
-  (interactive "*r"))
-(mel-defgeneric gzip64 decode-region (start end)
-  "Decode current region by unofficial gzip64 format."
-  (interactive "*r"))
-(mel-defgeneric gzip64 insert-encoded-file (filename)
-  "Insert file encoded by unofficial gzip64 format."
-  (interactive (list (read-file-name "Insert encoded file: "))))
-(mel-defgeneric gzip64 write-decoded-region (start end filename)
-  "Decode and write current region encoded by gzip64 into FILENAME."
-  (interactive
-   (list (region-beginning) (region-end)
-         (read-file-name "Write decoded region to file: "))))
-
-
-;;; @ method
-;;;
-
-;; mel-dl
-(defvar base64-dl-module
-  (and (fboundp 'dynamic-link)
-       (let ((path (expand-file-name "base64.so" exec-directory)))
-	 (and (file-exists-p path)
-	      path))))
-
-(mel-usemodule "mel-dl" base64 dl base64-dl-module)
-
-(mel-defmethod base64-encode-string dl)
-(mel-defmethod base64-decode-string dl)
-(mel-defmethod base64-encode-region dl)
-(mel-defmethod base64-decode-region dl)
-
-;; mel-b
-(mel-usemodule "mel-b" base64 internal)
-(mel-usemodule "mel-b" base64 external)
-(mel-usemodule "mel-b" base64 int-ext)
-
-(mel-defmethod base64-encode-string internal)
-(mel-defmethod base64-decode-string internal)
-(mel-defmethod base64-encode-region internal)
-(mel-defmethod base64-decode-region internal)
-(mel-defmethod base64-insert-encoded-file internal)
-(mel-defmethod base64-write-decoded-region internal)
-
-(mel-defmethod base64-encode-string external)
-(mel-defmethod base64-decode-string external)
-(mel-defmethod base64-encode-region external)
-(mel-defmethod base64-decode-region external)
-(mel-defmethod base64-insert-encoded-file external)
-(mel-defmethod base64-write-decoded-region external)
-
-(mel-defmethod base64-encoded-length internal)
-
-(mel-defmethod base64-decode-string int-ext)
-(mel-defmethod base64-encode-region int-ext)
-(mel-defmethod base64-decode-region int-ext)
-(mel-defmethod base64-insert-encoded-file int-ext)
-(mel-defmethod base64-write-decoded-region int-ext)
-
-;; mel-q
-(mel-usemodule "mel-q" quoted-printable internal)
-(mel-usemodule "mel-q" quoted-printable external)
-(mel-usemodule "mel-q" quoted-printable int-ext)
-(mel-usemodule "mel-q" q-encoding internal)
-
-(mel-defmethod quoted-printable-encode-string internal)
-(mel-defmethod quoted-printable-decode-string internal)
-(mel-defmethod quoted-printable-encode-region internal)
-(mel-defmethod quoted-printable-decode-region internal)
-
-(mel-defmethod quoted-printable-encode-string external)
-(mel-defmethod quoted-printable-decode-string external)
-(mel-defmethod quoted-printable-encode-region external)
-(mel-defmethod quoted-printable-decode-region external)
-(mel-defmethod quoted-printable-insert-encoded-file external)
-(mel-defmethod quoted-printable-write-decoded-region external)
-
-(mel-defmethod quoted-printable-encode-region int-ext)
-(mel-defmethod quoted-printable-decode-region int-ext)
-
-(mel-defmethod q-encoding-encode-string internal)
-(mel-defmethod q-encoding-decode-string internal)
-(mel-defmethod q-encoding-encoded-length internal)
-
-;; mel-u
-(mel-usemodule "mel-u" uuencode external)
-
-(mel-defmethod uuencode-encode-region external)
-(mel-defmethod uuencode-decode-region external)
-(mel-defmethod uuencode-insert-encoded-file external)
-(mel-defmethod uuencode-write-decoded-region external)
-
-;; mel-g
-(mel-usemodule "mel-g" gzip64 external)
-
-(mel-defmethod gzip64-encode-region external)
-(mel-defmethod gzip64-decode-region external)
-(mel-defmethod gzip64-insert-encoded-file external)
-(mel-defmethod gzip64-write-decoded-region external)
-
-;; mel-ccl
-(mel-usemodule "mel-ccl" base64 ccl (fboundp 'make-ccl-coding-system))
-(mel-usemodule "mel-ccl" quoted-printable ccl (fboundp 'make-ccl-coding-system))
-(mel-usemodule "mel-ccl" q-encoding ccl (fboundp 'make-ccl-coding-system))
-
-(mel-defmethod base64-encode-string ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-(mel-defmethod base64-encode-region ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-(mel-defmethod base64-insert-encoded-file ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-
-(mel-defmethod quoted-printable-encode-string ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-(mel-defmethod quoted-printable-encode-region ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-(mel-defmethod quoted-printable-insert-encoded-file ccl (not (broken-p 'ccl-execute-eof-block-on-encoding-some)))
-
-(mel-defmethod base64-decode-string ccl)
-(mel-defmethod base64-decode-region ccl)
-(mel-defmethod base64-write-decoded-region ccl)
-
-(mel-defmethod quoted-printable-decode-string ccl)
-(mel-defmethod quoted-printable-decode-region ccl)
-(mel-defmethod quoted-printable-write-decoded-region ccl)
-
-(mel-defmethod q-encoding-encode-string ccl)
-(mel-defmethod q-encoding-decode-string ccl)
-
-(mel-defmethod q-encoding-encoded-length ccl (not (featurep 'xemacs)))
+(mel-define-backend "7bit")
+(mel-define-method-function (mime-encode-string string (nil "7bit"))
+			    'identity)
+(mel-define-method-function (mime-decode-string string (nil "7bit"))
+			    'identity)
+(mel-define-method mime-encode-region (start end (nil "7bit")))
+(mel-define-method mime-decode-region (start end (nil "7bit")))
+(mel-define-method-function (mime-insert-encoded-file filename (nil "7bit"))
+			    'insert-file-contents-as-binary)
+(mel-define-method-function (mime-write-decoded-region
+			     start end filename (nil "7bit"))
+			    'write-region-as-binary)
+
+(mel-define-backend "8bit" ("7bit"))
+
+(mel-define-backend "binary" ("8bit"))
+
+(defvar mel-b-builtin
+   (and (fboundp 'base64-encode-string)
+        (subrp (symbol-function 'base64-encode-string))))
+
+(when mel-b-builtin
+  (mel-define-backend "base64")
+  (mel-define-method-function (mime-encode-string string (nil "base64"))
+			      'base64-encode-string)
+  (mel-define-method-function (mime-decode-string string (nil "base64"))
+			      'base64-decode-string)
+  (mel-define-method-function (mime-encode-region start end (nil "base64"))
+			      'base64-encode-region)
+  (mel-define-method-function (mime-decode-region start end (nil "base64"))
+			      'base64-decode-region)  
+  (mel-define-method mime-insert-encoded-file (filename (nil "base64"))
+    "Encode contents of file FILENAME to base64, and insert the result.
+It calls external base64 encoder specified by
+`base64-external-encoder'.  So you must install the program (maybe
+mmencode included in metamail or XEmacs package)."
+    (interactive (list (read-file-name "Insert encoded file: ")))
+    (insert (base64-encode-string
+	     (with-temp-buffer
+	       (set-buffer-multibyte nil)
+	       (insert-file-contents-as-binary filename)
+	       (buffer-string))))
+    (or (bolp)
+	(insert "\n"))
+    )
+    
+  (mel-define-method-function (encoded-text-encode-string string (nil "B"))
+			      'base64-encode-string)
+  (mel-define-method encoded-text-decode-string (string (nil "B"))
+    (if (and (string-match B-encoded-text-regexp string)
+	     (string= string (match-string 0 string)))
+	(base64-decode-string string)
+      (error "Invalid encoded-text %s" string)))
+  )
+
+(mel-use-module 'mel-b-el '("base64" "B"))
+(mel-use-module 'mel-q '("quoted-printable" "Q"))
+(mel-use-module 'mel-g '("x-gzip64"))
+(mel-use-module 'mel-u '("x-uue" "x-uuencode"))
+
+(defvar mel-b-ccl-module
+  (and (featurep 'mule)
+       (progn
+	 (require 'path-util)
+	 (module-installed-p 'mel-b-ccl)
+	 )))
+
+(defvar mel-q-ccl-module
+  (and (featurep 'mule)
+       (progn
+	 (require 'path-util)
+	 (module-installed-p 'mel-q-ccl)
+	 )))
+
+(if mel-b-ccl-module
+    (mel-use-module 'mel-b-ccl '("base64" "B"))
+  )
+
+(if mel-q-ccl-module
+    (mel-use-module 'mel-q-ccl '("quoted-printable" "Q"))
+  )
+
+(if base64-dl-module
+    (mel-use-module 'mel-b-dl '("base64" "B"))
+  )
 
 
 ;;; @ region
 ;;;
 
 ;;;###autoload
-(defvar mime-encoding-method-alist
-  '(("base64"           . base64-encode-region)
-    ("quoted-printable" . quoted-printable-encode-region)
-    ;; Not standard, their use is DISCOURAGED.
-    ;; ("x-uue"            . uuencode-encode-region)
-    ;; ("x-gzip64"         . gzip64-encode-region)
-    ("7bit")
-    ("8bit")
-    ("binary")
-    )
-  "Alist of encoding vs. corresponding method to encode region.
-Each element looks like (STRING . FUNCTION) or (STRING . nil).
-STRING is content-transfer-encoding.
-FUNCTION is region encoder and nil means not to encode.")
-
-;;;###autoload
-(defvar mime-decoding-method-alist
-  `(("base64"           . base64-decode-region)
-    ("quoted-printable" . quoted-printable-decode-region)
-    ("x-uue"            . uuencode-decode-region)
-    ("x-uuencode"       . uuencode-decode-region)
-    ("x-gzip64"         . gzip64-decode-region)
-    ,@(when (fboundp 'base64-dl-decode-region)
-        '(("base64-dl" . base64-dl-decode-region)))
-    ,@(when (fboundp 'base64-ccl-decode-region)
-        '(("base64-ccl" . base64-ccl-decode-region)))
-    ,@(when (fboundp 'base64-internal-decode-region)
-        '(("base64-internal" . base64-internal-decode-region)))
-    ,@(when (fboundp 'base64-external-decode-region)
-        '(("base64-external" . base64-external-decode-region)))
-    ,@(when (fboundp 'base64-int-ext-decode-region)
-        '(("base64-int-ext" . base64-int-ext-decode-region)))
-    ,@(when (fboundp 'quoted-printable-internal-decode-region)
-        '(("quoted-printable-internal"
-	   . quoted-printable-internal-decode-region)))
-    ,@(when (fboundp 'quoted-printable-ccl-decode-region)
-        '(("quoted-printable-ccl"
-	   . quoted-printable-ccl-decode-region)))
-    ,@(when (fboundp 'quoted-printable-external-decode-region)
-        '(("quoted-printable-external"
-	   . quoted-printable-external-decode-region)))
-    ,@(when (fboundp 'quoted-printable-int-ext-decode-region)
-        '(("quoted-printable-int-ext"
-	   . quoted-printable-int-ext-decode-region)))
-    )
-  "Alist of encoding vs. corresponding method to decode region.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is region decoder.")
-
-;;;###autoload
 (defun mime-encode-region (start end encoding)
   "Encode region START to END of current buffer using ENCODING.
-ENCODING must be string.  If ENCODING is found in
-`mime-encoding-method-alist' as its key, this function encodes the
-region by its value."
+ENCODING must be string."
   (interactive
    (list (region-beginning) (region-end)
 	 (completing-read "encoding: "
-			  mime-encoding-method-alist
-			  nil t "base64"))
-   )
-  (let ((f (cdr (assoc encoding mime-encoding-method-alist))))
-    (if f
-	(funcall f start end)
-      )))
+			  (mime-encoding-alist)
+			  nil t "base64")))
+  (funcall (mel-find-function 'mime-encode-region encoding) start end)
+  )
+
 
 ;;;###autoload
 (defun mime-decode-region (start end encoding)
   "Decode region START to END of current buffer using ENCODING.
-ENCODING must be string.  If ENCODING is found in
-`mime-decoding-method-alist' as its key, this function decodes the
-region by its value."
+ENCODING must be string."
   (interactive
    (list (region-beginning) (region-end)
 	 (completing-read "encoding: "
-			  mime-decoding-method-alist
-			  nil t "base64"))
-   )
-  (let ((f (cdr (assoc encoding mime-decoding-method-alist))))
-    (if f
-	(funcall f start end)
-      )))
+			  (mime-encoding-alist 'mime-decode-region)
+			  nil t "base64")))
+  (funcall (mel-find-function 'mime-decode-region encoding)
+	   start end))
 
 
 ;;; @ string
 ;;;
 
 ;;;###autoload
-(defvar mime-string-decoding-method-alist
-  '(("base64"           . base64-decode-string)
-    ("quoted-printable" . quoted-printable-decode-string)
-    ("7bit"		. identity)
-    ("8bit"		. identity)
-    ("binary"		. identity)
-    )
-  "Alist of encoding vs. corresponding method to decode string.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is string decoder.")
-
-;;;###autoload
 (defun mime-decode-string (string encoding)
   "Decode STRING using ENCODING.
 ENCODING must be string.  If ENCODING is found in
 `mime-string-decoding-method-alist' as its key, this function decodes
 the STRING by its value."
-  (let ((f (cdr (assoc encoding mime-string-decoding-method-alist))))
-    (if f
-	(funcall f string)
-      (with-temp-buffer
-	(insert string)
-	(mime-decode-region (point-min)(point-max) encoding)
-	(buffer-string)
-	))))
+  (funcall (mel-find-function 'mime-decode-string encoding)
+	   string))
+
+
+(mel-define-service encoded-text-encode-string (string encoding)
+  "Encode STRING as encoded-text using ENCODING.
+ENCODING must be string.")
+
+(mel-define-service encoded-text-decode-string (string encoding)
+  "Decode STRING as encoded-text using ENCODING.
+ENCODING must be string.")
+
+(defun base64-encoded-length (string)
+  (* (/ (+ (length string) 2) 3) 4))
+
+(defsubst Q-encoding-printable-char-p (chr mode)
+  (and (not (memq chr '(?= ?? ?_)))
+       (<= ?\   chr)(<= chr ?~)
+       (cond ((eq mode 'text) t)
+	     ((eq mode 'comment)
+	      (not (memq chr '(?\( ?\) ?\\)))
+	      )
+	     (t
+	      (string-match "[A-Za-z0-9!*+/=_---]" (char-to-string chr))
+	      ))))
+
+(defun Q-encoded-text-length (string &optional mode)
+  (let ((l 0)(i 0)(len (length string)) chr)
+    (while (< i len)
+      (setq chr (elt string i))
+      (if (Q-encoding-printable-char-p chr mode)
+	  (setq l (+ l 1))
+	(setq l (+ l 3))
+	)
+      (setq i (+ i 1)) )
+    l))
 
 
 ;;; @ file
 ;;;
 
 ;;;###autoload
-(defvar mime-file-encoding-method-alist
-  '(("base64"           . base64-insert-encoded-file)
-    ("quoted-printable" . quoted-printable-insert-encoded-file)
-    ;; Not standard, their use is DISCOURAGED.
-    ;; ("x-uue"            . uuencode-insert-encoded-file)
-    ;; ("x-gzip64"         . gzip64-insert-encoded-file)
-    ("7bit"		. insert-file-contents-as-binary)
-    ("8bit"		. insert-file-contents-as-binary)
-    ("binary"		. insert-file-contents-as-binary)
-    )
-  "Alist of encoding vs. corresponding method to insert encoded file.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is function to insert encoded file.")
-
-;;;###autoload
-(defvar mime-file-decoding-method-alist
-  `(("base64"           . base64-write-decoded-region)
-    ("quoted-printable" . quoted-printable-write-decoded-region)
-    ("x-uue"            . uuencode-write-decoded-region)
-    ("x-gzip64"         . gzip64-write-decoded-region)
-    ("7bit"		. write-region-as-binary)
-    ("8bit"		. write-region-as-binary)
-    ("binary"		. write-region-as-binary)
-    ,@(when (fboundp 'base64-internal-write-decoded-region)
-        '(("base64-internal" . base64-internal-write-decoded-region)))
-    ,@(when (fboundp 'base64-external-write-decoded-region)
-        '(("base64-external" . base64-external-write-decoded-region)))
-    ,@(when (fboundp 'base64-int-ext-write-decoded-region)
-        '(("base64-int-ext" . base64-int-ext-write-decoded-region)))
-    ,@(when (fboundp 'base64-ccl-write-decoded-region)
-        '(("base64-ccl" . base64-ccl-write-decoded-region)))
-    ,@(when (fboundp 'quoted-printable-external-write-decoded-region)
-        '(("quoted-printable-external"
-	   . quoted-printable-external-write-decoded-region)))
-    ,@(when (fboundp 'quoted-printable-ccl-write-decoded-region)
-        '(("quoted-printable-ccl"
-	   . quoted-printable-ccl-write-decoded-region)))
-    )
-  "Alist of encoding vs. corresponding method to write decoded region to file.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is function to write decoded region to file.")
-
-;;;###autoload
 (defun mime-insert-encoded-file (filename encoding)
   "Insert file FILENAME encoded by ENCODING format."
   (interactive
    (list (read-file-name "Insert encoded file: ")
 	 (completing-read "encoding: "
-			  mime-encoding-method-alist
-			  nil t "base64"))
-   )
-  (let ((f (cdr (assoc encoding mime-file-encoding-method-alist))))
-    (if f
-	(funcall f filename)
-      )))
+			  (mime-encoding-alist)
+			  nil t "base64")))
+  (funcall (mel-find-function 'mime-insert-encoded-file encoding)
+	   filename))
+
 
 ;;;###autoload
 (defun mime-write-decoded-region (start end filename encoding)
@@ -506,12 +265,10 @@ START and END are buffer positions."
    (list (region-beginning) (region-end)
 	 (read-file-name "Write decoded region to file: ")
 	 (completing-read "encoding: "
-			  mime-file-decoding-method-alist
+			  (mime-encoding-alist 'mime-write-decoded-region)
 			  nil t "base64")))
-  (let ((f (cdr (assoc encoding mime-file-decoding-method-alist))))
-    (if f
-	(funcall f start end filename)
-      )))
+  (funcall (mel-find-function 'mime-write-decoded-region encoding)
+	   start end filename))
 
 
 ;;; @ end