[elpa] 30/299: * style/varioref.el: Update copyright range. ("varioref"): Add more definitions. (LaTeX-varioref-package-options): Reformat.

[Stefan Monnier]

monnier pushed a commit to branch externals/auctex
in repository elpa.

commit e48619aa5a882b7d157d0505c3bb764de38eb382
Author: Tassilo Horn <address@hidden>
Date:   Mon Jan 14 19:33:12 2013 +0000

    * style/varioref.el: Update copyright range.
    ("varioref"): Add more definitions.
    (LaTeX-varioref-package-options): Reformat.
---
 ChangeLog         |    4 ++++
 style/varioref.el |   53 ++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97042aa..3c8cea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * style/pstricks.el (LaTeX-pstricks-package-options): New
        variable.
 
+       * style/varioref.el: Update copyright range.
+       ("varioref"): Add more definitions.
+       (LaTeX-varioref-package-options): Reformat.
+
 2013-01-14  Tassilo Horn  <address@hidden>
 
        * Makefile.in (STYLESRC): Enable memoir.el style.
diff --git a/style/varioref.el b/style/varioref.el
index 77c791b..37d611f 100644
--- a/style/varioref.el
+++ b/style/varioref.el
@@ -1,8 +1,9 @@
 ;;; varioref.el --- AUCTeX style file with support for varioref.sty
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2013 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <address@hidden>
+;;         Mads Jensen <address@hidden>
 ;; Maintainer: address@hidden
 
 ;; This file is part of AUCTeX.
@@ -26,38 +27,52 @@
 
 (TeX-add-style-hook "varioref"
    (lambda ()
-     
+
      (TeX-add-symbols
 
       ;; The macros with label arguments
       '("vref" TeX-arg-label)
-      '("vpageref" [ "Same page text" ] [ "different page text" ] 
TeX-arg-label)
+      '("Vref" TeX-arg-label)
+      '("vrefrange" [ "Same page text" ] TeX-arg-label TeX-arg-label)
+      '("vrefrange*" [ "Same page text" ] TeX-arg-label TeX-arg-label)
+      '("vref*" TeX-arg-label)
+      '("Vref" TeX-arg-label)
+      '("Ref" TeX-arg-label)
+      '("vpageref" [ "Same page text" ] [ "Different page text" ] 
TeX-arg-label)
+      '("vpageref*" [ "Same page text" ] [ "Different page text" ]
+        TeX-arg-label)
       '("fullref" TeX-arg-label)
+      '("labelformat" TeX-arg-counter t)
+
+      '("vpagerefrange" [ "Same page text" ] TeX-arg-label TeX-arg-label)
+      '("vpagerefrange*" [ "Same page text" ] TeX-arg-label TeX-arg-label)
 
       ;; And the other macros used for customization
       "reftextbefore" "reftextfacebefore"
-      "reftextafter"  "reftextfaceafter"
-      "reftextfaraway" "vreftextvario" "vrefwarning")
+      "reftextafter"  "reftextfaceafter" "reftexlabelrange"
+      "reftextfaraway" "vreftextvario" "vrefwarning"
+      "vpagerefnum" "vrefshowerrors")
 
-     ;; Install completion for labels
+     ;; Install completion for labels.  Only offer completion for
+     ;; commands that take only one reference as an argument
      (setq TeX-complete-list
           (append
-           '(("\\\\vref{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
-             ("\\\\vpageref\\(\\[[^]]*\\]\\)*{\\([^{}\n\r\\%,]*\\)" 
+           '(("\\\\[Vv]ref{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
+              ("\\\\vref\\*?{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
+              ("\\\\Ref{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
+              ("\\\\vref\\*{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
+              ("\\\\fullref{\\([^{}\n\r\\%,]*\\)" 1 LaTeX-label-list "}")
+              ("\\\\vpageref\\*?\\(\\[[^]]*\\]\\)*{\\([^{}\n\r\\%,]*\\)"
               2 LaTeX-label-list "}"))
            TeX-complete-list))))
 
-(defvar LaTeX-varioref-package-options '("draft" "final" "afrikaans" 
-                                      "american" "austrian" "naustrian"
-                                      "brazil" "breton" "catalan" "croatian"
-                                      "czech" "danish" "dutch" "english"
-                                      "esperanto" "finnish" "french"
-                                      "galician" "german" "ngerman" "greek"
-                                      "italian" "magyar" "norsk" "nynorsk"
-                                      "polish" "portuges" "romanian"
-                                      "russian" "slovak" "slovene"
-                                      "spanish" "swedish" "turkish"
-                                      "francais" "germanb")
+(defvar LaTeX-varioref-package-options
+  '("draft" "final" "afrikaans" "american" "austrian" "naustrian" "basque"
+    "brazil" "breton" "bahasam" "catalan" "croatian" "czech" "danish"
+    "dutch" "english" "esperanto" "finnish" "french" "galician" "german"
+    "icelandic" "ngerman" "greek" "italian" "magyar" "norsk" "nynorsk"
+    "polish" "portuges" "romanian" "russian" "slovak" "slovene"
+    "spanish" "swedish" "turkish" "ukrainian" "francais" "germanb")
   "Package options for the varioref package.")
 
 ;;; varioref.el ends here