;;;
-;;; $Id: tm-rich.el,v 1.2 1994/10/26 15:57:51 morioka Exp $
+;;; tm-rich.el --- text/enriched and text/richtext style
+;;; richtext filter for tm-view
+;;;
+;;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;;
+;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Version:
+;;; $Id: tm-rich.el,v 7.1 1995/10/20 10:40:06 morioka Exp $
+;;; Keywords: mail, news, MIME, multimedia, richtext, enriched
+;;;
+;;; This file is part of tm (Tools for MIME).
;;;
-
-(provide 'tm-rich)
(require 'tm-view)
-(if (and (>= (string-to-int emacs-version) 19) window-system)
- (progn
- (require 'hilit19)
-
- (defun mime/set-face-region (b e face)
- (let ((sym (intern face)))
- (if (eq sym 'italic)
- (setq sym 'modeline)
- )
- (if (member sym (face-list))
- (progn
- (hilit-unhighlight-region b e)
- (hilit-region-set-face b e sym)
- ))
- ))
+
+(defvar tm-rich/richtext-module
+ (if (or (< emacs-major-version 19)
+ (and (= emacs-major-version 19)
+ (< emacs-minor-version 29))
+ )
+ 'tinyrich
+ 'richtext))
+(require tm-rich/richtext-module)
+
+
+;;; @ content filters for tm-view
+;;;
+
+(defun mime-viewer/filter-text/richtext (ctype params encoding)
+ (let* ((mode mime::preview/original-major-mode)
+ (m (assq mode mime-viewer/code-converter-alist))
+ (charset (assoc "charset" params))
+ ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121)
+ ;; modified by Eric Ding <ericding@San-Jose.ate.slb.com>
+ (beg (point-min)) (end (point-max))
+ )
+ (remove-text-properties beg end '(face nil))
+ (mime/decode-region encoding beg end)
+ (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)
)
- (defun mime/set-face-region (beg end sym)
- )
- )
+ (richtext-decode beg (point-max))
+ ))
-(defvar mime/text/enriched-face-list
- '("bold" "italic" "fixed" "underline"))
-
-(defun mime/decode-text/enriched-region (beg end)
- (interactive "*r")
- (save-excursion
- (save-restriction
- (narrow-to-region beg end)
- (goto-char beg)
- (let (cmd (fb (point)) fe b e)
- (while (re-search-forward
- "[ \t\n\r]*<[^<>\n\r \t]+>[ \t\n\r]*" nil t)
- (setq cmd (buffer-substring (match-beginning 0) (match-end 0)))
- (replace-match "")
- (string-match "^[ \t\n\r]*<" cmd)
- (setq cmd (substring cmd (match-end 0)))
- (string-match ">[ \t\n\r]*$" cmd)
- (setq cmd (substring cmd 0 (match-beginning 0)))
- (cond ((string= cmd "nl")
- (fill-region fb (point) t)
- (insert "\n")
- (setq fb (point))
- )
- ((member (downcase cmd) mime/text/enriched-face-list)
- (if (not (bolp))
- (insert " ")
- )
- (setq b (point))
- (save-excursion
- (save-restriction
- (if (re-search-forward (concat "[ \t\n\r]*</"
- cmd ">[ \t\n\r]*")
- nil t)
- (progn
- (replace-match " ")
- (setq e (- (point) 1))
- )
- (setq e end)
- )))
- (mime/set-face-region b e cmd)
- )))
- (fill-region fb (point) t)
- ))))
+(defun mime-viewer/filter-text/enriched (ctype params encoding)
+ (let* ((mode mime::preview/original-major-mode)
+ (m (assq mode mime-viewer/code-converter-alist))
+ (charset (assoc "charset" params))
+ ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121)
+ ;; modified by Eric Ding <ericding@San-Jose.ate.slb.com>
+ (beg (point-min)) (end (point-max))
+ )
+ (remove-text-properties beg end '(face nil))
+ (mime/decode-region encoding beg end)
+ (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)
+ )
+ (enriched-decode beg (point-max))
+ ))
-(defun mime/decode-text/enriched (ctl)
- (interactive)
- (save-excursion
- (save-restriction
- (let ((beg (point-min)) (end (point-max)))
- (goto-char (point-min))
- (if (search-forward "\n\n" nil t)
- (setq beg (match-end 0))
- )
- (mime/decode-text/enriched-region beg end)
- ))))
+;;; @ setting
+;;;
+
+(set-alist 'mime-viewer/content-filter-alist
+ "text/richtext" (function mime-viewer/filter-text/richtext))
-(set-alist 'mime/content-filter-alist
- "text/enriched" (function mime/decode-text/enriched))
+(set-alist 'mime-viewer/content-filter-alist
+ "text/enriched" (function mime-viewer/filter-text/enriched))
+
+
+;;; @ end
+;;;
+
+(provide 'tm-rich)
-(set-alist 'mime/content-filter-alist
- "text/richtext" (function mime/decode-text/enriched))
+(run-hooks 'tm-rich-load-hook)