xemacs-beta: lisp/modes/enriched.el comparison

comparison lisp/modes/enriched.el @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6

author	cvs
date	Mon, 13 Aug 2007 10:07:35 +0200
parents	e45d5e7c476e
children

comparison

equal deleted inserted replaced

-:c5d88c05e1e9
+:1f0dabaa0855
 ;;; enriched.el --- read and save files in text/enriched format
-;; Copyright (c) 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (c) 1994, 1995, 1996 Free Software Foundation, Inc.
 ;; XEmacs version: Mike Sperber <sperber@informatik.uni-tuebingen.de>
 ;; Original author: Boris Goldowsky <boris@gnu.ai.mit.edu>
 ;; Keywords: wp, faces
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ;; 02111-1307, USA.
-;;; Synched up with: FSF 19.34.
+;;; Synched up with: FSF 20.2.
 ;;; Commentary:
-;;
 ;; This file implements reading, editing, and saving files with
 ;; text-properties such as faces, levels of indentation, and true line
-;; breaks distinguished from newlines just used to fit text into the
+;; breaks distinguished from newlines just used to fit text into the window.
-;; window.
-;;
 ;; The file format used is the MIME text/enriched format, which is a
-;; standard format defined in internet RFC 1563.  All standard
+;; standard format defined in internet RFC 1563.  All standard annotations
-;; annotations are supported.
+;; are supported except for <smaller> and <bigger>, which are currently not
-;;
+;; possible to display.
-;; A separate file, enriched.doc, contains further documentation and
-;; other important information about this code.  It also serves as an
+;; A separate file, enriched.doc, contains further documentation and other
-;; example file in text/enriched format.  It should be in the etc
+;; important information about this code.  It also serves as an example
-;; directory of your emacs distribution.
+;; file in text/enriched format.  It should be in the etc directory of your
-;;
+;; emacs distribution.
 ;;; TODO for the XEmacs port:
 ;;
 ;; Currently XEmacs does not support default-text-properties.  The
 ;; original enriched.el uses this to set the left-margin,
 ;; right-margin, and justification properties to 'front-sticky.
 ;; If you know the Right Way to fix this, contact
 ;; Mike Sperber <sperber@informatik.uni-tuebingen.de>.
+;;; Code:
 (provide 'enriched)
-(if window-system (require 'facemenu))
 ;;;
 ;;; Variables controlling the display
 ;;;
 (defgroup enriched nil
 "Read and save files in text/enriched format"
 :group 'wp)
 (defcustom enriched-verbose t
 "*If non-nil, give status messages when reading and writing files."
 :type 'boolean
 :group 'enriched)
-(defcustom enriched-default-right-margin 10
+;;;
-"*Default amount of space to leave on the right edge of the screen.
+;;; Set up faces & display table
-This can be increased inside text by changing the 'right-margin text property.
+;;;
-Measured in character widths.  If the screen is narrower than this, it is
-assumed to be 0."
+;; Emacs doesn't have a "fixed" face by default, since all faces currently
-:type 'integer
+;; have to be fixed-width.  So we just pick one that looks different from the
+;; default.
+(defface fixed
+'((t (:bold t)))
+"Face used for text that must be shown in fixed width.
+Currently, emacs can only display fixed-width fonts, but this may change.
+This face is used for text specifically marked as fixed-width, for example
+in text/enriched files."
 :group 'enriched)
-(defcustom enriched-fill-after-visiting t
+(defface excerpt
-"If t, fills paragraphs when reading in enriched documents.
+'((t (:italic t)))
-If nil, only fills when you explicitly request it.  If the value is 'ask, then
+"Face used for text that is an excerpt from another document.
-it will query you whether to fill.
+This is used in enriched-mode for text explicitly marked as an excerpt."
-Filling is never done if the current text-width is the same as the value
-stored in the file."
-:type '(choice (const nil) (const t) (const ask))
 :group 'enriched)
-;;;
+(defconst enriched-display-table
-;;; Set up faces & display table
+;; XEmacs change
-;;;
+;; (or (copy-sequence standard-display-table)
+;;     (make-display-table)))
-;; XEmacs change (Can't cheat, we have variable width fonts)
+(make-display-table))
-(if (not (find-face 'fixed))
+(aset enriched-display-table ?\f (make-vector (1- (frame-width)) ?-))
-(copy-face 'default 'fixed))
-(if (not (find-face 'excerpt))
-(copy-face 'italic 'excerpt))
-(defconst enriched-display-table (make-display-table))
-(aset enriched-display-table ?\f (make-string (1- (frame-width)) ?-))
 (defconst enriched-par-props '(left-margin right-margin justification)
 "Text-properties that usually apply to whole paragraphs.
 These are set front-sticky everywhere except at hard newlines.")
 ;;;   (bidirectional)
 (defconst enriched-initial-annotation
 (lambda ()
 (format "Content-Type: text/enriched\nText-Width: %d\n\n"
-	    (enriched-text-width)))
+	    fill-column))
 "What to insert at the start of a text/enriched file.
 If this is a string, it is inserted.  If it is a list, it should be a lambda
 expression, which is evaluated to get the string to insert.")
 (defconst enriched-annotation-format "<%s%s>"
 (defvar enriched-old-bindings nil
 "Store old variable values that we change when entering mode.
 The value is a list of \(VAR VALUE VAR VALUE...).")
 (make-variable-buffer-local 'enriched-old-bindings)
-(defvar enriched-text-width nil)
-(make-variable-buffer-local 'enriched-text-width)
 ;;;
 ;;; Define the mode
 ;;;
 ;;;###autoload
 	     (setq enriched-old-bindings (cdr (cdr enriched-old-bindings)))))
 	  (enriched-mode nil)		; Mode already on; do nothing.
 	  (t (setq enriched-mode t)	; Turn mode on
-	     (if (not (memq 'text/enriched buffer-file-format))
+	     (add-to-list 'buffer-file-format 'text/enriched)
-		 (setq buffer-file-format
-		       (cons 'text/enriched buffer-file-format)))
 	     ;; Save old variable values before we change them.
 	     ;; These will be restored if we exit Enriched mode.
 	     (setq enriched-old-bindings
 		   ;; XEmacs change
 		   (list ; 'buffer-display-table buffer-display-table
 			 'indent-line-function indent-line-function
-			 'use-hard-newlines    use-hard-newlines
 			 'default-text-properties default-text-properties))
 	     (make-local-variable 'indent-line-function)
-	     (make-local-variable 'use-hard-newlines)
 	     (make-local-variable 'default-text-properties)
 	     (setq indent-line-function 'indent-to-left-margin
 		   ;; XEmacs change
 		   ;; buffer-display-table  enriched-display-table
-		   use-hard-newlines     t)
+		   )
+	     (use-hard-newlines 1 nil)
 	     (let ((sticky (plist-get default-text-properties 'front-sticky))
 		   (p enriched-par-props))
 	       (while p
-		 (if (not (memq (car p) sticky))
+		 (add-to-list 'sticky (car p))
-		     (setq sticky (cons (car p) sticky)))
 		 (setq p (cdr p)))
 	       (if sticky
 		   (setq default-text-properties
 			 (plist-put default-text-properties
 				    'front-sticky sticky))))
 	    nil ; skip blank lines
 	  (indent-to (current-left-margin))
 	  (justify-current-line t nil t))
 	(forward-line 1)))))
-(defun enriched-text-width ()
-"The width of unindented text in this window, in characters.
-This is the width of the window minus `enriched-default-right-margin'."
-(or enriched-text-width
-(let ((ww (window-width)))
-	(setq enriched-text-width
-	      (if (> ww enriched-default-right-margin)
-		  (- ww enriched-default-right-margin)
-		ww)))))
 ;;;
 ;;; Encoding Files
 ;;;
 ;;;###autoload
-(defun enriched-encode (from to)
+(defun enriched-encode (from to &optional orig-buf)
 (if enriched-verbose (message "Enriched: encoding document..."))
 (save-restriction
 (narrow-to-region from to)
 (delete-to-left-margin)
 (unjustify-region)
 (format-annotate-region from (point-max) enriched-translations
 			     'enriched-make-annotation enriched-ignore))
 (goto-char from)
 (insert (if (stringp enriched-initial-annotation)
 		enriched-initial-annotation
-	      (funcall enriched-initial-annotation)))
+	      (save-excursion
+		;; Eval this in the buffer we are annotating.  This
+		;; fixes a bug which was saving incorrect File-Width
+		;; information, since we were looking at local
+		;; variables in the wrong buffer.
+		(if orig-buf (set-buffer orig-buf))
+		(funcall enriched-initial-annotation))))
 (enriched-map-property-regions 'hard
 (lambda (v b e)
 	(if (and v (= ?\n (char-after b)))
 	    (progn (goto-char b) (insert "\n"))))
 (point) nil)
 ;;;
 ;;;###autoload
 (defun enriched-decode (from to)
 (if enriched-verbose (message "Enriched: decoding document..."))
+(use-hard-newlines 1 'never)
 (save-excursion
 (save-restriction
 (narrow-to-region from to)
 (goto-char from)
-(let ((file-width (enriched-get-file-width))
-	    (use-hard-newlines t))
+;; Deal with header
+(let ((file-width (enriched-get-file-width)))
 	(enriched-remove-header)
 	;; Deal with newlines
-	(goto-char from)
 	(while (search-forward-regexp "\n\n+" nil t)
 	  (if (current-justification)
 	      (delete-char -1))
-	  (put-text-property (match-beginning 0) (point) 'hard t)
+	  (set-hard-newline-properties (match-beginning 0) (point)))
-	  (put-text-property (match-beginning 0) (point) 'front-sticky nil))
 	;; Translate annotations
 	(format-deannotate-region from (point-max) enriched-translations
 				  'enriched-next-annotation)
-	;; Fill paragraphs
+	;; Indent or fill the buffer
-	(if (or (and file-width		; possible reasons not to fill:
+	(cond (file-width		; File was filled to this width
-		     (= file-width (enriched-text-width))) ; correct wd.
+	       (setq fill-column file-width)
-		(null enriched-fill-after-visiting) ; never fill
+	       (if enriched-verbose (message "Indenting..."))
-		(and (eq 'ask enriched-fill-after-visiting) ; asked & declined
+	       (enriched-insert-indentation))
-		     (not (y-or-n-p "Re-fill for current display width? "))))
+	      (t			; File was not filled.
-	    ;; Minimally, we have to insert indentation and justification.
+	       (if enriched-verbose (message "Filling paragraphs..."))
-	    (enriched-insert-indentation)
+	       (fill-region (point-min) (point-max))))
-	  (if enriched-verbose (message "Filling paragraphs..."))
+	(if enriched-verbose (message nil)))
-	  (fill-region (point-min) (point-max))))
-(if enriched-verbose (message nil))
 (point-max))))
 (defun enriched-next-annotation ()
 "Find and return next text/enriched annotation.
 Any \"<<\" strings encountered are converted to \"<\".
 (while (looking-at "^[-A-Za-z]+: .*\n")
 (delete-region (point) (match-end 0)))
 (if (looking-at "^\n")
 (delete-char 1)))
-(defun enriched-decode-foreground (from to color)
+(defun enriched-decode-foreground (from to &optional color)
 ;; XEmacs change
 (let ((face (facemenu-get-face (intern (concat "fg:" color)))))
 (if (not face)
 	(progn
 	  (make-face face)
 	  (message "Warning: Color \"%s\" can't be displayed." color)))
 (list from to 'face face)))
-(defun enriched-decode-background (from to color)
+(defun enriched-decode-background (from to &optional color)
 ;; XEmacs change
 (let ((face (facemenu-get-face (intern (concat "bg:" color)))))
 (if (not face)
 	(progn
 	  (make-face face)

Mercurial > hg > xemacs-beta

comparison lisp/modes/enriched.el @ 215:1f0dabaa0855 r20-4b6