[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex b9548da54a 38/48: Simplify implementation of sty
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex b9548da54a 38/48: Simplify implementation of style/tcolorboxlib-theorems.el |
Date: |
Fri, 18 Nov 2022 14:27:45 -0500 (EST) |
branch: externals/auctex
commit b9548da54ac8bfbec09ce1260e3d9bf432f1958c
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>
Simplify implementation of style/tcolorboxlib-theorems.el
* style/tcolorboxlib-theorems.el
(LaTeX-tcolorbox-lib-theorems-auto-cleanup):
("tcolorboxlib-theorems"): Use `LaTeX-env-args' instead of
`LaTeX-env-tcolorbox-lib-theorems'.
(LaTeX-env-tcolorbox-lib-theorems): Delete function.
(LaTeX-arg-tcolorbox-lib-theorems-newtcbtheorem): Insert only the
first argument, other arguments are queried in the hook.
---
style/tcolorboxlib-theorems.el | 50 ++++++++++++++----------------------------
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/style/tcolorboxlib-theorems.el b/style/tcolorboxlib-theorems.el
index 20aa710d47..7205ed4c37 100644
--- a/style/tcolorboxlib-theorems.el
+++ b/style/tcolorboxlib-theorems.el
@@ -187,8 +187,14 @@
(let ((env (car elt)))
;; Add newly defined env's to AUCTeX:
(LaTeX-add-environments
- `(,env LaTeX-env-tcolorbox-lib-theorems)
- `(,(concat env "*") LaTeX-env-tcolorbox-lib-theorems))
+ `(,env LaTeX-env-args
+ [TeX-arg-key-val (LaTeX-tcolorbox-lib--theorems-keyval-options)]
+ "Title"
+ (TeX-arg-literal ,TeX-grop ,TeX-grcl)
+ (LaTeX-env-label-as-keyval nil nil ,env))
+ `(,(concat env "*") LaTeX-env-args
+ [TeX-arg-key-val (LaTeX-tcolorbox-lib--theorems-keyval-options)]
+ "Title"))
;; RefTeX: Make `reftex-label-regexps' buffer local and add env
;; to it:
(when (boundp 'reftex-label-regexps)
@@ -210,40 +216,15 @@
#'LaTeX-tcolorbox-lib-theorems-auto-cleanup t)
(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
-(defun LaTeX-env-tcolorbox-lib-theorems (environment)
- "Insert theorems ENVIRONMENT, ask for arguments and insert a label."
- (LaTeX-insert-environment
- environment
- (let ((opts (TeX-read-key-val t
(LaTeX-tcolorbox-lib--theorems-keyval-options)))
- (title (TeX-read-string
- (TeX-argument-prompt nil nil "Title"))))
- (concat
- (when (and opts (not (string= opts "")))
- (format "[%s]" opts))
- (concat TeX-grop title TeX-grcl)
- (unless (string= (substring-no-properties environment -1) "*")
- (concat TeX-grop TeX-grcl)))))
- (unless (string= (substring-no-properties environment -1) "*")
- (LaTeX-env-label-as-keyval nil nil nil environment)))
-
(defun LaTeX-arg-tcolorbox-lib-theorems-newtcbtheorem (optional)
- "Query and insert arguments of \\newtcbtheorem macro.
-If OPTIONAL is non-nil, insert the argument in brackets in not
+ "Query and insert the first argument of \\newtcbtheorem macro.
+If OPTIONAL is non-nil, insert the argument in brackets if not
empty."
(let ((env (TeX-read-string
- (TeX-argument-prompt optional nil "Name")))
- (disp-name (TeX-read-string
- (TeX-argument-prompt optional nil "Display Name")))
- (opts (TeX-read-key-val optional
-
(LaTeX-tcolorbox-lib--theorems-keyval-options))))
+ (TeX-argument-prompt optional nil "Name"))))
(LaTeX-add-tcolorbox-lib-theorems-newtcbtheorems env)
(LaTeX-tcolorbox-lib-theorems-auto-cleanup)
- (TeX-argument-insert env optional)
- (TeX-argument-insert disp-name optional)
- (TeX-argument-insert opts optional)
- ;; Our 'prefix' argument is always empty as we insert the 'label'
- ;; key with a full label value:
- (insert TeX-grop TeX-grcl)))
+ (TeX-argument-insert env optional)))
(defun LaTeX-tcolorbox-lib-theorems-reftex-label-context-function (env)
"Return a context string for RefTeX in ENV."
@@ -287,9 +268,12 @@ empty."
(TeX-add-symbols
;; 18.1 Macros of the Library
- '("newtcbtheorem"
+ `("newtcbtheorem"
[TeX-arg-key-val LaTeX-tcolorbox-init-options]
- LaTeX-arg-tcolorbox-lib-theorems-newtcbtheorem)
+ LaTeX-arg-tcolorbox-lib-theorems-newtcbtheorem
+ "Display Name"
+ (TeX-arg-key-val (LaTeX-tcolorbox-lib--theorems-keyval-options))
+ (TeX-arg-literal ,TeX-grop ,TeX-grcl))
`("renewtcbtheorem"
[TeX-arg-key-val LaTeX-tcolorbox-init-options]
- [elpa] externals/auctex cdf57fba58 11/48: * latex.el (TeX-arg-conditional): Declare 'indent'., (continued)
- [elpa] externals/auctex cdf57fba58 11/48: * latex.el (TeX-arg-conditional): Declare 'indent'., Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 4eaed332ba 26/48: Add new hooks for inserting environments with arguments, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex d7e6fa0d41 05/48: Cleanup `TeX-insert-dollar', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 21e624026a 28/48: Improve support for TikZ, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex e53bb19a90 37/48: ; Recognize large arguments with many lines, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 9b365b7419 18/48: Simplify implementation of style/textpos.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 1f6e9e7e58 10/48: Update style/XCharter.el to package version 1.24, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 05cd0440c5 02/48: Use `TeX-arg-completing-read-multiple', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 0c482642cc 32/48: Simplify implementation of style/currvita.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 615e12f650 42/48: Simplify implementation of style/tcolorbox.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex b9548da54a 38/48: Simplify implementation of style/tcolorboxlib-theorems.el,
Tassilo Horn <=
- [elpa] externals/auctex 8e3137f641 15/48: Simplify implementation of style/titlesec.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 20cabef81f 20/48: ; Delete unnecessary `TeX-arg-string', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 49987f08dd 19/48: Provide completion candidates for `TeX-arg-length', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 52738d11b2 39/48: Remove entry in `LaTeX-completion-function-map-alist-keyval', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 8f70cd5211 14/48: Simplify implementation of style/ulem.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex d5ff42e0bd 34/48: Simplify implementation of style/enumitem.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex ff5a83f345 17/48: Simplify implementation of style/thm-restate.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 0ee39626e4 01/48: Use `TeX-arg-completing-read', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 5949388ca2 12/48: Simplify argument queries in style/wrapfig.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 47f9ead1c6 44/48: Respect `TeX-exit-mark' when inserting enviroments, Tassilo Horn, 2022/11/18