[elpa] externals/auctex 9127647 69/80: Update style/varioref.el to package version 1.6b

[Tassilo Horn]

branch: externals/auctex
commit 9127647b84d06d2e2c83fc9f0274f15480a6a454
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>

    Update style/varioref.el to package version 1.6b
    
    * style/varioref.el ("varioref"): Rearrange macros acc. to the
    manual.  Add missing starred version of \Vref.  Add fontification
    support for \labelformat.
    (LaTeX-varioref-package-options): Update package options.
---
 style/varioref.el | 146 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 79 insertions(+), 67 deletions(-)

diff --git a/style/varioref.el b/style/varioref.el
index ce840e7..aeaaee0 100644
--- a/style/varioref.el
+++ b/style/varioref.el
@@ -1,6 +1,6 @@
-;;; varioref.el --- AUCTeX style file with support for varioref.sty
+;;; varioref.el --- AUCTeX style for `varioref.sty' (v1.6b)
 
-;; Copyright (C) 1999, 2013, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2013, 2015, 2018, 2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <address@hidden>
 ;;         Mads Jensen <address@hidden>
@@ -23,6 +23,11 @@
 ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 ;; 02110-1301, USA.
 
+;;; Commentary:
+
+;; This file adds support for `varioref.sty' (v1.6b) from 2019/09/08.
+;; `varioref.sty' is a standard LaTeX package and part of TeXLive.
+
 ;;; Code:
 
 ;; Silence the compiler:
@@ -30,73 +35,80 @@
                  "font-latex"
                  (keywords class))
 
-(TeX-add-style-hook "varioref"
-   (lambda ()
-
-     (TeX-add-symbols
-
-      ;; The macros with label arguments
-      '("vref" TeX-arg-ref)
-      '("Vref" TeX-arg-ref)
-      '("vrefrange" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
-      '("vrefrange*" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
-      '("vref*" TeX-arg-ref)
-      '("Vref" TeX-arg-ref)
-      '("Ref" TeX-arg-ref)
-      '("vpageref" [ "Same page text" ] [ "Different page text" ] TeX-arg-ref)
-      '("vpageref*" [ "Same page text" ] [ "Different page text" ]
-        TeX-arg-ref)
-      '("fullref" TeX-arg-ref)
-      '("labelformat" TeX-arg-counter t)
-
-      '("vpagerefrange" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
-      '("vpagerefrange*" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
-
-      ;; And the other macros used for customization
-      "reftextbefore" "reftextfacebefore"
-      "reftextafter"  "reftextfaceafter" "reftexlabelrange"
-      "reftextfaraway" "vreftextvario" "vrefwarning"
-      "vpagerefnum" "vrefshowerrors")
-
-     ;; Install completion for labels.  Only offer completion for
-     ;; commands that take only one reference as an argument
-     (setq TeX-complete-list
-          (append
-           '(("\\\\[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))
-
-     ;; Fontification
-     (when (and (fboundp 'font-latex-add-keywords)
-               (eq TeX-install-font-lock 'font-latex-setup))
-       (font-latex-add-keywords '(;; vref is already in font-latex.el,
-                                 ;; so don't add it here again
-                                 ("Vref"          "*{")
-                                 ("vpageref"      "*[[{")
-                                 ("vrefrange"     "*[{{")
-                                 ("Ref"           "{")
-                                 ("fullref"       "{")
-                                 ("vpagerefrange" "*[{{"))
-                               'reference))
-
-     ;; Activate RefTeX reference style.
-     (and LaTeX-reftex-ref-style-auto-activate
-         (fboundp 'reftex-ref-style-activate)
-         (reftex-ref-style-activate "Varioref")))
-   LaTeX-dialect)
+(TeX-add-style-hook
+ "varioref"
+ (lambda ()
+
+   (TeX-add-symbols
+    ;; 3 The user interface
+    '("vref" TeX-arg-ref)
+    '("vpageref" [ "Same page text" ] [ "Different page text" ] TeX-arg-ref)
+    '("vrefrange" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
+    '("vpagerefrange" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
+    "vpagerefnum"
+    '("vpagerefcompare" 4)
+    '("vpagerefnearby"  3)
+    '("vref*" TeX-arg-ref)
+    '("vpageref*" [ "Same page text" ] [ "Different page text" ] TeX-arg-ref)
+    '("vrefrange*" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
+    '("vpagerefrange*" [ "Same page text" ] TeX-arg-ref TeX-arg-ref)
+
+    '("labelformat" TeX-arg-counter t)
+
+    '("Ref" TeX-arg-ref)
+    '("Vref" TeX-arg-ref)
+    '("Vref*" TeX-arg-ref)
+
+    ;; 5 Customization
+    "reftextbefore" "reftextfacebefore"
+    "reftextafter"  "reftextfaceafter"
+    "reftextfaraway" "vreftextvario"
+    "reftextpagerange" "reftexlabelrange"
+    "vrefwarning"  "vrefshowerrors"
+    '("fullref" TeX-arg-ref))
+
+   ;; Install completion for labels.  Only offer completion for
+   ;; commands that take only one reference as an argument
+   (setq TeX-complete-list
+        (append
+         '(("\\\\[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))
+
+   ;; Fontification
+   (when (and (fboundp 'font-latex-add-keywords)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(;; vref is already in font-latex.el,
+                               ;; so don't add it here again
+                               ("vpageref"      "*[[{")
+                               ("vrefrange"     "*[{{")
+                               ("vpagerefrange" "*[{{")
+                               ("Ref"           "{")
+                               ("Vref"          "*{")
+                               ("fullref"       "{"))
+                             'reference)
+     (font-latex-add-keywords '(("labelformat"   "{{"))
+                             'function))
+
+   ;; Activate RefTeX reference style.
+   (and LaTeX-reftex-ref-style-auto-activate
+       (fboundp 'reftex-ref-style-activate)
+       (reftex-ref-style-activate "Varioref")))
+ LaTeX-dialect)
 
 (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")
+  '("afrikaans" "american" "arabic" "austrian" "naustrian" "basque"
+    "bahasam" "brazil" "breton" "bulgarian" "catalan" "croatian"
+    "czech" "danish" "dutch" "english" "esperanto" "finnish" "french"
+    "galician" "german" "ngerman" "greek" "icelandic" "italian" "magyar"
+    "norsk" "nynorsk" "polish" "portuges" "romanian" "russian"
+    "slovak" "slovene" "spanish" "swedish" "turkish" "ukrainian"
+    "francais" "germanb" "draft" "final" "space" "nospace")
   "Package options for the varioref package.")
 
 ;;; varioref.el ends here