X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-def.el;h=c74f4454fd4b523365f0d9ea3074787def3b2906;hb=2ab6f6d72b13ac9b146cee9066ccff420214f3fa;hp=c16f3b14a49a823c86225cc3d2d0ba6f107a53ed;hpb=1c44bf279d89dd0eb88f1d72a27c18043dce03c2;p=elisp%2Fflim.git

diff --git a/mime-def.el b/mime-def.el
index c16f3b1..c74f445 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(defconst mime-library-version-string "FLIM 1.5.0 - \"Mukaijima\"")
+(defconst mime-library-version-string "Chao 1.6.1 - \"Ky,Dr(Bto\"")
 
 
 ;;; @ variables
@@ -52,6 +52,11 @@
   :group 'mime
   :type 'directory)
 
+(defcustom mime-uuencode-encoding-name-list '("x-uue" "x-uuencode")
+  "*List of encoding names for uuencode format."
+  :group 'mime
+  :type '(repeat string))
+
 
 ;;; @ required functions
 ;;;
@@ -120,42 +125,31 @@
 	  "][" quoted-printable-hex-chars "]"))
 
 
-;;; @ MIME-entity
+;;; @ Content-Type
 ;;;
 
-(defsubst make-mime-entity (buffer
-			    header-start header-end body-start body-end
-			    &optional node-id
-			    content-type content-disposition
-			    encoding children)
-  (vector buffer header-start header-end body-start body-end
-	  node-id content-type content-disposition encoding nil
-	  children nil))
+(defsubst make-mime-content-type (type subtype &optional parameters)
+  (list* (cons 'type type)
+	 (cons 'subtype subtype)
+	 (nreverse parameters))
+  )
 
-(defsubst mime-entity-buffer (entity)              (aref entity  0))
-(defsubst mime-entity-header-start (entity)        (aref entity  1))
-(defsubst mime-entity-header-end (entity)          (aref entity  2))
-(defsubst mime-entity-body-start (entity)          (aref entity  3))
-(defsubst mime-entity-body-end (entity)            (aref entity  4))
-(defsubst mime-entity-node-id (entity)             (aref entity  5))
-(defsubst mime-entity-content-type (entity)        (aref entity  6))
-(defsubst mime-entity-content-disposition (entity) (aref entity  7))
-(defsubst mime-entity-encoding (entity)            (aref entity  8))
-(defsubst mime-entity-original-header (entity)     (aref entity  9))
-(defsubst mime-entity-children (entity)            (aref entity 10))
-(defsubst mime-entity-parsed-header (entity)       (aref entity 11))
-
-(defsubst mime-entity-set-original-header (entity header)
-  (aset entity 9 header))
-(defsubst mime-entity-set-parsed-header (entity header)
-  (aset entity 11 header))
+(defsubst mime-content-type-primary-type (content-type)
+  "Return primary-type of CONTENT-TYPE."
+  (cdr (car content-type)))
 
-(defsubst mime-entity-number (entity)
-  (reverse (mime-entity-node-id entity)))
+(defsubst mime-content-type-subtype (content-type)
+  "Return primary-type of CONTENT-TYPE."
+  (cdr (cadr content-type)))
 
+(defsubst mime-content-type-parameters (content-type)
+  "Return primary-type of CONTENT-TYPE."
+  (cddr content-type))
+
+(defsubst mime-content-type-parameter (content-type parameter)
+  "Return PARAMETER value of CONTENT-TYPE."
+  (cdr (assoc parameter (mime-content-type-parameters content-type))))
 
-;;; @ utility
-;;;
 
 (defsubst mime-type/subtype-string (type &optional subtype)
   "Return type/subtype string from TYPE and SUBTYPE."
@@ -165,6 +159,88 @@
 	(format "%s" type))))
 
 
+;;; @ Content-Disposition
+;;;
+
+(defsubst mime-content-disposition-type (content-disposition)
+  "Return disposition-type of CONTENT-DISPOSITION."
+  (cdr (car content-disposition)))
+
+(defsubst mime-content-disposition-parameters (content-disposition)
+  "Return disposition-parameters of CONTENT-DISPOSITION."
+  (cdr content-disposition))
+
+(defsubst mime-content-disposition-parameter (content-disposition parameter)
+  "Return PARAMETER value of CONTENT-DISPOSITION."
+  (cdr (assoc parameter (cdr content-disposition))))
+
+(defsubst mime-content-disposition-filename (content-disposition)
+  "Return filename of CONTENT-DISPOSITION."
+  (mime-content-disposition-parameter content-disposition "filename"))
+
+
+;;; @ MIME entity
+;;;
+
+(defsubst make-mime-entity-internal (buffer
+				     header-start header-end
+				     body-start body-end
+				     &optional node-id
+				     content-type encoding children)
+  (vector buffer header-start header-end body-start body-end
+	  node-id content-type nil encoding nil
+	  children nil))
+
+(defsubst mime-entity-buffer-internal (entity)              (aref entity  0))
+(defsubst mime-entity-header-start-internal (entity)        (aref entity  1))
+(defsubst mime-entity-header-end-internal (entity)          (aref entity  2))
+(defsubst mime-entity-body-start-internal (entity)          (aref entity  3))
+(defsubst mime-entity-body-end-internal (entity)            (aref entity  4))
+(defsubst mime-entity-node-id-internal (entity)             (aref entity  5))
+(defsubst mime-entity-content-type-internal (entity)        (aref entity  6))
+(defsubst mime-entity-content-disposition-internal (entity) (aref entity  7))
+(defsubst mime-entity-encoding-internal (entity)            (aref entity  8))
+(defsubst mime-entity-original-header-internal (entity)     (aref entity  9))
+(defsubst mime-entity-children-internal (entity)            (aref entity 10))
+(defsubst mime-entity-parsed-header-internal (entity)       (aref entity 11))
+
+(defsubst mime-entity-set-content-disposition-internal (entity disposition)
+  (aset entity  7 disposition))
+(defsubst mime-entity-set-original-header-internal (entity header)
+  (aset entity  9 header))
+(defsubst mime-entity-set-children-internal (entity children)
+  (aset entity 10 children))
+(defsubst mime-entity-set-parsed-header-internal (entity header)
+  (aset entity 11 header))
+
+
+;;; @ message structure
+;;;
+
+(defvar mime-message-structure nil
+  "Information about structure of message.
+Please use reference function `mime-entity-SLOT' to get value of SLOT.
+
+Following is a list of slots of the structure:
+
+buffer			buffer includes this entity (buffer).
+node-id			node-id (list of integers)
+header-start		minimum point of header in raw-buffer
+header-end		maximum point of header in raw-buffer
+body-start		minimum point of body in raw-buffer
+body-end		maximum point of body in raw-buffer
+content-type		content-type (content-type)
+content-disposition	content-disposition (content-disposition)
+encoding		Content-Transfer-Encoding (string or nil)
+children		entities included in this entity (list of entity)
+
+If an entity includes other entities in its body, such as multipart or
+message/rfc822, `mime-entity' structures of them are included in
+`children', so the `mime-entity' structure become a tree.")
+
+(make-variable-buffer-local 'mime-message-structure)
+
+
 ;;; @ end
 ;;;