Reimplement handling of MIME entities. Now all entities are (more or

less) well-formed XML, using the keyword "imail-part".  Presentation
of an entity is now consistent, whether it was originally shown inline
or out of line.  New option allows message digests to have their
messages show out of line.  imail-use-original-mime-boundaries
replaced by imail-mime-boundary-style; the latter additionally
supports a boundary that is an SGML comment.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index fe81600462f1d446586a3029637df913e89c9380..35c8544b6dc876c1a05e4525dceb21ca2676c2ca 100644 (file)
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-core.scm,v 1.114 2000/10/20 00:44:28 cph Exp $
+;;; $Id: imail-core.scm,v 1.115 2000/12/28 05:45:12 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -827,6 +827,11 @@
 (define-generic mime-body-type (body))
 (define-generic mime-body-subtype (body))
 
+(define (mime-body-type-string body)
+  (string-append (symbol->string (mime-body-type body))
+                "/"
+                (symbol->string (mime-body-subtype body))))
+
 (define (mime-body-parameter body key default)
   (let ((entry (assq key (mime-body-parameters body))))
     (if entry
@@ -844,9 +849,7 @@
   (write-instance-helper 'MIME-BODY body port 
     (lambda ()
       (write-char #\space port)
-      (write (mime-body-type body) port)
-      (write-char #\/ port)
-      (write (mime-body-subtype body) port))))
+      (write-string (mime-body-type-string body) port))))
 
 (define-class <mime-body-one-part> (<mime-body>)
   (id define accessor)

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 4d52abd2121b8a9e5470efb0884070b437275db9..086769b0ca78842403e5af736b3b0fae0d80f80c 100644 (file)
--- a/v7/src/imail/imail-top.scm
+++ b/v7/src/imail/imail-top.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-top.scm,v 1.227 2000/12/21 05:05:00 cph Exp $
+;;; $Id: imail-top.scm,v 1.228 2000/12/28 05:44:46 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -172,12 +172,6 @@ Note that this variable does not affect subparts of multipart/alternative."
   '(HTML ENRICHED)
   list-of-strings?)
 
-(define-variable imail-use-original-mime-boundaries
-  "If true, multipart message parts are separated with MIME boundary strings.
-Otherwise, simple dashed-line separators are used."
-  #f
-  boolean?)
-
 (define-variable imail-mime-attachment-directory
   "Default directory in which to store MIME attachments.
 Either #F or a pathname."
@@ -191,6 +185,19 @@ Otherwise, only one of the parts is shown."
   #f
   boolean?)
 
+(define-variable imail-mime-collapse-digest
+  "If true, component messages of a MIME digest are shown as attachments."
+  #t
+  boolean?)
+
+(define-variable imail-mime-boundary-style
+  "Specifies style of separators between parts of multipart MIME message.
+'SIMPLE means use a simple dashed line.
+'SGML is like 'SIMPLE except the line is bracketed with <!-- -->.
+'ORIGINAL means use the original MIME boundary strings."
+  'SIMPLE
+  (lambda (x) (memq x '(SIMPLE SGML ORIGINAL))))
+
 (define-variable imail-global-mail-notification
   "If true, all buffer modelines say if there is unseen mail.
  (This checks only for unseen mail in the primary folder.)
@@ -2079,34 +2086,40 @@ Negative argument means search in reverse."
 ;;;; MIME message formatting
 
 (define (insert-mime-message-body message mark inline-only? left-margin)
-  (insert-mime-message-part
+  (walk-mime-message-part
    message
    (mime-message-body-structure message)
    '()
-   (make-insert-mime-context inline-only? left-margin #f '())
+   (make-walk-mime-context inline-only? left-margin #f '())
    mark))
 
-(define-structure insert-mime-context
+(define-structure walk-mime-context
   (inline-only? #f read-only #t)
   (left-margin #f read-only #t)
   (enclosure #f read-only #t)
   (boundaries #f read-only #t))
 
-(define (make-insert-mime-subcontext context enclosure boundary)
-  (make-insert-mime-context (insert-mime-context-inline-only? context)
-                           (insert-mime-context-left-margin context)
-                           enclosure
-                           (cons (cons boundary (not boundary))
-                                 (insert-mime-context-boundaries context))))
+(define (make-walk-mime-subcontext context enclosure boundary)
+  (make-walk-mime-context (walk-mime-context-inline-only? context)
+                         (walk-mime-context-left-margin context)
+                         enclosure
+                         (cons (cons boundary (not boundary))
+                               (walk-mime-context-boundaries context))))
+
+(define (mime-enclosure-type? context type subtype)
+  (let ((enclosure (walk-mime-context-enclosure context)))
+    (and enclosure
+        (eq? (mime-body-type enclosure) type)
+        (eq? (mime-body-subtype enclosure) subtype))))
 
 (define (maybe-insert-mime-boundary context mark)
   (let ((boundary
-        (let loop ((boundaries (insert-mime-context-boundaries context)))
+        (let loop ((boundaries (walk-mime-context-boundaries context)))
           (and (pair? boundaries)
                (if (cdar boundaries)
                    (caar boundaries)
                    (loop (cdr boundaries)))))))
-    (let loop ((boundaries (insert-mime-context-boundaries context)))
+    (let loop ((boundaries (walk-mime-context-boundaries context)))
       (if (and (pair? boundaries)
               (not (cdar boundaries)))
          (begin
@@ -2115,58 +2128,115 @@ Negative argument means search in reverse."
     (if boundary
        (begin
          (insert-newline mark)
-         (if (eq? boundary 'SIMPLE)
-             (insert-chars #\- (- (mark-x-size mark) 1) mark)
-             (begin
-               (insert-string "--" mark)
-               (insert-string boundary mark)))
+         (cond ((string? boundary)
+                (insert-string "--" mark)
+                (insert-string boundary mark))
+               ((eq? 'SGML boundary)
+                (insert-string "<!-- " mark)
+                (insert-chars #\- (- (mark-x-size mark) 10) mark)
+                (insert-string " -->" mark))
+               (else
+                (insert-chars #\- (- (mark-x-size mark) 1) mark)))
          (insert-newline mark)
          (insert-newline mark)))))
 
 (define (mime-part-encoding context body)
   (let ((encoding
-        (let ((enclosure (insert-mime-context-enclosure context)))
-          (and enclosure
-               (eq? (mime-body-type enclosure) 'MESSAGE)
-               (eq? (mime-body-subtype enclosure) 'RFC822)
-               (mime-body-one-part-encoding enclosure)))))
+        (and (mime-enclosure-type? context 'MESSAGE 'RFC822)
+             (mime-body-one-part-encoding
+              (walk-mime-context-enclosure context)))))
     (if (and encoding (not (memq encoding '(7BIT 8BIT BINARY))))
        ;; This is illegal, but Netscape does it.
        encoding
        (mime-body-one-part-encoding body))))
 \f
-(define-generic insert-mime-message-part (message body selector context mark))
+(define-generic walk-mime-message-part (message body selector context mark))
+(define-generic insert-mime-message-inline*
+    (message body selector context mark))
+(define-generic compute-mime-message-outline (body name context))
 
-(define-method insert-mime-message-part
+(define-method walk-mime-message-part
     (message (body <mime-body>) selector context mark)
-  (insert-mime-message-attachment 'ATTACHMENT message body selector context
-                                 mark))
+  (insert-mime-message-outline message body selector context mark))
 
-(define-method insert-mime-message-part
+(define-method insert-mime-message-inline*
+    (message (body <mime-body>) selector context mark)
+  (call-with-auto-wrapped-output-mark
+   mark
+   (walk-mime-context-left-margin context)
+   (lambda (port)
+     (call-with-mime-decoding-output-port
+      (mime-part-encoding context body)
+      port
+      #t
+      (lambda (port)
+       (write-mime-message-body-part
+        message
+        (if (or (not (walk-mime-context-enclosure context))
+                (mime-enclosure-type? context 'MESSAGE 'RFC822))
+            `(,@selector TEXT)
+            selector)
+        (mime-body-one-part-n-octets body)
+        port))))))
+
+(define-method compute-mime-message-outline ((body <mime-body>) name context)
+  context
+  (list (and name (cons "name" name))
+       (cons "type" (mime-body-type-string body))
+       (and (eq? (mime-body-type body) 'TEXT)
+            (cons "charset" (mime-body-parameter body 'CHARSET "us-ascii")))
+       (let ((encoding (mime-body-one-part-encoding body)))
+         (and (not (known-mime-encoding? encoding))
+              (cons "encoding" encoding)))
+       (cons "length" (mime-body-one-part-n-octets body))))
+
+(define-method walk-mime-message-part
     (message (body <mime-body-multipart>) selector context mark)
   (let ((context
-        (make-insert-mime-subcontext
+        (make-walk-mime-subcontext
          context
          body
-         (if (ref-variable imail-use-original-mime-boundaries mark)
-             (mime-body-parameter body 'BOUNDARY "----------")
-             'SIMPLE)))
-       (show-alternatives? (ref-variable imail-mime-show-alternatives mark)))
-    (do ((parts (mime-body-multipart-parts body) (cdr parts))
-        (i 0 (fix:+ i 1)))
-       ((null? parts))
-      (let ((part (car parts))
-           (selector `(,@selector ,i)))
-       (if (and (fix:> i 0)
-                (eq? (mime-body-subtype body) 'ALTERNATIVE))
-           (if show-alternatives?
-               (insert-mime-message-attachment 'ALTERNATIVE message part
-                                               selector context mark))
-           (insert-mime-message-part message part selector context mark))))))
-
-(define-method insert-mime-message-part
+         (let ((style (ref-variable imail-mime-boundary-style mark)))
+           (if (eq? 'ORIGINAL style)
+               (mime-body-parameter body 'BOUNDARY "----------")
+               style))))
+       (parts (mime-body-multipart-parts body)))
+    (if (eq? (mime-body-subtype body) 'ALTERNATIVE)
+       (if (pair? parts)
+           (begin
+             (walk-mime-message-part message
+                                     (car parts)
+                                     `(,@selector 0)
+                                     context
+                                     mark)
+             (if (ref-variable imail-mime-show-alternatives mark)
+                 (do ((parts (cdr parts) (cdr parts))
+                      (i 1 (fix:+ i 1)))
+                     ((null? parts))
+                   (insert-mime-message-outline message
+                                                (car parts)
+                                                `(,@selector ,i)
+                                                context
+                                                mark)))))
+       (do ((parts parts (cdr parts))
+            (i 0 (fix:+ i 1)))
+           ((null? parts))
+         (walk-mime-message-part message
+                                 (car parts)
+                                 `(,@selector ,i)
+                                 context
+                                 mark)))))
+\f
+(define-method walk-mime-message-part
+    (message (body <mime-body-message>) selector context mark)
+  ((if (and (mime-enclosure-type? context 'MULTIPART 'DIGEST)
+           (ref-variable imail-mime-collapse-digest mark))
+       insert-mime-message-outline
+       insert-mime-message-inline)
+   message body selector context mark))
+
+(define-method insert-mime-message-inline*
     (message (body <mime-body-message>) selector context mark)
-  (maybe-insert-mime-boundary context mark)
   (insert-header-fields (with-string-output-port
                          (lambda (port)
                            (write-mime-message-body-part message
@@ -2175,117 +2245,106 @@ Negative argument means search in reverse."
                                                          port)))
                        #f
                        mark)
-  (insert-mime-message-part message
-                           (mime-body-message-body body)
-                           selector
-                           (make-insert-mime-subcontext context body #f)
-                           mark))
-\f
-(define-method insert-mime-message-part
-    (message (body <mime-body-text>) selector context mark)
-  (if (and (let ((disposition (mime-body-disposition body)))
-            (if disposition
-                (eq? (car disposition) 'INLINE)
-                (or (not (insert-mime-context-enclosure context))
-                    (let ((subtype (mime-body-subtype body)))
-                      (or (eq? subtype 'PLAIN)
-                          (memq subtype
-                                (ref-variable imail-inline-mime-text-subtypes
-                                              mark)))))))
-          (known-mime-encoding? (mime-part-encoding context body))
-          (re-string-match
-           (string-append "\\`"
-                          (apply regexp-group
-                                 (ref-variable imail-known-mime-charsets
-                                               mark))
-                          "\\'")
-           (mime-body-parameter body 'CHARSET "us-ascii")
-           #t))
-      (begin
-       (maybe-insert-mime-boundary context mark)
-       (insert-mime-info (make-mime-info 'INLINE #t body selector context)
-                         message
+  (walk-mime-message-part message
+                         (mime-body-message-body body)
+                         selector
+                         (make-walk-mime-subcontext context body #f)
                          mark))
-      (insert-mime-message-attachment 'ATTACHMENT message body selector context
-                                     mark)))
 
-(define (insert-mime-message-attachment class message body selector context
-                                       mark)
-  (if (not (insert-mime-context-inline-only? context))
+(define-method compute-mime-message-outline
+    ((body <mime-body-message>) name context)
+  name
+  (let ((envelope (mime-body-message-envelope body)))
+    (list (and (not (mime-enclosure-type? context 'MULTIPART 'DIGEST))
+              (cons "type" (mime-body-type-string body)))
+         (let ((from (mime-envelope-from envelope)))
+           (and (pair? from)
+                (cons
+                 "from"
+                 (or (mime-address-name (car from))
+                     (string-append (mime-address-mailbox (car from))
+                                    "@"
+                                    (mime-address-host (car from)))))))
+         (let ((subject (mime-envelope-subject envelope)))
+           (and subject
+                (cons "subject" subject)))
+         (cons "length" (mime-body-one-part-n-octets body)))))
+
+(define-method walk-mime-message-part
+    (message (body <mime-body-text>) selector context mark)
+  ((if (and (let ((disposition (mime-body-disposition body)))
+             (if disposition
+                 (eq? (car disposition) 'INLINE)
+                 (or (not (walk-mime-context-enclosure context))
+                     (let ((subtype (mime-body-subtype body)))
+                       (or (eq? subtype 'PLAIN)
+                           (memq subtype
+                                 (ref-variable imail-inline-mime-text-subtypes
+                                               mark)))))))
+           (known-mime-encoding? (mime-part-encoding context body))
+           (re-string-match
+            (string-append "\\`"
+                           (apply regexp-group
+                                  (ref-variable imail-known-mime-charsets
+                                                mark))
+                           "\\'")
+            (mime-body-parameter body 'CHARSET "us-ascii")
+            #t))
+       insert-mime-message-inline
+       insert-mime-message-outline)
+   message body selector context mark))
+\f
+(define (insert-mime-message-inline message body selector context mark)
+  (maybe-insert-mime-boundary context mark)
+  (insert-mime-info (make-mime-info #t #t body selector context)
+                   message
+                   mark))
+
+(define (insert-mime-message-outline message body selector context mark)
+  (if (not (walk-mime-context-inline-only? context))
       (begin
        (maybe-insert-mime-boundary context mark)
-       (insert-mime-info (make-mime-info class #f body selector context)
+       (insert-mime-info (make-mime-info #f #f body selector context)
                          message
                          mark))))
-\f
+
 (define (insert-mime-info info message mark)
-  (let ((start (mark-right-inserting-copy mark)))
+  (let ((start (mark-right-inserting-copy mark))
+       (body (mime-info-body info))
+       (context (mime-info-context info)))
     (if (mime-info-expanded? info)
-       (insert-mime-info-expanded info message mark)
-       (insert-mime-info-collapsed info message mark))
+       (insert-mime-message-inline* message
+                                    body
+                                    (mime-info-selector info)
+                                    context
+                                    mark)
+       (insert-mime-outline
+        (compute-mime-message-outline body
+                                      (mime-attachment-name info #f)
+                                      context)
+        mark))
     (attach-mime-info start mark info)
     (mark-temporary! start)))
 
-(define (insert-mime-info-expanded info message mark)
-  (let ((body (mime-info-body info))
-       (context (mime-info-context info)))
-    (call-with-auto-wrapped-output-mark
-     mark
-     (insert-mime-context-left-margin context)
-     (lambda (port)
-       (call-with-mime-decoding-output-port
-       (mime-part-encoding context body)
-       port
-       #t
-       (lambda (port)
-         (write-mime-message-body-part
-          message
-          (if (let ((enclosure (insert-mime-context-enclosure context)))
-                (or (not enclosure)
-                    (and (eq? (mime-body-type enclosure) 'MESSAGE)
-                         (eq? (mime-body-subtype enclosure) 'RFC822))))
-              `(,@(mime-info-selector info) TEXT)
-              (mime-info-selector info))
-          (mime-body-one-part-n-octets body)
-          port)))))))
-
-(define (insert-mime-info-collapsed info message mark)
-  message
-  (let ((body (mime-info-body info)))
-    (insert-string "<IMAIL-" mark)
-    (insert-string (string-upcase (symbol->string (mime-info-class info)))
-                  mark)
-    (insert-string " " mark)
-    (let ((column (mark-column mark)))
-      (let ((name (mime-attachment-name info #f)))
-       (if name
-           (begin
-             (insert-string "name=" mark)
-             (insert name mark)
-             (insert-newline mark)
-             (change-column column mark))))
-      (insert-string "type=" mark)
-      (insert (mime-body-type body) mark)
-      (insert-string "/" mark)
-      (insert (mime-body-subtype body) mark)
-      (insert-newline mark)
-      (if (eq? (mime-body-type body) 'TEXT)
-         (begin
-           (change-column column mark)
-           (insert-string "charset=" mark)
-           (insert (mime-body-parameter body 'CHARSET "us-ascii") mark)
-           (insert-newline mark)))
-      (let ((encoding (mime-body-one-part-encoding body)))
-       (if (not (known-mime-encoding? encoding))
-           (begin
-             (change-column column mark)
-             (insert-string "encoding=" mark)
-             (insert encoding mark)
-             (insert-newline mark))))
-      (change-column column mark)
-      (insert-string "length=" mark)
-      (insert (mime-body-one-part-n-octets body) mark))
-    (insert-string ">" mark)
+(define (insert-mime-outline parameters mark)
+  (let ((indentation "    "))
+    (insert-string "<imail-part" mark)
+    (insert-newline mark)
+    (for-each (lambda (n.v)
+               (if n.v
+                   (begin
+                     (insert-string indentation mark)
+                     (insert-string (car n.v) mark)
+                     (insert-string "=" mark)
+                     (insert (let ((value (cdr n.v)))
+                               (if (string? value)
+                                   value
+                                   (write-to-string value)))
+                             mark)
+                     (insert-newline mark))))
+             parameters)
+    (insert-string indentation mark)
+    (insert-string "/>" mark)
     (insert-newline mark)))
 \f
 (define (known-mime-encoding? encoding)
@@ -2294,7 +2353,7 @@ Negative argument means search in reverse."
 (define (mime-attachment-name info provide-default?)
   (or (mime-body-parameter (mime-info-body info) 'NAME #f)
       (and provide-default?
-          (string-append (if (eq? (mime-info-class info) 'INLINE)
+          (string-append (if (mime-info-inline? info)
                              "inline-"
                              "unnamed-attachment-")
                          (let ((selector (mime-info-selector info)))
@@ -2331,10 +2390,10 @@ Negative argument means search in reverse."
            (reverse! attachments))))))
 
 (define (mime-attachment? info)
-  (not (eq? (mime-info-class info) 'INLINE)))
+  (not (mime-info-inline? info)))
 
 (define-structure mime-info
-  (class #f read-only #t)
+  (inline? #f)
   (expanded? #f)
   (body #f read-only #t)
   (selector #f read-only #t)

diff --git a/v7/src/imail/imail.pkg b/v7/src/imail/imail.pkg
index 6d2000c995fded4dadd4779a9f73d5fd27efc82a..d3ea7b13e741da00342da8b6dcd0bd50ffc2fcd3 100644 (file)
--- a/v7/src/imail/imail.pkg
+++ b/v7/src/imail/imail.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail.pkg,v 1.78 2000/11/13 21:28:43 cph Exp $
+;;; $Id: imail.pkg,v 1.79 2000/12/28 05:45:07 cph Exp $
 ;;;
 ;;; Copyright (c) 2000 Massachusetts Institute of Technology
 ;;;
@@ -311,14 +311,15 @@
          edwin-variable$imail-known-mime-charsets
          edwin-variable$imail-message-filter
          edwin-variable$imail-mime-attachment-directory
+         edwin-variable$imail-mime-boundary-style
+         edwin-variable$imail-mime-collapse-digest
          edwin-variable$imail-mime-show-alternatives
          edwin-variable$imail-mode-hook
          edwin-variable$imail-output-default
          edwin-variable$imail-pass-phrase-retention-time
          edwin-variable$imail-primary-folder
          edwin-variable$imail-reply-with-re
-         edwin-variable$imail-update-interval
-         edwin-variable$imail-use-original-mime-boundaries)
+         edwin-variable$imail-update-interval)
   (export (edwin imail)
          imail-ui:body-cache-limit
          imail-ui:call-with-pass-phrase