tm 7.80.
[elisp/tm.git] / tm-view.el
index 4110f29..b66f13d 100644 (file)
@@ -1,64 +1,72 @@
-;;;
-;;; A MIME viewer for GNU Emacs
-;;;
-;;; by Morioka Tomohiko, 1994/07/13
-;;; 
+;;; tm-view.el --- interactive MIME viewer for GNU Emacs
 
-(provide 'tm-view)
+;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
+;; Version: $Revision: 7.73 $
+;; Keywords: mail, news, MIME, multimedia
 
-;;; @ require modules
-;;;
+;; This file is part of tm (Tools for MIME).
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; 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.
+
+;;; Code:
 
 (require 'tl-str)
 (require 'tl-list)
+(require 'tl-atype)
 (require 'tl-misc)
-(require 'tl-header)
-(require 'tiny-mime)
-(require 'tm-misc)
+(require 'tl-822)
+(require 'mel)
+(require 'tm-ew-d)
+(require 'tm-def)
+(require 'tm-parse)
+(require 'tm-text)
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.58 1995/06/22 04:11:58 morioka Exp $")
+  "$Id: tm-view.el,v 7.73 1996/08/30 16:57:53 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
 
 
-;;; @ constants
-;;;
-
-(defconst mime/tspecials "\000-\040()<>@,;:\\\"/[\093?.=")
-(defconst mime/token-regexp
-  (concat "[^" mime/tspecials "]*"))
-(defconst mime/content-type-subtype-regexp
-  (concat mime/token-regexp "/" mime/token-regexp))
-(defconst mime/content-parameter-value-regexp
-  (concat "\\("
-         message/quoted-string-regexp
-         "\\|[^; \t\n]*\\)"))
-
-(defconst mime/output-buffer-name "*MIME-out*")
-(defconst mime/decoding-buffer-name "*MIME-decoding*")
-
-
 ;;; @ variables
 ;;;
 
 (defvar mime/content-decoding-condition
   '(((type . "text/plain")
      (method "tm-plain" nil 'file 'type 'encoding 'mode 'name))
-    ;;((type . "text/x-latex")
-    ;; (method "tm-latex" nil 'file 'type 'encoding 'mode 'name))
+    ((type . "text/html")
+     (method "tm-html" nil 'file 'type 'encoding 'mode 'name)
+     (mode . "play"))
+    ((type . "text/x-rot13-47")
+     (method . mime-article/decode-caesar))
+    
     ((type . "audio/basic")
      (method "tm-au"    nil 'file 'type 'encoding 'mode 'name))
-    ((type . "image/gif")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    
     ((type . "image/jpeg")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    ((type . "image/gif")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/x-tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
     ((type . "image/x-pic")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    ((type . "image/x-mag")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name))
+    
     ((type . "video/mpeg")
      (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name))
+    
     ((type . "application/octet-stream")
      (method "tm-file"  nil 'file 'type 'encoding 'mode 'name))
+    
     ;;((type . "message/external-body")
     ;; (method "xterm" nil
     ;;        "-e" "showexternal"
     ;;         'file '"access-type" '"name" '"site" '"directory"))
-    ((type . "message/partial")
-     (method . mime/decode-message/partial-region))
     ((type . "message/rfc822")
-     (method "tm-file"  nil 'file 'type 'encoding 'mode 'name))
+     (method . mime-article/view-message/rfc822))
+    ((type . "message/partial")
+     (method . mime-article/decode-message/partial))
+    
     ((method "metamail" t
             "-m" "tm" "-x" "-d" "-z" "-e" 'file)(mode . "play"))
+    ((method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
+     (mode . "extract"))
     ))
 
 (defvar mime-viewer/childrens-header-showing-Content-Type-list
-  '("message/rfc822"))
+  '("message/rfc822" "message/news"))
 
 (defvar mime-viewer/default-showing-Content-Type-list
-  '("text/plain" "text/richtext" "text/enriched"
+  '("text/plain" nil "text/richtext" "text/enriched"
     "text/x-latex" "application/x-latex"
-    "application/octet-stream" nil
+    "message/delivery-status"
+    "application/pgp" "text/x-pgp"
+    "application/octet-stream"
     "application/x-selection" "application/x-comment"))
 
-(defvar mime-viewer/content-subject-omitting-Content-Type-list
+(defvar mime-viewer/content-button-ignored-ctype-list
   '("application/x-selection"))
 
+(defvar mime-viewer/content-button-visible-ctype-list
+  '("application/pgp"))
+
 (defvar mime-viewer/uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
 (defvar mime-viewer/ignored-field-list
-  '("Received" "Return-Path" "Replied" "Errors-To"
-    "Lines" "Sender" "Path" "Nntp-Posting-Host"
-    "Content-Type" "Precedence"))
-
-(defvar mime-viewer/ignored-field-regexp)
-
-(defvar mime-viewer/decoding-mode "play" "MIME body decoding mode")
-
-(defvar mime-viewer/file-name-char-regexp "[A-Za-z0-9+_-]")
-
-(defvar mime-viewer/file-name-regexp-1
-  (concat mime-viewer/file-name-char-regexp "+\\."
-         mime-viewer/file-name-char-regexp "+"))
-
-(defvar mime-viewer/file-name-regexp-2
-  (concat (regexp-* mime-viewer/file-name-char-regexp)
-         "\\(\\." mime-viewer/file-name-char-regexp "+\\)*"))
+  '(".*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. [tm-view.el]")
+
+(defvar mime-viewer/ignored-field-regexp
+  (concat "^"
+         (apply (function regexp-or) mime-viewer/ignored-field-list)
+         ":"))
+
+(defvar mime-viewer/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. [tm-view.el]")
+
+(defvar mime-viewer/visible-field-regexp
+  (concat "^"
+         (apply (function regexp-or) mime-viewer/visible-field-list)
+         ":"))
+
+(defvar mime-viewer/redisplay nil)
+
+(defvar mime-viewer/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.         ]]"
+    ))
 
 
 ;;; @@ predicate functions
 ;;;
 
-(defun mime-viewer/header-visible-p (cnum cinfo &optional ctype)
-  (or (eq cnum t)
+(defun mime-viewer/header-visible-p (rcnum cinfo &optional ctype)
+  (or (null rcnum)
       (progn
        (setq ctype
              (mime::content-info/type
-              (mime-article/cnum-to-cinfo (butlast cnum) cinfo)
+              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)
               ))
        (member ctype mime-viewer/childrens-header-showing-Content-Type-list)
        )))
 
-(defun mime-viewer/body-visible-p (cnum cinfo &optional ctype)
+(defun mime-viewer/body-visible-p (rcnum cinfo &optional ctype)
   (let (ccinfo)
     (or ctype
        (setq ctype
              (mime::content-info/type
-              (setq ccinfo (mime-article/cnum-to-cinfo cnum cinfo))
+              (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
               ))
        )
     (and (member ctype mime-viewer/default-showing-Content-Type-list)
         (if (string-equal ctype "application/octet-stream")
             (progn
               (or ccinfo
-                  (setq ccinfo (mime-article/cnum-to-cinfo cnum cinfo))
+                  (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
                   )
               (member (mime::content-info/encoding ccinfo)
                       '(nil "7bit" "8bit"))
     ))
 
 
-;;; @@ content subject
+;;; @@ content button
 ;;;
 
-(defun mime-viewer/default-content-subject-function
-  (cnum cinfo ctype params subj)
-  (if (not (member
-           ctype
-           mime-viewer/content-subject-omitting-Content-Type-list))
-      (insert
-       (let ((access-type (assoc "access-type" params))
-            (num (or (assoc-value "x-part-number" params)
-                     (if (listp cnum)
-                         (mapconcat (function
-                                     (lambda (num)
-                                       (format "%s" (+ num 1))
-                                       ))
-                                    cnum ".")
-                       "0"))
-                 ))
-        (if access-type
+(defun mime-preview/insert-content-button
+  (rcnum cinfo ctype params subj encoding)
+  (save-restriction
+    (narrow-to-region (point)(point))
+    (let ((access-type (assoc "access-type" params))
+         (charset (assoc "charset" params))
+         (num (or (assoc-value "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)]\n" num subj
-                          access-type (cdr server))
+                  (insert (format "[%s %s ([%s] %s)]\n" num subj
+                                  access-type (cdr server)))
                 (let ((site (assoc-value "site" params))
                       (dir (assoc-value "directory" params))
                       )
-                  (format "[%s %s ([%s] %s:%s)]\n" num subj
-                          access-type site dir)
+                  (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
+                                  access-type site dir))
                   )))
-          (format "[%s %s (%s)]\n" num subj ctype)
-          )))))
+            )
+           (t
+            (insert (concat "[" num " " subj))
+            (let ((rest
+                   (if (setq charset (cdr charset))
+                       (if encoding
+                           (format " <%s; %s (%s)>]\n"
+                                   ctype charset encoding)
+                         (format " <%s; %s>]\n" ctype charset)
+                         )
+                     (format " <%s>]\n" ctype)
+                     )))
+              (if (>= (+ (current-column)(length rest))(window-width))
+                  (setq rest (concat "\n\t" rest))
+                )
+              (insert rest)
+              ))))
+    (tm:add-button (point-min)(1- (point-max))
+                  (function mime-viewer/play-content))
+    ))
+
+(defun mime-preview/default-content-button-function
+  (rcnum cinfo ctype params subj encoding)
+  (if (and (consp rcnum)
+          (not (member
+                ctype
+                mime-viewer/content-button-ignored-ctype-list)))
+      (mime-preview/insert-content-button
+       rcnum cinfo ctype params subj encoding)
+    ))
 
-(defvar mime-viewer/content-subject-function
-  (function mime-viewer/default-content-subject-function))
+(defvar mime-preview/content-button-function
+  (function mime-preview/default-content-button-function))
 
 
-;;; @ content header filter
+;;; @@ content header filter
 ;;;
 
-(defun mime-viewer/default-content-header-filter ()
+(defun mime-preview/cut-header ()
   (goto-char (point-min))
-  (while (and (re-search-forward
-              (concat "^" mime-viewer/ignored-field-regexp ":")
-              nil t)
-             (progn
+  (while (and
+         (re-search-forward mime-viewer/ignored-field-regexp nil t)
+         (let* ((beg (match-beginning 0))
+                (end (match-end 0))
+                (name (buffer-substring beg end))
+                )
+           (if (not (string-match mime-viewer/visible-field-regexp name))
                (delete-region
-                (match-beginning 0)
+                beg
                 (save-excursion
                   (and
                    (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
                    (match-beginning 0)
                    )))
-               t)))
+             )
+           t)))
+  )
+
+(defun mime-viewer/default-content-header-filter ()
+  (mime-preview/cut-header)
   (mime/decode-message-header)
   )
 
 ;;;
 
 (defvar mime-viewer/content-filter-alist
-  '(("text/plain" . mime-viewer/filter-text/plain)
-    (nil . mime-viewer/filter-text/plain)))
-
-(defun mime-viewer/default-content-filter (cnum cinfo ctype params subj)
-  )
+  '(("text/enriched" . mime-preview/filter-for-text/enriched)
+    ("text/richtext" . mime-preview/filter-for-text/richtext)
+    (t . mime-preview/filter-for-text/plain)
+    ))
 
 
 ;;; @@ content separator
 ;;;
 
-(defun mime-viewer/default-content-separator (cnum cinfo ctype params subj)
-  (if (and (not (mime-viewer/header-visible-p cnum cinfo ctype))
-          (not (mime-viewer/body-visible-p cnum cinfo ctype))
+(defun mime-preview/default-content-separator (rcnum cinfo ctype params subj)
+  (if (and (not (mime-viewer/header-visible-p rcnum cinfo ctype))
+          (not (mime-viewer/body-visible-p rcnum cinfo ctype))
           )
       (progn
        (goto-char (point-max))
 ;;; @@ buffer local variables
 ;;;
 
-(defvar mime::article/content-info nil)
+;; for XEmacs
 (defvar mime::article/preview-buffer nil)
-
+(defvar mime::article/code-converter nil)
 (defvar mime::preview/article-buffer nil)
-(defvar mime::preview/content-list nil)
-(defvar mime::preview/original-major-mode nil)
 
+(make-variable-buffer-local 'mime::article/content-info)
+(make-variable-buffer-local 'mime::article/preview-buffer)
+(make-variable-buffer-local 'mime::article/code-converter)
 
-;;; @@ quitting
-;;;
+(make-variable-buffer-local 'mime::preview/mother-buffer)
+(make-variable-buffer-local 'mime::preview/content-list)
+(make-variable-buffer-local 'mime::preview/article-buffer)
+(make-variable-buffer-local 'mime::preview/original-major-mode)
+(make-variable-buffer-local 'mime::preview/original-window-configuration)
 
-(defun mime::viewer/quitting-method-for-gnus4 ()
-  (mime-viewer/kill-buffer)
-  (delete-other-windows)
-  (gnus-article-show-summary)
-  (if (null gnus-have-all-headers)
-      (gnus-summary-select-article nil t)
-    ))
 
-(defun mime::viewer/quitting-method-for-rmail ()
-  (mime-viewer/kill-buffer)
-  (rmail-summary)
-  (delete-other-windows)
-  )
+;;; @@ quitting method
+;;;
 
 (defvar mime-viewer/quitting-method-alist
-  '((gnus-article-mode . mime::viewer/quitting-method-for-gnus4)
-    (rmail-mode        . mime::viewer/quitting-method-for-rmail)
-    (mime/show-message-mode
-     . (lambda ()
-        (set-window-configuration
-         mime/show-mode-old-window-configuration)
-        (let ((mother mime/mother-buffer))
-          (kill-buffer
-           (mime::preview-content-info/buffer
-            (car mime::preview/content-list)))
-          (mime-viewer/kill-buffer)
-          (pop-to-buffer mother)
-          (goto-char (point-min))
-          (mime-viewer/up-content)
-          )))
-    ))
+  '((mime/show-message-mode
+     . mime-viewer/quitting-method-for-mime/show-message-mode)))
 
+(defvar mime-viewer/over-to-previous-method-alist nil)
+(defvar mime-viewer/over-to-next-method-alist nil)
 
-;;; @ data structures
+(defvar mime-viewer/show-summary-method nil)
+
+
+;;; @@ following method
+;;;
+
+(defvar mime-viewer/following-method-alist nil)
+
+
+;;; @@ X-Face
 ;;;
 
-;;; @@ content-info
+;; hack from Gnus 5.0.4.
+
+(defvar mime-viewer/x-face-to-pbm-command
+  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm")
+
+(defvar mime-viewer/x-face-command
+  (concat mime-viewer/x-face-to-pbm-command
+         " | xv -quit -")
+  "String to be executed to display an X-Face field.
+The command will be executed in a sub-shell asynchronously.
+The compressed face will be piped to this command.")
+
+(defun mime-viewer/x-face-function ()
+  "Function to display X-Face field. You can redefine to customize."
+  ;; 1995/10/12 (c.f. tm-eng:130)
+  ;;   fixed by Eric Ding <ericding@San-Jose.ate.slb.com>
+  (save-restriction
+    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
+    ;; end
+    (goto-char (point-min))
+    (if (re-search-forward "^X-Face:[ \t]*" nil t)
+       (let ((beg (match-end 0))
+             (end (std11-field-end))
+             )
+         (call-process-region beg end "sh" nil 0 nil
+                              "-c" mime-viewer/x-face-command)
+         ))))
+
+
+;;; @@ utility
+;;;
+
+(defun mime-preview/get-original-major-mode ()
+  (if mime::preview/mother-buffer
+      (save-excursion
+       (set-buffer mime::preview/mother-buffer)
+       (mime-preview/get-original-major-mode)
+       )
+    mime::preview/original-major-mode))
+
+
+;;; @ data structures
 ;;;
-(define-structure mime::content-info
-  point-min point-max type parameters encoding children)
 
 ;;; @@ preview-content-info
 ;;;
+
 (define-structure mime::preview-content-info
   point-min point-max buffer content-info)
 
 
-;;; @ parser
+;;; @ buffer setup
 ;;;
 
-(defun mime-viewer/parse-message (&optional ctl encoding)
-  (make-variable-buffer-local 'mime::article/content-info)
-  (setq mime::article/content-info (mime-viewer/parse ctl encoding))
-  (let ((ret (mime-viewer/make-preview-buffer)))
-    (make-variable-buffer-local 'mime::article/preview-buffer)
+(defun mime-viewer/setup-buffer (&optional ctl encoding ibuf obuf)
+  (if ibuf
+      (progn
+       (get-buffer ibuf)
+       (set-buffer ibuf)
+       ))
+  (or mime-viewer/redisplay
+      (setq mime::article/content-info (mime/parse-message ctl encoding))
+      )
+  (let ((ret (mime-viewer/make-preview-buffer obuf)))
     (setq mime::article/preview-buffer (car ret))
     ret))
 
-(defun mime-viewer/parse (&optional ctl encoding)
-  (save-excursion
+(defun mime-viewer/make-preview-buffer (&optional obuf)
+  (let* ((cinfo mime::article/content-info)
+        (pcl (mime/flatten-content-info cinfo))
+        (dest (make-list (length pcl) nil))
+        (the-buf (current-buffer))
+        (mode major-mode)
+        )
+    (or obuf
+       (setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
+    (set-buffer (get-buffer-create obuf))
+    (setq buffer-read-only nil)
+    (widen)
+    (erase-buffer)
+    (setq mime::preview/article-buffer the-buf)
+    (setq mime::preview/original-major-mode mode)
+    (setq major-mode 'mime/viewer-mode)
+    (setq mode-name "MIME-View")
+    (let ((drest dest))
+      (while pcl
+       (setcar drest
+               (mime-preview/display-content (car pcl) cinfo the-buf obuf))
+       (setq pcl (cdr pcl)
+             drest (cdr drest))
+       ))
+    (set-buffer-modified-p nil)
+    (setq buffer-read-only t)
+    (set-buffer the-buf)
+    (list obuf dest)
+    ))
+
+(defun mime-preview/display-content (content cinfo ibuf obuf)
+  (let* ((beg (mime::content-info/point-min content))
+        (end (mime::content-info/point-max content))
+        (ctype (mime::content-info/type content))
+        (params (mime::content-info/parameters content))
+        (encoding (mime::content-info/encoding content))
+        (rcnum (mime::content-info/rcnum 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
-      (setq ctl (or (mime/Content-Type)
-                   ctl))
-      (setq encoding (or (mime/Content-Transfer-Encoding)
-                        encoding))
-      (let ((ctype (car ctl))
-           (params (cdr ctl))
-           )
-       (let ((boundary (assoc "boundary" params)))
-         (goto-char (point-min))
-         (search-forward "\n\n" nil t)
-         (cond (boundary
-                (save-excursion
-                  (save-restriction
-                    (setq boundary
-                          (message/strip-quoted-string (cdr boundary)))
-                    (narrow-to-region
-                     (point-min)
-                     (if (re-search-forward
-                          (concat "^--" (regexp-quote boundary) "--$") nil t)
-                         (match-beginning 0)
-                       (point-max)
-                       ))
-                    (mime-viewer/parse-multipart 
-                     (point-min)
-                     (point-max)
-                     boundary ctype params encoding)
-                    )))
-               ((string= ctype "message/rfc822")
-                (mime::content-info/create
-                 (point-min) (point-max)
-                 ctype params encoding
-                 (save-excursion
-                   (save-restriction
-                     (narrow-to-region (progn
-                                         (goto-char (point-min))
-                                         (if (re-search-forward "^$" nil t)
-                                             (+ (match-end 0) 1)
-                                           (point-min)
-                                           ))
-                                       (point-max))
-                     (list (mime-viewer/parse))
-                     ))
-                 )
-                )
-               (t 
-                (mime::content-info/create (point-min) (point-max)
-                                         ctype params encoding nil)
-                ))
-         )))))
-
-(defun mime-viewer/parse-multipart (beg end boundary ctype params encoding)
-  (let ((sep (concat "^--" (regexp-quote boundary) "$"))
-       cb ce ct ret ncb children)
-    (save-excursion
-      (save-restriction
-       (narrow-to-region beg end)
-       (goto-char (point-min))
-       (search-forward (concat "--" boundary "\n") nil t)
-       (setq cb (match-end 0))
-       (while (re-search-forward sep nil t)
-         (setq ce (match-beginning 0))
-         (setq ncb (match-end 0))
-         (save-excursion
-           (save-restriction
-             (narrow-to-region cb ce)
-             (setq ret (apply (function mime-viewer/parse)
-                              (cond ((string= ctype "multipart/digest")
-                                     '(("message/rfc822") "7bit")
-                                     )
-                                    (t '(("text/plain") "7bit"))
-                                    )
-                              ))
-             ))
-         (setq children (nconc children (list ret)))
-         (goto-char (mime::content-info/point-max ret))
-         (search-forward (concat "--" boundary "\n") nil t)
-         (goto-char (setq cb (match-end 0)))
-         )
-       (setq ce (point-max))
+      (narrow-to-region beg end)
+      (setq subj
+           (mime-eword/decode-string
+            (mime-article/get-subject params encoding)))
+      )
+    (set-buffer obuf)
+    (setq nb (point))
+    (narrow-to-region nb nb)
+    (funcall mime-preview/content-button-function
+            rcnum cinfo ctype params subj encoding)
+    (if (mime-viewer/header-visible-p rcnum cinfo ctype)
+       (mime-preview/display-header beg he)
+      )
+    (if (and (null rcnum)
+            (member
+             ctype mime-viewer/content-button-visible-ctype-list))
        (save-excursion
-         (save-restriction
-           (narrow-to-region cb ce)
-           (setq ret (apply (function mime-viewer/parse)
-                            (cond ((string= ctype "multipart/mixed")
-                                   '(("text/plain") "7bit")
-                                   )
-                                  ((string= ctype "multipart/digest")
-                                   '(("message/rfc822") "7bit")
-                                   ))
-                            ))
-           ))
-       (setq children (nconc children (list ret)))
+         (goto-char (point-max))
+         (mime-preview/insert-content-button
+          rcnum cinfo ctype params subj encoding)
+         ))
+    (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
+          (mime-preview/display-body he end
+                                     rcnum cinfo ctype params subj encoding)
+          )
+         ((equal ctype "message/partial")
+          (mime-preview/display-message/partial)
+          )
+         ((and (null rcnum)
+               (null (mime::content-info/children cinfo))
+               )
+          (goto-char (point-max))
+          (mime-preview/insert-content-button
+           rcnum cinfo ctype params subj encoding)
+          ))
+    (mime-preview/default-content-separator rcnum cinfo ctype params subj)
+    (prog1
+       (progn
+         (setq ne (point-max))
+         (widen)
+         (mime::preview-content-info/create nb (1- ne) ibuf content)
+         )
+      (goto-char ne)
+      )))
+
+(defun mime-preview/display-header (beg end)
+  (save-restriction
+    (narrow-to-region (point)(point))
+    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (let ((f (cdr (assq mime::preview/original-major-mode
+                       mime-viewer/content-header-filter-alist))))
+      (if (functionp f)
+         (funcall f)
+       (mime-viewer/default-content-header-filter)
        ))
-    (setq beg (point-min))
-    (goto-char beg)
-    (mime::content-info/create beg end ctype params encoding children)
+    (run-hooks 'mime-viewer/content-header-filter-hook)
     ))
 
-(defun mime::parse-parameter (str)
-  (let ((ret (message::parse "\;" str)))
-    (if ret
-       (if (setq ret
-                 (message::parse mime/token-regexp
-                                 (message::parsed/rest ret)))
-           (let ((parameter (downcase (message::parsed/matched ret))))
-             (if (setq ret (message::parse "=" (message::parsed/rest ret)))
-                 (if (setq ret
-                           (message::parse
-                            mime/content-parameter-value-regexp
-                            (message::parsed/rest ret)))
-                     (message::make-parsed
-                      (cons parameter
-                            (message/strip-quoted-string
-                             (message::parsed/matched ret))
-                            )
-                      (message::parsed/rest ret)
-                      )
-                   )))))))
-
-(defun mime::parse-field-body/Content-Type (str)
-  (let ((ret (message::parse mime/content-type-subtype-regexp str)))
-    (if ret
-       (let ((ctype (downcase (message::parsed/matched ret)))
-             dest)
-         (while (progn
-                  (setq str (message::parsed/rest ret))
-                  (setq ret (mime::parse-parameter str))
-                  )
-           (setq dest (cons (message::parsed/matched ret) dest))
-           )
-         (if (string-match "^[ \t]*$" str)
-             (cons ctype (reverse dest))
-           )))))
-
-(defun mime/Content-Type (&optional port)
-  "Read field-body of Content-Type field from PORT and parse it.
-PORT must be buffer or string. If PORT is omitted,
-it is regarded as current-buffer. [tm-view]"
-  (or port
-      (setq port (current-buffer))
-      )
-  (let ((str (if (get-buffer port)
-                (save-window-excursion
-                  (switch-to-buffer port)
-                  (message/get-field-body "Content-Type")
-                  )
-              port)
-            ))
-    (if str
-       (mime::parse-field-body/Content-Type
-        (message/unfolding-string str))
+(defun mime-preview/display-body (beg end
+                                     rcnum cinfo ctype params subj encoding)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (let ((f (cdr (or (assoc ctype mime-viewer/content-filter-alist)
+                     (assq t mime-viewer/content-filter-alist)))))
+      (and (functionp f)
+          (funcall f ctype params encoding)
+          )
       )))
 
-(defun mime/Content-Transfer-Encoding (&optional default-encoding)
-  (let ((str (message/get-field-body "Content-Transfer-Encoding")))
-    (if str
-       (downcase str)
-      default-encoding)
-      ))
+(defun mime-preview/display-message/partial ()
+  (save-restriction
+    (goto-char (point-max))
+    (if (not (search-backward "\n\n" nil t))
+       (insert "\n")
+      )
+    (let ((be (point-max)))
+      (narrow-to-region be be)
+      (insert mime-viewer/announcement-for-message/partial)
+      (tm:add-button (point-min)(point-max)
+                    (function mime-viewer/play-content))
+      )))
 
-(defun mime-viewer/get-subject (param)
-  (if (member (cdr (assq 'encoding param))
+(defun mime-article/get-uu-filename (param &optional encoding)
+  (if (member (or encoding
+                 (cdr (assq 'encoding param))
+                 )
              mime-viewer/uuencode-encoding-name-list)
       (save-excursion
        (or (if (re-search-forward "^begin [0-9]+ " nil t)
@@ -480,153 +558,27 @@ it is regarded as current-buffer. [tm-view]"
                    (buffer-substring (match-beginning 0)(match-end 0))
                  ))
            ""))
-    (let (ret)
-      (or (and (setq ret (assoc "name" param))
-              (message/strip-quoted-string (cdr ret))
-              )
-         (and (setq ret (assoc "x-name" param))
-              (message/strip-quoted-string (cdr ret))
-              )
-         
-         (save-excursion
-           (save-restriction
-             (narrow-to-region (point-min)
-                               (or (and (search-forward "\n\n" nil t)
-                                        (match-beginning 0)
-                                        )
-                                   (point-max)))
-             (or
-              (message/get-field-body "Content-Description")
-              (message/get-field-body "Subject")
-              )))
-         ""))
     ))
 
-(defun mime-viewer/get-name (param)
-  (let ((str (mime-viewer/get-subject param)))
-    (if (string-match " " str)
-       (if (or (string-match mime-viewer/file-name-regexp-1 str)
-               (string-match mime-viewer/file-name-regexp-2 str))
-           (substring str (match-beginning 0)(match-end 0))
-         )
-      (replace-as-filename str)
-      )))
-
-(defun mime-viewer/make-preview-buffer (&optional buf cinfo obuf)
-  (let ((the-buf (current-buffer))
-       (mode major-mode)
-       pcl dest)
-    (setq buf
-         (if (null buf)
-             (current-buffer)
-           (prog1
-               (get-buffer buf)
-             (switch-to-buffer buf)
-             )))
-    (or cinfo
-       (setq cinfo mime::article/content-info)
-       )
-    (or obuf
-       (setq obuf (concat "*Preview-" (buffer-name buf) "*"))
-       )
-    (setq pcl (mime::make-flat-content-list cinfo))
-    (let ((bf (get-buffer obuf)))
-      (switch-to-buffer obuf)
-      (setq buffer-read-only nil)
-      (if bf
-         (erase-buffer)
-       ))
-    (make-variable-buffer-local 'mime::preview/article-buffer)
-    (setq mime::preview/article-buffer the-buf)
-    (make-variable-buffer-local 'mime::preview/original-major-mode)
-    (setq mime::preview/original-major-mode mode)
-    (setq major-mode 'mime/viewer-mode)
-    (setq mode-name "MIME-View")
-    (setq dest
-         (mapcar
-          (function
-           (lambda (cell)
-             (let ((beg (mime::content-info/point-min cell))
-                   (end (mime::content-info/point-max cell))
-                   (ctype (mime::content-info/type cell))
-                   (params (mime::content-info/parameters cell))
-                   he cnum e nb ne subj str)
-               (setq cnum (mime::get-point-content-number beg cinfo))
-               (switch-to-buffer the-buf)
-               (setq he (save-excursion
-                          (goto-char beg)
-                          (re-search-forward "^$" nil t)
-                          (+ (match-end 0) 1)
-                          ))
-               (switch-to-buffer obuf)
-               (setq nb (point))
-               (narrow-to-region nb nb)
-               (switch-to-buffer the-buf)
-               (if (mime-viewer/header-visible-p cnum cinfo ctype)
-                   (progn
-                     (setq str (buffer-substring beg he))
-                     (switch-to-buffer obuf)
-                     (insert str)
-                     (let ((f (assq
-                               mode
-                               mime-viewer/content-header-filter-alist))
-                           )
-                       (if (and f (setq f (cdr f)))
-                           (funcall f)
-                         (mime-viewer/default-content-header-filter)
-                         ))
-                     (switch-to-buffer the-buf)
-                     ))
-               (if (mime-viewer/body-visible-p cnum cinfo ctype)
-                   (let (be)
-                     (setq str (buffer-substring he end))
-                     (switch-to-buffer obuf)
-                     (save-restriction
-                       (setq be (point-max))
-                       (narrow-to-region be be)
-                       (insert str)
-                       (setq ne (point-max))
-                       (let ((f (or (assoc-value
-                                     ctype
-                                     mime-viewer/content-filter-alist)
-                                    )))
-                         (if (and f (fboundp f))
-                             (funcall f ctype params encoding)
-                           (mime-viewer/default-content-filter
-                            cnum cinfo ctype params subj)
-                           ))
-                       (setq ne (point-max))
-                       )
-                     (switch-to-buffer the-buf)
-                     ))
-               (switch-to-buffer obuf)
-               (mime-viewer/default-content-separator
-                cnum cinfo ctype params subj)
-               (prog1
-                   (progn
-                     (setq subj (mime-viewer/get-subject params))
-                     (goto-char nb)
-                     (funcall mime-viewer/content-subject-function
-                              cnum cinfo ctype params subj)
-                     (setq ne (point-max))
-                     (widen)
-                     (mime::preview-content-info/create nb (- ne 1)
-                                                        buf cell)
-                     )
-                 (goto-char ne)
-                 ))))
-          pcl))
-    (set-buffer-modified-p nil)
-    (setq buffer-read-only t)
-    (switch-to-buffer the-buf)
-    (list obuf dest)
-    ))
+(defun mime-article/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))
+               )
+           (rfc822/strip-quoted-string (cdr ret))
+         ))
+      (mime-article/get-uu-filename param encoding)
+      ""))
 
 
 ;;; @ content information
 ;;;
 
-(defun mime::get-point-content-number (p &optional cinfo)
+(defun mime-article/point-content-number (p &optional cinfo)
   (or cinfo
       (setq cinfo mime::article/content-info)
       )
@@ -639,15 +591,26 @@ it is regarded as current-buffer. [tm-view]"
              (catch 'tag
                (while c
                  (setq co (car c))
-                 (setq ret (mime::get-point-content-number p co))
+                 (setq ret (mime-article/point-content-number p co))
                  (cond ((eq ret t) (throw 'tag (list sn)))
                        (ret (throw 'tag (cons sn ret)))
                        )
                  (setq c (cdr c))
-                 (setq sn (+ sn 1))
+                 (setq sn (1+ sn))
                  )))
            t))))
 
+(defun mime-article/rcnum-to-cinfo (rcnum &optional cinfo)
+  (or cinfo
+      (setq cinfo mime::article/content-info)
+      )
+  (find-if (function
+           (lambda (ci)
+             (equal (mime::content-info/rcnum ci) rcnum)
+             ))
+          (mime/flatten-content-info cinfo)
+          ))
+
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
       (setq cinfo mime::article/content-info)
@@ -663,7 +626,7 @@ it is regarded as current-buffer. [tm-view]"
            ))
        ))))
 
-(defun mime::make-flat-content-list (&optional cinfo)
+(defun mime/flatten-content-info (&optional cinfo)
   (or cinfo
       (setq cinfo mime::article/content-info)
       )
@@ -671,12 +634,12 @@ it is regarded as current-buffer. [tm-view]"
        (rcl (mime::content-info/children cinfo))
        )
     (while rcl
-      (setq dest (nconc dest (mime::make-flat-content-list (car rcl))))
+      (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
       (setq rcl (cdr rcl))
       )
     dest))
 
-(defun mime::point-preview-content (p &optional pcl)
+(defun mime-preview/point-pcinfo (p &optional pcl)
   (or pcl
       (setq pcl mime::preview/content-list)
       )
@@ -695,319 +658,153 @@ it is regarded as current-buffer. [tm-view]"
     ))
 
 
-;;; @ decoder
+;;; @ MIME viewer mode
 ;;;
 
-(defun mime/Quoted-Printable-decode-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char (point-min))
-      (while (re-search-forward "=\n" nil t)
-       (replace-match "")
-       )
-      (goto-char (point-min))
-      (let (b e str)
-       (while (re-search-forward mime/Quoted-Printable-octet-regexp nil t)
-         (setq b (match-beginning 0))
-         (setq e (match-end 0))
-         (setq str (buffer-substring b e))
-         (delete-region b e)
-         (insert (mime/Quoted-Printable-decode-string str))
-         ))
-      )))
-
-(defun mime/Base64-decode-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char (point-min))
-      (while (search-forward "\n" nil t)
-       (replace-match "")
-       )
-      (let ((str (buffer-substring (point-min)(point-max))))
-       (delete-region (point-min)(point-max))
-       (insert (mime/base64-decode-string str))
-       ))))
-
-(defun mime/make-method-args (cal format)
-  (mapcar (function
-          (lambda (arg)
-            (if (stringp arg)
-                arg
-              (let ((ret (cdr (assoc (eval arg) cal))))
-                (if ret
-                    ret
-                  "")
-                ))
-            ))
-         format))
-
-(defun mime/start-external-method-region (beg end cal)
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char beg)
-      (let ((method (cdr (assoc 'method cal)))
-           (name (mime-viewer/get-name cal))
-           )
-       (if method
-           (let ((file (make-temp-name
-                        (expand-file-name "TM" mime/tmp-dir)))
-                 b args)
-             (if (nth 1 method)
-                 (setq b beg)
-               (setq b
-                     (if (re-search-forward "^$" nil t)
-                         (+ (match-end 0) 1)
-                       (point-min)
-                       ))
-               )
-             (goto-char b)
-             (write-region b end file)
-             (setq cal (put-alist
-                        'name (replace-as-filename name) cal))
-             (setq cal (put-alist 'file file cal))
-             (setq args (nconc
-                         (list (car method)
-                               mime/output-buffer-name (car method)
-                               )
-                         (mime/make-method-args cal (cdr (cdr method)))
-                         ))
-             (apply (function start-process) args)
-             (mime/show-output-buffer)
-             ))
-       ))))
-
-(defun mime/decode-message/partial-region (beg end cal)
-  (goto-char beg)
-  (let* ((root-dir (expand-file-name
-                   (concat "m-prts-" (user-login-name)) mime/tmp-dir))
-        (id (cdr (assoc "id" cal)))
-        (number (cdr (assoc "number" cal)))
-        (total (cdr (assoc "total" cal)))
-        (the-buf (current-buffer))
-        file
-        (mother mime::article/preview-buffer))
-    (if (not (file-exists-p root-dir))
-       (make-directory root-dir)
-      )
-    (setq id (replace-as-filename id))
-    (setq root-dir (concat root-dir "/" id))
-    (if (not (file-exists-p root-dir))
-       (make-directory root-dir)
-      )
-    (setq file (concat root-dir "/FULL"))
-    (if (not (file-exists-p file))
-       (progn
-         (re-search-forward "^$")
-         (goto-char (+ (match-end 0) 1))
-         (setq file (concat root-dir "/" number))
-         (write-region (point) (point-max) file)
-         (if (get-buffer "*MIME-temp*")
-             (kill-buffer "*MIME-temp*")
-           )
-         (switch-to-buffer "*MIME-temp*")
-         (let ((i 1)
-               (max (string-to-int total))
-               )
-           (catch 'tag
-             (while (<= i max)
-               (setq file (concat root-dir "/" (int-to-string i)))
-               (if (not (file-exists-p file))
-                   (progn
-                     (switch-to-buffer the-buf)
-                     (throw 'tag nil)
-                     ))
-               (insert-file-contents file)
-               (goto-char (point-max))
-               (setq i (+ i 1))
-               )
-             (delete-other-windows)
-             (write-file (concat root-dir "/FULL"))
-             (setq major-mode 'mime/show-message-mode)
-             (mime/viewer-mode mother)
-             (pop-to-buffer (current-buffer))
-             ))
-         )
-      (progn
-       (delete-other-windows)
-       (find-file file)
-       (setq major-mode 'mime/show-message-mode)
-       (mime/viewer-mode mother)
-       (pop-to-buffer (current-buffer))
-       ))
-    ))
-
-(defun mime/get-content-decoding-alist (al)
-  (get-unified-alist mime/content-decoding-condition al)
-  )
-
-(defun mime::article/decode-content-region (cinfo)
-  (let ((beg (mime::content-info/point-min cinfo))
-       (end (mime::content-info/point-max cinfo))
-       (ctype (mime::content-info/type cinfo))
-       (params (mime::content-info/parameters cinfo))
-       (encoding (mime::content-info/encoding cinfo))
-       )
-    (if ctype
-       (let (method cal ret)
-         (setq cal (append (list (cons 'type ctype)
-                                 (cons 'encoding encoding)
-                                 (cons 'major-mode major-mode)
-                                 )
-                           params))
-         (if mime-viewer/decoding-mode
-             (setq cal (cons
-                        (cons 'mode mime-viewer/decoding-mode)
-                        cal))
-           )
-         (setq ret (mime/get-content-decoding-alist cal))
-         (setq method (cdr (assoc 'method ret)))
-         (cond ((and (symbolp method)
-                     (fboundp method))
-                (funcall method beg end ret)
-                )
-               ((and (listp method)(stringp (car method)))
-                (mime/start-external-method-region beg end ret)
-                )
-               (t (mime/show-output-buffer
-                   "No method are specified for %s\n" ctype)
-                  ))
-         ))
-    ))
+(defconst mime-viewer/menu-title "MIME-View")
+(defconst mime-viewer/menu-list
+  '((up                 "Move to upper content"      mime-viewer/up-content)
+    (previous   "Move to previous content"   mime-viewer/previous-content)
+    (next       "Move to next content"       mime-viewer/next-content)
+    (scroll-down "Scroll to previous content" mime-viewer/scroll-down-content)
+    (scroll-up  "Scroll to next content"     mime-viewer/scroll-up-content)
+    (play       "Play Content"               mime-viewer/play-content)
+    (extract    "Extract Content"            mime-viewer/extract-content)
+    (print      "Print"                      mime-viewer/print-content)
+    (x-face     "Show X Face"                mime-viewer/display-x-face)
+    )
+  "Menu for MIME Viewer")
+
+(if running-xemacs
+    (progn
+      (defvar mime-viewer/xemacs-popup-menu
+       (cons mime-viewer/menu-title
+             (mapcar (function
+                      (lambda (item)
+                        (vector (nth 1 item)(nth 2 item) t)
+                        ))
+                     mime-viewer/menu-list)))
+      (defun mime-viewer/xemacs-popup-menu (event)
+       "Popup the menu in the MIME Viewer buffer"
+       (interactive "e")
+       (select-window (event-window event))
+       (set-buffer (event-buffer event))
+       (popup-menu 'mime-viewer/xemacs-popup-menu))
+      ))
 
-(defun mime/show-output-buffer (&rest forms)
-  (let ((the-buf (current-buffer)))
-    (if (null (get-buffer-window mime/output-buffer-name))
-       (split-window-vertically (/ (* (window-height) 3) 4))
-      )
-    (pop-to-buffer mime/output-buffer-name)
-    (goto-char (point-max))
-    (if forms
-       (insert (apply (function format) forms))
+(defun mime-viewer/define-keymap (&optional mother)
+  (let ((mime/viewer-mode-map (if mother
+                                 (copy-keymap mother)
+                               (make-keymap))))
+    (suppress-keymap mime/viewer-mode-map)
+    (define-key mime/viewer-mode-map
+      "u"        (function mime-viewer/up-content))
+    (define-key mime/viewer-mode-map
+      "p"        (function mime-viewer/previous-content))
+    (define-key mime/viewer-mode-map
+      "n"        (function mime-viewer/next-content))
+    (define-key mime/viewer-mode-map
+      " "        (function mime-viewer/scroll-up-content))
+    (define-key mime/viewer-mode-map
+      "\M- "     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\177"     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\C-m"     (function mime-viewer/next-line-content))
+    (define-key mime/viewer-mode-map
+      "\C-\M-m"  (function mime-viewer/previous-line-content))
+    (define-key mime/viewer-mode-map
+      "v"        (function mime-viewer/play-content))
+    (define-key mime/viewer-mode-map
+      "e"         (function mime-viewer/extract-content))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-p" (function mime-viewer/print-content))
+    (define-key mime/viewer-mode-map
+      "x"        (function mime-viewer/display-x-face))
+    (define-key mime/viewer-mode-map
+      "a"        (function mime-viewer/follow-content))
+    (define-key mime/viewer-mode-map
+      "q"        (function mime-viewer/quit))
+    (define-key mime/viewer-mode-map
+      "h"        (function mime-viewer/show-summary))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-x" (function mime-viewer/kill-buffer))
+    (define-key mime/viewer-mode-map
+      "<"        (function beginning-of-buffer))
+    (define-key mime/viewer-mode-map
+      ">"        (function end-of-buffer))
+    (define-key mime/viewer-mode-map
+      "?"        (function describe-mode))
+    (if mouse-button-2
+       (define-key mime/viewer-mode-map
+         mouse-button-2 (function tm:button-dispatcher))
       )
-    (pop-to-buffer the-buf)
-    ))
-
-
-;;; @ content filter
-;;;
-
-(defvar mime-viewer/code-converter-alist nil)
-
-(defun mime-viewer/default-code-convert-region
-  (beg end charset &optional encoding)
-  (if (member charset '("quoted-printable" "base64"))
-      (mime/code-convert-region-to-emacs beg (point-max) charset)
-    ))
-
-(defun mime-viewer/filter-text/plain (ctype params encoding)
-  (let ((charset (cdr (assoc "charset" params)))
-       (beg (point-min)) (end (point-max))
-       )
-    (goto-char (point-min))
-    (cond ((string= encoding "quoted-printable")
-          (mime/Quoted-Printable-decode-region beg end)
+    (cond (running-xemacs
+          (define-key mime/viewer-mode-map
+            mouse-button-3 (function mime-viewer/xemacs-popup-menu))
           )
-         ((string= encoding "base64")
-          (mime/Base64-decode-region beg end)
+         ((>= emacs-major-version 19)
+          (define-key mime/viewer-mode-map [menu-bar mime-view]
+            (cons mime-viewer/menu-title
+                  (make-sparse-keymap mime-viewer/menu-title)))
+          (mapcar (function
+                   (lambda (item)
+                     (define-key mime/viewer-mode-map
+                       (vector 'menu-bar 'mime-view (car item))
+                       (cons (nth 1 item)(nth 2 item))
+                       )
+                     ))
+                  (reverse mime-viewer/menu-list)
+                  )
           ))
-    (let* ((mode mime::preview/original-major-mode)
-          (m (assq mode mime-viewer/code-converter-alist))
-          )
-      (if (and m (fboundp (setq m (cdr m))))
-         (funcall m beg (point-max) charset encoding)
-       (mime-viewer/default-code-convert-region beg (point-max)
-                                                charset encoding)
-       )))
-  (run-hooks 'mime-viewer/plain-text-preview-hook)
-  )
-
-
-;;; @ MIME viewer mode
-;;;
-
-(defvar mime/viewer-mode-map nil)
-(if (null mime/viewer-mode-map)
-    (progn
-      (setq mime/viewer-mode-map (make-keymap))
-      (suppress-keymap mime/viewer-mode-map)
-      (define-key mime/viewer-mode-map
-       "u"        (function mime-viewer/up-content))
-      (define-key mime/viewer-mode-map
-       "p"        (function mime-viewer/previous-content))
-      (define-key mime/viewer-mode-map
-       "n"        (function mime-viewer/next-content))
-      (define-key mime/viewer-mode-map
-       " "        (function mime-viewer/scroll-up-content))
-      (define-key mime/viewer-mode-map
-       "\M- "     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-       "\177"     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-       "\C-m"     (function mime-viewer/next-line-content))
-      (define-key mime/viewer-mode-map
-       "\C-\M-m"  (function mime-viewer/previous-line-content))
-      (define-key mime/viewer-mode-map
-       "v"        (function mime-viewer/play-content))
-      (define-key mime/viewer-mode-map
-       "e"        (function mime-viewer/extract-content))
-      (define-key mime/viewer-mode-map
-       "\C-c\C-p" (function mime-viewer/print-content))
-      (define-key mime/viewer-mode-map
-       "q"        (function mime-viewer/quit))
-      (define-key mime/viewer-mode-map
-       "\C-c\C-x" (function mime-viewer/kill-buffer))
-      ))
+    (use-local-map mime/viewer-mode-map)
+    (run-hooks 'mime-viewer/define-keymap-hook)
+    ))
 
-(defun mime/viewer-mode (&optional mother ctl encoding)
+(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf
+                                  mother-keymap)
   "Major mode for viewing MIME message.
 
-u      Move to upper content
-p      Move to previous content
-n      Move to next content
-SPC    Scroll up
-M-SPC  Scroll down
-DEL    Scroll down
-RET    Move to next line
-M-RET  Move to previous line
-v      Decode the content as `play mode'
-e      Decode the content as `extract mode'
-C-c C-p        Decode the content as `print mode'
-q      Quit
+Here is a list of the standard keys for mime/viewer-mode.
+
+key            feature
+---            -------
+
+u              Move to upper content
+p              Move to previous content
+n              Move to next content
+SPC            Scroll up or move to next content
+M-SPC          Scroll down or move to previous content
+DEL            Scroll down or move to previous content
+RET            Move to next line
+M-RET          Move to previous line
+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)
-  (setq mime-viewer/ignored-field-regexp
-       (concat "\\("
-               (mapconcat (function regexp-quote)
-                          mime-viewer/ignored-field-list "\\|")
-               "\\)"))
-  (let ((buf (get-buffer mime/output-buffer-name))
-       (the-buf (current-buffer))
-       )
+  (let ((buf (get-buffer mime/output-buffer-name)))
     (if buf
-       (progn
-         (switch-to-buffer buf)
+       (save-excursion
+         (set-buffer buf)
          (erase-buffer)
-         (switch-to-buffer the-buf)
          )))
-  (let ((ret (mime-viewer/parse-message ctl encoding))) 
+  (let ((ret (mime-viewer/setup-buffer ctl encoding ibuf obuf))
+       (win-conf (current-window-configuration))
+       )
     (prog1
        (switch-to-buffer (car ret))
+      (setq mime::preview/original-window-configuration win-conf)
       (if mother
          (progn
-           (make-variable-buffer-local
-            'mime/show-mode-old-window-configuration)
-           (setq mime/show-mode-old-window-configuration
-                 (current-window-configuration))
-           (make-variable-buffer-local 'mime/mother-buffer)
-           (setq mime/mother-buffer mother)
+           (setq mime::preview/mother-buffer mother)
            ))
-      (use-local-map mime/viewer-mode-map)
-      (make-variable-buffer-local 'mime::preview/content-list)
+      (mime-viewer/define-keymap mother-keymap)
       (setq mime::preview/content-list (nth 1 ret))
       (goto-char
        (let ((ce (mime::preview-content-info/point-max
@@ -1025,11 +822,11 @@ q        Quit
 
 (defun mime-preview/point-content-number (point)
   (save-window-excursion
-    (let ((pc (mime::point-preview-content (point)))
+    (let ((pc (mime-preview/point-pcinfo (point)))
          cinfo)
       (switch-to-buffer (mime::preview-content-info/buffer pc))
       (setq cinfo (mime::preview-content-info/content-info pc))
-      (mime::get-point-content-number (mime::content-info/point-min cinfo))
+      (mime-article/point-content-number (mime::content-info/point-min cinfo))
       )))
 
 (defun mime-preview/cinfo-to-pcinfo (cinfo)
@@ -1043,24 +840,9 @@ q Quit
        (setq rpcl (cdr rpcl))
        ))))
 
-(defvar mime-preview/after-decoded-position nil)
+(autoload 'mime-preview/decode-content "tm-play")
 
-(defun mime-preview/decode-content ()
-  (interactive)
-  (let ((pc (mime::point-preview-content (point))))
-    (if pc
-       (let ((the-buf (current-buffer)))
-         (setq mime-preview/after-decoded-position (point))
-         (switch-to-buffer (mime::preview-content-info/buffer pc))
-         (mime::article/decode-content-region
-          (mime::preview-content-info/content-info pc))
-         (if (eq (current-buffer)
-                 (mime::preview-content-info/buffer pc))
-             (progn
-               (switch-to-buffer the-buf)
-               (goto-char mime-preview/after-decoded-position)
-               ))
-         ))))
+(defvar mime-viewer/decoding-mode "play" "MIME body decoding mode")
 
 (defun mime-viewer/play-content ()
   (interactive)
@@ -1080,32 +862,126 @@ q       Quit
     (mime-preview/decode-content)
     ))
 
+(defun mime-viewer/follow-content ()
+  (interactive)
+  (let ((root-cinfo
+        (mime::preview-content-info/content-info
+         (car mime::preview/content-list)))
+       pc p-beg p-end cinfo rcnum)
+    (let ((rest mime::preview/content-list)
+         b e cell len rc)
+      (if (catch 'tag
+           (while (setq cell (car rest))
+             (setq b (mime::preview-content-info/point-min cell)
+                   e (mime::preview-content-info/point-max cell))
+             (setq rest (cdr rest))
+             (if (and (<= b (point))(<= (point) e))
+                 (throw 'tag cell)
+               )
+             ))
+         (progn
+           (setq pc cell
+                 cinfo (mime::preview-content-info/content-info pc)
+                 rcnum (mime::content-info/rcnum cinfo))
+           (setq len (length rcnum))
+           (setq p-beg (mime::preview-content-info/point-min pc)
+                 p-end (mime::preview-content-info/point-max pc))
+           (while (and (setq cell (car rest))
+                       (progn
+                         (setq rc
+                               (mime::content-info/rcnum
+                                (mime::preview-content-info/content-info
+                                 cell)))
+                         (equal rcnum
+                                (nthcdr (- (length rc) len) rc))
+                         ))
+             (setq p-end (mime::preview-content-info/point-max cell))
+             (setq rest (cdr rest))
+             ))))
+    (if pc
+       (let* ((mode (mime-preview/get-original-major-mode))
+              (new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
+              new-buf
+              (the-buf (current-buffer))
+              (a-buf mime::preview/article-buffer)
+              (hb (mime::content-info/point-min cinfo))
+              (he (mime::content-info/point-max cinfo))
+              fields from to cc reply-to subj mid f)
+         (save-excursion
+           (set-buffer (setq new-buf (get-buffer-create new-name)))
+           (erase-buffer)
+           (insert-buffer-substring the-buf p-beg p-end)
+           (goto-char (point-min))
+           (if (mime-viewer/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::content-info/rcnum cinfo)) ci str)
+             (while (progn
+                      (setq str
+                            (save-excursion
+                              (set-buffer a-buf)
+                              (setq ci (mime-article/rcnum-to-cinfo rcnum))
+                              (save-restriction
+                                (narrow-to-region
+                                 (mime::content-info/point-min ci)
+                                 (mime::content-info/point-max ci)
+                                 )
+                                (std11-header-string-except
+                                 (concat "^"
+                                         (apply (function regexp-or) fields)
+                                         ":") ""))))
+                      (if (string-equal (mime::content-info/type ci)
+                                        "message/rfc822")
+                          nil
+                        (if str
+                            (insert str)
+                          )
+                        rcnum))
+               (setq fields (std11-collect-field-names)
+                     rcnum (cdr rcnum))
+               )
+             )
+           (mime/decode-message-header)
+           )
+         (funcall (cdr (assq mode mime-viewer/following-method-alist))
+                  new-buf)
+         ))))
+
+(defun mime-viewer/display-x-face ()
+  (interactive)
+  (save-window-excursion
+    (set-buffer mime::preview/article-buffer)
+    (mime-viewer/x-face-function)
+    ))
+
 (defun mime-viewer/up-content ()
   (interactive)
-  (let ((pc (mime::point-preview-content (point))) cinfo
-       (the-buf (current-buffer))
-       cn r)
-    (switch-to-buffer (mime::preview-content-info/buffer pc))
-    (setq cinfo (mime::preview-content-info/content-info pc))
-    (setq cn (mime::get-point-content-number
-             (mime::content-info/point-min cinfo)))
-    (if (eq cn t)
-       (mime-viewer/quit the-buf
-                         (mime::preview-content-info/buffer pc)
-                         )
-      (setq r (mime-article/cnum-to-cinfo (butlast cn)))
-      (switch-to-buffer the-buf)
-      (catch 'tag
-       (let ((rpcl mime::preview/content-list) cell)
-         (while rpcl
-           (setq cell (car rpcl))
-           (if (eq r (mime::preview-content-info/content-info cell))
-               (progn
-                 (goto-char (mime::preview-content-info/point-min cell))
-                 (throw 'tag nil)
-                 ))
+  (let* ((pc (mime-preview/point-pcinfo (point)))
+        (cinfo (mime::preview-content-info/content-info pc))
+        (rcnum (mime::content-info/rcnum cinfo))
+        )
+    (if rcnum
+       (let ((r (save-excursion
+                  (set-buffer (mime::preview-content-info/buffer pc))
+                   (mime-article/rcnum-to-cinfo (cdr rcnum))
+                  ))
+             (rpcl mime::preview/content-list)
+             cell)
+         (while (and
+                 (setq cell (car rpcl))
+                 (not (eq r (mime::preview-content-info/content-info cell)))
+                 )
            (setq rpcl (cdr rpcl))
-           )))
+           )
+         (goto-char (mime::preview-content-info/point-min cell))
+         )
+      (mime-viewer/quit)
       )))
 
 (defun mime-viewer/previous-content ()
@@ -1121,7 +997,13 @@ q Quit
            (throw 'tag (goto-char beg))
          )
        (setq i (- i 1))
-       ))
+       )
+      (let ((f (assq mime::preview/original-major-mode
+                    mime-viewer/over-to-previous-method-alist)))
+       (if f
+           (funcall (cdr f))
+         ))
+      )
     ))
 
 (defun mime-viewer/next-content ()
@@ -1136,7 +1018,13 @@ q        Quit
            (throw 'tag (goto-char beg))
          )
        (setq pcl (cdr pcl))
-       ))
+       )
+      (let ((f (assq mime::preview/original-major-mode
+                    mime-viewer/over-to-next-method-alist)))
+       (if f
+           (funcall (cdr f))
+         ))
+      )
     ))
 
 (defun mime-viewer/scroll-up-content (&optional h)
@@ -1144,48 +1032,64 @@ q       Quit
   (or h
       (setq h (- (window-height) 1))
       )
-  (let ((pcl mime::preview/content-list)
-       (p (point))
-       np beg)
-    (setq np
-         (or (catch 'tag
-               (while pcl
-                 (setq beg (mime::preview-content-info/point-min (car pcl)))
-                 (if (< p beg)
-                     (throw 'tag beg)
-                   )
-                 (setq pcl (cdr pcl))
-                 ))
-             (point-max)))
-    (forward-line h)
-    (if (> (point) np)
-       (goto-char np)
-      )))
+  (if (= (point) (point-max))
+      (let ((f (assq mime::preview/original-major-mode
+                     mime-viewer/over-to-next-method-alist)))
+        (if f
+            (funcall (cdr f))
+          ))
+    (let ((pcl mime::preview/content-list)
+          (p (point))
+          np beg)
+      (setq np
+            (or (catch 'tag
+                  (while pcl
+                    (setq beg (mime::preview-content-info/point-min (car pcl)))
+                    (if (< p beg)
+                        (throw 'tag beg)
+                      )
+                    (setq pcl (cdr pcl))
+                    ))
+                (point-max)))
+      (forward-line h)
+      (if (> (point) np)
+          (goto-char np)
+        )
+      ;;(show-subtree)
+      ))
+  )
 
 (defun mime-viewer/scroll-down-content (&optional h)
   (interactive)
   (or h
       (setq h (- (window-height) 1))
       )
-  (let ((pcl mime::preview/content-list)
-       (p (point))
-       pp beg)
-    (setq pp
-         (or (let ((i (- (length pcl) 1)))
-               (catch 'tag
-                 (while (> i 0)
-                   (setq beg (mime::preview-content-info/point-min
-                              (nth i pcl)))
-                   (if (> p beg)
-                       (throw 'tag beg)
-                     )
-                   (setq i (- i 1))
-                   )))
-             (point-min)))
-    (forward-line (- h))
-    (if (< (point) pp)
-       (goto-char pp)
-      )))
+  (if (= (point) (point-min))
+      (let ((f (assq mime::preview/original-major-mode
+                     mime-viewer/over-to-previous-method-alist)))
+        (if f
+            (funcall (cdr f))
+          ))
+    (let ((pcl mime::preview/content-list)
+          (p (point))
+          pp beg)
+      (setq pp
+            (or (let ((i (- (length pcl) 1)))
+                  (catch 'tag
+                    (while (> i 0)
+                      (setq beg (mime::preview-content-info/point-min
+                                 (nth i pcl)))
+                      (if (> p beg)
+                          (throw 'tag beg)
+                        )
+                      (setq i (- i 1))
+                      )))
+                (point-min)))
+      (forward-line (- h))
+      (if (< (point) pp)
+          (goto-char pp)
+        )))
+  )
 
 (defun mime-viewer/next-line-content ()
   (interactive)
@@ -1197,29 +1101,41 @@ q       Quit
   (mime-viewer/scroll-down-content 1)
   )
 
-(defun mime-viewer/quit (&optional the-buf buf)
+(defun mime-viewer/quit ()
   (interactive)
-  (or the-buf
-      (setq the-buf (current-buffer))
-      )
-  (or buf
-      (setq buf (mime::preview-content-info/buffer
-                (mime::point-preview-content (point))))
-      )
-  (let ((r (progn
-            (switch-to-buffer buf)
-            (assoc major-mode mime-viewer/quitting-method-alist)
+  (let ((r (save-excursion
+            (set-buffer (mime::preview-content-info/buffer
+                         (mime-preview/point-pcinfo (point))))
+            (assq major-mode mime-viewer/quitting-method-alist)
             )))
     (if r
-       (progn
-         (switch-to-buffer the-buf)
-         (funcall (cdr r))
-         ))
-    ))
+       (funcall (cdr r))
+      )))
+
+(defun mime-viewer/show-summary ()
+  (interactive)
+  (let ((r (save-excursion
+            (set-buffer
+             (mime::preview-content-info/buffer
+              (mime-preview/point-pcinfo (point)))
+             )
+            (assq major-mode mime-viewer/show-summary-method)
+            )))
+    (if r
+       (funcall (cdr r))
+      )))
 
 (defun mime-viewer/kill-buffer ()
   (interactive)
   (kill-buffer (current-buffer))
   )
 
+
+;;; @ end
+;;;
+
+(provide 'tm-view)
+
 (run-hooks 'tm-view-load-hook)
+
+;;; tm-view.el ends here