[Emacs-diffs] /srv/bzr/emacs/trunk r112289: * textmodes/reftex-vars.el (reftex-label-regexps): New defcustom.

[Tassilo Horn]

------------------------------------------------------------
revno: 112289
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Mon 2013-04-15 09:55:05 +0200
message:
  * textmodes/reftex-vars.el (reftex-label-regexps): New defcustom.
  
  * textmodes/reftex.el (reftex-compile-variables): Use it.
modified:
  lisp/ChangeLog
  lisp/textmodes/reftex-vars.el
  lisp/textmodes/reftex.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-14 02:55:21 +0000
+++ b/lisp/ChangeLog    2013-04-15 07:55:05 +0000
@@ -1,3 +1,9 @@
+2013-04-15  Tassilo Horn  <address@hidden>
+
+       * textmodes/reftex-vars.el (reftex-label-regexps): New defcustom.
+
+       * textmodes/reftex.el (reftex-compile-variables): Use it.
+
 2013-04-14  Stefan Monnier  <address@hidden>
 
        * files.el (normal-mode): Only use default major-mode if no other mode

=== modified file 'lisp/textmodes/reftex-vars.el'
--- a/lisp/textmodes/reftex-vars.el     2013-01-21 12:14:56 +0000
+++ b/lisp/textmodes/reftex-vars.el     2013-04-15 07:55:05 +0000
@@ -863,6 +863,20 @@
                          (string :tag ""))
                 (option (boolean :tag "Downcase words          "))))
 
+(defcustom reftex-label-regexps
+  '(;; Normal \\label{foo} labels
+    "\\\\label{\\(?1:[^}]*\\)}"
+    ;; keyvals [..., label = {foo}, ...] forms used by ctable,
+    ;; listings, minted, ...
+    "\\[[^]]*\\<label[[:space:]]*=[[:space:]]*{?\\(?1:[^],}]+\\)}?")
+  "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."
+  :group 'reftex-defining-label-environments
+  :type '(repeat (regexp :tag "Regular Expression")))
+
 (defcustom reftex-label-illegal-re "[^-a-zA-Z0-9_+=:;,.]"
   "Regexp matching characters not valid in labels."
   :group 'reftex-making-and-inserting-labels

=== modified file 'lisp/textmodes/reftex.el'
--- a/lisp/textmodes/reftex.el  2013-02-23 21:54:00 +0000
+++ b/lisp/textmodes/reftex.el  2013-04-15 07:55:05 +0000
@@ -1081,13 +1081,7 @@
            (wbol "\\(^\\)[ \t]*") ; Need to keep the empty group because
                                   ; match numbers are hard coded
            (label-re (concat "\\(?:"
-                            ;; Normal \label{...}
-                            "\\\\label{\\([^}]*\\)}"
-                            "\\|"
-                            ;; keyvals [..., label = {foo}, ...]
-                            ;; forms used by ctable, listings,
-                            ;; minted, ...
-                            
"\\[[^]]*label[[:space:]]*=[[:space:]]*{?\\(?1:[^],}]+\\)}?"
+                            (mapconcat 'identity reftex-label-regexps "\\|")
                             "\\)"))
            (include-re (concat wbol
                                "\\\\\\("