[AUCTeX-diffs] [elpa] externals/auctex 88edbf8 22/43: Improve support for extended NFSS macros

[Tassilo Horn]

branch: externals/auctex
commit 88edbf82425fbfce05955714d9ace027784a08aa
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>

    Improve support for extended NFSS macros
    
    * font-latex.el (font-latex-built-in-keyword-classes): Move
    entries for \normalfont and \normalshape to `function' class.
    Add \textssc to `bold-command' and \sscshape to `bold-declaration'
    class.
    
    * latex.el (LaTeX-common-initialization): Add entries for `spaced
    small caps' macros \sscshape and \textssc.  \textssc is not part
    of `LaTeX-font-list' yet.
---
 font-latex.el | 12 ++++++------
 latex.el      | 10 ++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/font-latex.el b/font-latex.el
index 81e52c6..c8e46e1 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -358,7 +358,8 @@ variable `font-latex-fontify-sectioning'." ',num)
       ;; separate category with 'noarg instead of 'command handling?
       ("enspace" "") ("enskip" "") ("quad" "") ("qquad" "") ("nonumber" "")
       ("centering" "") ("raggedright" "") ("raggedleft" "")
-      ("TeX" "") ("LaTeX" "") ("LaTeXe" ""))
+      ("TeX" "") ("LaTeX" "") ("LaTeXe" "")
+      ("normalfont" "") ("normalshape" ""))
      font-lock-function-name-face 2 command)
     ("sectioning-0"
      (("part" "*[{"))
@@ -404,8 +405,8 @@ variable `font-latex-fontify-sectioning'." ',num)
       ("textsuperscript" "{") ("textsubscript" "{") ("verb" "*"))
      font-lock-type-face 2 command)
     ("bold-command"
-     (("textbf" "{") ("textsc" "{") ("textulc" "{") ("textup" "{")
-      ("textsw" "{") ("boldsymbol" "{") ("pmb" "{"))
+     (("textbf" "{") ("textsc" "{") ("textssc" "{") ("textulc" "{")
+      ("textup" "{") ("textsw" "{") ("boldsymbol" "{") ("pmb" "{"))
      font-latex-bold-face 1 command)
     ("italic-command"
      (("emph" "{") ("textit" "{") ("textsl" "{"))
@@ -417,7 +418,7 @@ variable `font-latex-fontify-sectioning'." ',num)
      (("texttt" "{") ("textsf" "{") ("textrm" "{") ("textmd" "{") 
("oldstylenums" "{"))
      font-lock-type-face 1 command)
     ("bold-declaration"
-     ("bf" "bfseries" "sc" "scshape" "ulcshape" "upshape" "swshape")
+     ("bf" "bfseries" "sc" "scshape" "sscshape" "ulcshape" "upshape" "swshape")
      font-latex-bold-face 1 declaration)
     ("italic-declaration"
      ("em" "it" "itshape" "sl" "slshape")
@@ -425,8 +426,7 @@ variable `font-latex-fontify-sectioning'." ',num)
     ("type-declaration"
      ("tt" "ttfamily" "sf" "sffamily" "rm" "rmfamily" "mdseries"
       "tiny" "scriptsize" "footnotesize" "small" "normalsize"
-      "large" "Large" "LARGE" "huge" "Huge"
-      "normalfont" "normalshape")
+      "large" "Large" "LARGE" "huge" "Huge")
      font-lock-type-face 1 declaration))
   "Built-in keywords and specifications for font locking.
 
diff --git a/latex.el b/latex.el
index 50f81d9..db7bf6e 100644
--- a/latex.el
+++ b/latex.el
@@ -6502,8 +6502,14 @@ function would return non-nil and `(match-string 1)' 
would return
      '("itshape"  -1) '("slshape"  -1)
      '("upshape"  -1) '("scshape"  -1)
      '("eminnershape" -1)
-     ;; The next 2 were added to LaTeX kernel with 2020-02-02 release:
-     '("ulcshape" -1) '("swshape"  -1)
+     ;; The next 3 were added to LaTeX kernel with 2020-02-02 release:
+     '("sscshape" -1) '("swshape"  -1) '("ulcshape" -1)
+     ;; These are for the default settings:
+     "sscdefault" "swdefault" "ulcdefault"
+     ;; This macro is for `spaced small caps'.  Currently, only some
+     ;; commercial fonts offer this.  It should be moved into
+     ;; `LaTeX-font-list' once it is needed more frequently.
+     '("textssc" t)
      ;; User level reset macros:
      '("normalfont" -1) '("normalshape" -1)))