branch: main
commit 2d643932b5de4b67811fb444119021ea304ccf5f
Merge: f571914d 31acc2d0
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Merge remote-tracking branch 'origin/master' into externals/auctex
---
latex.el | 12 ++++++------
style/breqn.el | 42 ++++++------------------------------------
tex-buf.el | 6 +++---
3 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/latex.el b/latex.el
index 1b6699eb..7701eb37 100644
--- a/latex.el
+++ b/latex.el
@@ -6805,13 +6805,13 @@ function would return non-nil and `(match-string 1)'
would return
(goto-char (point-min))
(if
(search-forward-regexp
- "\\documentstyle\\[\\([^]]*\\)\\]{\\([^}]*\\)}"
+ "\\\\documentstyle\\[\\([^]]*\\)\\]{\\([^}]*\\)}"
(point-max) t)
(setq optstr (TeX-match-buffer 1)
docstyle (TeX-match-buffer 2)
optlist (TeX-split-string "," optstr))
(if (search-forward-regexp
- "\\documentstyle{\\([^}]*\\)}"
+ "\\\\documentstyle{\\([^}]*\\)}"
(point-max) t)
(setq docstyle (TeX-match-buffer 1))
(error "No documentstyle defined")))
@@ -6837,10 +6837,10 @@ function would return non-nil and `(match-string 1)'
would return
(mapconcat (lambda (x) x)
(nreverse 2epackages) "}\n\\usepackage{") "}\n"))
(if (equal docstyle "slides")
- (progn
- (goto-char (point-min))
- (while (re-search-forward "\\\\blackandwhite{" nil t)
- (replace-match "\\\\input{" nil nil)))))
+ (progn
+ (goto-char (point-min))
+ (while (re-search-forward "\\\\blackandwhite{" nil t)
+ (replace-match "\\\\input{" nil nil)))))
(TeX-normal-mode nil))
(defun LaTeX-env-beginning-pos-col ()
diff --git a/style/breqn.el b/style/breqn.el
index f22696ca..3a898605 100644
--- a/style/breqn.el
+++ b/style/breqn.el
@@ -1,6 +1,6 @@
-;;; breqn.el --- AUCTeX style for `breqn.sty' (v0.98e)
+;;; breqn.el --- AUCTeX style for `breqn.sty' (v0.98j)
-;; Copyright (C) 2017--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -26,7 +26,7 @@
;;; Commentary:
-;; This file adds support for `breqn.sty' (v0.98e) from 2017/01/27.
+;; This file adds support for `breqn.sty' (v0.98j) from 2020/04/19.
;; `breqn.sty' is part of TeXLive.
;; In breqn documentation, there is the following statement:
@@ -50,10 +50,6 @@
(require 'latex)
-;; Silence the compiler:
-(declare-function LaTeX-color-definecolor-list "color" ())
-(declare-function LaTeX-xcolor-definecolor-list "xcolor" ())
-
(defvar LaTeX-breqn-key-val-options
'(("style" ("\\tiny" "\\scriptsize" "\\footnotesize" "\\small"
"\\normalsize" "\\large" "\\Large" "\\LARGE"
@@ -64,16 +60,10 @@
("spread")
("frame")
("framesep")
- ("background")
- ("color")
("breakdepth"))
"Key=value options for breqn environments.
The keys \"label\" and \"labelprefix\" are omitted.")
-(defvar LaTeX-breqn-key-val-options-local nil
- "Buffer-local key=value options for breqn environments.")
-(make-variable-buffer-local 'LaTeX-breqn-key-val-options-local)
-
(defvar LaTeX-breqn-key-val-label-regexp
`(,(concat
"\\\\begin{"
@@ -92,43 +82,23 @@ Keys offered for key=val query depend on ENV. \"label\" and
(cond ((or (string= env "dgroup")
(string= env "dgroup*"))
(append '(("noalign") ("brace"))
- LaTeX-breqn-key-val-options-local))
+ LaTeX-breqn-key-val-options))
((or (string= env "darray")
(string= env "darray*"))
(append '(("noalign") ("brace") ("cols"
("{}")))
- LaTeX-breqn-key-val-options-local))
- (t LaTeX-breqn-key-val-options-local)))))
+ LaTeX-breqn-key-val-options))
+ (t LaTeX-breqn-key-val-options)))))
(LaTeX-insert-environment env (when (and keyvals
(not (string= keyvals "")))
(concat LaTeX-optop keyvals LaTeX-optcl)))
(LaTeX-env-label-as-keyval nil nil keyvals env)))
-(defun LaTeX-breqn-update-color-keys ()
- "Update color relevant keys from `LaTeX-breqn-key-val-options-local'."
- (when (or (member "xcolor" (TeX-style-list))
- (member "color" (TeX-style-list)))
- (let* ((colorcmd (if (member "xcolor" (TeX-style-list))
- #'LaTeX-xcolor-definecolor-list
- #'LaTeX-color-definecolor-list))
- (keys '("color" "background"))
- (tmp (copy-alist LaTeX-breqn-key-val-options-local)))
- (dolist (x keys)
- (setq tmp (assq-delete-all (car (assoc x tmp)) tmp))
- (push (list x (mapcar #'car (funcall colorcmd))) tmp))
- (setq LaTeX-breqn-key-val-options-local
- (copy-alist tmp)))))
-
-(add-hook 'TeX-auto-cleanup-hook #'LaTeX-breqn-update-color-keys t)
(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
(TeX-add-style-hook
"breqn"
(lambda ()
- ;; Local version of key-val options
- (setq LaTeX-breqn-key-val-options-local
- (copy-alist LaTeX-breqn-key-val-options))
-
;; Add breqn to parser:
(TeX-auto-add-regexp LaTeX-breqn-key-val-label-regexp)
diff --git a/tex-buf.el b/tex-buf.el
index 5f536619..7a4e0da5 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -1597,7 +1597,7 @@ Return nil ifs no errors were found."
;; Package xyz123 Warning: ...
;; Class xyz123 Warning: ...
(defvar LaTeX-warnings-regexp
- "\\(?:LaTeX\\|Class\\|Package\\|\*\\) [-A-Za-z0-9]* ?[Ww]arning:"
+ "\\(?:LaTeX\\|Class\\|Package\\|\\*\\) [-A-Za-z0-9]* ?[Ww]arning:"
"Regexp matching LaTeX warnings.")
(defun TeX-LaTeX-sentinel-has-warnings ()
@@ -1704,7 +1704,7 @@ Rerun to get mark in right position\\." nil t)
(message
"%s" "You should run LaTeX again to get TikZ marks in right position")
(setq TeX-command-next TeX-command-default))
- ((re-search-forward "^\* xsim warning: \"rerun\"" nil t)
+ ((re-search-forward "^\\* xsim warning: \"rerun\"" nil t)
(message
"%s" "You should run LaTeX again to synchronize exercise properties")
(setq TeX-command-next TeX-command-default))
@@ -2588,7 +2588,7 @@ Return non-nil if an error or warning is found."
;; TeX error
"^\\(!\\|\\(.*?\\):[0-9]+:\\) \\|"
;; New file
- "(\n?\\([^\n())]+\\)\\|"
+ "(\n?\\([^\n()]+\\)\\|"
;; End of file.
"\\()\\)\\|"
;; Hook to change line numbers
