[elpa] 237/299: Update biblatex support in style file.

[Stefan Monnier]

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

commit 353eb2a490d642d9f4b707213a9c3fcb2fa2997e
Author: Mosè Giordano <address@hidden>
Date:   Wed Apr 2 23:36:31 2014 +0200

    Update biblatex support in style file.
    
    * style/biblatex.el: Update copyright years and specify last
    `biblatex' version supported.
    (LaTeX-biblatex-executebibliographyoptions-options): Update.
    (LaTeX-biblatex-language-list): Ditto.
    (LaTeX-arg-biblatex-cites): Fix condition on `items' variable to
    adapt to the `TeX-completing-read-multiple' return value change.
---
 ChangeLog         |   10 ++++++++++
 style/biblatex.el |   46 ++++++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31b5104..e024f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2014-04-02  Mos� Giordano  <address@hidden>
+
+       * style/biblatex.el: Update copyright years and specify last
+       `biblatex' version supported.
+       (LaTeX-biblatex-executebibliographyoptions-options): Update.
+       (LaTeX-biblatex-language-list): Ditto.
+       (LaTeX-arg-biblatex-cites): Fix condition on `items' variable to
+       adapt to the `TeX-completing-read-multiple' return value change.
+
 2014-03-17  Nicolas Richard  <address@hidden>
 
        * style/exercise.el: New file.
+
 2014-03-18  Tassilo Horn  <address@hidden>
 
        * doc/auctex.texi: Mention that `TeX-PDF-mode' is enabled by
diff --git a/style/biblatex.el b/style/biblatex.el
index db96364..600e149 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -1,6 +1,6 @@
-;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.5.
+;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.8a.
 
-;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -26,7 +26,7 @@
 
 ;;; Commentary:
 
-;; This file adds support for `biblatex.sty' version 2.5.
+;; This file adds support for `biblatex.sty' version 2.8a.
 
 ;;; Code:
 
@@ -47,8 +47,7 @@
   "List of biblatex entry types.")
 
 (defvar LaTeX-biblatex-executebibliographyoptions-options
-  '(;;; Preamble options
-    ;; General
+  '(;; General
     ("sorting" ("nty" "nyt" "nyvt" "anyt" "anyvt" "ynt" "ydnt" "none" "debug"))
     ("sortcase" ("true" "false"))
     ("sortupper" ("true" "false"))
@@ -66,20 +65,17 @@
     ("minitems")
     ("autocite" ("plain" "inline" "footnote" "superscript"))
     ("autopunct" ("true" "false"))
-    ;; For list of languages, see table 5 of Biblatex reference manual.
-    ("language" ("auto" "catalan" "czech" "danish" "dutch" "american" "british"
-                "canadian" "australian" "newzealand" "finnish" "french"
-                "german" "austrian" "ngernam" "naustrian" "greek" "italian"
-                "norwegian" "brazilian" "portuguese" "russian" "spanish"
-                "swedish"))
+    ("language" (append LaTeX-biblatex-language-list
+                       '("autobib" "autocite" "auto")))
     ("clearlang" ("true" "false"))
-    ("babel" ("none" "hyphen" "other" "other*"))
+    ("autolang" ("none" "hyphen" "other" "other*" "langname"))
     ("block" ("none" "space" "par" "nbpar" "ragged"))
     ("notetype" ("foot+end" "footonly" "endonly"))
-    ("hyperref" ("true" "false"))
+    ("hyperref" ("true" "false" "auto"))
     ("backref" ("true" "false"))
     ("backrefstyle" ("none" "three" "two" "two+" "three+" "all+"))
-    ("backrefsetstyle" ("setonly" "memonly" "setormem" "setandmem" "memandset" 
"setplusmem"))
+    ("backrefsetstyle" ("setonly" "memonly" "setormem" "setandmem" "memandset"
+                       "setplusmem"))
     ("indexing" ("true" "false" "cite" "bib"))
     ("loadfiles" ("true" "false"))
     ("refsection" ("none" "part" "chapter" "section" "subsection"))
@@ -87,6 +83,7 @@
     ("citereset" ("none" "part" "chapter" "section" "subsection"))
     ("abbreviate" ("true" "false"))
     ("date" ("short" "long" "terse" "comp" "iso8601"))
+    ("datelabel" ("year" "short" "long" "terse" "comp" "iso8601"))
     ("origdate" ("short" "long" "terse" "comp" "iso8601"))
     ("eventdate" ("short" "long" "terse" "comp" "iso8601"))
     ("urldate" ("short" "long" "terse" "comp" "iso8601"))
@@ -118,25 +115,26 @@
     ("maxparens")
     ("firstinits" ("true" "false"))
     ("sortfirstinits" ("true" "false"))
-    ("tersefirstinits" ("true" "false"))
+    ("terseinits" ("true" "false"))
     ("labelalpha" ("true" "false"))
     ("maxalphanames")
     ("minalphanames")
-    ("labelnum" ("true" "false"))
+    ("labelnumber" ("true" "false"))
     ("labeltitle" ("true" "false"))
     ("labeltitleyear" ("true" "false"))
-    ("labelyear" ("true" "false"))
+    ("labeldate" ("true" "false"))
     ("singletitle" ("true" "false"))
-    ("uniquename" ("true" "false" "init" "full" "allinit" "allfull" "mininit" 
"minfull"))
+    ("uniquename" ("true" "false" "init" "full" "allinit" "allfull" "mininit"
+                  "minfull"))
     ("uniquelist" ("true" "false" "minyear")))
   "Key=value options for ExecuteBibliographyOptions macro of the biblatex 
package.")
 
 ;; See table 2 of Biblatex reference manual.
 (defvar LaTeX-biblatex-language-list
-  '("catalan" "czech" "danish" "dutch" "american" "british" "canadian"
-    "australian" "newzealand" "finnish" "french" "german" "austrian" "ngernam"
-    "naustrian" "greek" "italian" "norsk" "brazil" "portuguese" "russian"
-    "spanish" "swedish")
+  '("catalan" "croatian" "czech" "danish" "dutch" "american" "british"
+    "canadian" "australian" "newzealand" "finnish" "french" "german" "austrian"
+    "ngernam" "naustrian" "greek" "italian" "norwegian" "polish" "brazilian"
+    "portuguese" "russian" "spanish" "swedish")
   "List of languages supported by biblatex packages.")
 
 (defvar LaTeX-biblatex-addbibresource-options
@@ -194,8 +192,8 @@ for citation keys."
         (TeX-argument-insert
          (TeX-read-string (TeX-argument-prompt t nil "Global postnote"))
          (equal prenote ""))))
-  (let (items noinsert)
-    (while (not (equal items '("")))
+  (let ((items t) (noinsert nil))
+    (while items
       ;; Prompt for prenote and postnote of the current keys.
       (and TeX-arg-cite-note-p (not current-prefix-arg)
           (let ((TeX-arg-opening-brace "[")