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

[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  c731038844f059d2395f3fc2bc79fbe01485a3d9 (commit)
      from  90b1803b024add1ad76f98a564579f263bf08e62 (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 c731038844f059d2395f3fc2bc79fbe01485a3d9
Author: Arash Esbati <arash@gnu.org>
Date:   Wed Mar 2 11:54:10 2022 +0100

    Improve regexp matching new environments
    
    * style/newfloat.el
    (LaTeX-newfloat-DeclareFloatingEnvironment-regexp): Add 'p' to the
    name of the variable.  Use the function
    `LaTeX-extract-key-value-label' to build the regexp.  Be more
    restrictive when matching the type of declared environment.

diff --git a/style/newfloat.el b/style/newfloat.el
index 74185bd6..5cde1d4c 100644
--- a/style/newfloat.el
+++ b/style/newfloat.el
@@ -1,6 +1,6 @@
 ;;; newfloat.el --- AUCTeX style for `newfloat.sty' (v1.1-109)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015--2021 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2022 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
@@ -82,15 +82,15 @@
 ;; Setup parsing for \DeclareFloatingEnvironment:
 (TeX-auto-add-type "newfloat-DeclareFloatingEnvironment" "LaTeX")
 
-(defvar LaTeX-newfloat-DeclareFloatingEnvironment-regex
+(defvar LaTeX-newfloat-DeclareFloatingEnvironment-regexp
   `(,(concat "\\\\DeclareFloatingEnvironment"
              "[ \t\n\r%]*"
-             "\\["
-             "[ \t\n\r%{}a-zA-Z0-9=,-]*"
-             "\\]"
+             "\\(?:"
+             (LaTeX-extract-key-value-label 'none)
+             "\\)?"
              "[ \t\n\r%]*"
              "{\\([^}]+\\)}"
-             "\\(?:[ %]*{\\([^}]*\\)}\\)?")
+             "\\(?:[ %]*{\\(figure\\|table\\|verbatim\\)}\\)?")
     (1 2) LaTeX-auto-newfloat-DeclareFloatingEnvironment)
   "Matches the argument of `\\DeclareFloatingEnvironment' from 
`newfloat.sty'.")
 
@@ -152,7 +152,7 @@ If `caption.el' is loaded, add the new floating environment 
to
  (lambda ()
 
    ;; Add newfloat to the parser.
-   (TeX-auto-add-regexp LaTeX-newfloat-DeclareFloatingEnvironment-regex)
+   (TeX-auto-add-regexp LaTeX-newfloat-DeclareFloatingEnvironment-regexp)
 
    ;; Commands:
    (TeX-add-symbols

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

Summary of changes:
 style/newfloat.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX