branch: master commit ff5a83f34534f534d95decb9bb4159c7bda817bf Author: Arash Esbati <ar...@gnu.org> Commit: Arash Esbati <ar...@gnu.org>
Simplify implementation of style/thm-restate.el * style/thm-restate.el (LaTeX-thmrestate-restatable-marco-regexp): Recognize the starred version of the environment as well. (LaTeX-thmrestate-auto-cleanup): Fontify new macros. (LaTeX-env-thmrestate-restatable): Insert only the last mandatory argument. Other arguments are included in the style hook. (LaTeX-thm-restate-package-options): New variable. --- style/thm-restate.el | 93 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 34 deletions(-) diff --git a/style/thm-restate.el b/style/thm-restate.el index 15d33a9c..9f85050b 100644 --- a/style/thm-restate.el +++ b/style/thm-restate.el @@ -1,6 +1,6 @@ ;;; thm-restate.el --- AUCTeX style for `thm-restate.sty' (v66) -*- lexical-binding: t; -*- -;; Copyright (C) 2018, 2020 Free Software Foundation, Inc. +;; Copyright (C) 2018--2022 Free Software Foundation, Inc. ;; Author: Arash Esbati <ar...@gnu.org> ;; Maintainer: auctex-devel@gnu.org @@ -39,14 +39,17 @@ ;; Silence the parser: (declare-function LaTeX-thmtools-declaretheorem-list "thmtools" ()) +(declare-function font-latex-add-keywords + "font-latex" + (keywords class)) ;; Setup for macro names defined with -;; \begin{restatable}[<Heading>]{<env-name>}{<macro name>}: +;; \begin{restatable*?}[<Heading>]{<env-name>}{<macro name>}: (TeX-auto-add-type "thmrestate-restatable-macro" "LaTeX") (defvar LaTeX-thmrestate-restatable-marco-regexp - `(,(concat "\\\\begin{restatable}" + `(,(concat "\\\\begin{restatable\\*?}" "[ \t\n\r%]*" "\\(?:\\[[^]]*\\]\\)?" "[ \t\n\r%]*" @@ -62,43 +65,25 @@ (defun LaTeX-thmrestate-auto-cleanup () "Process parsed elements from thm-restate package." (dolist (newmac (mapcar #'car (LaTeX-thmrestate-restatable-macro-list))) - (TeX-add-symbols `(,newmac 0) - `(,(concat newmac "*") 0)))) + (TeX-add-symbols newmac (concat newmac "*")) + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords `((,newmac "*")) + 'function)))) (add-hook 'TeX-auto-prepare-hook #'LaTeX-thmrestate-auto-prepare t) (add-hook 'TeX-auto-cleanup-hook #'LaTeX-thmrestate-auto-cleanup t) (add-hook 'TeX-update-style-hook #'TeX-auto-parse t) (defun LaTeX-env-thmrestate-restatable (optional) - "Insert arguments for restatable environment from thm-restate package." - ;; The optional heading argument: - (let ((TeX-arg-opening-brace LaTeX-optop) - (TeX-arg-closing-brace LaTeX-optcl)) - (TeX-argument-insert - (TeX-read-string - (TeX-argument-prompt t nil "Heading")) - t)) - ;; Name of the environment we are referring to; this can be defined - ;; via amsthm.sty, ntheorem.sty or thmtools.sty: - (TeX-argument-insert - (completing-read - (TeX-argument-prompt optional nil "Environment") - (append - ;; Cater for environments defined with amsthm's \newtheorem - (when (and (fboundp 'LaTeX-amsthm-newtheorem-list) - (LaTeX-amsthm-newtheorem-list)) - (LaTeX-amsthm-newtheorem-list)) - ;; Cater for environments defined with ntheorem's \newtheorem - (when (and (fboundp 'LaTeX-ntheorem-newtheorem-list) - (LaTeX-ntheorem-newtheorem-list)) - (LaTeX-ntheorem-newtheorem-list)) - ;; Environments defined with \declaretheorem - (LaTeX-thmtools-declaretheorem-list))) - optional) + "Insert last argument of restatable environment from thm-restate package." (let ((mac (TeX-read-string (TeX-argument-prompt optional nil "Macro")))) - (TeX-add-symbols `(,mac 0) - `(,(concat mac "*") 0)) + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords `((,mac "*")) + 'function)) + (TeX-add-symbols mac (concat mac "*")) (TeX-argument-insert mac optional))) (TeX-add-style-hook @@ -113,8 +98,48 @@ ;; Provide restatable\\*? environment (LaTeX-add-environments - '("restatable" LaTeX-env-args LaTeX-env-thmrestate-restatable) - '("restatable*" LaTeX-env-args LaTeX-env-thmrestate-restatable))) + `("restatable" LaTeX-env-args + [TeX-arg-string "Heading"] + (TeX-arg-completing-read + ;; Name of the environment we are referring to; this can be + ;; defined via amsthm.sty, ntheorem.sty or thmtools.sty: + ,(lambda () + (append + ;; Cater for environments defined with amsthm's \newtheorem + (when (and (fboundp 'LaTeX-amsthm-newtheorem-list) + (LaTeX-amsthm-newtheorem-list)) + (LaTeX-amsthm-newtheorem-list)) + ;; Cater for environments defined with ntheorem's \newtheorem + (when (and (fboundp 'LaTeX-ntheorem-newtheorem-list) + (LaTeX-ntheorem-newtheorem-list)) + (LaTeX-ntheorem-newtheorem-list)) + ;; Environments defined with \declaretheorem + (LaTeX-thmtools-declaretheorem-list))) + "Environment") + LaTeX-env-thmrestate-restatable) + + `("restatable*" LaTeX-env-args + [TeX-arg-string "Heading"] + (TeX-arg-completing-read + ;; Name of the environment we are referring to; this can be + ;; defined via amsthm.sty, ntheorem.sty or thmtools.sty: + ,(lambda () + (append + ;; Cater for environments defined with amsthm's \newtheorem + (when (and (fboundp 'LaTeX-amsthm-newtheorem-list) + (LaTeX-amsthm-newtheorem-list)) + (LaTeX-amsthm-newtheorem-list)) + ;; Cater for environments defined with ntheorem's \newtheorem + (when (and (fboundp 'LaTeX-ntheorem-newtheorem-list) + (LaTeX-ntheorem-newtheorem-list)) + (LaTeX-ntheorem-newtheorem-list)) + ;; Environments defined with \declaretheorem + (LaTeX-thmtools-declaretheorem-list))) + "Environment") + LaTeX-env-thmrestate-restatable))) TeX-dialect) +(defvar LaTeX-thm-restate-package-options nil + "Package options for the thm-restate package.") + ;;; thm-restate.el ends here