tm 6.76.1.

[elisp/tm.git] / tm-rich.el

diff --git a/tm-rich.el b/tm-rich.el
index ac1121e..7827746 100644 (file)
--- a/tm-rich.el
+++ b/tm-rich.el
@@ -1,92 +1,24 @@
 ;;;
-;;; $Id: tm-rich.el,v 6.2 1995/06/24 05:04:05 morioka Exp $
+;;; $Id: tm-rich.el,v 6.10 1995/08/05 00:55:37 morioka Exp $
 ;;;
-;;;          by MORIOKA Tomohiko  <morioka@jaist.ac.jp>
-;;; modified by YAMATE Keiichirou <ics9118@sem1.info.osaka-cu.ac.jp>
+;;; by MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 ;;;
 
 (require 'tm-view)
 
-(defvar mime/text/richtext-face-list
-  '("bold" "italic" "fixed" "underline"))
-
-(defvar mime/text/enriched-face-list
-  '("bold" "italic" "fixed" "underline"))
-
-
-(cond ((and (>= emacs-major-version 19) window-system)
-       (defun mime/set-face-region (b e face)
-        (let ((sym (intern face)))
-          (if (member sym (face-list))
-              (let ((overlay (make-overlay b e)))
-                (overlay-put overlay 'face 'bold)
-                ))))
-       )
-      ((and (boundp 'NEMACS) NEMACS)
-       (setq mime/available-face-list
-            '("bold" "italic" "underline"))
-       (setq mime/available-face-attribute-alist
-            '(("bold"      . inversed-region)
-              ("italic"    . underlined-region)
-              ("underline" . underlined-region)
-              ))
-       (defun mime/set-face-region (beg end sym)
-        (attribute-add-narrow-attribute
-         (cdr (assoc sym mime/available-face-attribute-alist))
-         beg end))
-       )
-      (t
-       (setq mime/text/richtext-face-list nil)
-       (defun mime/set-face-region (beg end 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)
 
 
-;;; @ text/richtext
+;;; @ content filters for tm-view
 ;;;
 
-(defun mime/decode-text/richtext-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (while (search-forward "\n" nil t)
-       (replace-match "")
-       )
-      (goto-char beg)
-      (let (cmd str (fb (point)) fe b e)
-       (while (re-search-forward "<[^<>\n\r \t]+>" nil t)
-         (setq b (match-beginning 0))
-         (setq cmd (buffer-substring (+ b 1)
-                                     (- (match-end 0) 1)))
-         (replace-match "")
-         (cond ((string= cmd "nl")
-                (if (= fb b)
-                    (insert "\n")
-                  (fill-region fb b t)
-                  )
-                (setq fb (point))
-                )
-               ((member (downcase cmd) mime/text/richtext-face-list)
-                (setq b (point))
-                (save-excursion
-                  (save-restriction
-                    (if (re-search-forward (concat "</" cmd ">") nil t)
-                        (progn
-                          (replace-match "")
-                          (setq e (point))
-                          )
-                      (setq e end)
-                      )))
-                (mime/set-face-region b e cmd)
-                )))
-       (fill-region fb (point-max) t)
-       (goto-char (point-max))
-       (if (not (eq (preceding-char) ?\n))
-           (insert "\n")
-         )
-       ))))
-
 (defun mime-viewer/filter-text/richtext (ctype params encoding)
   (let* ((mode mime::preview/original-major-mode)
         (m (assq mode mime-viewer/code-converter-alist))
@@ -98,67 +30,9 @@
       (mime-viewer/default-code-convert-region beg (point-max)
                                               charset encoding)
       )
-    (mime/decode-text/richtext-region beg (point-max))
+    (richtext-decode beg (point-max))
     ))
 
-
-;;; @ text/enriched
-;;;
-
-(defun mime/decode-text/enriched-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (while (re-search-forward "[\n]+" nil t)
-       (let ((str (buffer-substring (match-beginning 0)
-                                    (match-end 0))))
-         (if (string= str "\n")
-             (replace-match " ")
-           (replace-match (substring str 1))
-           )))
-      (goto-char beg)
-      (let (cmd str (fb (point)) fe b e)
-       (while (re-search-forward "<\\(<\\|[^<>\n\r \t]+>\\)" nil t)
-         (setq b (match-beginning 0))
-         (setq cmd (buffer-substring b (match-end 0)))
-         (if (string= cmd "<<")
-             (replace-match "<")
-           (replace-match "")
-           (setq cmd (downcase (substring cmd 1 (- (length cmd) 1))))
-           )
-         (cond ((string= cmd "param")
-                (setq b (point))
-                (save-excursion
-                  (save-restriction
-                    (if (search-forward "</param>" nil t)
-                        (progn
-                          (replace-match "")
-                          (setq e (point))
-                          )
-                      (setq e end)
-                      )))
-                (delete-region b e)
-                )
-               ((member cmd mime/text/enriched-face-list)
-                (setq b (point))
-                (save-excursion
-                  (save-restriction
-                    (if (re-search-forward (concat "</" cmd ">") nil t)
-                        (progn
-                          (replace-match "")
-                          (setq e (point))
-                          )
-                      (setq e end)
-                      )))
-                (mime/set-face-region b e cmd)
-                )))
-       (goto-char (point-max))
-       (if (not (eq (preceding-char) ?\n))
-           (insert "\n")
-         )
-       ))))
-
 (defun mime-viewer/filter-text/enriched (ctype params encoding)
   (let* ((mode mime::preview/original-major-mode)
         (m (assq mode mime-viewer/code-converter-alist))
@@ -170,7 +44,7 @@
       (mime/code-convert-region-to-emacs beg (point-max)
                                         charset encoding)
       )
-    (mime/decode-text/enriched-region beg (point-max))
+    (enriched-decode beg (point-max))
     ))