[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 0ee39626e4 01/48: Use `TeX-arg-completing-read'
|
From: |
Tassilo Horn |
|
Subject: |
[elpa] externals/auctex 0ee39626e4 01/48: Use `TeX-arg-completing-read' |
|
Date: |
Fri, 18 Nov 2022 14:27:41 -0500 (EST) |
branch: externals/auctex
commit 0ee39626e4c8eeefeb5484137c651c2ac0d699e4
Author: Arash Esbati <arash@gnu.org>
Commit: Arash Esbati <arash@gnu.org>
Use `TeX-arg-completing-read'
* latex.el (LaTeX-common-initialization):
* style/MyriadPro.el ("MyriadPro"):
* style/amsthm.el ("amsthm"):
* style/arabxetex.el ("arabxetex"):
* style/babel.el ("babel"):
* style/biblatex.el ("biblatex"):
* style/bigdelim.el ("bigdelim"):
* style/caption.el ("caption"):
* style/changes.el ("changes"):
* style/csquotes.el ("csquotes"):
* style/doc.el ("doc"):
* style/enumitem.el ("enumitem"):
* style/etoolbox.el ("etoolbox"):
* style/exam.el ("exam"):
* style/fancyvrb.el ("fancyvrb"):
* style/floatrow.el ("floatrow"):
* style/fontaxes.el ("fontaxes"):
* style/fontspec.el ("fontspec"):
* style/footmisc.el ("footmisc"):
* style/graphicx.el ("graphicx"):
* style/harvard.el ("harvard"):
* style/hologo.el ("hologo"):
* style/l3doc.el ("l3doc"):
* style/ltugboat.el ("ltugboat"):
* style/ltxdoc.el ("ltxdoc"):
* style/mathtools.el ("mathtools"):
* style/mdframed.el ("mdframed"):
* style/menukeys.el ("menukeys"):
* style/metalogo.el ("metalogo"):
* style/multirow.el ("multirow"):
* style/natbib.el ("natbib"):
* style/newfloat.el ("newfloat"):
* style/ntheorem.el ("ntheorem"):
* style/paracol.el ("paracol"):
* style/polyglossia.el ("polyglossia"):
* style/pythontex.el ("pythontex"):
* style/splitidx.el ("splitidx"):
* style/subcaption.el ("subcaption"):
* style/tcolorbox.el ("tcolorbox"):
* style/tex-live.el ("tex-live"):
* style/theorem.el ("theorem"):
* style/titleps.el ("titleps"):
* style/titlesec.el ("titlesec"):
* style/titletoc.el ("titletoc"):
* style/xcolor.el ("xcolor"):
* style/xr-hyper.el ("xr-hyper"): Use `TeX-arg-completing-read'
instead of `TeX-arg-eval' and `completing-read' combination.
---
latex.el | 30 +++++------
style/MyriadPro.el | 8 +--
style/amsthm.el | 4 +-
style/arabxetex.el | 16 +++---
style/babel.el | 16 ++----
style/biblatex.el | 12 ++---
style/bigdelim.el | 33 ++++++------
style/caption.el | 28 ++++-------
style/changes.el | 10 ++--
style/csquotes.el | 24 ++++-----
style/doc.el | 12 ++---
style/enumitem.el | 15 +++---
style/etoolbox.el | 13 ++---
style/exam.el | 64 ++++++------------------
style/fancyvrb.el | 44 ++++++----------
style/floatrow.el | 36 +++++--------
style/fontaxes.el | 14 ++----
style/fontspec.el | 17 +++----
style/footmisc.el | 43 +++++++---------
style/graphicx.el | 52 +++++++++----------
style/harvard.el | 17 +++----
style/hologo.el | 12 ++---
style/ifthen.el | 4 +-
style/l3doc.el | 12 ++---
style/ltugboat.el | 18 ++-----
style/ltxdoc.el | 4 +-
style/mathtools.el | 16 ++----
style/mdframed.el | 31 ++++--------
style/menukeys.el | 128 ++++++++++++++++++-----------------------------
style/metalogo.el | 10 ++--
style/multirow.el | 20 ++++----
style/natbib.el | 10 ++--
style/newfloat.el | 12 ++---
style/ntheorem.el | 45 ++++++++---------
style/paracol.el | 24 ++++-----
style/polyglossia.el | 7 +--
style/pythontex.el | 139 ++++++++++++++++-----------------------------------
style/splitidx.el | 30 +++--------
style/subcaption.el | 50 +++++++++---------
style/tcolorbox.el | 56 +++++++++------------
style/tex-live.el | 45 ++++++++---------
style/theorem.el | 6 +--
style/titleps.el | 20 +++-----
style/titlesec.el | 32 ++++--------
style/titletoc.el | 24 ++++-----
style/xcolor.el | 76 ++++++++--------------------
style/xr-hyper.el | 6 +--
47 files changed, 512 insertions(+), 833 deletions(-)
diff --git a/latex.el b/latex.el
index ae8dd89f30..901ddfd7d0 100644
--- a/latex.el
+++ b/latex.el
@@ -7664,10 +7664,10 @@ function would return non-nil and `(match-string 1)'
would return
'("includeonly" t)
'("input" TeX-arg-input-file)
'("addcontentsline"
- (TeX-arg-eval completing-read "File: " '(("toc") ("lof") ("lot")))
- (TeX-arg-eval completing-read "Numbering style: " LaTeX-section-list) t)
+ (TeX-arg-completing-read ("toc" "lof" "lot") "File")
+ (TeX-arg-completing-read LaTeX-section-list "Numbering style") t)
'("addtocontents"
- (TeX-arg-eval completing-read "File: " '(("toc") ("lof") ("lot"))) t)
+ (TeX-arg-completing-read ("toc" "lof" "lot") "File") t)
'("typeout" t)
'("typein" [ TeX-arg-define-macro ] t)
'("verb" TeX-arg-verb)
@@ -7906,28 +7906,28 @@ function would return non-nil and `(match-string 1)'
would return
;; Added in LaTeX 2021-11-15
'("counterwithin"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Format")
- '("\\arabic" "\\roman" "\\Roman" "\\alph" "\\Alph")]
+ [TeX-arg-completing-read ("\\arabic" "\\roman" "\\Roman"
+ "\\alph" "\\Alph")
+ "Format"]
(TeX-arg-counter)
(TeX-arg-counter "Within counter"))
'("counterwithin*"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Format")
- '("\\arabic" "\\roman" "\\Roman" "\\alph" "\\Alph")]
+ [TeX-arg-completing-read ("\\arabic" "\\roman" "\\Roman"
+ "\\alph" "\\Alph")
+ "Format"]
(TeX-arg-counter)
(TeX-arg-counter "Within counter"))
'("counterwithout"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Format")
- '("\\arabic" "\\roman" "\\Roman" "\\alph" "\\Alph")]
+ [TeX-arg-completing-read ("\\arabic" "\\roman" "\\Roman"
+ "\\alph" "\\Alph")
+ "Format"]
(TeX-arg-counter)
(TeX-arg-counter "Within counter"))
'("counterwithout*"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Format")
- '("\\arabic" "\\roman" "\\Roman" "\\alph" "\\Alph")]
+ [TeX-arg-completing-read ("\\arabic" "\\roman" "\\Roman"
+ "\\alph" "\\Alph")
+ "Format"]
(TeX-arg-counter)
(TeX-arg-counter "Within counter"))
diff --git a/style/MyriadPro.el b/style/MyriadPro.el
index 0f3de7d173..1014b31064 100644
--- a/style/MyriadPro.el
+++ b/style/MyriadPro.el
@@ -1,6 +1,6 @@
;;; MyriadPro.el --- AUCTeX style for `MyriadPro.sty' (v0.5) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -62,9 +62,9 @@
(when (LaTeX-provided-package-options-member "MyriadPro" "sansmath")
(TeX-add-symbols
'("mathversion"
- (TeX-arg-eval completing-read "Math version: "
- '(("sans") ("sansbold")
- ("sanstabular") ("sansboldtabular"))))))
+ (TeX-arg-completing-read ("sans" "sansbold"
+ "sanstabular" "sansboldtabular")
+ "Math version"))))
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/amsthm.el b/style/amsthm.el
index 3ea817653c..64589c5bf4 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -160,9 +160,7 @@ make them available as new environments."
(format "%s" heading)))))
'("theoremstyle"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Style")
- (LaTeX-amsthm-newtheoremstyle-list)))
+ (TeX-arg-completing-read (LaTeX-amsthm-newtheoremstyle-list) "Style"))
"qedhere"
"swapnumbers"
diff --git a/style/arabxetex.el b/style/arabxetex.el
index 897b9cd6bb..a45b1fe092 100644
--- a/style/arabxetex.el
+++ b/style/arabxetex.el
@@ -1,6 +1,6 @@
;;; arabxetex.el --- AUCTeX style for `arabxetex.sty' (v1.2.1) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2017--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -65,9 +65,8 @@
(mapcar
(lambda (symbol)
(list symbol
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- LaTeX-arabxetex-package-options ]
+ [TeX-arg-completing-read LaTeX-arabxetex-package-options
+ "Mode"]
t))
(mapcar (lambda (lang) (concat "text" lang)) langs)))
;;
@@ -77,9 +76,8 @@
(lambda (environment)
(list environment
#'LaTeX-env-args
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- LaTeX-arabxetex-package-options ]))
+ [TeX-arg-completing-read LaTeX-arabxetex-package-options
+ "Mode"]))
langs))
;;
;; Fontification
@@ -97,9 +95,7 @@
;; 3.3 Transliteration
'("SetTranslitConvention"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Mapping")
- '("dmg" "loc")))
+ (TeX-arg-completing-read ("dmg" "loc") "Mapping"))
'("SetTranslitStyle" "Style"))
;; Fontification
diff --git a/style/babel.el b/style/babel.el
index a7d67479a8..1c89e8ffab 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -299,9 +299,7 @@
;; 1.12 The base option
'("AfterBabelLanguage"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Language")
- LaTeX-babel-language-list)
+ (TeX-arg-completing-read LaTeX-babel-language-list "Language")
t)
;; 1.14 Selecting fonts
@@ -330,9 +328,7 @@
;; 1.16 Creating a language
'("babelprovide"
[TeX-arg-key-val LaTeX-babel-babelprovide-key-val-options]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Language")
- LaTeX-babel-language-list))
+ (TeX-arg-completing-read LaTeX-babel-language-list "Language"))
;; 1.19 Accessing language info
'("languagename" 0)
@@ -340,13 +336,9 @@
;; 1.20 Hyphenation and line breaking
'("babelhyphen"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Type/Text")
- '("soft" "hard" "repeat" "nobreak" "empty")))
+ (TeX-arg-completing-read ("soft" "hard" "repeat" "nobreak" "empty")
"Type/Text"))
'("babelhyphen*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Type/Text")
- '("soft" "hard" "repeat" "nobreak" "empty")))
+ (TeX-arg-completing-read ("soft" "hard" "repeat" "nobreak" "empty")
"Type/Text"))
'("babelhyphenation"
[TeX-arg-eval mapconcat #'identity
diff --git a/style/biblatex.el b/style/biblatex.el
index 43115becc6..47cdb16f54 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -1,6 +1,6 @@
;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.8a. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -143,7 +143,7 @@
(defvar LaTeX-biblatex-language-list
'("catalan" "croatian" "czech" "danish" "dutch" "american" "british"
"canadian" "australian" "newzealand" "finnish" "french" "german" "austrian"
- "ngernam" "naustrian" "greek" "italian" "norwegian" "polish" "brazilian"
+ "ngerman" "naustrian" "greek" "italian" "norwegian" "polish" "brazilian"
"portuguese" "russian" "spanish" "swedish")
"List of languages supported by biblatex packages.")
@@ -483,13 +483,13 @@ for citation keys."
'("Rn" "Integer")
;; Localization Commands
'("DefineBibliographyStrings"
- (TeX-arg-eval completing-read "Language: " LaTeX-biblatex-language-list)
t)
+ (TeX-arg-completing-read LaTeX-biblatex-language-list "Language") t)
'("DefineBibliographyExtras"
- (TeX-arg-eval completing-read "Language: " LaTeX-biblatex-language-list)
t)
+ (TeX-arg-completing-read LaTeX-biblatex-language-list "Language") t)
'("UndefineBibliographyExtras"
- (TeX-arg-eval completing-read "Language: " LaTeX-biblatex-language-list)
t)
+ (TeX-arg-completing-read LaTeX-biblatex-language-list "Language") t)
'("DefineHyphenationExceptions"
- (TeX-arg-eval completing-read "Language: " LaTeX-biblatex-language-list)
t)
+ (TeX-arg-completing-read LaTeX-biblatex-language-list "Language") t)
"NewBibliographyString")
;; § 3.8.9 natbib Compatibility Commands
diff --git a/style/bigdelim.el b/style/bigdelim.el
index cb54da72be..c3423fc2aa 100644
--- a/style/bigdelim.el
+++ b/style/bigdelim.el
@@ -1,6 +1,6 @@
;;; bigdelim.el --- AUCTeX style for `bigdelim.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2011--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2011--2022 Free Software Foundation, Inc.
;; Author: Mads Jensen <mje@inducks.org>
;; Maintainer: auctex-devel@gnu.org
@@ -31,6 +31,7 @@
;;; Code:
(require 'tex)
+(require 'latex)
;; Silence the compiler:
(declare-function font-latex-add-keywords
@@ -64,27 +65,25 @@ standard one."
(TeX-run-style-hooks "multirow")
(TeX-add-symbols
- '("ldelim"
+ `("ldelim"
(TeX-arg-bigdelim-brace left)
"Number of rows for multirow"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Width in multirow")
- (append
- '("*")
- (mapcar (lambda (x)
- (concat TeX-esc (car x)))
- (LaTeX-length-list))))
+ (TeX-arg-completing-read
+ ,(lambda () (append '("*")
+ (mapcar (lambda (x)
+ (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Width in multirow")
[ "Text in multirow" ])
- '("rdelim"
+ `("rdelim"
(TeX-arg-bigdelim-brace right)
"Number of rows for multirow"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Width in multirow")
- (append
- '("*")
- (mapcar (lambda (x)
- (concat TeX-esc (car x)))
- (LaTeX-length-list))))
+ (TeX-arg-completing-read
+ ,(lambda () (append '("*")
+ (mapcar (lambda (x)
+ (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Width in multirow")
[ "Text in multirow" ]))
;; Fontification
diff --git a/style/caption.el b/style/caption.el
index 1b06fbf633..073dff4e2a 100644
--- a/style/caption.el
+++ b/style/caption.el
@@ -374,8 +374,8 @@ STAR is non-nil, do not query for a short-caption and a
label."
'("caption*" t)
'("captionlistentry"
- [TeX-arg-eval completing-read (TeX-argument-prompt t nil "Float type")
- LaTeX-caption-supported-float-types]
+ [TeX-arg-completing-read LaTeX-caption-supported-float-types
+ "Float type"]
t)
'("captionof" LaTeX-arg-caption-captionof)
@@ -385,32 +385,24 @@ STAR is non-nil, do not query for a short-caption and a
label."
'("captionsetup"
(TeX-arg-conditional (member "bicaption" (TeX-style-list))
([LaTeX-arg-bicaption-captionsetup])
- ([TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Float
type")
-
LaTeX-caption-supported-float-types]))
+ ([TeX-arg-completing-read
+ LaTeX-caption-supported-float-types "Float
type"]))
(TeX-arg-key-val (LaTeX-caption-key-val-options)))
'("captionsetup*"
(TeX-arg-conditional (member "bicaption" (TeX-style-list))
([LaTeX-arg-bicaption-captionsetup])
- ([TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Float
type")
-
LaTeX-caption-supported-float-types]))
+ ([TeX-arg-completing-read
+ LaTeX-caption-supported-float-types "Float
type"]))
(TeX-arg-key-val (LaTeX-caption-key-val-options)))
'("clearcaptionsetup"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Single key")
- (LaTeX-caption-key-val-options)]
- (TeX-arg-eval completing-read (TeX-argument-prompt nil nil "Float type")
- LaTeX-caption-supported-float-types))
+ [TeX-arg-completing-read (LaTeX-caption-key-val-options) "Single key"]
+ (TeX-arg-completing-read LaTeX-caption-supported-float-types "Float
type"))
'("clearcaptionsetup*"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Single key")
- (LaTeX-caption-key-val-options)]
- (TeX-arg-eval completing-read (TeX-argument-prompt nil nil "Float type")
- LaTeX-caption-supported-float-types))
+ [TeX-arg-completing-read (LaTeX-caption-key-val-options) "Single key"]
+ (TeX-arg-completing-read LaTeX-caption-supported-float-types "Float
type"))
'("captionbox" (LaTeX-arg-caption-captionbox) t)
diff --git a/style/changes.el b/style/changes.el
index 9c3bff5e93..ba38bc5dc5 100644
--- a/style/changes.el
+++ b/style/changes.el
@@ -1,6 +1,6 @@
;;; changes.el --- AUCTeX style for `changes.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -164,13 +164,9 @@ Insert the argument in brackets if OPTIONAL is non-nil."
'("setcommentmarkup" "Definition")
'("setauthormarkup" "Definition")
'("setauthormarkupposition"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Position")
- '("left" "right")))
+ (TeX-arg-completing-read ("left" "right") "Position"))
'("setauthormarktext"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Markup")
- '("id" "name")))
+ (TeX-arg-completing-read ("id" "name") "Markup"))
'("settruncatewidth" (TeX-arg-length "Width"))
'("setsummarywidth" (TeX-arg-length "Width"))
'("setsummarytowidth" "Text")
diff --git a/style/csquotes.el b/style/csquotes.el
index d5714a3530..d6d06816ea 100644
--- a/style/csquotes.el
+++ b/style/csquotes.el
@@ -124,10 +124,10 @@ PROMPT replaces the standard one \"Language\"."
;; 3.7 Selecting Quote Styles
`("setquotestyle"
- [ (TeX-arg-eval completing-read "Quote style variant: "
- ',quote-style-variant-list) ]
- (TeX-arg-eval completing-read "Quote style name or alias: "
- ',quote-style-name-list))
+ [TeX-arg-completing-read ,quote-style-variant-list
+ "Quote style variant"]
+ (TeX-arg-completing-read ,quote-style-name-list
+ "Quote style name or alias"))
"setquotestyle*"
;; 4.1 Quoting Regular Text
@@ -199,20 +199,20 @@ PROMPT replaces the standard one \"Language\"."
;; 8.1 Defining Quote Styles
`("DeclareQuoteStyle"
- [ (TeX-arg-eval completing-read "Quote style variant: "
- ',quote-style-variant-list) ]
- (TeX-arg-eval completing-read "Quote style name: "
- ',quote-style-name-list)
+ [TeX-arg-completing-read ,quote-style-variant-list
+ "Quote style variant"]
+ (TeX-arg-completing-read ,quote-style-name-list
+ "Quote style name")
["Outer quote initialization"] ["Inner quote initialization"]
"Opening outer quotation mark" ["Middle outer quotation mark"]
"Closing outer quotation mark" ["Kerning between adjoining marks"]
"Opening inner quotation mark" ["Middle inner quotation mark"]
"Closing inner quotation mark")
`("DeclareQuoteAlias"
- [ (TeX-arg-eval completing-read "Quote style variant: "
- ',quote-style-variant-list) ]
- (TeX-arg-eval completing-read "Quote style name: "
- ',quote-style-name-list)
+ [TeX-arg-completing-read ,quote-style-variant-list
+ "Quote style variant"]
+ (TeX-arg-completing-read ,quote-style-name-list
+ "Quote style name")
"Alias name")
'("DeclareQuoteOption" 1)
'("ExecuteQuoteOptions" 1)
diff --git a/style/doc.el b/style/doc.el
index 3ab6c0c74f..892e578616 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -189,9 +189,7 @@ percent sign at the beginning of a line before
(TeX-add-symbols
;; Cater for \Describe<eltname>[options]{<elements query>}
`(,(concat "Describe" eltname)
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Suppress option")
- '("noindex" "noprint")]
+ [TeX-arg-completing-read ("noindex" "noprint") "Suppress option"]
"Element")
;; Cater for \PrintDescribe<eltname>{<elements query>}
@@ -285,9 +283,7 @@ percent sign at the beginning of a line before
;; 2.4 Describing the usage of macros and environments
'("DescribeMacro"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Suppress option")
- '("noindex" "noprint")]
+ [TeX-arg-completing-read ("noindex" "noprint") "Suppress option"]
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
@@ -295,9 +291,7 @@ percent sign at the beginning of a line before
TeX-esc)))
(format "%s" name)))))
'("DescribeEnv"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Suppress option")
- '("noindex" "noprint")]
+ [TeX-arg-completing-read ("noindex" "noprint") "Suppress option"]
"Environment")
;; 2.5 Describing the definition of macros and environments
diff --git a/style/enumitem.el b/style/enumitem.el
index 62ad17f1c7..51106b4ccc 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -1,6 +1,6 @@
;;; enumitem.el --- AUCTeX style for `enumitem.sty' (v3.9) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -419,11 +419,11 @@ provided. OPTIONAL is ignored."
(format "%s" depth)))))
;; \renewlist{<name>}{<type>}{<max-depth>}
- '("renewlist"
- (TeX-arg-eval completing-read "Name: "
- (mapcar #'car (LaTeX-enumitem-newlist-list)))
- (TeX-arg-eval completing-read "Type: "
- (mapcar #'cadr (LaTeX-enumitem-newlist-list)))
+ `("renewlist"
+ (TeX-arg-completing-read (LaTeX-enumitem-newlist-list) "Name")
+ (TeX-arg-completing-read ,(lambda ()
+ (mapcar #'cadr
(LaTeX-enumitem-newlist-list)))
+ "Type")
"Max-depth")
;; \setlist<size>[<names,levels>]{<key-vals>}
@@ -487,8 +487,7 @@ provided. OPTIONAL is ignored."
(when (LaTeX-provided-package-options-member "enumitem" "shortlabels")
(TeX-add-symbols
'("SetEnumerateShortLabel"
- (TeX-arg-eval completing-read "Key: "
- '("A" "a" "I" "i" "1"))
+ (TeX-arg-completing-read ("A" "a" "I" "i" "1") "Key")
"Replacement")))
;; Add \labelindent to list of known lengths:
diff --git a/style/etoolbox.el b/style/etoolbox.el
index 42af6a4832..5362be8629 100644
--- a/style/etoolbox.el
+++ b/style/etoolbox.el
@@ -186,9 +186,7 @@ user."
'("providebool" "Name")
'("booltrue" "Name")
'("boolfalse" "Name")
- '("setbool" "Name" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Value")
- '("true" "false")))
+ '("setbool" "Name" (TeX-arg-completing-read ("true" "false") "Value"))
'("ifbool" "Name" 2)
'("notbool" "Name" 2)
@@ -197,9 +195,7 @@ user."
'("providetoggle" "Name")
'("toggletrue" "Name")
'("togglefalse" "Name")
- '("settoggle" "Name" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil
"Value")
- '("true" "false")))
+ '("settoggle" "Name" (TeX-arg-completing-read ("true" "false")
"Value"))
'("iftoggle" "Name" 2)
'("nottoggle" "Name" 2)
@@ -234,10 +230,7 @@ user."
'("ifcscounter" LaTeX-arg-etoolbox-csname 2)
'("ifltxcounter" TeX-arg-counter 2)
'("ifdeflength" TeX-arg-length 2)
- '("ifcslength" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Length")
- (LaTeX-length-list))
- 2)
+ '("ifcslength" (TeX-arg-completing-read (LaTeX-length-list) "Length") 2)
'("ifdefdimen" TeX-arg-macro 2)
'("ifcsdimen" "Control sequence" 2)
diff --git a/style/exam.el b/style/exam.el
index 370a923ef3..eab9300d8d 100644
--- a/style/exam.el
+++ b/style/exam.el
@@ -142,61 +142,29 @@ Arguments NAME and TYPE are the same as for the function
'("part" [ "Points" ] (TeX-arg-literal " "))
'("subpart" [ "Points" ] (TeX-arg-literal " "))
'("gradetable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("bonusgradetable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("bonuspointtable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("partialgradetable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("partialbonusgradetable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("partialbonuspointtable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("pointtable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("partialpointtable"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Orientation")
- '("v" "h") ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Table index")
- '("questions" "pages") ] )
+ [TeX-arg-completing-read ("v" "h") "Orientation"]
+ [TeX-arg-completing-read ("questions" "pages") "Table index"])
'("subsubpart" [ "Points" ] (TeX-arg-literal " "))
'("question" ["Points"] (TeX-arg-literal " "))
diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index a9ea0a44bf..6703a30e1b 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -322,11 +322,8 @@ RECUSTOM is non-nil, delete macros from the variable
;; New macros for using previously saved text:
((string= base-mac "UseVerb")
(TeX-add-symbols
- `(,mac-name
- (TeX-arg-eval
- completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverb-list))))
+ `(,mac-name (TeX-arg-completing-read
+ (LaTeX-fancyvrb-saveverb-list) "Saved name")))
(when (and (fboundp 'font-latex-add-keywords)
(eq TeX-install-font-lock 'font-latex-setup))
(font-latex-add-keywords `((,mac-name "{"))
@@ -602,12 +599,10 @@ ENV is the name of current environment as a string."
'("DefineVerbatimEnvironment"
LaTeX-fancyvrb-arg-define-environment)
'("RecustomVerbatimEnvironment"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Verbatim environment")
- LaTeX-fancyvrb-base-environments)
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Based on environment")
- LaTeX-fancyvrb-base-environments)
+ (TeX-arg-completing-read LaTeX-fancyvrb-base-environments
+ "Verbatim environment")
+ (TeX-arg-completing-read LaTeX-fancyvrb-base-environments
+ "Based on environment")
(TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)))
'("CustomVerbatimCommand"
@@ -627,24 +622,17 @@ ENV is the name of current environment as a string."
(TeX-arg-conditional (member "fvextra" (TeX-style-list))
(TeX-arg-verb-delim-or-brace)
(TeX-arg-verb)))
- '("UseVerb" (TeX-arg-eval
- completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverb-list)))
+ '("UseVerb" (TeX-arg-completing-read (LaTeX-fancyvrb-saveverb-list)
+ "Saved name"))
;; \UseVerb also has a starred version
- '("UseVerb*" (TeX-arg-eval
- completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverb-list)))
- '("UseVerbatim" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverbatim-list)))
- '("LUseVerbatim" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverbatim-list)))
- '("BUseVerbatim" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Saved name")
- (LaTeX-fancyvrb-saveverbatim-list)))
+ '("UseVerb*" (TeX-arg-completing-read (LaTeX-fancyvrb-saveverb-list)
+ "Saved name"))
+ '("UseVerbatim" (TeX-arg-completing-read (LaTeX-fancyvrb-saveverbatim-list)
+ "Saved name"))
+ '("LUseVerbatim" (TeX-arg-completing-read
(LaTeX-fancyvrb-saveverbatim-list)
+ "Saved name"))
+ '("BUseVerbatim" (TeX-arg-completing-read
(LaTeX-fancyvrb-saveverbatim-list)
+ "Saved name"))
;; Writing and reading verbatim files
'("VerbatimInput" [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
diff --git a/style/floatrow.el b/style/floatrow.el
index be8878f023..57596ee78e 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -1,6 +1,6 @@
;;; floatrow.el --- AUCTeX style for `floatrow.sty' (v0.3b) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2017--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -562,12 +562,10 @@ only the parsed items."
;; 2.1 The \floatbox Macro
;; \floatbox[<preamble>]{<captype>}[<width>][<height>][<vert
pos>]{<caption>}{<object>}
'("floatbox"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Preamble")
- '("\\capbeside" "\\nocapbeside" "\\captop")]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Float type")
- LaTeX-floatrow-supported-float-types)
+ [TeX-arg-completing-read ("\\capbeside" "\\nocapbeside" "\\captop")
+ "Preamble"]
+ (TeX-arg-completing-read LaTeX-floatrow-supported-float-types
+ "Float type")
LaTeX-floatrow-arg-floatbox)
;; 2.2 Creation of Personal Commands for Float Boxes
@@ -580,21 +578,15 @@ only the parsed items."
(TeX-add-symbols
`(,cmd LaTeX-floatrow-arg-floatbox))
(format "%s" cmd))))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Float type")
- '("figure" "table"))
+ (TeX-arg-completing-read ("figure" "table") "Float type")
[ 2 ])
'("renewfloatcommand"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Command")
- (LaTeX-floatrow-newfloatcommand-list))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Float type")
- '("figure" "table"))
+ (TeX-arg-completing-read (LaTeX-floatrow-newfloatcommand-list)
+ "Command")
+ (TeX-arg-completing-read ("figure" "table") "Float type")
[ 2 ])
-
;; 2.2.2 Predefined Float Box Commands
'("ffigbox"
LaTeX-floatrow-arg-floatbox)
@@ -614,9 +606,8 @@ only the parsed items."
;; 3 Float Layout Settings
'("floatsetup"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Float type")
- LaTeX-floatrow-supported-float-types]
+ [TeX-arg-completing-read LaTeX-floatrow-supported-float-types
+ "Float type"]
(TeX-arg-key-val (LaTeX-floatrow-key-val-options)))
;; 3.2 Settings for Current Float Environment
@@ -625,9 +616,8 @@ only the parsed items."
;; 3.3 Clearing of Settings for Current Float Type
'("clearfloatsetup"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Float type")
- LaTeX-floatrow-supported-float-types))
+ (TeX-arg-completing-read LaTeX-floatrow-supported-float-types
+ "Float type"))
;; 3.4 Temporary Clearing of All Float Settings
'("killfloatstyle" 0)
diff --git a/style/fontaxes.el b/style/fontaxes.el
index 62db15af54..da05bb5b29 100644
--- a/style/fontaxes.el
+++ b/style/fontaxes.el
@@ -1,6 +1,6 @@
;;; fontaxes.el --- AUCTeX style for `fontaxes.sty' version v1.0d -*-
lexical-binding: t; -*-
-;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -69,11 +69,9 @@
'("tbfigures" -1) ; alignment: tabular figures
'("prfigures" -1) ; alignment: proportional figures
'("fontfigurestyle"
- (TeX-arg-eval completing-read "Style: "
- '(("text") ("lining"))))
+ (TeX-arg-completing-read ("text" "lining") "Style"))
'("fontfigurealignment"
- (TeX-arg-eval completing-read "Alignment: "
- '(("tabular") ("proportional"))))
+ (TeX-arg-completing-read ("tabular" "proportional") "Alignment"))
'("fontbasefamily" t)
;; Math versions
@@ -82,11 +80,9 @@
'("tabularmath" -1) ; math figure alignment
'("proportionalmath" -1) ;
'("mathweight"
- (TeX-arg-eval completing-read "Math weight: "
- '(("bold") ("normal"))))
+ (TeX-arg-completing-read ("bold" "normal") "Math weight"))
'("mathfigurealignment"
- (TeX-arg-eval completing-read "Math figure alignment: "
- '(("tabular") ("proportional"))))
+ (TeX-arg-completing-read ("tabular" "proportional") "Math figure
alignment"))
;; Additional commands
;; These macros are now part of LaTeX kernel 2020-02-02
diff --git a/style/fontspec.el b/style/fontspec.el
index 6970b75b58..90018a21d4 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -1,6 +1,6 @@
;;; fontspec.el --- AUCTeX style for `fontspec.sty' version 2.7i. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2013--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2013--2022 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <mose@gnu.org>
@@ -369,15 +369,13 @@ to appropriate keys which are eventually prepended to
;; 23 Defining new features
'("newAATfeature"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Existing feature")
- (LaTeX-fontspec-font-features))
+ (TeX-arg-completing-read (LaTeX-fontspec-font-features)
+ "Existing feature")
"New option" 2)
'("newopentypefeature"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Existing feature")
- (LaTeX-fontspec-font-features))
+ (TeX-arg-completing-read (LaTeX-fontspec-font-features)
+ "Existing feature")
"New option" t)
'("newfontfeature" "New feature" t)
@@ -388,9 +386,8 @@ to appropriate keys which are eventually prepended to
;; 26 Renaming existing features & options
'("aliasfontfeature"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Existing feature")
- (LaTeX-fontspec-font-features))
+ (TeX-arg-completing-read (LaTeX-fontspec-font-features)
+ "Existing feature")
"New name")
'("aliasfontfeatureoption"
diff --git a/style/footmisc.el b/style/footmisc.el
index bc3b56adf9..2fb0385f9f 100644
--- a/style/footmisc.el
+++ b/style/footmisc.el
@@ -47,43 +47,34 @@
;; 1.7 The \setfnsymbol and \DefineFNsymbols commands
'("DefineFNsymbols"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- '("bringhurst" "chicago" "wiley"
- "lamport" "lamport*"))
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Style (text or math)")
- '("text" "math")]
+ (TeX-arg-completing-read ("bringhurst" "chicago" "wiley"
+ "lamport" "lamport*")
+ "Name")
+ [TeX-arg-completing-read ("text" "math") "Style"]
1)
'("DefineFNsymbols*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- '("bringhurst" "chicago" "wiley"
- "lamport" "lamport*"))
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Style (text or math)")
- '("text" "math")]
+ (TeX-arg-completing-read ("bringhurst" "chicago" "wiley"
+ "lamport" "lamport*")
+ "Name")
+ [TeX-arg-completing-read ("text" "math") "Style"]
1)
;; These two commands define both text and math variants of the
;; footnote symbols
'("DefineFNsymbolsTM"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- '("bringhurst" "chicago" "wiley"
- "lamport" "lamport*"))
+ (TeX-arg-completing-read ("bringhurst" "chicago" "wiley"
+ "lamport" "lamport*")
+ "Name")
1)
'("DefineFNsymbolsTM*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- '("bringhurst" "chicago" "wiley"
- "lamport" "lamport*"))
+ (TeX-arg-completing-read ("bringhurst" "chicago" "wiley"
+ "lamport" "lamport*")
+ "Name")
1)
'("setfnsymbol"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- '("bringhurst" "chicago" "wiley"
- "lamport" "lamport*")))
+ (TeX-arg-completing-read ("bringhurst" "chicago" "wiley"
+ "lamport" "lamport*")
+ "Name"))
;; 1.11 Option hang
"hangfootparskip"
diff --git a/style/graphicx.el b/style/graphicx.el
index 5704ecf19e..36e8dada8c 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -241,34 +241,34 @@ subdirectories and inserts the relative file name. See
(TeX-add-symbols
'("reflectbox" "Argument")
- '("resizebox"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Width")
- (append '("\\width" "!")
- (mapcar
- (lambda (x) (concat TeX-esc (car x)))
- (LaTeX-length-list))))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Height")
- (append '("\\height" "\\totalheight" "\\depth" "!")
- (mapcar
- (lambda (x) (concat TeX-esc (car x)))
- (LaTeX-length-list))))
+ `("resizebox"
+ (TeX-arg-completing-read
+ ,(lambda () (append '("\\width" "!")
+ (mapcar
+ (lambda (x) (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Width")
+ (TeX-arg-completing-read
+ ,(lambda () (append '("\\height" "\\totalheight" "\\depth" "!")
+ (mapcar
+ (lambda (x) (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Height")
"Argument")
- '("resizebox*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Width")
- (append '("\\width" "!")
- (mapcar
- (lambda (x) (concat TeX-esc (car x)))
- (LaTeX-length-list))))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Height")
- (append '("\\height" "\\totalheight" "\\depth" "!")
- (mapcar
- (lambda (x) (concat TeX-esc (car x)))
- (LaTeX-length-list))))
+ `("resizebox*"
+ (TeX-arg-completing-read
+ (lambda () (append '("\\width" "!")
+ (mapcar
+ (lambda (x) (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Width")
+ (TeX-arg-completing-read
+ (lambda () (append '("\\height" "\\totalheight" "\\depth" "!")
+ (mapcar
+ (lambda (x) (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Height")
"Argument")
'("rotatebox" (TeX-arg-conditional (member "graphics" (TeX-style-list))
diff --git a/style/harvard.el b/style/harvard.el
index 6373af36f5..b321d2400a 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -1,6 +1,6 @@
;;; harvard.el --- Support for Harvard Citation style package for AUCTeX. -*-
lexical-binding: t; -*-
-;; Copyright (C) 1994, 1997, 2005, 2012, 2014, 2020 Free Software Foundation,
Inc.
+;; Copyright (C) 1994--2022 Free Software Foundation, Inc.
;; Author: Berwin Turlach <statba@nus.edu.sg>
;; Maintainer: auctex-devel@gnu.org
@@ -53,18 +53,15 @@
(TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
TeX-arg-cite)
'("citationstyle"
- (TeX-arg-eval completing-read "Citation style: " '(("agsm") ("dcu"))))
+ (TeX-arg-completing-read ("agsm" "dcu") "Citation style"))
'("citationmode"
- (TeX-arg-eval completing-read "Citation mode: "
- '(("full") ("abbr") ("default"))))
+ (TeX-arg-completing-read ("full" "abbr" "default") "Citation mode"))
'("harvardparenthesis"
- (TeX-arg-eval completing-read "Harvardparenthesis: "
- '(("round") ("curly") ("angle") ("square"))))
+ (TeX-arg-completing-read ("round" "curly" "angle" "square")
"Harvardparenthesis"))
'("bibliographystyle"
- (TeX-arg-eval
- completing-read "Bibliography style: "
- '(("agsm") ("apsr") ("dcu") ("jmr") ("jphysicsB") ("kluwer")
("nederlands") ("econometrica")))
- ignore)
+ (TeX-arg-completing-read ("agsm" "apsr" "dcu" "jmr" "jphysicsB" "kluwer"
+ "nederlands" "econometrica")
+ "Bibliography style"))
'("harvarditem" [ "Short citation" ]
"Complete citation" "Year" TeX-arg-define-cite))
diff --git a/style/hologo.el b/style/hologo.el
index f5030fd50f..7e4608939b 100644
--- a/style/hologo.el
+++ b/style/hologo.el
@@ -154,12 +154,12 @@
(TeX-argument-insert logo nil)
(format "%s" keyval)))))
- '("hologoDriverSetup" (TeX-arg-eval completing-read
- "Driver: "
- '("pdftex" "luatex"
- "dvipdfm" "dvipdfmx"
- "dvips" "dvipsone" "xdvi"
- "xetex" "vtex"
"driverfallback")))
+ '("hologoDriverSetup" (TeX-arg-completing-read
+ ("pdftex" "luatex"
+ "dvipdfm" "dvipdfmx"
+ "dvips" "dvipsone" "xdvi"
+ "xetex" "vtex" "driverfallback")
+ "Driver"))
'("hologoFontSetup"
(TeX-arg-key-val (("general") ("bibsf")
diff --git a/style/ifthen.el b/style/ifthen.el
index 2f426029ef..6610f88e82 100644
--- a/style/ifthen.el
+++ b/style/ifthen.el
@@ -63,9 +63,7 @@
"NOT"
'("newboolean" "Name")
'("provideboolean" "Name")
- '("setboolean" "Name" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Value")
- '("true" "false"))))
+ '("setboolean" "Name" (TeX-arg-completing-read ("true" "false") "Value")))
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/l3doc.el b/style/l3doc.el
index 69ae346b39..de11ee0fa3 100644
--- a/style/l3doc.el
+++ b/style/l3doc.el
@@ -168,14 +168,10 @@ For syntax environment from l3doc class."
TeX-arg-macro)
'("cs"
[TeX-arg-key-val LaTeX-l3doc-cmd-key-val-options]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Macro")
- (TeX-symbol-list)))
+ (TeX-arg-completing-read (TeX-symbol-list) "Macro"))
'("tn"
[TeX-arg-key-val LaTeX-l3doc-key-val-options]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Macro")
- (TeX-symbol-list)))
+ (TeX-arg-completing-read (TeX-symbol-list) "Macro"))
;; "meta" is provided by doc.el, so don't add here again
'("Arg" "Argument")
@@ -184,9 +180,7 @@ For syntax environment from l3doc class."
'("parg" "Picture mode argument")
'("file" "File name")
- '("env" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Environment")
- (LaTeX-environment-list)))
+ '("env" (TeX-arg-completing-read (LaTeX-environment-list) "Environment"))
'("pkg" "Package name")
'("cls" "Class name")
diff --git a/style/ltugboat.el b/style/ltugboat.el
index 7511e523f3..92811ddec7 100644
--- a/style/ltugboat.el
+++ b/style/ltugboat.el
@@ -1,6 +1,6 @@
;;; ltugboat.el --- AUCTeX style for `ltugboat.cls' (v2.22) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2019--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2019--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -241,25 +241,15 @@
;; 10.2 Other special typesetting
"Dash"
- '("cs" (TeX-arg-eval let ((macro (completing-read
- (TeX-argument-prompt nil nil
- "Command")
- (TeX-symbol-list))))
- (format "%s" macro)))
- '("env" (TeX-arg-eval let ((env (completing-read
- (TeX-argument-prompt nil nil
- "Environment")
- (LaTeX-environment-list))))
- (format "%s" env)))
+ '("cs" (TeX-arg-completing-read (TeX-symbol-list) "Macro"))
+ '("env" (TeX-arg-completing-read (LaTeX-environment-list) "Environment"))
'("meta" "Text")
'("tubbraced" "Text")
'("nth" "Number")
;; 12 Bibliography
'("SetBibJustification"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Justification")
- '("\\raggedright" "\\sloppy"))))
+ (TeX-arg-completing-read ("\\raggedright" "\\sloppy") "Justification")))
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/ltxdoc.el b/style/ltxdoc.el
index feeb300d34..48040c4648 100644
--- a/style/ltxdoc.el
+++ b/style/ltxdoc.el
@@ -51,9 +51,7 @@
(TeX-add-symbols
'("cmd" TeX-arg-macro)
- '("cs" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Macro")
- (TeX-symbol-list)))
+ '("cs" (TeX-arg-completing-read (TeX-symbol-list) "Macro"))
'("marg" "Mandatory argument")
'("oarg" "Optional argument")
'("parg" "Picture mode argument")
diff --git a/style/mathtools.el b/style/mathtools.el
index d0e1f262c4..505c15718f 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -316,14 +316,10 @@ Put line break macro on the last line. Next, insert an
ampersand."
(format "%s" newtag))))
[ "Inner format" ] "Left" "Right")
'("renewtagform"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-mathtools-newtagform-list))
+ (TeX-arg-completing-read (LaTeX-mathtools-newtagform-list) "Name")
[ "Inner format" ] "Left" "Right")
'("usetagform"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-mathtools-newtagform-list)))
+ (TeX-arg-completing-read (LaTeX-mathtools-newtagform-list) "Name"))
;; 3.2.2 Showing only referenced tags
'("refeq" TeX-arg-ref)
'("noeqref" TeX-arg-ref)
@@ -388,9 +384,7 @@ Put line break macro on the last line. Next, insert an
ampersand."
(concat "Command: " TeX-esc)
(mapcar #'car
(LaTeX-mathtools-DeclarePairedDelimiter-list)))))
(concat TeX-esc cmd))))
- (TeX-arg-eval completing-read
- "star or nostar: "
- '("star" "nostar"))
+ (TeX-arg-completing-read ("star" "nostar") "star or nostar")
t)
;; 3.7.1 Left and right parentheses
'("lparen" TeX-arg-insert-right-brace-maybe)
@@ -421,9 +415,7 @@ Put line break macro on the last line. Next, insert an
ampersand."
(format "%s" env))))
3)
'("renewgathered"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-mathtools-newgathered-list))
+ (TeX-arg-completing-read (LaTeX-mathtools-newgathered-list) "Name")
3)
;; 4.6 Split fractions
'("splitfrac" 2)
diff --git a/style/mdframed.el b/style/mdframed.el
index 0e3dd9bb51..53981d6207 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -1,6 +1,6 @@
;;; mdframed.el --- AUCTeX style for `mdframed.sty' (v1.9b) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -290,29 +290,20 @@ and prepends them to variable
`LaTeX-mdframed-key-val-options'."
'("renewmdenv"
[TeX-arg-key-val (LaTeX-mdframed-key-val-options)]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Environment")
- (LaTeX-mdframed-newmdenv-list)))
+ (TeX-arg-completing-read (LaTeX-mdframed-newmdenv-list) "Environment"))
'("surroundwithmdframed"
[TeX-arg-key-val (LaTeX-mdframed-key-val-options)]
TeX-arg-environment)
'("mdflength"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Length")
- '(("skipabove")
- ("skipbelow")
- ("leftmargin")
- ("rightmargin")
- ("innerleftmargin")
- ("innerrightmargin")
- ("innertopmargin")
- ("innerbottommargin")
- ("linewidth")
- ("innerlinewidth")
- ("middlelinewidth")
- ("outerlinewidth"))))
+ (TeX-arg-completing-read ("skipabove" "skipbelow"
+ "leftmargin" "rightmargin"
+ "innerleftmargin" "innerrightmargin"
+ "innertopmargin" "innerbottommargin"
+ "linewidth" "innerlinewidth"
+ "middlelinewidth" "outerlinewidth")
+ "Length"))
;; 5. Defining your own style
'("mdfdefinestyle"
@@ -325,9 +316,7 @@ and prepends them to variable
`LaTeX-mdframed-key-val-options'."
(TeX-arg-key-val (LaTeX-mdframed-key-val-options)))
'("mdfapptodefinestyle"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Style name")
- (LaTeX-mdframed-mdfdefinestyle-list))
+ (TeX-arg-completing-read (LaTeX-mdframed-mdfdefinestyle-list) "Style
name")
(TeX-arg-key-val (LaTeX-mdframed-key-val-options)))
;; 6.11. Title commands inside the environment
diff --git a/style/menukeys.el b/style/menukeys.el
index ac375ea4ee..72b5560deb 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -1,6 +1,6 @@
;;; menukeys.el --- AUCTeX style for `menukeys.sty' (v1.4) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -113,15 +113,15 @@ from the variable `TeX-symbol-list' before being
re-added."
(setq TeX-symbol-list
(assq-delete-all (car (assoc macro (TeX-symbol-list)))
TeX-symbol-list)))
(TeX-add-symbols
- `(,macro [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil
- ,(concat "Input separator "
- "(default "
- (if (and sep (not
(string= sep "")))
- sep
- ",")
- ")"))
- LaTeX-menukeys-input-separators-list ] t ))
+ `(,macro [TeX-arg-completing-read
+ LaTeX-menukeys-input-separators-list
+ ,(concat "Input separator "
+ "(default "
+ (if (and sep (not (string= sep "")))
+ sep
+ ",")
+ ")")]
+ t ))
(when (and (featurep 'font-latex)
(eq TeX-install-font-lock 'font-latex-setup))
(font-latex-add-keywords `((,macro "[{"))
@@ -158,15 +158,15 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(setq TeX-symbol-list
(assq-delete-all (car (assoc macro (TeX-symbol-list)))
TeX-symbol-list)))
(TeX-add-symbols
- `(,macro [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil
- ,(concat "Input separator "
- "(default "
- (if (and sep (not
(string= sep "")))
- sep
- ",")
- ")"))
- LaTeX-menukeys-input-separators-list ] t ))
+ `(,macro [TeX-arg-completing-read
+ LaTeX-menukeys-input-separators-list
+ ,(concat "Input separator "
+ "(default "
+ (if (and sep (not (string= sep "")))
+ sep
+ ",")
+ ")")]
+ t))
(when (and (featurep 'font-latex)
(eq TeX-install-font-lock 'font-latex-setup))
(font-latex-add-keywords `((,macro "[{"))
@@ -197,33 +197,26 @@ macro. If RENEW is non-nil, query for an already defined
macro."
;; \directory [<separator>]{path}
;; \keys [<separator>]{keystrokes}
'("menu"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Input separator")
- LaTeX-menukeys-input-separators-list ]
+ [TeX-arg-completing-read LaTeX-menukeys-input-separators-list
+ "Input separator"]
t)
'("directory"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Input separator")
- LaTeX-menukeys-input-separators-list ]
+ [TeX-arg-completing-read LaTeX-menukeys-input-separators-list
+ "Input separator"]
t)
'("keys"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Input separator")
- LaTeX-menukeys-input-separators-list ]
+ [TeX-arg-completing-read LaTeX-menukeys-input-separators-list
+ "Input separator"]
t)))
(TeX-add-symbols
;; 4.2.1 Predefined styles
;; \drawtikzfolder[<front fill>][<draw>]
'("drawtikzfolder"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Front color")
- (LaTeX-xcolor-definecolor-list) ]
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Line color")
- (LaTeX-xcolor-definecolor-list) ] )
+ [TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Front color"]
+ [TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Line color"])
;; 4.2.2 Declaring styles
;; \newmenustylesimple*{<name>}[<pre>]{<style>}[<sep>][<post>]{<theme>}
@@ -235,9 +228,8 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list)
+ "Color theme"))
'("newmenustylesimple*"
(TeX-arg-eval
@@ -247,9 +239,7 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list) "Color
theme"))
;;
\newmenustyle*{<name>}[<pre>]{<first>}[<sep>]{<mid>}{<last>}{<single>}[<post>]{<theme>}
'("newmenustyle"
@@ -260,9 +250,7 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list) "Color
theme"))
'("newmenustyle*"
(TeX-arg-eval
@@ -272,9 +260,7 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list) "Color
theme"))
'("CurrentMenuElement" 0)
@@ -294,26 +280,19 @@ macro. If RENEW is non-nil, query for an already defined
macro."
;; 4.2.4 Changing styles
;; \changemenuelement*{name}{element}{definition}
'("changemenuelement"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-menukeys-newmenustyle-list))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenustyle-list) "Name")
2)
'("changemenuelement*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-menukeys-newmenustyle-list))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenustyle-list) "Name")
2)
;; Same arguments as \newmenustylesimple
'("renewmenustylesimple"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-menukeys-newmenustyle-list))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenustyle-list) "Name")
[ t ] nil [ nil ] [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list)
+ "Color theme"))
'("providemenustylesimple"
(TeX-arg-eval
@@ -323,19 +302,15 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list)
+ "Color theme"))
;; Same arguments as \newmenustyle
'("providemenustyle"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-menukeys-newmenustyle-list))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenustyle-list) "Name")
[ t ] nil [ nil ] nil nil nil [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list)
+ "Color theme"))
'("renewmenustyle"
(TeX-arg-eval
@@ -345,9 +320,8 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color theme")
- (LaTeX-menukeys-newmenucolortheme-list)))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list)
+ "Color theme"))
;; 4.3 Color themes
;; 4.3.2 Create a theme
@@ -406,12 +380,8 @@ macro. If RENEW is non-nil, query for an already defined
macro."
;; 4.3.4 Change a theme
'("changemenucolor"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-menukeys-newmenucolortheme-list))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Element")
- '("bg" "br" "txt"))
+ (TeX-arg-completing-read (LaTeX-menukeys-newmenucolortheme-list) "Name")
+ (TeX-arg-completing-read ("bg" "br" "txt") "Element")
(TeX-arg-eval
(lambda ()
(let ((model (completing-read
@@ -497,9 +467,9 @@ macro. If RENEW is non-nil, query for an already defined
macro."
((= (cdr cmd) 0)
(push (car cmd) collector))
((= (cdr cmd) 1)
- (push (list (car cmd) '(TeX-arg-eval completing-read
- "Direction: "
- '("^" "v" ">" "<")))
+ (push (list (car cmd) '(TeX-arg-completing-read
+ ("^" "v" ">" "<")
+ "Direction"))
collector))
((= (cdr cmd) 2)
(push (car cmd) collector)
diff --git a/style/metalogo.el b/style/metalogo.el
index fc6233c06d..00091e27f6 100644
--- a/style/metalogo.el
+++ b/style/metalogo.el
@@ -1,6 +1,6 @@
;;; metalogo.el --- AUCTeX style for `metalogo.sty' version 0.12. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2013--2022 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <giordano.mose@libero.it>
@@ -48,12 +48,12 @@
'("LuaLaTeX")
;; Commands
'("setlogokern"
- (TeX-arg-eval completing-read "Kern parameters: "
- '(("Te") ("eX") ("La") ("aT") ("Xe") ("eT") ("eL") ("X2")))
+ (TeX-arg-completing-read ("Te" "eX" "La" "aT" "Xe" "eT" "eL" "X2")
+ "Kern parameters")
(TeX-arg-length "Dimension"))
'("setlogodrop"
- [TeX-arg-eval completing-read "Drop parameters: "
- '(("TeX") ("Xe") ("XeTeX"))]
+ [TeX-arg-completing-read ("TeX" "Xe" "XeTeX")
+ "Drop parameters"]
(TeX-arg-length "Dimension"))
'("setLaTeXa" 1)
'("setLaTeXee" 1)
diff --git a/style/multirow.el b/style/multirow.el
index 11ae34e6ba..87603ed928 100644
--- a/style/multirow.el
+++ b/style/multirow.el
@@ -42,19 +42,17 @@
(lambda ()
(TeX-add-symbols
;; \multirow[<vpos>]{<nrows>}[<bigstruts>]{<width>}[<vmove>]{<text>}
- '("multirow"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Vertical position")
- '("c" "b" "t")]
+ `("multirow"
+ [TeX-arg-completing-read ("c" "b" "t") "Vertical position"]
"Number of rows"
[ "Big struts" ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Width")
- (append
- '("*" "=")
- (mapcar (lambda (x)
- (concat TeX-esc (car x)))
- (LaTeX-length-list))))
+ (TeX-arg-completing-read
+ ,(lambda ()
+ (append '("*" "=")
+ (mapcar (lambda (x)
+ (concat TeX-esc (car x)))
+ (LaTeX-length-list))))
+ "Width")
[TeX-arg-length "Vertical fix-up"]
t)
"multirowsetup"
diff --git a/style/natbib.el b/style/natbib.el
index ba6622ab56..00ea4b396c 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -1,6 +1,6 @@
;;; natbib.el --- AUCTeX style for `natbib.sty' version 8.31b -*-
lexical-binding: t; -*-
-;; Copyright (C) 1997, 1998, 2004, 2007, 2014--2020 Free Software Foundation,
Inc.
+;; Copyright (C) 1997, 1998, 2004, 2007, 2014--2022 Free Software Foundation,
Inc.
;; Authors: Berwin Turlach <statba@nus.edu.sg>
;; Carsten Dominik <dominik@strw.leidenuniv.nl>
@@ -118,10 +118,10 @@
"Punctuation between author and year"
"Punctuation between years for common authors")
- '("citestyle" (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Style")
- '("plain" "plainnat" "agu" "egu"
- "agms" "dcu" "kluwer" "cospar" "nature")))
+ '("citestyle" (TeX-arg-completing-read ("plain" "plainnat" "agu" "egu"
+ "agms" "dcu" "kluwer" "cospar"
+ "nature")
+ "Style"))
;; 2.12 Other Formatting Options
"bibsection"
diff --git a/style/newfloat.el b/style/newfloat.el
index 77239b9798..b1947bb33d 100644
--- a/style/newfloat.el
+++ b/style/newfloat.el
@@ -166,18 +166,18 @@ If `caption.el' is loaded, add the new floating
environment to
(format "%s" newfloat)))))
'("SetupFloatingEnvironment"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Floating environment")
- (mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ (TeX-arg-completing-read
+ (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))
+ "Floating environment")
(TeX-arg-key-val (LaTeX-newfloat-key-val-options)))
'("ForEachFloatingEnvironment" t)
'("ForEachFloatingEnvironment*" t)
'("PrepareListOf"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Floating environment")
- (mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ (TeX-arg-completing-read
+ (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))
+ "Floating environment")
t)
`("newfloatsetup"
diff --git a/style/ntheorem.el b/style/ntheorem.el
index cd8eff40a5..a487dfc821 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -1,6 +1,6 @@
;;; ntheorem.el --- AUCTeX style for `ntheorem.sty' (v1.33) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -202,8 +202,8 @@ make them available as new environments. Update
"") ])
'("renewtheorem"
- (TeX-arg-eval completing-read "Environment: "
- (LaTeX-ntheorem-newtheorem-list))
+ (TeX-arg-completing-read (LaTeX-ntheorem-newtheorem-list)
+ "Environment")
[ TeX-arg-environment "Numbered like" ]
t [ (TeX-arg-eval progn (if (eq (save-excursion
(backward-char 2)
@@ -214,8 +214,7 @@ make them available as new environments. Update
;; 2.3 Defining the Layout of Theorem Sets
'("theoremstyle"
- (TeX-arg-eval completing-read "Style: "
- LaTeX-ntheorem-theoremstyle-list))
+ (TeX-arg-completing-read LaTeX-ntheorem-theoremstyle-list "Style"))
'("theorembodyfont"
(LaTeX-arg-ntheorem-fontdecl "Body font"))
@@ -224,10 +223,9 @@ make them available as new environments. Update
(LaTeX-arg-ntheorem-fontdecl "Header font"))
'("theoremnumbering"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Numbering scheme")
- '("arabic" "roman" "Roman" "alph" "Alph"
- "greek" "Greek" "fnsymbol")))
+ (TeX-arg-completing-read ("arabic" "roman" "Roman" "alph" "Alph"
+ "greek" "Greek" "fnsymbol")
+ "Numbering scheme"))
'("theoremseparator" "Separator")
@@ -246,10 +244,11 @@ make them available as new environments. Update
'("theoremprework" t)
'("theorempostwork" t)
- '("theoremclass"
- (TeX-arg-eval completing-read "Theorem type: "
- (append '(("LaTeX"))
- (LaTeX-ntheorem-newtheorem-list))))
+ `("theoremclass"
+ (TeX-arg-completing-read ,(lambda ()
+ (append '(("LaTeX"))
+ (LaTeX-ntheorem-newtheorem-list)))
+ "Theorem type"))
;; 2.3.6 A Standard Set of Theorems
(when (LaTeX-provided-package-options-member "ntheorem" "standard")
@@ -332,18 +331,18 @@ make them available as new environments. Update
;; 2.4.2 Writing Extra Stuff to the Theorem File
'("addtheoremline"
- (TeX-arg-eval completing-read "Environment: "
- (LaTeX-ntheorem-newtheorem-list))
+ (TeX-arg-completing-read (LaTeX-ntheorem-newtheorem-list)
+ "Environment")
t)
'("addtheoremline*"
- (TeX-arg-eval completing-read "Environment: "
- (LaTeX-ntheorem-newtheorem-list))
+ (TeX-arg-completing-read (LaTeX-ntheorem-newtheorem-list)
+ "Environment")
t)
'("addtotheoremfile"
- [ TeX-arg-eval completing-read "Environment: "
- (LaTeX-ntheorem-newtheorem-list) ]
+ [TeX-arg-completing-read (LaTeX-ntheorem-newtheorem-list)
+ "Environment"]
t)
;; 2.5.1 Defining New Theorem Layouts
@@ -359,8 +358,8 @@ make them available as new environments. Update
2)
'("renewtheoremstyle"
- (TeX-arg-eval completing-read "Style name: "
- LaTeX-ntheorem-theoremstyle-list)
+ (TeX-arg-completing-read LaTeX-ntheorem-theoremstyle-list
+ "Style name")
2)
;; 2.5.2 Defining New Theorem List Layouts
@@ -376,8 +375,8 @@ make them available as new environments. Update
3)
'("renewtheoremlisttype"
- (TeX-arg-eval completing-read "Style name: "
- LaTeX-ntheorem-listtype-list)
+ (TeX-arg-completing-read LaTeX-ntheorem-listtype-list
+ "Style name")
3)
;; 2.6 Setting End Marks
diff --git a/style/paracol.el b/style/paracol.el
index 3ed74b72f8..86a47a267b 100644
--- a/style/paracol.el
+++ b/style/paracol.el
@@ -1,6 +1,6 @@
;;; paracol.el --- AUCTeX style for `paracol.sty' (v1.35) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -157,9 +157,7 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; 7.6 Page-Wise Footnotes
'("footnotelayout"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Layout")
- '("c" "m" "p")))
+ (TeX-arg-completing-read ("c" "m" "p") "Layout"))
;; \footnote*[num]{text}
;; \footnotemark*[num]
@@ -206,20 +204,18 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; \backgroundcolor{region(x0,y0)}[mode]{color}
;; \backgroundcolor{region(x0,y0)(x1,y1)}[mode]{color}
'("backgroundcolor"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Region")
- '("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
- "C" "G" "S" "F" "N" "P" "T" "B" "L" "R"))
+ (TeX-arg-completing-read ("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
+ "C" "G" "S" "F" "N" "P" "T" "B" "L" "R")
+ "Region")
(TeX-arg-conditional (member "xcolor" (TeX-style-list))
(TeX-arg-xcolor)
(TeX-arg-color)))
;; \nobackgroundcolor{region}
'("nobackgroundcolor"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Region")
- '("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
- "C" "G" "S" "F" "N" "P" "T" "B" "L" "R")))
+ (TeX-arg-completing-read ("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
+ "C" "G" "S" "F" "N" "P" "T" "B" "L" "R")
+ "Region"))
;; \resetbackgroundcolor
'("resetbackgroundcolor" 0)
@@ -227,9 +223,7 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; 7.9 Control of Contents Output
;; \addcontentsonly{file}{col}
'("addcontentsonly"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Content file")
- '("toc" "lof" "lot"))
+ (TeX-arg-completing-read ("toc" "lof" "lot") "Content file")
"Column")
;; 7.10 Page Flushing Commands
diff --git a/style/polyglossia.el b/style/polyglossia.el
index cdfb03e093..9a2f40e0ba 100644
--- a/style/polyglossia.el
+++ b/style/polyglossia.el
@@ -1,6 +1,6 @@
;;; polyglossia.el --- AUCTeX style for `polyglossia.sty' version 1.42.0. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2022 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <mose@gnu.org>
@@ -249,8 +249,9 @@ argument, otherwise as a mandatory one."
'("setotherlanguage" (LaTeX-arg-polyglossia-lang nil nil nil))
'("setotherlanguages" (LaTeX-arg-polyglossia-lang nil t nil))
'("setkeys" (LaTeX-arg-polyglossia-lang nil nil t ))
- '("PolyglossiaSetup" (TeX-arg-eval completing-read "Language: "
- (LaTeX-polyglossia-active-languages))
+ '("PolyglossiaSetup" (TeX-arg-completing-read
+ (LaTeX-polyglossia-active-languages)
+ "Language")
LaTeX-arg-polyglossiasetup-options)
"selectbackgroundlanguage"
'("resetdefaultlanguage" ["argument"] 1)
diff --git a/style/pythontex.el b/style/pythontex.el
index 01c6ed9e7d..610a6341ec 100644
--- a/style/pythontex.el
+++ b/style/pythontex.el
@@ -1,6 +1,6 @@
;;; pythontex.el --- AUCTeX style for `pythontex.sty' (v0.16) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2018--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2018--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -294,62 +294,43 @@ a list of strings."
;; 4.2.5 Custom code
;; pythontexcustomc[<position>]{<family>}{<code>}
'("pythontexcustomc"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Position")
- '("begin" "end") ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Family")
- LaTeX-pythontex-family-list)
+ [TeX-arg-completing-read ("begin" "end") "Position"]
+ (TeX-arg-completing-read LaTeX-pythontex-family-list "Family")
t)
;; 4.2.7 Formatting of typeset code
;; \setpythontexfv[<family>]{<fancyvrb settings>}
'("setpythontexfv"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Family")
- LaTeX-pythontex-family-list ]
+ [TeX-arg-completing-read LaTeX-pythontex-family-list "Family"]
(TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)))
;; \setpythontexprettyprinter[<family>]{<printer>}
- '("setpythontexprettyprinter"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Family")
- (cons "auto" LaTeX-pythontex-family-list) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Printer")
- '("text" "bw" "fancyvrb" "pygments")))
+ `("setpythontexprettyprinter"
+ [TeX-arg-completing-read ,(lambda ()
+ (cons "auto" LaTeX-pythontex-family-list))
+ "Family"]
+ (TeX-arg-completing-read ("text" "bw" "fancyvrb" "pygments") "Printer"))
;; \setpythontexpyglexer[<family>]{<pygments lexer>}
'("setpythontexpyglexer"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Family")
- LaTeX-pythontex-family-list ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Pygments lexer")
- (LaTeX-pythontex-language-list)))
+ [TeX-arg-completing-read LaTeX-pythontex-family-list "Family"]
+ (TeX-arg-completing-read (LaTeX-pythontex-language-list) "Pygments
lexer"))
;; \setpythontexpygopt[<family>]{<pygments options>}
'("setpythontexpygopt"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Family")
- LaTeX-pythontex-family-list ]
- (TeX-arg-key-val
- (("style") ("texcomments") ("mathescape"))))
+ [TeX-arg-completing-read LaTeX-pythontex-family-list "Family"]
+ (TeX-arg-key-val (("style") ("texcomments") ("mathescape"))))
;; 4.2.8 Access to printed content (stdout)
;; \printpythontex[<mode>][<options>]
'("printpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ] )
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)])
;; \stdoutpythontex[<mode>][<options>]
'("stdoutpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ] )
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)])
;;\saveprintpythontex{<name>}
'("saveprintpythontex"
@@ -370,32 +351,21 @@ a list of strings."
;; \useprintpythontex[<verbatim options>][<fancyvrb options>]{<name>}
;; I assume <verbatim options> is meant to be <mode>
'("useprintpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-pythontex-savecontent-list)))
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
+ (TeX-arg-completing-read (LaTeX-pythontex-savecontent-list) "Name"))
;; \usestdoutpythontex[<verbatim options>][<fancyvrb options>]{<name>}
;; I assume <verbatim options> is meant to be <mode>
'("usestdoutpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-pythontex-savecontent-list)))
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
+ (TeX-arg-completing-read (LaTeX-pythontex-savecontent-list) "Name"))
;; \stderrpythontex[<mode>][<fancyvrb options>]
'("stderrpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ] )
-
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)])
;;\savestderrpythontex{<name>}
'("savestderrpythontex"
@@ -407,62 +377,43 @@ a list of strings."
;; \usestderrpythontex[<mode>][<fancyvrb options>]{<name>}
'("usestderrpythontex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Mode")
- '("raw" "verb" "verbatim") ]
- [ TeX-arg-key-val (LaTeX-fancyvrb-key-val-options) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Name")
- (LaTeX-pythontex-savecontent-list)))
+ [TeX-arg-completing-read ("raw" "verb" "verbatim") "Mode"]
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
+ (TeX-arg-completing-read (LaTeX-pythontex-savecontent-list) "Name"))
;;\setpythontexautoprint{<boolean>}
'("setpythontexautoprint"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Boolean value")
- '("true" "false")))
+ (TeX-arg-completing-read ("true" "false") "Boolean value"))
;; \setpythontexautostdout{<boolean>}
'("setpythontexautostdout"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Boolean value")
- '("true" "false")))
+ (TeX-arg-completing-read ("true" "false") "Boolean value"))
;; 4.3 Pygments commands and environments
;; \pygment{<lexer>}<opening delim><code><closing delim>
'("pygment"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Lexer")
- (LaTeX-pythontex-language-list))
+ (TeX-arg-completing-read (LaTeX-pythontex-language-list) "Lexer")
TeX-arg-verb-delim-or-brace)
;; \inputpygments[<fancyvrb settings>]{<lexer>}{<external file>}
'("inputpygments"
- [ TeX-arg-eval (LaTeX-fancyvrb-key-val-options) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Lexer")
- (LaTeX-pythontex-language-list))
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
+ (TeX-arg-completing-read (LaTeX-pythontex-language-list) "Lexer")
TeX-arg-file-name)
;; \setpygmentsfv[<lexer>]{<fancyvrb settings>}
'("setpygmentsfv"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Lexer")
- (LaTeX-pythontex-language-list) ]
- (TeX-arg-eval (LaTeX-fancyvrb-key-val-options)))
+ [TeX-arg-completing-read (LaTeX-pythontex-language-list) "Lexer"]
+ (TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)))
;; \setpygmentspygopt[<lexer>]{<pygments options>}
'("setpygmentspygopt"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Lexer")
- (LaTeX-pythontex-language-list) ]
- (TeX-arg-key-val
- (("style") ("texcomments") ("mathescape"))))
+ [TeX-arg-completing-read (LaTeX-pythontex-language-list) "Lexer"]
+ (TeX-arg-key-val (("style") ("texcomments") ("mathescape"))))
;; \setpygmentsprettyprinter{<printer>}
'("setpygmentsprettyprinter"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Printer")
- '("text" "bw" "fancyvrb" "pygments")))
+ (TeX-arg-completing-read ("text" "bw" "fancyvrb" "pygments") "Printer"))
;; 4.5 Advanced PythonTeX usage
;; \setpythontexcontext{<key-value pairs>}
@@ -503,19 +454,13 @@ a list of strings."
(LaTeX-add-environments
;; 4.2.5 Custom code
'("pythontexcustomcode" LaTeX-env-args
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Position")
- '("begin" "end") ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Family")
- LaTeX-pythontex-family-list))
+ [TeX-arg-completing-read ("begin" "end") "Position"]
+ (TeX-arg-completing-read LaTeX-pythontex-family-list "Family"))
;; \begin{pygments}[<fancyvrb settings>]{<lexer>}
'("pygments" LaTeX-env-args
- [TeX-arg-eval (LaTeX-fancyvrb-key-val-options)]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Lexer")
- (LaTeX-pythontex-language-list))) )
+ [TeX-arg-key-val (LaTeX-fancyvrb-key-val-options)]
+ (TeX-arg-completing-read (LaTeX-pythontex-language-list) "Lexer")))
;; Filling
(add-to-list 'LaTeX-indent-environment-list
diff --git a/style/splitidx.el b/style/splitidx.el
index edf52c2847..a638a8d43a 100644
--- a/style/splitidx.el
+++ b/style/splitidx.el
@@ -1,6 +1,6 @@
;;; splitidx.el --- AUCTeX style for `splitidx.sty' (v1.2a) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -160,22 +160,16 @@
;; 3.2 Marking up index entries
'("sindex"
;; I don't use `[ TeX-arg-index-tag ]' here
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Short cut")
- (LaTeX-splitidx-newindex-list) ]
+ [TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut"]
TeX-arg-index)
;; 3.4 Customizing index entries
'("AtWriteToIndex"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Short cut")
- (LaTeX-splitidx-newindex-list))
+ (TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut")
t)
'("AtNextWriteToIndex"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Short cut")
- (LaTeX-splitidx-newindex-list))
+ (TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut")
t)
;; 3.6 Preventing premature expansion of index entries
@@ -190,25 +184,19 @@
;; 3.7 Including the generated indices in your document
'("printindex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Short cut")
- (LaTeX-splitidx-newindex-list) ]
+ [TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut"]
[ "Index name" ])
'("printindex*" 0)
'("printsubindex"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Short cut")
- (LaTeX-splitidx-newindex-list) ]
+ [TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut"]
[ "Index name" ])
'("printsubindex*" 0)
'("setindexpreamble"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Short cut")
- (LaTeX-splitidx-newindex-list) ]
+ [TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut"]
t)
'("useindexpreamble" [ TeX-arg-macro ])
@@ -246,9 +234,7 @@
(when (LaTeX-provided-package-options-member "splitidx" "useindex")
(TeX-add-symbols
'("index"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Short cut")
- (LaTeX-splitidx-newindex-list) ]
+ [TeX-arg-completing-read (LaTeX-splitidx-newindex-list) "Short cut"]
(TeX-arg-index)))
;; Tell RefTeX to look in the optional arg. for the index short cut
(when (fboundp 'reftex-add-index-macros)
diff --git a/style/subcaption.el b/style/subcaption.el
index cd3312d3eb..c98596a594 100644
--- a/style/subcaption.el
+++ b/style/subcaption.el
@@ -136,31 +136,31 @@ caption, insert only a caption."
;; The next 2 macros are part of the kernel of caption.sty, but we
;; load them within subcaption.el.
(TeX-add-symbols
- '("DeclareCaptionSubType"
- [TeX-arg-eval
- completing-read (TeX-argument-prompt t nil "Numbering scheme")
- '("arabic" "roman" "Roman" "alph" "Alph" "fnsymbol")]
- (TeX-arg-eval
- completing-read
- (TeX-argument-prompt nil nil "Type")
- (append
- (when (and (fboundp 'LaTeX-newfloat-DeclareFloatingEnvironment-list)
- (LaTeX-newfloat-DeclareFloatingEnvironment-list))
- (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list)))
- '("figure" "table"))))
-
- '("DeclareCaptionSubType*"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Numbering scheme")
- '("arabic" "roman" "Roman" "alph" "Alph" "fnsymbol")]
- (TeX-arg-eval
- completing-read
- (TeX-argument-prompt nil nil "Type")
- (append
- (when (and (fboundp 'LaTeX-newfloat-DeclareFloatingEnvironment-list)
- (LaTeX-newfloat-DeclareFloatingEnvironment-list))
- (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list)))
- '("figure" "table")))))
+ `("DeclareCaptionSubType"
+ [TeX-arg-completing-read ("arabic" "roman" "Roman"
+ "alph" "Alph" "fnsymbol")
+ "Numbering scheme"]
+ (TeX-arg-completing-read
+ ,(lambda ()
+ (append
+ (when (and (fboundp 'LaTeX-newfloat-DeclareFloatingEnvironment-list)
+ (LaTeX-newfloat-DeclareFloatingEnvironment-list))
+ (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ '("figure" "table")))
+ "Type"))
+
+ `("DeclareCaptionSubType*"
+ [TeX-arg-completing-read ("arabic" "roman" "Roman"
+ "alph" "Alph" "fnsymbol")
+ "Numbering scheme"]
+ (TeX-arg-completing-read
+ ,(lambda ()
+ (append
+ (when (and (fboundp 'LaTeX-newfloat-DeclareFloatingEnvironment-list)
+ (LaTeX-newfloat-DeclareFloatingEnvironment-list))
+ (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ '("figure" "table")))
+ "Type")))
;; \subcaption(box)? and \subfloat macros should get their own lines
(LaTeX-paragraph-commands-add-locally
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index 5ba44bb75a..3f4b415f91 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -1,6 +1,6 @@
;;; tcolorbox.el --- AUCTeX style for `tcolorbox.sty' (v4.00) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2022 Free Software Foundation, Inc.
;; Author: Tassilo Horn <tsdh@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -607,42 +607,35 @@ for example \"tcolorboxlib-raster.el\"."
'("tcbsetforeverylayer"
(TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)))
- '("tcbox"
- [TeX-arg-eval TeX-read-key-val t
- (append
- LaTeX-tcolorbox-tcbox-options
- (LaTeX-tcolorbox-keyval-options))]
+ `("tcbox"
+ [TeX-arg-key-val ,(lambda () (append LaTeX-tcolorbox-tcbox-options
+ (LaTeX-tcolorbox-keyval-options)))]
t)
'("newtcolorbox"
- [ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
+ [TeX-arg-key-val LaTeX-tcolorbox-init-options]
"Name"
- [ TeX-arg-define-macro-arguments ]
+ [TeX-arg-define-macro-arguments]
(TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)))
'("renewtcolorbox"
- [ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color box")
- (LaTeX-tcolorbox-newtcolorbox-list))
- [ TeX-arg-define-macro-arguments ]
+ [TeX-arg-key-val LaTeX-tcolorbox-init-options]
+ (TeX-arg-completing-read (LaTeX-tcolorbox-newtcolorbox-list) "Color box")
+ [TeX-arg-define-macro-arguments]
(TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)))
'("newtcbox"
- [ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
+ [TeX-arg-key-val LaTeX-tcolorbox-init-options]
TeX-arg-macro
- [ TeX-arg-define-macro-arguments ]
+ [TeX-arg-define-macro-arguments]
(TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)))
- '("renewtcbox"
- [ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
- (TeX-arg-eval
- (lambda ()
- (let ((macro (completing-read
- (TeX-argument-prompt nil nil "Macro: \\" t)
- (LaTeX-tcolorbox-newtcbox-list))))
- (concat TeX-esc macro))))
- [ TeX-arg-define-macro-arguments ]
+ `("renewtcbox"
+ [TeX-arg-key-val LaTeX-tcolorbox-init-options ]
+
+ (TeX-arg-completing-read (LaTeX-tcolorbox-newtcbox-list)
+ "Macro (cr): \\" t ,TeX-esc)
+ [TeX-arg-define-macro-arguments]
(TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)))
'("tcolorboxenvironment"
@@ -659,12 +652,13 @@ for example \"tcolorboxlib-raster.el\"."
'("thetcolorboxpage" 0)
;; 5.2 Lists of tcolorboxes
- '("tcblistof"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Macro")
- (if (< (LaTeX-largest-level) 2)
- '("\\chapter" "\\section" "\\subsection" "\\subsubsection")
- '("\\section" "\\subsection" "\\subsubsection")) ]
+ `("tcblistof"
+ [TeX-arg-completing-read
+ ,(lambda ()
+ (if (< (LaTeX-largest-level) 2)
+ '("\\chapter" "\\section" "\\subsection" "\\subsubsection")
+ '("\\section" "\\subsection" "\\subsubsection")))
+ "Macro"]
2)
;; 7 Saving and Loading of Verbatim Texts
@@ -679,7 +673,7 @@ for example \"tcolorboxlib-raster.el\"."
(LaTeX-add-environments
;; 3 Macros for Box Creation: Main env
'("tcolorbox" LaTeX-env-args
- [ TeX-arg-key-val (LaTeX-tcolorbox-keyval-options) ])
+ [TeX-arg-key-val (LaTeX-tcolorbox-keyval-options)])
;; 7 Saving and Loading of Verbatim Texts
'("tcbverbatimwrite" "File name")
diff --git a/style/tex-live.el b/style/tex-live.el
index b74890d675..5fdb4eeb87 100644
--- a/style/tex-live.el
+++ b/style/tex-live.el
@@ -1,6 +1,6 @@
;;; tex-live.el --- AUCTeX style for `tex-live.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2020--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -82,10 +82,11 @@
(TeX-add-symbols
'("verbatiminput" LaTeX-fancyvrb-arg-file-relative)
'("boxedverbatiminput" LaTeX-fancyvrb-arg-file-relative)
- '("listinginput"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Value of firstnumber key")
- (cadr (assoc "firstnumber"
(LaTeX-fancyvrb-key-val-options))))
+ `("listinginput"
+ (TeX-arg-completing-read
+ ,(lambda () (cadr (assoc "firstnumber"
+ (LaTeX-fancyvrb-key-val-options))))
+ "Value of firstnumber key")
LaTeX-fancyvrb-arg-file-relative)
;; Various sorts of names:
@@ -95,24 +96,22 @@
'("colname" "Collection")
'("dirname" "Directory")
'("filename" "Directory")
- '("envname"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Environment")
- '("TEXMFCACHE"
- "TEXMFCNF"
- "TEXMFCONFIG"
- "TEXMFDIST"
- "TEXMFHOME"
- "TEXMFLOCAL"
- "TEXMFMAIN"
- "TEXMFOUTPUT"
- "TEXMFSYSCONFIG"
- "TEXMFSYSVAR"
- "TEXMFVAR"
- "TEXINPUTS"
- "TEXFONTMAPS"
- "ENCFONTS"
- "PATH" "MANPATH" "INFOPATH" "DISPLAY")))
+ '("envname" (TeX-arg-completing-read ("TEXMFCACHE"
+ "TEXMFCNF"
+ "TEXMFCONFIG"
+ "TEXMFDIST"
+ "TEXMFHOME"
+ "TEXMFLOCAL"
+ "TEXMFMAIN"
+ "TEXMFOUTPUT"
+ "TEXMFSYSCONFIG"
+ "TEXMFSYSVAR"
+ "TEXMFVAR"
+ "TEXINPUTS"
+ "TEXFONTMAPS"
+ "ENCFONTS"
+ "PATH" "MANPATH" "INFOPATH"
"DISPLAY")
+ "Environment"))
'("code" "Code")
'("file" "File")
'("prog" "Program")
diff --git a/style/theorem.el b/style/theorem.el
index 219e86475c..01474da87d 100644
--- a/style/theorem.el
+++ b/style/theorem.el
@@ -1,6 +1,6 @@
;;; theorem.el --- AUCTeX style for `theorem.sty' (v2.2c) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -147,9 +147,7 @@ make them available as new environments."
"") ])
'("theoremstyle"
- (TeX-arg-eval completing-read
- "Style: "
- LaTeX-theorem-theoremstyle-list))
+ (TeX-arg-completing-read LaTeX-theorem-theoremstyle-list "Style"))
'("theorembodyfont"
(LaTeX-arg-theorem-fontdecl "Body font"))
diff --git a/style/titleps.el b/style/titleps.el
index 8de8b1d3d7..ad8646e059 100644
--- a/style/titleps.el
+++ b/style/titleps.el
@@ -142,14 +142,12 @@ Removal is based on the return value of function
'("widenhead*" 2)
'("TitlepsPatchSection"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titleps-section-command-list)))
+ (TeX-arg-completing-read (LaTeX-titleps-section-command-list)
+ "Sectioning command"))
'("TitlepsPatchSection*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titleps-section-command-list)))
+ (TeX-arg-completing-read (LaTeX-titleps-section-command-list)
+ "Sectioning command"))
;; 5. Marks
'("bottitlemarks" 0)
@@ -163,15 +161,13 @@ Removal is based on the return value of function
'("newtitlemark*" (TeX-arg-counter "Variable name"))
'("pretitlemark"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titleps-section-command-list))
+ (TeX-arg-completing-read (LaTeX-titleps-section-command-list)
+ "Sectioning command")
"Text")
'("pretitlemark*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titleps-section-command-list))
+ (TeX-arg-completing-read (LaTeX-titleps-section-command-list)
+ "Sectioning command")
"Text")
'("ifsamemark"
diff --git a/style/titlesec.el b/style/titlesec.el
index c3af038228..3c232b0f18 100644
--- a/style/titlesec.el
+++ b/style/titlesec.el
@@ -123,9 +123,7 @@ insert the argument in brackets."
;;
\titleformat{<command>}[<shape>]{<format>}{<label>}{<sep>}{<before-code>}[<after-code>]
'("titleformat"
(LaTeX-arg-titlesec-titlespec)
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Shape")
- LaTeX-titlesec-section-shape-list]
+ [TeX-arg-completing-read LaTeX-titlesec-section-shape-list "Shape"]
(TeX-arg-conditional (y-or-n-p "With optional after-code? ")
(4 [nil])
(4)))
@@ -160,9 +158,7 @@ insert the argument in brackets."
;; 3.4. Rules
'("titleline"
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Alignment")
- '("l" "r" "c")]
+ [TeX-arg-completing-read ("l" "r" "c") "Alignment"]
t)
'("titlerule" [TeX-arg-length "Rule height"])
@@ -173,22 +169,18 @@ insert the argument in brackets."
;; 3.5. Page styles
'("assignpagestyle"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titlesec-section-command-list))
+ (TeX-arg-completing-read (LaTeX-titlesec-section-command-list)
+ "Sectioning command")
(TeX-arg-pagestyle))
;; 3.9. Creating new levels and changing the class
'("titleclass"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titlesec-section-command-list))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Class")
- '("page" "top" "straight"))
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Super level command")
- (LaTeX-titlesec-section-command-list)]) )
+ (TeX-arg-completing-read (LaTeX-titlesec-section-command-list)
+ "Sectioning command")
+ (TeX-arg-completing-read ("page" "top" "straight")
+ "Class")
+ [TeX-arg-completing-read (LaTeX-titlesec-section-command-list)
+ "Super level command"]))
;; Don't increase indent at \iftitlemeasuring:
(add-to-list 'LaTeX-indent-begin-exceptions-list "iftitlemeasuring" t)
@@ -198,9 +190,7 @@ insert the argument in brackets."
(when (LaTeX-provided-package-options-member "titlesec" "calcwidth")
(TeX-add-symbols
'("titleline*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Alignment")
- '("l" "r" "c"))
+ (TeX-arg-completing-read ("l" "r" "c") "Alignment")
t)))
;; The length of the longest line is returned in \titlewidth
diff --git a/style/titletoc.el b/style/titletoc.el
index c0ac512198..5031f1e5e9 100644
--- a/style/titletoc.el
+++ b/style/titletoc.el
@@ -1,6 +1,6 @@
;;; titletoc.el --- AUCTeX style for `titletoc.sty' (v1.6) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -98,19 +98,18 @@ Removal is based on the return value of function
;; \dottedcontents{<section>}[<left>]{<above-code>}
;; {<label width>}{<leader width>}
'("dottedcontents"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titletoc-section-command-list))
- [ TeX-arg-length "Left margin" ] 3)
+ (TeX-arg-completing-read (LaTeX-titletoc-section-command-list)
+ "Sectioning command")
+ [TeX-arg-length "Left margin"]
+ 3)
;; \titlecontents{<section>}[<left>]{<above-code>}
;; {<numbered-entry-format>}{<numberless-entry-format>}
;; {<filler-page-format>}[<below-code>]
'("titlecontents"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titletoc-section-command-list))
- [ TeX-arg-length "Left margin" ]
+ (TeX-arg-completing-read (LaTeX-titletoc-section-command-list)
+ "Sectioning command")
+ [TeX-arg-length "Left margin"]
(TeX-arg-conditional (y-or-n-p "With optional below code argument? ")
(4 [nil])
(4)))
@@ -119,10 +118,9 @@ Removal is based on the return value of function
;; {<numbered-entry-format>}{<numberless-entry-format>}
;; {<filler-page-format>}[<separator>]
'("titlecontents*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Sectioning command")
- (LaTeX-titletoc-section-command-list))
- [ TeX-arg-length "Left margin" ]
+ (TeX-arg-completing-read (LaTeX-titletoc-section-command-list)
+ "Sectioning command")
+ [TeX-arg-length "Left margin"]
(TeX-arg-conditional (y-or-n-p "With optional separator argument? ")
(4 [nil])
(4)))
diff --git a/style/xcolor.el b/style/xcolor.el
index 06bd28f73b..455e886dc6 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -417,21 +417,15 @@ xcolor package.")
;; \colorlet[<type>]{<name>}[<num model>]{<color>}
'("colorlet"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Type")
- LaTeX-xcolor-type-color-models ]
+ [TeX-arg-completing-read LaTeX-xcolor-type-color-models "Type"]
(TeX-arg-eval
(lambda ()
(let ((xcolor (TeX-read-string
(TeX-argument-prompt nil nil "Color"))))
(LaTeX-add-xcolor-definecolors xcolor)
(format "%s" xcolor))))
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Model")
- (LaTeX-xcolor-color-models t) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color")
- (LaTeX-xcolor-definecolor-list)))
+ [TeX-arg-completing-read (LaTeX-xcolor-color-models t) "Model"]
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Color"))
;; 2.5.3 Defining sets of colors
;; \definecolorset[<type>]{<model-list>}{<head>}{<tail>}{<set spec>}
@@ -491,32 +485,20 @@ xcolor package.")
;; 2.7 Color blending
'("blendcolors"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Mix expr")
- (LaTeX-xcolor-definecolor-list)))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Mix expr"))
'("blendcolors*"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Mix expr")
- (LaTeX-xcolor-definecolor-list)))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Mix expr"))
;; 2.8 Color masks and separation
- '("maskcolors"
- [ TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Model")
- (LaTeX-xcolor-color-models t) ]
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color")
- (LaTeX-xcolor-definecolor-list)))
+ `("maskcolors"
+ [TeX-arg-completing-read ,(lambda () (LaTeX-xcolor-color-models t))
"Model"]
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Color"))
;; 2.9 Color series
'("definecolorseries"
"Name"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Core model")
- LaTeX-xcolor-core-color-models)
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Method")
- '("step" "grad" "last"))
+ (TeX-arg-completing-read LaTeX-xcolor-core-color-models "Core model")
+ (TeX-arg-completing-read ("step" "grad" "last") "Method")
[ t ] nil [ nil ] nil)
'("resetcolorseries" [ "Div." ] "Name")
@@ -524,16 +506,12 @@ xcolor package.")
;; 2.13 Color information
;; \extractcolorspec{<color>}{<cmd>}
'("extractcolorspec"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color")
- (LaTeX-xcolor-definecolor-list))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Color")
(TeX-arg-define-macro "Command: \\"))
;; \extractcolorspecs{<color>}{<model-cmd>}{<color-cmd>}
'("extractcolorspecs"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Color")
- (LaTeX-xcolor-definecolor-list))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Color")
(TeX-arg-define-macro "Model command: \\")
(TeX-arg-define-macro "Color command: \\"))
@@ -543,15 +521,11 @@ xcolor package.")
;; 2.14 Color conversion
;; \convertcolorspec{<model>}{<spec>}{<target model>}{cmd>}
- '("convertcolorspec"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Model")
- (LaTeX-xcolor-color-models))
- (TeX-arg-eval TeX-read-string
- (TeX-argument-prompt nil nil "Spec"))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Model")
- (LaTeX-xcolor-color-models t))
+ `("convertcolorspec"
+ (TeX-arg-completing-read (LaTeX-xcolor-color-models) "Model")
+ (TeX-arg-string "Spec")
+ (TeX-arg-completing-read ,(lambda () (LaTeX-xcolor-color-models t))
+ "Target model")
(TeX-arg-define-macro "Macro: \\")) ) ; close TeX-add-symbols
;; 2.12 Color in tables
@@ -568,23 +542,15 @@ xcolor package.")
( [ t ] )
(ignore))
"Row"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Odd-row color")
- (LaTeX-xcolor-definecolor-list))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Even-row color")
- (LaTeX-xcolor-definecolor-list)))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Odd-row
color")
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Even-row
color"))
'("rowcolors*"
(TeX-arg-conditional (y-or-n-p "With optional commands? ")
( [ t ] )
(ignore))
"Row"
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Odd-row color")
- (LaTeX-xcolor-definecolor-list))
- (TeX-arg-eval completing-read
- (TeX-argument-prompt nil nil "Even-row color")
- (LaTeX-xcolor-definecolor-list)))
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Odd-row
color")
+ (TeX-arg-completing-read (LaTeX-xcolor-definecolor-list) "Even-row
color"))
'("showrowcolors" 0)
'("hiderowcolors" 0))
(LaTeX-add-counters "rownum"))
diff --git a/style/xr-hyper.el b/style/xr-hyper.el
index 472d028a74..306e28ce0e 100644
--- a/style/xr-hyper.el
+++ b/style/xr-hyper.el
@@ -1,6 +1,6 @@
;;; xr-hyper.el --- AUCTeX style for `xr-hyper.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -46,9 +46,7 @@
(TeX-add-symbols
'("externaldocument"
["Prefix"]
- [TeX-arg-eval completing-read
- (TeX-argument-prompt t nil "Cite option")
- '("nocite")]
+ [TeX-arg-completing-read ("nocite") "Cite option"]
;; Act like \include and not like \input:
(TeX-arg-input-file "File" t)
["Final file"])
- [elpa] externals/auctex 0c482642cc 32/48: Simplify implementation of style/currvita.el, (continued)
- [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, 2022/11/18
- [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 <=
- [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
- [elpa] externals/auctex c6c7c3f024 22/48: ; Use #' to quote function, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex c0c9556338 30/48: Don't insert empty node name, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 978ebea1e8 16/48: Simplify implementation of style/thmtools.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex d3970b77da 09/48: ; * latex.el (LaTeX-common-initialization): Remove dupe textcircled., Tassilo Horn, 2022/11/18
- [elpa] externals/auctex a0ba387b2c 23/48: ; Trivial cleanups, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 04a3138c81 45/48: Simplify implementation of style/theorem.el, Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 316550f0bf 29/48: Fix `ConTeXt-add-environments', Tassilo Horn, 2022/11/18
- [elpa] externals/auctex 8775c8355f 13/48: Replace `TeX-arg-url-urlstyle' in style/url.el, Tassilo Horn, 2022/11/18