biblatex 1.5 (8jun11)

git-svn-id: svn://tug.org/texlive/trunk@22892 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 62 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 55487ad08e0..691a718af65 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 1.4c 2011/05/12 18:28:32 lehman stable $
+% $Id: biblatex.sty,v 1.5 2011/06/08 18:45:46 lehman stable $
 
 % Copyright (c) 2006-2011 Philipp Lehman.
 %
@@ -21,11 +21,11 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.4c 2011/05/12 18:28:32 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.5 2011/06/08 18:45:46 lehman stable $
  programmable bibliographies]
 
 \def\blx@bblversion$#1: #2 ${#2}
-\edef\blx@bblversion{\blx@bblversion$Revision: 1.4 $}
+\edef\blx@bblversion{\blx@bblversion$Revision: 1.5 $}
 
 %% Dependencies
 
@@ -143,7 +143,7 @@
        {\togglefalse{blx@tempa}}
        {}}
     {}%
-  \@ifclassloaded{memoir}%    memoir
+  \@ifclassloaded{memoir}
     {\def\do#1{%
        \patchcmd#1%
 	 {\color@begingroup}
@@ -155,7 +155,16 @@
        \@plainfootnotetext,%
        \@twocolfootnotetext,%
        \@threecolfootnotetext,%
-       \@parafootnotetext}}
+       \@parafootnotetext}%
+     \def\do#1{%
+       \patchcmd#1%
+	 {\color@begingroup\@makefntext}
+	 {\color@begingroup\toggletrue{blx@footnote}\@makefntext}
+	 {}
+	 {}}%
+     \docsvlist{%
+       \@footnotetext,% patch twice
+       \@plainfootnotetext}}
     {}%
   \iftoggle{blx@tempa}
     {\blx@warning@noline{%
@@ -353,6 +362,7 @@
 
 \def\blx@backend{0}
 \def\blx@uniquename{0}
+\def\blx@uniquelist{0}
 \def\blx@maxbibnames{\c@maxnames}
 \def\blx@minbibnames{\c@minnames}
 \def\blx@maxcitenames{\c@maxnames}
@@ -396,7 +406,6 @@
 \newtoggle{blx@labelalpha}
 \newtoggle{blx@labelnumber}
 \newtoggle{blx@labelyear}
-\newtoggle{blx@uniquelist}
 \newtoggle{blx@natbib}
 \newtoggle{blx@mcite}
 \newtoggle{blx@loadfiles}
@@ -3835,6 +3844,8 @@
   \do{compilers}%
   \do{redactor}%
   \do{redactors}%
+  \do{reviser}%
+  \do{revisers}%
   \do{founder}%
   \do{founders}%
   \do{continuator}%
@@ -3925,6 +3936,7 @@
   \do{byeditor}%
   \do{bycompiler}%
   \do{byredactor}%
+  \do{byreviser}%
   \do{byfounder}%
   \do{bycontinuator}%
   \do{bycollaborator}%
@@ -4508,10 +4520,10 @@
   \lefthyphenmin#1\relax
   \righthyphenmin#2\relax}
 
-\def\blx@mkbabel{%
-  \patchcmd\bbl@set@language
-    {\select@language}
-    {\blx@langsetup\languagename\select@language}%
+\begingroup
+\@makeother\#
+\gdef\blx@mkbabel{%
+  \pretocmd\select@language{\blx@langsetup{#1}}
     {\ifdef\blx@thelangenv
        {\def\blx@beglang{%
           \blx@clearlang
@@ -4529,6 +4541,7 @@
      \blx@langsetup\bbl@main@language}
     {\blx@err@patch{'babel' package}%
      \blx@mknobabel}}
+\endgroup
 
 \def\blx@mknobabel{%
   \blx@lbxinput{\blx@languagename}
@@ -8596,7 +8609,7 @@
     \blx@xml@toggle{singletitle}%
     \blx@xml@svalue{sortalphaothers}{\sortalphaothers}%
     \blx@xml@svalue{sortlos}{\blx@sortlos}%
-    \blx@xml@toggle{uniquelist}%
+    \blx@xml@svalue{uniquelist}{\blx@uniquelist}%
     \blx@xml@svalue{uniquename}{\blx@uniquename}%
     \blx@xml@toggle{useauthor}%
     \blx@xml@toggle{useeditor}%
@@ -8622,7 +8635,7 @@
     \blx@xml@toggle{skipbib}%
     \blx@xml@toggle{skiplab}%
     \blx@xml@toggle{skiplos}%
-    \blx@xml@toggle{uniquelist}%
+    \blx@xml@svalue{uniquelist}{\blx@uniquelist}%
     \blx@xml@svalue{uniquename}{\blx@uniquename}%
     \blx@xml@toggle{useauthor}%
     \blx@xml@toggle{useeditor}%
@@ -9644,9 +9657,16 @@
   \settoggle{blx@labelyear}{#1}}
 
 \DeclareBibliographyOption{uniquelist}[true]{%
-  \settoggle{blx@uniquelist}{#1}}
+  \ifcsdef{blx@opt@uniquelist@#1}
+    {\letcs\blx@uniquelist{blx@opt@uniquelist@#1}}
+    {\blx@err@invopt{uniquelist=#1}{}}}
 \DeclareTypeOption{uniquelist}[true]{%
-  \settoggle{blx@uniquelist}{#1}}
+  \ifcsdef{blx@opt@uniquelist@#1}
+    {\letcs\blx@uniquelist{blx@opt@uniquelist@#1}}
+    {\blx@err@invopt{uniquelist=#1}{}}}
+\def\blx@opt@uniquelist@false{0}
+\def\blx@opt@uniquelist@true{1}
+\def\blx@opt@uniquelist@minyear{2}
 
 \DeclareBibliographyOption{uniquename}[true]{%
   \ifcsdef{blx@opt@uniquename@#1}
@@ -9662,6 +9682,8 @@
 \def\blx@opt@uniquename@full{2}
 \def\blx@opt@uniquename@allinit{3}
 \def\blx@opt@uniquename@allfull{4}
+\def\blx@opt@uniquename@mininit{5}
+\def\blx@opt@uniquename@minfull{6}
 
 \DeclareBibliographyOption{singletitle}[true]{%
   \settoggle{blx@singletitle}{#1}}
@@ -9841,12 +9863,32 @@
 
 \AtEndPreamble{%
   \iftoggle{blx@firstinits}
-    {\ifx\blx@uniquename\blx@opt@uniquename@true
-       \setkeys{blx@opt@pre}{uniquename=init}%
-       \blx@warn@conflopt{%
-         'firstinits' conflicts with 'uniquename=true'.\MessageBreak
-         Setting 'uniquename=init'}%
-     \fi}
+    {\ifnumequal\blx@uniquename\blx@opt@uniquename@full
+       {\blx@warn@conflopt{%
+          'firstinits' conflicts with 'uniquename=full'.\MessageBreak
+          Setting 'uniquename=init'}%
+	\setkeys{blx@opt@pre}{uniquename=init}}
+       {}%
+     \ifnumequal\blx@uniquename\blx@opt@uniquename@allfull
+       {\blx@warn@conflopt{%
+          'firstinits' conflicts with 'uniquename=allfull'.\MessageBreak
+          Setting 'uniquename=allinit}%
+	\setkeys{blx@opt@pre}{uniquename=allinit}}
+       {}%
+     \ifnumequal\blx@uniquename\blx@opt@uniquename@minfull
+       {\blx@warn@conflopt{%
+          'firstinits' conflicts with 'uniquename=minfull'.\MessageBreak
+          Setting 'uniquename=mininit}%
+	\setkeys{blx@opt@pre}{uniquename=mininit}}
+       {}}
+    {}%
+  \nottoggle{blx@labelyear}
+    {\ifnumequal\blx@uniquelist\blx@opt@uniquelist@minyear
+       {\blx@warn@conflopt{%
+          'uniquelist=minyear' requires 'labelyear'.\MessageBreak
+          Setting 'uniquelist=true'}%
+        \setkeys{blx@opt@pre}{uniquelist}}
+       {}}
     {}%
   \ifnumgreater\blx@refhook@segment\z@
     {\ifnumgreater\blx@refhook@segment\blx@refhook@section