[Emacs-diffs] /srv/bzr/emacs/trunk r109227: * textmodes/reftex-vars.el (reftex-label-alist-builtin): Add

[Tassilo Horn]

------------------------------------------------------------
revno: 109227
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-27 09:59:50 +0200
message:
  * textmodes/reftex-vars.el (reftex-label-alist-builtin): Add
  support for the lstlisting and minted environments, and for the
  ctable macro.
  * textmodes/reftex.el (reftex-compile-variables): Also recognize
  labels written in keyvals syntax.
modified:
  lisp/ChangeLog
  lisp/textmodes/reftex-vars.el
  lisp/textmodes/reftex.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-27 03:48:40 +0000
+++ b/lisp/ChangeLog    2012-07-27 07:59:50 +0000
@@ -1,3 +1,11 @@
+2012-07-27  Tassilo Horn  <address@hidden>
+
+       * textmodes/reftex-vars.el (reftex-label-alist-builtin): Add
+       support for the lstlisting and minted environments, and for the
+       ctable macro.
+       * textmodes/reftex.el (reftex-compile-variables): Also recognize
+       labels written in keyvals syntax.
+
 2012-07-27  Jay Belanger  <address@hidden>
 
        * calc/calccomp.el (math-compose-expr): Use parentheses when

=== modified file 'lisp/textmodes/reftex-vars.el'
--- a/lisp/textmodes/reftex-vars.el     2012-04-09 13:05:48 +0000
+++ b/lisp/textmodes/reftex-vars.el     2012-07-27 07:59:50 +0000
@@ -122,7 +122,14 @@
       ;;("\\label{*}" nil nil nil nil)
       ))
 
-    )
+    (ctable    "The ctable package"
+     (("\\ctable[]{}{}{}" ?t "tab:" "\\ref{%s}" 1 ("table" "Tabelle"))))
+
+    (listings  "The listings package"
+      (("lstlisting" ?l "lst:" "~\\ref{%s}" nil (regexp "[Ll]isting"))))
+
+    (minted    "The minted package"
+      (("minted" ?l "lst:" "~\\ref{%s}" nil (regexp "[Ll]isting")))))
   "The default label environment descriptions.
 Lower-case symbols correspond to a style file of the same name in the LaTeX
 distribution.  Mixed-case symbols are convenience aliases.")

=== modified file 'lisp/textmodes/reftex.el'
--- a/lisp/textmodes/reftex.el  2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/reftex.el  2012-07-27 07:59:50 +0000
@@ -1284,7 +1284,15 @@
 ;          (wbol "\\(\\`\\|[\n\r]\\)[ \t]*")
            (wbol "\\(^\\)[ \t]*")  ; Need to keep the empty group because
                                   ;;; because match number are hard coded
-           (label-re "\\\\label{\\([^}]*\\)}")
+           (label-re (concat "\\(?:"
+                            ;; Normal \label{...}
+                            "\\\\label{\\([^}]*\\)}"
+                            "\\|"
+                            ;; keyvals [..., label = {foo}, ...]
+                            ;; forms used by ctable, listings,
+                            ;; minted, ...
+                            
"\\[[^]]*label[[:space:]]*=[[:space:]]*{?\\(?1:[^],}]+\\)}?[^[]*\\]"
+                            "\\)"))
            (include-re (concat wbol
                                "\\\\\\("
                                (mapconcat 'identity
@@ -1312,6 +1320,8 @@
                     "\\)\\([[{][^]}]*[]}]\\)*[[{]\\(%s\\)[]}]"))
            (find-label-re-format
             (concat "\\("
+                   
"\\[[^]]*label[[:space:]]*=[[:space:]]*{?\\(?1:[^],}]+\\)}?[^[]*\\]"
+                   "\\|"
                     (mapconcat 'regexp-quote (append '("\\label")
                                                      macros-with-labels) "\\|")
                     "\\)\\([[{][^]}]*[]}]\\)*[[{]\\(%s\\)[]}]"))