branch: externals/auctex
commit ced4b1a930def4c7cd0a3e33141566b96e17fc70
Author: Arash Esbati <ar...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Adapt styles to lexical-binding
* style/arabxetex.el ("arabxetex"):
* style/babel.el ("babel"):
* style/doc.el ("doc"):
* style/enumitem.el ("enumitem"):
* style/exam.el ("exam"):
* style/floatrow.el ("floatrow"):
* style/fontspec.el ("fontspec"):
* style/graphicx.el ("graphicx"):
* style/hologo.el ("hologo"):
* style/ltugboat.el ("ltugboat"):
* style/mdframed.el ("mdframed"):
* style/menukeys.el ("menukeys"):
* style/moodle.el ("moodle"):
* style/natbib.el ("natbib"):
* style/ntheorem.el ("ntheorem"):
* style/paracol.el ("paracol"):
* style/pythontex.el ("pythontex"):
* style/splitidx.el ("splitidx"):
* style/tcolorbox.el ("tcolorbox"):
* style/tex-live.el ("tex-live"):
* style/thmtools.el ("thmtools"):
* style/titleps.el ("titleps"):
* style/titlesec.el ("titlesec"):
* style/titletoc.el ("titletoc"):
* style/xcolor.el ("xcolor"): Replace occurrences of dynamically
bound `optional' with constant nil or t.
* style/harvard.el ("harvard"): Remove unnecessary quoting of
`lambda'.
* style/xcolor.el (LaTeX-xcolor-color-models): Remove unnecessary
`symbol-value'.
---
style/arabxetex.el | 6 +-
style/babel.el | 16 +++---
style/doc.el | 4 +-
style/enumitem.el | 8 +--
style/exam.el | 32 +++++------
style/floatrow.el | 16 +++---
style/fontspec.el | 12 ++--
style/graphicx.el | 14 ++---
style/harvard.el | 158 ++++++++++++++++++++++++++---------------------------
style/hologo.el | 4 +-
style/ltugboat.el | 6 +-
style/mdframed.el | 14 ++---
style/menukeys.el | 126 +++++++++++++++++++++---------------------
style/moodle.el | 2 +-
style/natbib.el | 2 +-
style/ntheorem.el | 6 +-
style/paracol.el | 8 +--
style/pythontex.el | 90 +++++++++++++++---------------
style/splitidx.el | 18 +++---
style/tcolorbox.el | 10 ++--
style/tex-live.el | 4 +-
style/thmtools.el | 2 +-
style/titleps.el | 14 ++---
style/titlesec.el | 14 ++---
style/titletoc.el | 10 ++--
style/xcolor.el | 48 ++++++++--------
26 files changed, 322 insertions(+), 322 deletions(-)
diff --git a/style/arabxetex.el b/style/arabxetex.el
index b912a81..249d7a4 100644
--- a/style/arabxetex.el
+++ b/style/arabxetex.el
@@ -65,7 +65,7 @@
(lambda (symbol)
(list symbol
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
+ (TeX-argument-prompt t nil "Mode")
LaTeX-arabxetex-package-options ]
t))
(mapcar (lambda (lang) (concat "text" lang)) langs)))
@@ -77,7 +77,7 @@
(list environment
#'LaTeX-env-args
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
+ (TeX-argument-prompt t nil "Mode")
LaTeX-arabxetex-package-options ]))
langs))
;;
@@ -97,7 +97,7 @@
;; 3.3 Transliteration
'("SetTranslitConvention"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mapping")
+ (TeX-argument-prompt nil nil "Mapping")
'("dmg" "loc")))
'("SetTranslitStyle" "Style"))
diff --git a/style/babel.el b/style/babel.el
index 6c1cf4d..6468060 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -288,7 +288,7 @@
'("defineshorthand"
[ TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Language(s)")
+ (TeX-argument-prompt t nil "Language(s)")
(LaTeX-babel-active-languages)) ""]
t nil)
'("aliasshorthand" "Original" "Alias")
@@ -299,7 +299,7 @@
;; 1.12 The base option
'("AfterBabelLanguage"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Language")
+ (TeX-argument-prompt nil nil "Language")
LaTeX-babel-language-list)
t)
@@ -307,11 +307,11 @@
'("babelfont"
[ TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Language(s)")
+ (TeX-argument-prompt t nil "Language(s)")
LaTeX-babel-language-list)
"," ]
(TeX-arg-eval let ((fontfam (completing-read
- (TeX-argument-prompt optional nil "font
family")
+ (TeX-argument-prompt nil nil "font family")
'("rm" "sf" "tt"))))
;; Make sure `tex-buf.el' is also loaded otherwise
;; `TeX-check-engine-add-engines' is not defined.
@@ -332,7 +332,7 @@
'("babelprovide"
[ TeX-arg-key-val LaTeX-babel-babelprovide-key-val-options ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Language")
+ (TeX-argument-prompt nil nil "Language")
LaTeX-babel-language-list))
;; 1.18 Getting the current language name
@@ -342,17 +342,17 @@
;; 1.19 Hyphenation and line breaking
'("babelhyphen"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Type/Text")
+ (TeX-argument-prompt nil nil "Type/Text")
'("soft" "hard" "repeat" "empty")))
'("babelhyphen*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Type/Text")
+ (TeX-argument-prompt nil nil "Type/Text")
'("soft" "hard" "repeat" "empty")))
'("babelhyphenation"
[ TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Language(s)")
+ (TeX-argument-prompt nil nil "Language(s)")
LaTeX-babel-language-list)
"," ]
t)
diff --git a/style/doc.el b/style/doc.el
index 6311890..20e1486 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -86,7 +86,7 @@
'("DescribeMacro" (TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Macro")
+ (TeX-argument-prompt nil nil "Macro")
TeX-esc)))
(format "%s" name)))))
'("DescribeEnv" "Environment")
@@ -100,7 +100,7 @@
'("cmd" (TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
TeX-esc)))
(format "%s" name)))))
"makelabel"
diff --git a/style/enumitem.el b/style/enumitem.el
index b47aa25..3b80572 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -384,8 +384,8 @@ in `enumitem'-completions."
(LaTeX-add-environments `(,name LaTeX-enumitem-env-with-opts))
(LaTeX-add-enumitem-newlists (list name type))
(TeX-ispell-skip-setcdr `((,name ispell-tex-arg-end 0)))
- (TeX-argument-insert name optional)
- (TeX-argument-insert type optional)
+ (TeX-argument-insert name nil)
+ (TeX-argument-insert type nil)
(format "%s" depth)))))
;; \renewlist{<name>}{<type>}{<max-depth>}
@@ -401,7 +401,7 @@ in `enumitem'-completions."
'("setlist"
[TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Environment(s),
level(s)")
+ (TeX-argument-prompt t nil "Environment(s), level(s)")
(append
(when (LaTeX-provided-package-options-member "enumitem"
"includedisplayed")
@@ -418,7 +418,7 @@ in `enumitem'-completions."
'("setlist*"
[TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Environment(s),
level(s)")
+ (TeX-argument-prompt t nil "Environment(s), level(s)")
(append
(when (LaTeX-provided-package-options-member "enumitem"
"includedisplayed")
diff --git a/style/exam.el b/style/exam.el
index 1dd7b2b..0cfb512 100644
--- a/style/exam.el
+++ b/style/exam.el
@@ -140,59 +140,59 @@ Arguments NAME and TYPE are the same as for the function
'("subpart" [ "Points" ] (TeX-arg-literal " "))
'("gradetable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("bonusgradetable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("bonuspointtable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("partialgradetable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("partialbonusgradetable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("partialbonuspointtable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("pointtable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("partialpointtable"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Orientation")
+ (TeX-argument-prompt t nil "Orientation")
'("v" "h") ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Table index")
+ (TeX-argument-prompt t nil "Table index")
'("questions" "pages") ] )
'("subsubpart" [ "Points" ] (TeX-arg-literal " "))
diff --git a/style/floatrow.el b/style/floatrow.el
index 6dfc25b..9bf6838 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -557,10 +557,10 @@ only the parsed items."
;; \floatbox[<preamble>]{<captype>}[<width>][<height>][<vert
pos>]{<caption>}{<object>}
'("floatbox"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Preamble")
+ (TeX-argument-prompt t nil "Preamble")
'("\\capbeside" "\\nocapbeside" "\\captop") ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Float type")
+ (TeX-argument-prompt nil nil "Float type")
LaTeX-floatrow-supported-float-types)
LaTeX-floatrow-arg-floatbox)
@@ -569,22 +569,22 @@ only the parsed items."
(TeX-arg-eval
(lambda ()
(let ((cmd (TeX-read-string
- (TeX-argument-prompt optional nil "Command"))))
+ (TeX-argument-prompt nil nil "Command"))))
(LaTeX-add-floatrow-newfloatcommands cmd)
(TeX-add-symbols
`(,cmd LaTeX-floatrow-arg-floatbox))
(format "%s" cmd))))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Float type")
+ (TeX-argument-prompt nil nil "Float type")
'("figure" "table"))
[ 2 ])
'("renewfloatcommand"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Command")
+ (TeX-argument-prompt nil nil "Command")
(LaTeX-floatrow-newfloatcommand-list))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Float type")
+ (TeX-argument-prompt nil nil "Float type")
'("figure" "table"))
[ 2 ])
@@ -609,7 +609,7 @@ only the parsed items."
;; 3 Float Layout Settings
'("floatsetup"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Float type")
+ (TeX-argument-prompt t nil "Float type")
LaTeX-floatrow-supported-float-types ]
(TeX-arg-key-val LaTeX-floatrow-key-val-options-local))
@@ -620,7 +620,7 @@ only the parsed items."
;; 3.3 Clearing of Settings for Current Float Type
'("clearfloatsetup"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Float type")
+ (TeX-argument-prompt nil nil "Float type")
LaTeX-floatrow-supported-float-types))
;; 3.4 Temporary Clearing of All Float Settings
diff --git a/style/fontspec.el b/style/fontspec.el
index 18c5305..b4378ca 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -332,13 +332,13 @@ to retrieve the list of fonts."
;; 23 Defining new features
'("newAATfeature"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Existing feature")
+ (TeX-argument-prompt nil nil "Existing feature")
LaTeX-fontspec-font-features-local)
"New option" 2)
'("newopentypefeature"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Existing feature")
+ (TeX-argument-prompt nil nil "Existing feature")
LaTeX-fontspec-font-features-local)
"New option" t)
@@ -351,7 +351,7 @@ to retrieve the list of fonts."
;; 26 Renaming existing features & options
'("aliasfontfeature"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Existing feature")
+ (TeX-argument-prompt nil nil "Existing feature")
LaTeX-fontspec-font-features-local)
"New name")
@@ -359,12 +359,12 @@ to retrieve the list of fonts."
(TeX-arg-eval
(lambda ()
(let* ((key (completing-read
- (TeX-argument-prompt optional nil "Feature")
+ (TeX-argument-prompt nil nil "Feature")
LaTeX-fontspec-font-features-local))
(val (completing-read
- (TeX-argument-prompt optional nil "Existing name")
+ (TeX-argument-prompt nil nil "Existing name")
(cadr (assoc key LaTeX-fontspec-font-features-local)))))
- (TeX-argument-insert key optional)
+ (TeX-argument-insert key nil)
(format "%s" val))))
"New name") )
diff --git a/style/graphicx.el b/style/graphicx.el
index 732388f..c24ee21 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -237,13 +237,13 @@ subdirectories and inserts the relative file name. See
'("resizebox"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Width")
+ (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 optional nil "Height")
+ (TeX-argument-prompt nil nil "Height")
(append '("\\height" "\\totalheight" "\\depth" "!")
(mapcar
(lambda (x) (concat TeX-esc (car x)))
@@ -252,13 +252,13 @@ subdirectories and inserts the relative file name. See
'("resizebox*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Width")
+ (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 optional nil "Height")
+ (TeX-argument-prompt nil nil "Height")
(append '("\\height" "\\totalheight" "\\depth" "!")
(mapcar
(lambda (x) (concat TeX-esc (car x)))
@@ -267,19 +267,19 @@ subdirectories and inserts the relative file name. See
'("rotatebox" (TeX-arg-conditional (member "graphics" (TeX-style-list))
()
- ([ TeX-arg-key-val (("x") ("y") ("origin")
("units")) ]))
+ ([ TeX-arg-key-val (("x") ("y")
("origin") ("units")) ]))
"Angle" "Argument")
'("scalebox" "Horizontal scale" [ "Vertical scale" ] "Argument")
'("includegraphics" (TeX-arg-conditional (member "graphics"
(TeX-style-list))
(["llx,lly"] ["urx,ury"])
- ([
LaTeX-arg-graphicx-includegraphics-key-val ]))
+ ([
LaTeX-arg-graphicx-includegraphics-key-val ]))
LaTeX-arg-includegraphics)
'("includegraphics*" (TeX-arg-conditional (member "graphics"
(TeX-style-list))
(["llx,lly"] ["urx,ury"])
- ([
LaTeX-arg-graphicx-includegraphics-key-val ]))
+ ([
LaTeX-arg-graphicx-includegraphics-key-val ]))
LaTeX-arg-includegraphics)
'("graphicspath" t)
diff --git a/style/harvard.el b/style/harvard.el
index 7c3d468..8574883 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -27,85 +27,85 @@
(TeX-add-style-hook
"harvard"
- #'(lambda ()
-
- (LaTeX-add-environments
- '("thebibliography" LaTeX-env-harvardbib ignore))
-
- (TeX-add-symbols
- "harvardand"
- '("citeasnoun"
- (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
- TeX-arg-cite)
- '("possessivecite"
- (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
- TeX-arg-cite)
- '("citeaffixed"
- (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
- TeX-arg-cite "Affix")
- '("citeyear"
- (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
- TeX-arg-cite)
- '("citename"
- (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
- TeX-arg-cite)
- '("citationstyle"
- (TeX-arg-eval completing-read "Citation style: " '(("agsm") ("dcu"))))
- '("citationmode"
- (TeX-arg-eval completing-read "Citation mode: "
- '(("full") ("abbr") ("default"))))
- '("harvardparenthesis"
- (TeX-arg-eval completing-read "Harvardparenthesis: "
- '(("round") ("curly") ("angle") ("square"))))
- '("bibliographystyle"
- (TeX-arg-eval
- completing-read "Bibliography style: "
- '(("agsm") ("apsr") ("dcu") ("jmr") ("jphysicsB") ("kluwer")
("nederlands") ("econometrica")))
- ignore)
- '("harvarditem" [ "Short citation" ]
- "Complete citation" "Year" TeX-arg-define-cite))
-
- (setq TeX-complete-list
- (append '(("\\\\citeasnoun\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
- 1 LaTeX-bibitem-list "}")
- ("\\\\citeasnoun{\\([^{}\n\r\\%,]*\\)" 1
- LaTeX-bibitem-list "}")
-
("\\\\possessivecite\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
- 1 LaTeX-bibitem-list "}")
- ("\\\\possessivecite{\\([^{}\n\r\\%,]*\\)" 1
- LaTeX-bibitem-list "}")
- ("\\\\citename\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
- 1 LaTeX-bibitem-list "}")
- ("\\\\citename{\\([^{}\n\r\\%,]*\\)" 1
- LaTeX-bibitem-list "}")
- ("\\\\citeaffixed\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
- 1 LaTeX-bibitem-list "}")
- ("\\\\citeaffixed{\\([^{}\n\r\\%,]*\\)" 1
- LaTeX-bibitem-list "}")
- ("\\\\citeaffixed{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
- 2 LaTeX-bibitem-list)
- ("\\\\citeyear\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
- 1 LaTeX-bibitem-list "}")
- ("\\\\citeyear{\\([^{}\n\r\\%,]*\\)" 1
- LaTeX-bibitem-list "}")
- ("\\\\citeyear{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
- 2 LaTeX-bibitem-list))
- TeX-complete-list))
-
- (setq LaTeX-auto-regexp-list
- (append '(("\\\\harvarditem{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^,
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
-
("\\\\harvarditem\\[[^][\n\r]+\\]{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^,
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
- )
- LaTeX-auto-regexp-list))
-
- (setq LaTeX-item-list
- (cons '("thebibliography" . LaTeX-item-harvardbib)
- LaTeX-item-list))
-
- ;; Tell RefTeX
- (when (and LaTeX-reftex-cite-format-auto-activate
- (fboundp 'reftex-set-cite-format))
- (reftex-set-cite-format 'harvard)))
+ (lambda ()
+
+ (LaTeX-add-environments
+ '("thebibliography" LaTeX-env-harvardbib ignore))
+
+ (TeX-add-symbols
+ "harvardand"
+ '("citeasnoun"
+ (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+ TeX-arg-cite)
+ '("possessivecite"
+ (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+ TeX-arg-cite)
+ '("citeaffixed"
+ (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+ TeX-arg-cite "Affix")
+ '("citeyear"
+ (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+ TeX-arg-cite)
+ '("citename"
+ (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+ TeX-arg-cite)
+ '("citationstyle"
+ (TeX-arg-eval completing-read "Citation style: " '(("agsm") ("dcu"))))
+ '("citationmode"
+ (TeX-arg-eval completing-read "Citation mode: "
+ '(("full") ("abbr") ("default"))))
+ '("harvardparenthesis"
+ (TeX-arg-eval completing-read "Harvardparenthesis: "
+ '(("round") ("curly") ("angle") ("square"))))
+ '("bibliographystyle"
+ (TeX-arg-eval
+ completing-read "Bibliography style: "
+ '(("agsm") ("apsr") ("dcu") ("jmr") ("jphysicsB") ("kluwer")
("nederlands") ("econometrica")))
+ ignore)
+ '("harvarditem" [ "Short citation" ]
+ "Complete citation" "Year" TeX-arg-define-cite))
+
+ (setq TeX-complete-list
+ (append '(("\\\\citeasnoun\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+ 1 LaTeX-bibitem-list "}")
+ ("\\\\citeasnoun{\\([^{}\n\r\\%,]*\\)" 1
+ LaTeX-bibitem-list "}")
+ ("\\\\possessivecite\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+ 1 LaTeX-bibitem-list "}")
+ ("\\\\possessivecite{\\([^{}\n\r\\%,]*\\)" 1
+ LaTeX-bibitem-list "}")
+ ("\\\\citename\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+ 1 LaTeX-bibitem-list "}")
+ ("\\\\citename{\\([^{}\n\r\\%,]*\\)" 1
+ LaTeX-bibitem-list "}")
+ ("\\\\citeaffixed\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+ 1 LaTeX-bibitem-list "}")
+ ("\\\\citeaffixed{\\([^{}\n\r\\%,]*\\)" 1
+ LaTeX-bibitem-list "}")
+ ("\\\\citeaffixed{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
+ 2 LaTeX-bibitem-list)
+ ("\\\\citeyear\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+ 1 LaTeX-bibitem-list "}")
+ ("\\\\citeyear{\\([^{}\n\r\\%,]*\\)" 1
+ LaTeX-bibitem-list "}")
+ ("\\\\citeyear{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
+ 2 LaTeX-bibitem-list))
+ TeX-complete-list))
+
+ (setq LaTeX-auto-regexp-list
+ (append '(("\\\\harvarditem{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^,
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
+
("\\\\harvarditem\\[[^][\n\r]+\\]{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^,
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
+ )
+ LaTeX-auto-regexp-list))
+
+ (setq LaTeX-item-list
+ (cons '("thebibliography" . LaTeX-item-harvardbib)
+ LaTeX-item-list))
+
+ ;; Tell RefTeX
+ (when (and LaTeX-reftex-cite-format-auto-activate
+ (fboundp 'reftex-set-cite-format))
+ (reftex-set-cite-format 'harvard)))
LaTeX-dialect)
(defun LaTeX-env-harvardbib (environment &optional _ignore)
diff --git a/style/hologo.el b/style/hologo.el
index 6e1b1b2..bc0d759 100644
--- a/style/hologo.el
+++ b/style/hologo.el
@@ -140,7 +140,7 @@
LaTeX-hologo-key-val-options-global))
(t
LaTeX-hologo-key-val-options-global)))))
- (TeX-argument-insert logo optional)
+ (TeX-argument-insert logo nil)
(format "%s" keyval)))))
'("hologoDriverSetup" (TeX-arg-eval completing-read
@@ -184,7 +184,7 @@
'(("logo")))
(t
nil)))))
- (TeX-argument-insert logo optional)
+ (TeX-argument-insert logo nil)
(format "%s" keyval)))))
;; Additional user macros
diff --git a/style/ltugboat.el b/style/ltugboat.el
index cf73128..d49371a 100644
--- a/style/ltugboat.el
+++ b/style/ltugboat.el
@@ -238,12 +238,12 @@
;; 10.2 Other special typesetting
'("Dash" 0)
'("cs" (TeX-arg-eval let ((macro (completing-read
- (TeX-argument-prompt optional nil
+ (TeX-argument-prompt nil nil
"Command")
(TeX-symbol-list))))
(format "%s" macro)))
'("env" (TeX-arg-eval let ((env (completing-read
- (TeX-argument-prompt optional nil
+ (TeX-argument-prompt nil nil
"Environment")
(LaTeX-environment-list))))
(format "%s" env)))
@@ -254,7 +254,7 @@
;; 12 Bibliography
'("SetBibJustification"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Justification")
+ (TeX-argument-prompt nil nil "Justification")
'("\\raggedright" "\\sloppy"))))
;; Fontification
diff --git a/style/mdframed.el b/style/mdframed.el
index 9f9c251..aaf449f 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -302,7 +302,7 @@
(TeX-arg-eval
(lambda ()
(let ((env (TeX-read-string
- (TeX-argument-prompt optional nil "Environment"))))
+ (TeX-argument-prompt nil nil "Environment"))))
(LaTeX-add-environments
`(,env LaTeX-env-args [ TeX-arg-key-val
LaTeX-mdframed-key-val-options-local ]))
;; Add new env's to `ispell-tex-skip-alist': skip the optional
argument
@@ -312,7 +312,7 @@
'("renewmdenv"
[ TeX-arg-key-val LaTeX-mdframed-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Environment")
+ (TeX-argument-prompt nil nil "Environment")
(LaTeX-mdframed-newmdenv-list)))
'("surroundwithmdframed"
@@ -321,7 +321,7 @@
'("mdflength"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Length")
+ (TeX-argument-prompt nil nil "Length")
'(("skipabove")
("skipbelow")
("leftmargin")
@@ -340,7 +340,7 @@
(TeX-arg-eval
(lambda ()
(let ((style (TeX-read-string
- (TeX-argument-prompt optional nil "Style name"))))
+ (TeX-argument-prompt nil nil "Style name"))))
(LaTeX-add-mdframed-mdfdefinestyles style)
(LaTeX-mdframed-update-style-key)
(format "%s" style))))
@@ -348,7 +348,7 @@
'("mdfapptodefinestyle"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Style name")
+ (TeX-argument-prompt nil nil "Style name")
(LaTeX-mdframed-mdfdefinestyle-list))
(TeX-arg-key-val LaTeX-mdframed-key-val-options-local))
@@ -363,7 +363,7 @@
(TeX-arg-eval
(lambda ()
(let ((nthm (TeX-read-string
- (TeX-argument-prompt optional nil "Environment"))))
+ (TeX-argument-prompt nil nil "Environment"))))
(LaTeX-add-environments (list nthm (vector "Heading")))
(format "%s" nthm))))
[ TeX-arg-environment "Numbered like" ]
@@ -379,7 +379,7 @@
(TeX-arg-eval
(lambda ()
(let ((nthm (TeX-read-string
- (TeX-argument-prompt optional nil "Environment"))))
+ (TeX-argument-prompt nil nil "Environment"))))
(LaTeX-add-environments (list nthm (vector "Heading"))
(list (concat nthm "*") (vector "Heading")))
(format "%s" nthm))))
diff --git a/style/menukeys.el b/style/menukeys.el
index 4260250..2a10dfe 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -113,7 +113,7 @@ from the variable `TeX-symbol-list' before being re-added."
(assq-delete-all (car (assoc macro (TeX-symbol-list)))
TeX-symbol-list)))
(TeX-add-symbols
`(,macro [ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil
+ (TeX-argument-prompt t nil
,(concat "Input separator "
"(default "
(if (and sep (not
(string= sep "")))
@@ -158,7 +158,7 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(assq-delete-all (car (assoc macro (TeX-symbol-list)))
TeX-symbol-list)))
(TeX-add-symbols
`(,macro [ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil
+ (TeX-argument-prompt t nil
,(concat "Input separator "
"(default "
(if (and sep (not
(string= sep "")))
@@ -197,19 +197,19 @@ macro. If RENEW is non-nil, query for an already defined
macro."
;; \keys [<separator>]{keystrokes}
'("menu"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Input separator")
+ (TeX-argument-prompt t nil "Input separator")
LaTeX-menukeys-input-separators-list ]
t)
'("directory"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Input separator")
+ (TeX-argument-prompt t nil "Input separator")
LaTeX-menukeys-input-separators-list ]
t)
'("keys"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Input separator")
+ (TeX-argument-prompt t nil "Input separator")
LaTeX-menukeys-input-separators-list ]
t)))
@@ -218,10 +218,10 @@ macro. If RENEW is non-nil, query for an already defined
macro."
;; \drawtikzfolder[<front fill>][<draw>]
'("drawtikzfolder"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Front color")
+ (TeX-argument-prompt t nil "Front color")
(LaTeX-xcolor-definecolor-list) ]
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Line color")
+ (TeX-argument-prompt t nil "Line color")
(LaTeX-xcolor-definecolor-list) ] )
;; 4.2.2 Declaring styles
@@ -230,24 +230,24 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
'("newmenustylesimple*"
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
;;
\newmenustyle*{<name>}[<pre>]{<first>}[<sep>]{<mid>}{<last>}{<single>}[<post>]{<theme>}
@@ -255,24 +255,24 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
'("newmenustyle*"
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
'("CurrentMenuElement" 0)
@@ -282,70 +282,70 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((copy (TeX-read-string
- (TeX-argument-prompt optional nil "Copy")))
+ (TeX-argument-prompt nil nil "Copy")))
(orig (completing-read
- (TeX-argument-prompt optional nil "Original")
+ (TeX-argument-prompt nil nil "Original")
(LaTeX-menukeys-newmenustyle-list))))
(LaTeX-add-menukeys-newmenustyles copy)
- (TeX-argument-insert copy optional)
+ (TeX-argument-insert copy nil)
(format "%s" orig)))))
;; 4.2.4 Changing styles
;; \changemenuelement*{name}{element}{definition}
'("changemenuelement"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-menukeys-newmenustyle-list))
2)
'("changemenuelement*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-menukeys-newmenustyle-list))
2)
;; Same arguments as \newmenustylesimple
'("renewmenustylesimple"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-menukeys-newmenustyle-list))
[ t ] nil [ nil ] [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
'("providemenustylesimple"
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
;; Same arguments as \newmenustyle
'("providemenustyle"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-menukeys-newmenustyle-list))
[ t ] nil [ nil ] nil nil nil [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
'("renewmenustyle"
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenustyles name)
(format "%s" name))))
[ t ] nil [ nil ] nil nil nil [ nil ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color theme")
+ (TeX-argument-prompt nil nil "Color theme")
(LaTeX-menukeys-newmenucolortheme-list)))
;; 4.3 Color themes
@@ -355,36 +355,36 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenucolorthemes name)
(format "%s" name))))
(TeX-arg-eval
(lambda ()
(let ((model (completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt nil nil "Model")
(LaTeX-xcolor-color-models))))
- (TeX-argument-insert model optional)
+ (TeX-argument-insert model nil)
(if (string= model "named")
(let ((bg (completing-read
- (TeX-argument-prompt optional nil "Node background
color")
+ (TeX-argument-prompt nil nil "Node background color")
(LaTeX-xcolor-definecolor-list)))
(br (completing-read
- (TeX-argument-prompt optional nil "Node border color")
+ (TeX-argument-prompt nil nil "Node border color")
(LaTeX-xcolor-definecolor-list)))
(txt (completing-read
- (TeX-argument-prompt optional nil "Node text color")
+ (TeX-argument-prompt nil nil "Node text color")
(LaTeX-xcolor-definecolor-list))))
- (TeX-argument-insert bg optional)
- (TeX-argument-insert br optional)
+ (TeX-argument-insert bg nil)
+ (TeX-argument-insert br nil)
(format "%s" txt))
(let ((bg (TeX-read-string
- (TeX-argument-prompt optional nil "Node background
color spec")))
+ (TeX-argument-prompt nil nil "Node background color
spec")))
(br (TeX-read-string
- (TeX-argument-prompt optional nil "Node border color
spec")))
+ (TeX-argument-prompt nil nil "Node border color spec")))
(txt (TeX-read-string
- (TeX-argument-prompt optional nil "Node text color
spec"))))
- (TeX-argument-insert bg optional)
- (TeX-argument-insert br optional)
+ (TeX-argument-prompt nil nil "Node text color spec"))))
+ (TeX-argument-insert bg nil)
+ (TeX-argument-insert br nil)
(format "%s" txt))))))
(TeX-arg-conditional (y-or-n-p "With additional optional arguments? ")
( [ 3 ] )
@@ -395,35 +395,35 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((copy (TeX-read-string
- (TeX-argument-prompt optional nil "Copy")))
+ (TeX-argument-prompt nil nil "Copy")))
(orig (completing-read
- (TeX-argument-prompt optional nil "Original")
+ (TeX-argument-prompt nil nil "Original")
(LaTeX-menukeys-newmenucolortheme-list))))
(LaTeX-add-menukeys-newmenucolorthemes copy)
- (TeX-argument-insert copy optional)
+ (TeX-argument-insert copy nil)
(format "%s" orig)))))
;; 4.3.4 Change a theme
'("changemenucolor"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-menukeys-newmenucolortheme-list))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Element")
+ (TeX-argument-prompt nil nil "Element")
'("bg" "br" "txt"))
(TeX-arg-eval
(lambda ()
(let ((model (completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt nil nil "Model")
(LaTeX-xcolor-color-models))))
- (TeX-argument-insert model optional)
+ (TeX-argument-insert model nil)
(if (string= model "named")
(let ((color (completing-read
- (TeX-argument-prompt optional nil "Color")
+ (TeX-argument-prompt nil nil "Color")
(LaTeX-xcolor-definecolor-list))))
(format "%s" color))
(let ((color (TeX-read-string
- (TeX-argument-prompt optional nil "Color spec"))))
+ (TeX-argument-prompt nil nil "Color spec"))))
(format "%s" color)))))))
;; Same arguments as \newmenucolortheme
@@ -431,36 +431,36 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-menukeys-newmenucolorthemes name)
(format "%s" name))))
(TeX-arg-eval
(lambda ()
(let ((model (completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt nil nil "Model")
(LaTeX-xcolor-color-models))))
- (TeX-argument-insert model optional)
+ (TeX-argument-insert model nil)
(if (string= model "named")
(let ((bg (completing-read
- (TeX-argument-prompt optional nil "Node background
color")
+ (TeX-argument-prompt nil nil "Node background color")
(LaTeX-xcolor-definecolor-list)))
(br (completing-read
- (TeX-argument-prompt optional nil "Node border color")
+ (TeX-argument-prompt nil nil "Node border color")
(LaTeX-xcolor-definecolor-list)))
(txt (completing-read
- (TeX-argument-prompt optional nil "Node text color")
+ (TeX-argument-prompt nil nil "Node text color")
(LaTeX-xcolor-definecolor-list))))
- (TeX-argument-insert bg optional)
- (TeX-argument-insert br optional)
+ (TeX-argument-insert bg nil)
+ (TeX-argument-insert br nil)
(format "%s" txt))
(let ((bg (TeX-read-string
- (TeX-argument-prompt optional nil "Node background
color spec")))
+ (TeX-argument-prompt nil nil "Node background color
spec")))
(br (TeX-read-string
- (TeX-argument-prompt optional nil "Node border color
spec")))
+ (TeX-argument-prompt nil nil "Node border color spec")))
(txt (TeX-read-string
- (TeX-argument-prompt optional nil "Node text color
spec"))))
- (TeX-argument-insert bg optional)
- (TeX-argument-insert br optional)
+ (TeX-argument-prompt nil nil "Node text color spec"))))
+ (TeX-argument-insert bg nil)
+ (TeX-argument-insert br nil)
(format "%s" txt))))))
(TeX-arg-conditional (y-or-n-p "With additional optional arguments? ")
( [ 3 ] )
diff --git a/style/moodle.el b/style/moodle.el
index bcdfd1d..920e385 100644
--- a/style/moodle.el
+++ b/style/moodle.el
@@ -188,7 +188,7 @@
'("moodleset"
(TeX-arg-eval
(lambda ()
- (let ((opts (TeX-read-key-val optional
+ (let ((opts (TeX-read-key-val nil
(append '(("ppi"))
LaTeX-moodle-key-val-options))))
(format "%s" opts)))))
diff --git a/style/natbib.el b/style/natbib.el
index f65cfe5..1574519 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -116,7 +116,7 @@
"Punctuation between years for common authors")
'("citestyle" (TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Style")
+ (TeX-argument-prompt nil nil "Style")
'("plain" "plainnat" "agu" "egu"
"agms" "dcu" "kluwer" "cospar" "nature")))
diff --git a/style/ntheorem.el b/style/ntheorem.el
index 0e937dc..03bdf4f 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -223,7 +223,7 @@ make them available as new environments. Update
'("theoremnumbering"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Numbering scheme")
+ (TeX-argument-prompt nil nil "Numbering scheme")
'("arabic" "roman" "Roman" "alph" "Alph"
"greek" "Greek" "fnsymbol")))
@@ -349,7 +349,7 @@ make them available as new environments. Update
(TeX-arg-eval
(lambda ()
(let ((style (TeX-read-string
- (TeX-argument-prompt optional nil "Style name"))))
+ (TeX-argument-prompt nil nil "Style name"))))
(LaTeX-add-ntheorem-newtheoremstyles style)
(add-to-list (make-local-variable 'LaTeX-ntheorem-theoremstyle-list)
(list style))
@@ -366,7 +366,7 @@ make them available as new environments. Update
(TeX-arg-eval
(lambda ()
(let ((layout (TeX-read-string
- (TeX-argument-prompt optional nil "List layout name"))))
+ (TeX-argument-prompt nil nil "List layout name"))))
(LaTeX-add-ntheorem-newtheoremlisttypes layout)
(add-to-list (make-local-variable 'LaTeX-ntheorem-listtype-list)
(list layout))
diff --git a/style/paracol.el b/style/paracol.el
index a0e97a0..98b2bd2 100644
--- a/style/paracol.el
+++ b/style/paracol.el
@@ -155,7 +155,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 optional nil "Layout")
+ (TeX-argument-prompt nil nil "Layout")
'("c" "m" "p")))
;; \footnote*[num]{text}
@@ -204,7 +204,7 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; \backgroundcolor{region(x0,y0)(x1,y1)}[mode]{color}
'("backgroundcolor"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Region")
+ (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-conditional (member "xcolor" (TeX-style-list))
@@ -214,7 +214,7 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; \nobackgroundcolor{region}
'("nobackgroundcolor"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Region")
+ (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")))
@@ -225,7 +225,7 @@ If OPTIONAL is non-nil, insert the result in square
brackets."
;; \addcontentsonly{file}{col}
'("addcontentsonly"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Content file")
+ (TeX-argument-prompt nil nil "Content file")
'("toc" "lof" "lot"))
"Column")
diff --git a/style/pythontex.el b/style/pythontex.el
index 1e5ade3..ce316b6 100644
--- a/style/pythontex.el
+++ b/style/pythontex.el
@@ -294,10 +294,10 @@ a list of strings."
;; pythontexcustomc[<position>]{<family>}{<code>}
'("pythontexcustomc"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Position")
- '("begin" "end") ]
+ (TeX-argument-prompt t nil "Position")
+ '("begin" "end") ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
+ (TeX-argument-prompt nil nil "Family")
LaTeX-pythontex-family-list)
t)
@@ -305,33 +305,33 @@ a list of strings."
;; \setpythontexfv[<family>]{<fancyvrb settings>}
'("setpythontexfv"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
- LaTeX-pythontex-family-list ]
+ (TeX-argument-prompt t nil "Family")
+ LaTeX-pythontex-family-list ]
(TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local))
;; \setpythontexprettyprinter[<family>]{<printer>}
'("setpythontexprettyprinter"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
- (cons "auto" LaTeX-pythontex-family-list) ]
+ (TeX-argument-prompt t nil "Family")
+ (cons "auto" LaTeX-pythontex-family-list) ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Printer")
+ (TeX-argument-prompt nil nil "Printer")
'("text" "bw" "fancyvrb" "pygments")))
;; \setpythontexpyglexer[<family>]{<pygments lexer>}
'("setpythontexpyglexer"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
- LaTeX-pythontex-family-list ]
+ (TeX-argument-prompt t nil "Family")
+ LaTeX-pythontex-family-list ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Pygments lexer")
+ (TeX-argument-prompt nil nil "Pygments lexer")
(LaTeX-pythontex-language-list)))
;; \setpythontexpygopt[<family>]{<pygments options>}
'("setpythontexpygopt"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
- LaTeX-pythontex-family-list ]
+ (TeX-argument-prompt t nil "Family")
+ LaTeX-pythontex-family-list ]
(TeX-arg-key-val
(("style") ("texcomments") ("mathescape"))))
@@ -339,22 +339,22 @@ a list of strings."
;; \printpythontex[<mode>][<options>]
'("printpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
;; \stdoutpythontex[<mode>][<options>]
'("stdoutpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
;;\saveprintpythontex{<name>}
'("saveprintpythontex"
(TeX-arg-eval (lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-pythontex-savecontents name)
(format "%s" name)))))
@@ -362,7 +362,7 @@ a list of strings."
'("savestdoutpythontex"
(TeX-arg-eval (lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-pythontex-savecontents name)
(format "%s" name)))))
@@ -370,29 +370,29 @@ a list of strings."
;; I assume <verbatim options> is meant to be <mode>
'("useprintpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-pythontex-savecontent-list)))
;; \usestdoutpythontex[<verbatim options>][<fancyvrb options>]{<name>}
;; I assume <verbatim options> is meant to be <mode>
'("usestdoutpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-pythontex-savecontent-list)))
;; \stderrpythontex[<mode>][<fancyvrb options>]
'("stderrpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
@@ -400,37 +400,37 @@ a list of strings."
'("savestderrpythontex"
(TeX-arg-eval (lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Name"))))
+ (TeX-argument-prompt nil nil "Name"))))
(LaTeX-add-pythontex-savecontents name)
(format "%s" name)))))
;; \usestderrpythontex[<mode>][<fancyvrb options>]{<name>}
'("usestderrpythontex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mode")
- '("raw" "verb" "verbatim") ]
+ (TeX-argument-prompt t nil "Mode")
+ '("raw" "verb" "verbatim") ]
[ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Name")
+ (TeX-argument-prompt nil nil "Name")
(LaTeX-pythontex-savecontent-list)))
;;\setpythontexautoprint{<boolean>}
'("setpythontexautoprint"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Boolean value")
+ (TeX-argument-prompt nil nil "Boolean value")
'("true" "false")))
;; \setpythontexautostdout{<boolean>}
'("setpythontexautostdout"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Boolean value")
+ (TeX-argument-prompt nil nil "Boolean value")
'("true" "false")))
;; 4.3 Pygments commands and environments
;; \pygment{<lexer>}<opening delim><code><closing delim>
'("pygment"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Lexer")
+ (TeX-argument-prompt nil nil "Lexer")
(LaTeX-pythontex-language-list))
TeX-arg-verb-delim-or-brace)
@@ -438,29 +438,29 @@ a list of strings."
'("inputpygments"
[ TeX-arg-eval LaTeX-fancyvrb-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Lexer")
+ (TeX-argument-prompt nil nil "Lexer")
(LaTeX-pythontex-language-list))
TeX-arg-file-name)
;; \setpygmentsfv[<lexer>]{<fancyvrb settings>}
'("setpygmentsfv"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Lexer")
- (LaTeX-pythontex-language-list) ]
+ (TeX-argument-prompt t nil "Lexer")
+ (LaTeX-pythontex-language-list) ]
(TeX-arg-eval LaTeX-fancyvrb-key-val-options-local))
;; \setpygmentspygopt[<lexer>]{<pygments options>}
'("setpygmentspygopt"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Lexer")
- (LaTeX-pythontex-language-list) ]
+ (TeX-argument-prompt t nil "Lexer")
+ (LaTeX-pythontex-language-list) ]
(TeX-arg-key-val
(("style") ("texcomments") ("mathescape"))))
;; \setpygmentsprettyprinter{<printer>}
'("setpygmentsprettyprinter"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Printer")
+ (TeX-argument-prompt nil nil "Printer")
'("text" "bw" "fancyvrb" "pygments")))
;; 4.5 Advanced PythonTeX usage
@@ -494,7 +494,7 @@ a list of strings."
(TeX-arg-eval
(lambda ()
(let ((name (TeX-read-string
- (TeX-argument-prompt optional nil "Listing environment
name"))))
+ (TeX-argument-prompt nil nil "Listing environment
name"))))
(LaTeX-add-newfloat-DeclareFloatingEnvironments `(,name "verbatim"))
(LaTeX-newfloat-auto-cleanup)
(format "%s" name))))))
@@ -503,17 +503,17 @@ a list of strings."
;; 4.2.5 Custom code
'("pythontexcustomcode" LaTeX-env-args
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Position")
- '("begin" "end") ]
+ (TeX-argument-prompt t nil "Position")
+ '("begin" "end") ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Family")
+ (TeX-argument-prompt nil nil "Family")
LaTeX-pythontex-family-list))
;; \begin{pygments}[<fancyvrb settings>]{<lexer>}
'("pygments" LaTeX-env-args
[ TeX-arg-eval LaTeX-fancyvrb-key-val-options-local ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Lexer")
+ (TeX-argument-prompt nil nil "Lexer")
(LaTeX-pythontex-language-list))) )
;; Filling
diff --git a/style/splitidx.el b/style/splitidx.el
index ce7f6e6..f2ed53f 100644
--- a/style/splitidx.el
+++ b/style/splitidx.el
@@ -152,7 +152,7 @@
(TeX-arg-eval
(lambda ()
(let ((shortcut (TeX-read-string
- (TeX-argument-prompt optional nil "Short cut"))))
+ (TeX-argument-prompt nil nil "Short cut"))))
(LaTeX-add-splitidx-newindices shortcut)
(format "%s" shortcut)))))
@@ -160,20 +160,20 @@
'("sindex"
;; I don't use `[ TeX-arg-index-tag ]' here
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt t nil "Short cut")
(LaTeX-splitidx-newindex-list) ]
TeX-arg-index)
;; 3.4 Customizing index entries
'("AtWriteToIndex"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt nil nil "Short cut")
(LaTeX-splitidx-newindex-list))
t)
'("AtNextWriteToIndex"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt nil nil "Short cut")
(LaTeX-splitidx-newindex-list))
t)
@@ -183,14 +183,14 @@
(TeX-arg-eval
(lambda ()
(let ((shortcut (TeX-read-string
- (TeX-argument-prompt optional nil "Short cut"))))
+ (TeX-argument-prompt nil nil "Short cut"))))
(LaTeX-add-splitidx-newindices shortcut)
(format "%s" shortcut)))))
;; 3.7 Including the generated indices in your document
'("printindex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt t nil "Short cut")
(LaTeX-splitidx-newindex-list) ]
[ "Index name" ])
@@ -198,7 +198,7 @@
'("printsubindex"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt t nil "Short cut")
(LaTeX-splitidx-newindex-list) ]
[ "Index name" ])
@@ -206,7 +206,7 @@
'("setindexpreamble"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt t nil "Short cut")
(LaTeX-splitidx-newindex-list) ]
t)
@@ -246,7 +246,7 @@
(TeX-add-symbols
'("index"
[TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Short cut")
+ (TeX-argument-prompt t nil "Short cut")
(LaTeX-splitidx-newindex-list) ]
(TeX-arg-index)))
;; Tell RefTeX to look in the optional arg. for the index short cut
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index b421731..7d30683 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -586,7 +586,7 @@ e.g. \"tcolorboxlib-raster.el\"."
'("tcbuselibrary"
(TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Libraries")
+ (TeX-argument-prompt nil nil "Libraries")
LaTeX-tcolorbox-library-list) ","))
;; 3 Macros for Box Creation
@@ -599,7 +599,7 @@ e.g. \"tcolorboxlib-raster.el\"."
(TeX-arg-key-val LaTeX-tcolorbox-keyval-options-local))
'("tcbox"
- [ TeX-arg-eval TeX-read-key-val optional
+ [ TeX-arg-eval TeX-read-key-val t
(append
LaTeX-tcolorbox-tcbox-options
LaTeX-tcolorbox-keyval-options-local) ]
@@ -614,7 +614,7 @@ e.g. \"tcolorboxlib-raster.el\"."
'("renewtcolorbox"
[ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color box")
+ (TeX-argument-prompt nil nil "Color box")
(LaTeX-tcolorbox-newtcolorbox-list))
[ TeX-arg-define-macro-arguments ]
(TeX-arg-key-val LaTeX-tcolorbox-keyval-options-local))
@@ -630,7 +630,7 @@ e.g. \"tcolorboxlib-raster.el\"."
(TeX-arg-eval
(lambda ()
(let ((macro (completing-read
- (TeX-argument-prompt optional nil "Macro: \\" t)
+ (TeX-argument-prompt nil nil "Macro: \\" t)
(LaTeX-tcolorbox-newtcbox-list))))
(concat TeX-esc macro))))
[ TeX-arg-define-macro-arguments ]
@@ -652,7 +652,7 @@ e.g. \"tcolorboxlib-raster.el\"."
;; 5.2 Lists of tcolorboxes
'("tcblistof"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Macro")
+ (TeX-argument-prompt t nil "Macro")
(if (< (LaTeX-largest-level) 2)
'("\\chapter" "\\section" "\\subsection"
"\\subsubsection")
'("\\section" "\\subsection" "\\subsubsection")) ]
diff --git a/style/tex-live.el b/style/tex-live.el
index 5371b0b..fc8d76a 100644
--- a/style/tex-live.el
+++ b/style/tex-live.el
@@ -78,7 +78,7 @@
'("boxedverbatiminput" LaTeX-fancyvrb-arg-file-relative)
'("listinginput"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Value of firstnumber
key")
+ (TeX-argument-prompt nil nil "Value of firstnumber key")
(cadr (assoc "firstnumber"
LaTeX-fancyvrb-key-val-options-local)))
LaTeX-fancyvrb-arg-file-relative)
@@ -91,7 +91,7 @@
'("filename" "Directory")
'("envname"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Environment")
+ (TeX-argument-prompt nil nil "Environment")
'("TEXMFCACHE"
"TEXMFCNF"
"TEXMFCONFIG"
diff --git a/style/thmtools.el b/style/thmtools.el
index 438f3e1..334fccc 100644
--- a/style/thmtools.el
+++ b/style/thmtools.el
@@ -270,7 +270,7 @@ RefTeX users should customize or add ENVIRONMENT to
'("ignoretheorems"
(TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Environment(s)")
+ (TeX-argument-prompt nil nil "Environment(s)")
(append
;; check for \newtheorem from amsthm.sty:
(when (and (fboundp 'LaTeX-amsthm-newtheorem-list)
diff --git a/style/titleps.el b/style/titleps.el
index e6514f5..c53bee8 100644
--- a/style/titleps.el
+++ b/style/titleps.el
@@ -78,7 +78,7 @@ Removal is based on the return value of function
(TeX-arg-eval
(lambda ()
(let ((ps (TeX-read-string
- (TeX-argument-prompt optional nil "Page style"))))
+ (TeX-argument-prompt nil nil "Page style"))))
(LaTeX-add-pagestyles ps)
(format "%s" ps))))
(TeX-arg-conditional (y-or-n-p "With optional global style? ")
@@ -106,14 +106,14 @@ Removal is based on the return value of function
'("settitlemarks"
(TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Level names")
+ (TeX-argument-prompt nil nil "Level names")
(LaTeX-titleps-section-command-list))
","))
'("settitlemarks"
(TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Level names")
+ (TeX-argument-prompt nil nil "Level names")
(LaTeX-titleps-section-command-list))
","))
@@ -140,12 +140,12 @@ Removal is based on the return value of function
'("TitlepsPatchSection"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titleps-section-command-list)))
'("TitlepsPatchSection*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titleps-section-command-list)))
;; 5. Marks
@@ -161,13 +161,13 @@ Removal is based on the return value of function
'("pretitlemark"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titleps-section-command-list))
"Text")
'("pretitlemark*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titleps-section-command-list))
"Text")
diff --git a/style/titlesec.el b/style/titlesec.el
index 1d88bf8..3e67546 100644
--- a/style/titlesec.el
+++ b/style/titlesec.el
@@ -121,7 +121,7 @@ insert the argument in brackets."
'("titleformat"
(LaTeX-arg-titlesec-titlespec)
[TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Shape")
+ (TeX-argument-prompt t nil "Shape")
LaTeX-titlesec-section-shape-list]
(TeX-arg-conditional (y-or-n-p "With optional after-code? ")
(4 [nil])
@@ -158,7 +158,7 @@ insert the argument in brackets."
;; 3.4. Rules
'("titleline"
[TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Alignment")
+ (TeX-argument-prompt t nil "Alignment")
'("l" "r" "c")]
t)
@@ -171,20 +171,20 @@ insert the argument in brackets."
;; 3.5. Page styles
'("assignpagestyle"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titlesec-section-command-list))
(TeX-arg-pagestyle))
;; 3.9. Creating new levels and changing the class
'("titleclass"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titlesec-section-command-list))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Class")
+ (TeX-argument-prompt nil nil "Class")
'("page" "top" "straight"))
[TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Super level command")
+ (TeX-argument-prompt t nil "Super level command")
(LaTeX-titlesec-section-command-list)]) )
;; 3.4. Rules: A variant of \titleline to be used only with calcwidth
@@ -192,7 +192,7 @@ insert the argument in brackets."
(TeX-add-symbols
'("titleline*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Alignment")
+ (TeX-argument-prompt nil nil "Alignment")
'("l" "r" "c"))
t)))
diff --git a/style/titletoc.el b/style/titletoc.el
index 9151005..2962397 100644
--- a/style/titletoc.el
+++ b/style/titletoc.el
@@ -99,7 +99,7 @@ Removal is based on the return value of function
;; {<label width>}{<leader width>}
'("dottedcontents"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titletoc-section-command-list))
[ TeX-arg-length "Left margin" ] 3)
@@ -108,7 +108,7 @@ Removal is based on the return value of function
;; {<filler-page-format>}[<below-code>]
'("titlecontents"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titletoc-section-command-list))
[ TeX-arg-length "Left margin" ]
(TeX-arg-conditional (y-or-n-p "With optional below code argument? ")
@@ -120,7 +120,7 @@ Removal is based on the return value of function
;; {<filler-page-format>}[<separator>]
'("titlecontents*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Sectioning command")
+ (TeX-argument-prompt nil nil "Sectioning command")
(LaTeX-titletoc-section-command-list))
[ TeX-arg-length "Left margin" ]
(TeX-arg-conditional (y-or-n-p "With optional separator argument? ")
@@ -151,11 +151,11 @@ Removal is based on the return value of function
(let ((name (if (and (member "newfloat" (TeX-active-styles))
(LaTeX-newfloat-DeclareFloatingEnvironment-list))
(completing-read
- (TeX-argument-prompt optional nil "Name of contents")
+ (TeX-argument-prompt nil nil "Name of contents")
(mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
(TeX-read-string
- (TeX-argument-prompt optional nil "Name of
contents")))))
+ (TeX-argument-prompt nil nil "Name of contents")))))
(make-local-variable 'LaTeX-titletoc-section-command-list)
(add-to-list 'LaTeX-titletoc-section-command-list name)
(format "%s" name))))
diff --git a/style/xcolor.el b/style/xcolor.el
index bfdda99..e56da7b 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -231,7 +231,7 @@ If NO-NAMED is non-nil, remove \"named\" and return the
remainder."
(if no-named
(remove "named" LaTeX-xcolor-color-models)
- (symbol-value 'LaTeX-xcolor-color-models)))
+ LaTeX-xcolor-color-models))
;; Needed for auto-parsing.
(require 'tex)
@@ -418,19 +418,19 @@ xcolor package.")
;; \colorlet[<type>]{<name>}[<num model>]{<color>}
'("colorlet"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Type")
- LaTeX-xcolor-type-color-models ]
+ (TeX-argument-prompt t nil "Type")
+ LaTeX-xcolor-type-color-models ]
(TeX-arg-eval
(lambda ()
(let ((xcolor (TeX-read-string
- (TeX-argument-prompt optional nil "Color"))))
+ (TeX-argument-prompt nil nil "Color"))))
(LaTeX-add-xcolor-definecolors xcolor)
(format "%s" xcolor))))
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Model")
- (LaTeX-xcolor-color-models t) ]
+ (TeX-argument-prompt t nil "Model")
+ (LaTeX-xcolor-color-models t) ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color")
+ (TeX-argument-prompt nil nil "Color")
(LaTeX-xcolor-definecolor-list)))
;; 2.5.3 Defining sets of colors
@@ -488,30 +488,30 @@ xcolor package.")
;; 2.7 Color blending
'("blendcolors"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mix expr")
+ (TeX-argument-prompt nil nil "Mix expr")
(LaTeX-xcolor-definecolor-list)))
'("blendcolors*"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Mix expr")
+ (TeX-argument-prompt nil nil "Mix expr")
(LaTeX-xcolor-definecolor-list)))
;; 2.8 Color masks and separation
'("maskcolors"
[ TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt t nil "Model")
(LaTeX-xcolor-color-models t) ]
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color")
+ (TeX-argument-prompt nil nil "Color")
(LaTeX-xcolor-definecolor-list)))
;; 2.9 Color series
'("definecolorseries"
"Name"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Core model")
+ (TeX-argument-prompt nil nil "Core model")
LaTeX-xcolor-core-color-models)
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Method")
+ (TeX-argument-prompt nil nil "Method")
'("step" "grad" "last"))
[ t ] nil [ nil ] nil)
@@ -521,14 +521,14 @@ xcolor package.")
;; \extractcolorspec{<color>}{<cmd>}
'("extractcolorspec"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color")
+ (TeX-argument-prompt nil nil "Color")
(LaTeX-xcolor-definecolor-list))
(TeX-arg-define-macro "Command: \\"))
;; \extractcolorspecs{<color>}{<model-cmd>}{<color-cmd>}
'("extractcolorspecs"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Color")
+ (TeX-argument-prompt nil nil "Color")
(LaTeX-xcolor-definecolor-list))
(TeX-arg-define-macro "Model command: \\")
(TeX-arg-define-macro "Color command: \\"))
@@ -541,12 +541,12 @@ xcolor package.")
;; \convertcolorspec{<model>}{<spec>}{<target model>}{cmd>}
'("convertcolorspec"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt nil nil "Model")
(LaTeX-xcolor-color-models))
(TeX-arg-eval TeX-read-string
- (TeX-argument-prompt optional nil "Spec"))
+ (TeX-argument-prompt nil nil "Spec"))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Model")
+ (TeX-argument-prompt nil nil "Model")
(LaTeX-xcolor-color-models t))
(TeX-arg-define-macro "Macro: \\")) ) ; close TeX-add-symbols
@@ -565,10 +565,10 @@ xcolor package.")
(ignore))
"Row"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Odd-row color")
+ (TeX-argument-prompt nil nil "Odd-row color")
(LaTeX-xcolor-definecolor-list))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Even-row color")
+ (TeX-argument-prompt nil nil "Even-row color")
(LaTeX-xcolor-definecolor-list)))
'("rowcolors*"
(TeX-arg-conditional (y-or-n-p "With optional commands? ")
@@ -576,10 +576,10 @@ xcolor package.")
(ignore))
"Row"
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Odd-row color")
+ (TeX-argument-prompt nil nil "Odd-row color")
(LaTeX-xcolor-definecolor-list))
(TeX-arg-eval completing-read
- (TeX-argument-prompt optional nil "Even-row color")
+ (TeX-argument-prompt nil nil "Even-row color")
(LaTeX-xcolor-definecolor-list)))
'("showrowcolors" 0)
'("hiderowcolors" 0))
@@ -589,8 +589,8 @@ xcolor package.")
(LaTeX-add-environments
'("testcolors" LaTeX-env-args
[ TeX-arg-eval mapconcat #'identity
- (TeX-completing-read-multiple
- (TeX-argument-prompt optional nil "Color models")
+ (TeX-completing-read-multiple
+ (TeX-argument-prompt t nil "Color models")
(LaTeX-xcolor-color-models t))
"," ] ))
