2004-09-27 07:44:44 +00:00
|
|
|
;;; flow-fill.el --- interpret RFC2646 "flowed" text
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; Author: Simon Josefsson <jas@pdc.kth.se>
|
|
|
|
;; Keywords: mail
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-09-19 13:40:08 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This implement decoding of RFC2646 formatted text, including the
|
|
|
|
;; quoted-depth wins rules.
|
|
|
|
|
|
|
|
;; Theory of operation: search for lines ending with SPC, save quote
|
|
|
|
;; length of line, remove SPC and concatenate line with the following
|
|
|
|
;; line if quote length of following line matches current line.
|
|
|
|
|
|
|
|
;; When no further concatenations are possible, we've found a
|
|
|
|
;; paragraph and we let `fill-region' fill the long line into several
|
|
|
|
;; lines with the quote prefix as `fill-prefix'.
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;; Todo: implement basic `fill-region' (Emacs and XEmacs
|
2000-10-26 18:12:28 +00:00
|
|
|
;; implementations differ..)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; History:
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; 2000-02-17 posted on ding mailing list
|
|
|
|
;; 2000-02-19 use `point-at-{b,e}ol' in XEmacs
|
|
|
|
;; 2000-03-11 no compile warnings for point-at-bol stuff
|
2002-11-29 15:57:52 +00:00
|
|
|
;; 2000-03-26 committed to gnus cvs
|
2000-10-26 18:12:28 +00:00
|
|
|
;; 2000-10-23 don't flow "-- " lines, make "quote-depth wins" rule
|
|
|
|
;; work when first line is at level 0.
|
2004-09-04 13:13:48 +00:00
|
|
|
;; 2002-01-12 probably incomplete encoding support
|
|
|
|
;; 2003-12-08 started working on test harness.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2000-10-26 18:12:28 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom fill-flowed-display-column 'fill-column
|
|
|
|
"Column beyond which format=flowed lines are wrapped, when displayed.
|
|
|
|
This can be a Lisp expression or an integer."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-08 18:17:56 +00:00
|
|
|
:group 'mime-display
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (const :tag "Standard `fill-column'" fill-column)
|
|
|
|
(const :tag "Fit Window" (- (window-width) 5))
|
|
|
|
(sexp)
|
|
|
|
(integer)))
|
|
|
|
|
|
|
|
(defcustom fill-flowed-encode-column 66
|
|
|
|
"Column beyond which format=flowed lines are wrapped, in outgoing messages.
|
|
|
|
This can be a Lisp expression or an integer.
|
|
|
|
RFC 2646 suggests 66 characters for readability."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-08 18:17:56 +00:00
|
|
|
:group 'mime-display
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (const :tag "Standard fill-column" fill-column)
|
|
|
|
(const :tag "RFC 2646 default (66)" 66)
|
|
|
|
(sexp)
|
|
|
|
(integer)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun fill-flowed-encode (&optional buffer)
|
|
|
|
(with-current-buffer (or buffer (current-buffer))
|
|
|
|
;; No point in doing this unless hard newlines is used.
|
|
|
|
(when use-hard-newlines
|
|
|
|
(let ((start (point-min)) end)
|
|
|
|
;; Go through each paragraph, filling it and adding SPC
|
|
|
|
;; as the last character on each line.
|
|
|
|
(while (setq end (text-property-any start (point-max) 'hard 't))
|
2011-01-04 02:24:15 +00:00
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start end)
|
|
|
|
(let ((fill-column (eval fill-flowed-encode-column)))
|
|
|
|
(fill-flowed-fill-buffer))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward "\n" nil t)
|
|
|
|
(replace-match " \n" t t))
|
|
|
|
(goto-char (setq start (1+ (point-max)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
t)))
|
|
|
|
|
2011-01-04 02:24:15 +00:00
|
|
|
(defun fill-flowed-fill-buffer ()
|
|
|
|
(let ((prefix nil)
|
|
|
|
(prev-prefix nil)
|
|
|
|
(start (point-min)))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(setq prefix (and (looking-at "[> ]+")
|
|
|
|
(match-string 0)))
|
|
|
|
(if (equal prefix prev-prefix)
|
|
|
|
(forward-line 1)
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start (point))
|
|
|
|
(let ((fill-prefix prev-prefix))
|
|
|
|
(fill-region (point-min) (point-max) t 'nosqueeze 'to-eop))
|
|
|
|
(goto-char (point-max)))
|
|
|
|
(setq prev-prefix prefix
|
|
|
|
start (point))))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start (point))
|
|
|
|
(let ((fill-prefix prev-prefix))
|
|
|
|
(fill-region (point-min) (point-max) t 'nosqueeze 'to-eop)))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;;###autoload
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun fill-flowed (&optional buffer delete-space)
|
2010-09-18 10:02:19 +00:00
|
|
|
(with-current-buffer (or (current-buffer) buffer)
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-min))
|
2006-02-24 05:02:12 +00:00
|
|
|
;; Remove space stuffing.
|
2006-04-17 08:36:28 +00:00
|
|
|
(while (re-search-forward "^\\( \\|>+ $\\)" nil t)
|
2006-02-24 05:02:12 +00:00
|
|
|
(delete-char -1)
|
|
|
|
(forward-line 1))
|
|
|
|
(goto-char (point-min))
|
2000-09-19 13:40:08 +00:00
|
|
|
(while (re-search-forward " $" nil t)
|
|
|
|
(when (save-excursion
|
|
|
|
(beginning-of-line)
|
2006-02-28 00:38:35 +00:00
|
|
|
(looking-at "^\\(>*\\)\\( ?\\)"))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((quote (match-string 1))
|
|
|
|
sig)
|
2000-09-19 13:40:08 +00:00
|
|
|
(if (string= quote "")
|
|
|
|
(setq quote nil))
|
|
|
|
(when (and quote (string= (match-string 2) ""))
|
|
|
|
(save-excursion
|
|
|
|
;; insert SP after quote for pleasant reading of quoted lines
|
|
|
|
(beginning-of-line)
|
|
|
|
(when (> (skip-chars-forward ">") 0)
|
|
|
|
(insert " "))))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; XXX slightly buggy handling of "-- "
|
2000-09-19 13:40:08 +00:00
|
|
|
(while (and (save-excursion
|
2000-10-26 18:12:28 +00:00
|
|
|
(ignore-errors (backward-char 3))
|
|
|
|
(setq sig (looking-at "-- "))
|
2000-09-19 13:40:08 +00:00
|
|
|
(looking-at "[^-][^-] "))
|
|
|
|
(save-excursion
|
|
|
|
(unless (eobp)
|
|
|
|
(forward-char 1)
|
2004-09-04 13:13:48 +00:00
|
|
|
(looking-at (format "^\\(%s\\)\\([^>\n\r]\\)"
|
|
|
|
(or quote " ?"))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(save-excursion
|
|
|
|
(replace-match (if (string= (match-string 2) " ")
|
|
|
|
"" "\\2")))
|
|
|
|
(backward-delete-char -1)
|
2011-01-23 00:34:08 +00:00
|
|
|
(when delete-space
|
|
|
|
(delete-char -1))
|
2000-09-19 13:40:08 +00:00
|
|
|
(end-of-line))
|
2000-10-26 18:12:28 +00:00
|
|
|
(unless sig
|
2004-09-04 13:13:48 +00:00
|
|
|
(condition-case nil
|
|
|
|
(let ((fill-prefix (when quote (concat quote " ")))
|
|
|
|
(fill-column (eval fill-flowed-display-column))
|
2006-02-24 05:02:12 +00:00
|
|
|
filladapt-mode
|
|
|
|
adaptive-fill-mode)
|
2007-10-28 09:18:39 +00:00
|
|
|
(fill-region (point-at-bol)
|
|
|
|
(min (1+ (point-at-eol))
|
2004-09-04 13:13:48 +00:00
|
|
|
(point-max))
|
|
|
|
'left 'nosqueeze))
|
|
|
|
(error
|
|
|
|
(forward-line 1)
|
|
|
|
nil))))))))
|
|
|
|
|
|
|
|
;; Test vectors.
|
|
|
|
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar show-trailing-whitespace)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defvar fill-flowed-encode-tests
|
2005-10-31 07:07:28 +00:00
|
|
|
`(
|
2004-09-04 13:13:48 +00:00
|
|
|
;; The syntax of each list element is:
|
|
|
|
;; (INPUT . EXPECTED-OUTPUT)
|
2005-10-31 07:07:28 +00:00
|
|
|
(,(concat
|
|
|
|
"> Thou villainous ill-breeding spongy dizzy-eyed \n"
|
|
|
|
"> reeky elf-skinned pigeon-egg! \n"
|
|
|
|
">> Thou artless swag-bellied milk-livered \n"
|
|
|
|
">> dismal-dreaming idle-headed scut!\n"
|
|
|
|
">>> Thou errant folly-fallen spleeny reeling-ripe \n"
|
|
|
|
">>> unmuzzled ratsbane!\n"
|
|
|
|
">>>> Henceforth, the coding style is to be strictly \n"
|
|
|
|
">>>> enforced, including the use of only upper case.\n"
|
|
|
|
">>>>> I've noticed a lack of adherence to the coding \n"
|
|
|
|
">>>>> styles, of late.\n"
|
|
|
|
">>>>>> Any complaints?")
|
|
|
|
.
|
|
|
|
,(concat
|
|
|
|
"> Thou villainous ill-breeding spongy dizzy-eyed reeky elf-skinned\n"
|
|
|
|
"> pigeon-egg! \n"
|
|
|
|
">> Thou artless swag-bellied milk-livered dismal-dreaming idle-headed\n"
|
|
|
|
">> scut!\n"
|
|
|
|
">>> Thou errant folly-fallen spleeny reeling-ripe unmuzzled ratsbane!\n"
|
|
|
|
">>>> Henceforth, the coding style is to be strictly enforced,\n"
|
|
|
|
">>>> including the use of only upper case.\n"
|
|
|
|
">>>>> I've noticed a lack of adherence to the coding styles, of late.\n"
|
|
|
|
">>>>>> Any complaints?\n"
|
|
|
|
))
|
|
|
|
;; (,(concat
|
|
|
|
;; "\n"
|
|
|
|
;; "> foo\n"
|
|
|
|
;; "> \n"
|
|
|
|
;; "> \n"
|
|
|
|
;; "> bar\n")
|
|
|
|
;; .
|
|
|
|
;; ,(concat
|
|
|
|
;; "\n"
|
|
|
|
;; "> foo bar\n"))
|
2004-09-04 13:13:48 +00:00
|
|
|
))
|
|
|
|
|
|
|
|
(defun fill-flowed-test ()
|
|
|
|
(interactive "")
|
|
|
|
(switch-to-buffer (get-buffer-create "*Format=Flowed test output*"))
|
|
|
|
(erase-buffer)
|
|
|
|
(setq show-trailing-whitespace t)
|
|
|
|
(dolist (test fill-flowed-encode-tests)
|
|
|
|
(let (start output)
|
|
|
|
(insert "***** BEGIN TEST INPUT *****\n")
|
|
|
|
(insert (car test))
|
|
|
|
(insert "***** END TEST INPUT *****\n\n")
|
|
|
|
(insert "***** BEGIN TEST OUTPUT *****\n")
|
|
|
|
(setq start (point))
|
|
|
|
(insert (car test))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start (point))
|
|
|
|
(fill-flowed))
|
|
|
|
(setq output (buffer-substring start (point-max)))
|
|
|
|
(insert "***** END TEST OUTPUT *****\n")
|
|
|
|
(unless (string= output (cdr test))
|
|
|
|
(insert "\n***** BEGIN TEST EXPECTED OUTPUT *****\n")
|
|
|
|
(insert (cdr test))
|
|
|
|
(insert "***** END TEST EXPECTED OUTPUT *****\n"))
|
|
|
|
(insert "\n\n")))
|
|
|
|
(goto-char (point-max)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(provide 'flow-fill)
|
|
|
|
|
|
|
|
;;; flow-fill.el ends here
|