[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 8585c4d4a242fe490a874ea453ccfce152f59840

[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  8585c4d4a242fe490a874ea453ccfce152f59840 (commit)
       via  46c356bc3c885b5f22a4a71658fe1f13cd3f0cb8 (commit)
      from  724da15cc25ba95a055e697d87188a1f148bebf7 (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 8585c4d4a242fe490a874ea453ccfce152f59840
Author: Arash Esbati <arash@gnu.org>
Date:   Wed Jan 20 22:16:48 2021 +0100

    Update style/bigstrut.el to package version 2.6
    
    * style/bigstrut.el ("bigstrut"): Remove non-existent macro
    \bigstrutsetup.
    Add \bigstrutjot to list of lengths.
    Add fontification support for \bigstrut.
    (TeX-arg-bigstrut): Fix prompt and the usage of
    `TeX-argument-prompt'.  Make the function more AUCTeX standard.

diff --git a/style/bigstrut.el b/style/bigstrut.el
index 71ea835..32b6c9b 100644
--- a/style/bigstrut.el
+++ b/style/bigstrut.el
@@ -1,6 +1,6 @@
 ;;; bigstrut.el --- AUCTeX style for `bigstrut.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2012, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2014--2021 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
-;; This file adds support for `bigstrut.sty'.
+;; This file adds support for `bigstrut.sty', v2.6 from 2021/01/02.
 
 ;;; Code:
 
@@ -35,16 +35,26 @@
  "bigstrut"
  (lambda ()
    (TeX-add-symbols
-    "bigstrutsetup"
-    '("bigstrut" [ TeX-arg-bigstrut ])))
+    '("bigstrut" [ TeX-arg-bigstrut ]))
+
+   (LaTeX-add-lengths "bigstrutjot")
+
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+              (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("bigstrut" "["))
+                              'function)))
  TeX-dialect)
 
-(defun TeX-arg-bigstrut (optional &optional _prompt)
-  "Prompt for the optional argument in \\bigstrut."
+(defun TeX-arg-bigstrut (optional &optional prompt)
+  "Prompt for the optional argument in \\bigstrut.
+If OPTIONAL is non-nil, insert the argument in brackets.  PROMPT
+replaces the standard one."
   (TeX-argument-insert
-   (completing-read (TeX-argument-prompt
-     optional "Strut to top (t) or bottom (b)" nil t)
-                    (mapcar 'list '("t" "b")) nil t)
+   (completing-read
+    (TeX-argument-prompt
+     optional prompt "Strut to top (t) or bottom (b)")
+    '("t" "b"))
    optional))
 
 (defvar LaTeX-bigstrut-package-options nil

commit 46c356bc3c885b5f22a4a71658fe1f13cd3f0cb8
Author: Arash Esbati <arash@gnu.org>
Date:   Wed Jan 20 19:36:59 2021 +0100

    Update style/multirow.el to package version 2.6
    
    * style/multirow.el ("multirow"): Improve arguments of \multirow
    macro incl. fontification.
    Add \bigstrutjot to list of lengths and not to macros.
    Add \STneed macro depending on supertabular package option.
    (LaTeX-multirow-package-options): Fix package options.

diff --git a/style/multirow.el b/style/multirow.el
index d5108b8..25d9f96 100644
--- a/style/multirow.el
+++ b/style/multirow.el
@@ -1,6 +1,6 @@
 ;;; multirow.el --- AUCTeX style for `multirow.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018--2021 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
-;; This file adds support for `multirow.sty'.
+;; This file adds support for `multirow.sty', v2.6 from 2021/01/02.
 
 ;;; Code:
 
@@ -40,20 +40,47 @@
  "multirow"
  (lambda ()
    (TeX-add-symbols
-    '("multirow" "Number of rows"
-      [ "Big struts" ] "Width" [ "Fixup" ] t)
-    "multirowsetup")
-
-   (if (not (boundp 'LaTeX-bigstrut-package-options))
-       (TeX-add-symbols "bigstrutjot"))
+    ;; \multirow[<vpos>]{<nrows>}[<bigstruts>]{<width>}[<vmove>]{<text>}
+    '("multirow"
+      [TeX-arg-eval completing-read
+                    (TeX-argument-prompt t nil "Vertical position")
+                    '("c" "b" "t")]
+      "Number of rows"
+      [ "Big struts" ]
+      (TeX-arg-eval completing-read
+                    (TeX-argument-prompt nil nil "Width")
+                    (append
+                     '("*" "=")
+                     (mapcar (lambda (x)
+                               (concat TeX-esc (car x)))
+                             (LaTeX-length-list))))
+      [TeX-arg-length "Vertical fix-up"]
+      t)
+    "multirowsetup"
+    "multirowdebugtrue"
+    "multirowdebugfalse")
+
+   ;; \bigstrutjot is a length defined both in multirow.sty and
+   ;; bigstrut.sty.  It doesn't make a difference within AUCTeX since
+   ;; dupes are removed by the function `LaTeX-length-list'.
+   (LaTeX-add-lengths "bigstrutjot")
+
+   ;; \STneed is only defined with package option `supertabular':
+   (when (LaTeX-provided-package-options-member "multirow"
+                                                "supertabular")
+     (TeX-add-symbols
+      '("STneed" TeX-arg-length)))
 
    ;; Fontification
    (when (and (featurep 'font-latex)
               (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("multirow" "{[{")) 'function)))
+     (font-latex-add-keywords '(("multirow" "[{[{[{"))
+                              'function)))
  TeX-dialect)
 
-(defvar LaTeX-multirow-package-options nil
+(defvar LaTeX-multirow-package-options '("debug"
+                                         "longtable"
+                                         "supertabular")
   "Package options for the multirow package.")
 
 ;;; multirow.el ends here

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

Summary of changes:
 style/bigstrut.el | 28 +++++++++++++++++++---------
 style/multirow.el | 47 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX