X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mel.el;h=0ea780921f2d10e915645a1e592ce5c7d578219f;hb=2cdf2dfc7fc737128e09ac46edaa074cbe27e690;hp=51d611c955bc8c0fb01a11a68000fb30dbb8c008;hpb=76320b6e961c154d373739318fc8267b5e252ceb;p=elisp%2Fflim.git

diff --git a/mel.el b/mel.el
index 51d611c..0ea7809 100644
--- a/mel.el
+++ b/mel.el
@@ -1,8 +1,8 @@
-;;; mel.el : a MIME encoding/decoding library
+;;; mel.el --- A MIME encoding/decoding library.
 
-;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Created: 1995/6/25
 ;; Keywords: MIME, Base64, Quoted-Printable, uuencode, gzip64
 
@@ -19,7 +19,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; along with this program; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -27,6 +27,8 @@
 
 (require 'mime-def)
 (require 'poem)
+(require 'alist)
+(require 'path-util)
 
 (defcustom mime-encoding-list
   '("7bit" "8bit" "binary" "base64" "quoted-printable")
@@ -59,17 +61,15 @@ Content-Transfer-Encoding for it."
 
 (defun mime-encoding-alist (&optional service)
   "Return table of Content-Transfer-Encoding for completion."
-  (mapcar #'list (mime-encoding-list service))
-  )
+  (mapcar (function 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))
-      )))
+  (while encodings
+    (set-alist 'mel-encoding-module-alist
+	       (car encodings)
+	       (cons name (cdr (assoc (car encodings)
+				      mel-encoding-module-alist))))
+    (setq encodings (cdr encodings))))
 
 (defsubst mel-find-function (service encoding)
   (mel-find-function-from-obarray
@@ -79,26 +79,6 @@ Content-Transfer-Encoding for it."
 ;;; @ setting for modules
 ;;;
 
-(defvar mel-ccl-module
-  (and (featurep 'mule)
-       (progn
-	 (require 'path-util)
-	 (module-installed-p 'mel-ccl)
-	 )))
-
-(mel-use-module 'mel-b '("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"))
-
-(if mel-ccl-module
-    (mel-use-module 'mel-ccl '("base64" "quoted-printable" "B" "Q"))
-  )
-
-(if base64-dl-module
-    (mel-use-module 'mel-b-dl '("base64" "B"))
-  )
-
 (mel-define-backend "7bit")
 (mel-define-method-function (mime-encode-string string (nil "7bit"))
 			    'identity)
@@ -116,6 +96,69 @@ Content-Transfer-Encoding for it."
 
 (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 "*fInsert 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 (string-match (eval-when-compile
+			(concat "\\`" B-encoded-text-regexp "\\'"))
+		      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))))
+
+(when mel-b-ccl-module
+  (mel-use-module 'mel-b-ccl '("base64" "B")))
+
+(when mel-q-ccl-module
+  (mel-use-module 'mel-q-ccl '("quoted-printable" "Q")))
+
+(when base64-dl-module
+  (mel-use-module 'mel-b-dl '("base64" "B")))
+
 
 ;;; @ region
 ;;;
@@ -125,12 +168,11 @@ Content-Transfer-Encoding for it."
   "Encode region START to END of current buffer using ENCODING.
 ENCODING must be string."
   (interactive
-   (list (region-beginning) (region-end)
-	 (completing-read "encoding: "
+   (list (region-beginning)(region-end)
+	 (completing-read "Encoding: "
 			  (mime-encoding-alist)
 			  nil t "base64")))
-  (funcall (mel-find-function 'mime-encode-region encoding) start end)
-  )
+  (funcall (mel-find-function 'mime-encode-region encoding) start end))
 
 
 ;;;###autoload
@@ -138,8 +180,8 @@ ENCODING must be string."
   "Decode region START to END of current buffer using ENCODING.
 ENCODING must be string."
   (interactive
-   (list (region-beginning) (region-end)
-	 (completing-read "encoding: "
+   (list (region-beginning)(region-end)
+	 (completing-read "Encoding: "
 			  (mime-encoding-alist 'mime-decode-region)
 			  nil t "base64")))
   (funcall (mel-find-function 'mime-decode-region encoding)
@@ -155,45 +197,39 @@ ENCODING must be string."
 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."
-  (funcall (mel-find-function 'mime-decode-string encoding)
-	   string))
+  (let ((f (mel-find-function 'mime-decode-string encoding)))
+    (if f
+	(funcall f string)
+      string)))
 
 
 (mel-define-service encoded-text-encode-string (string encoding)
-  "Encode STRING as encoded-text using ENCODING.
-ENCODING must be string.")
+  "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.")
+  "Decode STRING as encoded-text using ENCODING.  ENCODING must be string.")
 
 (defun base64-encoded-length (string)
-  (let ((len (length string)))
-    (* (+ (/ len 3)
-	  (if (= (mod len 3) 0) 0 1)
-	  ) 4)
-    ))
+  (* (/ (+ (length string) 2) 3) 4))
 
 (defsubst Q-encoding-printable-char-p (chr mode)
   (and (not (memq chr '(?= ?? ?_)))
-       (<= ?\   chr)(<= chr ?~)
+       (<= ?\  chr)(<= chr ?~)
        (cond ((eq mode 'text) t)
 	     ((eq mode 'comment)
-	      (not (memq chr '(?\( ?\) ?\\)))
-	      )
+	      (not (memq chr '(?\( ?\) ?\\))))
 	     (t
-	      (string-match "[A-Za-z0-9!*+/=_---]" (char-to-string chr))
-	      ))))
+	      (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 chr (aref string i))
+      (if (or (Q-encoding-printable-char-p chr mode)
+	      (eq chr ? ))
 	  (setq l (+ l 1))
-	(setq l (+ l 3))
-	)
-      (setq i (+ i 1)) )
+	(setq l (+ l 3)))
+      (setq i (+ i 1)))
     l))
 
 
@@ -205,7 +241,7 @@ ENCODING must be string.")
   "Insert file FILENAME encoded by ENCODING format."
   (interactive
    (list (read-file-name "Insert encoded file: ")
-	 (completing-read "encoding: "
+	 (completing-read "Encoding: "
 			  (mime-encoding-alist)
 			  nil t "base64")))
   (funcall (mel-find-function 'mime-insert-encoded-file encoding)
@@ -217,9 +253,9 @@ ENCODING must be string.")
   "Decode and write current region encoded by ENCODING into FILENAME.
 START and END are buffer positions."
   (interactive
-   (list (region-beginning) (region-end)
+   (list (region-beginning)(region-end)
 	 (read-file-name "Write decoded region to file: ")
-	 (completing-read "encoding: "
+	 (completing-read "Encoding: "
 			  (mime-encoding-alist 'mime-write-decoded-region)
 			  nil t "base64")))
   (funcall (mel-find-function 'mime-write-decoded-region encoding)