Tassilo Horn <[email protected]> writes: > Arash Esbati <[email protected]> writes: > >> The is due to the second regexp in `reftex-label-regexps'. Please >> find attached a patch fixing this issue. Any comments welcome. > > Pushed to emacs master. Thanks a lot!
Hi Tassilo, many thanks for installing the patch. Unfortunately, my last patch wasn't good enough since I forgot that the ctable package provides a macro and not an environment. The patch attached fixes this issue. This patch hardcodes the search to the environments/macro provided by the packages "listings", "breqn" and "ctable". I think this change is acceptable; any other envs/macros can be added easily by the user and/or AUCTeX styles. Best, Arash
>From 557490e4bd37b794133fca128710f2918d4d005f Mon Sep 17 00:00:00 2001 From: Arash Esbati <[email protected]> Date: Fri, 8 Mar 2019 22:01:01 +0100 Subject: [PATCH] ; Improve matching of key-val labels yet more (bug#34629) * lisp/textmodes/reftex-vars.el (reftex-label-regexps): Match explicitly for key-val labels in optional arguments of environments provided by "listings" and "breqn" packages and the macro "\ctable" from the package of the same name. Update docstring. --- lisp/textmodes/reftex-vars.el | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index eb1dfc50a3..88ad4478b0 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -894,11 +894,25 @@ reftex-derive-label-parameters `(;; Normal \\label{foo} labels "\\\\label{\\(?1:[^}]*\\)}" ;; keyvals [..., label = {foo}, ...] forms used by ctable, - ;; listings, minted, ... + ;; listings, breqn, ... ,(concat ;; Make sure we search only for optional arguments of - ;; environments and don't match any other [ - "\\\\begin[[:space:]]*{\\(?:[^}]+\\)}[[:space:]]*" + ;; environments/macros and don't match any other [. ctable + ;; provides a macro called \ctable, listings/breqn have + ;; environments. Start with a backslash and a group for names + "\\\\\\(?:" + ;; begin, optional spaces and opening brace + "begin[[:space:]]*{" + ;; Build a regexp for env names + (regexp-opt '("lstlisting" "dmath" "dseries" "dgroup" "darray")) + ;; closing brace, optional spaces + "}[[:space:]]*" + ;; Now for macros + "\\|" + ;; Build a regexp for macro names; currently only \ctable + (regexp-opt '("ctable")) + ;; Close the group for names + "\\)" ;; Match the opening [ and the following chars "\\[[^][]*" ;; Allow nested levels of chars enclosed in braces @@ -912,13 +926,18 @@ reftex-derive-label-parameters ;; Match the label value; braces around the value are ;; optional. "{?\\(?1:[^] ,}\r\n\t%]+\\)}?" - ;; We are done. Such search until the next closing bracket + ;; We are done. Just search until the next closing bracket "[^]]*\\]")) "List of regexps matching \\label definitions. The default value matches usual \\label{...} definitions and -keyval style [..., label = {...}, ...] label definitions. It is -assumed that the regexp group 1 matches the label text, so you -have to define it using \\(?1:...\\) when adding new regexps. +keyval style [..., label = {...}, ...] label definitions. The +regexp for keyval style explicitly looks for environments +provided by the packages \"listings\" (\"lstlisting\"), +\"breqn\" (\"dmath\", \"dseries\", \"dgroup\", \"darray\") and +the macro \"\\ctable\" provided by the package of the same name. + +It is assumed that the regexp group 1 matches the label text, so +you have to define it using \\(?1:...\\) when adding new regexps. When changed from Lisp, make sure to call `reftex-compile-variables' afterwards to make the change -- 2.21.0
_______________________________________________ auctex-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/auctex-devel
