biblatex 0.9d (4sep10)

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

85 files changed, 3754 insertions, 2159 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
index 39859f98d69..3b9232a2d39 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{alphabetic}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index d81006e7790..73c25c368fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index 062f08718d7..3d8bbe68dd4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
index cf586c9787b..bae7a30891d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
index 9ba53fa2b09..22d48fa135f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
index 4f3508759fa..21dca612f13 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
index 5cb8bf6bed6..9e84f2523d7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
new file mode 100644
index 00000000000..f6ae2f26897
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
@@ -0,0 +1,8 @@
+% $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+
+\ProvidesFile{authortitle-ticomp.bbx}
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+
+\RequireBibliographyStyle{authortitle}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index ac08c959d7e..184e5249cd1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{pagetracker}
@@ -56,15 +56,16 @@
   \finentry}
 
 \renewbibmacro*{author}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{author}%
 	\setunit{\addcomma\space}%
-        \usebibmacro{bbx:savehash}}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{authorstrg}}
     {\global\undef\bbx@lasthash}}
 
@@ -73,15 +74,16 @@
 \renewbibmacro*{editor+others}{%
   \usebibmacro{bbx:editor}{editor+othersstrg}}
 \newbibmacro*{bbx:editor}[1]{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
 	\setunit{\addcomma\space}%
-        \usebibmacro{bbx:savehash}}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}}
     {\global\undef\bbx@lasthash}}
@@ -91,11 +93,12 @@
 \renewbibmacro*{translator+others}{%
   \usebibmacro{bbx:translator}{translator+othersstrg}}
 \newbibmacro*{bbx:translator}[1]{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
 	\setunit{\addcomma\space}%
@@ -104,4 +107,19 @@
      \clearname{translator}}
     {\global\undef\bbx@lasthash}}
 
+\newbibmacro*{bbx:dashcheck}[2]{%
+  \ifboolexpr{
+    test {\iffieldequals{fullhash}{\bbx@lasthash}}
+    and
+    not test \iffirstonpage
+    and
+    (
+       not bool {bbx@inset}
+       or
+       test {\iffieldequalstr{entrysetcount}{1}}
+    )
+  }
+    {#1}
+    {#2}}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
index 0afe2cb9687..e39175ca4b5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
index 013f753ab7c..0b288eee160 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
index e730c30f017..b7026d43a13 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index a00b58e13b8..c4fc460d66b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
@@ -56,11 +56,12 @@
   \finentry}
 
 \renewbibmacro*{author}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\usebibmacro{bbx:savehash}%
         \printnames{author}%
@@ -81,11 +82,12 @@
 \renewbibmacro*{editor+others}{%
   \usebibmacro{bbx:editor}{editor+othersstrg}}
 \newbibmacro*{bbx:editor}[1]{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
 	\setunit{\addcomma\space}%
@@ -103,11 +105,12 @@
 \renewbibmacro*{translator+others}{%
   \usebibmacro{bbx:translator}{translator+othersstrg}}
 \newbibmacro*{bbx:translator}[1]{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
 	\setunit{\addcomma\space}%
@@ -120,6 +123,21 @@
      \setunit*{\addspace}}%
   \usebibmacro{date+extrayear}}
 
+\newbibmacro*{bbx:dashcheck}[2]{%
+  \ifboolexpr{
+    test {\iffieldequals{fullhash}{\bbx@lasthash}}
+    and
+    not test \iffirstonpage
+    and
+    (
+       not bool {bbx@inset}
+       or
+       test {\iffieldequalstr{entrysetcount}{1}}
+    )
+  }
+    {#1}
+    {#2}}
+
 \newbibmacro*{date+extrayear}{%
   \iffieldundef{year}
     {}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 0bbdd2aa878..2a196206e55 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,7 +1,7 @@
-% $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{sorting=debug}
 \DeclareFieldFormat{entrykey}{\ttfamily[#1]}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index d3a913fd255..18541bf5bf1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -1,7 +1,7 @@
-% $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{sorting=debug}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
index 6c4a3169231..7282ad5a4fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{numeric}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
index 6c8256ece60..b9bcec93050 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{numeric}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 5aca28eb5b8..160036883b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelnumber}
@@ -21,7 +21,9 @@
 
 \defbibenvironment{bibliography}
   {\list
-     {\printfield[labelnumberwidth]{labelnumber}}
+     {\printtext[labelnumberwidth]{%
+	\printfield{prefixnumber}%
+	\printfield{labelnumber}}}
      {\setlength{\labelwidth}{\labelnumberwidth}%
       \setlength{\leftmargin}{\labelwidth}%
       \setlength{\labelsep}{\biblabelsep}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index 1accffc4fcb..a9111ac67ce 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -1,7 +1,7 @@
-% $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 40e8b728c27..a7ea8e96e04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \newtoggle{bbx:isbn}
 \newtoggle{bbx:url}
@@ -437,9 +437,7 @@
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \iftoggle{bbx:url}
-    {\usebibmacro{url+urldate}}
-    {}%
+  \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
   \newunit\newblock
@@ -592,7 +590,7 @@
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
-  \usebibmacro{date}%
+  \usebibmacro{location+date}%
   \newunit\newblock
   \iftoggle{bbx:url}
     {\usebibmacro{url+urldate}}
@@ -660,17 +658,20 @@
     {\newunit
      \printfield{series}%
      \setunit{\addspace}}%
-  \printfield{volume}%
-  \setunit*{\adddot}%
-  \printfield{number}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}%
+  \usebibmacro{volume+number+eid}%
   \setunit{\addspace}%
   \usebibmacro{issue+date}%
   \setunit{\addcolon\space}%
   \usebibmacro{issue}%
   \newunit}
 
+\newbibmacro*{volume+number+eid}{%
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
 \newbibmacro*{title+issuetitle}{%
   \usebibmacro{periodical}%
   \setunit*{\addspace}%
@@ -693,18 +694,21 @@
 \newbibmacro*{issue+date}{%
   \printtext[parens]{%
     \iffieldundef{issue}
-      {\printdate}
+      {\usebibmacro{date}}
       {\printfield{issue}%
-       \setunit{\addspace}%
-       \printfield{year}}}%
+       \setunit*{\addspace}%
+       \usebibmacro{date}}}%
   \newunit}
 
 \newbibmacro*{event+venue+date}{%
   \printfield{eventtitle}%
-  \ifthenelse{\iffieldundef{venue}\AND
-	      \iffieldundef{eventyear}}
+  \ifboolexpr{
+    test {\iffieldundef{venue}}
+    and
+    test {\iffieldundef{eventyear}}
+  }
     {}
-    {\setunit{\addspace}%
+    {\setunit*{\addspace}%
      \printtext[parens]{%
        \printfield{venue}%
        \setunit*{\addcomma\space}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
index 23e05cb435d..468bbdc26b8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
index 7a5ed0f13b5..4ef0943b977 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
index 7de32f6a938..853bd821383 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
index c2249146e9d..a947435dd02 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
index 461a1fc3ab7..848a2b05e97 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
index 103cd55742a..8145890b9cc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
index a729977481c..17cec628b58 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index 9e2d6241156..0f41241c1e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
@@ -1,4 +1,4 @@
-% $Id: biblatex.cfg,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: biblatex.cfg,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{biblatex.cfg}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index d93c45ac12e..3a8b62b2065 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+[\abx@rcsid $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -41,6 +41,7 @@
 \newcommand*{\supercitedelim}{\addcomma}
 \newcommand*{\prenotedelim}{\addspace}
 \newcommand*{\postnotedelim}{\addcomma\space}
+\newcommand*{\nametitledelim}{\addcomma\space}
 \newcommand*{\nameyeardelim}{\addspace}
 
 % Used in the bibliography and the list of shorthands
@@ -164,7 +165,7 @@
 % dislike such linebreaks, use a higher value. If you do not mind
 % them at all, set this counter to zero. If you want to suppress them
 % unconditionally, set it to 10000.
-\setcounter{abbrvpenalty}{\hyphenpenalty}
+\defcounter{abbrvpenalty}{\hyphenpenalty}
 
 % The counter 'highnamepenalty' also holds a penalty affecting the
 % line-breaking of names. This penalty is inserted between smaller
@@ -173,7 +174,7 @@
 % linebreaks, use a higher value. If you do not mind them at all,
 % set this counter to zero. If you prefer the traditional BibTeX
 % behavior, set it to 10000.
-\setcounter{highnamepenalty}{\hyphenpenalty}
+\defcounter{highnamepenalty}{\hyphenpenalty}
 
 % The counter 'lownamepenalty' holds a penalty which affects the
 % line-breaking of names. This penalty is inserted between larger
@@ -181,7 +182,7 @@
 % first names and the last name. The default value is half the
 % \hyphenpenalty. If you dislike such linebreaks, use a higher
 % value. If you do not mind them at all, set this counter to zero.
-\setcounter{lownamepenalty}{\numexpr\hyphenpenalty/2\relax}
+\defcounter{lownamepenalty}{\hyphenpenalty/2}
 
 % Note that default values assigned to the above counters are
 % deliberately very low to prevent overfull boxes. This implies that
@@ -301,27 +302,47 @@
   \addcolon\space
   \ifhyperref
     {\url{#1}}
+    {\nolinkurl{#1}}%
+  \iffieldundef{eprintclass}
+    {}
+    {\addspace\mkbibparens{\thefield{eprintclass}}}}
+\DeclareFieldFormat{eprint:hdl}{%
+  HDL\addcolon\space
+  \ifhyperref
+    {\href{http://hdl.handle.net/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
+\DeclareFieldAlias{eprint:HDL}{eprint:hdl}
 \DeclareFieldFormat{eprint:arxiv}{%
-  arXiv\addcolon\space
+  arXiv\addcolon
   \ifhyperref
-    {\href{http://arxiv.org/\abx@arxivpath/#1}{\nolinkurl{#1}}}
-    {\nolinkurl{#1}}}
+    {\href{http://arxiv.org/\abx@arxivpath/#1}{%
+       \nolinkurl{#1}%
+       \iffieldundef{eprintclass}
+	 {}
+	 {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+    {\nolinkurl{#1}
+     \iffieldundef{eprintclass}
+       {}
+       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+\DeclareFieldAlias{eprint:arXiv}{eprint:arxiv}
 \DeclareFieldFormat{eprint:jstor}{%
   JSTOR\addcolon\space
   \ifhyperref
     {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
+\DeclareFieldAlias{eprint:JSTOR}{eprint:jstor}
 \DeclareFieldFormat{eprint:pubmed}{%
   PMID\addcolon\space
   \ifhyperref
     {\href{http://www.ncbi.nlm.nih.gov/pubmed/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
+\DeclareFieldAlias{eprint:PubMed}{eprint:pubmed}
 \DeclareFieldFormat{eprint:googlebooks}{%
   Google Books\addcolon\space
   \ifhyperref
     {\href{http://books.google.com/books?id=#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
+\DeclareFieldAlias{eprint:Google Books}{eprint:googlebooks}
 \DeclareFieldFormat{file}{\url{#1}}
 \DeclareFieldFormat{isbn}{\mkbibacro{ISBN}\addcolon\space #1}
 \DeclareFieldFormat{isrn}{\mkbibacro{ISRN}\addcolon\space #1}
@@ -365,7 +386,7 @@
 \DeclareFieldAlias[periodical]{series}[article]{series}
 \DeclareFieldAlias[periodical]{volume}[article]{volume}
 
-% Generic formats for \printtext
+% Generic formats for \printtext and \printfield
 
 \DeclareFieldFormat{emph}{\mkbibemph{#1}}
 \DeclareFieldFormat{bold}{\textbf{#1}}
@@ -429,7 +450,10 @@
 
 \DeclareListFormat{pageref}{%
   \ifnumless{\abx@pagerefstyle}{0}
-    {\usebibmacro{list:plain}#1}
+    {\usebibmacro{list:plain}%
+     \ifhyperref
+       {\hyperlink{page.#1}{#1}}
+       {#1}}
     {\ifnumequal{\value{listcount}}{1}
        {\usebibmacro{pageref:init}}
        {}%
@@ -447,22 +471,30 @@
 % ------------------------------------------------------------------
 
 \newbibmacro*{list:delim}[1]{%
-  \ifthenelse{\value{listcount}>\value{liststart}}
-    {\ifthenelse{\value{listcount}<\value{liststop}\OR
-                 \ifmoreitems}
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
+    {\ifboolexpr{
+       test {\ifnumless{\value{listcount}}{\value{liststop}}}
+       or
+       test \ifmoreitems
+     }
        {\multilistdelim}
        {\lbx@finallistdelim{#1}}}
     {}}
 
 \newbibmacro*{list:plain}{%
-  \ifthenelse{\value{listcount}>\value{liststart}}
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
     {\multilistdelim}
     {}}
 
 \newbibmacro*{list:andothers}{%
-  \ifthenelse{\value{listcount}=\value{liststop}\AND
-              \ifmoreitems}
-    {\ifnumgreater{\value{liststop}}{1}{\finalandcomma}{}%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmoreitems
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
      \andmoredelim\bibstring{andmore}}
     {}}
 
@@ -705,23 +737,38 @@
     {}}
 
 \newbibmacro*{name:delim}[1]{%
-  \ifthenelse{\value{listcount}>\value{liststart}}
-    {\ifthenelse{\value{listcount}<\value{liststop}\OR
-                 \ifmorenames}
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
+    {\ifboolexpr{
+       test {\ifnumless{\value{listcount}}{\value{liststop}}}
+       or
+       test \ifmorenames
+     }
        {\multinamedelim}
        {\lbx@finalnamedelim{#1}}}
     {}}
 
 \newbibmacro*{name:revsdelim}{%
-  \ifthenelse{\(\value{liststop}=1\AND\ifmorenames\)\OR
-                \value{liststop}=2}
+  \ifboolexpr{
+    (
+      test {\ifnumequal{\value{liststop}}{1}}
+      and
+      test \ifmorenames
+    )
+    or
+    test {\ifnumequal{\value{liststop}}{2}}
+  }
     {\revsdnamedelim}
     {}}
 
 \newbibmacro*{name:andothers}{%
-  \ifthenelse{\value{listcount}=\value{liststop}\AND
-              \ifmorenames}
-    {\ifnumgreater{\value{liststop}}{1}{\finalandcomma}{}%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmorenames
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
      \andothersdelim\bibstring{andothers}}
     {}}
 
@@ -853,10 +900,15 @@
 \newcommand*{\lbx@finalnamedelim}[1]{\finalnamedelim}
 \newcommand*{\lbx@finallistdelim}[1]{\finallistdelim}
 
-\newcommand*{\lbx@fromlang}{%
+\newcommand*{\lbx@lfromlang}{%
+  \iffieldundef{origlanguage}
+    {\unspace}
+    {\biblstring{from\thefield{origlanguage}}}}
+
+\newcommand*{\lbx@sfromlang}{%
   \iffieldundef{origlanguage}
     {\unspace}
-    {\bibstring{from\thefield{origlanguage}}}}
+    {\bibsstring{from\thefield{origlanguage}}}}
 
 % ------------------------------------------------------------------
 % MISCELLANEOUS
@@ -898,7 +950,7 @@
 % spanish
 
 \newcounter{smartand}
-\setcounter{smartand}{1}
+\defcounter{smartand}{1}
 \newrobustcmd*{\forceY}[1]{#1}
 \newrobustcmd*{\forceE}[1]{#1}
 
@@ -920,11 +972,9 @@
            {\@ifclassloaded{scrreprt}
               {\def\abx@classtype{3}}
               {\@ifclassloaded{memoir}
-                {\ifartopt
-                   \def\abx@classtype{4}%
-                 \else
-                   \def\abx@classtype{5}%
-                 \fi}
+                {\ifbool{artopt}
+		   {\def\abx@classtype{4}}
+		   {\def\abx@classtype{5}}}
                 {\ifundef\chapter
                    {}
                    {\def\abx@classtype{1}}}}}}}}}
@@ -932,18 +982,18 @@
 \ifcase\abx@classtype\relax % article
   \defbibheading{bibliography}[\refname]{%
     \section*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \section*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \section*{#1}%
     \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{losintoc}[\losname]{%
     \section*{#1}%
     \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\refname]{%
     \section{#1}%
     \if@twoside\markright{\MakeUppercase{#1}}\fi}
@@ -961,18 +1011,18 @@
 \or % book/report
   \defbibheading{bibliography}[\bibname]{%
     \chapter*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \chapter*{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \chapter*{#1}%
     \addcontentsline{toc}{chapter}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{losintoc}[\losname]{%
     \chapter*{#1}%
     \addcontentsline{toc}{chapter}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
     \if@twoside\markright{\MakeUppercase{#1}}\fi}
@@ -996,26 +1046,26 @@
       {\ifkomabibtotoc
          {\addsec{#1}}
          {\section*{#1}}%
-       \markboth{#1}{#1}}}
+       \@mkboth{#1}{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \ifkomabibtotocnumbered
       {\section{#1}}
       {\ifkomabibtotoc
          {\addsec{#1}}
          {\section*{#1}}%
-       \markboth{#1}{#1}}}
+       \@mkboth{#1}{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \addsec{#1}%
-    \markboth{#1}{#1}}
+    \@mkboth{#1}{#1}}
   \defbibheading{losintoc}[\losname]{%
     \addsec{#1}%
-    \markboth{#1}{#1}}
+    \@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\refname]{%
     \section{#1}%
-    \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+    \@mkboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
   \defbibheading{losnumbered}[\losname]{%
     \section{#1}%
-    \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+    \@mkboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
   \defbibheading{subbibliography}[\refname]{%
     \subsection*{#1}}
   \defbibheading{subbibintoc}[\refname]{%
@@ -1031,32 +1081,32 @@
       {\ifkomabibtotoc
          {\addchap{#1}}
          {\chapter*{#1}}%
-       \markboth{#1}{#1}}}
+       \@mkboth{#1}{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \ifkomabibtotocnumbered
       {\chapter{#1}}
       {\ifkomabibtotoc
          {\addchap{#1}}
          {\chapter*{#1}}%
-       \markboth{#1}{#1}}}
+       \@mkboth{#1}{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \addchap{#1}%
-    \markboth{#1}{#1}}
+    \@mkboth{#1}{#1}}
   \defbibheading{losintoc}[\losname]{%
     \addchap{#1}%
-    \markboth{#1}{#1}}
+    \@mkboth{#1}{#1}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
-    \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+    \@mkboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
   \defbibheading{losnumbered}[\losname]{%
     \chapter{#1}%
-    \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+    \@mkboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
   \defbibheading{subbibliography}[\refname]{%
     \section*{#1}%
     \if@twoside\markright{\sectionmarkformat#1}\fi}
   \defbibheading{subbibintoc}[\refname]{%
     \addsec{#1}%
-    \markboth{#1}{#1}}
+    \@mkboth{#1}{#1}}
   \defbibheading{subbibnumbered}[\refname]{%
     \section{#1}}
 
@@ -1067,24 +1117,24 @@
       {\phantomsection
        \addcontentsline{toc}{section}{#1}}
       {}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \section*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{section}{#1}}
       {}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \section*{#1}%
     \phantomsection
     \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{losintoc}[\losname]{%
     \section*{#1}%
     \phantomsection
     \addcontentsline{toc}{section}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\refname]{%
     \section{#1}}
   \defbibheading{losnumbered}[\losname]{%
@@ -1111,24 +1161,24 @@
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{shorthands}[\losname]{%
     \chapter*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{losintoc}[\losname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
     \if@twoside\markright{\MakeUppercase{#1}}\fi}
@@ -1349,41 +1399,77 @@
     {}}
 
 \newbibmacro*{author/editor}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
     {\usebibmacro{editor}}}
 
 \newbibmacro*{author/editor+others}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
     {\usebibmacro{editor+others}}}
 
 \newbibmacro*{author/translator}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
     {\usebibmacro{translator}}}
 
 \newbibmacro*{author/translator+others}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
     {\usebibmacro{translator+others}}}
 
 \newbibmacro*{author/editor/translator}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
+    {\ifboolexpr{
+       test \ifuseeditor
+       and
+       not test {\ifnameundef{editor}}
+     }
        {\usebibmacro{editor}}
        {\usebibmacro{translator}}}}
 
 \newbibmacro*{author/editor+others/translator+others}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\usebibmacro{author}}
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
+    {\ifboolexpr{
+       test \ifuseeditor
+       and
+       not test {\ifnameundef{editor}}
+     }
        {\usebibmacro{editor+others}}
        {\usebibmacro{translator+others}}}}
 
 \newbibmacro*{author}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
     {\printnames{author}%
      \iffieldundef{authortype}
        {}
@@ -1392,7 +1478,11 @@
     {}}
 
 \newbibmacro*{editor}{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
     {\printnames{editor}%
      \setunit{\addcomma\space}%
      \usebibmacro{editorstrg}%
@@ -1400,7 +1490,11 @@
     {}}
 
 \newbibmacro*{editor+others}{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
     {\printnames{editor}%
      \setunit{\addcomma\space}%
      \usebibmacro{editor+othersstrg}%
@@ -1408,7 +1502,11 @@
     {}}
 
 \newbibmacro*{translator}{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
     {\printnames{translator}%
      \setunit{\addcomma\space}%
      \usebibmacro{translatorstrg}%
@@ -1416,7 +1514,11 @@
     {}}
 
 \newbibmacro*{translator+others}{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
     {\printnames{translator}%
      \setunit{\addcomma\space}%
      \usebibmacro{translator+othersstrg}%
@@ -1426,25 +1528,45 @@
 \newbibmacro*{authorstrg}{%
   \iffieldundef{authortype}
     {}
-    {\ifthenelse{\value{author}>1\OR\ifandothers{author}}
+    {\ifboolexpr{
+       test {\ifnumgreater{\value{author}}{1}}
+       or
+       test {\ifandothers{author}}
+     }
        {\bibstring{\thefield{authortype}s}}
        {\bibstring{\thefield{authortype}}}}}
 
 \newbibmacro*{editorstrg}{%
   \iffieldundef{editortype}
-    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifboolexpr{
+       test {\ifnumgreater{\value{editor}}{1}}
+       or
+       test {\ifandothers{editor}}
+     }
        {\bibstring{editors}}
        {\bibstring{editor}}}
-    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifboolexpr{
+       test {\ifnumgreater{\value{editor}}{1}}
+       or
+       test {\ifandothers{editor}}
+     }
        {\bibstring{\thefield{editortype}s}}
        {\bibstring{\thefield{editortype}}}}}
 
 \newbibmacro*{editor+othersstrg}{%
   \iffieldundef{editortype}
-    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifboolexpr{
+       test {\ifnumgreater{\value{editor}}{1}}
+       or
+       test {\ifandothers{editor}}
+     }
        {\def\abx@tempa{editors}}
        {\def\abx@tempa{editor}}}
-    {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifboolexpr{
+       test {\ifnumgreater{\value{editor}}{1}}
+       or
+       test {\ifandothers{editor}}
+     }
        {\edef\abx@tempa{\thefield{editortype}s}}
        {\edef\abx@tempa{\thefield{editortype}}}}%
   \let\abx@tempb=\empty
@@ -1475,12 +1597,20 @@
     {\usebibmacro{editorstrg}}}
 
 \newbibmacro*{translatorstrg}{%
-  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}
+  \ifboolexpr{
+    test {\ifnumgreater{\value{translator}}{1}}
+    or
+    test {\ifandothers{translator}}
+  }
     {\bibstring{translators}}
     {\bibstring{translator}}}
 
 \newbibmacro*{translator+othersstrg}{%
-  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}
+  \ifboolexpr{
+    test {\ifnumgreater{\value{translator}}{1}}
+    or
+    test {\ifandothers{translator}}
+  }
     {\def\abx@tempa{translators}}
     {\def\abx@tempa{translator}}%
   \ifnamesequal{translator}{commentator}
@@ -1503,7 +1633,11 @@
   \bibstring{\abx@tempa}}
 
 \newbibmacro*{byauthor}{%
-  \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}
+  \ifboolexpr{
+    test \ifuseauthor
+    or
+    test {\ifnameundef{author}}
+  }
     {}
     {\usebibmacro{bytypestrg}{author}{author}%
      \setunit{\addspace}%
@@ -1683,7 +1817,11 @@
   \clearname{afterword}}
 
 \newbibmacro*{title}{%
-  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
+  \ifboolexpr{
+    test {\iffieldundef{title}}
+    and
+    test {\iffieldundef{subtitle}}
+  }
     {}
     {\printtext[title]{%
        \printfield[titlecase]{title}%
@@ -1693,7 +1831,11 @@
   \printfield{titleaddon}}
 
 \newbibmacro*{booktitle}{%
-  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}}
+  \ifboolexpr{
+    test {\iffieldundef{booktitle}}
+    and
+    test {\iffieldundef{booksubtitle}}
+  }
     {}
     {\printtext[booktitle]{%
        \printfield[titlecase]{booktitle}%
@@ -1703,7 +1845,11 @@
   \printfield{booktitleaddon}}
 
 \newbibmacro*{maintitle}{%
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+  \ifboolexpr{
+    test {\iffieldundef{maintitle}}
+    and
+    test {\iffieldundef{mainsubtitle}}
+  }
     {}
     {\printtext[maintitle]{%
        \printfield[titlecase]{maintitle}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index ce5dc41d4a4..4af84cc06db 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 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 % Copyright (c) 2006-2010 Philipp Lehman.
 %
@@ -19,26 +19,27 @@
 \def\abx@cbxid$#1: #2 #3 #4 #5${#4 v#3 biblatex citation style}
 \def\abx@lbxid$#1: #2 #3 #4 #5${#4 v#3 biblatex localization}
 
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 0.9a 2010/03/19 19:52:15 lehman beta $
+[\abx@rcsid $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
  programmable bibliographies]
 
 \def\blx@version$#1: #2 ${#2}
-\edef\blx@version{\blx@version$Revision: 0.9 $}
+\edef\blx@version{\blx@version$Revision: 0.9c $}
 
 %% Compatibility and requirements
 
 \RequirePackage{etoolbox}
 \RequirePackage{keyval}
+\RequirePackage{logreq}
 \RequirePackage{ifthen}
 \RequirePackage{url}
 
-\@ifpackagelater{etoolbox}{2009/08/06}
+\@ifpackagelater{etoolbox}{2010/08/21}
   {}
   {\PackageError{biblatex}
      {Outdated 'etoolbox' package}
-     {Upgrade to etoolbox v1.8 (2009/08/06) or later.\MessageBreak
+     {Upgrade to etoolbox v2.0 (2010/08/21) or later.\MessageBreak
       I found: '\csuse{ver@etoolbox.sty}'.\MessageBreak
       This is a fatal error. I'm aborting now.}%
    \endinput}
@@ -53,9 +54,9 @@
   \docsvlist{%
     amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
     cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
-    mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib}%
+    mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
   \@ifpackageloaded{babel}
-    {\iftoggle{autolang}
+    {\iftoggle{blx@autolang}
        {\blx@mkbabel}
        {\blx@mknobabel}}
     {\blx@mknobabel}%
@@ -100,13 +101,15 @@
   \toggletrue{blx@tempa}%
   \def\do#1{%
     \patchcmd#1%
-      {\color@begingroup}
-      {\color@begingroup\toggletrue{blx@footnote}}
+      {\interlinepenalty\interfootnotelinepenalty}
+      {\toggletrue{blx@footnote}%
+       \interlinepenalty\interfootnotelinepenalty}
       {\togglefalse{blx@tempa}\listbreak}
       {}}%
   \docsvlist{%
     \@footnotetext,%          latex
     \H@@footnotetext,%        hyperref
+    \V@@footnotetext,%        fancyvrb
     \scr@saved@footnotetext,% koma-script 3.x
     \l@dold@footnotetext,%    ledmac
     \l@doldold@footnotetext,% ledmac
@@ -157,6 +160,22 @@
           {}}
        {}}
     {}%
+  \apptocmd\@floatboxreset
+    {\boolfalse{citetracker}%
+     \boolfalse{pagetracker}}
+    {}
+    {\blx@err@patch{floats}}%
+  \ifdef\TX@endtabularx % tabularx/memoir
+    {\patchcmd\TX@endtabularx
+       {\edef\TX@ckpt{\cl@@ckpt}}
+       {\edef\TX@ckpt{\cl@@ckpt\abx@resttrackers}%
+        \abx@savetrackers}
+       {}
+       {\blx@err@patch{'tabularx'}}%
+     \apptocmd\TX@endtabularx{\abx@cleartrackers}
+       {}
+       {\blx@err@patch{'tabularx'}}}
+    {}%
   \@ifpackageloaded{csquotes}
     {\@ifpackagelater{csquotes}{2009/05/30}
        {}
@@ -167,14 +186,20 @@
      \@ifpackagelater{csquotes}{2009/08/27}
        {\appto\@blockquote@prehook{\abx@savetrackers}%
         \appto\@blockquote@posthook{\abx@resttrackers\abx@cleartrackers}}
-       {\BlockquoteDisable{\let\blx@thecheckpunct\@gobble}}}
+       {\BlockquoteDisable{\let\blx@thecheckpunct\@gobble}}%
+     \@ifpackagelater{csquotes}{2010/06/09}
+       {}
+       {\newcommand*{\@quotereset}{}%
+        \newcount\@quotereset}}
     {\@ifpackageloaded{babel}
        {\blx@warning@noline{%
           'babel' detected but 'csquotes' missing.\MessageBreak
-          Loading 'csquotes' is strongly recommended}}
+          Loading 'csquotes' recommended}}
        {}%
      \newcommand*{\@quotelevel}{}%
      \newcount\@quotelevel
+     \newcommand*{\@quotereset}{}%
+     \newcount\@quotereset
      \newcommand*{\@setquotesfcodes}{}%
      \let\@setquotesfcodes\relax
      \newcommand*{\@ifquotemarker}{}%
@@ -203,22 +228,6 @@
      \appto\blx@setsfcodes{%
        \sfcode`\`=\z@
        \sfcode`\'=\z@}}%
-  \apptocmd\@floatboxreset
-    {\boolfalse{citetracker}%
-     \boolfalse{pagetracker}}
-    {}
-    {\blx@err@patch{floats}}%
-  \ifdef\TX@endtabularx % tabularx/memoir
-    {\patchcmd\TX@endtabularx
-       {\edef\TX@ckpt{\cl@@ckpt}}
-       {\edef\TX@ckpt{\cl@@ckpt\abx@resttrackers}%
-        \abx@savetrackers}
-       {}
-       {\blx@err@patch{'tabularx'}}%
-     \apptocmd\TX@endtabularx{\abx@cleartrackers}
-       {}
-       {\blx@err@patch{'tabularx'}}}
-    {}%
   \addtocontents{toc}{%
      \string\boolfalse{citerequest}%
      \string\boolfalse{citetracker}%
@@ -254,8 +263,9 @@
 \def\blx@docatcodes{%
   \do\=\do\<\do\>\do\-\do\"\do\'\do\`\do\.%
   \do\,\do\;\do\:\do\!\do\?\do\/}
-\def\do#1{\noexpand\do\noexpand#1{\the\catcode`#1}}
+\def\do#1{\catcode\number`#1=\the\catcode`#1\relax}
 \edef\blx@catcodes{\blx@docatcodes\do\^\do\~\do\&\do\|}
+\let\do\noexpand
 
 \def\blx@saneccodes{%
   \catcode`\~=\active
@@ -271,6 +281,8 @@
 
 %% Allocation
 
+\providecommand{\@gobblefive}[5]{}
+
 \newcounter{listtotal}
 \def\thelisttotal{\the\c@listtotal}
 \newcounter{listcount}
@@ -345,13 +357,18 @@
 
 \newtoggle{blx@tempa}
 \newtoggle{blx@tempb}
+\newtoggle{blx@runltx}
+\newtoggle{blx@runbtx}
 \newtoggle{blx@block}
 \newtoggle{blx@unit}
 \newtoggle{blx@insert}
 \newtoggle{blx@lastins}
 \newtoggle{blx@debug}
-\newtoggle{autolang}
-\newtoggle{blx@defernums}
+\newtoggle{blx@cssort}
+\newtoggle{blx@autolang}
+\newtoggle{blx@clearlang}
+\newtoggle{blx@defernumbers}
+\newtoggle{blx@omitnumbers}
 \newtoggle{blx@footnote}
 \newtoggle{blx@labelalpha}
 \newtoggle{blx@labelnumber}
@@ -373,7 +390,7 @@
 \newtoggle{blx@skiplab}
 \newtoggle{blx@citation}
 \newtoggle{blx@bibliography}
-\newtoggle{blx@recode}
+\newtoggle{blx@reencode}
 \newtoggle{blx@citeindex}
 \newtoggle{blx@bibindex}
 
@@ -396,8 +413,8 @@
   \let\blx@blxinit\relax
   \blx@initunit}
 
-\edef\blx@auxfile{\jobname}
-\let\blx@theauxout\@mainaux
+\edef\blx@auxfile@bibtex{\jobname}
+\let\blx@auxout@bibtex\@mainaux
 \newcommand*{\labelalphaothers}{+}
 \newcommand*{\blxauxsuffix}{-blx}
 
@@ -509,17 +526,19 @@
     \unexpanded{\let#1\@empty\dolistloop}{#1}}%
   #1\let\do\noexpand}
 
-% {<macro>}{<entrykey>,...} => <macro>{<entrykey>,...}
+% {<code>}{<string>} => <code>{<string>}
 
-\protected\def\blx@sanitizekeys#1#2{%
+\protected\def\blx@xsanitizeafter#1#2{%
   \begingroup
+  \abx@hook@xsanitize
+  \def\blx@tempa{\endgroup#1}%
+  \edef\blx@tempb{#2}%
+  \expandafter\blx@tempa
+  \expandafter{\detokenize\expandafter{\blx@tempb}}}
+
+\def\abx@hook@xsanitize{%
   \blx@safe@actives
-  \let\protect\string
-  \edef\blx@tempa{#2}%
-  \edef\blx@tempa{%
-    \endgroup\unexpanded{#1}{%
-    \detokenize\expandafter{\blx@tempa}}}%
-  \blx@tempa}
+  \let\protect\string}
 
 % {<file>}{<message>}{<preload>}{<postload>}{<success>}{<failure>}
 
@@ -528,6 +547,7 @@
     {\blx@info@noline{Trying to load #2..}%
      \IfFileExists{#1}
        {\blx@info@noline{... file '#1' found}%
+        \listxadd\blx@list@req@stat{#1}%
         #3\@@input\@filef@und#4#5}
        {\blx@info@noline{... file '#1' not found}#6}%
      \global\csdef{blx@file@#1}{}%
@@ -536,34 +556,29 @@
 
 % {<string>}
 
-\protected\def\blx@auxwrite#1#2{%
+\protected\def\blx@auxwrite#1#2#3{%
   \if@filesw
     \begingroup
     \blx@safe@actives
     \let\protect\string
-    \immediate\write#1{#2}%
+    #2%
+    \immediate\write#1{#3}%
     \endgroup
   \fi}
 
-\def\blx@auxinit#1{%
-  \blx@auxwrite\blx@theauxout{%
-    \ifx\blx@theauxout\@mainaux
+\def\blx@auxinit@bibtex#1{%
+  \blx@auxwrite\blx@auxout@bibtex{}{%
+    \ifx\blx@auxout@bibtex\@mainaux
     \else
       \blx@msg@aux
     \fi
-    \ifnum\blx@backend=\blx@backend@biber
+    \string\bibstyle{biblatex}\blx@nl
+    \string\bibdata{%
+      \blx@ctrlfile\blxauxsuffix
       \expandafter\ifblank\expandafter{#1}
-        {}
-        {\string\bibdata{#1}}%
-    \else
-      \string\bibstyle{biblatex}\blx@nl
-      \string\bibdata{%
-        \blx@ctrlfile\blxauxsuffix
-        \expandafter\ifblank\expandafter{#1}
-          {}
-          {,#1}}\blx@nl
-      \string\citation{biblatex-control}
-    \fi}}
+	{}
+	{,#1}}\blx@nl
+    \string\citation{biblatex-control}}}
 
 % {<file>}{<signature>}{<true>}{<false>}
 
@@ -587,7 +602,10 @@
           \else
             \blx@warning@noline{%
               File '#1.#2' created\MessageBreak
-              by wrong version of biblatex}%
+              by wrong version of
+	      \ifnumequal\blx@backend\blx@backend@biber
+	        {Biber}
+		{biblatex}}%
           \fi
         \else
           \blx@error
@@ -618,7 +636,7 @@
 \edef\blx@msg@aux{%
   \blx@sig@aux\blx@nl
   \blx@ver@aux\blx@nl
-  \@percentchar\space Do not modify the above lines!\blx@nl
+  \@percentchar\space Do not modify this file!\blx@nl
   \@percentchar\blx@nl
   \@percentchar\space This is an auxiliary file
   used by the 'biblatex' package.\blx@nl
@@ -629,13 +647,31 @@
 \edef\blx@msg@bib{%
   \blx@sig@bib\blx@nl
   \blx@ver@bib\blx@nl
-  Do not modify the above lines!\blx@nl\blx@nl
+  Do not modify this file!\blx@nl\blx@nl
   This is an auxiliary file used
   by the 'biblatex' package.\blx@nl
   This file may safely be deleted.
   It will be recreated as\blx@nl
   required.\blx@nl\blx@nl}
 
+% {<true>}{<false>}
+
+\newrobustcmd*{\lbx@ifutfinput}{\ifboolexpr{%
+  test {\ifdefstring\inputencodingname{utf8}}
+  or
+  test {\ifdefstring\inputencodingname{utf8x}}
+  or
+  test {\ifdefstring\inputencodingname{lutf8}}
+  or
+  ( test {\ifundef\inputencodingname}
+    and
+    ( not test {\ifundef\XeTeXrevision}
+      or
+      not test {\ifundef\luatexversion}
+    )
+  )
+}}
+
 %% User feedback
 
 \protected\def\blx@error#1#2{%
@@ -675,12 +711,9 @@
 \def\blx@imc@BibliographyWarning{\blx@warning@entry}
 \blx@regimc\BibliographyWarning
 
-\def\blx@missing#1{%
+\protected\def\abx@missing#1{%
   \mbox{\reset@font\bfseries#1}}
 
-\protected\def\blx@errormark{%
-  \rule[0.25ex]{1.25ex}{1.25ex}}
-
 \def\blx@err@patch#1{%
   \blx@error
     {Patching #1 failed}
@@ -788,6 +821,12 @@
      This error may also be triggered if \string\mkbibparens\MessageBreak
      or \string\mkbibbrackets\space are nested too deeply}}
 
+\def\blx@err@filter{%
+  \blx@error
+    {Invalid filter expression}
+    {The filter expression you have supplied is invalid.\MessageBreak
+     See the biblatex manual for details}}
+
 \def\blx@warn@nohyph#1{%
   \blx@warning{No hyphenation patterns for '#1'}}
 
@@ -799,7 +838,7 @@
 
 \protected\def\blx@warn@nostring#1{%
   \blx@warning@entry{Bibliography string '#1' undefined}%
-  \blx@missing{#1}}
+  \abx@missing{#1}}
 
 \def\blx@warn@conflopt#1{%
   \blx@warning{Conflicting options.\MessageBreak#1}}
@@ -828,104 +867,238 @@
 \def\blx@msg@cundef#1{%
   Citation '#1' undefined}
 \def\blx@msg@cundefon#1{%
-  Citation '#1' on page \thepage\space undefined}
-
-\let\blx@auxlist\@empty
-\def\blx@logreq#1{%
-  \xifinlist{\blx@auxfile.aux}{\blx@auxlist}
+  Citation '#1' on page \the\c@page\space undefined}
+
+% \blx@list@active			active aux files (basename)
+%                                       [internal list]
+% \blx@list@inactive			inactive aux files (basename)
+%                                       [internal list]
+% \blx@list@bibfiles@<auxfile>		aux file -> bib file mapping (refsections)
+%                                       aux file (basename) -> bib files (full)
+%                                       [internal list]
+
+\let\blx@list@active\@empty
+\let\blx@list@inactive\@empty
+\listeadd\blx@list@inactive{\jobname}
+
+\def\blx@regbibfile#1#2{%
+  \ifinlistcs{#2.bib}{blx@list@bibfiles@#1}
     {}
-    {\listxadd\blx@auxlist{\blx@auxfile.aux}%
-     \blx@logreq@bibtex{\blx@auxfile}}%
-  \ifblank{#1}
-    {}
-    {\@latex@warning{#1}}%
-  \blx@reruntrue}
+    {\listcsxadd{blx@list@bibfiles@#1}{#2.bib}}}
 
-\def\blx@logreq@latex{\typeout{REQ:1:latex:REQ}}
-\def\blx@logreq@bibtex#1{%
-  \begingroup
-  \edef\blx@tempa{\endgroup
-    \noexpand\typeout{REQ:2:bibtex:\blx@nl
-      \ifcase\blx@backend
-        binary=bibtex\blx@nl
-      \or
-        binary=bibtex8\blx@nl
-        option=--mwizfuns 10000\blx@nl
-      \or
-        binary=biber\blx@nl
-      \fi
-      \ifundef\blx@mincrossrefs
-        {}
-        {\ifcase\blx@backend
-           option=-min-crossrefs=\blx@mincrossrefs\blx@nl
-         \or
-           option=--min\string_crossrefs \blx@mincrossrefs\blx@nl
-         \fi}%
-      \ifdef\blx@bibencoding
-        {\ifnum\blx@backend=\csuse{blx@backend@bibtex8}%
-           option=--csfile \blx@bibencoding.csf\blx@nl
-         \fi}
-        {}%
-      infile=#1\blx@nl:REQ}}%
-  \blx@tempa}
+\def\blx@regbibfiles#1#2{%
+  \blx@xsanitizeafter{\forcsvlist{\blx@regbibfile{#1}}}{#2}}
 
-\def\blx@warn@rerun{%
-  \blx@warning@noline{Please rerun LaTeX}}
-
-\def\blx@warn@auxlist{%
+\def\blx@check@logreq{%
   \begingroup
-  \edef\blx@tempa{%
-    Please (re)run
-    \ifnum\blx@backend=\blx@backend@biber
-      Biber
-    \else
-      BibTeX
-    \fi
-    on the file(s):}%
-  \def\do##1{\appto\blx@tempa{\MessageBreak##1}}%
-  \dolistloop\blx@auxlist
-  \blx@warning@noline{%
-    \blx@tempa\MessageBreak
-    and rerun LaTeX afterwards}%
+  \ifnum\blx@backend=\blx@backend@biber
+    \ltxrequest{biblatex}{{\iftoggle{blx@runltx}{1}{0}}}{%
+      \provides[type=dynamic]{
+	\file{\jobname.bcf}
+      }
+      \requires[type=dynamic]{
+        \file{\jobname.bbl}
+      }
+      \ifdef\blx@list@req@edit
+        {\requires[type=editable]{
+           \forlistloop\file\blx@list@req@edit
+	 }}
+	{}
+      \ifdef\blx@list@req@stat
+        {\requires[type=static]{
+           \forlistloop\file\blx@list@req@stat
+	 }}
+	{}
+    }%
+    \logrequest[package=biblatex,priority=5,active={{\iftoggle{blx@runbtx}{1}{0}}}]{%
+      \generic{biber}
+      \cmdline{
+	\binary{biber}
+	\infile{\jobname}
+      }
+      \input{
+	\file{\jobname.bcf}
+      }
+      \output{
+	\file{\jobname.bbl}
+      }
+      \provides[type=dynamic]{
+	\file{\jobname.bbl}
+      }
+      \requires[type=dynamic]{
+	\file{\jobname.bcf}
+      }
+      \ifcsdef{blx@list@bibfiles@\jobname}
+	{\requires[type=editable]{
+	   \def\do{\file}
+	   \dolistcsloop{blx@list@bibfiles@\jobname}
+	 }}
+	{}
+    }%
+  \else
+    \ltxrequest{biblatex}{{\iftoggle{blx@runltx}{1}{0}}}{%
+      \provides[type=dynamic]{
+	\def\do##1{\file{##1.aux}}
+	\dolistloop\blx@list@inactive
+	\file{\blx@ctrlfile\blxauxsuffix.bib}
+      }
+      \requires[type=dynamic]{
+	\def\do##1{\file{##1.bbl}}
+	\dolistloop\blx@list@inactive
+      }
+      \ifdef\blx@list@req@edit
+        {\requires[type=editable]{
+           \forlistloop\file\blx@list@req@edit
+	 }}
+	{}
+      \ifdef\blx@list@req@stat
+        {\requires[type=static]{
+           \forlistloop\file\blx@list@req@stat
+	 }}
+	{}
+    }%
+    \def\do##1{%
+      \ifinlist{##1}{\blx@list@active}
+        {\blx@logreq@bibtex{1}{##1}}
+	{\blx@logreq@bibtex{0}{##1}}}%
+    \dolistloop\blx@list@inactive
+  \fi
   \endgroup}
 
-\def\blx@reruntrue{%
-  \G@refundefinedtrue
-  \blx@logreq@latex
-  \global\let\blx@reruntrue\relax}
+\def\blx@logreq@bibtex#1#2{%
+  \logrequest[package=biblatex,priority=5,active=#1]{%
+    \generic{bibtex}
+    \cmdline{%
+      \ifnum\blx@backend=\blx@backend@bibtex
+        \binary{bibtex}
+	\option{-min-crossrefs \blx@mincrossrefs}
+      \else
+        \binary{bibtex8}
+        \option{--wolfgang}
+        \option{--min\string_crossrefs \blx@mincrossrefs}
+	\ifdef\blx@csfencoding
+	  {\option{--csfile \blx@csfencoding.csf}}
+	  {}%
+      \fi
+      \infile{#2}
+     }
+     \input{
+       \file{#2.aux}
+     }
+     \output{
+       \file{#2.bbl}
+     }
+      \provides[type=dynamic]{
+        \file{#2.bbl}
+      }
+      \requires[type=dynamic]{
+        \file{#2.aux}
+	\file{\blx@ctrlfile\blxauxsuffix.bib}
+      }
+      \requires[type=editable]{
+	\ifcsdef{blx@list@bibfiles@#2}
+	  {\def\do{\file}
+	   \dolistcsloop{blx@list@bibfiles@#2}}
+	  {}
+      }
+      \requires[type=static]{
+        \file{biblatex.bst}
+	\ifnum\blx@backend=\blx@backend@bibtexviii
+	  \ifdef\blx@csfencoding
+	    {\file{\blx@csfencoding.csf}}
+	    {}%
+	\fi
+      }
+  }%
+}
 
-\protected\def\blx@checksum{%
-  \blx@tempcnta\z@
-  \ifx\blx@checksum@old\blx@checksum@new
-  \else
-    \advance\blx@tempcnta\@ne
-    \blx@reruntrue
-  \fi
-  \ifx\blx@auxlist\@empty
+\def\blx@logreq@active#1{%
+  \ifnum\blx@backend=\blx@backend@biber
   \else
-    \advance\blx@tempcnta\tw@
-    \blx@reruntrue
+    \xifinlist{\blx@auxfile@bibtex}{\blx@list@active}
+      {}
+      {\listxadd\blx@list@active{\blx@auxfile@bibtex}}%
   \fi
-  \csuse{blx@rerun}%
-  \ifcase\blx@tempcnta
-  \or
-    \blx@warn@rerun
+  \ifblank{#1}
+    {}
+    {\@latex@warning{#1}}%
+  \blx@rerun@latex
+  \blx@rerun@bibtex}
+
+\def\blx@logreq@inactive{%
+  \ifnum\blx@backend=\blx@backend@biber
   \else
-    \blx@warn@auxlist
+    \xifinlist{\blx@auxfile@bibtex}{\blx@list@inactive}
+      {}
+      {\listxadd\blx@list@inactive{\blx@auxfile@bibtex}}%
   \fi}
 
+\def\blx@rerun@latex{%
+  \G@refundefinedtrue
+  \global\toggletrue{blx@runltx}%
+  \global\let\blx@rerun@latex\relax}
+
+\def\blx@rerun@bibtex{%
+  \global\toggletrue{blx@runbtx}%
+  \global\let\blx@rerun@bibtex\relax}
+
 \let\blx@checksum@old\@empty
 \let\blx@checksum@new\@empty
 \let\abx@aux@checksum\relax
 
-\def\blx@addchecksum#1{%
-  \xdef\blx@checksum@old{\blx@checksum@old#1}}
+\def\blx@checksum#1#2#3{%
+  \begingroup
+  \blx@tempcnta\the\numexpr0#2*0#3\relax
+  \blx@tempcntb\blx@tempcnta
+  \divide\blx@tempcntb10
+  \multiply\blx@tempcntb10
+  \advance\blx@tempcnta-\blx@tempcntb
+  \xdef#1{#1\the\blx@tempcnta}%
+  \endgroup}
 
+\def\blx@addchecksum{\blx@checksum\blx@checksum@old}
 \AtEndDocument{%
-  \def\blx@addchecksum#1{%
-    \xdef\blx@checksum@new{\blx@checksum@new#1}}}
+  \def\blx@addchecksum{\blx@checksum\blx@checksum@new}}
 
-\AfterEndDocument{\blx@checksum}
+\protected\def\blx@check@rerun{%
+  \blx@tempcnta\z@
+  \iftoggle{blx@runltx}
+    {\blx@tempcnta\@ne}
+    {\ifx\blx@checksum@old\blx@checksum@new
+     \else
+       \blx@tempcnta\@ne
+     \fi}%
+  \iftoggle{blx@runbtx}
+    {\advance\blx@tempcnta\tw@}
+    {}%
+  \ifcase\blx@tempcnta
+  \or
+    \blx@rerun@latex
+    \blx@warning@noline{Please rerun LaTeX}%
+  \else
+    \blx@rerun@latex
+    \blx@warn@auxlist
+  \fi}
+
+\def\blx@warn@auxlist{%
+  \begingroup
+  \ifnum\blx@backend=\blx@backend@biber
+    \edef\blx@tempa{%
+      Please (re)run Biber on the file:\MessageBreak
+      \jobname}%
+  \else
+    \edef\blx@tempa{Please (re)run BibTeX on the file(s):}%
+    \def\do##1{\appto\blx@tempa{\MessageBreak##1}}%
+    \dolistloop\blx@list@active
+  \fi
+  \blx@warning@noline{%
+    \blx@tempa\MessageBreak
+    and rerun LaTeX afterwards}%
+  \endgroup}
+
+\AfterEndDocument{%
+  \blx@check@rerun
+  \blx@check@logreq}
 
 %% Punctuation and capitalization
 
@@ -1569,13 +1742,29 @@
 \newrobustcmd*{\restorebibmacro}[1]{%
   \blx@restore{abx@macro@\detokenize{#1}}}
 
-% {<name>}{<definition>}
+% {<name>}[<args>][<optarg>]{<definition>}
 
 \newrobustcmd*{\newbibmacro}{%
-  \@star@or@long{\blx@defbibmacro\new@command}}
+  \@star@or@long\blx@newbibmacro}
+
+\def\blx@newbibmacro#1{%
+  \ifcsundef{abx@macro@\detokenize{#1}}
+    {\blx@defbibmacro\new@command{#1}}
+    {\blx@warning{%
+       Bibliography macro '\detokenize{#1}' already defined.\MessageBreak
+       Using \string\renewbibmacro}
+     \blx@defbibmacro\renew@command{#1}}}
 
 \newrobustcmd*{\renewbibmacro}{%
-  \@star@or@long{\blx@defbibmacro\renew@command}}
+  \@star@or@long\blx@renewbibmacro}
+
+\def\blx@renewbibmacro#1{%
+  \ifcsundef{abx@macro@\detokenize{#1}}
+    {\blx@warning{%
+       Bibliography macro '\detokenize{#1}' undefined.\MessageBreak
+       Using \string\newbibmacro}
+     \blx@defbibmacro\new@command{#1}}
+    {\blx@defbibmacro\renew@command{#1}}}
 
 \newrobustcmd*{\providebibmacro}{%
   \@star@or@long{\blx@defbibmacro\provide@command}}
@@ -1928,10 +2117,10 @@
 % {<entrykey>}{<true>}{<false>}
 
 \protected\def\blx@ifentryseen@global{%
-  \blx@sanitizekeys\blx@ifseen@global}
+  \blx@xsanitizeafter\blx@ifseen@global}
 
 \protected\def\blx@ifentryseen@context{%
-  \blx@sanitizekeys\blx@ifseen@context}
+  \blx@xsanitizeafter\blx@ifseen@context}
 
 \def\blx@ifseen@global#1{%
   \ifinlistcs{#1}{blx@bsee@\the\c@refsection}}
@@ -2147,7 +2336,7 @@
 % {<field>}{<true>}{<false>}
 
 \protected\def\blx@imc@iffieldint#1{%
-  \iffieldundef{#1}
+  \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
     {\expandafter\expandafter
      \expandafter\ifinteger
@@ -2210,26 +2399,26 @@
 % {<field>}{<true>}{<false>}
 
 \protected\def\blx@imc@iffieldnum#1{%
-  \iffieldundef{#1}
+  \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
     {\expandafter\expandafter
-     \expandafter\ifnumeral
+     \expandafter\blx@imc@ifnumeral
      \expandafter\expandafter
      \expandafter{\csname abx@field@#1\endcsname}}}
 
 \protected\def\blx@imc@iffieldnums#1{%
-  \iffieldundef{#1}
+  \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
     {\expandafter\expandafter
-     \expandafter\ifnumerals
+     \expandafter\blx@imc@ifnumerals
      \expandafter\expandafter
      \expandafter{\csname abx@field@#1\endcsname}}}
 
 \protected\def\blx@imc@iffieldpages#1{%
-  \iffieldundef{#1}
+  \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
     {\expandafter\expandafter
-     \expandafter\ifpages
+     \expandafter\blx@imc@ifpages
      \expandafter\expandafter
      \expandafter{\csname abx@field@#1\endcsname}}}
 
@@ -2529,7 +2718,8 @@
 
 \protected\def\blx@finentry@usedrv{%
   \unspace
-  \blx@initunit}
+%  \blx@initunit
+}
 
 \protected\def\blx@finentry@inset{%
   \blx@setunit\entrysetpunct
@@ -2577,57 +2767,73 @@
 
 % {<text>}
 
-\newcommand{\MakeCapital}{}
-\begingroup
-\catcode`\"=\active
-\protected\long\gdef\MakeCapital#1{%
+\newrobustcmd{\MakeCapital}[1]{%
   \begingroup
-  \def\do##1{\def##1{\blx@mkcp@single##1}}%
-  \abx@dosingleaccents
-  \def\do##1{\def##1{\blx@mkcp@double##1}}%
-  \abx@dodoubleaccents
-  \def\IeC{\blx@mkcp@single\IeC}%
+  \blx@mkcp@init
+  \protected@edef\blx@tempa{#1}%
+  \expandafter\blx@mkcp@parse\blx@tempa\@empty\blx@mkcp@end}
+
+\def\blx@mkcp@init{%
+  \def\blx@mkcp@iec{\noexpand\blx@mkcp@iec\noexpand}%
+  \def\blx@mkcp@bbl{\noexpand\blx@mkcp@bbl\noexpand}%
+  \def\blx@mkcp@sgl{\noexpand\blx@mkcp@sgl\noexpand}%
+  \def\blx@mkcp@dbl{\noexpand\blx@mkcp@dbl\noexpand}%
+  \def\do##1{\def##1{\blx@mkcp@sgl##1}}\abx@dosingleaccents
+  \def\do##1{\def##1{\blx@mkcp@dbl##1}}\abx@dodoubleaccents
+  \def\IeC##1{\blx@mkcp@iec\IeC{##1}}%
   \def\@tabacckludge##1{%
-    \expandafter\blx@mkcp@single\csname\string##1\endcsname}%
+    \expandafter\blx@mkcp@sgl\csname\string##1\endcsname}}
+
+\begingroup
+\catcode`\"=\active
+\gappto\blx@mkcp@init{%
   \ifnum\catcode`\"=\active
-    \def"##1{\blx@mkcp@single"\noexpand##1}%
-  \fi
-  \def\blx@mkcp@single{\noexpand\blx@mkcp@single\noexpand}%
-  \def\blx@mkcp@double{\noexpand\blx@mkcp@double\noexpand}%
-  \protected@edef\blx@tempa{%
-    \noexpand\ifblank{#1}
-      {\endgroup\unexpanded{#1}}
-      {\noexpand\blx@mkcp@parse#1}}%
-  \blx@tempa}
+    \def"#1{\blx@mkcp@bbl"\noexpand#1}%
+  \fi}
 \endgroup
 
-\long\def\blx@mkcp@parse#1{%
-  \begingroup
-  \expandafter\def\expandafter\blx@tempa\expandafter{#1}%
-  \ifx\blx@tempa\IeC
-    \aftergroup\blx@mkcp@iec
-  \else\ifx\blx@tempa\blx@mkcp@single
-    \aftergroup\blx@mkcp@two
-  \else\ifx\blx@tempa\blx@mkcp@double
-    \aftergroup\blx@mkcp@three
-  \else
-    \aftergroup\blx@mkcp@case
-  \fi\fi\fi
-  \endgroup{#1}}
+\def\blx@mkcp@parse{%
+  \futurelet\@let@token\blx@mkcp@eval}
+
+\long\def\blx@mkcp@eval{%
+  \ifx\@let@token\blx@mkcp@iec
+    \expandafter\blx@mkcp@getiec
+  \fi
+  \ifx\@let@token\blx@mkcp@bbl
+    \expandafter\blx@mkcp@gettwo
+  \fi
+  \ifx\@let@token\blx@mkcp@sgl
+    \expandafter\blx@mkcp@gettwo
+  \fi
+  \ifx\@let@token\blx@mkcp@dbl
+    \expandafter\blx@mkcp@getthree
+  \fi
+  \blx@mkcp@case}
+
+\def\blx@mkcp@getiec#1\blx@mkcp@case#2#3#4{%
+  \blx@mkcp@case{#2#3{#4}}}
+
+\def\blx@mkcp@gettwo#1\blx@mkcp@case#2#3#4{%
+  \blx@mkcp@case{#2#3#4}}
+
+\def\blx@mkcp@getthree#1\blx@mkcp@case#2#3#4#5{%
+  \blx@mkcp@case{#2#3#4#5}}
 
 \long\def\blx@mkcp@case#1{%
+  \begingroup
   \def\i{I}\def\j{J}%
   \def\do##1##2{\let##1##2\do}%
   \expandafter\do\@uclclist\relax{\relax\@gobble}%
-  \uppercase{\protected@edef\blx@tempa{#1}}%
-  \expandafter\endgroup\blx@tempa}
-
-\def\blx@mkcp@iec#1#2{\blx@mkcp@case{#1#2}}
-\def\blx@mkcp@two#1#2#3{\blx@mkcp@case{#2#3}}
-\def\blx@mkcp@three#1#2#3#4{\blx@mkcp@case{#2#3#4}}
+  \uppercase{\protected@edef\blx@tempa{\endgroup\blx@mkcp@end#1}}%
+  \blx@tempa}
 
-\let\blx@mkcp@single\@empty
-\let\blx@mkcp@double\@empty
+\protected\long\def\blx@mkcp@end#1\blx@mkcp@end{%
+  \let\blx@mkcp@iec\noexpand
+  \let\blx@mkcp@bbl\noexpand
+  \let\blx@mkcp@sgl\noexpand
+  \let\blx@mkcp@dbl\noexpand
+  \protected@edef\blx@tempa{\endgroup#1}%
+  \blx@tempa}
 
 \def\abx@dosingleaccents{%
   \do\"\do\'\do\`\do\^\do\~\do\=\do\.%
@@ -2649,64 +2855,111 @@
 
 \long\def\blx@mksc@ii#1{%
   \begingroup
-  \def\blx@tempa{\endgroup}%
+  \let\blx@tempa\@empty
   \let\blx@tempb\@empty
-  \def\blx@tempc{\MakeCapital}%
-  \@tempswatrue
-  \blx@mksc@parse#1\blx@mksc@end}
+  \blx@mksc@init
+  \protected@edef\@tempa{#1}%
+  \expandafter\blx@mksc@parse\@tempa\blx@mksc@end}
+
+\def\blx@mksc@init{%
+  \blx@mkcp@init
+  \def\blx@mkcp@nil{\noexpand\blx@mkcp@nil\noexpand}%
+  \def\i{\blx@mkcp@nil\i}\def\j{\blx@mkcp@nil\j}%
+  \def\do##1{%
+    \ifx##1\relax
+    \else
+      \def##1{\blx@mkcp@nil##1}%
+      \expandafter\do
+    \fi}%
+  \expandafter\do\@uclclist\relax}
 
 \def\blx@mksc@parse{%
   \futurelet\@let@token\blx@mksc@eval}
 
 \def\blx@mksc@eval{%
   \ifx\@let@token\blx@mksc@end
-    \blx@mksc@end
+    \expandafter\blx@mksc@end
   \fi
   \ifx\@let@token\bgroup
-    \blx@mksc@group
+    \expandafter\blx@mksc@group
   \fi
   \ifx\@let@token\@sptoken
-    \if@tempswa\blx@mksc@eject\fi
-    \blx@mksc@space
+    \expandafter\blx@mksc@space
+  \fi
+  \ifx\@let@token\blx@mkcp@nil
+    \expandafter\blx@mksc@getone
   \fi
-  \if\relax\noexpand\@let@token
-    \blx@mksc@cs
+  \ifx\@let@token\blx@mkcp@iec
+    \expandafter\blx@mksc@getiec
   \fi
-  \if-\noexpand\@let@token
-    \if@tempswa\blx@mksc@eject\fi
+  \ifx\@let@token\blx@mkcp@bbl
+    \expandafter\blx@mksc@gettwo
+  \fi
+  \ifx\@let@token\blx@mkcp@sgl
+    \expandafter\blx@mksc@gettwo
+  \fi
+  \ifx\@let@token\blx@mkcp@dbl
+    \expandafter\blx@mksc@getthree
+  \fi
+  \if\noexpand\@let@token\relax
+    \expandafter\blx@mksc@cs
   \fi
-  \blx@mksc@other&}
+  \blx@mksc@other}
 
-\def\blx@mksc@end#1\blx@mksc@end{\fi
+\def\blx@mksc@end#1\blx@mksc@end{%
   \blx@mksc@eject
+  \let\blx@mkcp@nil\noexpand
+  \let\blx@mkcp@iec\noexpand
+  \let\blx@mkcp@bbl\noexpand
+  \let\blx@mkcp@sgl\noexpand
+  \let\blx@mkcp@dbl\noexpand
+  \let\MakeUppercase\relax
+  \let\MakeLowercase\relax
+  \protected@edef\blx@tempa{\endgroup\blx@tempa}%
   \blx@tempa}
 
-\long\def\blx@mksc@group#1&#2{\fi
+\long\def\blx@mksc@group#1\blx@mksc@other#2{%
   \futurelet\@let@token\blx@mksc@ingroup#2&{#2}%
+  \blx@mksc@endhead
   \blx@mksc@parse}
 
 \long\def\blx@mksc@ingroup#1&#2{%
-  \if\relax\noexpand\@let@token
+  \if\noexpand\@let@token\relax
     \blx@mksc@locase{{#2}}%
   \else
     \blx@mksc@nocase{{#2}}%
   \fi}
 
-\def\blx@mksc@space{\def\blx@mksc@space##1&}
-\@nameuse{blx@mksc@space} {\fi
+\def\blx@mksc@space{\def\blx@mksc@space##1\blx@mksc@other}
+\csuse{blx@mksc@space} {%
   \blx@mksc@anycase{ }%
+  \blx@mksc@endhead
   \blx@mksc@parse}
 
-\long\def\blx@mksc@cs#1&#2{\fi
+\long\def\blx@mksc@cs#1\blx@mksc@other#2{%
   \ifcat\noexpand~\noexpand#2%
     \blx@mksc@locase{#2}%
   \else
     \blx@mksc@nocase{#2}%
   \fi
+  \blx@mksc@endhead
   \blx@mksc@parse}
 
-\long\def\blx@mksc@other&#1{%
+\def\blx@mksc@getiec#1\blx@mksc@other#2#3#4{%
+  \blx@mksc@other{#2#3{#4}}}
+
+\def\blx@mksc@getone#1\blx@mksc@other#2#3{%
+  \blx@mksc@other{#2#3}}
+
+\def\blx@mksc@gettwo#1\blx@mksc@other#2#3#4{%
+  \blx@mksc@other{#2#3#4}}
+
+\def\blx@mksc@getthree#1\blx@mksc@other#2#3#4#5{%
+  \blx@mksc@other{#2#3#4#5}}
+
+\long\def\blx@mksc@other#1{%
   \blx@mksc@locase{#1}%
+  \blx@mksc@endhead
   \blx@mksc@parse}
 
 \def\blx@mksc@locase{%
@@ -2728,15 +2981,18 @@
 \def\blx@mksc@eject{%
   \ifx\blx@tempb\@empty
   \else
-    \eappto\blx@tempa{%
-      \expandonce\blx@tempc{\expandonce\blx@tempb}}%
+    \eappto\blx@tempa{\noexpand\MakeLowercase{\expandonce\blx@tempb}}%
     \let\blx@tempb\@empty
-  \fi
-  \if@tempswa
-    \def\blx@tempc{\MakeLowercase}%
-    \@tempswafalse
   \fi}
 
+\def\blx@mksc@endhead{%
+  \ifx\blx@tempb\@empty
+  \else
+    \eappto\blx@tempa{\noexpand\MakeCapital{\expandonce\blx@tempb}}%
+    \let\blx@tempb\@empty
+  \fi
+  \let\blx@mksc@endhead\relax}
+
 % {<language,language,...>}
 
 \newrobustcmd*{\DeclareCaseLangs}{%
@@ -2748,10 +3004,7 @@
 \def\blx@defcaselangs#1{%
   \ifblank{#1}
     {}
-    {\begingroup
-     \def\do##1{\listgadd\blx@cmksc@lang{##1}}
-     \docsvlist{#1}%
-     \endgroup}}
+    {\forcsvlist{\listgadd\blx@cmksc@lang}{#1}}}
 
 \DeclareCaseLangs{%
   american,british,canadian,
@@ -2892,7 +3145,8 @@
 \newrobustcmd*{\blx@imc@printfile}[2][]{%
   \iftoggle{blx@loadfiles}
     {\IfFileExists{#2}
-       {\blx@imc@printtext[#1]{\input{#2}\unspace}}
+       {\listxadd\blx@list@req@edit{#2}%
+        \blx@imc@printtext[#1]{\input{#2}\unspace}}
        {\blx@nounit}}
     {\blx@nounit}}
 
@@ -3086,10 +3340,10 @@
 
 % {<key>}{<code>}
 
-\protected\long\def\blx@imc@entrydata#1{%
-  \blx@sanitizekeys\blx@imc@entrydata@i{#1}}
+\protected\def\blx@imc@entrydata{%
+  \blx@xsanitizeafter\blx@imc@entrydata@i}
 
-\protected\long\def\blx@imc@entrydata@i#1#2{%
+\long\def\blx@imc@entrydata@i#1#2{%
   \blx@ifdata{#1}
     {\begingroup
      \blx@resetdata
@@ -3117,11 +3371,11 @@
 \def\blx@entryset#1{%
   \blx@ifdata{#1}
     {\begingroup
-     \begingroup
+%    \begingroup
      \blx@getdata{#1}%
-     \edef\blx@tempa{\endgroup
-       \def\noexpand\abx@field@entrytype{\abx@field@entrytype}}%
-     \blx@tempa
+%    \edef\blx@tempa{\endgroup
+%      \def\noexpand\abx@field@entrytype{\abx@field@entrytype}}%
+%    \blx@tempa
      \def\abx@field@entrysetcount{1}%
      \blx@set@precode
      \blx@driver{\blx@imc@thefield{entrytype}}%
@@ -3145,69 +3399,122 @@
 % [<wrapper>]{<string>}
 
 \newrobustcmd*{\blx@imc@bibstring}[2][\@firstofone]{%
+  \blx@bibstring{#1}{\abx@str}{#2}}
+
+\newrobustcmd*{\blx@imc@biblstring}[2][\@firstofone]{%
+  \blx@bibstring{#1}{abx@lstr}{#2}}
+
+\newrobustcmd*{\blx@imc@bibsstring}[2][\@firstofone]{%
+  \blx@bibstring{#1}{abx@sstr}{#2}}
+
+\protected\def\blx@bibstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
   \let\bibstring\blx@imc@bibxstring
-  \lowercase{\edef\blx@tempa{#2}}%
-  \ifcsundef{abx@str@\blx@tempa}
-    {\blx@warn@nostring{\blx@tempa}}
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
+  \lowercase{\edef\blx@tempa{#3}}%
+  \ifcsundef{#2@\blx@tempa}
+    {\blx@warn@nostring\blx@tempa}
     {\blx@imc@ifcapital
-       {#1{\MakeCapital{\csuse{abx@str@\blx@tempa}}}}
-       {#1{\csuse{abx@str@\blx@tempa}}}}%
+       {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}
+       {#1{\csuse{#2@\blx@tempa}}}}%
   \blx@endunit}
 
 % [<wrapper>]{<string>}
 
 \newrobustcmd*{\blx@imc@bibcpstring}[2][\@firstofone]{%
+  \blx@bibcpstring{#1}{\abx@str}{#2}}
+
+\newrobustcmd*{\blx@imc@bibcplstring}[2][\@firstofone]{%
+  \blx@bibcpstring{#1}{abx@lstr}{#2}}
+
+\newrobustcmd*{\blx@imc@bibcpsstring}[2][\@firstofone]{%
+  \blx@bibcpstring{#1}{abx@sstr}{#2}}
+
+\protected\def\blx@bibcpstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
   \let\bibstring\blx@imc@bibxstring
-  \lowercase{\edef\blx@tempa{#2}}%
-  \ifcsundef{abx@str@\blx@tempa}
-    {\blx@warn@nostring{\blx@tempa}}
-    {#1{\MakeCapital{\csuse{abx@str@\blx@tempa}}}}%
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
+  \lowercase{\edef\blx@tempa{#3}}%
+  \ifcsundef{#2@\blx@tempa}
+    {\blx@warn@nostring\blx@tempa}
+    {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}%
   \blx@endunit}
 
 % [<wrapper>]{<string>}
 
 \newrobustcmd*{\blx@imc@biblcstring}[2][\@firstofone]{%
+  \blx@biblcstring{#1}{\abx@str}{#2}}
+
+\newrobustcmd*{\blx@imc@biblclstring}[2][\@firstofone]{%
+  \blx@biblcstring{#1}{abx@lstr}{#2}}
+
+\newrobustcmd*{\blx@imc@biblcsstring}[2][\@firstofone]{%
+  \blx@biblcstring{#1}{abx@sstr}{#2}}
+
+\protected\def\blx@biblcstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
   \let\bibstring\blx@imc@bibxstring
-  \lowercase{\edef\blx@tempa{#2}}%
-  \ifcsundef{abx@str@\blx@tempa}
-    {\blx@warn@nostring{\blx@tempa}}
-    {#1{\MakeLowercase{\csuse{abx@str@\blx@tempa}}}}%
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
+  \lowercase{\edef\blx@tempa{#3}}%
+  \ifcsundef{#2@\blx@tempa}
+    {\blx@warn@nostring\blx@tempa}
+    {#1{\MakeLowercase{\csuse{#2@\blx@tempa}}}}%
   \blx@endunit}
 
 % [<wrapper>]{<string>}
 
 \newrobustcmd*{\blx@imc@bibucstring}[2][\@firstofone]{%
+  \blx@bibucstring{#1}{\abx@str}{#2}}
+
+\newrobustcmd*{\blx@imc@bibuclstring}[2][\@firstofone]{%
+  \blx@bibucstring{#1}{abx@lstr}{#2}}
+
+\newrobustcmd*{\blx@imc@bibucsstring}[2][\@firstofone]{%
+  \blx@bibucstring{#1}{abx@sstr}{#2}}
+
+\protected\def\blx@bibucstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
   \let\bibstring\blx@imc@bibxstring
-  \lowercase{\edef\blx@tempa{#2}}%
-  \ifcsundef{abx@str@\blx@tempa}
-    {\blx@warn@nostring{\blx@tempa}}
-    {#1{\MakeUppercase{\csuse{abx@str@\blx@tempa}}}}%
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
+  \lowercase{\edef\blx@tempa{#3}}%
+  \ifcsundef{#2@\blx@tempa}
+    {\blx@warn@nostring\blx@tempa}
+    {#1{\MakeUppercase{\csuse{#2@\blx@tempa}}}}%
   \blx@endunit}
 
 % {<string>}
 
 \def\blx@imc@bibxstring#1{%
-  \ifcsundef{abx@str@#1}
-    {\protect\blx@warn@nostring{#1}}
-    {\csuse{abx@str@#1}}}
+  \blx@bibxstring{\abx@str}{#1}}
+
+\def\blx@imc@bibxlstring#1{%
+  \blx@bibxstring{abx@lstr}{#1}}
+
+\def\blx@imc@bibxsstring#1{%
+  \blx@bibxstring{abx@sstr}{#1}}
+
+\def\blx@bibxstring#1#2{%
+  \ifcsundef{#1@#2}
+    {\protect\blx@warn@nostring{#2}}
+    {\csuse{#1@#2}}}
 
 % {<string>}{<true>}{<false>}
 
 \def\blx@imc@ifbibstring#1{%
-  \ifcsundef{abx@str@\detokenize{#1}}
+  \ifcsundef{\abx@str @\detokenize{#1}}
     {\@secondoftwo}
     {\@firstoftwo}}
 
 \def\blx@imc@ifbibxstring#1{%
-  \ifcsundef{abx@str@#1}
+  \ifcsundef{\abx@str @#1}
     {\@secondoftwo}
     {\@firstoftwo}}
 
@@ -3216,22 +3523,55 @@
 \def\blx@imc@iffieldbibstring#1{%
   \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
-    {\ifcsundef{abx@str@\detokenize\expandafter
+    {\ifcsundef{\abx@str @\detokenize\expandafter
        \expandafter\expandafter{\csname abx@field@#1\endcsname}}
        {\@secondoftwo}
        {\@firstoftwo}}}
 
 \blx@regimcs{%
-  \bibstring \bibxstring \bibcpstring \biblcstring
-  \bibucstring \ifbibstring \ifbibxstring \iffieldbibstring}
+  \bibstring   \biblstring   \bibsstring 
+  \bibxstring  \bibxlstring  \bibxsstring
+  \bibcpstring \bibcplstring \bibcpsstring
+  \biblcstring \biblclstring \biblcsstring
+  \bibucstring \bibuclstring \bibucsstring
+  \ifbibstring \ifbibxstring \iffieldbibstring}
+
+\let\blx@hook@uc\relax
+\let\blx@hook@lc\relax
+
+\expandafter\patchcmd\csname MakeUppercase \endcsname
+  {\protected@edef}
+  {\blx@hook@uc\protected@edef}
+  {}
+  {\blx@err@patch{\string\MakeUppercase}}
+
+\expandafter\patchcmd\csname MakeLowercase \endcsname
+  {\protected@edef}
+  {\blx@hook@lc\protected@edef}
+  {}
+  {\blx@err@patch{\string\MakeLowercase}}
 
 \appto\blx@blxinit{%
-  \appto\@uclclist{%
-    \bibstring\bibucstring
-    \biblcstring\bibstring
-    \bibcpstring\bibucstring
-    \biblcstring\bibcpstring
-    \biblcstring\bibucstring}}
+  \def\blx@hook@uc{%
+    \let\bibstring\blx@imc@bibucstring
+    \let\biblstring\blx@imc@bibuclstring
+    \let\bibsstring\blx@imc@bibucsstring
+    \let\biblcstring\blx@imc@bibucstring
+    \let\biblclstring\blx@imc@bibuclstring
+    \let\biblcsstring\blx@imc@bibucsstring
+    \let\bibcpstring\blx@imc@bibucstring
+    \let\bibcplstring\blx@imc@bibuclstring
+    \let\bibcpsstring\blx@imc@bibucsstring}%
+  \def\blx@hook@lc{%
+    \let\bibstring\blx@imc@biblcstring
+    \let\biblstring\blx@imc@biblclstring
+    \let\bibsstring\blx@imc@biblcsstring
+    \let\bibucstring\blx@imc@biblcstring
+    \let\bibuclstring\blx@imc@biblclstring
+    \let\bibucsstring\blx@imc@biblcsstring
+    \let\bibcpstring\blx@imc@biblcstring
+    \let\bibcplstring\blx@imc@biblclstring
+    \let\bibcpsstring\blx@imc@biblcsstring}}
 
 \def\abx@dostrings{%
   \do{bibliography}%
@@ -3329,14 +3669,14 @@
   \do{translatoranaf}%
   \do{translatorsanaf}%
   \do{byauthor}%
-  \do{byeditor}
-  \do{byeditor}
+  \do{byeditor}%
+  \do{byeditor}%
   \do{bycompiler}%
   \do{byredactor}%
   \do{byfounder}%
   \do{bycontinuator}%
   \do{bycollaborator}%
-  \do{bytranslator}
+  \do{bytranslator}%
   \do{bycommentator}%
   \do{byannotator}%
   \do{withcommentator}%
@@ -3344,40 +3684,40 @@
   \do{withintroduction}%
   \do{withforeword}%
   \do{withafterword}%
-  \do{byeditortr}
-  \do{byeditorco}
-  \do{byeditoran}
-  \do{byeditorin}
-  \do{byeditorfo}
-  \do{byeditoraf}
-  \do{byeditortrco}
-  \do{byeditortran}
-  \do{byeditortrin}
-  \do{byeditortrfo}
-  \do{byeditortraf}
-  \do{byeditorcoin}
-  \do{byeditorcofo}
-  \do{byeditorcoaf}
-  \do{byeditoranin}
-  \do{byeditoranfo}
-  \do{byeditoranaf}
-  \do{byeditortrcoin}
-  \do{byeditortrcofo}
-  \do{byeditortrcoaf}
-  \do{byeditortranin}
-  \do{byeditortranfo}
-  \do{byeditortranaf}
-  \do{bytranslatorco}
-  \do{bytranslatoran}
-  \do{bytranslatorin}
-  \do{bytranslatorfo}
-  \do{bytranslatoraf}
-  \do{bytranslatorcoin}
-  \do{bytranslatorcofo}
-  \do{bytranslatorcoaf}
-  \do{bytranslatoranin}
-  \do{bytranslatoranfo}
-  \do{bytranslatoranaf}
+  \do{byeditortr}%
+  \do{byeditorco}%
+  \do{byeditoran}%
+  \do{byeditorin}%
+  \do{byeditorfo}%
+  \do{byeditoraf}%
+  \do{byeditortrco}%
+  \do{byeditortran}%
+  \do{byeditortrin}%
+  \do{byeditortrfo}%
+  \do{byeditortraf}%
+  \do{byeditorcoin}%
+  \do{byeditorcofo}%
+  \do{byeditorcoaf}%
+  \do{byeditoranin}%
+  \do{byeditoranfo}%
+  \do{byeditoranaf}%
+  \do{byeditortrcoin}%
+  \do{byeditortrcofo}%
+  \do{byeditortrcoaf}%
+  \do{byeditortranin}%
+  \do{byeditortranfo}%
+  \do{byeditortranaf}%
+  \do{bytranslatorco}%
+  \do{bytranslatoran}%
+  \do{bytranslatorin}%
+  \do{bytranslatorfo}%
+  \do{bytranslatoraf}%
+  \do{bytranslatorcoin}%
+  \do{bytranslatorcofo}%
+  \do{bytranslatorcoaf}%
+  \do{bytranslatoranin}%
+  \do{bytranslatoranfo}%
+  \do{bytranslatoranaf}%
   \do{and}%
   \do{andothers}%
   \do{andmore}%
@@ -3509,10 +3849,7 @@
 }
 
 \newrobustcmd*{\NewBibliographyString}[1]{%
-  \begingroup
-  \let\do\blx@newstring
-  \docsvlist{#1}%
-  \endgroup}
+  \forcsvlist\blx@newstring{#1}}
 
 \def\blx@newstring#1{%
   \ifcsundef{KV@blx@lbx@#1}
@@ -3533,11 +3870,15 @@
   \blx@lbxinput{#1}{}{\blx@err@nolang{#1}}%
   \csuse{abx@strings@#1}}
 
-\def\blx@cfg@defstring#1{\csdef{abx@str@#1}}
+\def\blx@cfg@defstring#1#2{%
+  \csdef{abx@lstr@#1}{#2}%
+  \csdef{abx@sstr@#1}{#2}}
+
 \def\blx@lbx@defstring#1#2{%
-  \expandafter\blx@lbx@thedef\csname abx@str@#1\endcsname#2}
-\def\blx@lbx@longdef#1#2#3{\def#1{#2}}
-\def\blx@lbx@shortdef#1#2#3{\def#1{#3}}
+  \blx@lbx@defstring@i{#1}#2}
+\def\blx@lbx@defstring@i#1#2#3{%
+  \csdef{abx@lstr@#1}{#2}%
+  \csdef{abx@sstr@#1}{#3}}
 
 % {<language>}
 
@@ -3588,23 +3929,32 @@
 \@onlypreamble\DefineBibliographyStrings
 
 \def\blx@defbibstrings#1#2{%
-  \def\do##1{\csundef{abx@str@##1}}%
+  \def\do##1{\csundef{abx@lstr@##1}\csundef{abx@sstr@##1}}%
   \abx@dostrings
   \csuse{abx@strings@#1}%
   \setkeys{blx@lbx}{#2}%
-  \global\cslet{abx@strings@#1}\@empty
-  \def\do##1{%
-    \ifcsundef{abx@str@##1}
-      {\csxappto{abx@strings@#1}{%
-         \undef\expandafter\noexpand\csname abx@str@##1\endcsname}}
-      {\csxappto{abx@strings@#1}{%
-         \def\expandafter\noexpand\csname abx@str@##1\endcsname{%
-           \csexpandonce{abx@str@##1}}}}}%
-  \abx@dostrings
+  \let\do\blx@defbibstrings@i
+  \csxdef{abx@strings@#1}{\abx@dostrings}%
   \csgappto{abx@strings@#1}{%
-    \let\bibname\abx@str@bibliography
-    \let\refname\abx@str@references
-    \let\losname\abx@str@shorthands}}
+    \ifcsdef{\abx@str @bibliography}
+      {\letcs\bibname{\abx@str @bibliography}}
+      {\let\bibname\@empty}%
+    \ifcsdef{\abx@str @references}
+      {\letcs\refname{\abx@str @references}}
+      {\let\refname\@empty}%
+    \ifcsdef{\abx@str @shorthands}
+      {\letcs\losname{\abx@str @shorthands}}
+      {\let\losname\@empty}}}
+
+\def\blx@defbibstrings@i#1{%
+  \ifcsdef{abx@lstr@#1}
+    {\def\expandafter\noexpand\csname abx@lstr@#1\endcsname{%
+       \csexpandonce{abx@lstr@#1}}}
+    {\undef\expandafter\noexpand\csname abx@lstr@#1\endcsname}%
+  \ifcsdef{abx@sstr@#1}
+    {\def\expandafter\noexpand\csname abx@sstr@#1\endcsname{%
+       \csexpandonce{abx@sstr@#1}}}
+    {\undef\expandafter\noexpand\csname abx@sstr@#1\endcsname}}
 
 % {<language>}{<language>}
 
@@ -3652,7 +4002,7 @@
     {\blx@lbxinput@ii{#2}{#1.lbx}{language '#2' -> '#1'}}
     {\blx@warning@noline{%
        File '#1.lbx' not found!\MessageBreak
-       Ignoring mapping '#2' -> '#1'}
+       Ignoring mapping '#2' -> '#1'}%
      \blx@lbxinput{#2}}}
 
 % {<language>}{<lbxfile>}{<message>}
@@ -3737,58 +4087,89 @@
 % {<short|long>}{<basename>}
 
 \newrobustcmd*{\mkbibrangefull}[2]{%
-  \printtext{%
-    \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-    \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-         {\mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+       \iffieldundef{#2endyear}
+	 {}
+	 {\iffieldequalstr{#2endyear}{}
+            {\mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \newrobustcmd*{\mkbibrangetrunc}[2]{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\iffieldsequal{#2month}{#2endmonth}
-         {\csuse{mkbibdate#1}{}{}{#2day}}
-	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-         {\mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\iffieldsequal{#2month}{#2endmonth}
+            {\csuse{mkbibdate#1}{}{}{#2day}}
+	    {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+       \iffieldundef{#2endyear}
+	 {}
+	 {\iffieldequalstr{#2endyear}{}
+            {\mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \newrobustcmd*{\mkbibrangefullextra}[2]{%
-  \printtext{%
-    \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-  \iffieldundef{#2endyear}
-    {\printfield{extrayear}}
-    {\iffieldequalstr{#2endyear}{}
-       {\printfield{extrayear}%
-	\printtext{\mbox{\bibdatedash}}}
-       {\printtext{%
-	  \bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
-	  \printfield{extrayear}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+     \iffieldundef{#2endyear}
+       {\printfield{extrayear}}
+       {\iffieldequalstr{#2endyear}{}
+	  {\printfield{extrayear}%
+	   \printtext{\mbox{\bibdatedash}}}
+	  {\printtext{%
+	     \bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+	     \printfield{extrayear}}}}}}
 
 \newrobustcmd*{\mkbibrangetruncextra}[2]{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\iffieldsequal{#2month}{#2endmonth}
-         {\csuse{mkbibdate#1}{}{}{#2day}}
-	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}%
-  \iffieldundef{#2endyear}
-    {\printfield{extrayear}}
-    {\iffieldequalstr{#2endyear}{}
-       {\printfield{extrayear}%
-	\printtext{\mbox{\bibdatedash}}}
-       {\printtext{%
-	  \bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
-	  \printfield{extrayear}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\iffieldsequal{#2month}{#2endmonth}
+            {\csuse{mkbibdate#1}{}{}{#2day}}
+	    {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}%
+     \iffieldundef{#2endyear}
+       {\printfield{extrayear}}
+       {\iffieldequalstr{#2endyear}{}
+	  {\printfield{extrayear}%
+	   \printtext{\mbox{\bibdatedash}}}
+	  {\printtext{%
+	     \bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+	     \printfield{extrayear}}}}}}
+
+\newrobustcmd*{\mkbibrangeiso}[1]{%
+  \iffieldundef{#1year}
+    {}
+    {\printtext{%
+       \blx@isodate{#1year}{#1month}{#1day}%
+       \iffieldundef{#1endyear}
+	 {}
+	 {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
+
+\newrobustcmd*{\mkbibrangeisoextra}[1]{%
+  \iffieldundef{#1year}
+    {}
+    {\printtext{%
+       \blx@isodate[extrayear]{#1year}{#1month}{#1day}%
+       \iffieldundef{#1endyear}
+	 {}
+	 {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
+
+\newrobustcmd*{\blx@isodate}[4][]{%
+  \thefield{#2}\ifblank{#1}{}{\printfield{#1}}%
+  \iffieldundef{#3}{}{\mbox{-}\thefield{#3}}%
+  \iffieldundef{#4}{}{\mbox{-}\thefield{#4}}}
 
 \newrobustcmd*{\mkbibdatelong}[3]{}
 \newrobustcmd*{\mkbibdateshort}[3]{}
@@ -3801,18 +4182,18 @@
 \newrobustcmd*{\mkbibmonth}[1]{%
   \ifcase0#1\relax
     0\blx@warning@entry{Month out of range}%
-  \or\bibstring{january}%
-  \or\bibstring{february}%
-  \or\bibstring{march}%
-  \or\bibstring{april}%
-  \or\bibstring{may}%
-  \or\bibstring{june}%
-  \or\bibstring{july}%
-  \or\bibstring{august}%
-  \or\bibstring{september}%
-  \or\bibstring{october}%
-  \or\bibstring{november}%
-  \or\bibstring{december}%
+  \or\abx@bibmonth{january}%
+  \or\abx@bibmonth{february}%
+  \or\abx@bibmonth{march}%
+  \or\abx@bibmonth{april}%
+  \or\abx@bibmonth{may}%
+  \or\abx@bibmonth{june}%
+  \or\abx@bibmonth{july}%
+  \or\abx@bibmonth{august}%
+  \or\abx@bibmonth{september}%
+  \or\abx@bibmonth{october}%
+  \or\abx@bibmonth{november}%
+  \or\abx@bibmonth{december}%
   \else
     #1\blx@warning@entry{Month out of range}%
   \fi}%
@@ -3833,20 +4214,20 @@
 % {<language>}{<strings>}
 
 \def\blx@maplang#1#2{%
-  \csxappto{captions#1}{%
-    \expandafter\noexpand\csname abx@strings@#2\endcsname}%
   \csxappto{extras#1}{%
     \noexpand\blx@resetpunct
-    \expandafter\noexpand\csname abx@extras@#2\endcsname}%
+    \expandafter\noexpand\csname abx@extras@#2\endcsname
+    \expandafter\noexpand\csname abx@strings@#2\endcsname}%
   \csxappto{noextras#1}{%
     \noexpand\blx@resetpunct
     \expandafter\noexpand\csname abx@noextras@#2\endcsname}}
 
 %% Babel interface
 
-\let\blx@beglang\begingroup
-\let\blx@endlang\endgroup
+\def\blx@beglang{\blx@clearlang\begingroup}
+\def\blx@endlang{\endgroup}
 \let\blx@hook@endlang\@empty
+\let\blx@hook@initlang\@empty
 \def\blx@hyphenreset{%
   \ifcsundef{l@\blx@languagename}
     {}
@@ -3863,18 +4244,20 @@
   \patchcmd\bbl@set@language
     {\select@language}
     {\blx@langsetup\languagename\select@language}%
-    {\ifundef\blx@thelangenv
-       {}
+    {\ifdef\blx@thelangenv
        {\def\blx@beglang{%
-          \begingroup
+          \blx@clearlang
+	  \begingroup
           \blx@imc@iffieldundef{hyphenation}
             {}
-            {\def\blx@endlang{%
+            {\blx@hook@initlang
+	     \def\blx@endlang{%
                \blx@hook@endlang
                \csname end\blx@thelangenv\endcsname
                \endgroup}%
              \csname\blx@thelangenv\expandafter\endcsname
-               \expandafter{\abx@field@hyphenation}}}}%
+               \expandafter{\abx@field@hyphenation}}}}
+       {}%
      \blx@langsetup\bbl@main@language}
     {\blx@err@patch{'babel' package}%
      \blx@mknobabel}}
@@ -3884,6 +4267,40 @@
     {}
     {\blx@err@nolang{\blx@languagename}}}
 
+\newrobustcmd*{\DeclareRedundantLanguages}[2]{%
+  \begingroup
+  \ifblank{#2}
+    {\def\do##1{%
+       \global\csundef{blx@rlm@##1}%
+       \global\csundef{blx@rlm@lang##1}}}
+    {\def\do##1{%
+       \csxdef{blx@rlm@##1}{#2}%
+       \csxdef{blx@rlm@lang##1}{#2}}}%
+  \docsvlist{#1}%
+  \endgroup}
+
+\def\blx@clearlang{%
+  \iftoggle{blx@clearlang}
+    {\iflistundef{language}
+       {}
+       {\ifnumgreater{\value{language}}{1}
+	  {}
+	  {\expandafter\blx@clearlang@i\abx@list@language}}}
+    {}}
+
+\def\blx@clearlang@i#1{%
+  \ifcsdef{blx@rlm@#1}
+    {\expandafter\expandafter\expandafter\forcsvlist
+     \expandafter\expandafter\expandafter\blx@clearlang@ii
+     \expandafter\expandafter\expandafter{%
+       \csname blx@rlm@#1\endcsname}}
+    {}}
+
+\def\blx@clearlang@ii#1{%
+  \ifdefstring\languagename{#1}
+    {\clearlist{language}}
+    {}}
+
 %% Bibtex data interface
 
 \def\abx@donames{%
@@ -3954,6 +4371,7 @@
   \do{eid}%
   \do{eprint}%
   \do{eprinttype}%
+  \do{eprintclass}%
   \do{file}%
   \do{gender}%
   \do{howpublished}%
@@ -3979,6 +4397,7 @@
   \do{extrayear}%
   \do{library}%
   \do{localnumber}%
+  \do{prefixnumber}%
   \do{mainsubtitle}%
   \do{maintitle}%
   \do{maintitleaddon}%
@@ -4101,21 +4520,66 @@
   \blx@warning@noline{\blx@tempa}%
   \endgroup}
 
+% {<field>}{<code>}
+
+\newrobustcmd{\DeclareFieldInputHandler}[2]{%
+  \ifblank{#2}
+    {\csundef{blx@fih@#1}}
+    {\long\csdef{blx@fih@#1}##1{#2}}}
+\@onlypreamble\DeclareFieldInputHandler
+
+% {<list>}{<code>}
+
+\newrobustcmd*{\DeclareListInputHandler}[2]{%
+  \ifblank{#2}
+    {\csundef{blx@lih@#1}}
+    {\csdef{blx@lih@#1}##1{#2}}}
+\@onlypreamble\DeclareListInputHandler
+
+% {<name>}{<code>}
+
+\newrobustcmd*{\DeclareNameInputHandler}[2]{%
+  \ifblank{#2}
+    {\csundef{blx@nih@#1}}
+    {\csdef{blx@nih@#1}##1{#2}}}
+\@onlypreamble\DeclareNameInputHandler
+
+% {<entrykey>}{<refsection>}{<field>}{<value>}
+
+\long\def\blx@bbl@addentryfield#1#2#3#4{%
+  \csxappto{blx@data@#2@\detokenize{#1}}{%
+    \def\expandafter\noexpand\csname abx@field@#3\endcsname{#4}}}
+
 % {<field>}{<value>}
 
-\protected\long\def\blx@bbl@fielddef#1#2{%
+\long\def\blx@bbl@addfield#1#2{%
   \csxappto\blx@bbl@data{%
-    \def\expandonce{\csname abx@field@#1\endcsname}%
-    {\unexpanded{#2}}}}
+    \def\expandafter\noexpand\csname abx@field@#1\endcsname{#2}}}
+
+\protected\long\def\blx@bbl@fielddef#1#2{%
+  \def\NewValue{#2}%
+  \ifcsdef{blx@fih@#1}
+    {\csname blx@fih@#1\endcsname{#2}%
+     \ifdefvoid\NewValue}
+    {\@secondoftwo}
+       {}
+       {\blx@bbl@addfield{#1}{\expandonce\NewValue}}}
 
 \protected\long\def\blx@bbl@fieldedef#1#2{%
-  \csxappto\blx@bbl@data{%
-    \def\expandonce{\csname abx@field@#1\endcsname}{#2}}}
+  \edef\NewValue{#2}%
+  \ifcsdef{blx@fih@#1}
+    {\csname blx@fih@#1\expandafter
+     \endcsname\expandafter{\NewValue}%
+     \ifdefvoid\NewValue}
+    {\@secondoftwo}
+       {}
+       {\blx@bbl@addfield{#1}{\NewValue}}}
 
 \protected\long\def\blx@bbl@stringdef#1#2{%
-  \csxappto\blx@bbl@data{%
-    \def\expandonce{\csname abx@field@#1\endcsname}%
-    {\detokenize{#2}}}}
+  \begingroup
+  \edef\blx@tempa{\endgroup
+    \blx@bbl@fielddef{#1}{\detokenize{#2}}}%
+  \blx@tempa}
 
 % {<field>}
 
@@ -4123,12 +4587,16 @@
   \begingroup
   \let\verb\blx@bbl@verbadd
   \def\blx@tempa{#1}%
-  \let\blx@tempb\@empty}
+  \let\NewValue\@empty}
 
 \protected\def\blx@bbl@verbend{%
-  \csxappto\blx@bbl@data{%
-    \def\expandonce{\csname abx@field@\blx@tempa\endcsname}%
-      {\blx@tempb}}%
+  \ifcsdef{blx@fih@\blx@tempa}
+    {\csname blx@fih@\blx@tempa\expandafter
+     \endcsname\expandafter{\NewValue}%
+     \ifdefvoid\NewValue}
+    {\@secondoftwo}
+       {}
+       {\blx@bbl@addfield{\blx@tempa}{\NewValue}}%
   \endgroup}
 
 \protected\def\blx@bbl@verbadd{%
@@ -4145,7 +4613,7 @@
 \uccode`\>=\endlinechar
 \uppercase{\gdef\blx@bbl@verbadd@i<#1>}{%
   \endgroup
-  \edef\blx@tempb{\blx@tempb\detokenize{#1}}}
+  \edef\NewValue{\NewValue\detokenize{#1}}}
 \endgroup
 
 % {<counter>}{<value>}
@@ -4167,18 +4635,33 @@
 % {<list}{<itemcount>}{<value>}
 
 \protected\def\blx@bbl@listdef#1#2#3{%
-  \csxappto\blx@bbl@data{%
-    \csname c@#1\endcsname#2\relax
-    \def\expandonce{\csname abx@list@#1\endcsname}%
-    {\unexpanded{#3}}}}
+  \def\NewCount{#2}%
+  \def\NewValue{#3}%
+  \ifcsdef{blx@lih@#1}
+    {\csname blx@lih@#1\endcsname{#3}%
+     \ifdefvoid\NewValue}
+    {\@secondoftwo}
+       {}
+       {\csxappto\blx@bbl@data{%
+	  \csname c@#1\endcsname\NewCount\relax
+	  \def\expandafter\noexpand\csname abx@list@#1\endcsname
+	  {\expandonce\NewValue}}}}
+
 
 % {<name>}{<itemcount>}{<value>}
 
 \protected\def\blx@bbl@namedef#1#2#3{%
-  \csxappto\blx@bbl@data{%
-    \csname c@#1\endcsname#2\relax
-    \def\expandonce{\csname abx@name@#1\endcsname}%
-    {\unexpanded{#3}}}}
+  \def\NewCount{#2}%
+  \def\NewValue{#3}%
+  \ifcsdef{blx@nih@#1}
+    {\csname blx@nih@#1\endcsname{#3}%
+     \ifdefvoid\NewValue}
+    {\@secondoftwo}
+       {}
+       {\csxappto\blx@bbl@data{%
+	  \csname c@#1\endcsname\NewCount\relax
+	  \def\expandafter\noexpand\csname abx@name@#1\endcsname
+	  {\expandonce\NewValue}}}}
 
 % {<entrykey>,...}
 
@@ -4187,8 +4670,9 @@
   \csxdef{blx@setp@\the\c@refsection @\abx@field@entrykey}{\detokenize{#1}}%
   \begingroup
   \blx@tempcnta\z@
-  \let\do\blx@bbl@set@i
-  \expandafter\docsvlist\expandafter{\detokenize{#1}}%
+  \expandafter\forcsvlist
+  \expandafter\blx@bbl@set@i
+  \expandafter{\detokenize{#1}}%
   \endgroup}
 
 \def\blx@bbl@set@i#1{%
@@ -4205,11 +4689,11 @@
 % {<entrykey>}
 
 \protected\def\blx@bbl@xref#1{%
-  \ifcsdef{blx@refp@\the\c@refsection @#1}
+  \ifcsdef{blx@refp@\the\c@refsection @\detokenize{#1}}
     {}
-    {\listcsgadd{blx@refs@\the\c@refsection}{#1}}%
-  \listcsxadd{blx@refp@\the\c@refsection @#1}{\abx@field@entrykey}%
-  \csxdef{blx@refc@\the\c@refsection @\abx@field@entrykey}{#1}}
+    {\listcsxadd{blx@refs@\the\c@refsection}{\detokenize{#1}}}%
+  \listcsxadd{blx@refp@\the\c@refsection @\detokenize{#1}}{\abx@field@entrykey}%
+  \csxdef{blx@refc@\the\c@refsection @\abx@field@entrykey}{\detokenize{#1}}}
 
 \def\blx@addxref#1{%
   \blx@ifdata{#1}
@@ -4227,8 +4711,7 @@
 \protected\def\blx@bbl@keyw#1{%
   \iftoggle{blx@skipbib}
     {}
-    {\def\do{\blx@addkeyword{\abx@field@entrykey}}%
-     \docsvlist{#1}%
+    {\forcsvlist{\blx@addkeyword{\abx@field@entrykey}}{#1}%
      \blx@bbl@fielddef{keywords}{#1}}}
 
 \def\blx@addkeyword#1#2{%
@@ -4239,8 +4722,7 @@
 \protected\long\def\blx@bbl@options#1{%
   \begingroup
   \let\blx@tempa\@empty
-  \let\do\blx@bbl@options@i
-  \docsvlist{#1}%
+  \forcsvlist\blx@bbl@options@i{#1}%
   \edef\blx@tempa{%
     \endgroup
     \ifx\blx@tempa\@empty
@@ -4348,6 +4830,17 @@
        {}}
     {}}
 
+% {<section>}
+
+\def\blx@bbl@refsection#1{%
+  \begingroup
+  \c@refsection#1\relax}
+
+\def\blx@bbl@endrefsection{%
+  \endgroup
+  \csnumgdef{blx@labelnumber@\the\c@refsection}{0}%
+  \iftoggle{blx@reencode}{\blx@reencode}{}}
+
 % {<entrykey>}{<entrytype>}{<options>}
 
 \protected\def\blx@bbl@entry#1#2#3{%
@@ -4359,8 +4852,8 @@
   \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
   \csuse\blx@bbl@data
   \cslet\blx@bbl@data\@empty
-  \blx@bbl@fieldedef{entrykey}{\abx@field@entrykey}%
-  \blx@bbl@fielddef{entrytype}{#2}%
+  \blx@bbl@addfield{entrykey}{\abx@field@entrykey}%
+  \blx@bbl@addfield{entrytype}{#2}%
   \blx@imc@iffieldundef{options}
     {}
     {\blx@bbl@fieldedef{options}{\expandonce\abx@field@options}}}
@@ -4406,19 +4899,16 @@
   \begingroup
   \letcs\blx@tempa{blx@sort@\the\c@refsection}%
   \global\cslet{blx@sort@\the\c@refsection}\@empty
-  \let\do\blx@addset@i
-  \dolistloop\blx@tempa
+  \forlistloop\blx@addset@i\blx@tempa
   \endgroup}
 
 \def\blx@addset@i#1{%
   \listcsgadd{blx@sort@\the\c@refsection}{#1}%
   \ifcsdef{blx@setp@\the\c@refsection @#1}
-    {\begingroup
-     \let\do\blx@addset@ii
-     \expandafter\expandafter\expandafter\docsvlist
+    {\expandafter\expandafter\expandafter\forcsvlist
+     \expandafter\expandafter\expandafter\blx@addset@ii
      \expandafter\expandafter\expandafter{%
-       \csname blx@setp@\the\c@refsection @#1\endcsname}%
-     \endgroup}
+       \csname blx@setp@\the\c@refsection @#1\endcsname}}
     {}}
 
 \def\blx@addset@ii#1{%
@@ -4431,24 +4921,32 @@
        \csuse{abx@ffd@*@shorthandwidth}{\abx@field@shorthand}}}}
 
 \def\blx@bbl@labelnumber{%
-  \ifundef\abx@field@shorthand
-    {\ifundef\abx@field@localnumber
-       {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
-          \csuse{blx@labelnumber@\the\c@refsection}+1}%
-        \edef\abx@field@localnumber{%
-          \csuse{blx@labelnumber@\the\c@refsection}}}
-       {}%
-     \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
-     \iftoggle{blx@skipbib}
-       {}
-       {\blx@setlabwidth{\labelnumberwidth}{%
-          \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@localnumber}}}}
-    {\csgappto\blx@bbl@data{%
-       \let\abx@field@labelnumber\abx@field@shorthand}%
-     \iftoggle{blx@skipbib}
-       {}
-       {\blx@setlabwidth{\labelnumberwidth}{%
-          \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}
+  \ifdefempty\abx@field@localnumber
+    {}
+    {\ifundef\abx@field@shorthand
+       {\ifdef\abx@field@localnumber
+	  {}
+	  {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+             \csuse{blx@labelnumber@\the\c@refsection}+1}%
+           \edef\abx@field@localnumber{%
+             \csuse{blx@labelnumber@\the\c@refsection}}}%
+	\blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
+	\iftoggle{blx@skipbib}
+	  {}
+	  {\blx@setlabwidth{\labelnumberwidth}{%
+             \csuse{abx@ffd@*@labelnumberwidth}{%
+	       \ifdef\abx@field@prefixnumber
+	         {\abx@field@prefixnumber\abx@field@localnumber}
+		 {\abx@field@localnumber}}}}}
+       {\csgappto\blx@bbl@data{%
+	  \let\abx@field@labelnumber\abx@field@shorthand}%
+	\iftoggle{blx@skipbib}
+	  {}
+	  {\blx@setlabwidth{\labelnumberwidth}{%
+             \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}%
+  \ifdef\abx@field@prefixnumber
+    {\blx@bbl@fieldedef{prefixnumber}{\abx@field@prefixnumber}}
+    {}}
 
 \def\blx@bbl@labelalpha{%
   \ifundef\abx@field@shorthand
@@ -4575,6 +5073,8 @@
 \def\blx@bblstart{%
   \let\preamble\blx@bbl@preamble
   \let\warn\blx@bbl@thewarn
+  \let\refsection\blx@bbl@refsection
+  \let\endrefsection\blx@bbl@endrefsection
   \let\entry\blx@bbl@entry
   \let\endentry\blx@bbl@endentry
   \let\lossort\blx@bbl@lossort
@@ -4609,30 +5109,43 @@
 % {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
 
 \protected\def\blx@aux@number#1#2#3#4{%
-  \begingroup
-  \edef\blx@bbl@data{blx@data@#3@\detokenize{#2}}%
-  \blx@bbl@fielddef{localnumber}{#4}%
-  \csgdef{blx@labelnumber@\the\c@refsection}{#4}%
-  \blx@addchecksum{\the\numexpr#1+#4}%
-  \endgroup}
+  \blx@bbl@addentryfield{#2}{#3}{localnumber}{#4}%
+  \ifblank{#4}
+    {}
+    {\csgdef{blx@labelnumber@#3}{#4}%
+     \blx@addchecksum{#1}{#4}}}
 
 \AtEndDocument{%
-  \def\abx@aux@number#1#2#3#4{\blx@addchecksum{\the\numexpr#1+#4}}}
+  \def\abx@aux@number#1#2#3#4{\blx@addchecksum{#1}{#4}}}
+
+% {<entrykey>}{<refsection>}{<numberprefix>}
+
+\protected\def\blx@aux@numprefix#1#2#3{%
+  \blx@bbl@addentryfield{#1}{#2}{prefixnumber}{#3}}
 
 \def\blx@addlabelnumber{%
   \iftoggle{blx@skiplab}
     {}
     {\begingroup
-     \ifundef\abx@field@shorthand
-       {\ifundef\abx@field@localnumber
-          {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
-             \csuse{blx@labelnumber@\the\c@refsection}+1}%
-           \blx@auxwrite\@mainaux{%
-             \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
-               {\the\c@refsection}{\csuse{blx@labelnumber@\the\c@refsection}}}%
-           \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
-           \blx@bbl@fieldedef{localnumber}{\csuse{blx@labelnumber@\the\c@refsection}}}
-          {}}
+     \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
+     \iftoggle{blx@omitnumbers}
+       {\blx@auxwrite\@mainaux{}{%
+          \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{}}}
+       {\ifundef\abx@field@shorthand
+	  {\ifundef\abx@field@localnumber
+             {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+        	\csuse{blx@labelnumber@\the\c@refsection}+1}%
+              \blx@auxwrite\@mainaux{}{%
+        	\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
+        	  {\the\c@refsection}{\csuse{blx@labelnumber@\the\c@refsection}}}}
+             {}}
+	  {}}%
+     \ifdef\blx@prefixnumbers
+       {\ifundef\abx@field@shorthand
+          {\blx@auxwrite\@mainaux{}{%
+	      \string\blx@aux@numprefix{\abx@field@entrykey}%
+		{\the\c@refsection}{\expandonce\blx@prefixnumbers}}}
+	  {}}
        {}%
      \endgroup}}
 
@@ -4657,8 +5170,8 @@
 
 \def\blx@bblinput{%
   \begingroup
-  \iftoggle{blx@recode}
-    {\ifdef\inpenc@prehook % inputenc 2006/05/05 v1.1b
+  \iftoggle{blx@reencode}
+    {\ifdef\inpenc@prehook
        {\inpenc@prehook{}%
         \inpenc@posthook{}}
        {}%
@@ -4666,46 +5179,62 @@
     {}%
   \blx@info@noline{Trying to load bibliographic data..}%
   \blx@blxinit
-  \blx@bblfile
-  \blx@bblsecs
+  \ifnumequal\blx@backend\blx@backend@biber
+    {\blx@bblfile@biber}
+    {\blx@bblfile@bibtex
+     \blx@bblsecs@bibtex}%
   \endgroup
-  \iftoggle{blx@recode}
+  \iftoggle{blx@reencode}
     {\ifdef\@enablequotes
        {\@enablequotes}
        {}}
     {}}
 
-\def\blx@bblfile{%
+\def\blx@bblfile@biber{%
+  \blx@secinit
+  \begingroup
+  \blx@bblstart
+  \blx@ifsigned{\jobname}{bbl}
+    {\InputIfFileExists{\jobname.bbl}
+       {\blx@info@noline{... file '\jobname.bbl' found}}
+       {\blx@info@noline{... file '\jobname.bbl' not found}%
+        \typeout{No file \jobname.bbl.}}}
+    {}%
+  \blx@bblend
+  \endgroup
+  \csnumgdef{blx@labelnumber@\the\c@refsection}{0}}
+
+\def\blx@bblfile@bibtex{%
   \blx@secinit
   \begingroup
   \blx@bblstart
   \ifnum\c@refsection>\z@
-    \edef\blx@auxfile{\jobname\the\c@refsection\blxauxsuffix}%
+    \edef\blx@auxfile@bibtex{\jobname\the\c@refsection\blxauxsuffix}%
   \else
-    \edef\blx@auxfile{\jobname}%
+    \edef\blx@auxfile@bibtex{\jobname}%
   \fi
-  \blx@ifsigned{\blx@auxfile}{bbl}
-    {\InputIfFileExists{\blx@auxfile.bbl}
-       {\blx@info@noline{... file '\blx@auxfile.bbl' found}}
-       {\blx@info@noline{... file '\blx@auxfile.bbl' not found}%
-        \typeout{No file \blx@auxfile.bbl.}}}
+  \blx@ifsigned{\blx@auxfile@bibtex}{bbl}
+    {\InputIfFileExists{\blx@auxfile@bibtex.bbl}
+       {\blx@info@noline{... file '\blx@auxfile@bibtex.bbl' found}}
+       {\blx@info@noline{... file '\blx@auxfile@bibtex.bbl' not found}%
+        \typeout{No file \blx@auxfile@bibtex.bbl.}}}
     {}%
   \blx@bblend
   \endgroup
   \csnumgdef{blx@labelnumber@\the\c@refsection}{0}%
-  \iftoggle{blx@recode}{\blx@recode}{}}
+  \iftoggle{blx@reencode}{\blx@reencode}{}}
 
-\def\blx@bblsecs{%
+\def\blx@bblsecs@bibtex{%
   \advance\c@refsection\@ne
   \ifnum\c@refsection>\blx@maxsection
   \else
-    \blx@bblfile
-    \expandafter\blx@bblsecs
+    \blx@bblfile@bibtex
+    \expandafter\blx@bblsecs@bibtex
   \fi}
 
-\def\blx@recode{%
+\def\blx@reencode{%
   \begingroup
-  \abx@hook@recode
+  \abx@hook@reencode
   \let\protect\@unexpandable@protect
   \def\do##1{\cslet{abx@name@##1}\relax}%
   \abx@donames
@@ -4722,7 +5251,7 @@
   \dolistcsloop{blx@sort@\the\c@refsection}%
   \endgroup}
 
-\def\abx@hook@recode{%
+\def\abx@hook@reencode{%
   \ifdef\@enablequotes{\@enablequotes}{}%
   \def\IeC##1{\unexpanded{\IeC{##1}}}%
   \let~\relax
@@ -4777,11 +5306,60 @@
 % {<name>}{<code>}
 
 \newrobustcmd*{\defbibfilter}[2]{%
+  \begingroup
+  \def\blx@flt@error{\csname blx@flt@errortrue\endcsname}%
+  \let\not\blx@flt@not \let\NOT\not
+  \let\and\blx@flt@and \let\AND\and
+  \let\or\blx@flt@or   \let\OR\or
+  \letcs\({blx@flt@(}  \letcs\){blx@flt@)}%
+  \def\section##1{\blx@flt@error}%
+  \def\segment##1{segment=##1}%
+  \def\type##1{type=##1}%
+  \def\subtype##1{subtype=##1}%
+  \def\keyword##1{keyword={##1}}%
+  \def\category##1{category={##1}}%
+  \edef\blx@tempa{\noexpand\blx@defbibfilter{#2}}%
+  \ifdef\blx@flt@errortrue
+    {\blx@err@filter}
+    {\let\the\relax
+     \let\blx@flt@item\relax
+     \edef\blx@tempa{\blx@tempa}%
+     \ifdef\blx@flt@errortrue
+       {\blx@err@filter}
+       {\csxdef{blx@filter@#1}{\blx@tempa}}}%
+  \endgroup}
+
+\def\blx@defbibfilter#1{%
+  \blx@defbibfilter@i#1 &}
+\def\blx@defbibfilter@i#1 #2&{%
+  \blx@defbibfilter@ii#1==&%
+  \ifblank{#2}{}{\blx@defbibfilter@i#2 &}}
+\def\blx@defbibfilter@ii#1=#2=#3&{%
   \ifblank{#2}
-    {\blx@error
-       {Invalid filter}
-       {The specified filter code is invalid}}
-    {\long\csdef{blx@filter@#1}{#2}}}
+    {\ifblank{#1}
+       {}
+       {\ifcsdef{blx@flt@#1}
+          {\csname blx@flt@#1\endcsname}
+	  {\blx@flt@error}}}
+    {\ifcsdef{blx@flt@#1}
+       {\csname blx@flt@#1\endcsname{\detokenize{#2}}}
+       {\blx@flt@error}}}
+
+\def\blx@flt@and{ and }
+\def\blx@flt@or{ or }
+\def\blx@flt@not{ not }
+\csdef{blx@flt@(}{ ( }
+\csdef{blx@flt@)}{ ) }
+\def\blx@flt@segment#1{%
+  test {\xifinlistcs\blx@flt@item{blx@segm@\the\c@refsection @#1}}}
+\def\blx@flt@type#1{%
+  test {\xifinlistcs\blx@flt@item{blx@type@\the\c@refsection @#1}}}
+\def\blx@flt@subtype#1{%
+  test {\xifinlistcs\blx@flt@item{blx@subt@\the\c@refsection @#1}}}
+\def\blx@flt@keyword#1{%
+  test {\xifinlistcs\blx@flt@item{blx@keyw@\the\c@refsection @#1}}}
+\def\blx@flt@category#1{%
+  test {\xifinlistcs\blx@flt@item{blx@catg@#1}}}
 
 % options
 
@@ -4923,12 +5501,12 @@
 \define@key{blx@los}{filter}{\blx@key@filter{#1}}
 
 \def\blx@key@filter#1{%
-  \ifcsundef{blx@filter@#1}
+  \ifcsdef{blx@filter@#1}
+    {\blx@printbibchecks
+     \blx@bibfilter\blx@tempa{blx@filter@#1}}
     {\blx@warning{%
        Custom filter '#1' not found.\MessageBreak
-       Skipping this custom filter}}
-    {\blx@printbibchecks
-     \blx@bibfilter\blx@tempa{blx@filter@#1}}}
+       Skipping this custom filter}}}
 
 \define@key{blx@bib}{maxnames}{\blx@key@maxnames{#1}}
 \define@key{blx@los}{maxnames}{\blx@key@maxnames{#1}}
@@ -5022,6 +5600,32 @@
         {Use \string\defbibnote\space to define it}}
      {\def\blx@thepostnote{#1}}}
 
+\define@key{blx@bib}{resetnumbers}[true]{%
+  \ifstrequal{#1}{true}
+    {\iftoggle{blx@defernumbers}
+       {\csnumdef{blx@labelnumber@0}{0}}
+       {\blx@warning{%
+          Option 'resetnumbers' requires 'defernumbers=true'.\MessageBreak
+          Ignoring 'resetnumbers=true'}}}
+    {}}
+
+\define@key{blx@bib}{omitnumbers}[true]{%
+  \ifstrequal{#1}{true}
+    {\iftoggle{blx@defernumbers}
+       {\toggletrue{blx@omitnumbers}}
+       {\blx@warning{%
+          Option 'omitnumbers' requires 'defernumbers=true'.\MessageBreak
+          Ignoring 'omitnumbers=true'}}}
+    {}}
+
+\define@key{blx@bib}{prefixnumbers}{%
+  \iftoggle{blx@defernumbers}
+    {\csnumdef{blx@labelnumber@0}{0}%
+     \def\blx@prefixnumbers{#1}}
+    {\blx@warning{%
+       Option 'prefixnumbers' requires 'defernumbers=true'.\MessageBreak
+       Ignoring 'prefixnumbers=\detokenize{#1}'}}}
+
 % [<options>]
 
 \newrobustcmd*{\printbibheading}{%
@@ -5172,8 +5776,7 @@
   \setkeys{blx@bbc}{#1}%
   \blx@rest@actives
   \togglefalse{blx@tempa}%
-  \let\do\blx@bibcategory
-  \dolistloop\blx@categories
+  \forlistloop\blx@bibcategory\blx@categories
   \blx@endbibcategory}
 
 \def\blx@bibcategory#1{%
@@ -5213,7 +5816,6 @@
 
 \def\blx@endbibliography{%
   \csuse{blx@endenv@\blx@theenv}%
-  \par\nobreak
   \blx@noitem
   \endgroup
   \blx@bibnote\blx@thepostnote
@@ -5230,7 +5832,7 @@
   \let\newrefsegment\blx@newrefsegment}
 
 \def\blx@bibnote#1{%
-  \ifdefempty{#1}
+  \ifdefempty#1
     {}
     {\begingroup
      \let\newrefsection\relax
@@ -5244,6 +5846,7 @@
     {}
     {\toggletrue{blx@bibliography}}%
   \blx@blxinit
+  \blx@resetdata
   \csuse{blx@hook@bbxinit}%
   \bibsetup\bibfont
   \blx@setsfcodes
@@ -5320,29 +5923,29 @@
 
 \protected\def\blx@aux@page#1#2{%
   \csgdef{blx@page@#1}{#2}%
-  \blx@addchecksum{\the\numexpr#1+0#2}}
+  \blx@addchecksum{#1}{#2}}
 \protected\def\blx@aux@spread#1#2{%
   \ifodd#2\relax
     \csxdef{blx@page@#1}{\number\numexpr#2-1}%
   \else
     \csgdef{blx@page@#1}{#2}%
   \fi
-  \blx@addchecksum{\the\numexpr#1+0#2}}
+  \blx@addchecksum{#1}{#2}}
 
 \protected\def\blx@aux@fnpage#1#2{%
   \csgdef{blx@fnpage@#1}{#2}%
-  \blx@addchecksum{\the\numexpr#1+0#2}}
+  \blx@addchecksum{#1}{#2}}
 \protected\def\blx@aux@fnspread#1#2{%
   \ifodd#2\relax
     \csxdef{blx@fnpage@#1}{\number\numexpr#2-1}%
   \else
     \csgdef{blx@fnpage@#1}{#2}%
   \fi
-  \blx@addchecksum{\the\numexpr#1+0#2}}
+  \blx@addchecksum{#1}{#2}}
 
 \AtEndDocument{%
-  \def\abx@aux@page#1#2{\blx@addchecksum{\the\numexpr#1+0#2}}%
-  \def\abx@aux@fnpage#1#2{\blx@addchecksum{\the\numexpr#1+0#2}}}
+  \def\abx@aux@page#1#2{\blx@addchecksum{#1}{#2}}%
+  \def\abx@aux@fnpage#1#2{\blx@addchecksum{#1}{#2}}}
 
 % hyperref interface
 
@@ -5391,10 +5994,10 @@
 
 \def\blx@printbibchecks{%
   \togglefalse{blx@tempa}%
-  \iftoggle{blx@defernums}
+  \iftoggle{blx@defernumbers}
     {\global\let\blx@printbibchecks\relax}
     {\iftoggle{blx@labelnumber}
-       {\blx@warning{Setting 'defernums=true' recommended}}
+       {\blx@warning@noline{Setting 'defernumbers=true' recommended}}
        {\global\let\blx@printbibchecks\relax}}}
 
 % {<entrykey>,...}
@@ -5419,7 +6022,6 @@
 
 \def\blx@endshorthands{%
   \csuse{blx@endenv@\blx@theenv}%
-  \par\nobreak
   \blx@noitem
   \endgroup
   \blx@bibnote\blx@thepostnote
@@ -5489,43 +6091,76 @@
   \blx@inf@refsec
   \blx@secinit
   \if@filesw
-    \blx@auxwrite\@mainaux{%
-      \string\abx@aux@refsection{\the\c@refsection}}%
-    \xdef\blx@auxfile{\jobname\the\c@refsection\blxauxsuffix}%
-    \blx@ifsigned{\blx@auxfile}{aux}
-      {\immediate\openout\blx@auxout \blx@auxfile.aux\relax
-       \global\let\blx@theauxout\blx@auxout
-       \blx@auxinit{#1}}
-      {}%
+    \blx@auxwrite\@mainaux{}{%
+      \string\abx@aux@refsection{\the\c@refsection}{\the\c@page}}%
+    \ifnum\blx@backend=\blx@backend@biber
+      \blx@xsanitizeafter\blx@refsection@biber{#1}%
+    \else
+      \blx@xsanitizeafter\blx@refsection@bibtex{#1}%
+    \fi
   \fi
   \blx@info{Setting label 'refsection:\the\c@refsection'}%
   \label{refsection:\the\c@refsection}%
   \endgroup}
 
+\def\blx@refsection@biber#1{%
+  \blx@regbibfiles{\jobname}{#1}%
+  \blx@auxwrite\blx@auxout
+    {\def\do##1{\blx@bcf@datasource{file}{##1}}}
+    {\blx@bcf@endsection\blx@nl
+     \blx@bcf@comment{section \the\c@refsection}%
+     \blx@bcf@bibdata{\the\c@refsection}{%
+       \expandafter\docsvlist
+       \expandafter{#1}}%
+     \blx@bcf@section{\the\c@refsection}}}
+
+\def\blx@refsection@bibtex#1{%
+  \xdef\blx@auxfile@bibtex{\jobname\the\c@refsection\blxauxsuffix}%
+  \blx@regbibfiles{\blx@auxfile@bibtex}{#1}%
+  \blx@logreq@inactive
+  \blx@ifsigned{\blx@auxfile@bibtex}{aux}
+    {\immediate\openout\blx@auxout\blx@auxfile@bibtex.aux\relax
+     \global\let\blx@auxout@bibtex\blx@auxout
+     \blx@auxinit@bibtex{#1}}
+    {}}
+
 \protected\def\endrefsection{%
   \blx@endrefsection
   \blx@inf@refsec}
 
 \def\blx@endrefsection{%
   \blx@endrefsegment
-  \ifx\blx@theauxout\blx@auxout
-    \immediate\closeout\blx@auxout
+  \ifnum\blx@backend=\blx@backend@biber
+    \blx@endrefsection@biber
+  \else
+    \blx@endrefsection@bibtex
   \fi
-  \global\let\blx@theauxout\@mainaux
-  \xdef\blx@auxfile{\jobname}%
+  \global\c@refsection\z@}
+
+\def\blx@endrefsection@biber{%
   \ifnum\c@refsection>\z@
-    \global\c@refsection\z@
+    \blx@auxwrite\blx@auxout{}{%
+      \blx@bcf@endsection\blx@nl
+      \blx@bcf@comment{section 0 (cont.)}%
+      \blx@bcf@section{0}}%
+  \fi}
+
+\def\blx@endrefsection@bibtex{%
+  \ifx\blx@auxout@bibtex\blx@auxout
+    \immediate\closeout\blx@auxout
+    \global\let\blx@auxout@bibtex\@mainaux
+    \xdef\blx@auxfile@bibtex{\jobname}%
   \fi}
 
 \AtEndDocument{%
   \blx@endrefsection
-  \def\abx@aux@refsection#1{\blx@addchecksum{[#1]}}}
+  \def\abx@aux@refsection#1#2{\blx@addchecksum{#1}{#2}}}
 
-\protected\def\abx@aux@refsection#1{%
+\protected\def\abx@aux@refsection#1#2{%
   \ifnum#1>\blx@maxsection
     \global\blx@maxsection#1\relax
   \fi
-  \blx@addchecksum{[#1]}}
+  \blx@addchecksum{#1}{#2}}
 
 % Reference segments
 
@@ -5581,14 +6216,12 @@
        {Category '#1' not declared}
        {Use \string\DeclareBibliographyCategory\space to declare}}
     {\AfterPreamble{%
-       \def\do{\blx@addtocategory{#1}}%
-       \blx@sanitizekeys\docsvlist{#2}%
-       \let\do\noexpand}}}
+       \blx@xsanitizeafter{\forcsvlist{\blx@addtocategory{#1}}}{#2}}}}
 
 % {<category>}{<entrykey>,...}
 
 \def\blx@addtocategory#1#2{%
-  \blx@auxwrite\@mainaux{\string\abx@aux@category{#1}{#2}}%
+  \blx@auxwrite\@mainaux{}{\string\abx@aux@category{#1}{#2}}%
   \abx@aux@category{#1}{#2}}
 
 % {<category>}{<entrykey>,...}
@@ -5603,11 +6236,14 @@
 % Database
 
 \renewrobustcmd*{\bibliography}[1]{%
-  \ifx\blx@bibfiles\@empty
-    \gdef\blx@bibfiles{#1}%
-  \else
-    \gappto\blx@bibfiles{,#1}%
-  \fi}
+  \blx@xsanitizeafter{\forcsvlist\blx@addbibfile}{#1}}
+
+\def\blx@addbibfile#1{%
+  \ifdefempty\blx@bibfiles
+    {\gdef\blx@bibfiles{#1}}
+    {\gappto\blx@bibfiles{,#1}}%
+  \blx@regbibfile{\jobname}{#1}}
+
 \let\blx@bibfiles\@empty
 
 %% Citations
@@ -5676,7 +6312,7 @@
     {\listcsgadd{blx@segm@\the\c@refsection @\the\c@refsegment}{#1}}%
   \blx@ifdata{#1}
     {}
-    {\blx@logreq{#2{#1}}}}
+    {\blx@logreq@active{#2{#1}}}}
 
 \def\blx@citation@set#1#2{%
   \blx@citation@entry{#1}{#2}%
@@ -5725,12 +6361,16 @@
        {blx@segm@\the\c@refsection @\the\c@refsegment}
        {blx@sbib@\the\c@refsection}%
      \ifcsvoid{blx@sort@\the\c@refsection}
-       {\blx@logreq{}}
+       {\blx@logreq@active{}}
        {}}
     {}}
 
 \def\blx@bibreq#1{%
-  \blx@auxwrite\blx@theauxout{\string\citation{#1}}}
+  \ifnum\blx@backend=\blx@backend@biber
+    \blx@auxwrite\blx@auxout{}{\blx@bcf@citekey{#1}}%
+  \else
+    \blx@auxwrite\blx@auxout@bibtex{}{\string\citation{#1}}%
+  \fi}
 
 % {<entrykey>,...}
 
@@ -5739,8 +6379,7 @@
   \blx@tempcnta\z@
   \blx@tempcntb\z@
   \let\blx@tempa\@empty
-  \let\do\blx@citeadd
-  \docsvlist{#1}%
+  \forcsvlist\blx@citeadd{#1}%
   \blx@thenotecheck
   \ifnum\blx@tempcnta>\z@
     \ifnum\blx@tempcntb>\z@
@@ -5752,7 +6391,7 @@
   \edef\blx@tempa{\endgroup
     \c@citecount\z@
     \c@citetotal\the\blx@tempcnta\relax
-    \unexpanded{\let\do\blx@citeprint\dolistloop}{\blx@tempb}}%
+    \unexpanded{\forlistloop\blx@citeprint}{\blx@tempb}}%
   \blx@tempa}
 
 \def\blx@notecheck{%
@@ -5780,7 +6419,7 @@
     {\advance\blx@tempcnta\@ne
      \listadd\blx@tempa{#1}}
     {\ifnum\blx@tempcntb>\z@\multicitedelim\fi
-     \blx@missing{#1}%
+     \abx@missing{#1}%
      \advance\blx@tempcntb\@ne}}
 
 % {<entrykey>}
@@ -6155,12 +6794,12 @@
   \if@filesw
     \protected@write\@mainaux{}{\string\abx@aux@backref
       {\the\c@instcount}{\abx@field@entrykey}%
-      {\the\c@refsection}{\thepage}}%
+      {\the\c@refsection}{\thepage}{\noexpand\the\c@page}}%
   \fi}
 
-% {<instcount>}{<entrykey>}{<refsection>}{<page>}
+% {<instcount>}{<entrykey>}{<refsection>}{<page>}{<page int>}
 
-\protected\def\blx@aux@backref#1#2#3#4{%
+\protected\def\blx@aux@backref#1#2#3#4#5{%
   \ifcsundef{blx@pref@#3@\detokenize{#2}}
     {\global\cslet{blx@pref@#3@\detokenize{#2}}\@empty
      \expandafter\blx@onlypreamble
@@ -6169,10 +6808,10 @@
   \ifinlistcs{#4}{blx@pref@#3@\detokenize{#2}}
     {}
     {\listcsgadd{blx@pref@#3@\detokenize{#2}}{#4}}%
-  \blx@addchecksum{\the\numexpr#1+0#4}}
+  \blx@addchecksum{#1}{#5}}
 
 \AtEndDocument{%
-  \def\abx@aux@backref#1#2#3#4{\blx@addchecksum{\the\numexpr#1+0#4}}}
+  \def\abx@aux@backref#1#2#3#4#5{\blx@addchecksum{#1}{#5}}}
 
 % {<true>}{<false>}
 
@@ -6192,19 +6831,37 @@
       {\blx@bibhyperref[\abx@field@entrykey]}}%
   \ifundef\hyper@natanchorstart
     {\long\def\blx@bibhyperref[#1]#2{%
-       \hyperlink{cite.\the\c@refsection @#1}{#2}}%
+       \blx@sfsave\hyperlink{cite.\the\c@refsection @#1}{\blx@sfrest
+         #2%
+       \blx@sfsave}\blx@sfrest}%
      \protected\long\def\blx@imc@bibhyperlink#1#2{%
-       \hyperlink{cite.\the\c@refsection:#1}{#2}}%
+       \blx@sfsave\hyperlink{cite.\the\c@refsection:#1}{\blx@sfrest
+	 #2%
+       \blx@sfsave}\blx@sfrest}%
      \protected\long\def\blx@imc@bibhypertarget#1#2{%
-       \hypertarget{cite.\the\c@refsection:#1}{#2}}}%
+       \blx@sfsave\hypertarget{cite.\the\c@refsection:#1}{\blx@sfrest
+         #2%
+       \blx@sfsave}\blx@sfrest}}%
     {\long\def\blx@bibhyperref[#1]#2{%
-       \hyper@natlinkstart{\the\c@refsection @#1}#2\hyper@natlinkend}%
+       \blx@sfsave\hyper@natlinkstart{\the\c@refsection @#1}\blx@sfrest
+       #2%
+       \blx@sfsave\hyper@natlinkend\blx@sfrest}%
      \protected\long\def\blx@imc@bibhyperlink#1#2{%
-       \hyper@natlinkstart{\the\c@refsection:#1}#2\hyper@natlinkend}%
+       \blx@sfsave\hyper@natlinkstart{\the\c@refsection:#1}\blx@sfrest
+       #2%
+       \blx@sfsave\hyper@natlinkend\blx@sfrest}%
      \protected\long\def\blx@imc@bibhypertarget#1#2{%
-       \@bsphack\hyper@natanchorstart{\the\c@refsection:#1}\@esphack
-       #2\hyper@natanchorend}}
-  \let\blx@imc@ifhyperref\@firstoftwo}
+       \blx@sfsave\hyper@natanchorstart{\the\c@refsection:#1}\blx@sfrest
+       #2%
+       \blx@sfsave\hyper@natanchorend\blx@sfrest}}
+  \let\blx@imc@ifhyperref\@firstoftwo
+  \def\blx@sf{\spacefactor}%
+  \def\blx@sfsave{%
+    \blx@leavevmode
+    \numgdef\blx@sf{\spacefactor}}%
+  \def\blx@sfrest{%
+    \ifhmode\spacefactor\blx@sf\relax\fi
+    \gdef\blx@sf{\spacefactor}}}
 
 \appto\blx@mknohyperref{%
   \protected\def\blx@imc@bibhyperref{\@ifnextchar[\blx@nohyperref\@firstofone}%
@@ -6227,10 +6884,7 @@
       {}
       {\ifstrequal{*}{#1}
 	 {\blx@citation@all}
-	 {\begingroup
-          \let\do\blx@nocite@do
-          \blx@sanitizekeys\docsvlist{#1}%
-          \endgroup}}}%
+	 {\blx@xsanitizeafter{\forcsvlist\blx@nocite@do}{#1}}}}%
   \@esphack}
 
 \def\blx@nocite@do#1{\blx@citation{#1}\blx@msg@cundef}
@@ -6249,7 +6903,7 @@
 \long\def\blx@citeargs@ii#1[#2]{%
   \blx@citeargs@iii{#1{#2}}}
 \long\def\blx@citeargs@iii#1#2{%
-  \blx@sanitizekeys{#1}{#2}}
+  \blx@xsanitizeafter{#1}{#2}}
 
 % {<macro>}(<arg1>)(<arg2>)
 % => <macro>{<arg1>}{<arg2>}
@@ -6296,7 +6950,7 @@
   \ifx#1&%
     \expandafter\blx@checkpunct@iii
   \fi
-  \if\noexpand#1\noexpand\blx@tempb
+  \ifx#1\blx@tempb
     \expandafter\blx@checkpunct@iv
   \fi
   \blx@checkpunct@ii}
@@ -6611,7 +7265,16 @@
   \ifblank{#1}
     {\let\blx@thecheckpunct\blx@nocheckpunct}
     {\let\blx@thecheckpunct\blx@checkpunct
-     \edef\blx@autopunct{\detokenize{#1}}}}
+     \def\blx@autopunct{#1}}}
+
+\AfterEndPreamble{% babel
+  \begingroup
+  \makeatletter
+  \scantokens\expandafter{%
+    \expandafter\gdef
+    \expandafter\blx@autopunct
+    \expandafter{\blx@autopunct}}%
+  \endgroup}
 
 % [<prenote>][<postnote>]{<entrykey>,...}[<format>]{<namelist>}<punct>
 
@@ -6630,7 +7293,7 @@
   \def\blx@loopcode{%
     \ifnameundef{#5}
       {\blx@warning@entry{'#5' undefined or not a name list}%
-       \blx@missing{#5}}
+       \abx@missing{#5}}
       {\printnames[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
   \ifblank{#2}
@@ -6656,9 +7319,9 @@
     {\def\abx@field@postnote{#2}}%
   \def\blx@precode{\usebibmacro{prenote}}%
   \def\blx@loopcode{%
-    \blx@imc@iflistundef{#5}
+    \iflistundef{#5}
       {\blx@warning@entry{'#5' undefined or not a literal list}%
-       \blx@missing{#5}}
+       \abx@missing{#5}}
       {\printlist[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
   \ifblank{#2}
@@ -6686,7 +7349,7 @@
   \def\blx@loopcode{%
     \iffieldundef{#5}
       {\blx@warning@entry{'#5' undefined or not a field}%
-       \blx@missing{#5}}
+       \abx@missing{#5}}
       {\printfield[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
   \ifblank{#2}
@@ -6759,6 +7422,7 @@
     \def\ifpages#1{\blx@TE{\blx@imc@ifpages{#1}}}%
     \def\iffieldnum#1{\blx@TE{\blx@imc@iffieldnum{#1}}}%
     \def\iffieldnums#1{\blx@TE{\blx@imc@iffieldnums{#1}}}%
+    \def\iffieldpages#1{\blx@TE{\blx@imc@iffieldpages{#1}}}%
     \def\ifbibstring#1{\blx@TE{\blx@imc@ifbibstring{#1}}}%
     \def\iffieldbibstring#1{\blx@TE{\blx@imc@iffieldbibstring{#1}}}%
     \def\ifnatbibmode{\blx@TE{\iftoggle{blx@natbib}}}%
@@ -6778,40 +7442,20 @@
 % {<listmacro>}{<filtercsname>} => matches in <listmacro>
 
 \protected\def\blx@bibfilter#1#2{%
-  \let\blx@@TE@hook\blx@TE@hook
-  \appto\blx@TE@hook\blx@fltinit
+  \begingroup
   \edef\blx@do##1{%
-    \def\noexpand\blx@fltitem{##1}%
-    \noexpand\ifthenelse{\csexpandonce{#2}}%
-      {\listadd\noexpand#1{##1}}%
+    \def\noexpand\blx@flt@item{##1}%
+    \ifboolexpr{\csexpandonce{#2}}%
+      {\listadd\noexpand\blx@tempa{##1}}%
       {}}%
-  \def\blx@done{\let\blx@TE@hook\blx@@TE@hook}%
-  \begingroup\edef#1{\endgroup
-    \unexpanded{\let#1\@empty}%
+  \let\blx@done\relax
+  \edef\blx@tempa{%
+    \let\noexpand\blx@tempa\noexpand\@empty
     \blx@listloop{#1}}%
-  #1}
-
-\appto\blx@fltinit{%
-  \def\segment#1{\blx@xTE{%
-    \ifinlist
-      {\blx@fltitem}
-      {\csuse{blx@segm@\the\c@refsection @#1}}}}%
-  \def\type#1{\blx@xTE{%
-    \ifinlist
-      {\blx@fltitem}
-      {\csuse{blx@type@\the\c@refsection @#1}}}}%
-  \def\subtype#1{\blx@xTE{%
-    \ifinlist
-      {\blx@fltitem}
-      {\csuse{blx@subt@\the\c@refsection @#1}}}}%
-  \def\keyword#1{\blx@xTE{%
-    \ifinlist
-      {\blx@fltitem}
-      {\csuse{blx@keyw@\the\c@refsection @\detokenize{#1}}}}}%
-  \def\category#1{\blx@xTE{%
-    \ifinlist
-      {\blx@fltitem}
-      {\csuse{blx@catg@#1}}}}}
+  \blx@tempa
+  \edef\blx@tempa{\endgroup
+    \def\noexpand#1{\blx@tempa}}%
+  \blx@tempa}
 
 %% Auxiliary macros
 
@@ -6882,10 +7526,13 @@
 
 \newrobustcmd*{\mkbibemph}{\emph}
 \protected\long\def\blx@imc@mkbibemph#1{%
-  \emph{#1}\relax
-  \blx@imc@setpunctfont\emph}
+  \emph{#1}\blx@imc@setpunctfont\emph}
 
-\blx@regimcs{\mkbibquote \mkbibemph}
+\newrobustcmd*{\mkbibbold}{\textbf}
+\protected\long\def\blx@imc@mkbibbold#1{%
+  \textbf{#1}\blx@imc@setpunctfont\textbf}
+
+\blx@regimcs{\mkbibquote \mkbibemph \mkbibbold}
 
 \newcommand*{\bibleftparen}{\blx@postpunct(}
 \newcommand*{\bibrightparen}{\blx@postpunct)\midsentence}
@@ -6976,6 +7623,9 @@
     \blx@errormark
   \fi}
 
+\protected\def\blx@errormark{%
+  \rule[0.25ex]{1.25ex}{1.25ex}}
+
 \AtEndDocument{%
   \unless\ifnum\blx@parenlevel@text=\z@
     \blx@err@matchparen{%
@@ -7123,6 +7773,448 @@
   \let\blx@volcite@vol\@gobble
   \let\blx@volcite@page\@firstofone}
 
+%% Control file writers
+
+\begingroup
+\let~\space
+\@makeother\<
+\@makeother\>
+\@makeother\.
+\@makeother\:
+\@makeother\?
+\@makeother\"
+\@makeother\-
+\@makeother\=
+\@makeother\/
+\xdef\blx@bcf@file{%
+  \blx@sig@bcf\blx@nl
+  \blx@ver@bcf\blx@nl}
+\xdef\blx@bcf@endfile{%
+  \blx@nl</bcf:controlfile>}
+\xdef\blx@bcf@comment#1{%
+  ~~<!-- #1 -->\blx@nl}
+\xdef\blx@bcf@options#1#2#3{%
+  ~~<bcf:options%
+    \noexpand\ifblank{#1}{}{ component="#1"}%
+    \noexpand\ifblank{#2}{}{ type="#2"}%
+  >\blx@nl
+  #3%
+  ~~</bcf:options>\blx@nl}
+\xdef\blx@bcf@option#1#2{%
+  ~~~~<bcf:option type="#1">\blx@nl
+  #2%
+  ~~~~</bcf:option>\blx@nl}
+\xdef\blx@bcf@ordered#1#2{%
+  ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl}
+\xdef\blx@bcf@sorting#1#2{%
+  ~~<bcf:sorting type="#1">\blx@nl
+  #2%
+  ~~</bcf:sorting>\blx@nl}
+\xdef\blx@bcf@sort#1#2{%
+  ~~~~<bcf:sort #1>\blx@nl
+  #2%
+  ~~~~</bcf:sort>\blx@nl}
+\xdef\blx@bcf@sortitem#1#2{%
+  ~~~~~~<bcf:sortitem #1>#2</bcf:sortitem>\blx@nl}
+\xdef\blx@bcf@section#1{%
+  ~~<bcf:section number="#1">}
+\xdef\blx@bcf@endsection{%
+  ~~</bcf:section>}
+\xdef\blx@bcf@bibdata#1#2{%
+  ~~<bcf:bibdata section="#1">\blx@nl
+  #2%
+  ~~</bcf:bibdata>\blx@nl}
+\xdef\blx@bcf@datasource#1#2{%
+  ~~~~<bcf:datasource type="#1">#2</bcf:datasource>\blx@nl}
+\xdef\blx@bcf@citekey#1{%
+  ~~~~<bcf:citekey>#1</bcf:citekey>}
+\xdef\blx@bcf@svalue#1#2{%
+  \blx@bcf@option{singlevalued}{%
+  ~~~~~~<bcf:key>#1</bcf:key>\blx@nl
+  ~~~~~~<bcf:value>#2</bcf:value>\blx@nl}}
+\xdef\blx@bcf@mvalue#1#2{%
+  \blx@bcf@option{multivalued}{%
+  ~~~~~~<bcf:key>#1</bcf:key>\blx@nl
+  #2}}
+\xdef\blx@bcf@toggle#1{%
+  \blx@bcf@svalue{#1}{\noexpand\iftoggle{blx@#1}{1}{0}}}
+\endgroup
+
+\def\blx@bcf@options@global{%
+  \blx@bcf@comment{global}%
+  \blx@bcf@options{biblatex}{global}{%
+    \blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+    \blx@bcf@toggle{labelalpha}%
+    \blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}%
+    \iftoggle{blx@labelyear}
+      {\blx@bcf@mvalue{labelyear}{\blx@bcf@labelyear@global}}
+      {}%
+    \blx@bcf@svalue{maxitems}{\the\c@maxitems}%
+    \blx@bcf@svalue{maxnames}{\the\c@maxnames}%
+    \blx@bcf@svalue{minitems}{\the\c@minitems}%
+    \blx@bcf@svalue{minnames}{\the\c@minnames}%
+    \blx@bcf@toggle{singletitle}%
+    \blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+    \blx@bcf@svalue{sortlos}{\blx@sortlos}%
+    \blx@bcf@toggle{terseinits}%
+    \blx@bcf@svalue{uniquename}{\blx@uniquename}%
+    \blx@bcf@toggle{useauthor}%
+    \blx@bcf@toggle{useeditor}%
+    \blx@bcf@toggle{useprefix}%
+    \blx@bcf@toggle{usetranslator}%
+  }%
+}
+
+\def\blx@bcf@options@type#1{%
+  \blx@bcf@comment{#1}%
+  \blx@bcf@options{biblatex}{#1}{%
+    \blx@bcf@toggle{labelalpha}%
+    \ifcsdef{blx@bcf@labelname@#1}
+      {\blx@bcf@mvalue{labelname}{\csuse{blx@bcf@labelname@#1}}}
+      {}%
+    \iftoggle{blx@labelyear}
+      {\ifcsdef{blx@bcf@labelyear@#1}
+         {\blx@bcf@mvalue{labelyear}{\csuse{blx@bcf@labelyear@#1}}}
+	 {}}
+      {}%
+    \blx@bcf@toggle{singletitle}%
+    \blx@bcf@toggle{skipbib}%
+    \blx@bcf@toggle{skiplab}%
+    \blx@bcf@toggle{skiplos}%
+    \blx@bcf@svalue{uniquename}{\blx@uniquename}%
+    \blx@bcf@toggle{useauthor}%
+    \blx@bcf@toggle{useeditor}%
+    \blx@bcf@toggle{useprefix}%
+    \blx@bcf@toggle{usetranslator}%
+  }%
+}
+
+\AtEndPreamble{%
+  \xdef\blx@biber@options{\blx@bcf@options@global}%
+  \begingroup
+  \def\do#1{%
+    \blx@setoptions@type{#1}%
+    \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
+  \ifdef\blx@opts@type
+    {\dolistloop\blx@opts@type}
+    {}%
+  \def\do#1{%
+    \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
+      {\blx@bcf@comment{#1}%
+       \csuse{blx@biber@sorting@\blx@sorting @#1}}
+      {}}%
+  \xdef\blx@biber@sorting{%
+    \ifcsdef{blx@biber@sorting@\blx@sorting}
+      {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
+      {}}%
+  \endgroup}
+
+% [<entrytype>]{<name>}{<spec>}
+
+\newrobustcmd*{\DeclareSortingScheme}[3][global]{%
+  \begingroup
+  \let\item\blx@sortdef@item
+  \let\field\blx@sortdef@field
+  \let\literal\blx@sortdef@literal
+  \blx@tempcnta\z@
+  \let\blx@tempa\@empty
+  #3%
+  \csxdef{blx@biber@sorting@#2@#1}{\blx@bcf@sorting{#1}{\blx@tempa}}%
+  \ifcsdef{blx@biber@sorting@#2}
+    {\ifinlistcs{#1}{blx@biber@sorting@#2}
+       {}
+       {\listcsgadd{blx@biber@sorting@#2}{#1}}}
+    {\listcsgadd{blx@biber@sorting@#2}{#1}}%
+  \endgroup}
+\@onlypreamble\DeclareSortingScheme
+
+\def\blx@sortdef@item#1{%
+  \advance\blx@tempcnta\@ne
+  \blx@tempcntb\z@
+  \let\blx@tempb\@empty
+  \let\do\@firstofone
+  #1%
+  \eappto\blx@tempa{%
+    \blx@bcf@sort{order="\the\blx@tempcnta"}{\blx@tempb}}}
+
+\newcommand*{\blx@sortdef@field}[2][]{%
+  \advance\blx@tempcntb\@ne
+  \edef\blx@tempc{order="\the\blx@tempcntb"}%
+  \ifblank{#1}
+    {}
+    {\setkeys{blx@sortdef@field}{#1}}%
+  \eappto\blx@tempb{%
+    \blx@bcf@sortitem{\blx@tempc}{#2}}}
+
+\define@key{blx@sortdef@field}{final}[true]{% true|false
+  \ifstrequal{#1}{true}
+    {\appto\blx@tempc{ final="1"}}
+    {}}
+\define@key{blx@sortdef@field}{pass}{% final|label
+  \ifstrequal{#1}{label}
+    {\appto\blx@tempc{ pass="label"}}
+    {\appto\blx@tempc{ pass="final"}}}
+\define@key{blx@sortdef@field}{direction}{% descending|ascending
+  \ifstrequal{#1}{ascending}
+    {\appto\blx@tempc{ sort_direction="ascending"}}
+    {\appto\blx@tempc{ sort_direction="descending"}}}
+\define@key{blx@sortdef@field}{strside}{% left|right
+  \ifstrequal{#1}{right}
+    {\appto\blx@tempc{ substring_side="right"}}
+    {\appto\blx@tempc{ substring_side="left"}}}
+\define@key{blx@sortdef@field}{padside}{% left|right
+  \ifstrequal{#1}{right}
+    {\appto\blx@tempc{ pad_side="right"}}
+    {\appto\blx@tempc{ pad_side="left"}}}
+\define@key{blx@sortdef@field}{strwidth}{% integer
+  \appto\blx@tempc{ substring_width="#1"}}
+\define@key{blx@sortdef@field}{padwidth}{% integer
+  \appto\blx@tempc{ pad_width="#1"}}
+\define@key{blx@sortdef@field}{padchar}{% character
+  \appto\blx@tempc{ pad_char="#1"}}
+
+\def\blx@sortdef@literal#1{%
+  \advance\blx@tempcntb\@ne
+  \eappto\blx@tempb{%
+    \blx@bcf@sortitem{order="\the\blx@tempcntb"}{#1}}}
+
+\DeclareSortingScheme{none}{%
+  \item{\field{citeorder}}
+}
+
+\DeclareSortingScheme{debug}{%
+  \item{\field{entrykey}}
+}
+
+\DeclareSortingScheme{nty}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[final]{sortkey}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sorttitle}
+        \field{title}}
+  \item{\field{sortyear}
+        \field{year}}
+  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
+        \literal{0000}}
+}
+
+\DeclareSortingScheme{nyt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[final]{sortkey}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sortyear}
+        \field{year}}
+  \item{\field{sorttitle}
+        \field{title}}
+  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
+        \literal{0000}}
+}
+
+\DeclareSortingScheme{nyvt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[final]{sortkey}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sortyear}
+        \field{year}}
+  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
+        \literal{0000}}
+  \item{\field{sorttitle}
+        \field{title}}
+}
+
+\DeclareSortingScheme{anyt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[pass=label]{labelalpha}}
+  \item{\field[final]{sortkey}}
+  \item{\field[pass=final]{labelalpha}}
+  \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sortyear}
+        \field{year}}
+  \item{\field{sorttitle}
+        \field{title}}
+  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
+        \literal{0000}}
+}
+
+\DeclareSortingScheme{anyvt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[pass=label]{labelalpha}}
+  \item{\field[final]{sortkey}}
+  \item{\field[pass=final]{labelalpha}}
+  \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sortyear}
+        \field{year}}
+  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
+        \literal{0000}}
+  \item{\field{sorttitle}
+        \field{title}}
+}
+
+\DeclareSortingScheme{ynt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[final]{sortkey}}
+  \item{\field{sortyear}
+        \field{year}
+        \literal{9999}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sorttitle}
+        \field{title}}
+}
+
+\DeclareSortingScheme{ydnt}{%
+  \item{\field[strside=left,strwidth=2]{presort}
+        \literal{mm}}
+  \item{\field[final]{sortkey}}
+  \item{\field[strside=left,strwidth=4,direction=descending]{sortyear}
+        \field[strside=left,strwidth=4,direction=descending]{year}
+        \literal{9999}}
+  \item{\field{sortname}
+        \field{author}
+        \field{editor}
+        \field{translator}
+        \field{sorttitle}
+        \field{title}}
+  \item{\field{sorttitle}
+        \field{title}}
+}
+
+\def\blx@deflabel#1#2{%
+  \begingroup
+  \global\let#1\@empty
+  \blx@tempcnta\z@
+  \def\do##1{%
+    \advance\blx@tempcnta\@ne
+    \xappto#1{\noexpand\blx@bcf@ordered{\the\blx@tempcnta}{##1}}}%
+  \docsvlist{#2}%
+  \endgroup}
+
+% [<entrytype>]
+
+\newrobustcmd*{\DeclareLabelname}[1][global]{%
+  \expandafter\blx@deflabel\csname blx@bcf@labelname@#1\endcsname}
+\@onlypreamble\DeclareLabelname
+
+% [<entrytype>]
+
+\newrobustcmd*{\DeclareLabelyear}[1][global]{%
+  \expandafter\blx@deflabel\csname blx@bcf@labelyear@#1\endcsname}
+\@onlypreamble\Declarelabelyear
+
+\DeclareLabelname{%
+  shortauthor,
+  author,
+  shorteditor,
+  editor,
+  translator}
+
+\DeclareLabelyear{%
+  year,
+  eventyear,
+  origyear,
+  urlyear}
+
+\edef\blx@ctrl@bibtex{%
+  \blx@msg@bib
+  @Control\string{biblatex-control,\blx@nl
+  \space\space options = \string{%
+    \blx@version:%
+    \noexpand\iftoggle{blx@debug}{1}{0}:%
+    \noexpand\ifnum\noexpand\blx@backend=\noexpand\blx@backend@bibtexviii
+      1:%
+    \noexpand\else
+      0:%
+    \noexpand\fi
+    \noexpand\iftoggle{blx@cssort}{1}{0}:%
+    \noexpand\iftoggle{blx@terseinits}{1}{0}:%
+    \noexpand\iftoggle{blx@useprefix}{1}{0}:%
+    \noexpand\iftoggle{blx@useauthor}{1}{0}:%
+    \noexpand\iftoggle{blx@useeditor}{1}{0}:%
+    \noexpand\iftoggle{blx@usetranslator}{1}{0}:%
+    \noexpand\iftoggle{blx@labelalpha}{1}{0}:%
+    \noexpand\iftoggle{blx@labelyear}{1}{0}:%
+    \noexpand\iftoggle{blx@singletitle}{1}{0}:%
+    \noexpand\blx@uniquename:%
+    \noexpand\csuse{blx@opt@sorting@\noexpand\blx@sorting}:%
+    \noexpand\blx@sortlos:%
+    \noexpand\the\c@maxnames:%
+    \noexpand\the\c@minnames:%
+    \noexpand\blx@maxline:%
+    \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}%
+  \string},\blx@nl
+  \string}%
+}
+
+\def\blx@bcf@start{%
+  \blx@bcf@file
+  \blx@bcf@comment{BIBER OPTIONS}%
+  \blx@bcf@options{biber}{global}{%
+    \blx@bcf@svalue{bibencoding}{\blx@bibencoding}%
+    \blx@bcf@toggle{cssort}%
+    \blx@bcf@toggle{debug}%
+    \blx@bcf@svalue{inputenc}{\blx@inputenc}%
+    \blx@bcf@svalue{mincrossrefs}{\blx@mincrossrefs}%
+  }%
+  \blx@bcf@comment{BIBLATEX OPTIONS}%
+  \csuse{blx@biber@options}%
+  \blx@bcf@comment{SORTING}%
+  \csuse{blx@biber@sorting}%
+  \blx@bcf@comment{CITATION DATA}%
+  \blx@bcf@comment{section 0}%
+}
+
+\AtEndPreamble{%
+  \ifnum\blx@backend=\blx@backend@biber
+    \begingroup
+    \def\do#1{\blx@bcf@datasource{file}{#1}}%
+    \xappto\blx@bcf@start{%
+      \blx@bcf@bibdata{0}{\expandafter\docsvlist\expandafter{\blx@bibfiles}}%
+      \blx@bcf@section{0}}%
+    \endgroup
+  \fi}
+
+\def\blx@bcf@end{%
+  \blx@bcf@endsection
+  \blx@bcf@endfile
+}
+
 %% Package options
 
 % [<entrytype>]{<options>}
@@ -7163,15 +8255,16 @@
     {\letcs\blx@backend{blx@backend@#1}}
     {\blx@err@invopt{backend=#1}{}}}
 \chardef\blx@backend@bibtex=0
-\expandafter\chardef\csname blx@backend@bibtex8\endcsname=1
+\chardef\blx@backend@bibtexviii=1
 \chardef\blx@backend@biber=2
+\cslet{blx@backend@bibtex8}\blx@backend@bibtexviii
 
 \DeclareBibliographyOption{loadfiles}[true]{%
   \settoggle{blx@loadfiles}{#1}}
 
 \DeclareBibliographyOption{mincrossrefs}{%
   \ifnum#1<\z@
-    \undef\blx@mincrossrefs
+    \def\blx@mincrossrefs{1}%
     \def\blx@minxrefs{1}%
   \else
     \def\blx@mincrossrefs{#1}%
@@ -7180,16 +8273,7 @@
 \def\blx@minxrefs{2}
 
 \DeclareBibliographyOption{bibencoding}{%
-  \ifstrequal{#1}{ascii}
-    {\undef\blx@bibencoding
-     \togglefalse{blx@recode}}
-    {\def\blx@bibencoding{#1}%
-     \ifstrequal{#1}{inputenc}
-       {\togglefalse{blx@recode}}
-       {\toggletrue{blx@recode}}%
-     \ifnum\blx@backend<\csuse{blx@backend@bibtex8}%
-       \letcs\blx@backend{blx@backend@bibtex8}%
-     \fi}}
+  \def\blx@bibencoding{#1}}
 
 \DeclareBibliographyOption{sorting}{%
   \ifcsdef{blx@opt@sorting@#1}
@@ -7205,6 +8289,9 @@
 \def\blx@opt@sorting@ydnt{22}
 \def\blx@opt@sorting@debug{99}
 
+\DeclareBibliographyOption{sortcase}[true]{%
+  \settoggle{blx@cssort}{#1}}
+
 \DeclareBibliographyOption{sortlos}{%
   \ifcsdef{blx@opt@sortlos@#1}
     {\letcs\blx@sortlos{blx@opt@sortlos@#1}}
@@ -7287,35 +8374,47 @@
 
 \DeclareBibliographyOption{abbreviate}[true]{%
   \ifstrequal{#1}{true}
-    {\let\blx@lbx@thedef\blx@lbx@shortdef}
-    {\let\blx@lbx@thedef\blx@lbx@longdef}}
+    {\def\abx@str{abx@sstr}}
+    {\def\abx@str{abx@lstr}}}
+
+\DeclareBibliographyOption{dateabbrev}[true]{%
+  \ifstrequal{#1}{true}
+    {\let\abx@bibmonth\blx@imc@bibsstring}
+    {\let\abx@bibmonth\blx@imc@biblstring}}
 
 \DeclareBibliographyOption{language}{%
   \ifstrequal{#1}{auto}
-    {\toggletrue{autolang}%
+    {\toggletrue{blx@autolang}%
      \def\blx@languagename{english}}
     {\IfFileExists{#1.lbx}
-       {\togglefalse{autolang}%
+       {\togglefalse{blx@autolang}%
 	\edef\blx@languagename{#1}}
        {\blx@error
 	  {Language '#1' not supported}
 	  {Failed to find a matching '#1.lbx' file}}}}
 
+\DeclareBibliographyOption{clearlang}[true]{%
+  \settoggle{blx@clearlang}{#1}}
+
 \DeclareBibliographyOption{babel}{%
   \ifcsdef{blx@opt@babel@#1}
     {\csuse{blx@opt@babel@#1}}
     {\blx@err@invopt{babel=#1}{}}}
 \def\blx@opt@babel@none{%
   \undef\blx@thelangenv
+  \let\blx@hook@initlang\@empty
   \let\blx@hook@endlang\@empty}
 \def\blx@opt@babel@hyphen{%
   \def\blx@thelangenv{hyphenrules}%
+  \let\blx@hook@initlang\@empty
   \let\blx@hook@endlang\@empty}
 \csdef{blx@opt@babel@other*}{%
   \def\blx@thelangenv{otherlanguage*}%
+  \def\blx@hook@initlang{\@quotereset\@ne}%
   \def\blx@hook@endlang{\blx@postpunct}}
 \def\blx@opt@babel@other{%
   \def\blx@thelangenv{otherlanguage}%
+  \def\blx@hook@initlang{\@quotereset\@ne}%
   \def\blx@hook@endlang{\blx@postpunct}}
 
 \DeclareBibliographyOption{indexing}[true]{%
@@ -7355,7 +8454,7 @@
     {\let\blx@backref\blx@backref@global
      \let\abx@aux@backref\blx@aux@backref}
     {\let\blx@backref\relax
-     \let\abx@aux@backref\@gobblefour}}
+     \let\abx@aux@backref\@gobblefive}}
 
 \appto\blx@mkhyperref{%
   \ifHy@plainpages
@@ -7593,25 +8692,25 @@
     {\setcounter{maxparens}{#1}}}
 
 \DeclareBibliographyOption{date}{%
-  \ifcsundef{mkbibrange#1}
-    {\blx@err@invopt{date=#1}{}}
+  \ifcsdef{mkbibrange#1}
     {\protected\def\blx@imc@printdate{\csuse{mkbibrange#1}{}}%
-     \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}}
+     \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}
+    {\blx@err@invopt{date=#1}{}}}
 
 \DeclareBibliographyOption{urldate}{%
-  \ifcsundef{mkbibrange#1}
-    {\blx@err@invopt{urldate=#1}{}}
-    {\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}}}
+  \ifcsdef{mkbibrange#1}
+    {\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}}
+    {\blx@err@invopt{urldate=#1}{}}}
 
 \DeclareBibliographyOption{eventdate}{%
-  \ifcsundef{mkbibrange#1}
-    {\blx@err@invopt{eventdate=#1}{}}
-    {\protected\def\blx@imc@printeventdate{\csuse{mkbibrange#1}{event}}}}
+  \ifcsdef{mkbibrange#1}
+    {\protected\def\blx@imc@printeventdate{\csuse{mkbibrange#1}{event}}}
+    {\blx@err@invopt{eventdate=#1}{}}}
 
 \DeclareBibliographyOption{origdate}{%
-  \ifcsundef{mkbibrange#1}
-    {\blx@err@invopt{origdate=#1}{}}
-    {\protected\def\blx@imc@printorigdate{\csuse{mkbibrange#1}{orig}}}}
+  \ifcsdef{mkbibrange#1}
+    {\protected\def\blx@imc@printorigdate{\csuse{mkbibrange#1}{orig}}}
+    {\blx@err@invopt{origdate=#1}{}}}
 
 \DeclareBibliographyOption{alldates}{%
   \ExecuteBibliographyOptions{date=#1,urldate=#1,eventdate=#1,origdate=#1}}
@@ -7652,7 +8751,7 @@
   \settoggle{blx@labelnumber}{#1}%
   \iftoggle{blx@labelnumber}
     {}
-    {\KV@blx@opt@pre@defernums{false}}}
+    {\KV@blx@opt@pre@defernumbers{false}}}
 \DeclareTypeOption{labelnumber}[true]{% FIXME: per-type check
   \settoggle{blx@labelnumber}{#1}}
 
@@ -7683,9 +8782,9 @@
 \DeclareTypeOption{singletitle}[true]{%
   \settoggle{blx@singletitle}{#1}}
 
-\DeclareBibliographyOption{defernums}[true]{%
-  \settoggle{blx@defernums}{#1}%
-  \iftoggle{blx@defernums}
+\DeclareBibliographyOption{defernumbers}[true]{%
+  \settoggle{blx@defernumbers}{#1}%
+  \iftoggle{blx@defernumbers}
     {\KV@blx@opt@pre@labelnumber{true}%
      \let\blx@thelabelnumber\blx@addlabelnumber
      \let\abx@aux@number\blx@aux@number}
@@ -7803,39 +8902,38 @@
        \noexpand\setkeys{blx@opt@pre}{\blx@theoptions}}%
      \blx@tempa}}
 
+%% Initial setup
+
 % Set defaults
 
 \setkeys{blx@opt@ldt}{style=numeric}
 \setkeys{blx@opt@pre}{%
-  sorting=nty,sortlos=los,sortcites=false,maxnames=3,minnames=1,
+  sorting=nty,sortlos=los,sortcase,sortcites=false,maxnames=3,minnames=1,
   maxitems=3,minitems=1,mincrossrefs=2,useauthor=true,useeditor=true,
-  usetranslator=false,indexing=false,backref=false,abbreviate=true,
-  pagetracker=false,ibidtracker=false,idemtracker=false,
+  usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
+  backref=false,pagetracker=false,ibidtracker=false,idemtracker=false,
   opcittracker=false,loccittracker=false,citetracker=false,block=none,
-  language=auto,babel=none,date=comp,origdate=comp,eventdate=comp,
-  urldate=short,autopunct=true,punctfont=false,defernums=false,
-  refsection=none,refsegment=none,citereset=none,hyperref=auto,
-  maxline=79,parentracker,maxparens=3,bibwarn}
+  language=auto,clearlang=true,babel=none,date=comp,origdate=comp,
+  eventdate=comp,urldate=short,autopunct=true,punctfont=false,
+  defernumbers=false,refsection=none,refsegment=none,citereset=none,
+  hyperref=auto,maxline=79,parentracker,maxparens=3,bibwarn}
 
 % Load compatibility code
 
-\input{blx-compat.def}
-
-% Process load-time options
-
-\ProcessOptions*
-
-%% Initial setup
+\blx@inputonce{blx-compat.def}{compatibility code}{}{}{}{}
 
 % Restore catcodes
 
-\def\do#1#2{\catcode`#1=#2\relax}\blx@catcodes
+\blx@catcodes
 \undef\blx@catcodes
-\let\do\noexpand
+
+% Process load-time options
+
+\ProcessOptions*
 
 % Load citation and bibliography styles, configuration file
 
-\input{biblatex.def}
+\blx@inputonce{biblatex.def}{generic definitions}{}{}{}{}
 \iftoggle{blx@natbib}
   {\blx@inputonce{blx-natbib.def}{natbib compatibility}{}{}{}{}}
   {}
@@ -7849,13 +8947,7 @@
 
 \blx@processoptions
 
-% Deferred last minute setup
-
-\csdef{blx@opt@refsection@none}{0}
-\csdef{blx@opt@refsection@part}{1}
-\csdef{blx@opt@refsection@chapter}{2}
-\csdef{blx@opt@refsection@section}{3}
-\csdef{blx@opt@refsection@subsection}{4}
+% Deferred setup at end of preamble
 
 \AtEndPreamble{%
   \iftoggle{blx@firstinits}
@@ -7866,17 +8958,16 @@
          Setting 'uniquename=init'}%
      \fi}
     {}%
-  \ifnum\blx@refhook@segment>\z@
-    \ifnum\blx@refhook@segment>\blx@refhook@section\relax
-    \else
-      \blx@err@confopt
-        {refsegment/refsection}
-	{The 'refsegment' option must point to a
-         lower-level\MessageBreak document division
-         than 'refsection'}%
-      \def\blx@refhook@segment{0}%
-    \fi
-  \fi
+  \ifnumgreater\blx@refhook@segment\z@
+    {\ifnumgreater\blx@refhook@segment\blx@refhook@section
+       {}
+       {\blx@err@confopt
+          {refsegment/refsection}
+	  {The 'refsegment' option must point to a
+           lower-level\MessageBreak document division
+           than 'refsection'}%
+	\def\blx@refhook@segment{0}}}
+    {}%
   \ifcase\blx@refhook@segment
   \or % 1
     \ifundef\part
@@ -7955,454 +9046,106 @@
          {}
          {\blx@err@patch{\string\part}}}%
   \fi
-  \@ifpackageloaded{inputenc}
-    {\ifundef\inputencodingname % inputenc 2006/05/05 v1.1b
-       {\begingroup
-        \def\@inpenc@undefined@#1{\gdef\blx@inputenc{#1}}%
-        \@inpenc@undefined
-        \endgroup}
-       {\let\blx@inputenc\inputencodingname}%
-     \ifdef\blx@bibencoding
-       {\iftoggle{blx@recode}
-          {\blx@info@noline{%
-             Input encoding '\blx@bibencoding' specified}}
-          {\blx@info@noline{%
-             Input encoding '\blx@inputenc' detected}%
-           \let\blx@bibencoding\blx@inputenc}}
-       {}}
-    {\ifdef\blx@bibencoding
-       {\blx@error
-          {Package 'inputenc' not loaded}
-          {The 'bibencoding' option depends on 'inputenc'}%
-        \undef\blx@bibencoding
-        \togglefalse{blx@recode}}
-       {}}}
-
-\begingroup
-\let~\space
-\@makeother\<
-\@makeother\>
-\@makeother\.
-\@makeother\:
-\@makeother\?
-\@makeother\"
-\@makeother\-
-\@makeother\/
-\xdef\blx@bcf@file#1{%
-  \blx@sig@bcf\blx@nl
-  \blx@ver@bcf\blx@nl
-  #1%
-  </bcf:controlfile>}
-\xdef\blx@bcf@comment#1{%
-  ~~<!-- #1 -->\blx@nl}
-\xdef\blx@bcf@options#1#2#3{%
-  ~~<bcf:options%
-    \noexpand\ifblank{#1}{}{ component="#1"}%
-    \noexpand\ifblank{#2}{}{ type="#2"}%
-  >\blx@nl
-  #3%
-  ~~</bcf:options>\blx@nl}
-\xdef\blx@bcf@option#1#2{%
-  ~~~~<bcf:option type="#1">\blx@nl
-  #2%
-  ~~~~</bcf:option>\blx@nl}
-\xdef\blx@bcf@ordered#1#2{%
-  ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl}
-\xdef\blx@bcf@sorting#1#2{%
-  ~~<bcf:sorting type="#1">\blx@nl
-  #2%
-  ~~</bcf:sorting>\blx@nl}
-\xdef\blx@bcf@sort#1#2{%
-  ~~~~<bcf:sort #1>\blx@nl
-  #2%
-  ~~~~</bcf:sort>\blx@nl}
-\xdef\blx@bcf@sortitem#1#2{%
-  ~~~~~~<bcf:sortitem #1>#2</bcf:sortitem>\blx@nl}
-\xdef\blx@bcf@svalue#1#2{%
-  \blx@bcf@option{singlevalued}{%
-  ~~~~~~<bcf:key>#1</bcf:key>\blx@nl
-  ~~~~~~<bcf:value>#2</bcf:value>\blx@nl
-  }%
-}
-\xdef\blx@bcf@mvalue#1#2{%
-  \blx@bcf@option{multivalued}{%
-  ~~~~~~<bcf:key>#1</bcf:key>\blx@nl
-  #2}%
-}
-\xdef\blx@bcf@toggle#1{%
-  \blx@bcf@svalue{#1}{\noexpand\iftoggle{blx@#1}{1}{0}}}
-\endgroup
-
-\def\blx@bcf@options@global{%
-  \blx@bcf@comment{global}%
-  \blx@bcf@options{biblatex}{global}{%
-    \blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}%
-    \blx@bcf@toggle{labelalpha}%
-    \blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}%
-    \iftoggle{blx@labelyear}
-      {\blx@bcf@mvalue{labelyear}{\blx@bcf@labelyear@global}}
-      {}%
-    \blx@bcf@svalue{maxitems}{\the\c@maxitems}%
-    \blx@bcf@svalue{maxnames}{\the\c@maxnames}%
-    \blx@bcf@svalue{minitems}{\the\c@minitems}%
-    \blx@bcf@svalue{minnames}{\the\c@minnames}%
-    \blx@bcf@toggle{singletitle}%
-    \blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}%
-    \blx@bcf@svalue{sortlos}{\blx@sortlos}%
-    \blx@bcf@toggle{terseinits}%
-    \blx@bcf@svalue{uniquename}{\blx@uniquename}%
-    \blx@bcf@toggle{useauthor}%
-    \blx@bcf@toggle{useeditor}%
-    \blx@bcf@toggle{useprefix}%
-    \blx@bcf@toggle{usetranslator}%
-  }%
-}
-
-\def\blx@bcf@options@type#1{%
-  \blx@bcf@comment{#1}%
-  \blx@bcf@options{biblatex}{#1}{%
-    \blx@bcf@toggle{labelalpha}%
-    \ifcsdef{blx@bcf@labelname@#1}
-      {\blx@bcf@mvalue{labelname}{\csuse{blx@bcf@labelname@#1}}}
-      {}%
-    \iftoggle{blx@labelyear}
-      {\ifcsdef{blx@bcf@labelyear@#1}
-         {\blx@bcf@mvalue{labelyear}{\csuse{blx@bcf@labelyear@#1}}}
-	 {}}
-      {}%
-    \blx@bcf@toggle{singletitle}%
-    \blx@bcf@toggle{skipbib}%
-    \blx@bcf@toggle{skiplab}%
-    \blx@bcf@toggle{skiplos}%
-    \blx@bcf@svalue{uniquename}{\blx@uniquename}%
-    \blx@bcf@toggle{useauthor}%
-    \blx@bcf@toggle{useeditor}%
-    \blx@bcf@toggle{useprefix}%
-    \blx@bcf@toggle{usetranslator}%
-  }%
-}
-
-\AtEndPreamble{%
-  \xdef\blx@biber@options{\blx@bcf@options@global}%
-  \begingroup
-  \def\do#1{%
-    \blx@setoptions@type{#1}%
-    \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
-  \ifdef\blx@opts@type
-    {\dolistloop\blx@opts@type}
-    {}%
-  \def\do#1{%
-    \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
-      {\blx@bcf@comment{#1}%
-       \csuse{blx@biber@sorting@\blx@sorting @#1}}
-      {}}%
-  \xdef\blx@biber@sorting{%
-    \ifcsdef{blx@biber@sorting@\blx@sorting}
-      {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
-      {}}%
-  \endgroup}
-
-% [<entrytype>]{<name>}{<spec>}
-
-\newrobustcmd*{\DeclareSortingScheme}[3][global]{%
-  \begingroup
-  \let\item\blx@sortdef@item
-  \let\field\blx@sortdef@field
-  \let\literal\blx@sortdef@literal
-  \blx@tempcnta\z@
-  \let\blx@tempa\@empty
-  #3%
-  \csxdef{blx@biber@sorting@#2@#1}{\blx@bcf@sorting{#1}{\blx@tempa}}%
-  \ifcsdef{blx@biber@sorting@#2}
-    {\ifinlistcs{#1}{blx@biber@sorting@#2}
-       {}
-       {\listcsgadd{blx@biber@sorting@#2}{#1}}}
-    {\listcsgadd{blx@biber@sorting@#2}{#1}}%
-  \endgroup}
-\@onlypreamble\DeclareSortingScheme
-
-\def\blx@sortdef@item#1{%
-  \advance\blx@tempcnta\@ne
-  \blx@tempcntb\z@
-  \let\blx@tempb\@empty
-  \let\do\@firstofone
-  #1%
-  \eappto\blx@tempa{%
-    \blx@bcf@sort{order="\the\blx@tempcnta"}{\blx@tempb}}}
-
-\newcommand*{\blx@sortdef@field}[2][]{%
-  \advance\blx@tempcntb\@ne
-  \edef\blx@tempc{order="\the\blx@tempcntb"}%
-  \ifblank{#1}
+  \blx@checkencoding}
+
+\def\blx@checkencoding{%
+  \ifundef\inputencodingname
+    {\ifundef\XeTeXrevision
+       {\ifundef\luatexversion
+	  {\def\blx@inputenc{ascii}%
+	   \blx@info@noline{%
+	     No input encoding detected.\MessageBreak
+	     Assuming '\blx@inputenc'}}
+	  {\def\blx@inputenc{utf8}%
+	   \blx@info@noline{%
+             LuaTeX detected.\MessageBreak
+	     Assuming input encoding '\blx@inputenc'}}}
+       {\def\blx@inputenc{utf8}%
+        \blx@info@noline{%
+	  XeTeX detected.\MessageBreak
+	  Assuming input encoding '\blx@inputenc'}}}
+    {\let\blx@inputenc\inputencodingname
+     \ifboolexpr{
+       test {\ifdefstring\blx@inputenc{utf8x}}
+       or
+       test {\ifdefstring\blx@inputenc{lutf8}}
+     }
+       {\def\blx@inputenc{utf8}}
+       {}%
+     \blx@info@noline{%
+       Input encoding '\blx@inputenc' detected}}%
+  \ifdef\blx@bibencoding
+    {\ifdefstring\blx@bibencoding{ascii}
+       {\blx@info@noline{%
+	  Data encoding '\blx@bibencoding' specified.\MessageBreak
+	  No need to reencode data}%
+        \togglefalse{blx@reencode}}
+       {\ifdefstring\blx@bibencoding{inputenc}
+	  {\let\blx@bibencoding\blx@inputenc
+	   \blx@info@noline{%
+	     Data encoding '\blx@bibencoding' specified.\MessageBreak
+	     No need to reencode data}
+           \togglefalse{blx@reencode}}
+	  {\ifdefequal\blx@bibencoding\blx@inputenc
+	     {\blx@info@noline{%
+	        Data encoding '\blx@bibencoding' specified.\MessageBreak
+		No need to reencode data}%
+ 	      \togglefalse{blx@reencode}}
+	     {\ifnumequal\blx@backend\blx@backend@biber
+	        {\blx@info@noline{%
+	           Data encoding '\blx@bibencoding' specified.\MessageBreak
+		   Backend will reencode on the fly}%
+		 \togglefalse{blx@reencode}}
+		{\blx@info@noline{%
+	           Data encoding '\blx@bibencoding' specified.\MessageBreak
+	           Reencoding not supported by backend.\MessageBreak
+		   Falling back to reencoding with inputenc}%
+		 \@ifpackageloaded{inputenc}
+	           {\toggletrue{blx@reencode}}
+		   {\@ifpackageloaded{inputenx}
+	              {\toggletrue{blx@reencode}}
+		      {\blx@warning@noline{%
+			 On-the-fly data reencoding not supported by\MessageBreak
+			 this setup. Load the 'inputenc/inputenx'\MessageBreak
+			 package or use backend=biber. 'luainputenc'\MessageBreak
+			 is not supported  (use backend=biber instead)}%
+		       \togglefalse{blx@reencode}}}}}}}}
+    {\def\blx@bibencoding{ascii}%
+     \blx@info@noline{%
+	Data encoding not specified.\MessageBreak
+	Assuming '\blx@bibencoding'}%
+     \togglefalse{blx@reencode}}%
+  \ifdefstring\blx@bibencoding{ascii}
     {}
-    {\setkeys{blx@sortdef@field}{#1}}%
-  \eappto\blx@tempb{%
-    \blx@bcf@sortitem{\blx@tempc}{#2}}}
-
-\define@key{blx@sortdef@field}{final}[true]{% true|false
-  \ifstrequal{#1}{true}
-    {\appto\blx@tempc{ final="1"}}
-    {}}
-\define@key{blx@sortdef@field}{pass}{% final|label
-  \ifstrequal{#1}{label}
-    {\appto\blx@tempc{ pass="label"}}
-    {\appto\blx@tempc{ pass="final"}}}
-\define@key{blx@sortdef@field}{direction}{% descending|ascending
-  \ifstrequal{#1}{ascending}
-    {\appto\blx@tempc{ sort_direction="ascending"}}
-    {\appto\blx@tempc{ sort_direction="descending"}}}
-\define@key{blx@sortdef@field}{strside}{% left|right
-  \ifstrequal{#1}{right}
-    {\appto\blx@tempc{ substring_side="right"}}
-    {\appto\blx@tempc{ substring_side="left"}}}
-\define@key{blx@sortdef@field}{padside}{% left|right
-  \ifstrequal{#1}{right}
-    {\appto\blx@tempc{ pad_side="right"}}
-    {\appto\blx@tempc{ pad_side="left"}}}
-\define@key{blx@sortdef@field}{strwidth}{% integer
-  \appto\blx@tempc{ substring_width="#1"}}
-\define@key{blx@sortdef@field}{padwidth}{% integer
-  \appto\blx@tempc{ pad_width="#1"}}
-\define@key{blx@sortdef@field}{padchar}{% character
-  \appto\blx@tempc{ pad_char="#1"}}
-
-\def\blx@sortdef@literal#1{%
-  \advance\blx@tempcntb\@ne
-  \eappto\blx@tempb{%
-    \blx@bcf@sortitem{order="\the\blx@tempcntb"}{#1}}}
-
-\DeclareSortingScheme{none}{%
-  \item{\field{citeorder}}
-}
-
-\DeclareSortingScheme{debug}{%
-  \item{\field{entrykey}}
-}
-
-\DeclareSortingScheme{nty}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[final]{sortkey}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sorttitle}
-        \field{title}}
-  \item{\field{sortyear}
-        \field{year}}
-  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
-        \literal{0000}}
-}
-
-\DeclareSortingScheme{nyt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[final]{sortkey}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sortyear}
-        \field{year}}
-  \item{\field{sorttitle}
-        \field{title}}
-  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
-        \literal{0000}}
-}
-
-\DeclareSortingScheme{nyvt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[final]{sortkey}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sortyear}
-        \field{year}}
-  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
-        \literal{0000}}
-  \item{\field{sorttitle}
-        \field{title}}
-}
-
-\DeclareSortingScheme{anyt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[pass=label]{labelalpha}}
-  \item{\field[final]{sortkey}}
-  \item{\field[pass=final]{labelalpha}}
-  \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sortyear}
-        \field{year}}
-  \item{\field{sorttitle}
-        \field{title}}
-  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
-        \literal{0000}}
-}
-
-\DeclareSortingScheme{anyvt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[pass=label]{labelalpha}}
-  \item{\field[final]{sortkey}}
-  \item{\field[pass=final]{labelalpha}}
-  \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sortyear}
-        \field{year}}
-  \item{\field[padside=left,padwidth=4,padchar=0]{volume}
-        \literal{0000}}
-  \item{\field{sorttitle}
-        \field{title}}
-}
+    {\ifdefstring\blx@bibencoding{utf8}
+       {\ifnumequal\blx@backend\blx@backend@biber
+	  {}
+	  {\blx@warning@noline{%
+	     Data encoding is '\blx@bibencoding'.\MessageBreak
+	     Use backend=biber}}}
+       {\ifnumless\blx@backend\blx@backend@bibtexviii
+	  {\blx@warning@noline{%
+	     Data encoding is '\blx@bibencoding'.\MessageBreak
+	     Use backend=bibtex8 or backend=biber}}}
+	  {\let\blx@csfencoding\blx@bibencoding}}}
 
-\DeclareSortingScheme{ynt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[final]{sortkey}}
-  \item{\field{sortyear}
-        \field{year}
-        \literal{9999}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sorttitle}
-        \field{title}}
-}
-
-\DeclareSortingScheme{ydnt}{%
-  \item{\field[strside=left,strwidth=2]{presort}
-        \literal{mm}}
-  \item{\field[final]{sortkey}}
-  \item{\field[strside=left,strwidth=4,direction=descending]{sortyear}
-        \field[strside=left,strwidth=4,direction=descending]{year}
-        \literal{9999}}
-  \item{\field{sortname}
-        \field{author}
-        \field{editor}
-        \field{translator}
-        \field{sorttitle}
-        \field{title}}
-  \item{\field{sorttitle}
-        \field{title}}
-}
-
-\def\blx@deflabel#1#2{%
-  \begingroup
-  \global\let#1\@empty
-  \blx@tempcnta\z@
-  \def\do##1{%
-    \advance\blx@tempcnta\@ne
-    \xappto#1{\noexpand\blx@bcf@ordered{\the\blx@tempcnta}{##1}}}%
-  \docsvlist{#2}%
-  \endgroup}
-
-% [<entrytype>]
-
-\newrobustcmd*{\DeclareLabelname}[1][global]{%
-  \expandafter\blx@deflabel\csname blx@bcf@labelname@#1\endcsname}
-\@onlypreamble\DeclareLabelname
-
-% [<entrytype>]
-
-\newrobustcmd*{\DeclareLabelyear}[1][global]{%
-  \expandafter\blx@deflabel\csname blx@bcf@labelyear@#1\endcsname}
-\@onlypreamble\Declarelabelyear
-
-\DeclareLabelname{%
-  shortauthor,
-  author,
-  shorteditor,
-  editor,
-  translator}
-
-\DeclareLabelyear{%
-  year,
-  eventyear,
-  origyear,
-  urlyear}
-
-\edef\blx@ctrl@bibtex{%
-  \blx@msg@bib
-  @Control\string{biblatex-control,\blx@nl
-  \space\space options = \string{%
-    \blx@version:%
-    \noexpand\iftoggle{blx@debug}{1}{0}:%
-    \noexpand\ifnum\noexpand\blx@backend=\csuse{blx@backend@bibtex8}%
-      1:%
-    \noexpand\else
-      0:%
-    \noexpand\fi
-    \noexpand\iftoggle{blx@terseinits}{1}{0}:%
-    \noexpand\iftoggle{blx@useprefix}{1}{0}:%
-    \noexpand\iftoggle{blx@useauthor}{1}{0}:%
-    \noexpand\iftoggle{blx@useeditor}{1}{0}:%
-    \noexpand\iftoggle{blx@usetranslator}{1}{0}:%
-    \noexpand\iftoggle{blx@labelalpha}{1}{0}:%
-    \noexpand\iftoggle{blx@labelyear}{1}{0}:%
-    \noexpand\iftoggle{blx@singletitle}{1}{0}:%
-    \noexpand\blx@uniquename:%
-    \noexpand\csuse{blx@opt@sorting@\noexpand\blx@sorting}:%
-    \noexpand\blx@sortlos:%
-    \noexpand\the\c@maxnames:%
-    \noexpand\the\c@minnames:%
-    \noexpand\blx@maxline:%
-    \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}%
-  \string},\blx@nl
-  \string}%
-}
-
-\def\blx@ctrl@biber{%
-  \blx@bcf@file{%
-    \blx@bcf@comment{BIBER OPTIONS}%
-    \blx@bcf@options{biber}{global}{%
-      \blx@bcf@svalue{bibencoding}{\ifdef\blx@bibencoding{\blx@bibencoding}{ascii}}%
-      \blx@bcf@toggle{debug}%
-      \blx@bcf@svalue{inputenc}{\ifdef\blx@inputenc{\blx@inputenc}{ascii}}%
-      \blx@bcf@svalue{mincrossrefs}{\blx@mincrossrefs}%
-    }%
-    \blx@bcf@comment{BIBLATEX OPTIONS}%
-    \csuse{blx@biber@options}%
-    \blx@bcf@comment{SORTING SPEC}%
-    \csuse{blx@biber@sorting}%
-  }%
-}
+% Deferred last minute setup
 
 \AtBeginDocument{%
   \if@filesw
-    \blx@auxinit{\blx@bibfiles}%
     \ifnum\blx@backend=\blx@backend@biber
       \blx@ifsigned{\jobname}{bcf}
         {\immediate\openout\blx@auxout\jobname.bcf\relax
-         \immediate\write\blx@auxout{\blx@ctrl@biber}%
-         \immediate\closeout\blx@auxout}
+         \blx@auxwrite\blx@auxout{}{\blx@bcf@start}%
+         \AfterEndDocument{%
+           \blx@auxwrite\blx@auxout{}{\blx@bcf@end}%
+	   \immediate\closeout\blx@auxout}}
         {}%
     \else
+      \blx@auxinit@bibtex\blx@bibfiles
       \blx@ifsigned{\blx@ctrlfile\blxauxsuffix}{bib}
         {\immediate\openout\blx@auxout\blx@ctrlfile\blxauxsuffix.bib\relax
-         \immediate\write\blx@auxout{\blx@ctrl@bibtex}%
+         \blx@auxwrite\blx@auxout{}{\blx@ctrl@bibtex}%
          \immediate\closeout\blx@auxout}
         {}%
     \fi
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index aff3b4c7cb9..25ed9a9fe4e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
@@ -1,7 +1,7 @@
-% $Id: blx-compat.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+[\abx@rcsid $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
  biblatex generic compatibility]
 
 % LaTeX
@@ -19,6 +19,20 @@
     {Use the package option 'style' instead.\MessageBreak
      I'm ignoring the command}}
 
+% Standard classes
+
+\DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}}
+
+% biblatex <0.9b
+
+\DeclareBibliographyOption{defernums}[true]{%
+  \ExecuteBibliographyOptions{defernumbers=#1}}
+
+\newcommand*{\lbx@fromlang}{%
+  \iffieldundef{origlanguage}
+    {\unspace}
+    {\bibstring{from\thefield{origlanguage}}}}
+
 % LaTeX, biblatex <0.9a
 
 \providecommand*{\thebibliography}{}
@@ -53,10 +67,6 @@
   {\endtheshorthands}
   {\thelositem}
 
-% Standard classes
-
-\DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}}
-
 % Biblatex <0.8d
 
 \DeclareBibliographyOption{bibtex8}[true]{%
@@ -76,7 +86,13 @@
 \newcommand{\ifkomabibtotocnumbered}[2]{#2}
 
 \ifdef\ds@bibtotoc
-  {\DeclareOption{bibtotoc}{%
+  {% xkeyval breaks inheritance of key=value class options
+   \ifdef\XKV@classoptionslist
+     {\let\blx@classoptionslist\@classoptionslist
+      \let\@classoptionslist\XKV@classoptionslist
+      \AtEndOfPackage{\let\@classoptionslist\blx@classoptionslist}}
+     {}%
+   \DeclareOption{bibtotoc}{%
      \let\ifkomabibtotoc=\@firstoftwo
      \let\ifkomabibtotocnumbered=\@secondoftwo}
    \DeclareOption{bibtotocnumbered}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 5a3cb219fa1..835c87aabc4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
@@ -1,7 +1,7 @@
-% $Id: blx-natbib.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 0.9a 2010/03/19 19:52:15 lehman beta $
+[\abx@rcsid $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
  biblatex natbib compatibility]
 
 \renewcommand*{\nameyeardelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index 881927c0371..10d0ebfb92f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelalpha,autocite=inline}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index 1d3f605eef1..14a835427d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelalpha,autocite=inline}
 
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 d1b51b8f5fa..df32026440e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{sortcites,autocite=footnote}
 \newbool{cbx:parens}
@@ -24,7 +24,7 @@
        {\ifnameundef{labelname}
           {}
           {\printnames{labelname}%
-           \setunit{\addcomma\space}}%
+           \setunit{\nametitledelim}}%
         \savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title}}
     {\usebibmacro{cite:shorthand}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index c8f5d47b719..6338c38899c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
@@ -21,7 +21,7 @@
        {\ifnameundef{labelname}
 	  {}
 	  {\printnames{labelname}%
-           \setunit{\addcomma\space}}%
+           \setunit{\nametitledelim}}%
 	\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index 3a79d7b222e..8a1d3d1925a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
@@ -34,7 +34,7 @@
 	  {\ifnameundef{labelname}
              {}
              {\printnames{labelname}%
-              \setunit{\addcomma\space}}%
+              \setunit{\nametitledelim}}%
            \savefield{namehash}{\cbx@lasthash}}%
 	\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index 6350f87a79c..bddf31eebe2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireCitationStyle{authortitle-comp}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -16,11 +16,11 @@
           {\ifsingletitle
              {\printtext[bibhyperref]{\printnames{labelname}}}
              {\printnames{labelname}%
-	      \setunit{\addcomma\space}%
+	      \setunit{\nametitledelim}%
 	      \usebibmacro{cite:title}}}%
         \savefield{namehash}{\cbx@lasthash}}}
     {\usebibmacro{cite:shorthand}%
-     \usebibmacro{cite:init}}%
+     \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
 
 \renewbibmacro*{citetitle}{%
@@ -30,7 +30,7 @@
        {\savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title}}
     {\usebibmacro{cite:shorthand}%
-     \usebibmacro{cite:init}}%
+     \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
 
 \renewbibmacro*{textcite}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index a58bf3860e0..e79409f422e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireCitationStyle{authortitle}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -13,7 +13,7 @@
        {\ifsingletitle
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}%
-	   \setunit{\addcomma\space}%
+	   \setunit{\nametitledelim}%
 	   \usebibmacro{cite:title}}}}%
     {\usebibmacro{cite:shorthand}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
new file mode 100644
index 00000000000..47cf2274050
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -0,0 +1,98 @@
+% $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+
+\ProvidesFile{authortitle-ticomp.cbx}
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+
+\RequireCitationStyle{authortitle-icomp}
+\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
+
+\renewbibmacro*{cite}{%
+  \iffieldundef{shorthand}
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\usebibmacro{cite:ibid}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+	  {\setunit{\compcitedelim}%
+           \usebibmacro{cite:title}}
+	  {\ifnameundef{labelname}
+             {\usebibmacro{cite:title}}
+             {\ifsingletitle
+        	{\printtext[bibhyperref]{\printnames{labelname}}}
+        	{\printnames{labelname}%
+		 \setunit{\nametitledelim}%
+		 \usebibmacro{cite:title}}}%
+           \savefield{namehash}{\cbx@lasthash}}}}
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}
+
+\renewbibmacro*{citetitle}{%
+  \iffieldundef{shorthand}
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\usebibmacro{cite:ibid}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+	  {\setunit{\compcitedelim}}
+	  {\savefield{namehash}{\cbx@lasthash}}%
+	\usebibmacro{cite:title}}}
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}
+
+\renewbibmacro*{textcite}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\setunit{\compcitedelim}%
+     \iffieldundef{shorthand}
+       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+          {\usebibmacro{cite:ibid}}
+	  {\usebibmacro{cite:title}}}%
+       {\usebibmacro{cite:shorthand}}}
+    {\ifnameundef{labelname}
+       {\ifnumequal{\value{citecount}}{1}
+	  {\usebibmacro{prenote}}
+	  {}%
+        \iffieldundef{shorthand}
+	  {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\usebibmacro{cite:ibid}}
+	     {\usebibmacro{cite:title}}}%
+	  {\usebibmacro{cite:shorthand}}}
+       {\ifthenelse{\ifsingletitle\AND
+                    \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+          {\printtext[bibhyperref]{\printnames{labelname}}}
+          {\printnames{labelname}
+           \setunit{%
+	     \global\booltrue{cbx:parens}%
+	     \addspace\bibopenparen}%
+	   \ifnumequal{\value{citecount}}{1}
+	     {\usebibmacro{prenote}}
+	     {}%
+	   \iffieldundef{shorthand}
+	     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+        	{\usebibmacro{cite:ibid}}
+		{\usebibmacro{cite:title}}}%
+	     {\usebibmacro{cite:shorthand}}}}%
+     \savefield{namehash}{\cbx@lasthash}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+    \multicitedelim}}
+
+\renewbibmacro*{textcite:postnote}{%
+  \ifbool{cbx:parens}
+    {\setunit{\postnotedelim}}
+    {\setunit{%
+       \global\booltrue{cbx:parens}%
+       \addspace\bibopenparen}}%
+  \printfield{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
+       \multicitedelim}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 96f07ad2afd..c97a8d14e94 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{autocite=footnote}
 \newbool{cbx:parens}
@@ -11,7 +11,7 @@
     {\ifnameundef{labelname}
        {}
        {\printnames{labelname}%
-        \setunit{\addcomma\space}}%
+        \setunit{\nametitledelim}}%
      \usebibmacro{cite:title}}%
     {\usebibmacro{cite:shorthand}}}
 
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 c40ea714eeb..af107a90667 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 @@
-% $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
 \newbool{cbx:parens}
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 87f0ee9f111..c311bfdb6e3 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 @@
-% $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
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 6f9f985b8e8..c503c9ac161 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 @@
-% $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
                             pagetracker,sortcites,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 2bece812403..2a9031820ad 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 @@
-% $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index a2357a4d05c..701f956efe4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
@@ -1,7 +1,7 @@
-% $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{autocite=plain}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index ed7122db029..df3339bbac7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
@@ -1,7 +1,7 @@
-% $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{autocite=plain}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index 11b3729dd0b..03f185df895 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
@@ -12,13 +12,15 @@
 \DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
 
 \newbibmacro*{cite:init}{%
-  \let\cbx@tempa=\empty
-  \undef\cbx@lasthash
-  \defcounter{cbx@tempcnta}{0}%
-  \defcounter{cbx@tempcntb}{-2}}
+  \global\let\cbx@tempa=\empty
+  \global\undef\cbx@lasthash
+  \global\undef\cbx@lastnumber
+  \global\undef\cbx@lastprefix
+  \setcounter{cbx@tempcnta}{0}%
+  \setcounter{cbx@tempcntb}{-2}}
 
 \newbibmacro*{cite:comp}{%
-  \global\defcounter{cbx@tempcntb}{\value{cbx@tempcntb}+1}%
+  \addtocounter{cbx@tempcntb}{1}%
   \iffieldundef{shorthand}
     {\ifbool{bbx:subentry}
        {\iffieldundef{entrysetcount}
@@ -28,18 +30,36 @@
     {\usebibmacro{cite:comp:shand}}}
 
 \newbibmacro*{cite:comp:comp}{%
-  \ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
-    {\savefield{entrykey}{\cbx@lastkey}%
-     \savefield{labelnumber}{\cbx@lastnumber}%
-     \global\defcounter{cbx@tempcnta}{\value{cbx@tempcnta}+1}}
-    {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
-       {}
-       {\usebibmacro{cite:dump}%
-	\ifnumgreater{\value{cbx@tempcntb}}{-1}
-	  {\multicitedelim}
-	  {}%
-	\printtext[bibhyperref]{\printfield{labelnumber}}}}%
-  \global\defcounter{cbx@tempcntb}{\thefield{labelnumber}}}
+  \ifboolexpr{
+    ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} )
+    or
+    test {\iffieldequals{prefixnumber}{\cbx@lastprefix}}
+  }
+    {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
+       {\savefield{entrykey}{\cbx@lastkey}%
+	\savefield{labelnumber}{\cbx@lastnumber}%
+	\addtocounter{cbx@tempcnta}{1}}
+       {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
+	  {}
+	  {\usebibmacro{cite:dump}%
+	   \ifnumgreater{\value{cbx@tempcntb}}{-1}
+	     {\multicitedelim}
+	     {}%
+	   \printtext[bibhyperref]{%
+	     \printfield{prefixnumber}%
+	     \printfield{labelnumber}}}}}
+    {\usebibmacro{cite:comp:end}}%
+  \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
+  \savefield{prefixnumber}{\cbx@lastprefix}}
+
+\newbibmacro*{cite:comp:end}{%
+  \usebibmacro{cite:dump}%
+  \ifnumgreater{\value{cbx@tempcntb}}{-1}
+    {\multicitedelim}
+    {}%
+  \printtext[bibhyperref]{%
+    \printfield{prefixnumber}%
+    \printfield{labelnumber}}}
 
 \newbibmacro*{cite:comp:inset}{%
   \usebibmacro{cite:dump}%
@@ -47,9 +67,10 @@
     {\multicitedelim}
     {}%
   \printtext[bibhyperref]{%
+    \printfield{prefixnumber}%
     \printfield{labelnumber}%
     \printfield{entrysetcount}}%
-  \global\defcounter{cbx@tempcntb}{-1}}
+  \setcounter{cbx@tempcntb}{-1}}
 
 \newbibmacro*{cite:comp:shand}{%
   \usebibmacro{cite:dump}%
@@ -57,7 +78,7 @@
     {\multicitedelim}
     {}%
   \printtext[bibhyperref]{\printfield{shorthand}}%
-  \global\defcounter{cbx@tempcntb}{-1}}
+  \setcounter{cbx@tempcntb}{-1}}
 
 \newbibmacro*{cite:dump}{%
   \ifnumgreater{\value{cbx@tempcnta}}{0}
@@ -65,9 +86,13 @@
        {\bibrangedash}
        {\multicitedelim}%
      \bibhyperref[\cbx@lastkey]{%
-       \printtext[labelnumber]{\cbx@lastnumber}}%
-     \global\defcounter{cbx@tempcnta}{0}}
-    {}}
+       \ifdef\cbx@lastprefix
+         {\printtext[prefixnumber]{\cbx@lastprefix}}
+	 {}%
+       \printtext[labelnumber]{\cbx@lastnumber}}}
+    {}%
+  \setcounter{cbx@tempcnta}{0}%
+  \global\undef\cbx@lastprefix}
 
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
index 8490d61a40a..31921501429 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelnumber,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
@@ -10,6 +10,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
+    \printfield{prefixnumber}%
     \printfield{labelnumber}%
     \ifbool{bbx:subentry}
       {\printfield{entrysetcount}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 7665a9a587d..68ae4488b0d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{labelnumber,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
@@ -10,6 +10,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
+    \printfield{prefixnumber}%
     \printfield{labelnumber}%
     \ifbool{bbx:subentry}
       {\printfield{entrysetcount}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index e7e8d727277..f52a2cfc403 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
@@ -1,7 +1,7 @@
-% $Id: reading.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireCitationStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index 1a06a81f20b..ea26e14379c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -1,36 +1,108 @@
-% $Id: verbose-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
-                            pagetracker,autocite=footnote}
-\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
-\newcommand*{\cbx@resetcount}{0}
+[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
 \DeclareFieldFormat{bibhypertarget}{%
   \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+\newcommand*{\cbx@resetcount}{0}
+\providecommand*{\mkibid}[1]{#1}
+\newtoggle{cbx:loccit}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
 
 \DeclareBibliographyOption{ibidpage}[true]{%
   \ifstrequal{#1}{true}
     {\ExecuteBibliographyOptions{loccittracker=constrict}}
     {\ExecuteBibliographyOptions{loccittracker=false}}}
 
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{cite:postnote:ibidpage}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+                            pagetracker,autocite=footnote,citepages=permit}
+
 \newbibmacro*{cite}{%
-  \global\boolfalse{cbx:loccit}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{
+          test {\ifciteibid}
+	  and
+	  not test {\iffirstonpage}
+        }
           {\usebibmacro{cite:ibid}}
           {\usebibmacro{cite:short}}}
        {\usebibmacro{cite:shorthand}}}
     {\usebibmacro{cite:full}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -39,22 +111,22 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
 \newbibmacro*{cite:ibid}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
   \ifloccit
-    {\global\booltrue{cbx:loccit}}
+    {\global\toggletrue{cbx:loccit}}
     {}}
 
 \newbibmacro*{cite:shorthand}{%
   \printtext[bibhyperlink]{%
     \printfield{shorthand}}}
 
-\newbibmacro*{cite:postnote}{%
-  \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+  \iftoggle{cbx:loccit}
     {}
     {\usebibmacro{postnote}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index 9dca13b35df..1401d38f024 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -1,28 +1,95 @@
-% $Id: verbose-inote.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
-                            singletitle,pagetracker,autocite=footnote}
-\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
-\newbool{cbx:pageref}
+[\abx@cbxid $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
 \DeclareFieldFormat{bibhypertarget}{%
   \bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+\providecommand*{\mkibid}[1]{#1}
+\newtoggle{cbx:loccit}
+\newtoggle{cbx:pageref}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
 
 \DeclareBibliographyOption{ibidpage}[true]{%
   \ifstrequal{#1}{true}
     {\ExecuteBibliographyOptions{loccittracker=constrict}}
     {\ExecuteBibliographyOptions{loccittracker=false}}}
 \DeclareBibliographyOption{pageref}[true]{%
-  \setbool{cbx:pageref}{#1}}
+  \settoggle{cbx:pageref}{#1}}
+
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{cite:postnote:ibidpage}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,singletitle,
+                            pagetracker,autocite=footnote,citepages=permit}
 
 \newbibmacro*{cite}{%
-  \global\boolfalse{cbx:loccit}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\iffieldundef{shorthand}
        {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -36,6 +103,7 @@
   \csxdef{cbx@t@\thefield{entrykey}}{\the\value{instcount}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -44,7 +112,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
@@ -54,11 +122,17 @@
 \newbibmacro*{cite:ibid}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
   \ifloccit
-    {\global\booltrue{cbx:loccit}}
+    {\global\toggletrue{cbx:loccit}}
     {}}
 
+\newbibmacro*{cite:postnote:ibidpage}{%
+  \iftoggle{cbx:loccit}
+    {}
+    {\usebibmacro{postnote}}}
+
 \newbibmacro*{footcite}{%
-  \global\boolfalse{cbx:loccit}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\iffieldundef{shorthand}
        {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -73,30 +147,26 @@
   \label{cbx@\the\value{instcount}}}
 
 \newbibmacro*{footcite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
       {\thefield{entrytype}}}%
   \usebibmacro{shorthandintro}}
 
-\newbibmacro*{cite:postnote}{%
-  \ifbool{cbx:loccit}
-    {}
-    {\usebibmacro{postnote}}}
-
 \newbibmacro*{footcite:note}{%
   \ifnameundef{labelname}
     {\printfield{label}}
     {\printnames{labelname}}%
   \ifsingletitle
     {}
-    {\setunit*{\addcomma\space}%
+    {\setunit*{\nametitledelim}%
      \printfield[title]{labeltitle}}%
   \setunit*{\addcomma\space}%
   \printtext{%
     \bibstring{seenote}\addnbspace
     \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
-    \ifbool{cbx:pageref}
+    \iftoggle{cbx:pageref}
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
@@ -110,7 +180,7 @@
 \newbibmacro*{footcite:ibid}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
   \ifloccit
-    {\global\booltrue{cbx:loccit}}
+    {\global\toggletrue{cbx:loccit}}
     {}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index 8744c605da3..55ed02cc5ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -1,23 +1,87 @@
-% $Id: verbose-note.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote}
-\newbool{cbx:pageref}
+[\abx@cbxid $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
 \DeclareFieldFormat{bibhypertarget}{%
   \bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+\newtoggle{cbx:pageref}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
 
 \DeclareBibliographyOption{pageref}[true]{%
-  \setbool{cbx:pageref}{#1}%
-  \ifbool{cbx:pageref}
+  \settoggle{cbx:pageref}{#1}%
+  \iftoggle{cbx:pageref}
     {\ExecuteBibliographyOptions{pagetracker}}
     {}}
 
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{postnote}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote,citepages=permit}
+
 \newbibmacro*{cite}{%
+  \usebibmacro{cite:citepages}%
   \ifciteseen
     {\iffieldundef{shorthand}
        {\usebibmacro{cite:short}}
@@ -29,6 +93,7 @@
   \csxdef{cbx@t@\thefield{entrykey}}{\the\value{instcount}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -37,7 +102,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
@@ -45,6 +110,7 @@
   \printtext[bibhyperlink]{\printfield{shorthand}}}
 
 \newbibmacro*{footcite}{%
+  \usebibmacro{cite:citepages}%
   \ifciteseen
     {\iffieldundef{shorthand}
        {\usebibmacro{footcite:note}}
@@ -57,6 +123,7 @@
   \label{cbx@\the\value{instcount}}}
 
 \newbibmacro*{footcite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -69,13 +136,13 @@
     {\printnames{labelname}}%
   \ifsingletitle
     {}
-    {\setunit*{\addcomma\space}%
+    {\setunit*{\nametitledelim}%
      \printfield[title]{labeltitle}}%
   \setunit*{\addcomma\space}%
   \printtext{%
     \bibstring{seenote}\addnbspace
     \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
-    \ifbool{cbx:pageref}
+    \iftoggle{cbx:pageref}
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
@@ -93,7 +160,7 @@
      {\usebibmacro{footcite}}
      {\usebibmacro{cite}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\parencite}[\mkbibparens]
   {\usebibmacro{prenote}}
@@ -102,20 +169,20 @@
      {\usebibmacro{footcite}}
      {\usebibmacro{cite}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{footcite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{footcite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index a6564e7b6e4..e3c644b1d7d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -1,31 +1,96 @@
-% $Id: verbose-trad1.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
-                            idemtracker=constrict,opcittracker=context,
-			    loccittracker=context,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
+\newtoggle{cbx:ibidpage}
+\newtoggle{cbx:loccit}
 \newbool{cbx:noidem}
 
 \DeclareBibliographyOption{ibidpage}[true]{%
-  \ifstrequal{#1}{true}
-    {\renewbibmacro*{cite:ibid:page}{\global\booltrue{cbx:loccit}}}
-    {\renewbibmacro*{cite:ibid:page}{}}}
+  \settoggle{cbx:ibidpage}{#1}}
 
 \DeclareBibliographyOption{strict}[true]{%
   \ifstrequal{#1}{true}
     {\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}}
     {\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}}
 
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{cite:postnote:ibidpage}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+                            idemtracker=constrict,opcittracker=context,
+			    loccittracker=context,autocite=footnote,
+			    citepages=permit}
+
 \newbibmacro*{cite:save}{%
   \csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
   \global\boolfalse{cbx:noidem}}
 
 \newbibmacro*{cite}{%
-  \global\boolfalse{cbx:loccit}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:loccit}%
   \bibhypertarget{cite\the\value{instcount}}{%
     \ifciteseen
       {\iffieldundef{shorthand}
@@ -48,6 +113,7 @@
        \usebibmacro{cite:save}}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -56,11 +122,11 @@
 
 \newbibmacro*{cite:name}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}}
+  \setunit*{\nametitledelim}}
 
 \newbibmacro*{cite:idem}{%
   \bibstring[\mkibid]{idem\thefield{gender}}%
-  \setunit{\addcomma\space}}
+  \setunit{\nametitledelim}}
 
 \newbibmacro*{cite:title}{%
   \printtext[bibhyperlink]{%
@@ -73,24 +139,22 @@
   \printtext{%
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{loccit}}}%
-  \global\booltrue{cbx:loccit}}
+  \global\toggletrue{cbx:loccit}}
 
 \newbibmacro*{cite:ibid}{%
   \printtext{%
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{ibidem}}}%
-  \ifloccit
-    {\usebibmacro{cite:ibid:page}}
+  \ifboolexpr{ test {\ifloccit} and togl {cbx:ibidpage} }
+    {\global\toggletrue{cbx:loccit}}
     {}}
 
-\newbibmacro*{cite:ibid:page}{}
-
 \newbibmacro*{cite:shorthand}{%
   \printtext[bibhyperlink]{\printfield{shorthand}}%
   \global\booltrue{cbx:noidem}}
 
-\newbibmacro*{cite:postnote}{%
-  \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+  \iftoggle{cbx:loccit}
     {}
     {\usebibmacro{postnote}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 761285bed3e..5abdb2bfbcb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -1,13 +1,15 @@
-% $Id: verbose-trad2.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
-                            idemtracker=constrict,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
+\newtoggle{cbx:fullcite}
+\newtoggle{cbx:loccit}
 \newbool{cbx:noidem}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
 
 \DeclareBibliographyOption{ibidpage}[true]{%
   \ifstrequal{#1}{true}
@@ -19,12 +21,81 @@
     {\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}}
     {\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}}
 
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{cite:postnote:ibidpage}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+                            idemtracker=constrict,autocite=footnote,
+			    citepages=permit}
+
 \newbibmacro*{cite:save}{%
   \csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
   \global\boolfalse{cbx:noidem}}
 
 \newbibmacro*{cite}{%
-  \global\boolfalse{cbx:loccit}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:fullcite}%
+  \global\togglefalse{cbx:loccit}%
   \bibhypertarget{cite\the\value{instcount}}{%
     \ifciteseen
       {\iffieldundef{shorthand}
@@ -40,6 +111,8 @@
        \usebibmacro{cite:save}}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
+  \global\toggletrue{cbx:fullcite}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -48,16 +121,16 @@
 
 \newbibmacro*{cite:name}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}}
+  \setunit*{\nametitledelim}}
 
 \newbibmacro*{cite:idem}{%
   \bibstring[\mkibid]{idem\thefield{gender}}%
-  \setunit{\addcomma\space}}
+  \setunit{\nametitledelim}}
 
 \newbibmacro*{cite:title}{%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}%
-    \setunit{\addcomma\space}%
+    \setunit{\nametitledelim}%
     \bibstring[\mkibid]{opcit}}}
 
 \newbibmacro*{cite:ibid}{%
@@ -65,15 +138,15 @@
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{ibidem}}}%
   \ifloccit
-    {\global\booltrue{cbx:loccit}}
+    {\global\toggletrue{cbx:loccit}}
     {}}
 
 \newbibmacro*{cite:shorthand}{%
   \printtext[bibhyperlink]{\printfield{shorthand}}%
   \global\booltrue{cbx:noidem}}
 
-\newbibmacro*{cite:postnote}{%
-  \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+  \iftoggle{cbx:loccit}
     {}
     {\usebibmacro{postnote}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 05a2999b84a..bcd8d124745 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,20 +1,86 @@
-% $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
-                            loccittracker=constrict,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:ibid}
+\newtoggle{cbx:loccit}
 
 \DeclareBibliographyOption{strict}[true]{%
   \ifstrequal{#1}{true}
     {\ExecuteBibliographyOptions{ibidtracker=constrict,loccittracker=constrict}}
     {\ExecuteBibliographyOptions{ibidtracker=context,loccittracker=context}}}
 
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{%
+    \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{cite:postnote:ibidpage}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+                            loccittracker=constrict,autocite=footnote,
+			    citepages=permit}
+
 \newbibmacro*{cite}{%
-  \global\boolfalse{cbx:ibid}%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\ifciteibid
        {\ifloccit
@@ -28,6 +94,7 @@
     {\usebibmacro{cite:full}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -36,25 +103,25 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
 \newbibmacro*{cite:opcit}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \bibstring[\mkibid]{opcit}}}
 
 \newbibmacro*{cite:ibid}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
-  \global\booltrue{cbx:ibid}}
+  \global\toggletrue{cbx:loccit}}
 
 \newbibmacro*{cite:shorthand}{%
   \printtext[bibhyperlink]{\printfield{shorthand}}}
 
-\newbibmacro*{cite:postnote}{%
-  \ifbool{cbx:ibid}
+\newbibmacro*{cite:postnote:ibidpage}{%
+  \iftoggle{cbx:loccit}
     {}
     {\usebibmacro{postnote}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index ad4eb8527a9..f8c8a2e9b06 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -1,18 +1,82 @@
-% $Id: verbose.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,autocite=footnote}
-\newcommand*{\cbx@resetcount}{0}
+[\abx@cbxid $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
 \DeclareFieldFormat{bibhypertarget}{%
   \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+\newcommand*{\cbx@resetcount}{0}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
+
+\DeclareBibliographyOption{citepages}[permit]{%
+  \ifcsdef{cbx@opt@citepages@#1}
+    {\csuse{cbx@opt@citepages@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'citepages=#1'}
+       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@suppress{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \clearfield{pages}%
+    \clearfield{pagetotal}}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@omit{%
+  \renewbibmacro*{cite:citepages}{}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \ifboolexpr{
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      test {\iffieldpages{postnote}}
+    }
+      {\clearfield{pages}%
+       \clearfield{pagetotal}}
+      {}}%
+  \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@separate{%
+  \providetoggle{cbx:fullcite}%
+  \renewbibmacro*{cite:citepages}{%
+    \global\togglefalse{cbx:fullcite}}%
+  \renewbibmacro*{cite:full:citepages}{%
+    \global\toggletrue{cbx:fullcite}}%
+  \renewbibmacro*{cite:postnote}{%
+    \ifboolexpr{
+      togl {cbx:fullcite}
+      and
+      test {\iffieldpages{postnote}}
+      and
+      test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+      and
+      (
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
+      )
+    }
+      {\usebibmacro{cite:postnote:pages}}
+      {\usebibmacro{postnote}}}
+  \providebibmacro*{cite:postnote:pages}{%
+    \setunit{\postnotedelim}%
+    \bibstring{thiscite}%
+    \setunit{\addspace}%
+    \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,autocite=footnote,citepages=permit}
 
 \newbibmacro*{cite}{%
+  \usebibmacro{cite:citepages}%
   \ifciteseen
     {\iffieldundef{shorthand}
        {\usebibmacro{cite:short}}
@@ -20,6 +84,7 @@
     {\usebibmacro{cite:full}}}
 
 \newbibmacro*{cite:full}{%
+  \usebibmacro{cite:full:citepages}%
   \printtext[bibhypertarget]{%
     \usedriver
       {\DeclareNameAlias{sortname}{default}}
@@ -28,7 +93,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\addcomma\space}%
+  \setunit*{\nametitledelim}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
@@ -40,27 +105,27 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\parencite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index b0a83b30044..30be0a1206c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: UKenglish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InheritBibliographyExtras{british}
 \InheritBibliographyStrings{british}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
index 7688e2d3d68..c7b94a9c987 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: USenglish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InheritBibliographyExtras{american}
 \InheritBibliographyStrings{american}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
index e19c50f04de..ba09bcdf7db 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
@@ -1,7 +1,7 @@
-% $Id: american.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index c1e42eb159e..1097a54c200 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
@@ -1,7 +1,7 @@
-% $Id: australian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index ef381f4ca0e..f2351c9ec70 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
@@ -1,7 +1,7 @@
-% $Id: austrian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
index 514b6b1fd12..a0a542bd897 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
@@ -1,7 +1,7 @@
-% $Id: brazil.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InheritBibliographyExtras{brazilian}
 \InheritBibliographyStrings{brazilian}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index 7b0573cc145..1181117f66b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -1,12 +1,13 @@
-% $Id: brazilian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: brazilian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: brazilian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
-% * incomplete
-% * translations by native speaker
-% * peer review pending
+% * complete
+% * translations + peer review by native speakers
+
+\DeclareRedundantLanguages{brazilian}{brazil,portuges}
 
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
@@ -56,15 +57,15 @@
   editor           = {{editor}{ed\adddot}},
   editors          = {{editores}{eds\adddot}},
   compiler         = {{compilador}{comp\adddot}},
-  compilers        = {{compiladores}{comps\adddot}},
+  compilers        = {{compiladores}{comp\adddot}},
   redactor         = {{redator}{red\adddot}},
   redactors        = {{redatores}{red\adddot}},
-% founder          = {{}{}}, % FIXME: missing
-% founders         = {{}{}}, % FIXME: missing
-% continuator      = {{}{}}, % FIXME: missing
-% continuators     = {{}{}}, % FIXME: missing
-% collaborator     = {{}{}}, % FIXME: missing
-% collaborators    = {{}{}}, % FIXME: missing
+  founder          = {{fundador}{fund\adddot}},
+  founders         = {{fundadores}{fund\adddot}},
+  continuator      = {{continuador}{cont\adddot}},
+  continuators     = {{continuadores}{cont\adddot}},
+  collaborator     = {{colaborador}{col\adddot}},
+  collaborators    = {{colaboradores}{cols\adddot}},
   translator       = {{tradutor}{trad\adddot}},
   translators      = {{tradutores}{trads\adddot}},
   commentator      = {{comentador}{coment\adddot}},
@@ -74,8 +75,8 @@
   commentary       = {{coment\'ario}{coment\adddot}},
   annotations      = {{notas}{notas}},
   introduction     = {{introdu\c{c}\~ao}{introd\adddot}},
-  foreword         = {{pref\'acio}{pref\'acio}},
-  afterword        = {{posf\'acio}{posf\'acio}},
+  foreword         = {{pref\'acio}{pref\adddot}},
+  afterword        = {{posf\'acio}{posf\adddot}},
   editortr         = {{editor e tradutor}%
                       {ed\adddotspace e trad\adddot}},
   editorstr        = {{editores e tradutores}%
@@ -216,10 +217,10 @@
   byeditor         = {{editado por}{ed\adddotspace por}},
   bycompiler       = {{compilado por}{comp\adddotspace por}},
   byredactor       = {{redigido por}{red\adddotspace por}},
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{traduzido \lbx@fromlang\ por}{trad\adddot\ \lbx@fromlang\ por}},
+  byfounder        = {{fundado por}{fund\adddotspace por}},
+  bycontinuator    = {{continuado por}{cont\adddotspace por}},
+  bycollaborator   = {{em colabora\c{a}\~o com}{em col\adddotspace com}},
+  bytranslator     = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
   bycommentator    = {{comentado por}{com\adddot\ por}},
   byannotator      = {{anotado por}{anot\adddot\ por}},
   withcommentator  = {{com coment\'ario de}{com coment\adddot\ de}},
@@ -227,8 +228,8 @@
   withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}},
   withforeword     = {{com pref\'acio de}{com pref\adddot\ de}},
   withafterword    = {{com posf\'acio de}{com posf\adddot\ de}},
-  byeditortr       = {{editado e traduzido \lbx@fromlang\ por}%
-                      {ed\adddotspace e trad\adddot\ \lbx@fromlang\ por}},
+  byeditortr       = {{editado e traduzido \lbx@lfromlang\ por}%
+                      {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}},
   byeditorco       = {{editado e comentado por}%
                       {ed\adddotspace e com\adddot\ por}},
   byeditoran       = {{editado e anotado por}%
@@ -239,16 +240,16 @@
                       {ed\adddotspace e pref\adddot\ por}},
   byeditoraf       = {{editado e posfaciado por}%
                       {ed\adddotspace e posf\adddot\ por}},
-  byeditortrco     = {{editado, traduzido \lbx@fromlang\ e comentado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e com\adddot\ por}},
-  byeditortran     = {{editado, traduzido \lbx@fromlang\ e anotado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e anot\adddot\ por}},
-  byeditortrin     = {{editado, traduzido \lbx@fromlang\ e introduzido por}%
-                      {ed.,\addabbrvspace trad. \lbx@fromlang\ e introd\adddot\ por}},
-  byeditortrfo     = {{editado, traduzido \lbx@fromlang\ e prefaciado por}%
-                      {ed.,\addabbrvspace trad. \lbx@fromlang\ e pref\adddot\ por}},
-  byeditortraf     = {{editado, traduzido \lbx@fromlang\ e posfaciado por}%
-                      {ed.,\addabbrvspace trad. \lbx@fromlang\ e posf\adddot\ por}},
+  byeditortrco     = {{editado, traduzido \lbx@lfromlang\ e comentado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
+  byeditortran     = {{editado, traduzido \lbx@lfromlang\ e anotado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
+  byeditortrin     = {{editado, traduzido \lbx@lfromlang\ e introduzido por}%
+                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}},
+  byeditortrfo     = {{editado, traduzido \lbx@lfromlang\ e prefaciado por}%
+                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}},
+  byeditortraf     = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}%
+                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}},
   byeditorcoin     = {{editado, comentado e introduzido por}%
                       {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
   byeditorcofo     = {{editado, comentado e prefaciado por}%
@@ -261,40 +262,40 @@
                       {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}},
   byeditoranaf     = {{editado, anotado e posfaciado por}%
                       {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
-  byeditortrcoin   = {{editado, traduzido \lbx@fromlang, comentado e introduzido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ e introd\adddot\ por}},
-  byeditortrcofo   = {{editado, traduzido \lbx@fromlang, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ e pref\adddot\ por}},
-  byeditortrcoaf   = {{editado, traduzido \lbx@fromlang, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ e posf\adddot\ por}},
-  byeditortranin   = {{editado, traduzido \lbx@fromlang, anotado e introduzido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  byeditortranfo   = {{editado, traduzido \lbx@fromlang, anotado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
-  byeditortranaf   = {{editado, traduzido \lbx@fromlang, anotado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
-  bytranslatorco   = {{traduzido \lbx@fromlang\ e comentado por}%
-                      {trad\adddot\ \lbx@fromlang\ e com\adddot\ por}},
-  bytranslatoran   = {{traduzido \lbx@fromlang\ e anotado por}%
-                      {trad\adddot\ \lbx@fromlang\ e anot\adddot\ por}},
-  bytranslatorin   = {{traduzido \lbx@fromlang\ e introduzido por}%
-                      {trad\adddot\ \lbx@fromlang\ e introd\adddot\ por}},
-  bytranslatorfo   = {{traduzido \lbx@fromlang\ e prefaciado por}%
-                      {trad\adddot\ \lbx@fromlang\ e pref\adddot\ por}},
-  bytranslatoraf   = {{traduzido \lbx@fromlang\ e posfaciado por}%
-                      {trad\adddot\ \lbx@fromlang\ e posf\adddot\ por}},
-  bytranslatorcoin = {{traduzido \lbx@fromlang, comentado e introduzido por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ e introd\adddot\ por}},
-  bytranslatorcofo = {{traduzido \lbx@fromlang, comentado e prefaciado por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ e pref\adddot\ por}},
-  bytranslatorcoaf = {{traduzido \lbx@fromlang, comentado e posfaciado por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ e posf\adddot\ por}},
-  bytranslatoranin = {{traduzido \lbx@fromlang, anotado e introduzido por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  bytranslatoranfo = {{traduzido \lbx@fromlang, anotado e prefaciado por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
-  bytranslatoranaf = {{traduzido \lbx@fromlang, anotado e posfaciado por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
+  byeditortrcoin   = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+  byeditortrcofo   = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
+  byeditortrcoaf   = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
+  byeditortranin   = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+  byeditortranfo   = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
+  byeditortranaf   = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
+  bytranslatorco   = {{traduzido \lbx@lfromlang\ e comentado por}%
+                      {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
+  bytranslatoran   = {{traduzido \lbx@lfromlang\ e anotado por}%
+                      {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
+  bytranslatorin   = {{traduzido \lbx@lfromlang\ e introduzido por}%
+                      {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}},
+  bytranslatorfo   = {{traduzido \lbx@lfromlang\ e prefaciado por}%
+                      {trad\adddot\ \lbx@sfromlang\ e pref\adddot\ por}},
+  bytranslatoraf   = {{traduzido \lbx@lfromlang\ e posfaciado por}%
+                      {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}},
+  bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+  bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
+  bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
+  bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+  bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
+  bytranslatoranaf = {{traduzido \lbx@lfromlang, anotado e posfaciado por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
   and              = {{e}{e}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
@@ -320,12 +321,12 @@
   sections         = {{se\c{c}\~oes}{\S\S}},
   paragraph        = {{par\'agrafo}{par\adddot}},
   paragraphs       = {{par\'agrafo}{pars\adddot}},
-  in               = {{in}{in}},
+  in               = {{em}{em}},
   inseries         = {{em}{em}},
   ofseries         = {{de}{de}},
   number           = {{n\'umero}{n\textordmasculine}},
   chapter          = {{cap\'\i tulo}{cap\adddot}},
-  mathesis         = {{disseta\c{c}\~ao de mestrado}{diss\adddot\ de mestrado}},
+  mathesis         = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestrado}},
   phdthesis        = {{tese de doutorado}{tese de doutorado}},
   resreport        = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}},
   techreport       = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}},
@@ -335,8 +336,8 @@
   version          = {{vers\~ao}{vers\~ao}},
   url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
   urlseen          = {{acesso em}{acesso em}},
-% inpress          = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
+  inpress          = {{na prensa}{na prensa}},
+  submitted        = {{submetido}{subm\adddot}},
   citedas          = {{doravante citado como}{doravante citado como}},
   seenote          = {{ver nota}{ver nota}},
   quotedin         = {{apud}{apud}},
@@ -363,7 +364,7 @@
   february         = {{fevereiro}{fev\adddot}},
   march            = {{mar\c{c}o}{mar\adddot}},
   april            = {{abril}{abr\adddot}},
-  may              = {{maio}{mai\adddot}},
+  may              = {{maio}{maio}},
   june             = {{junho}{jun\adddot}},
   july             = {{julho}{jul\adddot}},
   august           = {{agosto}{ago\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index 5fbe4626024..ff956b9f92b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -1,7 +1,7 @@
-% $Id: british.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index 7c52485aae2..b82baad7991 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
@@ -1,7 +1,7 @@
-% $Id: canadian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index 071dc84d1df..c240f538cef 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -1,12 +1,14 @@
-% $Id: danish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: danish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: danish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * existing translations + peer review by native speakers
 
+\DeclareRedundantLanguages{danish}{danish}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -148,7 +150,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{oversat \lbx@fromlang\ af}{oversat \lbx@fromlang\ af}},
+  bytranslator     = {{oversat \lbx@lfromlang\ af}{oversat \lbx@sfromlang\ af}},
   bycommentator    = {{kommenteret af}{komm\adddot\ af}},
   byannotator      = {{forklaret af}{forkl\adddot\ af}}, 
 % byannotator      = {{fortolket af}{fortolket af}}, % alternative translation
@@ -157,8 +159,8 @@
   withintroduction = {{med en indledning af}{med en indl\adddot\ af}},
   withforeword     = {{med et forord af}{med et forord af}},
   withafterword    = {{med et efterord af}{med et efterord af}},
-  byeditortr       = {{udgivet og oversat \lbx@fromlang\ af}%
-                      {udg\adddotspace og oversat \lbx@fromlang\ af}},
+  byeditortr       = {{udgivet og oversat \lbx@lfromlang\ af}%
+                      {udg\adddotspace og oversat \lbx@sfromlang\ af}},
   byeditorco       = {{udgivet og kommenteret af}%
                       {udg\adddotspace og komm\adddot\ af}},
   byeditoran       = {{udgivet og forklaret af}%
@@ -169,16 +171,16 @@
                       {udg\adddotspace og med et forord skrev\adddot\ af}},
   byeditoraf       = {{udgivet og med et efterord skrevet af}%
                       {udg\adddotspace og med et efterord skrev\adddot\ af}},
-  byeditortrco     = {{udgivet, oversat \lbx@fromlang\ og kommenteret af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang\ og komm\adddot\ af}},
-  byeditortran     = {{udgivet, oversat \lbx@fromlang\ og forklaret af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang\ og forkl\adddot\ af}},
-  byeditortrin     = {{udgivet, oversat \lbx@fromlang\ og med en indledning skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang\ og med en indl\adddot\ skrev\adddot\ af}},
-  byeditortrfo     = {{udgivet, oversat \lbx@fromlang\ og med et forord skrevet af}%
-                      {wnoversat \lbx@fromlang\ og med et forord skrev\adddot\ af}},
-  byeditortraf     = {{udgivet, oversat \lbx@fromlang\ og med et efterord skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang\ og med et efterord skrev\adddot\ af}},
+  byeditortrco     = {{udgivet, oversat \lbx@lfromlang\ og kommenteret af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang\ og komm\adddot\ af}},
+  byeditortran     = {{udgivet, oversat \lbx@lfromlang\ og forklaret af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang\ og forkl\adddot\ af}},
+  byeditortrin     = {{udgivet, oversat \lbx@lfromlang\ og med en indledning skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang\ og med en indl\adddot\ skrev\adddot\ af}},
+  byeditortrfo     = {{udgivet, oversat \lbx@lfromlang\ og med et forord skrevet af}%
+                      {wnoversat \lbx@sfromlang\ og med et forord skrev\adddot\ af}},
+  byeditortraf     = {{udgivet, oversat \lbx@lfromlang\ og med et efterord skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang\ og med et efterord skrev\adddot\ af}},
   byeditorcoin     = {{udgivet, kommenteret og med en indledning skrevet af}%
                       {udg.,\addabbrvspace komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
   byeditorcofo     = {{udgivet, kommenteret og med et forord skrevet af}%
@@ -191,40 +193,40 @@
                       {udg.,\addabbrvspace forkl\adddot\ og med et forord skrev\adddot\ af}},
   byeditoranaf     = {{udgivet, forklaret og med et efterord skrevet af}%
                       {udg.,\addabbrvspace forkl\adddot\ og med et efterord skrev\adddot\ af}},
-  byeditortrcoin   = {{udgivet, oversat \lbx@fromlang, kommenteret og med en indledning skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
-  byeditortrcofo   = {{udgivet, oversat \lbx@fromlang, kommenteret og med et forord skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, komm\adddot\ og med et forord skrev\adddot\ af}},
-  byeditortrcoaf   = {{udgivet, oversat \lbx@fromlang, kommenteret og med et efterord skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, komm\adddot\ og med et efterord skrev\adddot\ af}},
-  byeditortranin   = {{udgivet, oversat \lbx@fromlang, forklaret og med en indledning skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, 
-  byeditortranfo   = {{udgivet, oversat \lbx@fromlang, forklaret og med et forord skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, forkl\adddot\ og med et forord skrev\adddot\ af}},
-  byeditortranaf   = {{udgivet, oversat \lbx@fromlang, forklaret og med et efterord skrevet af}%
-                      {udg.,\addabbrvspace oversat \lbx@fromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, 
-  bytranslatorco   = {{oversat \lbx@fromlang\ og kommenteret af}%
-                      {oversat \lbx@fromlang\ og komm\adddot\ af}},
-  bytranslatoran   = {{oversat \lbx@fromlang\ og forklaret af}%
-                      {oversat \lbx@fromlang\ og forkl\adddot\ af}}, 
-  bytranslatorin   = {{oversat \lbx@fromlang\ og med en indledning skrevet af}%
-                      {oversat \lbx@fromlang\ og med en indl\adddot\ skrev\adddot\ af}},
-  bytranslatorfo   = {{oversat \lbx@fromlang\ og med et forord skrevet af}%
-                      {oversat \lbx@fromlang\ og med et forord skrev\adddot\ af}},
-  bytranslatoraf   = {{oversat \lbx@fromlang\ og med et efterord skrevet af}%
-                      {oversat \lbx@fromlang\ og med et efterord skrev\adddot\ af}},
-  bytranslatorcoin = {{oversat \lbx@fromlang, kommenteret og med en indledning skrevet af}%
-                      {oversat \lbx@fromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
-  bytranslatorcofo = {{oversat \lbx@fromlang, kommenteret og med et forord skrevet af}%
-                      {oversat \lbx@fromlang, komm\adddot\ og med et forord skrev\adddot\ af}},
-  bytranslatorcoaf = {{oversat \lbx@fromlang, kommenteret og med et efterord skrevet af}%
-                      {oversat \lbx@fromlang, komm\adddot\ og med et efterord skrev\adddot\ af}},
-  bytranslatoranin = {{oversat \lbx@fromlang, forklaret og med en indledning skrevet af}%
-                      {oversat \lbx@fromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
-  bytranslatoranfo = {{oversat \lbx@fromlang, forklaret og med et forord skrevet af}%
-                      {oversat \lbx@fromlang, forkl\adddot\ og med et forord skrev\adddot\ af}},
-  bytranslatoranaf = {{oversat \lbx@fromlang, forklaret og med et efterord skrevet af}%
-                      {oversat \lbx@fromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}},
+  byeditortrcoin   = {{udgivet, oversat \lbx@lfromlang, kommenteret og med en indledning skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
+  byeditortrcofo   = {{udgivet, oversat \lbx@lfromlang, kommenteret og med et forord skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ af}},
+  byeditortrcoaf   = {{udgivet, oversat \lbx@lfromlang, kommenteret og med et efterord skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med et efterord skrev\adddot\ af}},
+  byeditortranin   = {{udgivet, oversat \lbx@lfromlang, forklaret og med en indledning skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, 
+  byeditortranfo   = {{udgivet, oversat \lbx@lfromlang, forklaret og med et forord skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ af}},
+  byeditortranaf   = {{udgivet, oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}%
+                      {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, 
+  bytranslatorco   = {{oversat \lbx@lfromlang\ og kommenteret af}%
+                      {oversat \lbx@sfromlang\ og komm\adddot\ af}},
+  bytranslatoran   = {{oversat \lbx@lfromlang\ og forklaret af}%
+                      {oversat \lbx@sfromlang\ og forkl\adddot\ af}}, 
+  bytranslatorin   = {{oversat \lbx@lfromlang\ og med en indledning skrevet af}%
+                      {oversat \lbx@sfromlang\ og med en indl\adddot\ skrev\adddot\ af}},
+  bytranslatorfo   = {{oversat \lbx@lfromlang\ og med et forord skrevet af}%
+                      {oversat \lbx@sfromlang\ og med et forord skrev\adddot\ af}},
+  bytranslatoraf   = {{oversat \lbx@lfromlang\ og med et efterord skrevet af}%
+                      {oversat \lbx@sfromlang\ og med et efterord skrev\adddot\ af}},
+  bytranslatorcoin = {{oversat \lbx@lfromlang, kommenteret og med en indledning skrevet af}%
+                      {oversat \lbx@sfromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
+  bytranslatorcofo = {{oversat \lbx@lfromlang, kommenteret og med et forord skrevet af}%
+                      {oversat \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ af}},
+  bytranslatorcoaf = {{oversat \lbx@lfromlang, kommenteret og med et efterord skrevet af}%
+                      {oversat \lbx@sfromlang, komm\adddot\ og med et efterord skrev\adddot\ af}},
+  bytranslatoranin = {{oversat \lbx@lfromlang, forklaret og med en indledning skrevet af}%
+                      {oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}},
+  bytranslatoranfo = {{oversat \lbx@lfromlang, forklaret og med et forord skrevet af}%
+                      {oversat \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ af}},
+  bytranslatoranaf = {{oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}%
+                      {oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}},
   and              = {{og}{og}},
 % FIXME: spacing after abbreviation dot?
   andothers        = {{med flere}{m.fl\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index dc20cfb4c65..5926dee2d30 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -1,13 +1,15 @@
-% $Id: dutch.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: dutch.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: dutch.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * translations by native speaker
 % * peer review pending
 
+\DeclareRedundantLanguages{dutch}{dutch}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{-}%
   \protected\def\bibdatedash{\bibrangedash}% FIXME: unsure
@@ -149,7 +151,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{vertaald \lbx@fromlang\ door}{vert\adddot\ \lbx@fromlang\ door}},
+  bytranslator     = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@sfromlang\ door}},
   bycommentator    = {{becommentari\"{e}erd door}{comm\adddot\ door}},
   byannotator      = {{geannoteerd door}{annot\adddot\ door}},
   withcommentator  = {{met een commentaar van}{met een comment\adddot\ van}},
@@ -157,8 +159,8 @@
   withintroduction = {{met een introductie van}{met een intro\adddot\ van}},
   withforeword     = {{met een voorwoord van}{met een woorw\adddot\ van}},
   withafterword    = {{met een nawoord van}{met een naw\adddot\ van}},
-  byeditortr       = {{geredigeerd en vertaald \lbx@fromlang\ door}%
-                      {red\adddotspace en vert\adddot\ \lbx@fromlang\ door}},
+  byeditortr       = {{geredigeerd en vertaald \lbx@lfromlang\ door}%
+                      {red\adddotspace en vert\adddot\ \lbx@sfromlang\ door}},
   byeditorco       = {{geredigeerd en becommentari\"{e}erd door}%
                       {red\adddotspace en comm\adddot\ door}},
   byeditoran       = {{geredigeerd en geannoteerd door}%
@@ -169,16 +171,16 @@
                       {red., met een voorw., van}},
   byeditoraf       = {{geredigeerd, met een nawoord, van}%
                       {red., met een naw., van}},
-  byeditortrco     = {{geredigeerd, vertaald \lbx@fromlang\ en becommentari\"{e}erd door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en comm\adddot\ door}},
-  byeditortran     = {{geredigeerd, vertaald \lbx@fromlang\ en geannoteerd door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en annot\adddot\ door}},
-  byeditortrin     = {{geredigeerd en vertaald \lbx@fromlang, met een introductie, door}%
-                      {red\adddotspace en vert. \lbx@fromlang, met een introd., door}},
-  byeditortrfo     = {{geredigeerd en vertaald \lbx@fromlang, met een voorwoord, door}%
-                      {red\adddotspace en vert. \lbx@fromlang, met een voorw., door}},
-  byeditortraf     = {{geredigeerd en vertaald \lbx@fromlang, met een nawoord, door}%
-                      {red\adddotspace en vert. \lbx@fromlang, met een naw., door}},
+  byeditortrco     = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}},
+  byeditortran     = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en annot\adddot\ door}},
+  byeditortrin     = {{geredigeerd en vertaald \lbx@lfromlang, met een introductie, door}%
+                      {red\adddotspace en vert. \lbx@sfromlang, met een introd., door}},
+  byeditortrfo     = {{geredigeerd en vertaald \lbx@lfromlang, met een voorwoord, door}%
+                      {red\adddotspace en vert. \lbx@sfromlang, met een voorw., door}},
+  byeditortraf     = {{geredigeerd en vertaald \lbx@lfromlang, met een nawoord, door}%
+                      {red\adddotspace en vert. \lbx@sfromlang, met een naw., door}},
   byeditorcoin     = {{geredigeerd en becommentari\"{e}erd, met een introductie, door}%
                       {red\adddotspace en comm., met een introd., door}},
   byeditorcofo     = {{geredigeerd en becommentari\"{e}erd, met een voorwoord, door}%
@@ -191,40 +193,40 @@
                       {red\adddotspace en annot., met een voorw., door}},
   byeditoranaf     = {{geredigeerd en geannoteerd, met een nawoord, door}%
                       {red\adddotspace en annot., met een naw., door}},
-  byeditortrcoin   = {{geredigeerd, vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een introductie, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en comm., met een introd., door}},
-  byeditortrcofo   = {{geredigeerd, vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een voorwoord, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en comm., met een voorw., door}},
-  byeditortrcoaf   = {{geredigeerd, vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een nawoord, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en comm., met een naw., door}},
-  byeditortranin   = {{geredigeerd, vertaald \lbx@fromlang\ en geannoteerd, met een introductie, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en annot., met een introd., door}},
-  byeditortranfo   = {{geredigeerd, vertaald \lbx@fromlang\ en geannoteerd, met een voorwoord, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en annot., met een voorw., door}},
-  byeditortranaf   = {{geredigeerd, vertaald \lbx@fromlang\ en geannoteerd, met een nawoord, door}%
-                      {red., vert\adddot\ \lbx@fromlang\ en annot., met een naw., door}},
-  bytranslatorco   = {{vertaald \lbx@fromlang\ en becommentari\"{e}erd door}%
-                      {vert\adddot\ \lbx@fromlang\ en comm\adddot\ door}},
-  bytranslatoran   = {{vertaald \lbx@fromlang\ en geannoteerd door}%
-                      {vert\adddot\ \lbx@fromlang\ en annot.\adddot\ door}},
-  bytranslatorin   = {{vertaald \lbx@fromlang, met een introductie, door}%
-                      {vert. \lbx@fromlang, met een introd., door}},
-  bytranslatorfo   = {{vertaald \lbx@fromlang, met een voorwoord, door}%
-                      {vert. \lbx@fromlang, met een voorw., door}},
-  bytranslatoraf   = {{vertaald \lbx@fromlang, met een nawoord, door}%
-                      {vert. \lbx@fromlang, met een naw., door}},
-  bytranslatorcoin = {{vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een introd., door}%
-                      {vert\adddot\ \lbx@fromlang\ en comm., met een introd., door}},
-  bytranslatorcofo = {{vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een voorwoord, door}%
-                      {vert\adddot\ \lbx@fromlang\ en comm., met een voorw., door}},
-  bytranslatorcoaf = {{vertaald \lbx@fromlang\ en becommentari\"{e}erd, met een nawoord, door}%
-                      {vert\adddot\ \lbx@fromlang\ en comm., met een naw., door}},
-  bytranslatoranin = {{vertaald \lbx@fromlang\ en geannoteerd, met een introd., door}%
-                      {vert\adddot\ \lbx@fromlang\ en annot., met een introd., door}},
-  bytranslatoranfo = {{vertaald \lbx@fromlang\ en geannoteerd, met een voorwoord, door}%
-                      {vert\adddot\ \lbx@fromlang\ en annot., met een voorw., door}},
-  bytranslatoranaf = {{vertaald \lbx@fromlang\ en geannoteerd, met een nawoord, door}%
-                      {vert\adddot\ \lbx@fromlang\ en annot., met een naw., door}},
+  byeditortrcoin   = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een introductie, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en comm., met een introd., door}},
+  byeditortrcofo   = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een voorwoord, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}},
+  byeditortrcoaf   = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een nawoord, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}},
+  byeditortranin   = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een introductie, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en annot., met een introd., door}},
+  byeditortranfo   = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}},
+  byeditortranaf   = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}%
+                      {red., vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}},
+  bytranslatorco   = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd door}%
+                      {vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}},
+  bytranslatoran   = {{vertaald \lbx@lfromlang\ en geannoteerd door}%
+                      {vert\adddot\ \lbx@sfromlang\ en annot.\adddot\ door}},
+  bytranslatorin   = {{vertaald \lbx@lfromlang, met een introductie, door}%
+                      {vert. \lbx@sfromlang, met een introd., door}},
+  bytranslatorfo   = {{vertaald \lbx@lfromlang, met een voorwoord, door}%
+                      {vert. \lbx@sfromlang, met een voorw., door}},
+  bytranslatoraf   = {{vertaald \lbx@lfromlang, met een nawoord, door}%
+                      {vert. \lbx@sfromlang, met een naw., door}},
+  bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een introd., door}%
+                      {vert\adddot\ \lbx@sfromlang\ en comm., met een introd., door}},
+  bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een voorwoord, door}%
+                      {vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}},
+  bytranslatorcoaf = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een nawoord, door}%
+                      {vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}},
+  bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een introd., door}%
+                      {vert\adddot\ \lbx@sfromlang\ en annot., met een introd., door}},
+  bytranslatoranfo = {{vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}%
+                      {vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}},
+  bytranslatoranaf = {{vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}%
+                      {vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}},
   and              = {{en}{en}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 2f7c88e7e61..cd373552c9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -1,12 +1,15 @@
-% $Id: english.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: english.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: english.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
 % * some recently added translations need review
 
+\DeclareRedundantLanguages{english,american}{english,american,british,
+canadian,australian,newzealand,USenglish,UKenglish}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -238,7 +241,7 @@
   byfounder        = {{founded by}{found\adddotspace by}},
   bycontinuator    = {{continued by}{cont\adddotspace by}},
   bycollaborator   = {{in collaboration with}{in collab\adddotspace with}}, % FIXME: unsure
-  bytranslator     = {{translated \lbx@fromlang\ by}{trans\adddot\ \lbx@fromlang\ by}},
+  bytranslator     = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang\ by}},
   bycommentator    = {{commented by}{comm\adddot\ by}},
   byannotator      = {{annotated by}{annot\adddot\ by}},
   withcommentator  = {{with a commentary by}{with a comment\adddot\ by}},
@@ -246,8 +249,8 @@
   withintroduction = {{with an introduction by}{with an intro\adddot\ by}},
   withforeword     = {{with a foreword by}{with a forew\adddot\ by}},
   withafterword    = {{with an afterword by}{with an afterw\adddot\ by}},
-  byeditortr       = {{edited and translated \lbx@fromlang\ by}%
-                      {ed\adddotspace and trans\adddot\ \lbx@fromlang\ by}},
+  byeditortr       = {{edited and translated \lbx@lfromlang\ by}%
+                      {ed\adddotspace and trans\adddot\ \lbx@sfromlang\ by}},
   byeditorco       = {{edited and commented by}%
                       {ed\adddotspace and comm\adddot\ by}},
   byeditoran       = {{edited and annotated by}%
@@ -258,16 +261,16 @@
                       {ed.,\addabbrvspace with a forew., by}},
   byeditoraf       = {{edited, with an afterword, by}%
                       {ed.,\addabbrvspace with an afterw., by}},
-  byeditortrco     = {{edited, translated \lbx@fromlang\finalandcomma\ and commented by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm\adddot\ by}},
-  byeditortran     = {{edited, translated \lbx@fromlang\finalandcomma\ and annotated by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot\adddot\ by}},
-  byeditortrin     = {{edited and translated \lbx@fromlang, with an introduction, by}%
-                      {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an introd., by}},
-  byeditortrfo     = {{edited and translated \lbx@fromlang, with a foreword, by}%
-                      {ed\adddotspace and trans\adddot\ \lbx@fromlang, with a forew., by}},
-  byeditortraf     = {{edited and translated \lbx@fromlang, with an afterword, by}%
-                      {ed\adddotspace and trans\adddot\ \lbx@fromlang, with an afterw., by}},
+  byeditortrco     = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot\ by}},
+  byeditortran     = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot\ by}},
+  byeditortrin     = {{edited and translated \lbx@lfromlang, with an introduction, by}%
+                      {ed\adddotspace and trans\adddot\ \lbx@sfromlang, with an introd., by}},
+  byeditortrfo     = {{edited and translated \lbx@lfromlang, with a foreword, by}%
+                      {ed\adddotspace and trans\adddot\ \lbx@sfromlang, with a forew., by}},
+  byeditortraf     = {{edited and translated \lbx@lfromlang, with an afterword, by}%
+                      {ed\adddotspace and trans\adddot\ \lbx@sfromlang, with an afterw., by}},
   byeditorcoin     = {{edited and commented, with an introduction, by}%
                       {ed\adddotspace and comm., with an introd., by}},
   byeditorcofo     = {{edited and commented, with a foreword, by}%
@@ -280,40 +283,40 @@
                       {ed\adddotspace and annot., with a forew., by}},
   byeditoranaf     = {{edited and annotated, with an afterword, by}%
                       {ed\adddotspace and annot., with an afterw., by}},
-  byeditortrcoin   = {{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an introduction, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an introd., by}},
-  byeditortrcofo   = {{edited, translated \lbx@fromlang\finalandcomma\ and commented, with a foreword, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with a forew., by}},
-  byeditortrcoaf   = {{edited, translated \lbx@fromlang\finalandcomma\ and commented, with an afterword, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and comm., with an afterw., by}},
-  byeditortranin   = {{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an introduction, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an introd., by}},
-  byeditortranfo   = {{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with a foreword, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with a forew., by}},
-  byeditortranaf   = {{edited, translated \lbx@fromlang\finalandcomma\ and annotated, with an afterword, by}%
-                      {ed.,\addabbrvspace trans\adddot\ \lbx@fromlang\finalandcomma\ and annot, with an afterw., by}},
-  bytranslatorco   = {{translated \lbx@fromlang\ and commented by}%
-                      {trans\adddot\ \lbx@fromlang\ and comm\adddot\ by}},
-  bytranslatoran   = {{translated \lbx@fromlang\ and annotated by}%
-                      {trans\adddot\ \lbx@fromlang\ and annot\adddot\ by}},
-  bytranslatorin   = {{translated \lbx@fromlang, with an introduction, by}%
-                      {trans\adddot\ \lbx@fromlang, with an introd., by}},
-  bytranslatorfo   = {{translated \lbx@fromlang, with a foreword, by}%
-                      {trans\adddot\ \lbx@fromlang, with a forew., by}},
-  bytranslatoraf   = {{translated \lbx@fromlang, with an afterword, by}%
-                      {trans\adddot\ \lbx@fromlang, with an afterw., by}},
-  bytranslatorcoin = {{translated \lbx@fromlang\ and commented, with an introduction, by}%
-                      {trans\adddot\ \lbx@fromlang\ and comm., with an introd., by}},
-  bytranslatorcofo = {{translated \lbx@fromlang\ and commented, with a foreword, by}%
-                      {trans\adddot\ \lbx@fromlang\ and comm., with a forew., by}},
-  bytranslatorcoaf = {{translated \lbx@fromlang\ and commented, with an afterword, by}%
-                      {trans\adddot\ \lbx@fromlang\ and comm., with an afterw., by}},
-  bytranslatoranin = {{translated \lbx@fromlang\ and annotated, with an introduction, by}%
-                      {trans\adddot\ \lbx@fromlang\ and annot., with an introd., by}},
-  bytranslatoranfo = {{translated \lbx@fromlang\ and annotated, with a foreword, by}%
-                      {trans\adddot\ \lbx@fromlang\ and annot., with a forew., by}},
-  bytranslatoranaf = {{translated \lbx@fromlang\ and annotated, with an afterword, by}%
-                      {trans\adddot\ \lbx@fromlang\ and annot., with an afterw., by}},
+  byeditortrcoin   = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm., with an introd., by}},
+  byeditortrcofo   = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm., with a forew., by}},
+  byeditortrcoaf   = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm., with an afterw., by}},
+  byeditortranin   = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with an introd., by}},
+  byeditortranfo   = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with a forew., by}},
+  byeditortranaf   = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}%
+                      {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with an afterw., by}},
+  bytranslatorco   = {{translated \lbx@lfromlang\ and commented by}%
+                      {trans\adddot\ \lbx@sfromlang\ and comm\adddot\ by}},
+  bytranslatoran   = {{translated \lbx@lfromlang\ and annotated by}%
+                      {trans\adddot\ \lbx@sfromlang\ and annot\adddot\ by}},
+  bytranslatorin   = {{translated \lbx@lfromlang, with an introduction, by}%
+                      {trans\adddot\ \lbx@sfromlang, with an introd., by}},
+  bytranslatorfo   = {{translated \lbx@lfromlang, with a foreword, by}%
+                      {trans\adddot\ \lbx@sfromlang, with a forew., by}},
+  bytranslatoraf   = {{translated \lbx@lfromlang, with an afterword, by}%
+                      {trans\adddot\ \lbx@sfromlang, with an afterw., by}},
+  bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and comm., with an introd., by}},
+  bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and comm., with a forew., by}},
+  bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and comm., with an afterw., by}},
+  bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and annot., with an introd., by}},
+  bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and annot., with a forew., by}},
+  bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}%
+                      {trans\adddot\ \lbx@sfromlang\ and annot., with an afterw., by}},
   and              = {{and}{and}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
@@ -444,63 +447,71 @@
 }
 
 \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-         {\mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \iffieldsequal{#2year}{#2endyear}
-	    {\iffieldsequal{#2month}{#2endmonth}
-               {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
-	       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-	    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+       \iffieldundef{#2endyear}
+	 {}
+	 {\iffieldequalstr{#2endyear}{}
+            {\mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \iffieldsequal{#2year}{#2endyear}
+	       {\iffieldsequal{#2month}{#2endmonth}
+        	  {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+		  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+	       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
 
 \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}
-      {}
-      {\iffieldequalstr{#2endyear}{}
-         {\mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+       \iffieldundef{#2endyear}
+	 {}
+	 {\iffieldequalstr{#2endyear}{}
+            {\mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}
-      {\printfield{extrayear}}
-      {\iffieldequalstr{#2endyear}{}
-         {\printfield{extrayear}%
-	  \mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \iffieldsequal{#2year}{#2endyear}
-	    {\iffieldsequal{#2month}{#2endmonth}
-               {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
-	       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-	    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-	  \printfield{extrayear}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+       \iffieldundef{#2endyear}
+	 {\printfield{extrayear}}
+	 {\iffieldequalstr{#2endyear}{}
+            {\printfield{extrayear}%
+	     \mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \iffieldsequal{#2year}{#2endyear}
+	       {\iffieldsequal{#2month}{#2endmonth}
+        	  {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+		  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+	       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+	     \printfield{extrayear}}}}}}
 
 \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
-  \printtext{%
-    \iffieldsequal{#2year}{#2endyear}
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
-    \iffieldundef{#2endyear}
-      {\printfield{extrayear}}
-      {\iffieldequalstr{#2endyear}{}
-         {\printfield{extrayear}%
-	  \mbox{\bibdatedash}}
-	 {\bibdatedash
-	  \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
-	  \printfield{extrayear}}}}}
+  \iffieldundef{#2year}
+    {}
+    {\printtext{%
+       \iffieldsequal{#2year}{#2endyear}
+	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+       \iffieldundef{#2endyear}
+	 {\printfield{extrayear}}
+	 {\iffieldequalstr{#2endyear}{}
+            {\printfield{extrayear}%
+	     \mbox{\bibdatedash}}
+	    {\bibdatedash
+	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+	     \printfield{extrayear}}}}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index c3944e07402..cf973ff0577 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -1,7 +1,7 @@
-% $Id: finnish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
@@ -13,6 +13,8 @@
 % Source for some items in translations: Kielikello 3/1998.
 % and Liisa Junno: Kirjastosanasto 1. BTJ Kirjastopalvelu 2006.
 
+\DeclareRedundantLanguages{finnish}{finnish}
+
 \DeclareBibliographyExtras{%
   % dashes: may be either \textendash or \textemdash
   \protected\def\bibrangedash{%
@@ -44,11 +46,16 @@
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
     \thefield{#1}}%
-  \savecommand\lbx@fromlang
-  \def\lbx@fromlang{%
+  \savecommand\lbx@lfromlang
+  \savecommand\lbx@sfromlang
+  \def\lbx@lfromlang{%
+    \iffieldundef{origlanguage}
+      {}
+      {\biblstring{from\thefield{origlanguage}}\space}}%
+  \def\lbx@sfromlang{%
     \iffieldundef{origlanguage}
       {}
-      {\bibstring{from\thefield{origlanguage}}\space}}%
+      {\bibsstring{from\thefield{origlanguage}}\space}}%
   \savebibmacro{in:}%
   \renewbibmacro{in:}{%
     \iffieldequalstr{entrytype}{article}
@@ -57,7 +64,8 @@
 }
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\lbx@fromlang
+  \restorecommand\lbx@lfromlang
+  \restorecommand\lbx@sfromlang
   \restorebibmacro{in:}%
 }
 
@@ -231,7 +239,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{\lbx@fromlang k\"a\"ant\"anyt}{\lbx@fromlang k\"a\"ant\adddot}},
+  bytranslator     = {{\lbx@lfromlang k\"a\"ant\"anyt}{\lbx@sfromlang k\"a\"ant\adddot}},
   bycommentator    = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},  % FIXME: unsure.
   byannotator      = {{selityksin varustanut}{selityksin varustanut}},          % FIXME: unsure.
   withcommentator  = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},  % FIXME: unsure.
@@ -239,8 +247,8 @@
   withintroduction = {{johdannon kirjottanut}{johdannon kirjottanut}},
   withforeword     = {{esipuheen kirjoittanut}{esipuheen kirjoittanut}},
   withafterword    = {{j\"alkisanat kirjoittanut}{j\"alkisanat kirjoittanut}},
-  byeditortr       = {{toimittanut ja \lbx@fromlang k\"a\"ant\"anyt}%
-                      {toim\adddotspace ja \lbx@fromlang k\"a\"ant\adddot}},
+  byeditortr       = {{toimittanut ja \lbx@lfromlang k\"a\"ant\"anyt}%
+                      {toim\adddotspace ja \lbx@sfromlang k\"a\"ant\adddot}},
   byeditorco       = {{toimittanut ja kommentaarin kirjoittanut}%
                       {toimittanut ja kommentaarin kirjoittanut}},
   byeditoran       = {{toimittanut ja selityksin varustanut}%
@@ -251,16 +259,16 @@
                       {toimittanut ja esipuheen kirjoittanut}},
   byeditoraf       = {{toimittanut ja j\"alkisanat kirjoittanut}%
                       {toimittanut ja j\"alkisanat kirjoittanut}},
-  byeditortrco     = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}},
-  byeditortran     = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}},
-  byeditortrin     = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}},
-  byeditortrfo     = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}},
-  byeditortraf     = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}},
+  byeditortrco     = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}},
+  byeditortran     = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt ja selityksin varustanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt ja selityksin varustanut}},
+  byeditortrin     = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}},
+  byeditortrfo     = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}},
+  byeditortraf     = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}},
   byeditorcoin     = {{toimittanut, kommentaarin ja johdannon kirjoittanut}%
                       {toimittanut, kommentaarin ja johdannon kirjoittanut}},
   byeditorcofo     = {{toimittanut, kommentaarin ja esipuheen kirjoittanut}%
@@ -273,40 +281,40 @@
                       {toimittanut, selitykset ja esipuheen kirjoittanut}},
   byeditoranaf     = {{toimittanut, selitykset ja j\"alkisanat kirjoittanut}%
                       {toimittanut, selitykset ja j\"alkisanat kirjoittanut}},
-  byeditortrcoin   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}},
-  byeditortrcofo   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}},
-  byeditortrcoaf   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}},
-  byeditortranin   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}},
-  byeditortranfo   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}},
-  byeditortranaf   = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}%
-                      {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}},
-  bytranslatorco   = {{\lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}},
-  bytranslatoran   = {{\lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}},
-  bytranslatorin   = {{\lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}},
-  bytranslatorfo   = {{\lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}},
-  bytranslatoraf   = {{\lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}},
-  bytranslatorcoin = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}},
-  bytranslatorcofo = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}},
-  bytranslatorcoaf = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}},
-  bytranslatoranin = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}},
-  bytranslatoranfo = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}},
-  bytranslatoranaf = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}%
-                      {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}},
+  byeditortrcoin   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}},
+  byeditortrcofo   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}},
+  byeditortrcoaf   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}},
+  byeditortranin   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}},
+  byeditortranfo   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}},
+  byeditortranaf   = {{toimittanut, \lbx@lfromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}%
+                      {toimittanut, \lbx@sfromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}},
+  bytranslatorco   = {{\lbx@lfromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}},
+  bytranslatoran   = {{\lbx@lfromlang k\"a\"ant\"anyt ja selityksin varustanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt ja selityksin varustanut}},
+  bytranslatorin   = {{\lbx@lfromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}},
+  bytranslatorfo   = {{\lbx@lfromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}},
+  bytranslatoraf   = {{\lbx@lfromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}},
+  bytranslatorcoin = {{\lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}},
+  bytranslatorcofo = {{\lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}},
+  bytranslatorcoaf = {{\lbx@lfromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}},
+  bytranslatoranin = {{\lbx@lfromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}},
+  bytranslatoranfo = {{\lbx@lfromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}},
+  bytranslatoranaf = {{\lbx@lfromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}%
+                      {\lbx@sfromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}},
   and              = {{ja}{ja}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 393fd5292da..9a694b6f5b2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -1,13 +1,15 @@
-% $Id: french.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: french.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: french.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * draft translations, this file really needs an overhaul
 % * peer review pending
 
+\DeclareRedundantLanguages{french}{french}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -173,7 +175,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{traduit \lbx@fromlang\ par}{trad\adddot\ \lbx@fromlang\ par}},
+  bytranslator     = {{traduit \lbx@lfromlang\ par}{trad\adddot\ \lbx@sfromlang\ par}},
   bycommentator    = {{comment\'e par}{comm\adddot\ par}},
   byannotator      = {{annot\'e par}{annot\adddot\ par}},
   withcommentator  = {{avec des commentaires par}{avec des comment\adddot\ par}},
@@ -181,8 +183,8 @@
   withintroduction = {{avec une introduction par}{avec une introd\adddot\ par}},
   withforeword     = {{avec une pr\'eface par}{avec une pr\'ef\adddot\ par}},
   withafterword    = {{avec un postface par}{avec un postf\adddot\ par}},
-  byeditortr       = {{\'edition \'etablie et traduite \lbx@fromlang\ par}%
-                      {\'ed\adddotspace \'etablie et trad\adddot\ \lbx@fromlang\ par}},
+  byeditortr       = {{\'edition \'etablie et traduite \lbx@lfromlang\ par}%
+                      {\'ed\adddotspace \'etablie et trad\adddot\ \lbx@sfromlang\ par}},
   byeditorco       = {{\'edition \'etablie et comment\'ee par}%
                       {\'ed\adddotspace \'etablie et comm\adddot\ par}},
   byeditoran       = {{\'edition \'etablie et annot\'ee par}%
@@ -193,16 +195,16 @@
                       {\'ed\adddotspace \'etablie et pr\'ef\adddot\ par}},
   byeditoraf       = {{\'edition \'etablie et postfac\'ee par}%
                       {\'ed\adddotspace \'etablie et postf\adddot\ par}},
-  byeditortrco     = {{\'edition \'etablie, traduite \lbx@fromlang\ et comment\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang\ et comm\adddot\ par}},
-  byeditortran     = {{\'edition \'etablie, traduite \lbx@fromlang\ et annot\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang\ et annot\adddot\ par}},
-  byeditortrin     = {{\'edition \'etablie, traduite \lbx@fromlang\ et introduite par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang\ et introd\adddot\ par}},
-  byeditortrfo     = {{\'edition \'etablie, traduite \lbx@fromlang\ et pr\'efac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang\ et pr\'ef\adddot\ par}},
-  byeditortraf     = {{\'edition \'etablie, traduite \lbx@fromlang\ et postfac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang\ et postf\adddot\ par}},
+  byeditortrco     = {{\'edition \'etablie, traduite \lbx@lfromlang\ et comment\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang\ et comm\adddot\ par}},
+  byeditortran     = {{\'edition \'etablie, traduite \lbx@lfromlang\ et annot\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang\ et annot\adddot\ par}},
+  byeditortrin     = {{\'edition \'etablie, traduite \lbx@lfromlang\ et introduite par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang\ et introd\adddot\ par}},
+  byeditortrfo     = {{\'edition \'etablie, traduite \lbx@lfromlang\ et pr\'efac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang\ et pr\'ef\adddot\ par}},
+  byeditortraf     = {{\'edition \'etablie, traduite \lbx@lfromlang\ et postfac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang\ et postf\adddot\ par}},
   byeditorcoin     = {{\'edition \'etablie, comment\'ee et introduite par}%
                       {\'ed\adddotspace \'etablie, comm\adddot\ et introd\adddot\ par}},
   byeditorcofo     = {{\'edition \'etablie, comment\'ee et pr\'efac\'ee par}%
@@ -215,40 +217,40 @@
                       {\'ed\adddotspace \'etablie, annot\adddot\ et pr\'ef\adddot\ par}},
   byeditoranaf     = {{\'edition \'etablie, annot\'ee et postfac\'ee par}%
                       {\'ed\adddotspace \'etablie, annot\adddot\ et postf\adddot\ par}},
-  byeditortrcoin   = {{\'edition \'etablie, traduite \lbx@fromlang, comment\'ee et introduite par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, comm\adddot\ et introd\adddot\ par}},
-  byeditortrcofo   = {{\'edition \'etablie, traduite \lbx@fromlang, comment\'ee et pr\'efac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, comm\adddot\ et pr\'ef\adddot\ par}},
-  byeditortrcoaf   = {{\'edition \'etablie, traduite \lbx@fromlang, comment\'ee et postfac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, comm\adddot\ et postf\adddot\ par}},
-  byeditortranin   = {{\'edition \'etablie, traduite \lbx@fromlang, annot\'ee et introduite par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, annot\adddot\ et introd\adddot\ par}},
-  byeditortranfo   = {{\'edition \'etablie, traduite \lbx@fromlang, annot\'ee et pr\'efac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, annot\adddot\ et pr\'ef\adddot\ par}},
-  byeditortranaf   = {{\'edition \'etablie, traduite \lbx@fromlang, annot\'ee et postfac\'ee par}%
-                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@fromlang, annot\adddot\ et postf\adddot\ par}},
-  bytranslatorco   = {{traduit \lbx@fromlang\ et comment\'e par}%
-                      {trad\adddot\ \lbx@fromlang\ et comm\adddot\ par}},
-  bytranslatoran   = {{traduit \lbx@fromlang\ et annot\'e par}%
-                      {trad\adddot\ \lbx@fromlang\ et annot\adddot\ par}},
-  bytranslatorin   = {{traduit \lbx@fromlang\ et introduit par}%
-                      {trad\adddot\ \lbx@fromlang\ et introd\adddot\ par}},
-  bytranslatorfo   = {{traduit \lbx@fromlang\ et pr\'efac\'e par}%
-                      {trad\adddot\ \lbx@fromlang\ et pr\'ef\adddot\ par}},
-  bytranslatoraf   = {{traduit \lbx@fromlang\ et postfac\'e par}%
-                      {trad\adddot\ \lbx@fromlang\ et postf\adddot\ par}},
-  bytranslatorcoin = {{traduit \lbx@fromlang, comment\'e et introduit par}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ et introd\adddot\ par}},
-  bytranslatorcofo = {{traduit \lbx@fromlang, comment\'e et pr\'efac\'e par}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ et pr\'ef\adddot\ par}},
-  bytranslatorcoaf = {{traduit \lbx@fromlang, comment\'e et postfac\'e par}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ et postf\adddot\ par}},
-  bytranslatoranin = {{traduit \lbx@fromlang, annot\'e et introduit par}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ et introd\adddot\ par}},
-  bytranslatoranfo = {{traduit \lbx@fromlang, annot\'e et pr\'efac\'e par}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ et pr\'ef\adddot\ par}},
-  bytranslatoranaf = {{traduit \lbx@fromlang, annot\'e et postfac\'e par}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ et postf\adddot\ par}},
+  byeditortrcoin   = {{\'edition \'etablie, traduite \lbx@lfromlang, comment\'ee et introduite par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, comm\adddot\ et introd\adddot\ par}},
+  byeditortrcofo   = {{\'edition \'etablie, traduite \lbx@lfromlang, comment\'ee et pr\'efac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, comm\adddot\ et pr\'ef\adddot\ par}},
+  byeditortrcoaf   = {{\'edition \'etablie, traduite \lbx@lfromlang, comment\'ee et postfac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, comm\adddot\ et postf\adddot\ par}},
+  byeditortranin   = {{\'edition \'etablie, traduite \lbx@lfromlang, annot\'ee et introduite par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, annot\adddot\ et introd\adddot\ par}},
+  byeditortranfo   = {{\'edition \'etablie, traduite \lbx@lfromlang, annot\'ee et pr\'efac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, annot\adddot\ et pr\'ef\adddot\ par}},
+  byeditortranaf   = {{\'edition \'etablie, traduite \lbx@lfromlang, annot\'ee et postfac\'ee par}%
+                      {\'ed\adddotspace \'etablie, trad\adddot\ \lbx@sfromlang, annot\adddot\ et postf\adddot\ par}},
+  bytranslatorco   = {{traduit \lbx@lfromlang\ et comment\'e par}%
+                      {trad\adddot\ \lbx@sfromlang\ et comm\adddot\ par}},
+  bytranslatoran   = {{traduit \lbx@lfromlang\ et annot\'e par}%
+                      {trad\adddot\ \lbx@sfromlang\ et annot\adddot\ par}},
+  bytranslatorin   = {{traduit \lbx@lfromlang\ et introduit par}%
+                      {trad\adddot\ \lbx@sfromlang\ et introd\adddot\ par}},
+  bytranslatorfo   = {{traduit \lbx@lfromlang\ et pr\'efac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang\ et pr\'ef\adddot\ par}},
+  bytranslatoraf   = {{traduit \lbx@lfromlang\ et postfac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang\ et postf\adddot\ par}},
+  bytranslatorcoin = {{traduit \lbx@lfromlang, comment\'e et introduit par}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ et introd\adddot\ par}},
+  bytranslatorcofo = {{traduit \lbx@lfromlang, comment\'e et pr\'efac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ et pr\'ef\adddot\ par}},
+  bytranslatorcoaf = {{traduit \lbx@lfromlang, comment\'e et postfac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ et postf\adddot\ par}},
+  bytranslatoranin = {{traduit \lbx@lfromlang, annot\'e et introduit par}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ et introd\adddot\ par}},
+  bytranslatoranfo = {{traduit \lbx@lfromlang, annot\'e et pr\'efac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ et pr\'ef\adddot\ par}},
+  bytranslatoranaf = {{traduit \lbx@lfromlang, annot\'e et postfac\'e par}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ et postf\adddot\ par}},
   and              = {{et}{et}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index a463ce1626f..430c5a2057f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -1,12 +1,14 @@
-% $Id: german.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: german.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: german.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
 % * translations + peer review by native speakers
 
+\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian}
+
 \DeclareBibliographyExtras{%
   \DeclareCapitalPunctuation{.:!?}%
   \protected\def\bibrangedash{%
@@ -38,15 +40,21 @@
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
     \thefield{#1}}%
-  \savecommand\lbx@fromlang
-  \def\lbx@fromlang{%
+  \savecommand\lbx@lfromlang
+  \savecommand\lbx@sfromlang
+  \def\lbx@lfromlang{%
+    \iffieldundef{origlanguage}
+      {}
+      {\bibstring{from\thefield{origlanguage}}\space}}%
+  \def\lbx@sfromlang{%
     \iffieldundef{origlanguage}
       {}
       {\bibstring{from\thefield{origlanguage}}\space}}%
 }
 
 \UndeclareBibliographyExtras{%
-  \restorecommand\lbx@fromlang
+  \restorecommand\lbx@lfromlang
+  \restorecommand\lbx@sfromlang
 }
 
 \DeclareBibliographyStrings{%
@@ -219,7 +227,7 @@
   byfounder        = {{begr\"undet von}{begr\adddotspace von}},
   bycontinuator    = {{fortgef\"urt von}{fortgef\adddotspace von}},
   bycollaborator   = {{unter Mitarbeit von}{unter Mitarb\adddotspace von}},
-  bytranslator     = {{\lbx@fromlang \"ubersetzt von}{\lbx@fromlang \"ubers\adddot\ von}},
+  bytranslator     = {{\lbx@lfromlang \"ubersetzt von}{\lbx@sfromlang \"ubers\adddot\ von}},
   bycommentator    = {{kommentiert von}{komm\adddot\ von}},
   byannotator      = {{erl\"autert von}{erl\"aut\adddot\ von}},
   withcommentator  = {{mit einem Kommentar von}{mit einem Komm\adddot\ von}},
@@ -227,8 +235,8 @@
   withintroduction = {{mit einer Einleitung von}{mit einer Einl\adddot\ von}},
   withforeword     = {{mit einem Vorwort von}{mit einem Vorw\adddot\ von}},
   withafterword    = {{mit einem Nachwort von}{mit einem Nachw\adddot\ von}},
-  byeditortr       = {{herausgegeben und \lbx@fromlang \"ubersetzt von}%
-                      {hrsg\adddotspace und \lbx@fromlang \"ubers\adddot\ von}},
+  byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                      {hrsg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
   byeditorco       = {{herausgegeben und kommentiert von}%
                       {hrsg\adddotspace und komm\adddot\ von}},
   byeditoran       = {{herausgegeben und erl\"autert von}%
@@ -239,16 +247,16 @@
                       {hrsg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
   byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
                       {hrsg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-  byeditortrco     = {{herausgegeben, \lbx@fromlang \"ubersetzt und kommentiert von}%
-                      {hrsg., \lbx@fromlang \"ubers\adddot\ und komm\adddot\ von}},
-  byeditortran     = {{herausgegeben, \lbx@fromlang \"ubersetzt und erl\"autert von}%
-                      {hrsg., \lbx@fromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-  byeditortrin     = {{herausgegeben, \lbx@fromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  byeditortrfo     = {{herausgegeben, \lbx@fromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  byeditortraf     = {{herausgegeben, \lbx@fromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                      {hrsg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                      {hrsg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
   byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
                       {hrsg., komm\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
   byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
@@ -261,40 +269,40 @@
                       {hrsg., erl\"aut\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
   byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
                       {hrsg., erl\"aut\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-  byeditortrcoin   = {{herausgegeben, \lbx@fromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., komm\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  byeditortrcofo   = {{herausgegeben, \lbx@fromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., komm\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  byeditortrcoaf   = {{herausgegeben, \lbx@fromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-  byeditortranin   = {{herausgegeben, \lbx@fromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  byeditortranfo   = {{herausgegeben, \lbx@fromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  byeditortranaf   = {{herausgegeben, \lbx@fromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hrsg., \lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-  bytranslatorco   = {{\lbx@fromlang \"ubersetzt und kommentiert von}%
-                      {\lbx@fromlang \"ubers\adddot\ und komm\adddot\ von}},
-  bytranslatoran   = {{\lbx@fromlang \"ubersetzt und erl\"autert von}%
-                      {\lbx@fromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-  bytranslatorin   = {{\lbx@fromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                      {\lbx@fromlang \"ubers\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  bytranslatorfo   = {{\lbx@fromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                      {\lbx@fromlang \"ubers\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  bytranslatoraf   = {{\lbx@fromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                      {\lbx@fromlang \"ubers\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-  bytranslatorcoin = {{\lbx@fromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                      {\lbx@fromlang \"ubers., komm\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  bytranslatorcofo = {{\lbx@fromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                      {\lbx@fromlang \"ubers., komm\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  bytranslatorcoaf = {{\lbx@fromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                      {\lbx@fromlang \"ubers., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-  bytranslatoranin = {{\lbx@fromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                      {\lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
-  bytranslatoranfo = {{\lbx@fromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                      {\lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
-  bytranslatoranaf = {{\lbx@fromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {\lbx@fromlang \"ubers., erl\"aut\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., komm\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., komm\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                      {hrsg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  bytranslatorco   = {{\lbx@lfromlang \"ubersetzt und kommentiert von}%
+                      {\lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  bytranslatoran   = {{\lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                      {\lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  bytranslatorin   = {{\lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                      {\lbx@sfromlang \"ubers\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  bytranslatorfo   = {{\lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                      {\lbx@sfromlang \"ubers\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  bytranslatoraf   = {{\lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                      {\lbx@sfromlang \"ubers\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  bytranslatorcoin = {{\lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                      {\lbx@sfromlang \"ubers., komm\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  bytranslatorcofo = {{\lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                      {\lbx@sfromlang \"ubers., komm\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  bytranslatorcoaf = {{\lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                      {\lbx@sfromlang \"ubers., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  bytranslatoranin = {{\lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                      {\lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einer Einl\adddot\ vers\adddot\ von}},
+  bytranslatoranfo = {{\lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                      {\lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einem Vorw\adddot\ vers\adddot\ von}},
+  bytranslatoranaf = {{\lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                      {\lbx@sfromlang \"ubers., erl\"aut\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
   and              = {{und}{und}},
   andothers        = {{u.\,a\adddot}{u.\,a\adddot}},
   andmore          = {{u.\,a\adddot}{u.\,a\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 6f89a47df69..b0c954cf058 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -1,7 +1,7 @@
-% $Id: greek.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
@@ -18,28 +18,15 @@
 
 % This file requires UTF-8 support!
 
-\ifundef\XeTeXrevision
-  {\ifundef\@inpenc@undefined
-     {\@firstofone}
-     {\begingroup
-      \ifundef\inputencodingname % inputenc >= 2006/05/05 v1.1b, inputenx
-        {\def\@inpenc@undefined@#1{\def\inputencodingname{#1}}%
-	 \@inpenc@undefined}
-	{}%
-      \ifdefstring\inputencodingname{utf8x} % ucs
-	 {\aftergroup\@gobble}
-	 {\ifdefstring\inputencodingname{utf8}
-	     {\aftergroup\@gobble}
-	     {\aftergroup\@firstofone}}%
-      \endgroup}}
-  {\@gobble}
-{\PackageError{biblatex}
-   {Greek requires UTF-8 support}
-   {The 'greek.lbx' file requires UTF-8 encoding but you
-    seem\MessageBreak to be using a different encoding.
-    This is a fatal error. I will\MessageBreak abort loading
-    greek.lbx now.}%
- \endinput}
+\lbx@ifutfinput
+  {}
+  {\PackageError{biblatex}
+     {Greek requires UTF-8 support}
+     {The 'greek.lbx' file requires UTF-8 encoding but you
+      seem\MessageBreak to be using a different encoding.
+      This is a fatal error. I will\MessageBreak abort loading
+      greek.lbx now.}%
+   \endinput}
 
 \NewBibliographyString{%
   datejanuary,
@@ -56,6 +43,8 @@
   datedecember%
 }
 
+\DeclareRedundantLanguages{greek}{greek}
+
 \DeclareBibliographyExtras{%
   \DeclareCapitalPunctuation{.!;?}%
   \let\finalandcomma=\empty
@@ -66,24 +55,8 @@
   \protected\def\mkbibordinal{\mkbibmascord}%
   \protected\def\mkbibmascord#1{\stripzeros{#1}ος}%
   \protected\def\mkbibfemord#1{\stripzeros{#1}η}%
-  \protected\def\mkbibdatemonth#1{%
-    \ifcase0#1\relax
-      #1\BibliographyWarning{Month out of range}%
-    \or\bibstring{datejanuary}%
-    \or\bibstring{datefebruary}%
-    \or\bibstring{datemarch}%
-    \or\bibstring{dateapril}%
-    \or\bibstring{datemay}%
-    \or\bibstring{datejune}%
-    \or\bibstring{datejuly}%
-    \or\bibstring{dateaugust}%
-    \or\bibstring{dateseptember}%
-    \or\bibstring{dateoctober}%
-    \or\bibstring{datenovember}%
-    \or\bibstring{datedecember}%
-    \else
-      #1\BibliographyWarning{Month out of range}%
-    \fi}%
+  \savecommand\mkbibmonth
+  \let\mkbibmonth\lbx@gr@mkbibmonth
   \protected\def\mkbibdatelong#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -111,6 +84,7 @@
 }
 
 \UndeclareBibliographyExtras{%
+  \restorecommand\mkbibmonth
   \restorecommand\mkbibordedition
   \restorecommand\mkbibordseries
 }
@@ -285,7 +259,7 @@
   byfounder        = {{αρχική δημιουργία από}{αρχική δημιουργία από}}
   bycontinuator    = {{συνέχεια από}{συνέχεια από}}
   bycollaborator   = {{συνεργασία από}{συνεργασία από}}
-  bytranslator     = {{μετάφραση \lbx@fromlang\ υπό}{μετάφραση \lbx@fromlang\ υπό}},
+  bytranslator     = {{μετάφραση \lbx@lfromlang\ υπό}{μετάφραση \lbx@sfromlang\ υπό}},
   bycommentator    = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}},
   byannotator      = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}},
   withcommentator  = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}}
@@ -493,4 +467,23 @@
   annotation       = {{σχολιασμοί}{σχολιασμοί}},
 }
 
+\protected\def\lbx@gr@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx@bibmonth{datejanuary}%
+  \or\abx@bibmonth{datefebruary}%
+  \or\abx@bibmonth{datemarch}%
+  \or\abx@bibmonth{dateapril}%
+  \or\abx@bibmonth{datemay}%
+  \or\abx@bibmonth{datejune}%
+  \or\abx@bibmonth{datejuly}%
+  \or\abx@bibmonth{dateaugust}%
+  \or\abx@bibmonth{dateseptember}%
+  \or\abx@bibmonth{dateoctober}%
+  \or\abx@bibmonth{datenovember}%
+  \or\abx@bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 71bd4dd46e8..d9f8590abb4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -1,13 +1,15 @@
-% $Id: italian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: italian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: italian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * existing translations by a native speaker
 % * peer review pending
 
+\DeclareRedundantLanguages{italian}{italian}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -151,7 +153,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{tradotto \lbx@fromlang\ da}{trad\adddot\ \lbx@fromlang\ da}},
+  bytranslator     = {{tradotto \lbx@lfromlang\ da}{trad\adddot\ \lbx@sfromlang\ da}},
   bycommentator    = {{commentato da}{comm\adddot\ da}},
   byannotator      = {{annotato da}{annot\adddot\ da}},
   withcommentator  = {{con commenti di}{con comm\adddot\ di}},
@@ -159,8 +161,8 @@
   withintroduction = {{con introduzione di}{con introd\adddot\ di}},
   withforeword     = {{con prefazione di}{con pref\adddot\ di}},
   withafterword    = {{con postfazione di}{con postf\adddot\ di}},
-  byeditortr       = {{curato e tradotto \lbx@fromlang\ da}%
-                      {cur\adddotspace e trad\adddot\ \lbx@fromlang\ da}},
+  byeditortr       = {{curato e tradotto \lbx@lfromlang\ da}%
+                      {cur\adddotspace e trad\adddot\ \lbx@sfromlang\ da}},
   byeditorco       = {{curato e commentato da}%
                       {cur\adddotspace e comm\adddot\ da}},
   byeditoran       = {{curato e annotato da}%
@@ -171,16 +173,16 @@
                       {a cura e con pref\adddot\ di}},
   byeditoraf       = {{a cura e con postfazione di}%
                       {a cura e con postf\adddot\ di}},
-  byeditortrco     = {{curato, tradotto \lbx@fromlang\ e commentato da}%
-                      {cur.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e comm\adddot\ da}},
-  byeditortran     = {{curato, tradotto \lbx@fromlang\ e annotato da}%
-                      {cur.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e annot\adddot\ da}},
-  byeditortrin     = {{edizione, traduzione \lbx@fromlang\ e introduzione di}%
-                      {ed., trad\adddot\ \lbx@fromlang\ e introd\adddot\ di}},
-  byeditortrfo     = {{edizione, traduzione \lbx@fromlang\ e prefazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang\ e pref\adddot\ di}},
-  byeditortraf     = {{edizione, traduzione \lbx@fromlang\ e postfazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang\ e postf\adddot\ di}},
+  byeditortrco     = {{curato, tradotto \lbx@lfromlang\ e commentato da}%
+                      {cur.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e comm\adddot\ da}},
+  byeditortran     = {{curato, tradotto \lbx@lfromlang\ e annotato da}%
+                      {cur.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e annot\adddot\ da}},
+  byeditortrin     = {{edizione, traduzione \lbx@lfromlang\ e introduzione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang\ e introd\adddot\ di}},
+  byeditortrfo     = {{edizione, traduzione \lbx@lfromlang\ e prefazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang\ e pref\adddot\ di}},
+  byeditortraf     = {{edizione, traduzione \lbx@lfromlang\ e postfazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang\ e postf\adddot\ di}},
   byeditorcoin     = {{edizione, commenti e introduzione di}%
                       {ed., comm\adddot\ e introduzione di}},
   byeditorcofo     = {{edizione, commenti e prefazione di}%
@@ -193,40 +195,40 @@
                       {ed., annot\adddot\ e prefazione di}},
   byeditoranaf     = {{edizione, annotazioni e postfazione di}%
                       {ed., annot\adddot\ e postfazione di}},
-  byeditortrcoin   = {{edizione, traduzione \lbx@fromlang, commenti e introduzione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, comm\adddot\ e introd\adddot\ di}},
-  byeditortrcofo   = {{edizione, traduzione \lbx@fromlang, commenti e prefazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, comm\adddot\ e pref\adddot\ di}},
-  byeditortrcoaf   = {{edizione, traduzione \lbx@fromlang, commenti e postfazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, comm\adddot\ e postf\adddot\ di}},
-  byeditortranin   = {{edizione, traduzione \lbx@fromlang, annotazioni e introduzione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, annot\adddot\ e introd\adddot\ di}},
-  byeditortranfo   = {{edizione, traduzione \lbx@fromlang, annotazioni e prefazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, annot\adddot\ e pref\adddot\ di}},
-  byeditortranaf   = {{edizione, traduzione \lbx@fromlang, annotazioni e postfazione di}%
-                      {ed., trad\adddot\ \lbx@fromlang, annot\adddot\ e postf\adddot\ di}},
-  bytranslatorco   = {{tradotto \lbx@fromlang\ e commentato da}%
-                      {trad\adddot\ \lbx@fromlang\ e comm\adddot\ da}},
-  bytranslatoran   = {{tradotto \lbx@fromlang\ e annotato da}%
-                      {trad\adddot\ \lbx@fromlang\ e annot\adddot\ da}},
-  bytranslatorin   = {{traduzione \lbx@fromlang\ e introduzione di}%
-                      {trad\adddot\ \lbx@fromlang\ e introd\adddot\ di}},
-  bytranslatorfo   = {{traduzione \lbx@fromlang\ e prefazione di}%
-                      {trad\adddot\ \lbx@fromlang\ e pref\adddot\ di}},
-  bytranslatoraf   = {{traduzione \lbx@fromlang\ e postfazione di}%
-                      {trad\adddot\ \lbx@fromlang\ e postf\adddot\ di}},
-  bytranslatorcoin = {{traduzione \lbx@fromlang, commenti e introduzione di}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ e introd\adddot\ di}},
-  bytranslatorcofo = {{traduzione \lbx@fromlang, commenti e prefazione di}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ e pref\adddot\ di}},
-  bytranslatorcoaf = {{traduzione \lbx@fromlang, commenti e postfazione di}%
-                      {trad\adddot\ \lbx@fromlang, comm\adddot\ e postf\adddot\ di}},
-  bytranslatoranin = {{traduzione \lbx@fromlang, annotazioni e introduzione di}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ e introd\adddot\ di}},
-  bytranslatoranfo = {{traduzione \lbx@fromlang, annotazioni e prefazione di}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ e pref\adddot\ di}},
-  bytranslatoranaf = {{traduzione \lbx@fromlang, annotazioni e postfazione di}%
-                      {trad\adddot\ \lbx@fromlang, annot\adddot\ e postf\adddot\ di}},
+  byeditortrcoin   = {{edizione, traduzione \lbx@lfromlang, commenti e introduzione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, comm\adddot\ e introd\adddot\ di}},
+  byeditortrcofo   = {{edizione, traduzione \lbx@lfromlang, commenti e prefazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, comm\adddot\ e pref\adddot\ di}},
+  byeditortrcoaf   = {{edizione, traduzione \lbx@lfromlang, commenti e postfazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, comm\adddot\ e postf\adddot\ di}},
+  byeditortranin   = {{edizione, traduzione \lbx@lfromlang, annotazioni e introduzione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, annot\adddot\ e introd\adddot\ di}},
+  byeditortranfo   = {{edizione, traduzione \lbx@lfromlang, annotazioni e prefazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, annot\adddot\ e pref\adddot\ di}},
+  byeditortranaf   = {{edizione, traduzione \lbx@lfromlang, annotazioni e postfazione di}%
+                      {ed., trad\adddot\ \lbx@sfromlang, annot\adddot\ e postf\adddot\ di}},
+  bytranslatorco   = {{tradotto \lbx@lfromlang\ e commentato da}%
+                      {trad\adddot\ \lbx@sfromlang\ e comm\adddot\ da}},
+  bytranslatoran   = {{tradotto \lbx@lfromlang\ e annotato da}%
+                      {trad\adddot\ \lbx@sfromlang\ e annot\adddot\ da}},
+  bytranslatorin   = {{traduzione \lbx@lfromlang\ e introduzione di}%
+                      {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ di}},
+  bytranslatorfo   = {{traduzione \lbx@lfromlang\ e prefazione di}%
+                      {trad\adddot\ \lbx@sfromlang\ e pref\adddot\ di}},
+  bytranslatoraf   = {{traduzione \lbx@lfromlang\ e postfazione di}%
+                      {trad\adddot\ \lbx@sfromlang\ e postf\adddot\ di}},
+  bytranslatorcoin = {{traduzione \lbx@lfromlang, commenti e introduzione di}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ e introd\adddot\ di}},
+  bytranslatorcofo = {{traduzione \lbx@lfromlang, commenti e prefazione di}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ e pref\adddot\ di}},
+  bytranslatorcoaf = {{traduzione \lbx@lfromlang, commenti e postfazione di}%
+                      {trad\adddot\ \lbx@sfromlang, comm\adddot\ e postf\adddot\ di}},
+  bytranslatoranin = {{traduzione \lbx@lfromlang, annotazioni e introduzione di}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ e introd\adddot\ di}},
+  bytranslatoranfo = {{traduzione \lbx@lfromlang, annotazioni e prefazione di}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ e pref\adddot\ di}},
+  bytranslatoranaf = {{traduzione \lbx@lfromlang, annotazioni e postfazione di}%
+                      {trad\adddot\ \lbx@sfromlang, annot\adddot\ e postf\adddot\ di}},
   and              = {{e}{e}},
   andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index c9c60b17804..9885ffcaa48 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
@@ -1,7 +1,7 @@
-% $Id: naustrian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index d26260128c8..078482f57aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
@@ -1,7 +1,7 @@
-% $Id: newzealand.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index ef85b1294b9..711b13d6db3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
@@ -1,7 +1,7 @@
-% $Id: ngerman.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index 955a3ac000f..1f699a3be89 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
@@ -1,7 +1,7 @@
-% $Id: norsk.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index f1695768afa..f54e373023e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -1,13 +1,15 @@
-% $Id: norwegian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: norwegian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: norwegian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * existing translations by a native speaker
 % * peer review pending
 
+\DeclareRedundantLanguages{norwegian}{norsk,nynorsk}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -139,7 +141,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{oversatt \lbx@fromlang\ av}{oversatt \lbx@fromlang\ av}},
+  bytranslator     = {{oversatt \lbx@lfromlang\ av}{oversatt \lbx@sfromlang\ av}},
   bycommentator    = {{kommentert av}{komm\adddot\ av}},
   byannotator      = {{forklart av}{forkl\adddot\ av}}, 
   withcommentator  = {{med en kommentar av}{med en komm\adddot\ av}},
@@ -147,8 +149,8 @@
   withintroduction = {{med en innledning av}{med en innl\adddot\ av}},
   withforeword     = {{med et forord av}{med et forord av}},
   withafterword    = {{med et etterord av}{med et etterord av}},
-  byeditortr       = {{utgitt og oversatt \lbx@fromlang\ av}%
-                      {utg\adddotspace og oversatt \lbx@fromlang\ av}},
+  byeditortr       = {{utgitt og oversatt \lbx@lfromlang\ av}%
+                      {utg\adddotspace og oversatt \lbx@sfromlang\ av}},
   byeditorco       = {{utgitt og kommentert av}%
                       {utg\adddotspace og komm\adddot\ av}},
   byeditoran       = {{utgitt og forklart av}%
@@ -159,16 +161,16 @@
                       {utg\adddotspace og med et forord skrev\adddot\ av}},
   byeditoraf       = {{utgitt og med et etterord skrevet av}%
                       {utg\adddotspace og med et etterord skrev\adddot\ av}},
-  byeditortrco     = {{utgitt, oversatt \lbx@fromlang\ og kommentert av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang\ og komm\adddot\ av}},
-  byeditortran     = {{utgitt, oversatt \lbx@fromlang\ og forklart av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang\ og forkl\adddot\ av}},
-  byeditortrin     = {{utgitt, oversatt \lbx@fromlang\ og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditortrfo     = {{utgitt, oversatt \lbx@fromlang\ og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang\ og med et forord skrev\adddot\ av}},
-  byeditortraf     = {{utgitt, oversatt \lbx@fromlang\ og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang\ og med et etterord skrev\adddot\ av}},
+  byeditortrco     = {{utgitt, oversatt \lbx@lfromlang\ og kommentert av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og komm\adddot\ av}},
+  byeditortran     = {{utgitt, oversatt \lbx@lfromlang\ og forklart av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og forkl\adddot\ av}},
+  byeditortrin     = {{utgitt, oversatt \lbx@lfromlang\ og med en innledning skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med en innl\adddot\ skrev\adddot\ av}},
+  byeditortrfo     = {{utgitt, oversatt \lbx@lfromlang\ og med et forord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med et forord skrev\adddot\ av}},
+  byeditortraf     = {{utgitt, oversatt \lbx@lfromlang\ og med et etterord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med et etterord skrev\adddot\ av}},
   byeditorcoin     = {{utgitt, kommentert og med en innledning skrevet av}%
                       {utg.,\addabbrvspace komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
   byeditorcofo     = {{utgitt, kommentert og med et forord skrevet av}%
@@ -181,40 +183,40 @@
                       {utg.,\addabbrvspace forkl\adddot\ og med et forord skrev\adddot\ av}},
   byeditoranaf     = {{utgitt, forklart og med et etterord skrevet av}%
                       {utg.,\addabbrvspace forkl\adddot\ og med et etterord skrev\adddot\ av}},
-  byeditortrcoin   = {{utgitt, oversatt \lbx@fromlang, kommentert og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditortrcofo   = {{utgitt, oversatt \lbx@fromlang, kommentert og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
-  byeditortrcoaf   = {{utgitt, oversatt \lbx@fromlang, kommentert og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
-  byeditortranin   = {{utgitt, oversatt \lbx@fromlang, forklart og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}}, 
-  byeditortranfo   = {{utgitt, oversatt \lbx@fromlang, forklart og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
-  byeditortranaf   = {{utgitt, oversatt \lbx@fromlang, forklart og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@fromlang, forkl\adddot\ og med et etterord skrev\adddot\ av}}, 
-  bytranslatorco   = {{oversatt \lbx@fromlang\ og kommentert av}%
-                      {oversatt \lbx@fromlang\ og komm\adddot\ av}},
-  bytranslatoran   = {{oversatt \lbx@fromlang\ og forklart av}%
-                      {oversatt \lbx@fromlang\ og forkl\adddot\ av}}, 
-  bytranslatorin   = {{oversatt \lbx@fromlang\ og med en innledning skrevet av}%
-                      {oversatt \lbx@fromlang\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatorfo   = {{oversatt \lbx@fromlang\ og med et forord skrevet av}%
-                      {oversatt \lbx@fromlang\ og med et forord skrev\adddot\ av}},
-  bytranslatoraf   = {{oversatt \lbx@fromlang\ og med et etterord skrevet av}%
-                      {oversatt \lbx@fromlang\ og med et etterord skrev\adddot\ av}},
-  bytranslatorcoin = {{oversatt \lbx@fromlang, kommentert og med en innledning skrevet av}%
-                      {oversatt \lbx@fromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatorcofo = {{oversatt \lbx@fromlang, kommentert og med et forord skrevet av}%
-                      {oversatt \lbx@fromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
-  bytranslatorcoaf = {{oversatt \lbx@fromlang, kommentert og med et etterord skrevet av}%
-                      {oversatt \lbx@fromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
-  bytranslatoranin = {{oversatt \lbx@fromlang, forklart og med en innledning skrevet av}%
-                      {oversatt \lbx@fromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatoranfo = {{oversatt \lbx@fromlang, forklart og med et forord skrevet av}%
-                      {oversatt \lbx@fromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
-  bytranslatoranaf = {{oversatt \lbx@fromlang, forklart og med et etterord skrevet av}%
-                      {oversatt \lbx@fromlang, forkl\adddot\ og med et etterord skrev\adddot\ av}},
+  byeditortrcoin   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med en innledning skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
+  byeditortrcofo   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med et forord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
+  byeditortrcoaf   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med et etterord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
+  byeditortranin   = {{utgitt, oversatt \lbx@lfromlang, forklart og med en innledning skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}}, 
+  byeditortranfo   = {{utgitt, oversatt \lbx@lfromlang, forklart og med et forord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
+  byeditortranaf   = {{utgitt, oversatt \lbx@lfromlang, forklart og med et etterord skrevet av}%
+                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med et etterord skrev\adddot\ av}}, 
+  bytranslatorco   = {{oversatt \lbx@lfromlang\ og kommentert av}%
+                      {oversatt \lbx@sfromlang\ og komm\adddot\ av}},
+  bytranslatoran   = {{oversatt \lbx@lfromlang\ og forklart av}%
+                      {oversatt \lbx@sfromlang\ og forkl\adddot\ av}}, 
+  bytranslatorin   = {{oversatt \lbx@lfromlang\ og med en innledning skrevet av}%
+                      {oversatt \lbx@sfromlang\ og med en innl\adddot\ skrev\adddot\ av}},
+  bytranslatorfo   = {{oversatt \lbx@lfromlang\ og med et forord skrevet av}%
+                      {oversatt \lbx@sfromlang\ og med et forord skrev\adddot\ av}},
+  bytranslatoraf   = {{oversatt \lbx@lfromlang\ og med et etterord skrevet av}%
+                      {oversatt \lbx@sfromlang\ og med et etterord skrev\adddot\ av}},
+  bytranslatorcoin = {{oversatt \lbx@lfromlang, kommentert og med en innledning skrevet av}%
+                      {oversatt \lbx@sfromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
+  bytranslatorcofo = {{oversatt \lbx@lfromlang, kommentert og med et forord skrevet av}%
+                      {oversatt \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
+  bytranslatorcoaf = {{oversatt \lbx@lfromlang, kommentert og med et etterord skrevet av}%
+                      {oversatt \lbx@sfromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
+  bytranslatoranin = {{oversatt \lbx@lfromlang, forklart og med en innledning skrevet av}%
+                      {oversatt \lbx@sfromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
+  bytranslatoranfo = {{oversatt \lbx@lfromlang, forklart og med et forord skrevet av}%
+                      {oversatt \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
+  bytranslatoranaf = {{oversatt \lbx@lfromlang, forklart og med et etterord skrevet av}%
+                      {oversatt \lbx@sfromlang, forkl\adddot\ og med et etterord skrev\adddot\ av}},
   and              = {{og}{og}},
   andothers        = {{bl.\,a\adddot}{bl.\,a\adddot}},
   andmore          = {{og mer}{og mer}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 0314ad7fe10..17b8b1e22e4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -1,7 +1,7 @@
-% $Id: nynorsk.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
index 470eda101b5..e3112d96e06 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
@@ -1,7 +1,7 @@
-% $Id: portuges.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \InheritBibliographyExtras{portuguese}
 \InheritBibliographyStrings{portuguese}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index d517b4b0fff..4881f42b6a9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,12 +1,14 @@
-% $Id: portuguese.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: portuguese.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@lbxid $Id: portuguese.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * initial draft based on brazilian.lbx
 % * needs review by a native speaker from Portugal
 
+\DeclareRedundantLanguages{portuguese}{portuges,brazil}
+
 \InheritBibliographyExtras{brazilian}
 
 \DeclareBibliographyStrings{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 19b5cc191b8..262276be20c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -1,13 +1,15 @@
-% $Id: spanish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: spanish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: spanish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
 % * existing translations by a native speaker
 % * peer review pending
 
+\DeclareRedundantLanguages{spanish}{spanish}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{\mbox{-}}% non-breaking hyphen
   \protected\def\bibdatedash{\bibrangedash}% FIXME: unsure
@@ -164,7 +166,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{traducido \lbx@fromlang\ por}{trad\adddot\ \lbx@fromlang\ por}},
+  bytranslator     = {{traducido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
   bycommentator    = {{comentado por}{com\adddot\ por}},
   byannotator      = {{anotado por}{anot\adddot\ por}},
   withcommentator  = {{con comentario de}{con com\adddot\ de}},
@@ -172,8 +174,8 @@
   withintroduction = {{con introduci\'on de}{con introd\adddot\ de}},
   withforeword     = {{con pr\'ologo de}{con pr\'ol\adddot\ de}},
   withafterword    = {{con ep\'{\i}logo de}{con ep\'{\i}l\adddot\ de}},
-  byeditortr       = {{editado y traducido \lbx@fromlang\ por}%
-                      {ed\adddotspace y trad\adddot\ \lbx@fromlang\ por}},
+  byeditortr       = {{editado y traducido \lbx@lfromlang\ por}%
+                      {ed\adddotspace y trad\adddot\ \lbx@sfromlang\ por}},
   byeditorco       = {{editado y comentado por}%
                       {ed\adddotspace y com\adddot\ por}},
   byeditoran       = {{editado y anotado por}%
@@ -184,16 +186,16 @@
                       {ed\adddotspace y pr\'ol\adddot\ por}},
   byeditoraf       = {{editado y epilogado por}%
                       {ed\adddotspace y epil\adddot\ por}},
-  byeditortrco     = {{editado, traducido \lbx@fromlang\ y comentado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ y com\adddot\ por}},
-  byeditortran     = {{editado, traducido \lbx@fromlang\ y anotado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ y anot\adddot\ por}},
-  byeditortrin     = {{editado, traducido \lbx@fromlang\ e introducido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e introd\adddot\ por}},
-  byeditortrfo     = {{editado, traducido \lbx@fromlang\ y prologado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ y pr\'ol\adddot\ por}},
-  byeditortraf     = {{editado, traducido \lbx@fromlang\ y epilogado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ y epil\adddot\ por}},
+  byeditortrco     = {{editado, traducido \lbx@lfromlang\ y comentado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ y com\adddot\ por}},
+  byeditortran     = {{editado, traducido \lbx@lfromlang\ y anotado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ y anot\adddot\ por}},
+  byeditortrin     = {{editado, traducido \lbx@lfromlang\ e introducido por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}},
+  byeditortrfo     = {{editado, traducido \lbx@lfromlang\ y prologado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ y pr\'ol\adddot\ por}},
+  byeditortraf     = {{editado, traducido \lbx@lfromlang\ y epilogado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ y epil\adddot\ por}},
   byeditorcoin     = {{editado, comentado e introducido por}%
                       {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
   byeditorcofo     = {{editado, comentado y prologado por}%
@@ -206,40 +208,40 @@
                       {ed.,\addabbrvspace anot\adddot\ y pr\'ol\adddot\ por}},
   byeditoranaf     = {{editado, anotado y epilogado por}%
                       {ed.,\addabbrvspace anot\adddot\ y epil\adddot\ por}},
-  byeditortrcoin   = {{editado, traducido \lbx@fromlang, comentado e introducido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ e introd\adddot\ por}},
-  byeditortrcofo   = {{editado, traducido \lbx@fromlang, comentado y prologado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ y pr\'ol\adddot\ por}},
-  byeditortrcoaf   = {{editado, traducido \lbx@fromlang, comentado y epilogado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ y epil\adddot\ por}},
-  byeditortranin   = {{editado, traducido \lbx@fromlang, anotado e introducido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  byeditortranfo   = {{editado, traducido \lbx@fromlang, anotado y prologado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ y pr\'ol\adddot\ por}},
-  byeditortranaf   = {{editado, traducido \lbx@fromlang, anotado y epilogado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ y epil\adddot\ por}},
-  bytranslatorco   = {{traducido \lbx@fromlang\ y comentado por}%
-                      {trad\adddot\ \lbx@fromlang\ y com\adddot\ por}},
-  bytranslatoran   = {{traducido \lbx@fromlang\ y anotado por}%
-                      {trad\adddot\ \lbx@fromlang\ y anot\adddot\ por}},
-  bytranslatorin   = {{traducido \lbx@fromlang\ e introducido por}%
-                      {trad\adddot\ \lbx@fromlang\ e introd\adddot\ por}},
-  bytranslatorfo   = {{traducido \lbx@fromlang\ y prologado por}%
-                      {trad\adddot\ \lbx@fromlang\ y pr\'ol\adddot\ por}},
-  bytranslatoraf   = {{traducido \lbx@fromlang\ y epilogado por}%
-                      {trad\adddot\ \lbx@fromlang\ y epil\adddot\ por}},
-  bytranslatorcoin = {{traducido \lbx@fromlang, comentado e introducido por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ e introd\adddot\ por}},
-  bytranslatorcofo = {{traducido \lbx@fromlang, comentado y prologado por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ y pr\'ol\adddot\ por}},
-  bytranslatorcoaf = {{traducido \lbx@fromlang, comentado y epilogado por}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ y epil\adddot\ por}},
-  bytranslatoranin = {{traducido \lbx@fromlang, anotado e introducido por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
-  bytranslatoranfo = {{traducido \lbx@fromlang, anotado y prologado por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ y pr\'ol\adddot\ por}},
-  bytranslatoranaf = {{traducido \lbx@fromlang, anotado y epilogado por}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ y epil\adddot\ por}},
+  byeditortrcoin   = {{editado, traducido \lbx@lfromlang, comentado e introducido por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+  byeditortrcofo   = {{editado, traducido \lbx@lfromlang, comentado y prologado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ y pr\'ol\adddot\ por}},
+  byeditortrcoaf   = {{editado, traducido \lbx@lfromlang, comentado y epilogado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ y epil\adddot\ por}},
+  byeditortranin   = {{editado, traducido \lbx@lfromlang, anotado e introducido por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+  byeditortranfo   = {{editado, traducido \lbx@lfromlang, anotado y prologado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ y pr\'ol\adddot\ por}},
+  byeditortranaf   = {{editado, traducido \lbx@lfromlang, anotado y epilogado por}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ y epil\adddot\ por}},
+  bytranslatorco   = {{traducido \lbx@lfromlang\ y comentado por}%
+                      {trad\adddot\ \lbx@sfromlang\ y com\adddot\ por}},
+  bytranslatoran   = {{traducido \lbx@lfromlang\ y anotado por}%
+                      {trad\adddot\ \lbx@sfromlang\ y anot\adddot\ por}},
+  bytranslatorin   = {{traducido \lbx@lfromlang\ e introducido por}%
+                      {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}},
+  bytranslatorfo   = {{traducido \lbx@lfromlang\ y prologado por}%
+                      {trad\adddot\ \lbx@sfromlang\ y pr\'ol\adddot\ por}},
+  bytranslatoraf   = {{traducido \lbx@lfromlang\ y epilogado por}%
+                      {trad\adddot\ \lbx@sfromlang\ y epil\adddot\ por}},
+  bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+  bytranslatorcofo = {{traducido \lbx@lfromlang, comentado y prologado por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ y pr\'ol\adddot\ por}},
+  bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado y epilogado por}%
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ y epil\adddot\ por}},
+  bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+  bytranslatoranfo = {{traducido \lbx@lfromlang, anotado y prologado por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ y pr\'ol\adddot\ por}},
+  bytranslatoranaf = {{traducido \lbx@lfromlang, anotado y epilogado por}%
+                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ y epil\adddot\ por}},
   and              = {{y}{y}},
   andothers        = {{y~col\adddot}{y~col\adddot}},
 % andmore          = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index 7fb7f8c6a0a..bb188b66b2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -1,7 +1,7 @@
-% $Id: swedish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@lbxid $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 % STATUS OF THIS FILE
 % * incomplete
@@ -27,6 +27,8 @@
 % "Bibliografiska f\"orkortningar" there (though not a part of the
 % standard).
 
+\DeclareRedundantLanguages{swedish}{swedish}
+
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
@@ -184,7 +186,7 @@
 % byfounder        = {{}{}}, % FIXME: missing
 % bycontinuator    = {{}{}}, % FIXME: missing
 % bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{\"oversatt \lbx@fromlang\ av}{\"overs\adddot\ \lbx@fromlang\ av}},
+  bytranslator     = {{\"oversatt \lbx@lfromlang\ av}{\"overs\adddot\ \lbx@sfromlang\ av}},
   bycommentator    = {{kommenterad av}{kommenterad av}},
   byannotator      = {{f\"orklarad av}{f\"orklarad av}},
   withcommentator  = {{med kommentarer av}{med kommentarer av}},
@@ -192,8 +194,8 @@
   withintroduction = {{med inledning av}{med inl\adddot\ av}},
   withforeword     = {{med f\"orord av}{med f\"orord av}},
   withafterword    = {{med efterord av}{med efterord av}},
-  byeditortr       = {{utgiven och \"oversatt \lbx@fromlang\ av}%
-                      {utg\adddotspace och \"overs\adddot\ \lbx@fromlang\ av}},
+  byeditortr       = {{utgiven och \"oversatt \lbx@lfromlang\ av}%
+                      {utg\adddotspace och \"overs\adddot\ \lbx@sfromlang\ av}},
   byeditorco       = {{utgiven och kommenterad av}%
                       {utg\adddotspace och kommenterad av}},
   byeditoran       = {{utgiven och f\"orklarad av}%
@@ -204,16 +206,16 @@
                       {utg\adddotspace och med f\"orord av}},
   byeditoraf       = {{utgiven och f\"orsedd med efterord av}%
                       {utg\adddotspace och med efterord av}},
-  byeditortrco     = {{utgiven, \"oversatt \lbx@fromlang\ och kommenterad av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang\ och kommenterad av}},
-  byeditortran     = {{utgiven, \"oversatt \lbx@fromlang\ och f\"orklarad av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang\ och f\"orklarad av}},
-  byeditortrin     = {{utgiven, \"oversatt \lbx@fromlang\ och f\"orsedd med inledning av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang\ och med inl\adddot\ av}},
-  byeditortrfo     = {{utgiven, \"oversatt \lbx@fromlang\ och f\"orsedd med f\"orord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang\ och med f\"orord av}},
-  byeditortraf     = {{utgiven, \"oversatt \lbx@fromlang\ och f\"orsedd med efterord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang\ och med efterord av}},
+  byeditortrco     = {{utgiven, \"oversatt \lbx@lfromlang\ och kommenterad av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang\ och kommenterad av}},
+  byeditortran     = {{utgiven, \"oversatt \lbx@lfromlang\ och f\"orklarad av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang\ och f\"orklarad av}},
+  byeditortrin     = {{utgiven, \"oversatt \lbx@lfromlang\ och f\"orsedd med inledning av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang\ och med inl\adddot\ av}},
+  byeditortrfo     = {{utgiven, \"oversatt \lbx@lfromlang\ och f\"orsedd med f\"orord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang\ och med f\"orord av}},
+  byeditortraf     = {{utgiven, \"oversatt \lbx@lfromlang\ och f\"orsedd med efterord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang\ och med efterord av}},
   byeditorcoin     = {{utgiven, kommenterad och f\"orsedd med inledning av}%
                       {utg.,\addabbrvspace kommenterad och med inl\adddot\ av}},
   byeditorcofo     = {{utgiven, kommenterad och f\"orsedd med f\"orord av}%
@@ -226,40 +228,40 @@
                       {utg.,\addabbrvspace f\"orklarad och med f\"orord av}},
   byeditoranaf     = {{utgiven, f\"orklarad och f\"orsedd med efterord av}%
                       {utg.,\addabbrvspace f\"orklarad och med efterord av}},
-  byeditortrcoin   = {{utgiven, \"oversatt \lbx@fromlang, kommenterad och f\"orsedd med inledning av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, kommenterad och med inl\adddot\ av}},
-  byeditortrcofo   = {{utgiven, \"oversatt \lbx@fromlang, kommenterad och f\"orsedd med f\"orord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, kommenterad och med f\"orord av}},
-  byeditortrcoaf   = {{utgiven, \"oversatt \lbx@fromlang, kommenterad och f\"orsedd med efterord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, kommenterad och med efterord av}},
-  byeditortranin   = {{utgiven, \"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med inledning av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, f\"orklarad och med inl\adddot\ av}},
-  byeditortranfo   = {{utgiven, \"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med f\"orord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, f\"orklarad och med f\"orord av}},
-  byeditortranaf   = {{utgiven, \"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med efterord av}%
-                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@fromlang, f\"orklarad och med efterord av}},
-  bytranslatorco   = {{\"oversatt \lbx@fromlang\ och kommenterad av}%
-                      {\"overs\adddot\ \lbx@fromlang\ och kommenterad av}},
-  bytranslatoran   = {{\"oversatt \lbx@fromlang\ och f\"orklarad av}%
-                      {\"overs\adddot\ \lbx@fromlang\ och f\"orklarad av}},
-  bytranslatorin   = {{\"oversatt \lbx@fromlang\ och f\"orsedd med inledning av}%
-                      {\"overs\adddot\ \lbx@fromlang\ och med inl\adddot\ av}},
-  bytranslatorfo   = {{\"oversatt \lbx@fromlang\ och f\"orsedd med f\"orord av}%
-                      {\"overs\adddot\ \lbx@fromlang\ och med f\"orord av}},
-  bytranslatoraf   = {{\"oversatt \lbx@fromlang\ och f\"orsedd med efterord av}%
-                      {\"overs\adddot\ \lbx@fromlang\ och med efterord av}},
-  bytranslatorcoin = {{\"oversatt \lbx@fromlang, kommenterad och f\"orsedd med inledning av}%
-                      {\"overs\adddot\ \lbx@fromlang, kommenterad och med inl\adddot\ av}},
-  bytranslatorcofo = {{\"oversatt \lbx@fromlang, kommenterad och f\"orsedd med f\"ordord av}%
-                      {\"overs\adddot\ \lbx@fromlang, kommenterad och med f\"ordord av}},
-  bytranslatorcoaf = {{\"oversatt \lbx@fromlang, kommenterad och f\"orsedd med efterord av}%
-                      {\"overs\adddot\ \lbx@fromlang, kommenterad och med efterord av}},
-  bytranslatoranin = {{\"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med inledning av}%
-                      {\"overs\adddot\ \lbx@fromlang, f\"orklarad med inledning\ av}},
-  bytranslatoranfo = {{\"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med f\"orord av}%
-                      {\"overs\adddot\ \lbx@fromlang, f\"orklarad med f\"orord av}},
-  bytranslatoranaf = {{\"oversatt \lbx@fromlang, f\"orklarad och f\"orsedd med efterord av}%
-                      {\"overs\adddot\ \lbx@fromlang, f\"orklarad med efterord av}},
+  byeditortrcoin   = {{utgiven, \"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med inledning av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, kommenterad och med inl\adddot\ av}},
+  byeditortrcofo   = {{utgiven, \"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med f\"orord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, kommenterad och med f\"orord av}},
+  byeditortrcoaf   = {{utgiven, \"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med efterord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, kommenterad och med efterord av}},
+  byeditortranin   = {{utgiven, \"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med inledning av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, f\"orklarad och med inl\adddot\ av}},
+  byeditortranfo   = {{utgiven, \"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med f\"orord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, f\"orklarad och med f\"orord av}},
+  byeditortranaf   = {{utgiven, \"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med efterord av}%
+                      {utg.,\addabbrvspace \"overs\adddot\ \lbx@sfromlang, f\"orklarad och med efterord av}},
+  bytranslatorco   = {{\"oversatt \lbx@lfromlang\ och kommenterad av}%
+                      {\"overs\adddot\ \lbx@sfromlang\ och kommenterad av}},
+  bytranslatoran   = {{\"oversatt \lbx@lfromlang\ och f\"orklarad av}%
+                      {\"overs\adddot\ \lbx@sfromlang\ och f\"orklarad av}},
+  bytranslatorin   = {{\"oversatt \lbx@lfromlang\ och f\"orsedd med inledning av}%
+                      {\"overs\adddot\ \lbx@sfromlang\ och med inl\adddot\ av}},
+  bytranslatorfo   = {{\"oversatt \lbx@lfromlang\ och f\"orsedd med f\"orord av}%
+                      {\"overs\adddot\ \lbx@sfromlang\ och med f\"orord av}},
+  bytranslatoraf   = {{\"oversatt \lbx@lfromlang\ och f\"orsedd med efterord av}%
+                      {\"overs\adddot\ \lbx@sfromlang\ och med efterord av}},
+  bytranslatorcoin = {{\"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med inledning av}%
+                      {\"overs\adddot\ \lbx@sfromlang, kommenterad och med inl\adddot\ av}},
+  bytranslatorcofo = {{\"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med f\"ordord av}%
+                      {\"overs\adddot\ \lbx@sfromlang, kommenterad och med f\"ordord av}},
+  bytranslatorcoaf = {{\"oversatt \lbx@lfromlang, kommenterad och f\"orsedd med efterord av}%
+                      {\"overs\adddot\ \lbx@sfromlang, kommenterad och med efterord av}},
+  bytranslatoranin = {{\"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med inledning av}%
+                      {\"overs\adddot\ \lbx@sfromlang, f\"orklarad med inledning\ av}},
+  bytranslatoranfo = {{\"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med f\"orord av}%
+                      {\"overs\adddot\ \lbx@sfromlang, f\"orklarad med f\"orord av}},
+  bytranslatoranaf = {{\"oversatt \lbx@lfromlang, f\"orklarad och f\"orsedd med efterord av}%
+                      {\"overs\adddot\ \lbx@sfromlang, f\"orklarad med efterord av}},
   and              = {{och}{och}},
   % Hedberg uses "et al.", but in an all-Swedish lists "m.fl." may be used
   andothers        = {{m.\,fl\adddot}{m.\,fl\adddot}},