X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-view.el;h=68314dec4eca46e18e5f7632b109a1681b609b5f;hb=aeadb8000788e6ae6970c6f6dd1991bdbef49286;hp=80917f4f959d55ce0ea8ca771128d77fcb877561;hpb=ec7a15d2044278ece0df0b45490f31bed5d81d5c;p=elisp%2Fsemi.git

diff --git a/mime-view.el b/mime-view.el
index 80917f4..68314de 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Created: 1994/7/13
-;;	Renamed: 1994/8/31 from tm-body.el
+;; Created: 1994/07/13
+;;	Renamed: 1994/08/31 from tm-body.el
 ;;	Renamed: 1997/02/19 from tm-view.el
 ;; Keywords: MIME, multimedia, mail, news
 
@@ -28,170 +28,335 @@
 ;;; Code:
 
 (require 'std11)
-(require 'mel)
-(require 'eword-decode)
-(require 'mime-parse)
-(require 'mime-text)
+(require 'mime-lib)
+(require 'semi-def)
+(require 'calist)
+(require 'alist)
+(require 'mailcap)
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-view-version-string
-  `,(concat "SEMI MIME-View "
-	    (mapconcat #'number-to-string (cdr semi-version) ".")
-	    " (" (car semi-version) ")"))
+  `,(concat (car mime-user-interface-version) " MIME-View "
+	    (mapconcat #'number-to-string
+		       (cddr mime-user-interface-version) ".")
+	    " (" (cadr mime-user-interface-version) ")"))
 
 
 ;;; @ variables
 ;;;
 
-(defvar mime-acting-condition
-  '(((type . text)(subtype . plain)
-     (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . text)(subtype . html)
-     (method "tm-html" nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    ((type . text)(subtype . x-rot13-47)
-     (method . mime-method-to-display-caesar)
-     (mode . "play")
-     )
-    ((type . text)(subtype . x-rot13-47-48)
-     (method . mime-method-to-display-caesar)
-     (mode . "play")
-     )
+(defgroup mime-view nil
+  "MIME view mode"
+  :group 'mime)
 
-    ((type . audio)(subtype . basic)
-     (method "tm-au"    nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    
-    ((type . image)
-     (method "tm-image" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    
-    ((type . video)(subtype . mpeg)
-     (method "tm-mpeg"  nil 'file "" 'encoding 'mode 'name)
-     (mode . "play")
-     )
-    
-    ((type . application)(subtype . postscript)
-     (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . application)(subtype . octet-stream)
-     (method . mime-method-to-save)(mode "play" "print")
-     )
+(defcustom mime-view-find-every-acting-situation t
+  "*Find every available acting-situation if non-nil."
+  :group 'mime-view
+  :type 'boolean)
+
+(defcustom mime-acting-situation-examples-file "~/.mime-example"
+  "*File name of example about acting-situation demonstrated by user."
+  :group 'mime-view
+  :type 'file)
+
+
+;;; @ in raw-buffer (representation space)
+;;;
+
+(defvar mime-preview-buffer nil
+  "MIME-preview buffer corresponding with the (raw) buffer.")
+(make-variable-buffer-local 'mime-preview-buffer)
+
+
+(defvar mime-raw-representation-type nil
+  "Representation-type of mime-raw-buffer.
+It must be nil, `binary' or `cooked'.
+If it is nil, `mime-raw-representation-type-alist' is used as default
+value.
+Notice that this variable is usually used as buffer local variable in
+raw-buffer.")
+
+(make-variable-buffer-local 'mime-raw-representation-type)
+
+(defvar mime-raw-representation-type-alist
+  '((mime-show-message-mode     . binary)
+    (mime-temp-message-mode     . binary)
+    (t                          . cooked)
+    )
+  "Alist of major-mode vs. representation-type of mime-raw-buffer.
+Each element looks like (SYMBOL . REPRESENTATION-TYPE).  SYMBOL is
+major-mode or t.  t means default.  REPRESENTATION-TYPE must be
+`binary' or `cooked'.
+This value is overridden by buffer local variable
+`mime-raw-representation-type' if it is not nil.")
+
+
+(defsubst mime-raw-find-entity-from-node-id (entity-node-id
+					     &optional message-info)
+  "Return entity from ENTITY-NODE-ID in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (mime-raw-find-entity-from-number (reverse entity-node-id) message-info))
+
+(defun mime-raw-find-entity-from-number (entity-number &optional message-info)
+  "Return entity from ENTITY-NUMBER in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (or message-info
+      (setq message-info mime-message-structure))
+  (if (eq entity-number t)
+      message-info
+    (let ((sn (car entity-number)))
+      (if (null sn)
+	  message-info
+	(let ((rc (nth sn (mime-entity-children message-info))))
+	  (if rc
+	      (mime-raw-find-entity-from-number (cdr entity-number) rc)
+	    ))
+	))))
+
+(defun mime-raw-find-entity-from-point (point &optional message-info)
+  "Return entity from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (or message-info
+      (setq message-info mime-message-structure))
+  (if (and (<= (mime-entity-point-min message-info) point)
+	   (<= point (mime-entity-point-max message-info)))
+      (let ((children (mime-entity-children message-info)))
+	(catch 'tag
+	  (while children
+	    (let ((ret
+		   (mime-raw-find-entity-from-point point (car children))))
+	      (if ret
+		  (throw 'tag ret)
+		))
+	    (setq children (cdr children)))
+	  message-info))))
 
-    ((type . message)(subtype . external-body)
-     ("access-type" . "anon-ftp")
-     (method . mime-method-to-display-message/external-ftp)
-     )
-    ((type . message)(subtype . rfc822)
-     (method . mime-method-to-display-message/rfc822)
-     (mode . "play")
-     )
-    ((type . message)(subtype . partial)
-     (method . mime-method-to-store-message/partial)
-     (mode . "play")
-     )
-    
-    ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
-     (mode . "play")
-     )
-    ((method . mime-method-to-save)(mode . "extract"))
-    ))
 
-(defvar mime-view-childrens-header-showing-Content-Type-list
-  '("message/rfc822" "message/news"))
+;;; @ in preview-buffer (presentation space)
+;;;
+
+(defvar mime-mother-buffer nil
+  "Mother buffer corresponding with the (MIME-preview) buffer.
+If current MIME-preview buffer is generated by other buffer, such as
+message/partial, it is called `mother-buffer'.")
+(make-variable-buffer-local 'mime-mother-buffer)
 
-(defvar mime-view-visible-media-type-list
-  '("text/plain" nil "text/richtext" "text/enriched"
-    "text/rfc822-headers"
-    "text/x-latex" "application/x-latex"
-    "message/delivery-status"
-    "application/pgp" "text/x-pgp"
-    "application/octet-stream"
-    "application/x-selection" "application/x-comment")
-  "*List of media-types to be able to display in MIME-preview buffer.
-Each elements are string of TYPE/SUBTYPE, e.g. \"text/plain\".")
+(defvar mime-raw-buffer nil
+  "Raw buffer corresponding with the (MIME-preview) buffer.")
+(make-variable-buffer-local 'mime-raw-buffer)
+
+(defvar mime-preview-original-window-configuration nil
+  "Window-configuration before mime-view-mode is called.")
+(make-variable-buffer-local 'mime-preview-original-window-configuration)
+
+(defun mime-preview-original-major-mode (&optional recursive)
+  "Return major-mode of original buffer.
+If optional argument RECURSIVE is non-nil and current buffer has
+mime-mother-buffer, it returns original major-mode of the
+mother-buffer."
+  (if (and recursive mime-mother-buffer)
+      (save-excursion
+	(set-buffer mime-mother-buffer)
+	(mime-preview-original-major-mode recursive)
+	)
+    (save-excursion
+      (set-buffer
+       (mime-entity-buffer
+	(get-text-property (point-min) 'mime-view-entity)))
+      major-mode)))
+
+
+;;; @ entity information
+;;;
+
+(defsubst mime-entity-representation-type (entity)
+  (with-current-buffer (mime-entity-buffer entity)
+    (or mime-raw-representation-type
+	(cdr (or (assq major-mode mime-raw-representation-type-alist)
+		 (assq t mime-raw-representation-type-alist))))))
+
+(defsubst mime-entity-cooked-p (entity)
+  (eq (mime-entity-representation-type entity) 'cooked))
+
+(defsubst mime-entity-parent (entity &optional message-info)
+  "Return mother entity of ENTITY.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' in buffer of ENTITY is used."
+  (mime-raw-find-entity-from-node-id
+   (cdr (mime-entity-node-id entity))
+   (or message-info
+       (save-excursion
+	 (set-buffer (mime-entity-buffer entity))
+	 mime-message-structure))))
+
+(defun mime-entity-situation (entity)
+  "Return situation of ENTITY."
+  (append (or (mime-entity-content-type entity)
+	      (make-mime-content-type 'text 'plain))
+	  (let ((d (mime-entity-content-disposition entity)))
+	    (cons (cons 'disposition-type
+			(mime-content-disposition-type d))
+		  (mapcar (function
+			   (lambda (param)
+			     (let ((name (car param)))
+			       (cons (cond ((string= name "filename")
+					    'filename)
+					   ((string= name "creation-date")
+					    'creation-date)
+					   ((string= name "modification-date")
+					    'modification-date)
+					   ((string= name "read-date")
+					    'read-date)
+					   ((string= name "size")
+					    'size)
+					   (t (cons 'disposition (car param))))
+				     (cdr param)))))
+			  (mime-content-disposition-parameters d))
+		  ))
+	  (list (cons 'encoding (mime-entity-encoding entity))
+		(cons 'major-mode
+		      (save-excursion
+			(set-buffer (mime-entity-buffer entity))
+			major-mode)))
+	  ))
 
-(defvar mime-view-content-button-visible-ctype-list
-  '("application/pgp"))
 
 (defvar mime-view-uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
-(defvar mime-view-ignored-field-list
-  '(".*Received" ".*Path" ".*Id" "References"
-    "Replied" "Errors-To"
-    "Lines" "Sender" ".*Host" "Xref"
-    "Content-Type" "Precedence"
-    "Status" "X-VM-.*")
-  "All fields that match this list will be hidden in MIME preview buffer.
-Each elements are regexp of field-name. [mime-view.el]")
+(defun mime-entity-uu-filename (entity)
+  (if (member (mime-entity-encoding entity)
+	      mime-view-uuencode-encoding-name-list)
+      (save-excursion
+	(set-buffer (mime-entity-buffer entity))
+	(goto-char (mime-entity-body-start entity))
+	(if (re-search-forward "^begin [0-9]+ "
+			       (mime-entity-body-end entity) t)
+	    (if (looking-at ".+$")
+		(buffer-substring (match-beginning 0)(match-end 0))
+	      )))))
+
+(defun mime-entity-filename (entity)
+  (or (mime-entity-uu-filename entity)
+      (let ((ret (mime-entity-content-disposition entity)))
+	(and ret
+	     (setq ret (mime-content-disposition-filename ret))
+	     (std11-strip-quoted-string ret)
+	     ))
+      (let ((ret (mime-entity-content-type entity)))
+	(and ret
+	     (setq ret
+		   (cdr
+		    (let ((param (mime-content-type-parameters ret)))
+		      (or (assoc "name" param)
+			  (assoc "x-name" param))
+		      )))
+	     (std11-strip-quoted-string ret)
+	     ))
+      ))
 
-(defvar mime-view-ignored-field-regexp
-  (concat "^"
-	  (apply (function regexp-or) mime-view-ignored-field-list)
-	  ":"))
+(defun mime-view-entity-title (entity)
+  (or (mime-entity-read-field entity 'Content-Description)
+      (mime-entity-read-field entity 'Subject)
+      (mime-entity-filename entity)
+      ""))
 
-(defvar mime-view-visible-field-list '("Dnas.*" "Message-Id")
-  "All fields that match this list will be displayed in MIME preview buffer.
-Each elements are regexp of field-name.")
 
-(defvar mime-view-redisplay nil)
+(defsubst mime-raw-point-to-entity-node-id (point &optional message-info)
+  "Return entity-node-id from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (mime-entity-node-id (mime-raw-find-entity-from-point point message-info)))
 
-(defvar mime-view-announcement-for-message/partial
-  (if (and (>= emacs-major-version 19) window-system)
-      "\
-\[[ This is message/partial style split message. ]]
-\[[ Please press `v' key in this buffer          ]]
-\[[ or click here by mouse button-2.             ]]"
-    "\
-\[[ This is message/partial style split message. ]]
-\[[ Please press `v' key in this buffer.         ]]"
-    ))
+(defsubst mime-raw-point-to-entity-number (point &optional message-info)
+  "Return entity-number from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (mime-entity-number (mime-raw-find-entity-from-point point message-info)))
 
+(defun mime-raw-flatten-message-info (&optional message-info)
+  "Return list of entity in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-message-structure' is used."
+  (or message-info
+      (setq message-info mime-message-structure))
+  (let ((dest (list message-info))
+	(rcl (mime-entity-children message-info)))
+    (while rcl
+      (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl))))
+      (setq rcl (cdr rcl)))
+    dest))
 
-;;; @@ entity button
+
+;;; @ presentation of preview
 ;;;
 
-(defun mime-view-insert-entity-button (rcnum cinfo
-					     media-type media-subtype params
-					     subj encoding)
-  "Insert entity-button."
-  (mime-insert-button
-   (let ((access-type (assoc "access-type" params))
-	 (num (or (cdr (assoc "x-part-number" params))
-		  (if (consp rcnum)
-		      (mapconcat (function
-				  (lambda (num)
-				    (format "%s" (1+ num))
-				    ))
-				 (reverse rcnum) ".")
-		    "0"))
-	      ))
-     (cond (access-type
-	    (let ((server (assoc "server" params)))
-	      (setq access-type (cdr access-type))
-	      (if server
-		  (format "%s %s ([%s] %s)"
-			  num subj access-type (cdr server))
+;;; @@ entity-button
+;;;
+
+;;; @@@ predicate function
+;;;
+
+(defun mime-view-entity-button-visible-p (entity)
+  "Return non-nil if header of ENTITY is visible.
+Please redefine this function if you want to change default setting."
+  (let ((media-type (mime-entity-media-type entity))
+	(media-subtype (mime-entity-media-subtype entity)))
+    (or (not (eq media-type 'application))
+	(and (not (eq media-subtype 'x-selection))
+	     (or (not (eq media-subtype 'octet-stream))
+		 (let ((mother-entity (mime-entity-parent entity)))
+		   (or (not (eq (mime-entity-media-type mother-entity)
+				'multipart))
+		       (not (eq (mime-entity-media-subtype mother-entity)
+				'encrypted)))
+		   )
+		 )))))
+
+;;; @@@ entity button generator
+;;;
+
+(defun mime-view-insert-entity-button (entity)
+  "Insert entity-button of ENTITY."
+  (let ((entity-node-id (mime-entity-node-id entity))
+	(params (mime-entity-parameters entity))
+	(subject (mime-view-entity-title entity)))
+    (mime-insert-button
+     (let ((access-type (assoc "access-type" params))
+	   (num (or (cdr (assoc "x-part-number" params))
+		    (if (consp entity-node-id)
+			(mapconcat (function
+				    (lambda (num)
+				      (format "%s" (1+ num))
+				      ))
+				   (reverse entity-node-id) ".")
+		      "0"))
+		))
+       (cond (access-type
+	      (let ((server (assoc "server" params)))
+		(setq access-type (cdr access-type))
+		(if server
+		    (format "%s %s ([%s] %s)"
+			    num subject access-type (cdr server))
 		(let ((site (cdr (assoc "site" params)))
 		      (dir (cdr (assoc "directory" params)))
 		      )
 		  (format "%s %s ([%s] %s:%s)"
-			  num subj access-type site dir)
+			  num subject access-type site dir)
 		  )))
 	    )
 	   (t
-	    (let ((charset (cdr (assoc "charset" params))))
+	    (let ((media-type (mime-entity-media-type entity))
+		  (media-subtype (mime-entity-media-subtype entity))
+		  (charset (cdr (assoc "charset" params)))
+		  (encoding (mime-entity-encoding entity)))
 	      (concat
-	       num " " subj
+	       num " " subject
 	       (let ((rest
 		      (format " <%s/%s%s%s>"
 			      media-type media-subtype
@@ -205,147 +370,336 @@ Each elements are regexp of field-name.")
 		     "\n\t")
 		 rest)))
 	    )))
-   (function mime-preview-play-current-entity))
-  )
-
-(defun mime-view-entity-button-function (rcnum cinfo
-					       media-type media-subtype
-					       params subj encoding)
-  "Insert entity button conditionally.
-Please redefine this function if you want to change default setting."
-  (or (null rcnum)
-      (and (eq media-type 'application)
-	   (or (eq media-subtype 'x-selection)
-	       (and (eq media-subtype 'octet-stream)
-		    (let ((entity-info
-			   (mime-raw-entity-node-id-to-entity-info
-			    (cdr rcnum) cinfo)))
-		      (and (eq (mime-entity-info-media-type entity-info)
-			       'multipart)
-			   (eq (mime-entity-info-media-subtype entity-info)
-			       'encrypted)
-			   )))))
-      (mime-view-insert-entity-button
-       rcnum cinfo media-type media-subtype params subj encoding)
-      ))
+     (function mime-preview-play-current-entity))
+    ))
 
 
-;;; @@ content header filter
+;;; @@ entity-header
 ;;;
 
-(defun mime-view-cut-header ()
-  (goto-char (point-min))
-  (while (re-search-forward mime-view-ignored-field-regexp nil t)
-    (let* ((beg (match-beginning 0))
-	   (end (match-end 0))
-	   (name (buffer-substring beg end))
-	   )
-      (catch 'visible
-	(let ((rest mime-view-visible-field-list))
-	  (while rest
-	    (if (string-match (car rest) name)
-		(throw 'visible nil)
-	      )
-	    (setq rest (cdr rest))))
-	(delete-region beg
-		       (save-excursion
-			 (if (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
-			     (match-beginning 0)
-			   (point-max))))
-	))))
+(defvar mime-header-presentation-method-alist nil
+  "Alist of major mode vs. corresponding header-presentation-method functions.
+Each element looks like (SYMBOL . FUNCTION).
+SYMBOL must be major mode in raw-buffer or t.  t means default.
+Interface of FUNCTION must be (ENTITY SITUATION).")
 
-(defun mime-view-default-content-header-filter ()
-  (mime-view-cut-header)
-  (eword-decode-header)
-  )
-
-(defvar mime-view-content-header-filter-alist nil)
-
-
-;;; @@ content filter
-;;;
+(defvar mime-view-ignored-field-list
+  '(".*Received" ".*Path" ".*Id" "References"
+    "Replied" "Errors-To"
+    "Lines" "Sender" ".*Host" "Xref"
+    "Content-Type" "Precedence"
+    "Status" "X-VM-.*")
+  "All fields that match this list will be hidden in MIME preview buffer.
+Each elements are regexp of field-name.")
 
-(defvar mime-view-content-filter-alist
-  '(("text/enriched" . mime-view-filter-for-text/enriched)
-    ("text/richtext" . mime-view-filter-for-text/richtext)
-    (t . mime-view-filter-for-text/plain)
-    )
-  "Alist of media-types vs. corresponding MIME-preview filter functions.
-Each element looks like (TYPE/SUBTYPE . FUNCTION) or (t . FUNCTION).
-TYPE/SUBTYPE is a string of media-type and FUNCTION is a filter
-function.  t means default media-type.")
+(defvar mime-view-visible-field-list '("Dnas.*" "Message-Id")
+  "All fields that match this list will be displayed in MIME preview buffer.
+Each elements are regexp of field-name.")
 
 
-;;; @@ entity separator
+;;; @@ entity-body
 ;;;
 
-(defun mime-view-entity-separator-function (rcnum cinfo
-						  media-type media-subtype
-						  params subj)
-  "Insert entity separator conditionally.
-Please redefine this function if you want to change default setting."
-  (or (mime-view-header-visible-p rcnum cinfo)
-      (mime-view-body-visible-p rcnum cinfo media-type media-subtype)
-      (progn
-	(goto-char (point-max))
-	(insert "\n")
-	)))
-
-
-;;; @@ buffer local variables
+;;; @@@ predicate function
 ;;;
 
-;;; @@@ in raw-buffer
+(defun mime-calist::field-match-method-as-default-rule (calist
+							field-type field-value)
+  (let ((s-field (assq field-type calist)))
+    (cond ((null s-field)
+	   (cons (cons field-type field-value) calist)
+	   )
+	  (t calist))))
+
+(define-calist-field-match-method
+  'header #'mime-calist::field-match-method-as-default-rule)
+
+(define-calist-field-match-method
+  'body #'mime-calist::field-match-method-as-default-rule)
+
+
+(defvar mime-preview-condition nil
+  "Condition-tree about how to display entity.")
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+			   (encoding . nil)
+			   (body . visible)))
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+			   (encoding . "7bit")
+			   (body . visible)))
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . octet-stream)
+			   (encoding . "8bit")
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . pgp)
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-latex)
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-selection)
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . application)(subtype . x-comment)
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . delivery-status)
+			   (body . visible)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((body . visible)
+   (body-presentation-method . mime-display-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . nil)
+   (body . visible)
+   (body-presentation-method . mime-display-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . enriched)
+   (body . visible)
+   (body-presentation-method . mime-display-text/enriched)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . richtext)
+   (body . visible)
+   (body-presentation-method . mime-display-text/richtext)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . text)(subtype . t)
+   (body . visible)
+   (body-presentation-method . mime-display-text/plain)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition
+ '((type . multipart)(subtype . alternative)
+   (body . visible)
+   (body-presentation-method . mime-display-multipart/alternative)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . partial)
+			   (body-presentation-method
+			    . mime-display-message/partial-button)))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . rfc822)
+			   (body-presentation-method . nil)
+			   (childrens-situation (header . visible)
+						(entity-button . invisible))))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . news)
+			   (body-presentation-method . nil)
+			   (childrens-situation (header . visible)
+						(entity-button . invisible))))
+
+
+;;; @@@ entity presentation
 ;;;
 
-(defvar mime-raw-message-info
-  "Information about structure of message.
-Please use reference function `mime-entity-info-SLOT' to get value of
-SLOT.
+(autoload 'mime-display-text/plain "mime-text")
+(autoload 'mime-display-text/enriched "mime-text")
+(autoload 'mime-display-text/richtext "mime-text")
 
-Following is a list of slots of the structure:
+(defvar mime-view-announcement-for-message/partial
+  (if (and (>= emacs-major-version 19) window-system)
+      "\
+\[[ This is message/partial style split message. ]]
+\[[ Please press `v' key in this buffer          ]]
+\[[ or click here by mouse button-2.             ]]"
+    "\
+\[[ This is message/partial style split message. ]]
+\[[ Please press `v' key in this buffer.         ]]"
+    ))
 
-node-id		reversed entity-number (list of integers or t)
-point-min	beginning point of region in raw-buffer
-point-max	end point of region in raw-buffer
-type		media-type (symbol)
-subtype		media-subtype (symbol)
-type/subtype	media-type/subtype (string or nil)
-parameters	parameter of Content-Type field (association list)
-encoding	Content-Transfer-Encoding (string or nil)
-children	entities included in this entity (list of content-infos)
+(defun mime-display-message/partial-button (&optional entity situation)
+  (save-restriction
+    (goto-char (point-max))
+    (if (not (search-backward "\n\n" nil t))
+	(insert "\n")
+      )
+    (goto-char (point-max))
+    (narrow-to-region (point-max)(point-max))
+    (insert mime-view-announcement-for-message/partial)
+    (mime-add-button (point-min)(point-max)
+		     #'mime-preview-play-current-entity)
+    ))
 
-If an entity includes other entities in its body, such as multipart or
-message/rfc822, entity-infos of other entities are included in
-`children', so entity-info become a tree.")
-(make-variable-buffer-local 'mime-raw-message-info)
+(defun mime-display-multipart/mixed (entity situation)
+  (let ((children (mime-entity-children entity))
+	(default-situation
+	  (cdr (assq 'childrens-situation situation))))
+    (while children
+      (mime-display-entity (car children) nil default-situation)
+      (setq children (cdr children))
+      )))
 
-(defvar mime-preview-buffer nil
-  "MIME-preview buffer corresponding with the (raw) buffer.")
-(make-variable-buffer-local 'mime-preview-buffer)
+(defcustom mime-view-type-subtype-score-alist
+  '(((text . enriched) . 3)
+    ((text . richtext) . 2)
+    ((text . plain)    . 1)
+    (t . 0))
+  "Alist MEDIA-TYPE vs corresponding score.
+MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
+  :group 'mime-view
+  :type '(repeat (cons (choice :tag "Media-Type"
+			       (item :tag "Type/Subtype"
+				     (cons symbol symbol))
+			       (item :tag "Type" symbol)
+			       (item :tag "Default" t))
+		       integer)))
+
+(defun mime-display-multipart/alternative (entity situation)
+  (let* ((children (mime-entity-children entity))
+	 (default-situation
+	   (cdr (assq 'childrens-situation situation)))
+	 (i 0)
+	 (p 0)
+	 (max-score 0)
+	 (situations
+	  (mapcar (function
+		   (lambda (child)
+		     (let ((situation
+			    (or (ctree-match-calist
+				 mime-preview-condition
+				 (append (mime-entity-situation child)
+					 default-situation))
+				default-situation)))
+		       (if (cdr (assq 'body-presentation-method situation))
+			   (let ((score
+				  (cdr
+				   (or (assoc
+					(cons
+					 (cdr (assq 'type situation))
+					 (cdr (assq 'subtype situation)))
+					mime-view-type-subtype-score-alist)
+				       (assq
+					(cdr (assq 'type situation))
+					mime-view-type-subtype-score-alist)
+				       (assq
+					t
+					mime-view-type-subtype-score-alist)
+				       ))))
+			     (if (> score max-score)
+				 (setq p i
+				       max-score score)
+			       )))
+		       (setq i (1+ i))
+		       situation)
+		     ))
+		  children)))
+    (setq i 0)
+    (while children
+      (let ((child (car children))
+	    (situation (car situations)))
+	(mime-display-entity child (if (= i p)
+				       situation
+				     (del-alist 'body-presentation-method
+						(copy-alist situation))))
+	)
+      (setq children (cdr children)
+	    situations (cdr situations)
+	    i (1+ i))
+      )))
 
 
-;;; @@@ in preview-buffer
+;;; @ acting-condition
 ;;;
 
-(defvar mime-mother-buffer nil
-  "Mother buffer corresponding with the (MIME-preview) buffer.
-If current MIME-preview buffer is generated by other buffer, such as
-message/partial, it is called `mother-buffer'.")
-(make-variable-buffer-local 'mime-mother-buffer)
-
-(defvar mime-raw-buffer nil
-  "Raw buffer corresponding with the (MIME-preview) buffer.")
-(make-variable-buffer-local 'mime-raw-buffer)
-
-(defvar mime-preview-original-major-mode nil
-  "Major-mode of mime-raw-buffer.")
-(make-variable-buffer-local 'mime-preview-original-major-mode)
-
-(make-variable-buffer-local 'mime-preview-original-window-configuration)
-
+(defvar mime-acting-condition nil
+  "Condition-tree about how to process entity.")
+
+(if (file-readable-p mailcap-file)
+    (let ((entries (mailcap-parse-file)))
+      (while entries
+	(let ((entry (car entries))
+	      view print shared)
+	  (while entry
+	    (let* ((field (car entry))
+		   (field-type (car field)))
+	      (cond ((eq field-type 'view)  (setq view field))
+		    ((eq field-type 'print) (setq print field))
+		    ((memq field-type '(compose composetyped edit)))
+		    (t (setq shared (cons field shared))))
+	      )
+	    (setq entry (cdr entry))
+	    )
+	  (setq shared (nreverse shared))
+	  (ctree-set-calist-with-default
+	   'mime-acting-condition
+	   (append shared (list '(mode . "play")(cons 'method (cdr view)))))
+	  (if print
+	      (ctree-set-calist-with-default
+	       'mime-acting-condition
+	       (append shared
+		       (list '(mode . "print")(cons 'method (cdr view))))
+	       ))
+	  )
+	(setq entries (cdr entries))
+	)))
 
-;;; @@ quitting method
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . application)(subtype . octet-stream)
+   (mode . "play")
+   (method . mime-detect-content)
+   ))
+
+(ctree-set-calist-with-default
+ 'mime-acting-condition
+ '((mode . "extract")
+   (method . mime-save-content)))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . text)(subtype . x-rot13-47)(mode . "play")
+   (method . mime-view-caesar)
+   ))
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . text)(subtype . x-rot13-47-48)(mode . "play")
+   (method . mime-view-caesar)
+   ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . rfc822)(mode . "play")
+   (method . mime-view-message/rfc822)
+   ))
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . partial)(mode . "play")
+   (method . mime-store-message/partial-piece)
+   ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . message)(subtype . external-body)
+   ("access-type" . "anon-ftp")
+   (method . mime-view-message/external-ftp)
+   ))
+
+(ctree-set-calist-strictly
+ 'mime-acting-condition
+ '((type . application)(subtype . octet-stream)
+   (method . mime-save-content)
+   ))
+
+
+;;; @ quitting method
 ;;;
 
 (defvar mime-preview-quitting-method-alist
@@ -353,24 +707,24 @@ message/partial, it is called `mother-buffer'.")
      . mime-preview-quitting-method-for-mime-show-message-mode))
   "Alist of major-mode vs. quitting-method of mime-view.")
 
-(defvar mime-view-over-to-previous-method-alist nil)
-(defvar mime-view-over-to-next-method-alist nil)
+(defvar mime-preview-over-to-previous-method-alist nil
+  "Alist of major-mode vs. over-to-previous-method of mime-view.")
 
-(defvar mime-view-show-summary-method nil
-  "Alist of major-mode vs. show-summary-method.")
+(defvar mime-preview-over-to-next-method-alist nil
+  "Alist of major-mode vs. over-to-next-method of mime-view.")
 
 
-;;; @@ following method
+;;; @ following method
 ;;;
 
-(defvar mime-view-following-method-alist nil
+(defvar mime-preview-following-method-alist nil
   "Alist of major-mode vs. following-method of mime-view.")
 
 (defvar mime-view-following-required-fields-list
   '("From"))
 
 
-;;; @@ X-Face
+;;; @ X-Face
 ;;;
 
 ;; hack from Gnus 5.0.4.
@@ -405,278 +759,77 @@ The compressed face will be piped to this command.")
 ;;; @ buffer setup
 ;;;
 
-(defun mime-view-setup-buffers (&optional ctl encoding ibuf obuf)
-  (if ibuf
-      (progn
-	(get-buffer ibuf)
-	(set-buffer ibuf)
-	))
-  (or mime-view-redisplay
-      (setq mime-raw-message-info (mime-parse-message ctl encoding))
-      )
-  (let* ((cinfo mime-raw-message-info)
-	 (pcl (mime-raw-flatten-message-info cinfo))
-	 (the-buf (current-buffer))
-	 (mode major-mode)
-	 )
-    (or obuf
-	(setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
-    (set-buffer (get-buffer-create obuf))
-    (let ((inhibit-read-only t))
-      ;;(setq buffer-read-only nil)
-      (widen)
-      (erase-buffer)
-      (setq mime-raw-buffer the-buf)
-      (setq mime-preview-original-major-mode mode)
-      (setq major-mode 'mime-view-mode)
-      (setq mode-name "MIME-View")
-      (while pcl
-	(mime-view-display-entity (car pcl) cinfo the-buf obuf)
-	(setq pcl (cdr pcl))
-	)
-      (set-buffer-modified-p nil)
-      )
-    (setq buffer-read-only t)
-    (set-buffer the-buf)
-    )
-  (setq mime-preview-buffer obuf)
-  )
-
-(defun mime-view-display-entity (content cinfo ibuf obuf)
-  "Display entity from content-info CONTENT."
-  (let* ((beg (mime-entity-info-point-min content))
-	 (end (mime-entity-info-point-max content))
-	 (media-type (mime-entity-info-media-type content))
-	 (media-subtype (mime-entity-info-media-subtype content))
-	 (ctype (if media-type
-		    (if media-subtype
-			(format "%s/%s" media-type media-subtype)
-		      (symbol-name media-type)
-		      )))
-	 (params (mime-entity-info-parameters content))
-	 (encoding (mime-entity-info-encoding content))
-	 (rcnum (mime-entity-info-node-id content))
-	 he e nb ne subj)
-    (set-buffer ibuf)
-    (goto-char beg)
-    (setq he (if (re-search-forward "^$" nil t)
-		 (1+ (match-end 0))
-	       end))
-    (if (> he end)
-	(setq he end)
-      )
-    (save-restriction
-      (narrow-to-region beg end)
-      (setq subj
-	    (eword-decode-string
-	     (mime-raw-get-subject params encoding)))
-      )
-    (set-buffer obuf)
-    (setq nb (point))
-    (narrow-to-region nb nb)
-    (mime-view-entity-button-function
-     rcnum cinfo media-type media-subtype params subj encoding)
-    (if (mime-view-header-visible-p rcnum cinfo)
-	(mime-view-display-header beg he)
-      )
-    (if (and (null rcnum)
-	     (member
-	      ctype mime-view-content-button-visible-ctype-list))
-	(save-excursion
-	  (goto-char (point-max))
-	  (mime-view-insert-entity-button
-	   rcnum cinfo media-type media-subtype params subj encoding)
-	  ))
-    (cond ((mime-view-body-visible-p rcnum cinfo media-type media-subtype)
-	   (mime-view-display-body he end
-				      rcnum cinfo ctype params subj encoding)
-	   )
-	  ((and (eq media-type 'message)(eq media-subtype 'partial))
-	   (mime-view-insert-message/partial-button)
-	   )
-	  ((and (null rcnum)
-		(null (mime-entity-info-children cinfo))
-		)
-	   (goto-char (point-max))
-	   (mime-view-insert-entity-button
-	    rcnum cinfo media-type media-subtype params subj encoding)
-	   ))
-    (mime-view-entity-separator-function
-     rcnum cinfo media-type media-subtype params subj)
-    (setq ne (point-max))
-    (widen)
-    (put-text-property nb ne 'mime-view-raw-buffer ibuf)
-    (put-text-property nb ne 'mime-view-entity-info content)
-    (goto-char ne)
-    ))
-
-(defun mime-view-display-header (beg end)
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (insert-buffer-substring mime-raw-buffer beg end)
-    (let ((f (cdr (assq mime-preview-original-major-mode
-			mime-view-content-header-filter-alist))))
-      (if (functionp f)
-	  (funcall f)
-	(mime-view-default-content-header-filter)
-	))
-    (run-hooks 'mime-view-content-header-filter-hook)
-    ))
-
-(defun mime-view-display-body (beg end rcnum cinfo ctype params subj encoding)
-  (save-restriction
-    (narrow-to-region (point-max)(point-max))
-    (insert-buffer-substring mime-raw-buffer beg end)
-    (let ((f (cdr (or (assoc ctype mime-view-content-filter-alist)
-		      (assq t mime-view-content-filter-alist)))))
-      (and (functionp f)
-	   (funcall f ctype params encoding)
-	   )
-      )))
-
-(defun mime-view-insert-message/partial-button ()
-  (save-restriction
-    (goto-char (point-max))
-    (if (not (search-backward "\n\n" nil t))
+(defun mime-display-entity (entity &optional situation
+				   default-situation preview-buffer)
+  (or preview-buffer
+      (setq preview-buffer (current-buffer)))
+  (let* ((raw-buffer (mime-entity-buffer entity))
+	 (start (mime-entity-point-min entity))
+	 e nb ne)
+    (set-buffer raw-buffer)
+    (goto-char start)
+    (or situation
+	(setq situation
+	      (or (ctree-match-calist mime-preview-condition
+				      (append (mime-entity-situation entity)
+					      default-situation))
+		  default-situation)))
+    (let ((button-is-invisible
+	   (eq (cdr (assq 'entity-button situation)) 'invisible))
+	  (header-is-visible
+	   (eq (cdr (assq 'header situation)) 'visible))
+	  (header-presentation-method
+	   (or (cdr (assq 'header-presentation-method situation))
+	       (cdr (assq major-mode mime-header-presentation-method-alist))))
+	  (body-presentation-method
+	   (cdr (assq 'body-presentation-method situation)))
+	  (children (mime-entity-children entity)))
+      (set-buffer preview-buffer)
+      (setq nb (point))
+      (narrow-to-region nb nb)
+      (or button-is-invisible
+	  (if (mime-view-entity-button-visible-p entity)
+	      (mime-view-insert-entity-button entity)
+	    ))
+      (when header-is-visible
+	(if header-presentation-method
+	    (funcall header-presentation-method entity situation)
+	  (mime-insert-decoded-header entity
+				      mime-view-ignored-field-list
+				      mime-view-visible-field-list
+				      (if (mime-entity-cooked-p entity)
+					  nil
+					default-mime-charset))
+	  )
+	(goto-char (point-max))
 	(insert "\n")
-      )
-    (goto-char (point-max))
-    (narrow-to-region (point-max)(point-max))
-    (insert mime-view-announcement-for-message/partial)
-    (mime-add-button (point-min)(point-max)
-		     (function mime-preview-play-current-entity))
-    ))
-
-(defun mime-raw-get-uu-filename (param &optional encoding)
-  (if (member (or encoding
-		  (cdr (assq 'encoding param))
-		  )
-	      mime-view-uuencode-encoding-name-list)
-      (save-excursion
-	(or (if (re-search-forward "^begin [0-9]+ " nil t)
-		(if (looking-at ".+$")
-		    (buffer-substring (match-beginning 0)(match-end 0))
-		  ))
-	    ""))
-    ))
-
-(defun mime-raw-get-subject (param &optional encoding)
-  (or (std11-find-field-body '("Content-Description" "Subject"))
-      (let (ret)
-	(if (or (and (setq ret (mime/Content-Disposition))
-		     (setq ret (assoc "filename" (cdr ret)))
-		     )
-		(setq ret (assoc "name" param))
-		(setq ret (assoc "x-name" param))
-		)
-	    (std11-strip-quoted-string (cdr ret))
-	  ))
-      (mime-raw-get-uu-filename param encoding)
-      ""))
-
-
-;;; @ entity information
-;;;
-
-(defun mime-raw-point-to-entity-number (position &optional message-info)
-  "Return entity-number from POTION in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (let ((b (mime-entity-info-point-min message-info))
-	(e (mime-entity-info-point-max message-info))
-	(c (mime-entity-info-children message-info))
+	(run-hooks 'mime-display-header-hook)
 	)
-    (if (and (<= b position)(<= position e))
-	(or (let (co ret (sn 0))
-	      (catch 'tag
-		(while c
-		  (setq co (car c))
-		  (setq ret (mime-raw-point-to-entity-number position co))
-		  (cond ((eq ret t) (throw 'tag (list sn)))
-			(ret (throw 'tag (cons sn ret)))
-			)
-		  (setq c (cdr c))
-		  (setq sn (1+ sn))
-		  )))
-	    t))))
-
-(defun mime-raw-point-to-entity-node-id (position &optional message-info)
-  "Return entity-node-id from POTION in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (reverse (mime-raw-point-to-entity-number position message-info)))
-
-(defsubst mime-raw-entity-node-id-to-entity-info (entity-node-id
-						  &optional message-info)
-  "Return entity-info from ENTITY-NODE-ID in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (mime-raw-entity-number-to-entity-info (reverse entity-node-id)
-					 message-info))
-
-(defun mime-raw-entity-number-to-entity-info (entity-number
-					      &optional message-info)
-  "Return entity-info from ENTITY-NUMBER in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (if (eq entity-number t)
-      message-info
-    (let ((sn (car entity-number)))
-      (if (null sn)
-	  message-info
-	(let ((rc (nth sn (mime-entity-info-children message-info))))
-	  (if rc
-	      (mime-raw-entity-number-to-entity-info (cdr entity-number) rc)
-	    ))
-	))))
-
-(defun mime-raw-flatten-message-info (&optional message-info)
-  "Return list of entity-infos in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (or message-info
-      (setq message-info mime-raw-message-info))
-  (let ((dest (list message-info))
-	(rcl (mime-entity-info-children message-info)))
-    (while rcl
-      (setq dest (nconc dest (mime-raw-flatten-message-info (car rcl))))
-      (setq rcl (cdr rcl)))
-    dest))
-
-
-;;; @@ predicate functions
-;;;
-
-(defun mime-view-header-visible-p (rcnum cinfo)
-  "Return non-nil if header of current entity is visible."
-  (or (null rcnum)
-      (member (mime-entity-info-type/subtype
-	       (mime-raw-entity-node-id-to-entity-info
-		(cdr rcnum) cinfo))
-	      mime-view-childrens-header-showing-Content-Type-list)
-      ))
-
-(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
-  (let ((ctype (if media-type
-		   (if media-subtype
-		       (format "%s/%s" media-type media-subtype)
-		     (symbol-name media-type)
-		     ))))
-    (and (member ctype mime-view-visible-media-type-list)
-	 (if (and (eq media-type 'application)
-		  (eq media-subtype 'octet-stream))
-	     (let ((ccinfo
-		    (mime-raw-entity-node-id-to-entity-info
-		     rcnum cinfo)))
-	       (member (mime-entity-info-encoding ccinfo)
-		       '(nil "7bit" "8bit"))
+      (cond (children)
+            ((functionp body-presentation-method)
+	     (funcall body-presentation-method entity situation)
+	     )
+	    (t
+	     (when button-is-invisible
+	       (goto-char (point-max))
+	       (mime-view-insert-entity-button entity)
 	       )
-	   t))
-    ))
+	     (or header-is-visible
+		 (progn
+		   (goto-char (point-max))
+		   (insert "\n")
+		   ))
+	     ))
+      (setq ne (point-max))
+      (widen)
+      (put-text-property nb ne 'mime-view-entity entity)
+      (goto-char ne)
+      (if children
+	  (if (functionp body-presentation-method)
+	      (funcall body-presentation-method entity situation)
+	    (mime-display-multipart/mixed entity situation)
+	    ))
+      )))
 
 
 ;;; @ MIME viewer mode
@@ -752,8 +905,6 @@ If optional argument MESSAGE-INFO is not specified,
     (define-key mime-view-mode-map
       "q"        (function mime-preview-quit))
     (define-key mime-view-mode-map
-      "h"        (function mime-preview-show-summary))
-    (define-key mime-view-mode-map
       "\C-c\C-x" (function mime-preview-kill-buffer))
     ;; (define-key mime-view-mode-map
     ;;   "<"        (function beginning-of-buffer))
@@ -815,7 +966,60 @@ If optional argument MESSAGE-INFO is not specified,
 	  (bury-buffer buf)
 	  ))))
 
-(defun mime-view-mode (&optional mother ctl encoding ibuf obuf
+(defvar mime-view-redisplay nil)
+
+(defun mime-display-message (message &optional preview-buffer
+				     mother default-keymap-or-function)
+  (mime-maybe-hide-echo-buffer)
+  (let ((win-conf (current-window-configuration))
+	(raw-buffer (mime-entity-buffer message)))
+    (or preview-buffer
+	(setq preview-buffer
+	      (concat "*Preview-" (buffer-name raw-buffer) "*")))
+    (set-buffer raw-buffer)
+    (mime-parse-buffer)
+    (setq mime-preview-buffer preview-buffer)
+    (let ((inhibit-read-only t))
+      (switch-to-buffer preview-buffer)
+      (widen)
+      (erase-buffer)
+      (setq mime-raw-buffer raw-buffer)
+      (if mother
+	  (setq mime-mother-buffer mother)
+	)
+      (setq mime-preview-original-window-configuration win-conf)
+      (setq major-mode 'mime-view-mode)
+      (setq mode-name "MIME-View")
+      (mime-display-entity message nil
+			   '((entity-button . invisible)
+			     (header . visible))
+			   preview-buffer)
+      (mime-view-define-keymap default-keymap-or-function)
+      (let ((point
+	     (next-single-property-change (point-min) 'mime-view-entity)))
+	(if point
+	    (goto-char point)
+	  (goto-char (point-min))
+	  (search-forward "\n\n" nil t)
+	  ))
+      (run-hooks 'mime-view-mode-hook)
+      ))
+  (set-buffer-modified-p nil)
+  (setq buffer-read-only t)
+  )
+
+(defun mime-view-buffer (&optional raw-buffer preview-buffer mother
+				   default-keymap-or-function)
+  (interactive)
+  (mime-display-message
+   (save-excursion
+     (if raw-buffer (set-buffer raw-buffer))
+     (mime-parse-message)
+     )
+   preview-buffer mother default-keymap-or-function))
+
+(defun mime-view-mode (&optional mother ctl encoding
+				 raw-buffer preview-buffer
 				 default-keymap-or-function)
   "Major mode for viewing MIME message.
 
@@ -835,32 +1039,18 @@ v		Decode current content as `play mode'
 e		Decode current content as `extract mode'
 C-c C-p		Decode current content as `print mode'
 a		Followup to current content.
-x		Display X-Face
 q		Quit
 button-2	Move to point under the mouse cursor
         	and decode current content as `play mode'
 "
   (interactive)
-  (mime-maybe-hide-echo-buffer)
-  (let ((ret (mime-view-setup-buffers ctl encoding ibuf obuf))
-	(win-conf (current-window-configuration))
-	)
-    (prog1
-	(switch-to-buffer ret)
-      (setq mime-preview-original-window-configuration win-conf)
-      (if mother
-	  (progn
-	    (setq mime-mother-buffer mother)
-	    ))
-      (mime-view-define-keymap default-keymap-or-function)
-      (let ((point (next-single-property-change (point-min) 'mime-view-entity-info)))
-	(if point
-	    (goto-char point)
-	  (goto-char (point-min))
-	  (search-forward "\n\n" nil t)
-	  ))
-      (run-hooks 'mime-view-mode-hook)
-      )))
+  (mime-display-message
+   (save-excursion
+     (if raw-buffer (set-buffer raw-buffer))
+     (or mime-view-redisplay
+	 (mime-parse-message ctl encoding))
+     )
+   preview-buffer mother default-keymap-or-function))
 
 
 ;;; @@ playing
@@ -891,49 +1081,39 @@ It decodes current entity to call internal or external method as
 ;;; @@ following
 ;;;
 
-(defun mime-preview-original-major-mode ()
-  "Return major-mode of original buffer.
-If a current buffer has mime-mother-buffer, return original major-mode
-of the mother-buffer."
-  (if mime-mother-buffer
-      (save-excursion
-	(set-buffer mime-mother-buffer)
-	(mime-preview-original-major-mode)
-	)
-    mime-preview-original-major-mode))
-
 (defun mime-preview-follow-current-entity ()
   "Write follow message to current entity.
 It calls following-method selected from variable
-`mime-view-following-method-alist'."
+`mime-preview-following-method-alist'."
   (interactive)
-  (let ((root-cinfo (get-text-property (point-min) 'mime-view-entity-info))
-	cinfo)
-    (while (null (setq cinfo (get-text-property (point) 'mime-view-entity-info)))
+  (let (entity)
+    (while (null (setq entity
+		       (get-text-property (point) 'mime-view-entity)))
       (backward-char)
       )
-    (let* ((p-beg (previous-single-property-change (point) 'mime-view-entity-info))
+    (let* ((p-beg
+	    (previous-single-property-change (point) 'mime-view-entity))
 	   p-end
-	   (rcnum (mime-entity-info-node-id cinfo))
-	   (len (length rcnum))
+	   (entity-node-id (mime-entity-node-id entity))
+	   (len (length entity-node-id))
 	   )
       (cond ((null p-beg)
 	     (setq p-beg
 		   (if (eq (next-single-property-change (point-min)
-							'mime-view-entity-info)
+							'mime-view-entity)
 			   (point))
 		       (point)
 		     (point-min)))
 	     )
-	    ((eq (next-single-property-change p-beg 'mime-view-entity-info)
+	    ((eq (next-single-property-change p-beg 'mime-view-entity)
 		 (point))
 	     (setq p-beg (point))
 	     ))
-      (setq p-end (next-single-property-change p-beg 'mime-view-entity-info))
+      (setq p-end (next-single-property-change p-beg 'mime-view-entity))
       (cond ((null p-end)
 	     (setq p-end (point-max))
 	     )
-	    ((null rcnum)
+	    ((null entity-node-id)
 	     (setq p-end (point-max))
 	     )
 	    (t
@@ -943,12 +1123,13 @@ It calls following-method selected from variable
 		 (let (e)
 		   (while (setq e
 				(next-single-property-change
-				 (point) 'mime-view-entity-info))
+				 (point) 'mime-view-entity))
 		     (goto-char e)
-		     (let ((rc (mime-entity-info-node-id
+		     (let ((rc (mime-entity-node-id
 				(get-text-property (point)
-						   'mime-view-entity-info))))
-		       (or (equal rcnum (nthcdr (- (length rc) len) rc))
+						   'mime-view-entity))))
+		       (or (equal entity-node-id
+				  (nthcdr (- (length rc) len) rc))
 			   (throw 'tag nil)
 			   ))
 		     (setq p-end e)
@@ -956,8 +1137,9 @@ It calls following-method selected from variable
 		 (setq p-end (point-max))
 		 ))
 	     ))
-      (let* ((mode (mime-preview-original-major-mode))
-	     (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
+      (let* ((mode (mime-preview-original-major-mode 'recursive))
+	     (new-name
+	      (format "%s-%s" (buffer-name) (reverse entity-node-id)))
 	     new-buf
 	     (the-buf (current-buffer))
 	     (a-buf mime-raw-buffer)
@@ -967,16 +1149,7 @@ It calls following-method selected from variable
 	  (erase-buffer)
 	  (insert-buffer-substring the-buf p-beg p-end)
 	  (goto-char (point-min))
-	  (if (mime-view-header-visible-p rcnum root-cinfo)
-	      (delete-region (goto-char (point-min))
-			     (if (re-search-forward "^$" nil t)
-				 (match-end 0)
-			       (point-min)))
-	    )
-	  (goto-char (point-min))
-	  (insert "\n")
-	  (goto-char (point-min))
-	  (let ((rcnum (mime-entity-info-node-id cinfo)) ci str)
+          (let ((entity-node-id (mime-entity-node-id entity)) ci str)
 	    (while (progn
 		     (setq
 		      str
@@ -984,27 +1157,26 @@ It calls following-method selected from variable
 			(set-buffer a-buf)
 			(setq
 			 ci
-			 (mime-raw-entity-node-id-to-entity-info
-			  rcnum))
+			 (mime-raw-find-entity-from-node-id entity-node-id))
 			(save-restriction
 			  (narrow-to-region
-			   (mime-entity-info-point-min ci)
-			   (mime-entity-info-point-max ci)
+			   (mime-entity-point-min ci)
+			   (mime-entity-point-max ci)
 			   )
 			  (std11-header-string-except
 			   (concat "^"
 				   (apply (function regexp-or) fields)
 				   ":") ""))))
 		     (if (and
-			  (eq (mime-entity-info-media-type ci) 'message)
-			  (eq (mime-entity-info-media-subtype ci) 'rfc822))
+			  (eq (mime-entity-media-type ci) 'message)
+			  (eq (mime-entity-media-subtype ci) 'rfc822))
 			 nil
 		       (if str
 			   (insert str)
 			 )
-		       rcnum))
+		       entity-node-id))
 	      (setq fields (std11-collect-field-names)
-		    rcnum (cdr rcnum))
+		    entity-node-id (cdr entity-node-id))
 	      )
 	    )
 	  (let ((rest mime-view-following-required-fields-list))
@@ -1027,7 +1199,7 @@ It calls following-method selected from variable
 	      ))
 	  (eword-decode-header)
 	  )
-	(let ((f (cdr (assq mode mime-view-following-method-alist))))
+	(let ((f (cdr (assq mode mime-preview-following-method-alist))))
 	  (if (functionp f)
 	      (funcall f new-buf)
 	    (message
@@ -1058,18 +1230,18 @@ If there is no upper entity, call function `mime-preview-quit'."
   (interactive)
   (let (cinfo)
     (while (null (setq cinfo
-		       (get-text-property (point) 'mime-view-entity-info)))
+		       (get-text-property (point) 'mime-view-entity)))
       (backward-char)
       )
-    (let ((r (mime-raw-entity-node-id-to-entity-info
-	      (cdr (mime-entity-info-node-id cinfo))
-	      (get-text-property 1 'mime-view-entity-info)))
+    (let ((r (mime-raw-find-entity-from-node-id
+	      (cdr (mime-entity-node-id cinfo))
+	      (get-text-property 1 'mime-view-entity)))
 	  point)
       (catch 'tag
 	(while (setq point (previous-single-property-change
-			    (point) 'mime-view-entity-info))
+			    (point) 'mime-view-entity))
 	  (goto-char point)
-	  (if (eq r (get-text-property (point) 'mime-view-entity-info))
+	  (if (eq r (get-text-property (point) 'mime-view-entity))
 	      (throw 'tag t)
 	    )
 	  )
@@ -1079,17 +1251,20 @@ If there is no upper entity, call function `mime-preview-quit'."
 (defun mime-preview-move-to-previous ()
   "Move to previous entity.
 If there is no previous entity, it calls function registered in
-variable `mime-view-over-to-previous-method-alist'."
+variable `mime-preview-over-to-previous-method-alist'."
   (interactive)
-  (while (null (get-text-property (point) 'mime-view-entity-info))
+  (while (null (get-text-property (point) 'mime-view-entity))
     (backward-char)
     )
-  (let ((point
-	 (previous-single-property-change (point) 'mime-view-entity-info)))
+  (let ((point (previous-single-property-change (point) 'mime-view-entity)))
     (if point
-	(goto-char point)
-      (let ((f (assq mime-preview-original-major-mode
-		     mime-view-over-to-previous-method-alist)))
+	(if (get-text-property (1- point) 'mime-view-entity)
+	    (goto-char point)
+	  (goto-char (1- point))
+	  (mime-preview-move-to-previous)
+	  )
+      (let ((f (assq (mime-preview-original-major-mode)
+		     mime-preview-over-to-previous-method-alist)))
 	(if f
 	    (funcall (cdr f))
 	  ))
@@ -1098,13 +1273,20 @@ variable `mime-view-over-to-previous-method-alist'."
 (defun mime-preview-move-to-next ()
   "Move to next entity.
 If there is no previous entity, it calls function registered in
-variable `mime-view-over-to-next-method-alist'."
+variable `mime-preview-over-to-next-method-alist'."
   (interactive)
-  (let ((point (next-single-property-change (point) 'mime-view-entity-info)))
+  (while (null (get-text-property (point) 'mime-view-entity))
+    (forward-char)
+    )
+  (let ((point (next-single-property-change (point) 'mime-view-entity)))
     (if point
-	(goto-char point)
-      (let ((f (assq mime-preview-original-major-mode
-		     mime-view-over-to-next-method-alist)))
+	(progn
+	  (goto-char point)
+	  (if (null (get-text-property point 'mime-view-entity))
+	      (mime-preview-move-to-next)
+	    ))
+      (let ((f (assq (mime-preview-original-major-mode)
+		     mime-preview-over-to-next-method-alist)))
 	(if f
 	    (funcall (cdr f))
 	  ))
@@ -1113,19 +1295,19 @@ variable `mime-view-over-to-next-method-alist'."
 (defun mime-preview-scroll-up-entity (&optional h)
   "Scroll up current entity.
 If reached to (point-max), it calls function registered in variable
-`mime-view-over-to-next-method-alist'."
+`mime-preview-over-to-next-method-alist'."
   (interactive)
   (or h
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-max))
-      (let ((f (assq mime-preview-original-major-mode
-                     mime-view-over-to-next-method-alist)))
+      (let ((f (assq (mime-preview-original-major-mode)
+                     mime-preview-over-to-next-method-alist)))
         (if f
             (funcall (cdr f))
           ))
     (let ((point
-	   (or (next-single-property-change (point) 'mime-view-entity-info)
+	   (or (next-single-property-change (point) 'mime-view-entity)
 	       (point-max))))
       (forward-line h)
       (if (> (point) point)
@@ -1136,30 +1318,20 @@ If reached to (point-max), it calls function registered in variable
 (defun mime-preview-scroll-down-entity (&optional h)
   "Scroll down current entity.
 If reached to (point-min), it calls function registered in variable
-`mime-view-over-to-previous-method-alist'."
+`mime-preview-over-to-previous-method-alist'."
   (interactive)
   (or h
       (setq h (1- (window-height)))
       )
   (if (= (point) (point-min))
-      (let ((f (assq mime-preview-original-major-mode
-                     mime-view-over-to-previous-method-alist)))
+      (let ((f (assq (mime-preview-original-major-mode)
+		     mime-preview-over-to-previous-method-alist)))
         (if f
             (funcall (cdr f))
           ))
-    (let (point)
-      (save-excursion
-	(catch 'tag
-	  (while (> (point) 1)
-	    (if (setq point
-		      (previous-single-property-change (point)
-						       'mime-view-entity-info))
-		(throw 'tag t)
-	      )
-	    (backward-char)
-	    )
-	  (setq point (point-min))
-	  ))
+    (let ((point
+	   (or (previous-single-property-change (point) 'mime-view-entity)
+	       (point-min))))
       (forward-line (- h))
       (if (< (point) point)
           (goto-char point)
@@ -1184,23 +1356,12 @@ If reached to (point-min), it calls function registered in variable
 It calls function registered in variable
 `mime-preview-quitting-method-alist'."
   (interactive)
-  (let ((r (assq mime-preview-original-major-mode
+  (let ((r (assq (mime-preview-original-major-mode)
 		 mime-preview-quitting-method-alist)))
     (if r
 	(funcall (cdr r))
       )))
 
-(defun mime-preview-show-summary ()
-  "Show summary.
-It calls function registered in variable
-`mime-view-show-summary-method'."
-  (interactive)
-  (let ((r (assq mime-preview-original-major-mode
-		 mime-view-show-summary-method)))
-    (if r
-	(funcall (cdr r))
-      )))
-
 (defun mime-preview-kill-buffer ()
   (interactive)
   (kill-buffer (current-buffer))