X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmml.el;h=286c8e4f9c72569ec831a73646f355ce5b9bfabb;hb=a526b7eba49c81420c8caed38c3bafe0e20cdecb;hp=779997ccae1ba448172fe9e8358d334cde94e3ff;hpb=7ebf974f6bac5c2f61e7c7cda2962fa4d8766b81;p=elisp%2Fgnus.git-

diff --git a/lisp/mml.el b/lisp/mml.el
index 779997c..286c8e4 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -26,6 +26,7 @@
 (require 'mm-util)
 (require 'mm-bodies)
 (require 'mm-encode)
+(require 'mm-decode)
 
 (eval-and-compile
   (autoload 'message-make-message-id "message"))
@@ -201,13 +202,14 @@
    ((eq (car cont) 'part)
     (let (coded encoding charset filename type)
       (setq type (or (cdr (assq 'type cont)) "text/plain"))
-      (if (equal (car (split-string type "/")) "text")
+      (if (member (car (split-string type "/")) '("text" "message"))
 	  (with-temp-buffer
 	    (cond
 	     ((cdr (assq 'buffer cont))
 	      (insert-buffer-substring (cdr (assq 'buffer cont))))
-	     ((setq filename (cdr (assq 'filename cont)))
-	      (insert-file-contents-literally filename))
+	     ((and (setq filename (cdr (assq 'filename cont)))
+		   (not (equal (cdr (assq 'nofile cont)) "yes")))
+	      (mm-insert-file-contents filename))
 	     (t
 	      (save-restriction
 		(narrow-to-region (point) (point))
@@ -225,8 +227,9 @@
 	  (cond
 	   ((cdr (assq 'buffer cont))
 	    (insert-buffer-substring (cdr (assq 'buffer cont))))
-	   ((setq filename (cdr (assq 'filename cont)))
-	    (insert-file-contents-literally filename))
+	   ((and (setq filename (cdr (assq 'filename cont)))
+		 (not (equal (cdr (assq 'nofile cont)) "yes")))
+	    (mm-insert-file-contents filename))
 	   (t
 	    (insert (cdr (assq 'contents cont)))))
 	  (setq encoding (mm-encode-buffer type)
@@ -242,21 +245,23 @@
       (when name
 	(setq name (mml-parse-file-name name))
 	(if (stringp name)
-	    (insert ";\n " (mail-header-encode-parameter "name" name)
-		    "\";\n access-type=local-file")
-	  (insert
-	   (format ";\n "
-		   (mail-header-encode-parameter
-		    "name" (file-name-nondirectory (nth 2 name)))
-		   (mail-header-encode-parameter "site" (nth 1 name))
-		   (mail-header-encode-parameter
-		    "directory" (file-name-directory (nth 2 name)))))
-	  (insert ";\n access-type="
-		  (if (member (nth 0 name) '("ftp@" "anonymous@"))
-		      "anon-ftp"
-		    "ftp"))))
+	    (mml-insert-parameter
+	     (mail-header-encode-parameter "name" name)
+	     "access-type=local-file")
+	  (mml-insert-parameter
+	   (mail-header-encode-parameter
+	    "name" (file-name-nondirectory (nth 2 name)))
+	   (mail-header-encode-parameter "site" (nth 1 name))
+	   (mail-header-encode-parameter
+	    "directory" (file-name-directory (nth 2 name))))
+	  (mml-insert-parameter
+	   (concat "access-type="
+		   (if (member (nth 0 name) '("ftp@" "anonymous@"))
+		       "anon-ftp"
+		     "ftp")))))      
       (when parameters
-	(insert parameters)))
+	(mml-insert-parameter-string
+	 cont '(expiration size permission))))
     (insert "\n\n")
     (insert "Content-Type: " (cdr (assq 'type cont)) "\n")
     (insert "Content-ID: " (message-make-message-id) "\n")
@@ -296,8 +301,9 @@
 	(cond
 	 ((cdr (assq 'buffer cont))
 	  (insert-buffer-substring (cdr (assq 'buffer cont))))
-	 ((setq filename (cdr (assq 'filename cont)))
-	  (insert-file-contents-literally filename))
+	 ((and (setq filename (cdr (assq 'filename cont)))
+	       (not (equal (cdr (assq 'nofile cont)) "yes")))
+	  (mm-insert-file-contents filename))
 	 (t
 	  (insert (cdr (assq 'contents cont)))))
 	(goto-char (point-min))
@@ -338,7 +344,8 @@
 	(insert "; " (mail-header-encode-parameter
 		      "charset" (symbol-name charset))))
       (when parameters
-	(insert parameters))
+	(mml-insert-parameter-string
+	 cont '(name access-type expiration size permission)))
       (insert "\n"))
     (setq parameters
 	  (mml-parameter-string
@@ -347,7 +354,8 @@
 	      parameters)
       (insert "Content-Disposition: " (or disposition "inline"))
       (when parameters
-	(insert parameters))
+	(mml-insert-parameter-string
+	 cont '(filename creation-date modification-date read-date)))
       (insert "\n"))
     (unless (eq encoding '7bit)
       (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
@@ -363,12 +371,23 @@
 	;; Strip directory component from the filename parameter.
 	(when (eq type 'filename)
 	  (setq value (file-name-nondirectory value)))
-	(setq string (concat string ";\n "
+	(setq string (concat string "; "
 			     (mail-header-encode-parameter
 			      (symbol-name type) value)))))
     (when (not (zerop (length string)))
       string)))
 
+(defun mml-insert-parameter-string (cont types)
+  (let (value type)
+    (while (setq type (pop types))
+      (when (setq value (cdr (assq type cont)))
+	;; Strip directory component from the filename parameter.
+	(when (eq type 'filename)
+	  (setq value (file-name-nondirectory value)))
+	(mml-insert-parameter
+	 (mail-header-encode-parameter
+	  (symbol-name type) value))))))
+
 (defvar ange-ftp-path-format)
 (defvar efs-path-regexp)
 (defun mml-parse-file-name (path)
@@ -380,16 +399,13 @@
 	    (substring path (1+ (match-end 2))))
     path))
 
-(defun mml-quote-region (beg end)
-  "Quote the MML tags in the region."
-  (interactive "r")
-  (save-excursion
-    (goto-char beg)
-    ;; Quote parts.
-    (while (re-search-forward
-	    "<#/?!*\\(multipart\\|part\\|external\\)" end t)
-      (goto-char (match-beginning 1))
-      (insert "!"))))
+(defun mml-insert-buffer (buffer)
+  "Insert BUFFER at point and quote any MML markup."
+  (save-restriction
+    (narrow-to-region (point) (point))
+    (insert-buffer-substring buffer)
+    (mml-quote-region (point-min) (point-max))
+    (goto-char (point-max))))
 
 ;;;
 ;;; Transforming MIME to MML
@@ -421,15 +437,13 @@
   (let (textp buffer)
     ;; Determine type and stuff.
     (unless (stringp (car handle))
-      (unless (setq textp (equal
-			   (car (split-string
-				 (car (mm-handle-type handle)) "/"))
-			   "text"))
+      (unless (setq textp (equal (mm-handle-media-supertype handle)
+				 "text"))
 	(save-excursion
 	  (set-buffer (setq buffer (generate-new-buffer " *mml*")))
 	  (mm-insert-part handle))))
     (unless no-markup
-      (mml-insert-mml-markup handle buffer))
+      (mml-insert-mml-markup handle buffer textp))
     (cond
      ((stringp (car handle))
       (mapcar 'mml-insert-mime (cdr handle))
@@ -440,22 +454,250 @@
      (t
       (insert "<#/part>\n")))))
 
-(defun mml-insert-mml-markup (handle &optional buffer)
+(defun mml-insert-mml-markup (handle &optional buffer nofile)
   "Take a MIME handle and insert an MML tag."
   (if (stringp (car handle))
-      (insert "<#multipart type=" (cadr (split-string (car handle) "/"))
+      (insert "<#multipart type=" (mm-handle-media-subtype handle)
 	      ">\n")
-    (insert "<#part type=" (car (mm-handle-type handle)))
+    (insert "<#part type=" (mm-handle-media-type handle))
     (dolist (elem (append (cdr (mm-handle-type handle))
 			  (cdr (mm-handle-disposition handle))))
       (insert " " (symbol-name (car elem)) "=\"" (cdr elem) "\""))
+    (when (mm-handle-disposition handle)
+      (insert " disposition=" (car (mm-handle-disposition handle))))
     (when buffer
       (insert " buffer=\"" (buffer-name buffer) "\""))
+    (when nofile
+      (insert " nofile=yes"))
     (when (mm-handle-description handle)
       (insert " description=\"" (mm-handle-description handle) "\""))
-    (equal (split-string (car (mm-handle-type handle)) "/") "text")
     (insert ">\n")))
 
+(defun mml-insert-parameter (&rest parameters)
+  "Insert PARAMETERS in a nice way."
+  (dolist (param parameters)
+    (insert ";")
+    (let ((point (point)))
+      (insert " " param)
+      (when (> (current-column) 71)
+	(goto-char point)
+	(insert "\n ")
+	(end-of-line)))))
+
+;;;
+;;; Mode for inserting and editing MML forms
+;;;
+
+(defvar mml-mode-map
+  (let ((map (make-sparse-keymap))
+	(main (make-sparse-keymap)))
+    (define-key map "f" 'mml-attach-file)
+    (define-key map "b" 'mml-attach-buffer)
+    (define-key map "e" 'mml-attach-external)
+    (define-key map "q" 'mml-quote-region)
+    (define-key map "m" 'mml-insert-multipart)
+    (define-key map "p" 'mml-insert-part)
+    (define-key map "v" 'mml-validate)
+    (define-key map "P" 'mml-preview)
+    (define-key main "\M-m" map)
+    main))
+
+(easy-menu-define
+ mml-menu mml-mode-map ""
+ '("MML"
+   ("Attach"
+    ["File" mml-attach-file t]
+    ["Buffer" mml-attach-buffer t]
+    ["External" mml-attach-external t])
+   ("Insert"
+    ["Multipart" mml-insert-multipart t]
+    ["Part" mml-insert-part t])
+   ["Quote" mml-quote-region t]
+   ["Validate" mml-validate t]
+   ["Preview" mml-preview t]))
+
+(defvar mml-mode nil
+  "Minor mode for editing MML.")
+
+(defun mml-mode (&optional arg)
+  "Minor mode for editing MML.
+
+\\{mml-mode-map}"
+  (interactive "P")
+  (if (not (set (make-local-variable 'mml-mode)
+		(if (null arg) (not mml-mode)
+		  (> (prefix-numeric-value arg) 0))))
+      nil
+    (set (make-local-variable 'mml-mode) t)
+    (unless (assq 'mml-mode minor-mode-alist)
+      (push `(mml-mode " MML") minor-mode-alist))
+    (unless (assq 'mml-mode minor-mode-map-alist)
+      (push (cons 'mml-mode mml-mode-map)
+	    minor-mode-map-alist)))
+  (run-hooks 'mml-mode-hook))
+
+;;;
+;;; Helper functions for reading MIME stuff from the minibuffer and
+;;; inserting stuff to the buffer.
+;;;
+
+(defun mml-minibuffer-read-file (prompt)
+  (let ((file (read-file-name prompt nil nil t)))
+    ;; Prevent some common errors.  This is inspired by similar code in
+    ;; VM.
+    (when (file-directory-p file)
+      (error "%s is a directory, cannot attach" file))
+    (unless (file-exists-p file)
+      (error "No such file: %s" file))
+    (unless (file-readable-p file)
+      (error "Permission denied: %s" file))
+    file))
+
+(defun mml-minibuffer-read-type (name &optional default)
+  (let* ((default (or default
+		      (mm-default-file-encoding name)
+		      ;; Perhaps here we should check what the file
+		      ;; looks like, and offer text/plain if it looks
+		      ;; like text/plain.
+		      "application/octet-stream"))
+	 (string (completing-read
+		  (format "Content type (default %s): " default)
+		  (mapcar
+		   'list
+		   (delete-duplicates
+		    (nconc
+		     (mapcar (lambda (m) (cdr m))
+			     mailcap-mime-extensions)
+		     (apply
+		      'nconc
+		      (mapcar
+		       (lambda (l)
+			 (delq nil
+			       (mapcar
+				(lambda (m)
+				  (let ((type (cdr (assq 'type (cdr m)))))
+				    (if (equal (cadr (split-string type "/"))
+					       "*")
+					nil
+				      type)))
+				(cdr l))))
+		       mailcap-mime-data)))
+		    :test 'equal)))))
+    (if (not (equal string ""))
+	string
+      default)))
+
+(defun mml-minibuffer-read-description ()
+  (let ((description (read-string "One line description: ")))
+    (when (string-match "\\`[ \t]*\\'" description)
+      (setq description nil))
+    description))
+
+(defun mml-quote-region (beg end)
+  "Quote the MML tags in the region."
+  (interactive "r")
+  (save-excursion
+    (save-restriction
+      ;; Temporarily narrow the region to defend from changes
+      ;; invalidating END.
+      (narrow-to-region beg end)
+      (goto-char (point-min))
+      ;; Quote parts.
+      (while (re-search-forward
+	      "<#/?!*\\(multipart\\|part\\|external\\)" nil t)
+	(goto-char (match-beginning 1))
+	(insert "!")))))
+
+(defun mml-insert-tag (name &rest plist)
+  "Insert an MML tag described by NAME and PLIST."
+  (when (symbolp name)
+    (setq name (symbol-name name)))
+  (insert "<#" name)
+  (while plist
+    (let ((key (pop plist))
+	  (value (pop plist)))
+      (when value
+	;; Quote VALUE if it contains suspicious characters.
+	(when (string-match "[\"\\~/* \t\n]" value)
+	  (setq value (prin1-to-string value)))
+	(insert (format " %s=%s" key value)))))
+  (insert ">\n<#/" name ">\n"))
+
+;;; Attachment functions.
+
+(defun mml-attach-file (file &optional type description)
+  "Attach a file to the outgoing MIME message.
+The file is not inserted or encoded until you send the message with
+`\\[message-send-and-exit]' or `\\[message-send]'.
+
+FILE is the name of the file to attach.  TYPE is its content-type, a
+string of the form \"type/subtype\".  DESCRIPTION is a one-line
+description of the attachment."
+  (interactive
+   (let* ((file (mml-minibuffer-read-file "Attach file: "))
+	  (type (mml-minibuffer-read-type file))
+	  (description (mml-minibuffer-read-description)))
+     (list file type description)))
+  (mml-insert-tag 'part 'type type 'filename file 'disposition "attachment"
+		  'description description))
+
+(defun mml-attach-buffer (buffer &optional type description)
+  "Attach a buffer to the outgoing MIME message.
+See `mml-attach-file' for details of operation."
+  (interactive
+   (let* ((buffer (read-buffer "Attach buffer: "))
+	  (type (mml-minibuffer-read-type buffer "text/plain"))
+	  (description (mml-minibuffer-read-description)))
+     (list buffer type description)))
+  (mml-insert-tag 'part 'type type 'buffer buffer 'disposition "attachment"
+		  'description description))
+
+(defun mml-attach-external (file &optional type description)
+  "Attach an external file into the buffer.
+FILE is an ange-ftp/efs specification of the part location.
+TYPE is the MIME type to use."
+  (interactive
+   (let* ((file (mml-minibuffer-read-file "Attach external file: "))
+	  (type (mml-minibuffer-read-type file))
+	  (description (mml-minibuffer-read-description)))
+     (list file type description)))
+  (mml-insert-tag 'external 'type type 'name file 'disposition "attachment"
+		  'description description))
+
+(defun mml-insert-multipart (&optional type)
+  (interactive (list (completing-read "Multipart type (default mixed): "
+		     '(("mixed") ("alternative") ("digest") ("parallel")
+		       ("signed") ("encrypted"))
+		     nil nil "mixed")))
+  (or type
+      (setq type "mixed"))
+  (mml-insert-tag "multipart" 'type type)
+  (forward-line -1))
+
+(defun mml-preview (&optional raw)
+ "Display current buffer with Gnus, in a new buffer.
+If RAW, don't highlight the article."
+ (interactive "P")
+ (let ((buf (current-buffer)))
+   (switch-to-buffer (get-buffer-create 
+                     (concat (if raw "*Raw MIME preview of "
+                               "*MIME preview of ") (buffer-name))))
+   (erase-buffer)
+   (insert-buffer buf)
+   (mml-to-mime)
+   (unless raw
+     (run-hooks 'gnus-article-decode-hook)
+     (let ((gnus-newsgroup-name "dummy"))
+      (gnus-article-prepare-display)))
+   (fundamental-mode)
+   (setq buffer-read-only t)
+   (goto-char (point-min))))
+
+(defun mml-validate ()
+  "Validate the current MML document."
+  (interactive)
+  (mml-parse))
+
 (provide 'mml)
 
 ;;; mml.el ends here