[elpa] externals/auctex f700ec0 16/43: Support extended NFSS shapes with 2020-02-02 LaTeX kernel

[Tassilo Horn]

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

    Support extended NFSS shapes with 2020-02-02 LaTeX kernel
    
    * font-latex.el (font-latex-built-in-keyword-classes): Add
    \textulc and \textsw to `bold-command' class, the respective
    declarations to `bold-declaration'.
    Add reset \normalfont and \normalshape to `type-declaration'
    class.
    
    * latex.el (LaTeX-font-list): Add the macros \textulc and \textsw
    and bind the to C-l and C-w respectively.
    (LaTeX-common-initialization): Add the matching font declarations
    \ulcshape and \swshape.  Add user level reset macros \normalfont
    and \normalshape.
---
 font-latex.el | 11 ++++++-----
 latex.el      | 30 ++++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/font-latex.el b/font-latex.el
index 02a86f5..3b69f8f 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1,6 +1,6 @@
 ;;; font-latex.el --- LaTeX fontification for Font Lock mode.
 
-;; Copyright (C) 1996-2019  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2020  Free Software Foundation, Inc.
 
 ;; Authors:    Peter S. Galbraith <address@hidden>
 ;;             Simon Marshall <address@hidden>
@@ -409,8 +409,8 @@ variable `font-latex-fontify-sectioning'." ',num)
       ("textsuperscript" "{") ("textsubscript" "{") ("verb" "*"))
      font-lock-type-face 2 command)
     ("bold-command"
-     (("textbf" "{") ("textsc" "{") ("textup" "{") ("boldsymbol" "{")
-      ("pmb" "{"))
+     (("textbf" "{") ("textsc" "{") ("textulc" "{") ("textup" "{")
+      ("textsw" "{") ("boldsymbol" "{") ("pmb" "{"))
      font-latex-bold-face 1 command)
     ("italic-command"
      (("emph" "{") ("textit" "{") ("textsl" "{"))
@@ -422,7 +422,7 @@ variable `font-latex-fontify-sectioning'." ',num)
      (("texttt" "{") ("textsf" "{") ("textrm" "{") ("textmd" "{") 
("oldstylenums" "{"))
      font-lock-type-face 1 command)
     ("bold-declaration"
-     ("bf" "bfseries" "sc" "scshape" "upshape")
+     ("bf" "bfseries" "sc" "scshape" "ulcshape" "upshape" "swshape")
      font-latex-bold-face 1 declaration)
     ("italic-declaration"
      ("em" "it" "itshape" "sl" "slshape")
@@ -430,7 +430,8 @@ 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")
+      "large" "Large" "LARGE" "huge" "Huge"
+      "normalfont" "normalshape")
      font-lock-type-face 1 declaration))
   "Built-in keywords and specifications for font locking.
 
diff --git a/latex.el b/latex.el
index 0c6b58a..50f81d9 100644
--- a/latex.el
+++ b/latex.el
@@ -1,6 +1,6 @@
 ;;; latex.el --- Support for LaTeX documents.
 
-;; Copyright (C) 1991, 1993-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993-2020 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Keywords: tex
@@ -5818,26 +5818,28 @@ regenerated by the respective menu filter."
     (?\C-e "\\emph{"       "}")
     (?\C-f "\\textsf{"     "}" "\\mathsf{"     "}")
     (?\C-i "\\textit{"     "}" "\\mathit{"     "}")
+    (?\C-l "\\textulc{"    "}")
     (?\C-m "\\textmd{"     "}")
     (?\C-n "\\textnormal{" "}" "\\mathnormal{" "}")
     (?\C-r "\\textrm{"     "}" "\\mathrm{"     "}")
     (?\C-s "\\textsl{"     "}" "\\mathbb{"     "}")
     (?\C-t "\\texttt{"     "}" "\\mathtt{"     "}")
     (?\C-u "\\textup{"     "}")
+    (?\C-w "\\textsw{"     "}")
     (?\C-d "" "" t))
   "Font commands used with LaTeX2e.  See `TeX-font-list'."
   :group 'LaTeX-macro
   :type '(repeat
-          (group
-           :value (?\C-a "" "")
-           (character :tag "Key")
-           (string :tag "Prefix")
-           (string :tag "Suffix")
-           (option (group
-                    :inline t
-                    (string :tag "Math Prefix")
-                    (string :tag "Math Suffix")))
-           (option (sexp :format "Replace\n" :value t)))))
+         (group
+          :value (?\C-a "" "")
+          (character :tag "Key")
+          (string :tag "Prefix")
+          (string :tag "Suffix")
+          (option (group
+                   :inline t
+                   (string :tag "Math Prefix")
+                   (string :tag "Math Suffix")))
+          (option (sexp :format "Replace\n" :value t)))))
 
 
 ;;; Simple Commands
@@ -6499,7 +6501,11 @@ function would return non-nil and `(match-string 1)' 
would return
      '("mdseries" -1) '("bfseries" -1)
      '("itshape"  -1) '("slshape"  -1)
      '("upshape"  -1) '("scshape"  -1)
-     '("eminnershape" -1)))
+     '("eminnershape" -1)
+     ;; The next 2 were added to LaTeX kernel with 2020-02-02 release:
+     '("ulcshape" -1) '("swshape"  -1)
+     ;; User level reset macros:
+     '("normalfont" -1) '("normalshape" -1)))
 
   (TeX-run-style-hooks "LATEX")