monnier pushed a commit to branch externals/auctex
in repository elpa.
commit dcb5b9a2b43acb1c038fddbe65cfeb7030b57599
Author: Tassilo Horn <[email protected]>
Date: Mon Jan 14 19:37:34 2013 +0000
* style/listings.el: Update copyright range.
(LaTeX-listings-key-val-options, "listings")
(LaTeX-listings-package-options): Update to recent listings
version.
---
ChangeLog | 5 ++++
style/listings.el | 56 +++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3c8cea7..0f6cf28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
("varioref"): Add more definitions.
(LaTeX-varioref-package-options): Reformat.
+ * style/listings.el: Update copyright range.
+ (LaTeX-listings-key-val-options, "listings")
+ (LaTeX-listings-package-options): Update to recent listings
+ version.
+
2013-01-14 Tassilo Horn <[email protected]>
* Makefile.in (STYLESRC): Enable memoir.el style.
diff --git a/style/listings.el b/style/listings.el
index cfb11e9..7b467ed 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -1,6 +1,6 @@
;;; listings.el --- AUCTeX style for `listings.sty'
-;; Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2009, 2013 Free Software Foundation, Inc.
;; Author: Ralf Angeli <[email protected]>
;; Maintainer: [email protected]
@@ -33,8 +33,7 @@
;;; Code:
;; The following are options taken from chapter 4 of the listings
-;; manual (2006/05/08 Version 1.3c). Experimental options described
-;; in chapter 5 are not included.
+;; manual (2007/02/22 Version 1.4).
(defvar LaTeX-listings-key-val-options
'(;; Space and placement
("float" ("t" "b" "p" "h")) ; Support [*] as an optional prefix and that
@@ -102,6 +101,7 @@
("caption") ; Insert braces?
("label")
("nolol" ("true" "false"))
+ ("numberbychapter" ("true" "false"))
("captionpos" ("t" "b")) ; Can be a subset of tb.
("abovecaptionskip")
("belowcaptionskip")
@@ -141,8 +141,9 @@
("deleteindex")
("indexstyle")
;; Column alignment
- ("columns" ("fixed" "flexible" "fullflexible")) ; Also supports an optional
- ; argument with {c,l,r}.
+ ("columns" ("fixed" "flexible" "fullflexible" "spaceflexible")) ;
+ ; Also supports an optional
+ ; argument with {c,l,r}.
("flexiblecolumns" ("true" "false"))
("keepspaces" ("true" "false"))
("basewidth")
@@ -185,7 +186,35 @@
("morekeywordcomment")
("deletekeywordcomment")
("keywordcommentsemicolon")
- ("podcomment" ("true" "false")))
+ ("podcomment" ("true" "false"))
+ ;; The following are all options from chapter 5, which are
+ ;; experimental
+ ;; Export of identifiers
+ ("procnamekeys")
+ ("moreprocnamekeys")
+ ("deleteprocnamekeys")
+ ("procnamestyle")
+ ("indexprocnames" ("true" "false"))
+ ;; Hyperlink references
+ ("hyperref")
+ ("morehyperref")
+ ("deletehyperref")
+ ("hyperanchor")
+ ("hyperlink")
+ ;; Literate programming
+ ("literate") ;; three arguments: replace,replacement text,length
+ ;; LGrind definitions
+ ("lgrindef")
+ ;; Arbitrary linerange markers
+ ("rangebeginprefix")
+ ("rangebeginsuffix")
+ ("rangeendprefix")
+ ("rangeendsuffix")
+ ("rangeprefix")
+ ("rangesuffix")
+ ("includerangemarker" ("true" "false"))
+ ;; Multicolumn Listing
+ ("multicolumn"))
"Key=value options for listings macros and environments.")
(TeX-add-style-hook
@@ -202,7 +231,15 @@
"lstlistoflistings"
'("lstnewenvironment" "Name" ["Number or arguments"] ["Default argument"]
"Starting code" "Ending code")
- '("lstset" (TeX-arg-key-val LaTeX-listings-key-val-options)))
+ '("lstset" (TeX-arg-key-val LaTeX-listings-key-val-options))
+ '("lstloadlanguages" t)
+ ;; 4.17 Short Inline Listing Commands
+ '("lstMakeShortInline" [ "Options" ] "Character")
+ '("lstDeleteShortLine" "Character")
+
+ "lstgrinddeffile" "lstaspectfiles" "lstlanguagefiles"
+ "lstlistingname" "lstlistlistingname")
+
;; New environments
(LaTeX-add-environments
'("lstlisting" LaTeX-env-args
@@ -237,7 +274,10 @@
(font-lock-set-defaults))))
(defvar LaTeX-listings-package-options '("draft" "final" "savemem"
- "noaspects")
+ "noaspects"
+ ;; procnames is mentioned in
+ ;; Section 5.2
+ "procnames")
"Package options for the listings package.")
;;; listings.el ends here
