[elpa] 106/299: Add beamer class options.

[Stefan Monnier]

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

commit 61fbbce678e4ad570672b50712f951dc1e6aa02d
Author: Mosè Giordano <address@hidden>
Date:   Thu Apr 18 19:51:53 2013 +0200

    Add beamer class options.
    
    * style/beamer.el: Update copyright years and remove trailing
    whitespaces.
    ("beamer"): Run style hooks for loaded packages.
    (LaTeX-beamer-class-options): New function.
    
    * style/hyperref.el (LaTeX-hyperref-package-options-list): Rename
    from `LaTeX-hyperref-package-options' to avoid clash with the
    function with the same name.
    ("hyperref"): Use it.
    (LaTeX-hyperref-package-options): Ditto.
---
 ChangeLog         |   13 +++++++++++++
 style/beamer.el   |   29 +++++++++++++++++++++++------
 style/hyperref.el |    8 ++++----
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ee1479..78b9e8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-18  Mos� Giordano  <address@hidden>
+
+       * style/beamer.el: Update copyright years and remove trailing
+       whitespaces.
+       ("beamer"): Run style hooks for loaded packages.
+       (LaTeX-beamer-class-options): New function.
+
+       * style/hyperref.el (LaTeX-hyperref-package-options-list): Rename
+       from `LaTeX-hyperref-package-options' to avoid clash with the
+       function with the same name.
+       ("hyperref"): Use it.
+       (LaTeX-hyperref-package-options): Ditto.
+
 2013-04-17  Mos� Giordano  <address@hidden>
 
        * plain-tex.el (plain-TeX-common-initialization): Fix typo in
diff --git a/style/beamer.el b/style/beamer.el
index cd4fa09..5d05465 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,6 +1,6 @@
 ;;; beamer.el --- AUCTeX style for the latex-beamer class
 
-;; Copyright (C) 2003, 2004, 2005,2008 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2008, 2013 Free Software Foundation
 
 ;; Author: Thomas Baumann <address@hidden>
 ;; Created: 2003-12-20
@@ -56,6 +56,9 @@
  (lambda ()
    (add-hook 'LaTeX-after-insert-env-hooks 'LaTeX-beamer-after-insert-env nil 
t)
 
+   (TeX-run-style-hooks "amsmath" "amssymb" "amsthm" "color" "geometry"
+                       "hyperref" "inputenc" "translator" "xcolor")
+
    (unless LaTeX-beamer-section-labels-flag
      (make-local-variable 'LaTeX-section-hook)
      (setq LaTeX-section-hook
@@ -172,7 +175,7 @@
      (font-lock-set-defaults))))
 
 (defun TeX-arg-beamer-overlay-spec (optional &optional prompt)
-  "Prompt for overlay specification." 
+  "Prompt for overlay specification."
   (let ((overlay (read-string "(Optional) Overlay: ")))
     (unless (zerop (length overlay))
       (insert "<" overlay ">"))
@@ -182,13 +185,13 @@
   "Prompt for the frametitle."
   (let ((title (read-string "Title: ")))
     (if (not (zerop (length title)))
-        (insert TeX-grop TeX-esc "frametitle" TeX-grop 
+        (insert TeX-grop TeX-esc "frametitle" TeX-grop
                title TeX-grcl TeX-grcl)
       (insert TeX-grop TeX-grcl))))
 
 (defun LaTeX-item-beamer ()
-  "Insert a new item with an optional overlay argument. You 
-can turn off the prompt for the overlay argument by setting 
+  "Insert a new item with an optional overlay argument. You
+can turn off the prompt for the overlay argument by setting
 `LaTeX-beamer-item-overlay-flag' to nil. Calling the function
 with a prefix argument prompts for the overlay specification
 unconditionally."
@@ -201,7 +204,7 @@ unconditionally."
       (TeX-arg-beamer-overlay-spec 0))
   (insert " ")
   (indent-according-to-mode))
-  
+
 (defun TeX-arg-beamer-note (optional &optional prompt)
   "Prompt for overlay specification and optional argument."
   (let ((overlay (read-string "(Optional) Overlay: "))
@@ -333,4 +336,18 @@ also be a string.  Then the length of the string is used."
     nil nil nil)
    t))
 
+(defun LaTeX-beamer-class-options ()
+  "Read the beamer class options from the user."
+  (TeX-read-key-val t '(("usepdftitle" ("false")) ("envcountsect")
+                       ("notheorems") ("noamsthm") ("compress") ("t") ("c")
+                       ("leqno") ("fleqn") ("handout") ("trans") ("pdftex")
+                       ("nativepdf") ("pdfmark") ("dvips") ("dviwindo")
+                       ("dvipsone") ("vtex") ("ps2pdf") ("ignorenonframetext")
+                       ("noamssymb") ("bigger") ("smaller") ("8pt") ("9pt")
+                       ("10pt") ("11pt") ("12pt") ("14pt") ("17pt") ("20pt")
+                       ("draft") ("CJK") ("cjk") ("pgf")
+                       ("hyperref" LaTeX-hyperref-package-options-list)
+                       ("color") ("xcolor") ("ucs") ("utf8x") ("utf8")
+                       ("aspectratio" ("1610" "169" "149" "54" "43" "32")))))
+
 ;;; beamer.el ends here
diff --git a/style/hyperref.el b/style/hyperref.el
index f5e708b..bfd47a4 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(defvar LaTeX-hyperref-package-options
+(defvar LaTeX-hyperref-package-options-list
   '(;; See http://www.tug.org/applications/hyperref/manual.html#x1-40003
     ;; General options
     ("draft" ("true" "false"))
@@ -67,7 +67,7 @@
     ("vtex")
     ("vtexpdfmark")
     ("xetex")
-    ;;  Extension options
+    ;; Extension options
     ("extension")
     ("hyperfigures" ("true" "false"))
     ("backref" ("section" "slide" "page" "none" "false"))
@@ -161,7 +161,7 @@
    (TeX-run-style-hooks "url" "nameref")
 
    (TeX-add-symbols
-    '("hypersetup" (TeX-arg-key-val LaTeX-hyperref-package-options))
+    '("hypersetup" (TeX-arg-key-val LaTeX-hyperref-package-options-list))
     '("href" [ (TeX-arg-key-val LaTeX-hyperref-href-options) ] "URL" "Text")
     '("nolinkurl" t)
     '("hyperbaseurl" t)
@@ -230,6 +230,6 @@
 
 (defun LaTeX-hyperref-package-options ()
   "Read the hyperref package options from the user."
-  (TeX-read-key-val t LaTeX-hyperref-package-options))
+  (TeX-read-key-val t LaTeX-hyperref-package-options-list))
 
 ;;; hyperref.el ends here