(Download): Renamed from "Anonymous FTP"; modify for

[elisp/apel.git] / mcs-ltn1.el

diff --git a/mcs-ltn1.el b/mcs-ltn1.el
index 2fed09a..8cf14e6 100644 (file)
--- a/mcs-ltn1.el
+++ b/mcs-ltn1.el
@@ -1,9 +1,9 @@
 ;;; mcs-ltn1.el --- MIME charset implementation for Emacs 19
 ;;;                 and XEmacs without MULE
 
-;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of APEL (A Portable Emacs Library).
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -30,13 +30,21 @@
 
 (defvar default-mime-charset 'iso-8859-1)
 
-(defun mime-charset-to-coding-system (charset)
+(defsubst lbt-to-string (lbt)
+  (cdr (assq lbt '((nil . nil)
+                  (CRLF . "\r\n")
+                  (CR . "\r")
+                  (dos . "\r\n")
+                  (mac . "\r"))))
+  )
+
+(defun mime-charset-to-coding-system (charset &optional lbt)
   (if (stringp charset)
-      (setq charset (intern (downcase charset)))
-    )
+      (setq charset (intern (downcase charset))))
   (if (memq charset (list 'us-ascii default-mime-charset))
-      charset
-    ))
+      charset))
+
+(defalias 'mime-charset-p 'mime-charset-to-coding-system)
 
 (defun detect-mime-charset-region (start end)
   "Return MIME charset for region between START and END."
@@ -46,25 +54,40 @@
       default-mime-charset
     'us-ascii))
 
-(defun encode-mime-charset-region (start end charset)
+(defun encode-mime-charset-region (start end charset &optional lbt)
   "Encode the text between START and END as MIME CHARSET."
-  )
+  (let ((newline (lbt-to-string lbt)))
+    (if newline
+       (save-excursion
+         (save-restriction
+           (narrow-to-region start end)
+           (goto-char (point-min))
+           (while (search-forward "\n" nil t)
+             (replace-match newline))
+           )))
+      ))
 
 (defun decode-mime-charset-region (start end charset &optional lbt)
   "Decode the text between START and END as MIME CHARSET."
-  (cond ((eq lbt 'CRLF)
-        (save-excursion
-          (save-restriction
-            (narrow-to-region start end)
-            (goto-char (point-min))
-            (while (search-forward "\r\n" nil t)
-              (replace-match "\n"))
-            ))
-        )))
-
-(defun encode-mime-charset-string (string charset)
+  (let ((newline (lbt-to-string lbt)))
+    (if newline
+       (save-excursion
+         (save-restriction
+           (narrow-to-region start end)
+           (goto-char (point-min))
+           (while (search-forward newline nil t)
+             (replace-match "\n"))
+           )))
+      ))
+
+(defun encode-mime-charset-string (string charset &optional lbt)
   "Encode the STRING as MIME CHARSET."
-  string)
+  (if lbt
+      (with-temp-buffer
+       (insert string)
+       (encode-mime-charset-region (point-min)(point-max) charset lbt)
+       (buffer-string))
+    string))
 
 (defun decode-mime-charset-string (string charset &optional lbt)
   "Decode the STRING as MIME CHARSET."
@@ -81,6 +104,7 @@
 ;;; @ end
 ;;;
 
-(provide 'mcs-ltn1)
+(require 'product)
+(product-provide (provide 'mcs-ltn1) (require 'apel-ver))
 
 ;;; mcs-ltn1.el ends here