[AUCTeX-diffs] GNU AUCTeX branch, master, updated. c1e0419194c632999d4c3e2eb427082614da9aae

[Arash Esbati]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  c1e0419194c632999d4c3e2eb427082614da9aae (commit)
       via  88edbf82425fbfce05955714d9ace027784a08aa (commit)
      from  1d72a5ceec85f507a252ccc41f9a5abda966e110 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1e0419194c632999d4c3e2eb427082614da9aae
Author: Arash Esbati <address@hidden>
Date:   Wed Jan 8 19:25:34 2020 +0100

    Adjust style/fontaxes.el to LaTeX kernel
    
    * style/fontaxes.el ("fontaxes"): Comment out entries for macros
    which are now provided by LaTeX kernel.  Also remove fontification
    support.

diff --git a/style/fontaxes.el b/style/fontaxes.el
index 6524a5a..232dd18 100644
--- a/style/fontaxes.el
+++ b/style/fontaxes.el
@@ -1,6 +1,6 @@
 ;;; fontaxes.el --- AUCTeX style for `fontaxes.sty' version v1.0d
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <address@hidden>
 ;; Maintainer: address@hidden
@@ -43,18 +43,19 @@
  "fontaxes"
  (lambda ()
    (TeX-add-symbols
-    ;; Various font shapes
-    '("swshape"           -1)  ; swash shape
-    '("sscshape"          -1)  ; spaced small caps
+    ;; Various font shapes:
+    ;; These macros are now part of LaTeX kernel 2020-02-02
+    ;; '("swshape"           -1)  ; swash shape
+    ;; '("sscshape"          -1)  ; spaced small caps
+    ;; '("swdefault"          0)
+    ;; '("sscdefault"         0)
+    ;; '("ulcdefault"         0)
     '("fontprimaryshape"   t)
     '("fontsecondaryshape" t)
-    '("swdefault"          t)
-    '("sscdefault"         t)
-    '("ulcdefault"         t)
 
     ;; Figure versions
     '("figureversion"
-      (TeX-arg-eval mapconcat 'identity
+      (TeX-arg-eval mapconcat #'identity
                     (TeX-completing-read-multiple
                      "Style, alignment: "
                      '(("text") ("osf")
@@ -86,9 +87,10 @@
                     '(("tabular") ("proportional"))))
 
     ;; Additional commands
-    '("textsw"              t)
-    '("textssc"             t)
-    '("textulc"             t)
+    ;; These macros are now part of LaTeX kernel 2020-02-02
+    ;; '("textsw"              t)
+    ;; '("textssc"             t)
+    ;; '("textulc"             t)
     '("textfigures"         t)
     '("liningfigures"       t)
     '("tabularfigures"      t)
@@ -102,13 +104,6 @@
                                 ("tabularfigures"      "{")
                                 ("proportionalfigures" "{"))
                               'type-command)
-     (font-latex-add-keywords '(("textsw"              "{")
-                                ("textssc"             "{")
-                                ("textulc"             "{"))
-                              'bold-command)
-     (font-latex-add-keywords '(("swshape"             "")
-                                ("sscshape"            ""))
-                              'bold-declaration)
      (font-latex-add-keywords '(("figureversion"       "{"))
                               'variable)))
  LaTeX-dialect)

commit 88edbf82425fbfce05955714d9ace027784a08aa
Author: Arash Esbati <address@hidden>
Date:   Wed Jan 8 19:18:02 2020 +0100

    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.

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)))
 

-----------------------------------------------------------------------

Summary of changes:
 font-latex.el     | 12 ++++++------
 latex.el          | 10 ++++++++--
 style/fontaxes.el | 31 +++++++++++++------------------
 3 files changed, 27 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX