;;; paragraphs.el --- paragraph and sentence parsing.
-;; Copyright (C) 1985-1991 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 91, 94, 95 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
+;; Keywords: wp
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Commentary:
+
+;; This package provides the paragraph-oriented commands documented in the
+;; Emacs manual.
+
+;;; Code:
+
+(defvar use-hard-newlines nil
+ "Non-nil means to distinguish hard and soft newlines.
+When this is non-nil, the functions `newline' and `open-line' add the
+text-property `hard' to newlines that they insert. Also, a line is
+only considered as a candidate to match `paragraph-start' or
+`paragraph-separate' if it follows a hard newline. Newlines not
+marked hard are called \"soft\", and are always internal to
+paragraphs. The fill functions always insert soft newlines.
+
+Each buffer has its own value of this variable.")
+(make-variable-buffer-local 'use-hard-newlines)
+
+(defconst paragraph-start "[ \t\n\f]" "\
+*Regexp for beginning of a line that starts OR separates paragraphs.
+This regexp should match lines that separate paragraphs
+and should also match lines that start a paragraph
+\(and are part of that paragraph).
+
+This is matched against the text at the left margin, which is not necessarily
+the beginning of the line, so it should never use \"^\" as an anchor. This
+ensures that the paragraph functions will work equally well within a region
+of text indented by a margin setting.
+
+The variable `paragraph-separate' specifies how to distinguish
+lines that start paragraphs from lines that separate them.
+
+If the variable `use-hard-newlines' is nonnil, then only lines following a
+hard newline are considered to match.")
-;;;###autoload
-(defconst paragraph-start "^[ \t\n\f]" "\
-*Regexp for beginning of a line that starts OR separates paragraphs.")
+;; paragraph-start requires a hard newline, but paragraph-separate does not:
+;; It is assumed that paragraph-separate is distinctive enough to be believed
+;; whenever it occurs, while it is reasonable to set paragraph-start to
+;; something very minimal, even including "." (which makes every hard newline
+;; start a new paragraph).
-;;;###autoload
-(defconst paragraph-separate "^[ \t\f]*$" "\
+(defconst paragraph-separate "[ \t\f]*$" "\
*Regexp for beginning of a line that separates paragraphs.
-If you change this, you may have to change paragraph-start also.")
+If you change this, you may have to change paragraph-start also.
+
+This is matched against the text at the left margin, which is not necessarily
+the beginning of the line, so it should not use \"^\" as an anchor. This
+ensures that the paragraph functions will work equally within a region of
+text indented by a margin setting.")
-;;;###autoload
(defconst sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\| \\)[ \t\n]*") "\
*Regexp describing the end of a sentence.
-All paragraph boundaries also end sentences, regardless.")
+All paragraph boundaries also end sentences, regardless.
+
+In order to be recognized as the end of a sentence, the ending period,
+question mark, or exclamation point must be followed by two spaces,
+unless it's inside some sort of quotes or parenthesis.")
-;;;###autoload
(defconst page-delimiter "^\014" "\
*Regexp describing line-beginnings that separate pages.")
-;;;###autoload
(defvar paragraph-ignore-fill-prefix nil "\
Non-nil means the paragraph commands are not affected by `fill-prefix'.
This is desirable in modes where blank lines are the paragraph delimiters.")
-
(defun forward-paragraph (&optional arg)
"Move forward to end of paragraph.
-With arg N, do it N times; negative arg -N means move forward N paragraphs.
+With arg N, do it N times; negative arg -N means move backward N paragraphs.
A line which `paragraph-start' matches either separates paragraphs
\(if `paragraph-separate' matches it also) or is the first line of a paragraph.
(and fill-prefix (not (equal fill-prefix ""))
(not paragraph-ignore-fill-prefix)
(regexp-quote fill-prefix)))
+ ;; Remove ^ from paragraph-start and paragraph-sep if they are there.
+ ;; These regexps shouldn't be anchored, because we look for them
+ ;; starting at the left-margin. This allows paragraph commands to
+ ;; work normally with indented text.
+ ;; This hack will not find problem cases like "whatever\\|^something".
+ (paragraph-start (if (and (not (equal "" paragraph-start))
+ (equal ?^ (aref paragraph-start 0)))
+ (substring paragraph-start 1)
+ paragraph-start))
+ (paragraph-separate (if (and (not (equal "" paragraph-start))
+ (equal ?^ (aref paragraph-separate 0)))
+ (substring paragraph-separate 1)
+ paragraph-separate))
(paragraph-separate
(if fill-prefix-regexp
- (concat paragraph-separate "\\|^"
+ (concat paragraph-separate "\\|"
fill-prefix-regexp "[ \t]*$")
- paragraph-separate)))
- (while (< arg 0)
+ paragraph-separate))
+ ;; This is used for searching.
+ (sp-paragraph-start (concat "^[ \t]*\\(" paragraph-start "\\)"))
+ start)
+ (while (and (< arg 0) (not (bobp)))
(if (and (not (looking-at paragraph-separate))
- (re-search-backward "^\n" (max (1- (point)) (point-min)) t))
+ (re-search-backward "^\n" (max (1- (point)) (point-min)) t)
+ (looking-at paragraph-separate))
nil
+ (setq start (point))
+ ;; Move back over paragraph-separating lines.
(forward-char -1) (beginning-of-line)
- (while (and (not (bobp)) (looking-at paragraph-separate))
- (forward-line -1))
- (end-of-line)
- ;; Search back for line that starts or separates paragraphs.
- (if (if fill-prefix-regexp
- ;; There is a fill prefix; it overrides paragraph-start.
- (progn
- (while (progn (beginning-of-line)
- (and (not (bobp))
- (not (looking-at paragraph-separate))
- (looking-at fill-prefix-regexp)))
- (forward-line -1))
- (not (bobp)))
- (re-search-backward paragraph-start nil t))
- ;; Found one.
- (progn
- (while (and (not (eobp)) (looking-at paragraph-separate))
- (forward-line 1))
- (if (eq (char-after (- (point) 2)) ?\n)
- (forward-line -1)))
- ;; No starter or separator line => use buffer beg.
- (goto-char (point-min))))
+ (while (and (not (bobp))
+ (progn (move-to-left-margin)
+ (looking-at paragraph-separate)))
+ (forward-line -1))
+ (if (bobp)
+ nil
+ ;; Go to end of the previous (non-separating) line.
+ (end-of-line)
+ ;; Search back for line that starts or separates paragraphs.
+ (if (if fill-prefix-regexp
+ ;; There is a fill prefix; it overrides paragraph-start.
+ (let (multiple-lines)
+ (while (and (progn (beginning-of-line) (not (bobp)))
+ (progn (move-to-left-margin)
+ (not (looking-at paragraph-separate)))
+ (looking-at fill-prefix-regexp))
+ (if (not (= (point) start))
+ (setq multiple-lines t))
+ (forward-line -1))
+ (move-to-left-margin)
+ ;; Don't move back over a line before the paragraph
+ ;; which doesn't start with fill-prefix
+ ;; unless that is the only line we've moved over.
+ (and (not (looking-at fill-prefix-regexp))
+ multiple-lines
+ (forward-line 1))
+ (not (bobp)))
+ (while (and (re-search-backward sp-paragraph-start nil 1)
+ ;; Found a candidate, but need to check if it is a
+ ;; REAL paragraph-start.
+ (not (bobp))
+ (progn (setq start (point))
+ (move-to-left-margin)
+ (not (looking-at paragraph-separate)))
+ (or (not (looking-at paragraph-start))
+ (and use-hard-newlines
+ (not (get-text-property (1- start)
+ 'hard)))))
+ (goto-char start))
+ (> (point) (point-min)))
+ ;; Found one.
+ (progn
+ ;; Move forward over paragraph separators.
+ ;; We know this cannot reach the place we started
+ ;; because we know we moved back over a non-separator.
+ (while (and (not (eobp))
+ (progn (move-to-left-margin)
+ (looking-at paragraph-separate)))
+ (forward-line 1))
+ ;; If line before paragraph is just margin, back up to there.
+ (end-of-line 0)
+ (if (> (current-column) (current-left-margin))
+ (forward-char 1)
+ (skip-chars-backward " \t")
+ (if (not (bolp))
+ (forward-line 1))))
+ ;; No starter or separator line => use buffer beg.
+ (goto-char (point-min)))))
(setq arg (1+ arg)))
- (while (> arg 0)
- (beginning-of-line)
+ (while (and (> arg 0) (not (eobp)))
(while (prog1 (and (not (eobp))
+ (progn (move-to-left-margin) (not (eobp)))
(looking-at paragraph-separate))
- (forward-line 1)))
+ (forward-line 1)))
(if fill-prefix-regexp
;; There is a fill prefix; it overrides paragraph-start.
(while (and (not (eobp))
+ (progn (move-to-left-margin) (not (eobp)))
(not (looking-at paragraph-separate))
(looking-at fill-prefix-regexp))
(forward-line 1))
- (if (re-search-forward paragraph-start nil t)
- (goto-char (match-beginning 0))
- (goto-char (point-max))))
+ (while (and (re-search-forward sp-paragraph-start nil 1)
+ (progn (setq start (match-beginning 0))
+ (goto-char start)
+ (not (eobp)))
+ (progn (move-to-left-margin)
+ (not (looking-at paragraph-separate)))
+ (or (not (looking-at paragraph-start))
+ (and use-hard-newlines
+ (not (get-text-property (1- start) 'hard)))))
+ (forward-char 1))
+ (if (< (point) (point-max))
+ (goto-char start)))
(setq arg (1- arg)))))
(defun backward-paragraph (&optional arg)
The paragraph marked is the one that contains point or follows point."
(interactive)
(forward-paragraph 1)
- (push-mark nil t)
+ (push-mark nil t t)
(backward-paragraph 1))
(defun kill-paragraph (arg)
(end-of-paragraph-text))))))
(defun forward-sentence (&optional arg)
- "Move forward to next`sentence-end'. With argument, repeat.
+ "Move forward to next `sentence-end'. With argument, repeat.
With negative argument, move backward repeatedly to `sentence-beginning'.
The variable `sentence-end' is a regular expression that matches ends of
(defun kill-sentence (&optional arg)
"Kill from point to end of sentence.
With arg, repeat; negative arg -N means kill back to Nth start of sentence."
- (interactive "*p")
- (let ((beg (point)))
- (forward-sentence arg)
- (kill-region beg (point))))
+ (interactive "p")
+ (kill-region (point) (progn (forward-sentence arg) (point))))
(defun backward-kill-sentence (&optional arg)
"Kill back from point to start of sentence.
With arg, repeat, or kill forward to Nth end of sentence if negative arg -N."
- (interactive "*p")
- (let ((beg (point)))
- (backward-sentence arg)
- (kill-region beg (point))))
+ (interactive "p")
+ (kill-region (point) (progn (backward-sentence arg) (point))))
(defun mark-end-of-sentence (arg)
"Put mark at end of sentence. Arg works as in `forward-sentence'."
(push-mark
(save-excursion
(forward-sentence arg)
- (point))))
+ (point))
+ nil t))
(defun transpose-sentences (arg)
"Interchange this (next) and previous sentence."