[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex 501b0de 47/57: Use RefTeX for mul
From: |
Tassilo Horn |
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex 501b0de 47/57: Use RefTeX for multiple references in cleveref |
Date: |
Wed, 11 Jan 2017 18:01:42 +0000 (UTC) |
branch: externals/auctex
commit 501b0de7ba69315a87d167bf65b5ddeee5c58551
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
Use RefTeX for multiple references in cleveref
* style/cleveref.el (TeX-arg-cleveref-multiple-labels): Check if
RefTeX is enabled and use it for multiple referencing macros.
("cleveref"): Use `TeX-arg-ref' instead of `TeX-arg-label'.
("cleveref"): Remove call of (font-latex-set-syntactic-keywords).
---
style/cleveref.el | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/style/cleveref.el b/style/cleveref.el
index 3143e9a..3150180 100644
--- a/style/cleveref.el
+++ b/style/cleveref.el
@@ -25,19 +25,22 @@
;;; Code
-(defun TeX-arg-cleveref-multiple-labels (optional &optional prompt definition)
+(defun TeX-arg-cleveref-multiple-labels (optional &optional prompt)
"Prompt for a series of labels completing with known labels.
If OPTIONAL is non-nil, insert the resulting value as an optional
argument, otherwise as a mandatory one. Use PROMPT as the prompt
-string. If DEFINITION is non-nil, add each chosen label to the
-list of defined labels."
- (let* ((labels (TeX-completing-read-multiple
- (TeX-argument-prompt optional prompt "Keys")
- (LaTeX-label-list)))
- (labels-string (mapconcat 'identity labels ",")))
- (when definition
- (apply 'LaTeX-add-labels labels))
- (TeX-argument-insert labels-string optional optional)))
+string."
+ (if (and (fboundp 'reftex-arg-label)
+ (fboundp 'reftex-plug-flag)
+ (reftex-plug-flag 2))
+ ;; Use RefTeX when enabled
+ (TeX-arg-ref optional)
+ ;; Use AUCTeX interface
+ (let* ((labels (TeX-completing-read-multiple
+ (TeX-argument-prompt optional prompt "Keys")
+ (LaTeX-label-list)))
+ (labels-string (mapconcat #'identity labels ",")))
+ (TeX-argument-insert labels-string optional))))
(TeX-add-style-hook
"cleveref"
@@ -45,22 +48,22 @@ list of defined labels."
(TeX-add-symbols
'("cref" TeX-arg-cleveref-multiple-labels)
'("Cref" TeX-arg-cleveref-multiple-labels)
- '("crefrange" (TeX-arg-label "Key (first)") (TeX-arg-label "Key (last)"))
- '("Crefrange" (TeX-arg-label "key (first)") (TeX-arg-label "Key (last)"))
+ '("crefrange" (TeX-arg-ref "Key (first)") (TeX-arg-ref "Key (last)"))
+ '("Crefrange" (TeX-arg-ref "key (first)") (TeX-arg-ref "Key (last)"))
'("cpageref" TeX-arg-cleveref-multiple-labels)
'("Cpageref" TeX-arg-cleveref-multiple-labels)
- '("cpagerefrange" (TeX-arg-label "Key (first)") (TeX-arg-label "Key
(last)"))
- '("Cpagerefrange" (TeX-arg-label "Key (first)") (TeX-arg-label "Key
(last)"))
+ '("cpagerefrange" (TeX-arg-ref "Key (first)") (TeX-arg-ref "Key (last)"))
+ '("Cpagerefrange" (TeX-arg-ref "Key (first)") (TeX-arg-ref "Key (last)"))
'("cref*" TeX-arg-cleveref-multiple-labels)
'("Cref*" TeX-arg-cleveref-multiple-labels)
- '("crefrange*" (TeX-arg-label "Key (first)") (TeX-arg-label "Key (last)"))
- '("Crefrange*" (TeX-arg-label "Key (first)") (TeX-arg-label "Key (last)"))
- '("namecref" TeX-arg-label)
- '("nameCref" TeX-arg-label)
- '("lcnamecref" TeX-arg-label)
- '("namecrefs" TeX-arg-label)
- '("nameCrefs" TeX-arg-label)
- '("lcnamecrefs" TeX-arg-label)
+ '("crefrange*" (TeX-arg-ref "Key (first)") (TeX-arg-ref "Key (last)"))
+ '("Crefrange*" (TeX-arg-ref "Key (first)") (TeX-arg-ref "Key (last)"))
+ '("namecref" TeX-arg-ref)
+ '("nameCref" TeX-arg-ref)
+ '("lcnamecref" TeX-arg-ref)
+ '("namecrefs" TeX-arg-ref)
+ '("nameCrefs" TeX-arg-ref)
+ '("lcnamecrefs" TeX-arg-ref)
'("labelcref" TeX-arg-cleveref-multiple-labels)
'("labelcpageref" TeX-arg-cleveref-multiple-labels))
@@ -73,7 +76,6 @@ list of defined labels."
;; Fontification
(when (and (fboundp 'font-latex-add-keywords)
- (fboundp 'font-latex-set-syntactic-keywords)
(eq TeX-install-font-lock 'font-latex-setup))
(font-latex-add-keywords '(("cref" "*{")
("Cref" "*{")
@@ -91,9 +93,7 @@ list of defined labels."
("lcnamecrefs" "{")
("labelcref" "{")
("labelcpageref" "{"))
- 'reference)
- ;; For syntactic fontification, e.g. verbatim constructs.
- (font-latex-set-syntactic-keywords))
+ 'reference))
;; Activate RefTeX reference style.
(and LaTeX-reftex-ref-style-auto-activate
- [AUCTeX-diffs] [elpa] externals/auctex 8186490 06/57: Fix documentation of TeX-arg-file, (continued)
- [AUCTeX-diffs] [elpa] externals/auctex 8186490 06/57: Fix documentation of TeX-arg-file, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 5ddbd04 12/57: Add new style/titleps.el, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 225bade 14/57: Add new style/titletoc.el, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex ea7f427 28/57: Improve multi-level script fontification, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex c541d75 20/57: Fix the names also in expert macros, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 377a97a 32/57: Completion for math macros, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 3a5ed08 38/57: Support biblatex cite format in all Emacsen, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 4c59f77 42/57: Adapt Makefile to new ChangeLog file name, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex d185bcb 49/57: * Makefile.in (release-commit): Fix name of preview ChangeLog., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 74c5ac9 09/57: Update style/tcolorbox.el to package v3.96, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 501b0de 47/57: Use RefTeX for multiple references in cleveref,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex fb6333b 45/57: ; * doc/install.texi (Installation): Guard reference in "@ifclear rawfile"., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 826f17a 54/57: Release_11.90, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 7209776 46/57: Skip macros and environments from tcolorbox and raster library, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 6c155cc 33/57: Refactor normal completion and completion at point a bit, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex a9ec6ba 01/57: Update style/minted.el to package version 2.4.1., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 67c081d 53/57: ; make change-history-commit, Tassilo Horn, 2017/01/11