From df344ab435c04aea5bb9261e6d2c349ab8f4fcea Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Thu, 5 Jun 2014 16:41:32 +0200 Subject: [PATCH] tildify.el: Optimise environments regexes * lisp/textmodes/tildify.el (tildify-ignored-environments-alist): Each time beginning of an environment to ignore is found, `tildify-find-env' needs to identify regexp for the ending of the environment. This is done by trying all the opening regexes on matched text in a loop, so to speed that up, this loop should have fewer things to match, which can be done by using alternatives in the opening regexes. Coincidentally, this should make matching of the opening regexp faster as well thanks to the use of `regexp-opt' and having common prefix pulled from many regexes. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/textmodes/tildify.el | 37 +++++++++++++++---------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f8ed1dced82..1a6b1cd517c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,19 @@ 2014-06-05 Michal Nazarewicz + * textmodes/tildify.el (tildify-ignored-environments-alist): + Optimise environments regexes + + Each time beginning of an environment to ignore is found, + `tildify-find-env' needs to identify regexp for the ending + of the environment. This is done by trying all the opening + regexes on matched text in a loop, so to speed that up, this + loop should have fewer things to match, which can be done by + using alternatives in the opening regexes. + + Coincidentally, this should make matching of the opening + regexp faster as well thanks to the use of `regexp-opt' and + having common prefix pulled from many regexes. + * textmodes/tildify.el (tildify-string-alist) (tildify-ignored-environments-alist): Add `nxml-mode' to the list of supported modes since `xml-mode' is no longer a thing but just diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 6dd471d49ad..39ccad717d4 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -119,42 +119,35 @@ mode, the item for the mode SYMBOL is looked up in the alist instead." (symbol :tag "Like other"))))) (defcustom tildify-ignored-environments-alist - '((latex-mode + `((latex-mode ("\\\\\\\\" . "") ; do not remove this - ("\\\\begin{verbatim}" . "\\\\end{verbatim}") + (,(eval-when-compile (concat + "\\\\begin{\\(" + (regexp-opt '("verbatim" "math" "displaymath" + "equation" "eqnarray" "eqnarray*")) + "\\)}")) + . ("\\\\end{" 1 "}")) ("\\\\verb\\*?\\(.\\)" . (1)) - ("\\$\\$" . "\\$\\$") - ("\\$" . "\\$") + ("\\$\\$?" . (0)) ("\\\\(" . "\\\\)") ("\\\\[[]" . "\\\\[]]") - ("\\\\begin{math}" . "\\\\end{math}") - ("\\\\begin{displaymath}" . "\\\\end{displaymath}") - ("\\\\begin{equation}" . "\\\\end{equation}") - ("\\\\begin{eqnarray\\*?}" . "\\\\end{eqnarray\\*?}") ("\\\\[a-zA-Z]+\\( +\\|{}\\)[a-zA-Z]*" . "") ("%" . "$")) (plain-tex-mode . latex-mode) (html-mode - ("]*>" . "") - ("" . "") - ("" . "") - ("" . "") - ("" . "") - ("" . "") - ("]*>" . "") - ("" . "") - ("" . "") - ("" . "") - ("" . "") - ("" . "") + (,(eval-when-compile (concat + "<\\(" + (regexp-opt '("pre" "dfn" "code" "samp" "kbd" "var" + "PRE" "DFN" "CODE" "SAMP" "KBD" "VAR")) + "\\)\\>[^>]*>")) + . ("")) ("") ("<" . ">")) (sgml-mode . html-mode) (xml-mode ("") ("<" . ">")) - (nxml-mode . xml-mode) - (t nil)) + (nxml-mode . xml-mode)) "Alist specifying ignored structured text environments. Parts of text defined in this alist are skipped without performing hard space insertion on them. These setting allow skipping text parts like verbatim or -- 2.39.2