Commit fc21a7de authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Stefan Monnier

* test/automated/tildify-tests.el: New file.

* lisp/textmodes/tildify.el (tildify-buffer, tildify-region):
Add dont-ask option.

Fixes: debbugs:17547
parent 4c539a7b
2014-05-21 Michal Nazarewicz <mina86@mina86.com>
* textmodes/tildify.el (tildify-buffer, tildify-region):
Add dont-ask option.
2014-05-28 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (zerop): Move from C. Add compiler-macro (bug#17475).
......
......@@ -3,7 +3,7 @@
;; Copyright (C) 1997-2014 Free Software Foundation, Inc.
;; Author: Milan Zamazal <pdm@zamazal.org>
;; Version: 4.5
;; Version: 4.5.1
;; Keywords: text, TeX, SGML, wp
;; This file is part of GNU Emacs.
......@@ -172,20 +172,22 @@ END-REGEX defines end of the corresponding text part and can be either:
;;; *** Interactive functions ***
;;;###autoload
(defun tildify-region (beg end)
(defun tildify-region (beg end &optional dont-ask)
"Add hard spaces in the region between BEG and END.
See variables `tildify-pattern-alist', `tildify-string-alist', and
`tildify-ignored-environments-alist' for information about configuration
parameters.
This function performs no refilling of the changed text."
(interactive "*r")
This function performs no refilling of the changed text.
If DONT-ASK is set, or called interactively with prefix argument, user
won't be prompted for confirmation of each substitution."
(interactive "*rP")
(setq tildify-count 0)
(let (a
z
(marker-end (copy-marker end))
end-env
finish
(ask t)
(ask (not dont-ask))
(case-fold-search nil)
(regexp (tildify-build-regexp)) ; beginnings of environments
aux)
......@@ -226,14 +228,16 @@ This function performs no refilling of the changed text."
(message "%d spaces replaced." tildify-count))
;;;###autoload
(defun tildify-buffer ()
(defun tildify-buffer (&optional dont-ask)
"Add hard spaces in the current buffer.
See variables `tildify-pattern-alist', `tildify-string-alist', and
`tildify-ignored-environments-alist' for information about configuration
parameters.
This function performs no refilling of the changed text."
(interactive "*")
(tildify-region (point-min) (point-max)))
This function performs no refilling of the changed text.
If DONT-ASK is set, or called interactively with prefix argument, user
won't be prompted for confirmation of each substitution."
(interactive "*P")
(tildify-region (point-min) (point-max) dont-ask))
;;; *** Auxiliary functions ***
......
2014-05-21 Michal Nazarewicz <mina86@mina86.com>
* automated/tildify-tests.el: New file.
2014-05-27 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/ruby.rb: Add one more test.
......
;;; tildify-test.el --- ERT tests for teldify.el
;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Michal Nazarewicz <mina86@mina86.com>
;; Version: 4.5
;; Keywords: text, TeX, SGML, 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 3 of the License, or
;; (at your option) any later version.
;; 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
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This package defines regression tests for the tildify package.
;;; Code:
(require 'ert)
(require 'tildify)
(defun tildify-test--example-sentence (space)
"Return an example sentence with SPACE where hard space is required."
(concat "Lorem ipsum v" space "dolor sit amet, a" space
"consectetur adipiscing elit."))
(defun tildify-test--example-html (sentence &optional with-nbsp)
"Return an example HTML code.
SENTENCE is placed where spaces should not be replaced with hard spaces, and
WITH-NBSP is placed where spaces should be replaced with hard spaces. If the
latter is missing, SENTENCE will be used in all placeholder positions."
(let ((with-nbsp (or with-nbsp sentence)))
(concat "<p>" with-nbsp "</p>\n"
"<pre>" sentence "</pre>\n"
"<! -- " sentence " -- >\n"
"<p>" with-nbsp "</p>\n"
"<" sentence ">\n")))
(defun tildify-test--test (modes input expected)
"Test tildify running in MODES.
INPUT is the initial content of the buffer and EXPECTED is expected result
after `tildify-buffer' is run."
(dolist (mode modes)
(with-temp-buffer
(funcall mode)
(let ((header (concat "Testing `tildify-buffer' in "
(symbol-name mode) "\n")))
(insert header input)
(tildify-buffer t)
(should (string-equal (concat header expected) (buffer-string)))))
(with-temp-buffer
(funcall mode)
(let ((header (concat "Testing `tildify-region' in "
(symbol-name mode) "\n")))
(insert header input)
(tildify-region (point-min) (point-max) t)
(should (string-equal (concat header expected) (buffer-string)))))))
(ert-deftest tildify-test-html ()
"Tests tildification in an HTML document"
(let* ((sentence (tildify-test--example-sentence " "))
(with-nbsp (tildify-test--example-sentence "&nbsp;")))
(tildify-test--test '(html-mode sgml-mode)
(tildify-test--example-html sentence sentence)
(tildify-test--example-html sentence with-nbsp))))
(defun tildify-test--example-tex (sentence &optional with-nbsp)
"Return an example (La)Tex code.
SENTENCE is placed where spaces should not be replaced with hard spaces, and
WITH-NBSP is placed where spaces should be replaced with hard spaces. If the
latter is missing, SENTENCE will be used in all placeholder positions."
(let ((with-nbsp (or with-nbsp sentence)))
(concat with-nbsp "\n"
"\\begin{verbatim}\n" sentence "\n\\end{verbatim}\n"
"\\verb#" sentence "#\n"
"$$" sentence "$$\n"
"$" sentence "$\n"
"\\[" sentence "\\]\n"
"\\v A % " sentence "\n"
with-nbsp "\n")))
(ert-deftest tildify-test-tex ()
"Tests tildification in a (La)TeX document"
(let* ((sentence (tildify-test--example-sentence " "))
(with-nbsp (tildify-test--example-sentence "~")))
(tildify-test--test '(tex-mode latex-mode plain-tex-mode)
(tildify-test--example-tex sentence sentence)
(tildify-test--example-tex sentence with-nbsp))))
(provide 'tildify-tests)
;;; tildify-tests.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment