[elpa] externals/auctex da4cb3d 14/67: Improve behavior of `TeX-arg-beamer-overlay-spec'

[Tassilo Horn]

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

    Improve behavior of `TeX-arg-beamer-overlay-spec'
    
    * style/beamer.el (TeX-arg-beamer-overlay-spec): Use
    `TeX-argument-insert' in the body of the function and respect the
    OPTIONAL argument.
    ("beamer"): Enclose all occurrences of
    `TeX-arg-beamer-overlay-spec' in brackets in order to mark them as
    optional.
---
 style/beamer.el | 64 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/style/beamer.el b/style/beamer.el
index 6cd8327..284aa31 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -79,8 +79,8 @@
    (LaTeX-paragraph-commands-add-locally "frametitle")
 
    (TeX-add-symbols
-    '("alert" 1)
-    '("alt" TeX-arg-beamer-overlay-spec 2)
+    '("alert" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("alt" [ TeX-arg-beamer-overlay-spec ] 2)
     '("beamerbutton" 1)
     '("beamergotobutton" 1)
     '("beamerreturnbutton" 1)
@@ -88,41 +88,41 @@
     '("frame" TeX-arg-beamer-frametitle)
     '("frametitle"
       (TeX-arg-eval TeX-read-string "Title: " nil 
'LaTeX-beamer-frametitle-history))
-    '("hyperlink" TeX-arg-beamer-overlay-spec 2)
-    '("hyperlinkslideprev" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkslidenext" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkframestart" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkframeend" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkframestartnext" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkframeendprev" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkpresentationstart" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkpresentationend" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkappendixstart" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkappendixend" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkdocumentstart" TeX-arg-beamer-overlay-spec 1)
-    '("hyperlinkdocumentend" TeX-arg-beamer-overlay-spec 1)
-    '("hypertarget" TeX-arg-beamer-overlay-spec 2)
+    '("hyperlink" [ TeX-arg-beamer-overlay-spec ] 2)
+    '("hyperlinkslideprev" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkslidenext" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkframestart" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkframeend" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkframestartnext" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkframeendprev" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkpresentationstart" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkpresentationend" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkappendixstart" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkappendixend" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkdocumentstart" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hyperlinkdocumentend" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("hypertarget" [ TeX-arg-beamer-overlay-spec ] 2)
     '("institute" 1)
-    '("invisible" TeX-arg-beamer-overlay-spec 1)
-    '("label" TeX-arg-beamer-overlay-spec 1)
+    '("invisible" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("label" [ TeX-arg-beamer-overlay-spec ] 1)
     '("logo" 1)
     '("note" TeX-arg-beamer-note 1)
-    '("only" TeX-arg-beamer-overlay-spec 1)
-    '("onslide" TeX-arg-beamer-overlay-spec)
+    '("only" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("onslide" [ TeX-arg-beamer-overlay-spec ])
     '("partpage")
     '("pause" ["Slide number"])
-    '("structure" TeX-arg-beamer-overlay-spec 1)
-    '("temporal" TeX-arg-beamer-overlay-spec 3)
+    '("structure" [ TeX-arg-beamer-overlay-spec ] 1)
+    '("temporal" [ TeX-arg-beamer-overlay-spec ] 3)
     '("titlepage")
     '("titlegraphic" 1)
-    '("uncover" TeX-arg-beamer-overlay-spec 1)
+    '("uncover" [ TeX-arg-beamer-overlay-spec ] 1)
     '("usetheme" LaTeX-arg-beamer-theme)
     '("useinnertheme" LaTeX-arg-beamer-inner-theme)
     '("useoutertheme" LaTeX-arg-beamer-outer-theme)
     '("usecolortheme" LaTeX-arg-beamer-color-theme)
     '("usefonttheme" LaTeX-arg-beamer-font-theme)
     '("usetheme" LaTeX-arg-beamer-theme)
-    '("visible" TeX-arg-beamer-overlay-spec 1))
+    '("visible" [ TeX-arg-beamer-overlay-spec ] 1))
 
    (LaTeX-add-environments
     '("actionenv")
@@ -184,11 +184,17 @@
      (font-latex-update-font-lock t)))
  LaTeX-dialect)
 
-(defun TeX-arg-beamer-overlay-spec (_optional &optional _prompt)
-  "Prompt for overlay specification."
-  (let ((overlay (TeX-read-string "(Optional) Overlay: ")))
-    (unless (zerop (length overlay))
-      (insert "<" overlay ">"))
+(defun TeX-arg-beamer-overlay-spec (optional &optional prompt)
+  "Prompt for overlay specification.
+If OPTIONAL is non-nil, insert the specification only if
+non-empty and enclosed in \"<>\".  PROMPT replaces the standard
+one."
+  (let ((TeX-arg-opening-brace "<")
+        (TeX-arg-closing-brace ">"))
+    (TeX-argument-insert
+     (TeX-read-string
+      (TeX-argument-prompt optional prompt "Overlay"))
+     optional)
     (indent-according-to-mode)))
 
 (defun TeX-arg-beamer-frametitle (_optional &optional _prompt)