[elpa] 110/299: Set default environment for some class styles.

[Stefan Monnier]

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

commit 13b1ad9e7e1d8a3d0526006707b16922ea9359c8
Author: Mosè Giordano <address@hidden>
Date:   Sun Apr 21 23:46:50 2013 +0200

    Set default environment for some class styles.
    
    * style/beamer.el ("beamer"): Set `frame' as default environment.
    Set `section' as largest sectioning level.  Add fontification for
    `title', `author', and `date'.
    
    * style/letter.el ("letter"): Set `letter' as default environment.
    Add some macros and fontification.
    
    * style/slides.el ("slides"): Set `slide' as default environment.
---
 ChangeLog       |    9 ++++++++
 style/beamer.el |    8 ++++++-
 style/letter.el |   61 ++++++++++++++++++++++++++++++++++++++++++------------
 style/slides.el |    3 +-
 4 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a93901..2692734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2013-04-21  Mos� Giordano  <address@hidden>
 
+       * style/beamer.el ("beamer"): Set `frame' as default environment.
+       Set `section' as largest sectioning level.  Add fontification for
+       `title', `author', and `date'.
+
+       * style/letter.el ("letter"): Set `letter' as default environment.
+       Add some macros and fontification.
+
+       * style/slides.el ("slides"): Set `slide' as default environment.
+
        * latex.el (TeX-arg-insert-braces): Move
        `indent-according-to-mode' after `save-excursion' because
        `LaTeX-newline' (used in `save-excursion') deletes trailing
diff --git a/style/beamer.el b/style/beamer.el
index 4f0c639..fdd2293 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -71,6 +71,8 @@
                   ("enumerate" . LaTeX-item-beamer))
                 LaTeX-item-list))
 
+   (setq LaTeX-default-environment "frame")
+
    (LaTeX-paragraph-commands-add-locally "frametitle")
 
    (TeX-add-symbols
@@ -157,6 +159,7 @@
                          (format "[%s]" width))))))
     "semiverbatim")
 
+   (LaTeX-largest-level-set "section")
    (LaTeX-add-counters "lecture" "part" "section" "subsection" "subsubsection"
                       "subsectionslide" "framenumber" "figure" "table"
                       "beamerpauses")
@@ -171,7 +174,10 @@
    ;; Fontification
    (when (and (featurep 'font-latex)
              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("frametitle" "<[{")) 'slide-title)
+     (font-latex-add-keywords '(("title" "[{")
+                               ("author" "[{")
+                               ("date" "[{")
+                               ("frametitle" "<[{")) 'slide-title)
      ;; For syntactic fontification, e.g. verbatim constructs.
      (font-latex-set-syntactic-keywords)
      ;; Tell font-lock about the update.
diff --git a/style/letter.el b/style/letter.el
index 76ec022..de7abba 100644
--- a/style/letter.el
+++ b/style/letter.el
@@ -32,28 +32,61 @@
   "Package options for the letter class.")
 
 ;; You may want to define this in tex-site.el to contain your
-;; organizations address.  
+;; organizations address.
 (defvar LaTeX-letter-sender-address ""
   "Initial value when prompting for a sender address in the letter style.")
 
-(TeX-add-style-hook "letter"
- (function
-  (lambda ()
-    (LaTeX-add-environments
-     '("letter" LaTeX-env-recipient))
-    (LaTeX-add-pagestyles "headings" "firstpage")
-    (TeX-add-symbols
-     '("name" "Sender: ") 
-     '("address" "Sender address: ")
-     '("signature" "Signature: ")
-     '("opening" "Opening: ")
-     '("closing" "Closing: ")))))
+(TeX-add-style-hook
+ "letter"
+ (lambda ()
+   (LaTeX-add-environments
+    '("letter" LaTeX-env-recipient))
+   (LaTeX-add-pagestyles "headings" "firstpage")
+   (setq LaTeX-default-environment "letter")
+   (TeX-add-symbols
+    '("name" "Sender: ")
+    '("address" "Sender address: ")
+    '("signature" "Signature: ")
+    '("opening" "Opening: ")
+    '("closing" "Closing: ")
+    "location"
+    "telephone"
+    "makelabels"
+    "stopbreaks"
+    "startbreaks"
+    "cc"
+    "encl"
+    "ps"
+    "stopletter"
+    "returnaddress"
+    "startlabels"
+    "mlabel"
+    "descriptionlabel"
+    "ccname"
+    "enclname"
+    "pagename"
+    "headtoname")
+
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("name" "{")
+                               ("address" "{")
+                               ("signature" "{")
+                               ("opening" "{")
+                               ("closing" "{")
+                               ("location" "{")
+                               ("telephone" "{")
+                               ("cc" "{")
+                               ("encl" "{")
+                               ("ps" "{"))
+                             'function))))
 
 (defun LaTeX-env-recipient (environment)
   "Insert ENVIRONMENT and prompt for recipient and address."
   (let ((sender (read-string "Sender: " (user-full-name)))
        (sender-address (read-string "Sender address: "
-                                   LaTeX-letter-sender-address))
+                                    LaTeX-letter-sender-address))
        (recipient (read-string "Recipient: "))
        (address (read-string "Recipient address: "))
        (signature (read-string "Signature: "))
diff --git a/style/slides.el b/style/slides.el
index 8760dc8..e873a6a 100644
--- a/style/slides.el
+++ b/style/slides.el
@@ -44,6 +44,7 @@
                           "overlay"
                           "note")
    (LaTeX-add-counters "minutes" "seconds")
-   (LaTeX-add-pagestyles "headings" "slide" "overlay" "note")))
+   (LaTeX-add-pagestyles "headings" "slide" "overlay" "note")
+   (setq LaTeX-default-environment "slide")))
 
 ;;; slides.el ends here