branch: externals/auctex
commit ee04c04677a1a30baeaab6322bfceec6091e802c
Merge: 51c960c d77538b
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Merge remote-tracking branch 'origin/master' into externals/auctex
---
doc/auctex.texi | 2 +-
doc/changes.texi | 9 ++
doc/faq.texi | 2 +-
doc/quickstart.texi | 2 +-
latex.el | 256 ++++++++++++++++++++++++++--------------------------
style/beamer.el | 3 +
style/brazilian.el | 8 +-
style/currvita.el | 12 +--
style/ltugboat.el | 4 +-
style/ltxguide.el | 8 +-
style/marginnote.el | 16 ++--
style/mflogo.el | 6 +-
style/minted.el | 17 ++--
style/multicol.el | 27 +++---
style/portuguese.el | 8 +-
style/xparse.el | 20 ++--
16 files changed, 205 insertions(+), 195 deletions(-)
diff --git a/doc/auctex.texi b/doc/auctex.texi
index c5d36ff..5f8df63 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -87,7 +87,7 @@ it easy to find the errors that may slip through anyway.
It is a good idea to make a printout of @AUCTeX{}'s reference card
@file{tex-ref.tex} or one of its typeset versions.
-If you want to make @AUCTeX{} aware of style files and multi-file
+If you want to make @AUCTeX{} aware of style files and multifile
documents right away, insert the following in your init file (usually
@file{~/.emacs.d/init.el}).
diff --git a/doc/changes.texi b/doc/changes.texi
index c702341..64bf838 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -110,6 +110,15 @@ The style @file{latexinfo.el} is removed from @AUCTeX{}.
@AUCTeX{} has preliminary support for @LaTeX{}-hooks. Hooks provided by
@LaTeX{} kernel are known and available for completion in
@samp{\AddToHook}, @samp{\RemoveFromHook} and @samp{\AddToHookNext}.
+
+@item
+@AUCTeX{} is now able to place all generated output files, including those
+that are produced by applications running under @AUCTeX{}, temporary files
+related to region processing and @previewlatex{} files, in an output
+directory. To use this feature, set the new user option
+@code{TeX-output-dir} to the absolute path of the output directory or a
+relative path which would be interpreted as being relative to the master
+file in a multifile document.
@end itemize
@heading News in 12.3
diff --git a/doc/faq.texi b/doc/faq.texi
index 9afa4ba..a9b2aa2 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -71,7 +71,7 @@ the file @file{INSTALL.windows}
@end ifclear
@item
-Why doesn't the completion, style file, or multi-file stuff work?
+Why doesn't the completion, style file, or multifile stuff work?
It must be enabled first, insert this in your init file:
diff --git a/doc/quickstart.texi b/doc/quickstart.texi
index 874b4eb..9731d15 100644
--- a/doc/quickstart.texi
+++ b/doc/quickstart.texi
@@ -48,7 +48,7 @@ be achieved by putting
@end lisp
@noindent
into your init file. Finally, if you often use @code{\include} or
-@code{\input}, you should make @AUCTeX{} aware of the multi-file
+@code{\input}, you should make @AUCTeX{} aware of the multifile
document structure. You can do this by inserting
@lisp
diff --git a/latex.el b/latex.el
index ded745f..8ce8c6e 100644
--- a/latex.el
+++ b/latex.el
@@ -6964,7 +6964,7 @@ function would return non-nil and `(match-string 1)'
would return
"enumiv" "footnote" "mpfootnote")
(LaTeX-add-lengths "arraycolsep" "arrayrulewidth" "baselineskip"
"baselinestretch"
- "bibindent" "columnsep" "columnwidth" "doublerulesep"
+ "bibindent" "columnsep" "columnseprule" "columnwidth"
"doublerulesep"
"evensidemargin" "linewidth" "oddsidemargin" "paperwidth"
"paperheight" "parindent" "parskip" "tabcolsep"
"textheight" "textwidth" "topmargin" "unitlength")
@@ -7214,133 +7214,133 @@ function would return non-nil and `(match-string 1)'
would return
;; With the advent of LaTeX2e release 2020-02-02, all symbols
;; provided by textcomp.sty are available out of the box by the
;; kernel. The next block is moved here from textcomp.el:
- '("capitalgrave" 0) ; Type: Accent -- Slot: 0
- '("capitalacute" 0) ; Type: Accent -- Slot: 1
- '("capitalcircumflex" 0) ; Type: Accent -- Slot: 2
- '("capitaltilde" 0) ; Type: Accent -- Slot: 3
- '("capitaldieresis" 0) ; Type: Accent -- Slot: 4
- '("capitalhungarumlaut" 0) ; Type: Accent -- Slot: 5
- '("capitalring" 0) ; Type: Accent -- Slot: 6
- '("capitalcaron" 0) ; Type: Accent -- Slot: 7
- '("capitalbreve" 0) ; Type: Accent -- Slot: 8
- '("capitalmacron" 0) ; Type: Accent -- Slot: 9
- '("capitaldotaccent" 0) ; Type: Accent -- Slot: 10
- '("textquotestraightbase" 0) ; Type: Symbol -- Slot: 13
- '("textquotestraightdblbase" 0) ; Type: Symbol -- Slot: 18
- '("texttwelveudash" 0) ; Type: Symbol -- Slot: 21
- '("textthreequartersemdash" 0) ; Type: Symbol -- Slot: 22
- '("textcapitalcompwordmark" 0) ; Type: Symbol -- Slot: 23
- '("textleftarrow" 0) ; Type: Symbol -- Slot: 24
- '("textrightarrow" 0) ; Type: Symbol -- Slot: 25
- '("t" 0) ; Type: Accent -- Slot: 26
- '("capitaltie" 0) ; Type: Accent -- Slot: 27
- '("newtie" 0) ; Type: Accent -- Slot: 28
- '("capitalnewtie" 0) ; Type: Accent -- Slot: 29
- '("textascendercompwordmark" 0) ; Type: Symbol -- Slot: 31
- '("textblank" 0) ; Type: Symbol -- Slot: 32
- '("textdollar" 0) ; Type: Symbol -- Slot: 36
- '("textquotesingle" 0) ; Type: Symbol -- Slot: 39
- '("textasteriskcentered" 0) ; Type: Symbol -- Slot: 42
- '("textdblhyphen" 0) ; Type: Symbol -- Slot: 45
- '("textfractionsolidus" 0) ; Type: Symbol -- Slot: 47
- '("textzerooldstyle" 0) ; Type: Symbol -- Slot: 48
- '("textoneoldstyle" 0) ; Type: Symbol -- Slot: 49
- '("texttwooldstyle" 0) ; Type: Symbol -- Slot: 50
- '("textthreeoldstyle" 0) ; Type: Symbol -- Slot: 51
- '("textfouroldstyle" 0) ; Type: Symbol -- Slot: 52
- '("textfiveoldstyle" 0) ; Type: Symbol -- Slot: 53
- '("textsixoldstyle" 0) ; Type: Symbol -- Slot: 54
- '("textsevenoldstyle" 0) ; Type: Symbol -- Slot: 55
- '("texteightoldstyle" 0) ; Type: Symbol -- Slot: 56
- '("textnineoldstyle" 0) ; Type: Symbol -- Slot: 57
- '("textlangle" 0) ; Type: Symbol -- Slot: 60
- '("textminus" 0) ; Type: Symbol -- Slot: 61
- '("textrangle" 0) ; Type: Symbol -- Slot: 62
- '("textmho" 0) ; Type: Symbol -- Slot: 77
- '("textbigcircle" 0) ; Type: Symbol -- Slot: 79
- '("textohm" 0) ; Type: Symbol -- Slot: 87
- '("textlbrackdbl" 0) ; Type: Symbol -- Slot: 91
- '("textrbrackdbl" 0) ; Type: Symbol -- Slot: 93
- '("textuparrow" 0) ; Type: Symbol -- Slot: 94
- '("textdownarrow" 0) ; Type: Symbol -- Slot: 95
- '("textasciigrave" 0) ; Type: Symbol -- Slot: 96
- '("textborn" 0) ; Type: Symbol -- Slot: 98
- '("textdivorced" 0) ; Type: Symbol -- Slot: 99
- '("textdied" 0) ; Type: Symbol -- Slot: 100
- '("textleaf" 0) ; Type: Symbol -- Slot: 108
- '("textmarried" 0) ; Type: Symbol -- Slot: 109
- '("textmusicalnote" 0) ; Type: Symbol -- Slot: 110
- '("texttildelow" 0) ; Type: Symbol -- Slot: 126
- '("textdblhyphenchar" 0) ; Type: Symbol -- Slot: 127
- '("textasciibreve" 0) ; Type: Symbol -- Slot: 128
- '("textasciicaron" 0) ; Type: Symbol -- Slot: 129
- '("textacutedbl" 0) ; Type: Symbol -- Slot: 130
- '("textgravedbl" 0) ; Type: Symbol -- Slot: 131
- '("textdagger" 0) ; Type: Symbol -- Slot: 132
- '("textdaggerdbl" 0) ; Type: Symbol -- Slot: 133
- '("textbardbl" 0) ; Type: Symbol -- Slot: 134
- '("textperthousand" 0) ; Type: Symbol -- Slot: 135
- '("textbullet" 0) ; Type: Symbol -- Slot: 136
- '("textcelsius" 0) ; Type: Symbol -- Slot: 137
- '("textdollaroldstyle" 0) ; Type: Symbol -- Slot: 138
- '("textcentoldstyle" 0) ; Type: Symbol -- Slot: 139
- '("textflorin" 0) ; Type: Symbol -- Slot: 140
- '("textcolonmonetary" 0) ; Type: Symbol -- Slot: 141
- '("textwon" 0) ; Type: Symbol -- Slot: 142
- '("textnaira" 0) ; Type: Symbol -- Slot: 143
- '("textguarani" 0) ; Type: Symbol -- Slot: 144
- '("textpeso" 0) ; Type: Symbol -- Slot: 145
- '("textlira" 0) ; Type: Symbol -- Slot: 146
- '("textrecipe" 0) ; Type: Symbol -- Slot: 147
- '("textinterrobang" 0) ; Type: Symbol -- Slot: 148
- '("textinterrobangdown" 0) ; Type: Symbol -- Slot: 149
- '("textdong" 0) ; Type: Symbol -- Slot: 150
- '("texttrademark" 0) ; Type: Symbol -- Slot: 151
- '("textpertenthousand" 0) ; Type: Symbol -- Slot: 152
- '("textpilcrow" 0) ; Type: Symbol -- Slot: 153
- '("textbaht" 0) ; Type: Symbol -- Slot: 154
- '("textnumero" 0) ; Type: Symbol -- Slot: 155
- '("textdiscount" 0) ; Type: Symbol -- Slot: 156
- '("textestimated" 0) ; Type: Symbol -- Slot: 157
- '("textopenbullet" 0) ; Type: Symbol -- Slot: 158
- '("textservicemark" 0) ; Type: Symbol -- Slot: 159
- '("textlquill" 0) ; Type: Symbol -- Slot: 160
- '("textrquill" 0) ; Type: Symbol -- Slot: 161
- '("textcent" 0) ; Type: Symbol -- Slot: 162
- '("textsterling" 0) ; Type: Symbol -- Slot: 163
- '("textcurrency" 0) ; Type: Symbol -- Slot: 164
- '("textyen" 0) ; Type: Symbol -- Slot: 165
- '("textbrokenbar" 0) ; Type: Symbol -- Slot: 166
- '("textsection" 0) ; Type: Symbol -- Slot: 167
- '("textasciidieresis" 0) ; Type: Symbol -- Slot: 168
- '("textcopyright" 0) ; Type: Symbol -- Slot: 169
- '("textordfeminine" 0) ; Type: Symbol -- Slot: 170
- '("textcopyleft" 0) ; Type: Symbol -- Slot: 171
- '("textlnot" 0) ; Type: Symbol -- Slot: 172
- '("textcircledP" 0) ; Type: Symbol -- Slot: 173
- '("textregistered" 0) ; Type: Symbol -- Slot: 174
- '("textasciimacron" 0) ; Type: Symbol -- Slot: 175
- '("textdegree" 0) ; Type: Symbol -- Slot: 176
- '("textpm" 0) ; Type: Symbol -- Slot: 177
- '("texttwosuperior" 0) ; Type: Symbol -- Slot: 178
- '("textthreesuperior" 0) ; Type: Symbol -- Slot: 179
- '("textasciiacute" 0) ; Type: Symbol -- Slot: 180
- '("textmu" 0) ; Type: Symbol -- Slot: 181
- '("textparagraph" 0) ; Type: Symbol -- Slot: 182
- '("textperiodcentered" 0) ; Type: Symbol -- Slot: 183
- '("textreferencemark" 0) ; Type: Symbol -- Slot: 184
- '("textonesuperior" 0) ; Type: Symbol -- Slot: 185
- '("textordmasculine" 0) ; Type: Symbol -- Slot: 186
- '("textsurd" 0) ; Type: Symbol -- Slot: 187
- '("textonequarter" 0) ; Type: Symbol -- Slot: 188
- '("textonehalf" 0) ; Type: Symbol -- Slot: 189
- '("textthreequarters" 0) ; Type: Symbol -- Slot: 190
- '("texteuro" 0) ; Type: Symbol -- Slot: 191
- '("texttimes" 0) ; Type: Symbol -- Slot: 214
- '("textdiv" 0) ; Type: Symbol -- Slot: 246
- '("textcircled" 1) ; Type: Command -- Slot: N/A
- '("capitalcedilla" 1) ; Type: Command -- Slot: N/A
- '("capitalogonek" 1) ; Type: Command -- Slot: N/A
+ "capitalgrave" ; Type: Accent -- Slot: 0
+ "capitalacute" ; Type: Accent -- Slot: 1
+ "capitalcircumflex" ; Type: Accent -- Slot: 2
+ "capitaltilde" ; Type: Accent -- Slot: 3
+ "capitaldieresis" ; Type: Accent -- Slot: 4
+ "capitalhungarumlaut" ; Type: Accent -- Slot: 5
+ "capitalring" ; Type: Accent -- Slot: 6
+ "capitalcaron" ; Type: Accent -- Slot: 7
+ "capitalbreve" ; Type: Accent -- Slot: 8
+ "capitalmacron" ; Type: Accent -- Slot: 9
+ "capitaldotaccent" ; Type: Accent -- Slot: 10
+ "textquotestraightbase" ; Type: Symbol -- Slot: 13
+ "textquotestraightdblbase" ; Type: Symbol -- Slot: 18
+ "texttwelveudash" ; Type: Symbol -- Slot: 21
+ "textthreequartersemdash" ; Type: Symbol -- Slot: 22
+ "textcapitalcompwordmark" ; Type: Symbol -- Slot: 23
+ "textleftarrow" ; Type: Symbol -- Slot: 24
+ "textrightarrow" ; Type: Symbol -- Slot: 25
+ "t" ; Type: Accent -- Slot: 26
+ "capitaltie" ; Type: Accent -- Slot: 27
+ "newtie" ; Type: Accent -- Slot: 28
+ "capitalnewtie" ; Type: Accent -- Slot: 29
+ "textascendercompwordmark" ; Type: Symbol -- Slot: 31
+ "textblank" ; Type: Symbol -- Slot: 32
+ "textdollar" ; Type: Symbol -- Slot: 36
+ "textquotesingle" ; Type: Symbol -- Slot: 39
+ "textasteriskcentered" ; Type: Symbol -- Slot: 42
+ "textdblhyphen" ; Type: Symbol -- Slot: 45
+ "textfractionsolidus" ; Type: Symbol -- Slot: 47
+ "textzerooldstyle" ; Type: Symbol -- Slot: 48
+ "textoneoldstyle" ; Type: Symbol -- Slot: 49
+ "texttwooldstyle" ; Type: Symbol -- Slot: 50
+ "textthreeoldstyle" ; Type: Symbol -- Slot: 51
+ "textfouroldstyle" ; Type: Symbol -- Slot: 52
+ "textfiveoldstyle" ; Type: Symbol -- Slot: 53
+ "textsixoldstyle" ; Type: Symbol -- Slot: 54
+ "textsevenoldstyle" ; Type: Symbol -- Slot: 55
+ "texteightoldstyle" ; Type: Symbol -- Slot: 56
+ "textnineoldstyle" ; Type: Symbol -- Slot: 57
+ "textlangle" ; Type: Symbol -- Slot: 60
+ "textminus" ; Type: Symbol -- Slot: 61
+ "textrangle" ; Type: Symbol -- Slot: 62
+ "textmho" ; Type: Symbol -- Slot: 77
+ "textbigcircle" ; Type: Symbol -- Slot: 79
+ "textohm" ; Type: Symbol -- Slot: 87
+ "textlbrackdbl" ; Type: Symbol -- Slot: 91
+ "textrbrackdbl" ; Type: Symbol -- Slot: 93
+ "textuparrow" ; Type: Symbol -- Slot: 94
+ "textdownarrow" ; Type: Symbol -- Slot: 95
+ "textasciigrave" ; Type: Symbol -- Slot: 96
+ "textborn" ; Type: Symbol -- Slot: 98
+ "textdivorced" ; Type: Symbol -- Slot: 99
+ "textdied" ; Type: Symbol -- Slot: 100
+ "textleaf" ; Type: Symbol -- Slot: 108
+ "textmarried" ; Type: Symbol -- Slot: 109
+ "textmusicalnote" ; Type: Symbol -- Slot: 110
+ "texttildelow" ; Type: Symbol -- Slot: 126
+ "textdblhyphenchar" ; Type: Symbol -- Slot: 127
+ "textasciibreve" ; Type: Symbol -- Slot: 128
+ "textasciicaron" ; Type: Symbol -- Slot: 129
+ "textacutedbl" ; Type: Symbol -- Slot: 130
+ "textgravedbl" ; Type: Symbol -- Slot: 131
+ "textdagger" ; Type: Symbol -- Slot: 132
+ "textdaggerdbl" ; Type: Symbol -- Slot: 133
+ "textbardbl" ; Type: Symbol -- Slot: 134
+ "textperthousand" ; Type: Symbol -- Slot: 135
+ "textbullet" ; Type: Symbol -- Slot: 136
+ "textcelsius" ; Type: Symbol -- Slot: 137
+ "textdollaroldstyle" ; Type: Symbol -- Slot: 138
+ "textcentoldstyle" ; Type: Symbol -- Slot: 139
+ "textflorin" ; Type: Symbol -- Slot: 140
+ "textcolonmonetary" ; Type: Symbol -- Slot: 141
+ "textwon" ; Type: Symbol -- Slot: 142
+ "textnaira" ; Type: Symbol -- Slot: 143
+ "textguarani" ; Type: Symbol -- Slot: 144
+ "textpeso" ; Type: Symbol -- Slot: 145
+ "textlira" ; Type: Symbol -- Slot: 146
+ "textrecipe" ; Type: Symbol -- Slot: 147
+ "textinterrobang" ; Type: Symbol -- Slot: 148
+ "textinterrobangdown" ; Type: Symbol -- Slot: 149
+ "textdong" ; Type: Symbol -- Slot: 150
+ "texttrademark" ; Type: Symbol -- Slot: 151
+ "textpertenthousand" ; Type: Symbol -- Slot: 152
+ "textpilcrow" ; Type: Symbol -- Slot: 153
+ "textbaht" ; Type: Symbol -- Slot: 154
+ "textnumero" ; Type: Symbol -- Slot: 155
+ "textdiscount" ; Type: Symbol -- Slot: 156
+ "textestimated" ; Type: Symbol -- Slot: 157
+ "textopenbullet" ; Type: Symbol -- Slot: 158
+ "textservicemark" ; Type: Symbol -- Slot: 159
+ "textlquill" ; Type: Symbol -- Slot: 160
+ "textrquill" ; Type: Symbol -- Slot: 161
+ "textcent" ; Type: Symbol -- Slot: 162
+ "textsterling" ; Type: Symbol -- Slot: 163
+ "textcurrency" ; Type: Symbol -- Slot: 164
+ "textyen" ; Type: Symbol -- Slot: 165
+ "textbrokenbar" ; Type: Symbol -- Slot: 166
+ "textsection" ; Type: Symbol -- Slot: 167
+ "textasciidieresis" ; Type: Symbol -- Slot: 168
+ "textcopyright" ; Type: Symbol -- Slot: 169
+ "textordfeminine" ; Type: Symbol -- Slot: 170
+ "textcopyleft" ; Type: Symbol -- Slot: 171
+ "textlnot" ; Type: Symbol -- Slot: 172
+ "textcircledP" ; Type: Symbol -- Slot: 173
+ "textregistered" ; Type: Symbol -- Slot: 174
+ "textasciimacron" ; Type: Symbol -- Slot: 175
+ "textdegree" ; Type: Symbol -- Slot: 176
+ "textpm" ; Type: Symbol -- Slot: 177
+ "texttwosuperior" ; Type: Symbol -- Slot: 178
+ "textthreesuperior" ; Type: Symbol -- Slot: 179
+ "textasciiacute" ; Type: Symbol -- Slot: 180
+ "textmu" ; Type: Symbol -- Slot: 181
+ "textparagraph" ; Type: Symbol -- Slot: 182
+ "textperiodcentered" ; Type: Symbol -- Slot: 183
+ "textreferencemark" ; Type: Symbol -- Slot: 184
+ "textonesuperior" ; Type: Symbol -- Slot: 185
+ "textordmasculine" ; Type: Symbol -- Slot: 186
+ "textsurd" ; Type: Symbol -- Slot: 187
+ "textonequarter" ; Type: Symbol -- Slot: 188
+ "textonehalf" ; Type: Symbol -- Slot: 189
+ "textthreequarters" ; Type: Symbol -- Slot: 190
+ "texteuro" ; Type: Symbol -- Slot: 191
+ "texttimes" ; Type: Symbol -- Slot: 214
+ "textdiv" ; Type: Symbol -- Slot: 246
+ '("textcircled" 1) ; Type: Command -- Slot: N/A
+ '("capitalcedilla" 1) ; Type: Command -- Slot: N/A
+ '("capitalogonek" 1) ; Type: Command -- Slot: N/A
"rmfamily" "sffamily" "ttfamily"
'("mdseries" -1) '("bfseries" -1)
diff --git a/style/beamer.el b/style/beamer.el
index 36f15d7..589a26a 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -152,6 +152,9 @@
(LaTeX-find-matching-begin)
(end-of-line)
(LaTeX-newline)
+ ;; Indent the next macro insertion and don't
+ ;; rely on the fill-function to do it:
+ (indent-according-to-mode)
(insert (format "\\frametitle{%s}" title))
;; This works because \frametitle is a
;; paragraph command.
diff --git a/style/brazilian.el b/style/brazilian.el
index 5124e66..c1ae802 100644
--- a/style/brazilian.el
+++ b/style/brazilian.el
@@ -61,10 +61,10 @@
(setq TeX-quote-language nil))
(setq LaTeX-babel-hyphen-language "brazilian")
(TeX-add-symbols
- '("ord" 0)
- '("ro" 0)
- '("orda" 0)
- '("ra" 0))
+ "ord"
+ "ro"
+ "orda"
+ "ra")
;; Fontification
(when (and (eq TeX-install-font-lock 'font-latex-setup)
(featurep 'font-latex))
diff --git a/style/currvita.el b/style/currvita.el
index 62aa51f..f1f27a3 100644
--- a/style/currvita.el
+++ b/style/currvita.el
@@ -1,6 +1,6 @@
;;; currvita.el --- AUCTeX style for `currvita.sty' (v0.9i) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015, 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-de...@gnu.org
@@ -81,11 +81,11 @@
;; General commands: "\date" is already provided by AUCTeX
(TeX-add-symbols
- '("cvplace" t)
- '("cvheadingfont" 0)
- '("cvlistheadingfont" 0)
- '("cvlabelfont" 0)
- '("cvbibname" 0))
+ '("cvplace" t)
+ "cvheadingfont"
+ "cvlistheadingfont"
+ "cvlabelfont"
+ "cvbibname")
;; Add new lengths defined by currvita.sty
(LaTeX-add-lengths "cvlabelwidth" "cvlabelskip" "cvlabelsep"))
diff --git a/style/ltugboat.el b/style/ltugboat.el
index 25464c4..7511e52 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, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019--2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-de...@gnu.org
@@ -240,7 +240,7 @@
"XSLT"
;; 10.2 Other special typesetting
- '("Dash" 0)
+ "Dash"
'("cs" (TeX-arg-eval let ((macro (completing-read
(TeX-argument-prompt nil nil
"Command")
diff --git a/style/ltxguide.el b/style/ltxguide.el
index 50b5ee3..a30a2a7 100644
--- a/style/ltxguide.el
+++ b/style/ltxguide.el
@@ -1,6 +1,6 @@
;;; ltxguide.el --- AUCTeX style for `ltxguide.cls' (2001/05/28) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2020, 2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-de...@gnu.org
@@ -38,6 +38,8 @@
(declare-function font-latex-add-keywords
"font-latex"
(keywords class))
+(declare-function font-latex-set-syntactic-keywords
+ "font-latex")
(defvar LaTeX-article-class-options)
@@ -112,7 +114,9 @@ For decl environment provided by ltxguide.cls."
("NEWdescription" "{"))
'textual)
(font-latex-add-keywords '(("URL" ""))
- 'reference)))
+ 'reference)
+ ;; Tell font-lock about the update.
+ (font-latex-set-syntactic-keywords)))
TeX-dialect)
(defvar LaTeX-ltxguide-class-options
diff --git a/style/marginnote.el b/style/marginnote.el
index 045baff..0a977da 100644
--- a/style/marginnote.el
+++ b/style/marginnote.el
@@ -1,6 +1,6 @@
;;; marginnote.el --- AUCTeX style for `marginnote.sty' (v1.4) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2018--2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-de...@gnu.org
@@ -46,15 +46,11 @@
'("marginnote" [ "Left margin text" ] "Text"
[ TeX-arg-length "Vertical offset" ] )
- '("marginnotetextwidth" 0)
-
- '("marginnotevadjust" 0)
-
- '("raggedleftmarginnote" 0)
-
- '("raggedrightmarginnote" 0)
-
- '("marginfont" 0))
+ "marginnotetextwidth"
+ "marginnotevadjust"
+ "raggedleftmarginnote"
+ "raggedrightmarginnote"
+ "marginfont")
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/mflogo.el b/style/mflogo.el
index 3e70976..c8d25d2 100644
--- a/style/mflogo.el
+++ b/style/mflogo.el
@@ -1,6 +1,6 @@
;;; mflogo.el --- AUCTeX style for `mflogo.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2012, 2019, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2019, 2020, 2021 Free Software Foundation, Inc.
;; Author: Mads Jensen <m...@inducks.org>
;; Maintainer: auctex-de...@gnu.org
@@ -43,8 +43,8 @@
(TeX-add-symbols
'("textlogo" "Text")
'("logofamily" -1)
- '("MF" 0)
- '("MP" 0))
+ "MF"
+ "MP")
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/minted.el b/style/minted.el
index dd4d545..41f63e6 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -1,6 +1,6 @@
;;; minted.el --- AUCTeX style for `minted.sty' (v2.5) -*- lexical-binding:
t; -*-
-;; Copyright (C) 2014-2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2021 Free Software Foundation, Inc.
;; Author: Tassilo Horn <t...@gnu.org>
;; Maintainer: auctex-de...@gnu.org
@@ -132,16 +132,15 @@
;; in a .tex file, Emacs asks to apply a variable which is not
;; safe and does not restore the frame; the splitted frame
;; remains. I couldn't figure out why, so for now, I add the
- ;; styles from Pygments version 2.5.2 here.
+ ;; styles from Pygments version 2.9 here.
("style" ("abap" "algol" "algol_nu" "arduino" "autumn"
"borland" "bw" "colorful" "default" "emacs"
- "friendly" "fruity" "igor" "inkpot" "lovelace"
- "manni" "monokai" "murphy" "native" "paraiso-dark"
- "paraiso-light" "pastie" "perldoc"
- "rainbow_dash" "rrt" "sas"
- "solarized-dark" "solarized-light" "stata"
- "stata-dark" "stata-light"
- "tango" "trac" "vim" "vs" "xcode"))
+ "friendly" "fruity" "gruvbox-dark" "gruvbox-light"
+ "igor" "inkpot" "lovelace" "manni" "material" "monokai"
+ "murphy" "native" "paraiso-dark" "paraiso-light"
+ "pastie" "perldoc" "rainbow_dash" "rrt" "sas"
+ "solarized-dark" "solarized-light" "stata" "stata-dark"
+ "stata-light" "tango" "trac" "vim" "vs" "xcode" "zenburn"))
("stepnumber")
("stepnumberfromfirst")
("stepnumberoffsetvalues" ("true" "false"))
diff --git a/style/multicol.el b/style/multicol.el
index 46b476c..d9f7284 100644
--- a/style/multicol.el
+++ b/style/multicol.el
@@ -1,6 +1,6 @@
;;; multicol.el --- AUCTeX style for `multicol.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2011, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2020, 2021 Free Software Foundation, Inc.
;; Author: Mads Jensen <m...@inducks.org>
;; Maintainer: auctex-de...@gnu.org
@@ -43,20 +43,19 @@
[ "Local value for \\premulticols" ]))
(TeX-add-symbols
- '("multicoltolerance" 0)
- '("multicolpretolerance" 0)
- '("premulticols" 0)
- '("postmulticols" 0)
- '("multicolsep" 0)
- '("multicolbaselineskip" 0)
- '("multicolovershoot" 0)
- '("multicolundershoot" 0)
- '("columnsep" 0)
- '("columnseprule" 0)
- '("columnseprulecolor" 0)
+ '("multicoltolerance" (TeX-arg-literal " = "))
+ '("multicolpretolerance" (TeX-arg-literal " = "))
+ "columnseprulecolor"
'("raggedcolumns" 0)
- '("flushcolumns" 0)
- "columnbreak"))
+ '("flushcolumns" 0)
+ '("columnbreak" 0))
+
+ (LaTeX-add-lengths "premulticols"
+ "postmulticols"
+ "multicolsep"
+ "multicolbaselineskip"
+ "multicolovershoot"
+ "multicolundershoot"))
TeX-dialect)
(defvar LaTeX-multicol-package-options
diff --git a/style/portuguese.el b/style/portuguese.el
index 1e8b4c8..6c93b5c 100644
--- a/style/portuguese.el
+++ b/style/portuguese.el
@@ -62,10 +62,10 @@
`("portuguese" "\"<" "\">" ,TeX-quote-after-quote)))
(setq LaTeX-babel-hyphen-language "portuguese")
(TeX-add-symbols
- '("ord" 0)
- '("ro" 0)
- '("orda" 0)
- '("ra" 0))
+ "ord"
+ "ro"
+ "orda"
+ "ra")
;; Fontification
(when (and (eq TeX-install-font-lock 'font-latex-setup)
(featurep 'font-latex))
diff --git a/style/xparse.el b/style/xparse.el
index b02b3f9..2a9dff4 100644
--- a/style/xparse.el
+++ b/style/xparse.el
@@ -125,14 +125,14 @@ TYPE is one of the symobols mac or env."
(push "Text" args))
;; r<token1><token2>
((looking-at-p "r")
- (re-search-forward "r\\(?:\\(.\\)\\(.\\)\\)" (+ (point) 3) t)
+ (re-search-forward "r\\(.\\)\\(.\\)" (+ (point) 3) t)
(push `(LaTeX-arg-xparse-query
,(match-string-no-properties 1)
,(match-string-no-properties 2))
args))
;; R<token1><token2>{default}
((looking-at-p "R")
- (re-search-forward "R\\(?:\\(.\\)\\(.\\)\\)" (+ (point) 3) t)
+ (re-search-forward "R\\(.\\)\\(.\\)" (+ (point) 3) t)
(forward-sexp)
(push `(LaTeX-arg-xparse-query
,(match-string-no-properties 1)
@@ -149,7 +149,7 @@ TYPE is one of the symobols mac or env."
(push (vector "Text") args))
;; d<token1><token2>
((looking-at-p "d")
- (re-search-forward "d\\(?:\\(.\\)\\(.\\)\\)" (+ (point) 3) t)
+ (re-search-forward "d\\(.\\)\\(.\\)" (+ (point) 3) t)
(push (vector #'LaTeX-arg-xparse-query
(match-string-no-properties 1)
(match-string-no-properties 2))
@@ -161,7 +161,7 @@ TYPE is one of the symobols mac or env."
(push (vector "Text") args))
;; D<token1><token2>{default}
((looking-at-p "D")
- (re-search-forward "D\\(?:\\(.\\)\\(.\\)\\)" (+ (point) 3) t)
+ (re-search-forward "D\\(.\\)\\(.\\)" (+ (point) 3) t)
(forward-sexp)
(push (vector #'LaTeX-arg-xparse-query
(match-string-no-properties 1)
@@ -261,14 +261,14 @@ TYPE is one of the symobols mac or env."
;; Testing special values
'("IfBooleanTF" 3)
- '("IfBooleanT" 3)
- '("IfBooleanF" 3)
+ '("IfBooleanT" 2)
+ '("IfBooleanF" 2)
'("IfNoValueTF" 3)
- '("IfNoValueT" 3)
- '("IfNoValueF" 3)
+ '("IfNoValueT" 2)
+ '("IfNoValueF" 2)
'("IfValueTF" 3)
- '("IfValueT" 3)
- '("IfValueF" 3)
+ '("IfValueT" 2)
+ '("IfValueF" 2)
"BooleanTrue"
"BooleanFalse"
;; Argument processors
