biblatex 2.6 (9may13)

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

5 files changed, 71 insertions, 71 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index 185499b12ba..d831050b97a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -42,8 +42,8 @@
        {}
        {\printnames{labelname}%
         \setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}}%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
@@ -74,12 +74,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}%
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
        \multicitedelim}}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index b579d1c9efd..5936fe16d88 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-comp.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,sortcites,autocite=inline}
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,sortcites,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite:init}{%
@@ -12,7 +12,7 @@
     {\iffieldundef{prenote}
        {}
        {\global\undef\cbx@lasthash
-	\global\undef\cbx@lastyear}}}
+        \global\undef\cbx@lastyear}}}
 
 \newbibmacro*{cite:reinit}{%
   \global\undef\cbx@lasthash
@@ -22,8 +22,8 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
        {\usebibmacro{cite:label}%
-	\setunit{\addspace}%
-	\usebibmacro{cite:labelyear+extrayear}%
+        \setunit{\addspace}%
+        \usebibmacro{cite:labelyear+extrayear}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
@@ -34,7 +34,7 @@
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{labelyear}{\cbx@lastyear}}}
           {\printnames{labelname}%
-  	   \setunit{\nameyeardelim}%
+           \setunit{\nameyeardelim}%
            \usebibmacro{cite:labelyear+extrayear}%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
@@ -78,29 +78,29 @@
     {\ifnameundef{labelname}
        {\iffieldundef{shorthand}
           {\usebibmacro{cite:label}%
-	   \setunit{%
-	     \global\booltrue{cbx:parens}%
-	     \addspace\bibopenparen}%
-	   \ifnumequal{\value{citecount}}{1}
-	     {\usebibmacro{prenote}}
-	     {}%
-	   \usebibmacro{cite:labelyear+extrayear}}
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \addspace\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \usebibmacro{cite:labelyear+extrayear}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-	  {\usebibmacro{prenote}}
-	  {}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
              {\usebibmacro{cite:labelyear+extrayear}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
-           \global\undef\cbx@lastyear}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+           \global\undef\cbx@lastyear}}%
+       \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
@@ -133,12 +133,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}%
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
        \multicitedelim}}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 56dc3f27d86..77c4b1e0033 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-ibid.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker,
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,pagetracker,
                             ibidtracker=constrict,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index afa46ee3677..0fdb7f60eda 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-icomp.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,ibidtracker=constrict,
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,ibidtracker=constrict,
                             pagetracker,sortcites,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
@@ -32,20 +32,20 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
-	  {\usebibmacro{cite:label}%
-	   \setunit{\addspace}%
-	   \usebibmacro{cite:labelyear+extrayear}%
+          {\usebibmacro{cite:label}%
+           \setunit{\addspace}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \usebibmacro{cite:reinit}}
-	  {\iffieldequals{namehash}{\cbx@lasthash}
+          {\iffieldequals{namehash}{\cbx@lasthash}
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                	  \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-        	{\setunit{\addcomma}%
-        	 \usebibmacro{cite:extrayear}}
-        	{\setunit{\compcitedelim}%
-        	 \usebibmacro{cite:labelyear+extrayear}%
-        	 \savefield{labelyear}{\cbx@lastyear}}}
+                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+                {\setunit{\addcomma}%
+                 \usebibmacro{cite:extrayear}}
+                {\setunit{\compcitedelim}%
+                 \usebibmacro{cite:labelyear+extrayear}%
+                 \savefield{labelyear}{\cbx@lastyear}}}
              {\printnames{labelname}%
-  	      \setunit{\nameyeardelim}%
+              \setunit{\nameyeardelim}%
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
@@ -58,16 +58,16 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
-	  {\usebibmacro{cite:label}%
+          {\usebibmacro{cite:label}%
            \usebibmacro{cite:reinit}}
-	  {\iffieldequals{namehash}{\cbx@lasthash}
+          {\iffieldequals{namehash}{\cbx@lasthash}
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                	  \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-        	{\setunit{\addcomma}%
-        	 \usebibmacro{cite:extrayear}}
-        	{\setunit{\compcitedelim}%
-        	 \usebibmacro{cite:labelyear+extrayear}%
-        	 \savefield{labelyear}{\cbx@lastyear}}}
+                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+                {\setunit{\addcomma}%
+                 \usebibmacro{cite:extrayear}}
+                {\setunit{\compcitedelim}%
+                 \usebibmacro{cite:labelyear+extrayear}%
+                 \savefield{labelyear}{\cbx@lastyear}}}
              {\usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
@@ -91,33 +91,33 @@
     {\ifnameundef{labelname}
        {\iffieldundef{shorthand}
           {\usebibmacro{cite:label}%
-	   \setunit{%
-	     \global\booltrue{cbx:parens}%
-	     \addspace\bibopenparen}%
-	   \ifnumequal{\value{citecount}}{1}
-	     {\usebibmacro{prenote}}
-	     {}%
-	   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
-	     {\usebibmacro{cite:ibid}}
-	     {\usebibmacro{cite:labelyear+extrayear}}}
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \addspace\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\usebibmacro{cite:ibid}}
+             {\usebibmacro{cite:labelyear+extrayear}}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-	  {\usebibmacro{prenote}}
-	  {}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
              {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
-		{\usebibmacro{cite:ibid}}
-		{\usebibmacro{cite:labelyear+extrayear}}}%
+                {\usebibmacro{cite:ibid}}
+                {\usebibmacro{cite:labelyear+extrayear}}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
-           \global\undef\cbx@lastyear}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+           \global\undef\cbx@lastyear}}%
+       \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index c8fb2f891ad..97a4aa9bf21 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,autocite=inline}
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite}{%