tm 7.80.

[elisp/tm.git] / tinyrich.el

diff --git a/tinyrich.el b/tinyrich.el
index 7e26937..3929205 100644 (file)
--- a/tinyrich.el
+++ b/tinyrich.el
@@ -1,47 +1,17 @@
 ;;;
-;;; $Id: tinyrich.el,v 4.0 1995/09/10 13:35:41 morioka Exp $
+;;; $Id: tinyrich.el,v 5.0 1995/09/20 14:45:56 morioka Exp $
 ;;;
 ;;;          by MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 ;;; modified by YAMATE Keiichirou <ics9118@sem1.info.osaka-cu.ac.jp>
 ;;;
 
-(defvar mime/text/enriched-face-list
-  '("bold" "italic" "fixed" "underline"))
-
-(cond ((string-match "XEmacs\\|Lucid" emacs-version)
-       (defun mime/set-face-region (b e face)
-        (let ((sym (intern face)))
-          (if (member sym (face-list))
-              (let ((overlay (make-extent b e)))
-                (set-extent-property overlay 'face sym)
-                ))))
-       )
-      ((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 sym)
-                ))))
-       )
-      ((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 mime-viewer/face-list-for-text/enriched
+  (cond ((and (>= emacs-major-version 19) window-system)
+        '(bold italic fixed underline)
         )
-       ))
+       ((and (boundp 'NEMACS) NEMACS)
+        '("bold" "italic" "underline")
+        )))
 
 (defun enriched-decode (beg end)
   (interactive "*r")
@@ -57,7 +27,7 @@
            (replace-match (substring str 1))
            )))
       (goto-char beg)
-      (let (cmd str (fb (point)) fe b e)
+      (let (cmd sym 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)))
@@ -66,7 +36,8 @@
            (replace-match "")
            (setq cmd (downcase (substring cmd 1 (- (length cmd) 1))))
            )
-         (cond ((string= cmd "param")
+         (setq sym (intern cmd))
+         (cond ((eq sym 'param)
                 (setq b (point))
                 (save-excursion
                   (save-restriction
@@ -79,7 +50,7 @@
                       )))
                 (delete-region b e)
                 )
-               ((member cmd mime/text/enriched-face-list)
+               ((memq sym mime-viewer/face-list-for-text/enriched)
                 (setq b (point))
                 (save-excursion
                   (save-restriction
@@ -90,7 +61,7 @@
                           )
                       (setq e end)
                       )))
-                (mime/set-face-region b e cmd)
+                (tm:set-face-region b e sym)
                 )))
        (goto-char (point-max))
        (if (not (eq (preceding-char) ?\n))