(eword-decode-version): Use `mime-module-version' instead of

[elisp/semi.git] / eword-decode.el

diff --git a/eword-decode.el b/eword-decode.el
index c59d65b..6d86b00 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -1,6 +1,6 @@
 ;;; eword-decode.el --- RFC 2047 based encoded-word decoder for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: ENAMI Tsugutomo <enami@sys.ptg.sony.co.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -10,10 +10,9 @@
 ;;     Renamed: 1993/06/03 to tiny-mime.el
 ;;     Renamed: 1995/10/03 from tiny-mime.el (split off encoder)
 ;;     Renamed: 1997/02/22 from tm-ew-d.el
-;; Version: $Revision: 1.8 $
 ;; Keywords: encoded-word, MIME, multilingual, header, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Spadework for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -40,13 +39,8 @@
   "Encoded-word decoding"
   :group 'mime)
 
-
-;;; @ version
-;;;
-
-(defconst eword-decode-RCS-ID
-  "$Id: eword-decode.el,v 1.8 1998-02-17 13:10:39 morioka Exp $")
-(defconst eword-decode-version (get-version-string eword-decode-RCS-ID))
+(defconst eword-decode-version
+  `,(mapconcat #'number-to-string (cddr mime-module-version) "."))
 
 
 ;;; @ MIME encoded-word definition
@@ -218,7 +212,7 @@ If SEPARATOR is not nil, it is used as header separator."
                      code-conversion
                    default-mime-charset))))
        (if default-charset
-           (let (beg end field-name len)
+           (let (beg p end field-name len)
              (goto-char (point-min))
              (while (re-search-forward std11-field-head-regexp nil t)
                (setq beg (match-beginning 0)
@@ -365,7 +359,30 @@ as a version of Net$cape)."
   "*Max position of eword-lexical-analyze-cache.
 It is max size of eword-lexical-analyze-cache - 1.")
 
-(defun eword-analyze-quoted-string (string)
+(defcustom eword-lexical-analyzers
+  '(eword-analyze-quoted-string
+    eword-analyze-domain-literal
+    eword-analyze-comment
+    eword-analyze-spaces
+    eword-analyze-special
+    eword-analyze-encoded-word
+    eword-analyze-atom)
+  "*List of functions to return result of lexical analyze.
+Each function must have two arguments: STRING and MUST-UNFOLD.
+STRING is the target string to be analyzed.
+If MUST-UNFOLD is not nil, each function must unfold and eliminate
+bare-CR and bare-LF from the result even if they are included in
+content of the encoded-word.
+Each function must return nil if it can not analyze STRING as its
+format.
+
+Previous function is preferred to next function.  If a function
+returns nil, next function is used.  Otherwise the return value will
+be the result."
+  :group 'eword-decode
+  :type '(repeat function))
+
+(defun eword-analyze-quoted-string (string &optional must-unfold)
   (let ((p (std11-check-enclosure string ?\" ?\")))
     (if p
        (cons (cons 'quoted-string
@@ -375,6 +392,9 @@ It is max size of eword-lexical-analyze-cache - 1.")
              (substring string p))
       )))
 
+(defun eword-analyze-domain-literal (string &optional must-unfold)
+  (std11-analyze-domain-literal string))
+
 (defun eword-analyze-comment (string &optional must-unfold)
   (let ((p (std11-check-enclosure string ?\( ?\) t)))
     (if p
@@ -387,6 +407,12 @@ It is max size of eword-lexical-analyze-cache - 1.")
              (substring string p))
       )))
 
+(defun eword-analyze-spaces (string &optional must-unfold)
+  (std11-analyze-spaces string))
+
+(defun eword-analyze-special (string &optional must-unfold)
+  (std11-analyze-special string))
+
 (defun eword-analyze-encoded-word (string &optional must-unfold)
   (if (eq (string-match eword-encoded-word-regexp string) 0)
       (let ((end (match-end 0))
@@ -409,7 +435,7 @@ It is max size of eword-lexical-analyze-cache - 1.")
        (cons (cons 'atom dest) string)
        )))
 
-(defun eword-analyze-atom (string)
+(defun eword-analyze-atom (string &optional must-unfold)
   (if (string-match std11-atom-regexp string)
       (let ((end (match-end 0)))
        (cons (cons 'atom (decode-mime-charset-string
@@ -422,15 +448,14 @@ It is max size of eword-lexical-analyze-cache - 1.")
   (let (dest ret)
     (while (not (string-equal string ""))
       (setq ret
-           (or (eword-analyze-quoted-string string)
-               (std11-analyze-domain-literal string)
-               (eword-analyze-comment string must-unfold)
-               (std11-analyze-spaces string)
-               (std11-analyze-special string)
-               (eword-analyze-encoded-word string must-unfold)
-               (eword-analyze-atom string)
-               '((error) . "")
-               ))
+           (let ((rest eword-lexical-analyzers)
+                 func r)
+             (while (and (setq func (car rest))
+                         (null (setq r (funcall func string must-unfold)))
+                         )
+               (setq rest (cdr rest)))
+             (or r `((error . ,string) . ""))
+             ))
       (setq dest (cons (car ret) dest))
       (setq string (cdr ret))
       )
@@ -483,11 +508,11 @@ such as a version of Net$cape)."
       (setq max-column fill-column))
   (let ((c start-column)
        (tokens (eword-lexical-analyze string must-unfold))
-       (result ""))
-    (while tokens
-      (let* ((token (car tokens))
-            (type (car token)))
-       (setq tokens (cdr tokens))
+       (result "")
+       token)
+    (while (and (setq token (car tokens))
+               (setq tokens (cdr tokens)))
+      (let* ((type (car token)))
        (if (eq type 'spaces)
            (let* ((next-token (car tokens))
                   (next-str (eword-decode-token next-token))
@@ -504,7 +529,9 @@ such as a version of Net$cape)."
            (setq result (concat result str)
                  c (+ c (string-width str)))
            ))))
-    result))
+    (if token
+       (concat result (eword-decode-token token))
+      result)))
 
 (defun eword-decode-and-unfold-structured-field (string)
   "Decode and unfold STRING as structured field body.