biblatex 1.2a (13feb11)

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

86 files changed, 821 insertions, 374 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 7b8f25b5a50..b1496215540 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 947cdba6613..1db55785b75 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: alphabetic.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 76fe2cb6153..b65c8ee16c3 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 a52b94abbd7..b7e2624dba8 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 8414562b339..49687b7176e 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 2343abfe9ca..293409e9a58 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 597dad3c62a..f7c366e968d 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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
index 762109315db..827f1d529f2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index 938a0388ef8..ae89d6192f6 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{pagetracker}
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 875bdaf7427..aab27d1d6d5 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 518c0e512a5..e92ceb65505 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 513383a4ed6..f66566ac369 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 460661290bd..710609095bb 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireBibliographyStyle{standard}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 51db6407606..1a5c220ab06 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: debug.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{sorting=debug}
 \DeclareFieldFormat{entrykey}{\ttfamily[#1]}
@@ -70,7 +70,7 @@
   \par\nobreak
   \makebox[6em][l]{\ttfamily [#1]}}
 
-\DeclareBibliographyDriver{*}{%
+\DeclareBibliographyDriver{debug}{%
   \item\begingroup\ttfamily\leavevmode
   \xleaders\hbox to 0.75em{\hss-\hss}\hfill\kern\z@
   \space\printfield{entrykey}\space
@@ -87,6 +87,37 @@
   \endgroup
   \clearpage}
 
+\DeclareBibliographyAlias{article}{debug}
+\DeclareBibliographyAlias{book}{debug}
+\DeclareBibliographyAlias{bookinbook}{debug}
+\DeclareBibliographyAlias{booklet}{debug}
+\DeclareBibliographyAlias{collection}{debug}
+\DeclareBibliographyAlias{inbook}{debug}
+\DeclareBibliographyAlias{incollection}{debug}
+\DeclareBibliographyAlias{inproceedings}{debug}
+\DeclareBibliographyAlias{inreference}{debug}
+\DeclareBibliographyAlias{manual}{debug}
+\DeclareBibliographyAlias{misc}{debug}
+\DeclareBibliographyAlias{mvbook}{debug}
+\DeclareBibliographyAlias{mvcollection}{debug}
+\DeclareBibliographyAlias{mvproceedings}{debug}
+\DeclareBibliographyAlias{mvreference}{debug}
+\DeclareBibliographyAlias{online}{debug}
+\DeclareBibliographyAlias{patent}{debug}
+\DeclareBibliographyAlias{periodical}{debug}
+\DeclareBibliographyAlias{proceedings}{debug}
+\DeclareBibliographyAlias{reference}{debug}
+\DeclareBibliographyAlias{report}{debug}
+\DeclareBibliographyAlias{review}{debug}
+\DeclareBibliographyAlias{set}{debug}
+\DeclareBibliographyAlias{shorthands}{debug}
+\DeclareBibliographyAlias{suppbook}{debug}
+\DeclareBibliographyAlias{suppcollection}{debug}
+\DeclareBibliographyAlias{suppperiodical}{debug}
+\DeclareBibliographyAlias{thesis}{debug}
+\DeclareBibliographyAlias{unpublished}{debug}
+\DeclareBibliographyAlias{*}{debug}
+
 \DeclareBibliographyDriver{shorthands}{%
   \texttt{\printfield{entrykey}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index 50c4a5e1762..fe4eef8d288 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: draft.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 5969f70c686..9f8cf56e447 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 cf2870463aa..bdc8bb474a8 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 e3e9c0566cb..9fa87734615 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelnumber}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index a4968857f83..bea9d4a2c05 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: reading.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 ae5656c7a25..76ab28ce00a 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: standard.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \newtoggle{bbx:isbn}
 \newtoggle{bbx:url}
@@ -613,15 +613,17 @@
   \usebibmacro{setpageref}%
   \finentry}
 
-\DeclareBibliographyAlias{books}{book}
+\DeclareBibliographyAlias{mvbook}{book}
 \DeclareBibliographyAlias{bookinbook}{inbook}
-\DeclareBibliographyAlias{collections}{collection}
-\DeclareBibliographyAlias{reference}{collection}
-\DeclareBibliographyAlias{inreference}{incollection}
-\DeclareBibliographyAlias{review}{article}
 \DeclareBibliographyAlias{suppbook}{inbook}
+\DeclareBibliographyAlias{mvcollection}{collection}
 \DeclareBibliographyAlias{suppcollection}{incollection}
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+\DeclareBibliographyAlias{reference}{collection}
+\DeclareBibliographyAlias{mvreference}{reference}
+\DeclareBibliographyAlias{inreference}{incollection}
 \DeclareBibliographyAlias{suppperiodical}{article}
+\DeclareBibliographyAlias{review}{article}
 \DeclareBibliographyAlias{*}{misc}
 
 \newbibmacro*{maintitle+title}{%
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 4a8c3ef4f4a..bd5b788c814 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 24efe50153d..e607ef30c49 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-inote.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 e61ce198992..9cd4ca9d9b7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-note.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 daea3f3c18a..4061f108b79 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 1ffa2a99dd6..84520444b05 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 02f6970ee27..0f9ef96429d 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 edbd0f3f805..460f583d4ec 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index ea6cb793e6e..3c2c93676f4 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: biblatex.cfg,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{biblatex.cfg}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index bdafa671adf..36f149d3b65 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -681,6 +681,9 @@
 \DeclareNameAlias{withforeword}{default}
 \DeclareNameAlias{withafterword}{default}
 
+\DeclareFieldFormat{authortype}{#1}
+\DeclareFieldFormat{editortype}{#1}
+
 % Auxiliary macros for name formatting directives
 % ------------------------------------------------------------------
 
@@ -1128,6 +1131,105 @@
 }
 
 % ------------------------------------------------------------------
+% DATA INHERITANCE (CROSSREF)
+% ------------------------------------------------------------------
+
+\DefaultInheritance{all=true,override=false}
+
+\DeclareDataInheritance{mvbook,book}{inbook,bookinbook,suppbook}{%
+  \inherit{author}{author}
+  \inherit{author}{bookauthor}
+}
+
+\DeclareDataInheritance{mvbook}{book,inbook,bookinbook,suppbook}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{mvcollection,mvreference}
+{collection,reference,incollection,inreference,suppcollection}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{mvproceedings}{proceedings,inproceedings}{%
+  \inherit{title}{maintitle}
+  \inherit{subtitle}{mainsubtitle}
+  \inherit{titleaddon}{maintitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{book}{inbook,bookinbook,suppbook}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{collection,reference}
+{incollection,inreference,suppcollection}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{proceedings}{inproceedings}{%
+  \inherit{title}{booktitle}
+  \inherit{subtitle}{booksubtitle}
+  \inherit{titleaddon}{booktitleaddon}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{periodical}{article,suppperiodical}{%
+  \inherit{title}{journaltitle}
+  \inherit{subtitle}{journalsubtitle}
+  \noinherit{shorttitle}
+  \noinherit{sorttitle}
+  \noinherit{indextitle}
+  \noinherit{indexsorttitle}
+}
+
+\DeclareDataInheritance{*}{*}{%
+  \noinherit{crossref}
+  \noinherit{xref}
+  \noinherit{entryset}
+  \noinherit{entrysubtype}
+  \noinherit{execute}
+  \noinherit{label}
+  \noinherit{options}
+  \noinherit{presort}
+  \noinherit{related}
+  \noinherit{relatedstring}
+  \noinherit{relatedtype}
+  \noinherit{shorthand}
+  \noinherit{shorthandintro}
+  \noinherit{sortkey}
+}
+
+% ------------------------------------------------------------------
 % MACROS FOR LBX FILES
 % ------------------------------------------------------------------
 
@@ -1773,30 +1875,36 @@
 \newbibmacro*{authorstrg}{%
   \iffieldundef{authortype}
     {}
-    {\ifboolexpr{
-       test {\ifnumgreater{\value{author}}{1}}
-       or
-       test {\ifandothers{author}}
-     }
-       {\bibstring{\thefield{authortype}s}}
-       {\bibstring{\thefield{authortype}}}}}
+    {\printtext[authortype]{%
+       \ifbibxstring{\thefield{authortype}}
+	 {\ifboolexpr{
+	    test {\ifnumgreater{\value{author}}{1}}
+	    or
+	    test {\ifandothers{author}}
+	  }
+	    {\bibstring{\thefield{authortype}s}}
+	    {\bibstring{\thefield{authortype}}}}
+	 {\thefield{authortype}}}}}
 
 \newbibmacro*{editorstrg}{%
-  \iffieldundef{editortype}
-    {\ifboolexpr{
-       test {\ifnumgreater{\value{editor}}{1}}
-       or
-       test {\ifandothers{editor}}
-     }
-       {\bibstring{editors}}
-       {\bibstring{editor}}}
-    {\ifboolexpr{
-       test {\ifnumgreater{\value{editor}}{1}}
-       or
-       test {\ifandothers{editor}}
-     }
-       {\bibstring{\thefield{editortype}s}}
-       {\bibstring{\thefield{editortype}}}}}
+  \printtext[editortype]{%
+    \iffieldundef{editortype}
+      {\ifboolexpr{
+	 test {\ifnumgreater{\value{editor}}{1}}
+	 or
+	 test {\ifandothers{editor}}
+       }
+	 {\bibstring{editors}}
+	 {\bibstring{editor}}}
+      {\ifbibxstring{\thefield{editortype}}
+	 {\ifboolexpr{
+	    test {\ifnumgreater{\value{editor}}{1}}
+	    or
+	    test {\ifandothers{editor}}
+	  }
+	    {\bibstring{\thefield{editortype}s}}
+	    {\bibstring{\thefield{editortype}}}}
+	 {\thefield{editortype}}}}}
 
 \newbibmacro*{editor+othersstrg}{%
   \iffieldundef{editortype}
@@ -1837,8 +1945,7 @@
            \appto\abx@tempb{\clearname{afterword}}}
           {}}}%
   \ifbibxstring{\abx@tempa}
-    {\bibstring{\abx@tempa}%
-     \abx@tempb}
+    {\printtext[editortype]{\bibstring{\abx@tempa}}\abx@tempb}
     {\usebibmacro{editorstrg}}}
 
 \newbibmacro*{translatorstrg}{%
@@ -1956,7 +2063,9 @@
 \newbibmacro*{bytypestrg}[2]{%
   \iffieldundef{#1type}
     {\bibstring{by#2}}
-    {\bibstring{by\thefield{#1type}}}}
+    {\ifbibxstring{by\thefield{#1type}}
+       {\bibstring{by\thefield{#1type}}}
+       {\printtext{\thefield{#1type}}}}}
 
 \newbibmacro*{byeditor+othersstrg}{%
   \iffieldundef{editortype}
@@ -1985,8 +2094,7 @@
            \appto\abx@tempb{\clearname{afterword}}}
           {}}}%
   \ifbibxstring{\abx@tempa}
-    {\bibstring{\abx@tempa}%
-     \abx@tempb}
+    {\printtext{\bibstring{\abx@tempa}}\abx@tempb}
     {\usebibmacro{bytypestrg}{editor}{editor}}}
 
 \newbibmacro*{bytranslator+othersstrg}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 61a6ae51e73..fb6d3810573 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: biblatex.sty,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 % Copyright (c) 2006-2011 Philipp Lehman.
 %
@@ -21,11 +21,11 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.1b 2011/02/04 11:36:21 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.2a 2011/02/13 12:05:37 lehman stable $
  programmable bibliographies]
 
 \def\blx@bblversion$#1: #2 ${#2}
-\edef\blx@bblversion{\blx@bblversion$Revision: 1.1 $}
+\edef\blx@bblversion{\blx@bblversion$Revision: 1.2 $}
 
 %% Dependencies
 
@@ -504,7 +504,19 @@
     {\expandafter\expandafter\expandafter\docsvlist
      \expandafter\expandafter\expandafter{%
        \csname abx@field@#1\endcsname}}}
-\blx@regimc\docsvfield
+
+% {<handler>}{<field>} => <handler>{<item1>}<handler>{<item2>}...
+
+\def\blx@imc@forcsvfield#1#2{%
+  \blx@imc@iffieldundef{#2}
+    {}
+    {\expandafter\expandafter\expandafter\blx@imc@forcsvfield@i
+     \expandafter\expandafter\expandafter{%
+       \csname abx@field@#2\endcsname}{#1}}}
+
+\def\blx@imc@forcsvfield@i#1#2{\forcsvlist{#2}{#1}}
+
+\blx@regimcs{\docsvfield \forcsvfield}
 
 % {<list>|<listmacro>}
 
@@ -570,7 +582,8 @@
   \abx@hook@xsanitize
   \def\blx@tempa{\endgroup#1}%
   \edef\blx@tempb{#2}%
-  \let\do\@makeother\dospecials
+  \let\do\@makeother
+  \dospecials
   \catcode`\<=\active
   \catcode`\>=\active
   \catcode`\&=\active
@@ -615,18 +628,20 @@
   \fi}
 
 \def\blx@auxinit@bibtex#1{%
-  \blx@auxwrite\blx@auxout@bibtex{}{%
-    \ifx\blx@auxout@bibtex\@mainaux
-    \else
-      \blx@msg@aux
-    \fi
-    \string\bibstyle{biblatex}\blx@nl
-    \string\bibdata{%
-      \blx@ctrlfile\blxauxsuffix
-      \expandafter\ifblank\expandafter{#1}
-	{}
-	{,#1}}\blx@nl
-    \string\citation{biblatex-control}}}
+  \blx@auxwrite\blx@auxout@bibtex
+    {\def\do##1{,\blx@stripbib{##1}}}
+    {\ifx\blx@auxout@bibtex\@mainaux
+     \else
+       \blx@msg@aux
+     \fi
+     \string\bibstyle{biblatex}\blx@nl
+     \string\bibdata{%
+       \blx@ctrlfile\blxauxsuffix
+       \ifx#1\@empty
+       \else
+         \dolistloop#1%
+       \fi}\blx@nl
+     \string\citation{biblatex-control}}}
 
 % {<file>}{<signature>}{<true>}{<false>}
 
@@ -951,13 +966,20 @@
 \let\blx@list@inactive\@empty
 \listeadd\blx@list@inactive{\jobname}
 
+\protected\def\blx@regbibfiles#1#2{%
+  \forlistloop{\blx@regbibfile{#1}}{#2}}
+
 \def\blx@regbibfile#1#2{%
-  \ifinlistcs{#2.bib}{blx@list@bibfiles@#1}
-    {}
-    {\listcsxadd{blx@list@bibfiles@#1}{#2.bib}}}
+  \ifcsundef{blx@res@loca@#2}
+    {\blx@regbibfile@i{#1}{#2}}
+    {\ifcsstring{blx@res@loca@#2}{local}
+       {\blx@regbibfile@i{#1}{#2}}
+       {}}}
 
-\def\blx@regbibfiles#1#2{%
-  \blx@xsanitizeafter{\forcsvlist{\blx@regbibfile{#1}}}{#2}}
+\def\blx@regbibfile@i#1#2{%
+  \ifinlistcs{#2}{blx@list@bibfiles@#1}
+    {}
+    {\listcsxadd{blx@list@bibfiles@#1}{#2}}}
 
 \def\blx@check@logreq{%
   \begingroup
@@ -1695,28 +1717,31 @@
 \newrobustcmd*{\InitializeBibliographyStyle}{\appto\blx@hook@bbxinit}
 \@onlypreamble\InitializeBibliographyStyle
 
-% {<type>}{<driverdef>}
+% {<entry type>}{<driverdef>}
 
 \newrobustcmd*{\DeclareBibliographyDriver}[1]{%
   \long\csdef{blx@bbx@#1}}
 \@onlypreamble\DeclareBibliographyDriver
 
+% {<entry type>}
+
 \def\blx@driver#1{%
-  \ifcsundef{blx@bbx@#1}
-    {\ifcsundef{blx@bbx@*}
+  \ifcsdef{blx@bbx@#1}
+    {\csuse{blx@bbx@#1}}
+    {\ifcsdef{blx@bbx@*}
        {\blx@warning{%
-	  No driver for entry type '\abx@field@entrytype'}}
-       {\csuse{blx@bbx@*}}}
-    {\csuse{blx@bbx@#1}}}
+          No driver for entry type '#1'.\MessageBreak
+	  Using fallback driver}%
+        \csuse{blx@bbx@*}}
+       {\blx@error
+          {No driver found}
+	  {I can't find a driver for the entry type
+	   '\abx@field@entrytype'\MessageBreak
+	   and there is no fallback driver either}}}}
 
 % {<type>}{<true>}{<false>}
 
-\def\blx@ifdriver#1{%
-  \ifcsundef{blx@bbx@#1}
-    {\ifcsundef{blx@bbx@*}
-       {\@secondoftwo}
-       {\@firstoftwo}}
-    {\@firstoftwo}}
+\def\blx@imc@ifdriver#1{\ifcsdef{blx@bbx@#1}}
 
 % {<alias>}{<type>}
 
@@ -2174,6 +2199,40 @@
           \expandafter\@secondoftwo
         \fi}}}
 
+% {<category>}{<true>}{<false>}
+
+\protected\def\blx@imc@ifcategory{%
+  \ifdef\abx@field@entrykey
+    {\blx@imc@ifentrycategory\abx@field@entrykey}
+    {\expandafter\@secondoftwo\@gobble}}
+
+% {<entrykey>}{<category>}{<true>}{<false>}
+
+\protected\def\blx@imc@ifentrycategory{%
+  \blx@xsanitizeafter\blx@imc@ifentrycategory@i}
+
+\def\blx@imc@ifentrycategory@i#1#2{%
+  \ifcsdef{blx@catg@\detokenize{#2}}
+    {\ifinlistcs{#1}{blx@catg@\detokenize{#2}}}
+    {\@secondoftwo}}
+
+% {<keyword>}{<true>}{<false>}
+
+\protected\def\blx@imc@ifkeyword{%
+  \ifdef\abx@field@entrykey
+    {\blx@imc@ifentrykeyword\abx@field@entrykey}
+    {\expandafter\@secondoftwo\@gobble}}
+
+% {<entrykey>}{<keyword>}{<true>}{<false>}
+
+\protected\def\blx@imc@ifentrykeyword{%
+  \blx@xsanitizeafter\blx@imc@ifentrykeyword@i}
+
+\def\blx@imc@ifentrykeyword@i#1#2{%
+  \ifcsdef{blx@keyw@\the\c@refsection @\detokenize{#2}}
+    {\ifinlistcs{#1}{blx@keyw@\the\c@refsection @\detokenize{#2}}}
+    {\@secondoftwo}}
+
 % {<true>}{<false>}
 
 \protected\def\blx@ifciteseen@global{%
@@ -2586,80 +2645,94 @@
 \newrobustcmd*{\NumCheckSetup}{\appto\blx@hook@ifnum}
 \newcommand*{\NumcheckSetup}{\NumCheckSetup}
 
-% [<pagination>]{<string>}
+% [<pagination>][<postpro>]{<string>}
 
 \newrobustcmd*{\blx@imc@mkpageprefix}[1][pagination]{%
-  \iffieldequalstr{#1}{none}
-    {\@firstofone}
-    {\begingroup
-     \def\blx@tempa{page}%
-     \iffieldundef{#1}
-       {}
+  \begingroup
+  \def\blx@tempa{\blx@mkpageprefix{page}}%
+  \iffieldundef{#1}
+    {}
+    {\iffieldequalstr{#1}{none}
+       {\def\blx@tempa{\blx@mkpageprefix@i}}
        {\iffieldbibstring{#1}
-          {\edef\blx@tempa{\thefield{#1}}}
-          {\blx@warning@entry{%
-             Unknown pagination type '\thefield{#1}'}}}%
-     \expandafter\endgroup
-     \expandafter\blx@mkpageprefix
-     \expandafter{\blx@tempa}}}
-
-\long\def\blx@mkpageprefix#1#2{%
-  \ifnumeral{#2}
-    {\bibstring{#1}\ppspace#2}
-    {\ifnumerals{#2}
-       {\bibstring{#1s}\ppspace#2}
-       {\begingroup
-        \def\pno{\bibstring{#1}}%
-        \def\ppno{\bibstring{#1s}}%
-        #2\endgroup}}}
+	  {\edef\blx@tempa{\blx@mkpageprefix{\thefield{#1}}}}
+	  {\blx@warning@entry{%
+             Unknown pagination type '\strfield{#1}'}}}}%
+  \@ifnextchar[%]
+    {\blx@tempa}
+    {\blx@tempa[\@firstofone]}}
+
+\protected\long\def\blx@mkpageprefix#1[#2]#3{%
+  \ifnumeral{#3}
+    {\bibstring{#1}\ppspace}
+    {\ifnumerals{#3}
+       {\bibstring{#1s}\ppspace}
+       {\def\pno{\bibstring{#1}}%
+        \def\ppno{\bibstring{#1s}}}}%
+  \blx@mkpageprefix@i[#2]{#3}}
 
-% [<pagination>]{<string>}
+\long\def\blx@mkpageprefix@i[#1]#2{#1{#2}\endgroup}
+
+% [<pagination>][<postpro>]{<string>}
 
 \newrobustcmd*{\blx@imc@mkpagetotal}[1][bookpagination]{%
   \begingroup
-  \def\blx@tempa{page}%
+  \def\blx@tempa{\blx@mkpagetotal{page}}%
   \iffieldundef{#1}
     {}
     {\iffieldequalstr{#1}{none}
-       {}
+       {\def\blx@tempa{\blx@mkpagetotal@i}}
        {\iffieldbibstring{#1}
-          {\edef\blx@tempa{\thefield{#1}}}
-          {\blx@warning@entry{%
-             Unknown pagination type '\thefield{#1}'}}}}%
-  \expandafter\endgroup
-  \expandafter\blx@mkpagetotal
-  \expandafter{\blx@tempa}}
-
-\long\def\blx@mkpagetotal#1#2{%
-  \begingroup
-  \ifnumeral{#2}
+	  {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}}}}
+	  {\blx@warning@entry{%
+             Unknown pagination type '\strfield{#1}'}}}}%
+  \@ifnextchar[%]
+    {\blx@tempa}
+    {\blx@tempa[\@firstofone]}}
+
+\protected\long\def\blx@mkpagetotal#1[#2]#3{%
+  \ifnumeral{#3}
     {\setbox\@tempboxa=\hbox{%
-       \blx@tempcnta0#2\relax
+       \blx@tempcnta0#3\relax
        \ifnum\blx@tempcnta=\@ne
          \aftergroup\@firstoftwo
        \else
          \aftergroup\@secondoftwo
        \fi}%
-     {#2\ppspace\bibstring{#1}}
-     {#2\ppspace\bibstring{#1s}}}
+     {#2{#3}\ppspace\bibstring{#1}}
+     {#2{#3}\ppspace\bibstring{#1s}}}
     {\def\pno{\bibstring{#1}}%
      \def\ppno{\bibstring{#1s}}%
-     #2}%
+     #2{#3}}%
   \endgroup}
 
-% [<pagination>]{<string>}
+\long\def\blx@mkpagetotal@i[#1]#2{#1{#2}\endgroup}
 
-\protected\def\blx@imc@mkpagefirst{%
-  \@ifstar\blx@pagefirst@i\blx@pagefirst@ii}
+% [<pagination>][<postpro>]{<string>}
+% <*>[<postpro>]{<string>}
 
-\long\def\blx@pagefirst@i#1{%
-  \blx@pagefirst@iii#1\bibrangedash&}
+\protected\def\blx@imc@mkpagefirst{%
+  \@ifstar
+    {\@ifnextchar[%]
+       {\blx@pagefirst@i}
+       {\blx@pagefirst@i[\@firstofone]}}
+    {\blx@pagefirst@ii}}
 
-\newcommand{\blx@pagefirst@ii}[2][pagination]{%
+\long\def\blx@pagefirst@i[#1]#2{%
   \begingroup
   \edef\blx@tempa{\endgroup
-    \noexpand\mkpageprefix[#1]{%
-      \blx@pagefirst@iii#2\bibrangedash&}}%
+    \unexpanded{#1}{\blx@pagefirst@iii#2\bibrangedash&}}%
+  \blx@tempa}
+
+\newrobustcmd*{\blx@pagefirst@ii}[1][pagination]{%
+  \@ifnextchar[%]
+    {\blx@pagefirst@iiA{#1}}
+    {\blx@pagefirst@iiA{#1}[\@firstofone]}}
+
+\protected\long\def\blx@pagefirst@iiA#1[#2]#3{%
+  \begingroup
+  \def\blx@tempa{\endgroup\mkpageprefix[#1][#2]}%
+  \eappto\blx@tempa{{\blx@pagefirst@iii#3\bibrangedash&}}%
   \blx@tempa}
 
 \long\def\blx@pagefirst@iii#1\bibrangedash#2&{%
@@ -2795,9 +2868,10 @@
   \global\toggletrue{blx@block}}
 
 \blx@regimcs{%
-  \thefield \strfield \thelist \thename \clearfield \clearlist
-  \clearname \restorefield \restorelist \restorename \ifciteseen
-  \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
+  \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist
+  \clearname \restorefield \restorelist \restorename
+  \ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
+  \ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
   \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
   \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
   \iffieldundef \iffieldxref \iflistequalcs \iflistequals
@@ -3634,7 +3708,7 @@
     {\@firstoftwo}}
 
 \def\blx@imc@ifbibxstring#1{%
-  \ifcsundef{\abx@str @#1}
+  \blx@xsanitizeafter\ifcsundef{\abx@str @#1}
     {\@secondoftwo}
     {\@firstoftwo}}
 
@@ -3644,7 +3718,8 @@
   \blx@imc@iffieldundef{#1}
     {\@secondoftwo}
     {\ifcsundef{\abx@str @\detokenize\expandafter
-       \expandafter\expandafter{\csname abx@field@#1\endcsname}}
+                          \expandafter\expandafter{%
+		\csname abx@field@#1\endcsname}}
        {\@secondoftwo}
        {\@firstoftwo}}}
 
@@ -3881,6 +3956,7 @@
   \do{urlseen}%
   \do{file}%
   \do{inpress}%
+  \do{inpreparation}%
   \do{submitted}%
   \do{library}%
   \do{abstract}%
@@ -4302,7 +4378,7 @@
 \newrobustcmd*{\mkbibfemord}{\mkbibordinal}
 \newrobustcmd*{\mkbibmonth}[1]{%
   \ifcase0#1\relax
-    0\blx@warning@entry{Month out of range}%
+    \blx@warning@entry{Month out of range or not an integer}%
   \or\abx@bibmonth{january}%
   \or\abx@bibmonth{february}%
   \or\abx@bibmonth{march}%
@@ -4316,8 +4392,8 @@
   \or\abx@bibmonth{november}%
   \or\abx@bibmonth{december}%
   \else
-    #1\blx@warning@entry{Month out of range}%
-  \fi}%
+    \blx@warning@entry{Month out of range}#1%
+  \fi}
 
 \protected\def\blx@imc@printdate{}
 \protected\def\blx@imc@printdateextra{}
@@ -4428,12 +4504,12 @@
   \do{set}%
   \do{article}%
   \do{book}%
-  \do{books}%
-  \do{bookinbook}%
+  \do{mvbook}%
   \do{booklet}%
   \do{collection}%
-  \do{collections}%
+  \do{mvcollection}%
   \do{inbook}%
+  \do{bookinbook}%
   \do{incollection}%
   \do{inproceedings}%
   \do{manual}%
@@ -4442,6 +4518,7 @@
   \do{patent}%
   \do{periodical}%
   \do{proceedings}%
+  \do{mvproceedings}%
   \do{report}%
   \do{suppbook}%
   \do{suppcollection}%
@@ -4461,6 +4538,7 @@
   \do{music}%
   \do{performance}%
   \do{reference}%
+  \do{mvreference}%
   \do{review}%
   \do{software}%
   \do{standard}%
@@ -6146,32 +6224,27 @@
   \blx@ifdata{#1}
     {\begingroup
      \blx@getdata{#1}%
-     \blx@ifdriver{\abx@field@entrytype}
-       {\blx@bibcheck
-        \iftoggle{blx@skipentry}{}{%
-          \global\let\blx@noitem\@empty
-	  \blx@setoptions@type\abx@field@entrytype
-          \blx@setoptions@entry
-          \blx@thelabelnumber
-	  \blx@addprefixnumber
-          \addtocounter{instcount}\@ne
-          \csuse{blx@item@\blx@theenv}\relax
-          \blx@initsep
-          \blx@namesep
-          \csuse{blx@hook@bibitem}%
-          \blx@execute
-          \blx@initunit
-          \blx@anchor
-          \blx@beglang
-          \bibsentence
-          \blx@pagetracker
-          \blx@driver{\abx@field@entrytype}%
-          \blx@postpunct
-          \blx@endlang}}
-       {\blx@warning{%
-          No driver for entry type
-          '\abx@field@entrytype'.\MessageBreak
-          Skipping entry '\abx@field@entrykey'}}%
+     \blx@bibcheck
+     \iftoggle{blx@skipentry}{}{%
+       \global\let\blx@noitem\@empty
+       \blx@setoptions@type\abx@field@entrytype
+       \blx@setoptions@entry
+       \blx@thelabelnumber
+       \blx@addprefixnumber
+       \addtocounter{instcount}\@ne
+       \csuse{blx@item@\blx@theenv}\relax
+       \blx@initsep
+       \blx@namesep
+       \csuse{blx@hook@bibitem}%
+       \blx@execute
+       \blx@initunit
+       \blx@anchor
+       \blx@beglang
+       \bibsentence
+       \blx@pagetracker
+       \blx@driver\abx@field@entrytype
+       \blx@postpunct
+       \blx@endlang}%
      \endgroup}
     {}}
 
@@ -6383,8 +6456,16 @@
     {\blx@refsection}
     {\blx@refsection[]}}
 
+\def\blx@refsection{%
+  \begingroup
+  \let\do\@makeother
+  \dospecials
+  \catcode`\{=\@ne
+  \catcode`\}=\tw@
+  \blx@refsection@i}
 
-\def\blx@refsection[#1]{%
+\def\blx@refsection@i[#1]{%
+  \endgroup
   \global\advance\blx@maxsection\@ne
   \global\c@refsection\blx@maxsection
   \blx@inf@refsec
@@ -6394,41 +6475,50 @@
       \string\abx@aux@refsection{\the\c@refsection}{\the\c@page}}%
     \ifblank{#1}
       {}
-      {\blx@xsanitizeafter{\def\blx@bibfiles}{#1%
-	 \ifdef\blx@bibfiles@extra
-	   {,\blx@bibfiles@extra}
-	   {}}}%
+      {\let\blx@bibfiles\@empty
+       \blx@xsanitizeafter{\forcsvlist\blx@refsection@addfile}{#1}%
+       \forlistloop{\listadd\blx@bibfiles}\blx@bibfiles@global}%
     \ifnum\blx@backend=\blx@backend@biber
-      \blx@refsection@biber\blx@bibfiles
+      \blx@refsection@biber
     \else
-      \blx@refsection@bibtex\blx@bibfiles
+      \blx@refsection@bibtex
     \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}%
+\def\blx@refsection@addfile#1{%
+  \ifcsdef{blx@res@labl@#1}
+    {\blx@refsection@addfile@i{\csuse{blx@res@labl@#1}}}
+    {\blx@refsection@addfile@i{#1}}}
+
+\def\blx@refsection@addfile@i#1{%
+  \ifcsdef{blx@res@loca@#1}
+    {\listeadd\blx@bibfiles{#1}}
+    {\listeadd\blx@bibfiles{\blx@stripbib{#1}\detokenize{.bib}}}}
+
+\def\blx@refsection@biber{%
+  \blx@regbibfiles\jobname\blx@bibfiles
   \begingroup
-  \blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
+  \let\blx@tempa\@empty
+  \blx@bibdata\blx@tempa\blx@bibfiles
   \blx@auxwrite\blx@auxout
-    {\def\do##1{\blx@xml@datasource{file}{##1}}}
+    {\let\do\blx@datasource}
     {\blx@xml@endsection\blx@nl
      \blx@xml@comment{section \the\c@refsection}%
-     \blx@xml@bibdata{\the\c@refsection}{%
-       \expandafter\docsvlist\expandafter{\blx@tempa}}%
+     \blx@xml@bibdata{\the\c@refsection}{\blx@tempa}%
      \blx@xml@section{\the\c@refsection}}%
   \endgroup}
 
-\def\blx@refsection@bibtex#1{%
+\def\blx@refsection@bibtex{%
   \xdef\blx@auxfile@bibtex{\jobname\the\c@refsection\blxauxsuffix}%
-  \blx@regbibfiles{\blx@auxfile@bibtex}{#1}%
+  \blx@regbibfiles\blx@auxfile@bibtex\blx@bibfiles
   \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}}
+     \blx@auxinit@bibtex\blx@bibfiles}
     {}}
 
 \protected\def\endrefsection{%
@@ -6508,7 +6598,7 @@
 \newrobustcmd*{\DeclareBibliographyCategory}[1]{%
   \ifcsundef{blx@catg@#1}
     {\global\cslet{blx@catg@#1}\@empty
-     \listgadd{\blx@categories}{#1}}
+     \listgadd\blx@categories{#1}}
     {\blx@error
        {Category '#1' already declared}
        {The bibliography category '#1'\MessageBreak
@@ -6540,27 +6630,111 @@
 
 \AtEndDocument{\let\abx@aux@category\@gobbletwo}
 
-% {<bibfile>,...}
+% [<options>]{<resource>,...}
 
-\renewrobustcmd*{\bibliography}{%
-  \@ifstar
-    {\blx@xsanitizeafter{\forcsvlist\blx@extrabibfile}}
-    {\blx@xsanitizeafter{\forcsvlist\blx@addbibfile}}}
+\renewrobustcmd*{\bibliography}[1]{%
+  \begingroup
+  \def\blx@tempa{file}%
+  \def\blx@tempb{bibtex}%
+  \def\blx@tempc{local}%
+  \forcsvlist\blx@addbib@legacy{#1}%
+  \endgroup}
 \@onlypreamble\bibliography
 
-\def\blx@addbibfile#1{%
-  \ifdefempty\blx@bibfiles
-    {\gdef\blx@bibfiles{#1}}
-    {\gappto\blx@bibfiles{,#1}}%
-  \blx@regbibfile{\jobname}{#1}}
+\def\blx@addbib@legacy#1{%
+  \begingroup
+  \blx@xsanitizeafter{\def\blx@tempa}{\blx@stripbib{#1}\detokenize{.bib}}
+  \edef\blx@tempb{\endgroup\noexpand\blx@addbib@resource{\blx@tempa}}%
+  \blx@tempb}
+
+\def\blx@stripbib#1{%
+  \expandafter\blx@stripbib@i\detokenize{#1.bib}&}
+\edef\blx@stripbib@i{%
+  \def\noexpand\blx@stripbib@i##1\detokenize{.bib}##2&}
+\blx@stripbib@i{#1}
+
+% [<options>]{<resource>,...}
+
+\newrobustcmd*{\addbibresource}{%
+  \blx@addbib\blx@addbib@resource}
+\@onlypreamble\addbibresource
+
+\newrobustcmd*{\addglobalbib}{%
+  \blx@addbib\blx@addbib@global}
+\@onlypreamble\addglobalbib
+
+\newrobustcmd*{\addsectionbib}{%
+  \blx@addbib\blx@addbib@register}
+\@onlypreamble\addsectionbib
+
+\def\blx@addbib#1{%
+  \@ifnextchar[%]
+    {\blx@addbib@i{#1}}
+    {\blx@addbib@i{#1}[]}}
+
+\def\blx@addbib@i#1[#2]{%
+  \begingroup
+  \let\do\@makeother
+  \dospecials
+  \catcode`\{=\@ne
+  \catcode`\}=\tw@
+  \blx@addbib@ii{#1}{#2}}
+
+\def\blx@addbib@ii#1#2#3{%
+  \endgroup
+  \begingroup
+  \def\blx@tempa{file}%
+  \def\blx@tempb{bibtex}%
+  \def\blx@tempc{local}%
+  \undef\blx@tempd
+  \setkeys{blx@addbib}{#2}%
+  \blx@xsanitizeafter{#1}{#3}%
+  \endgroup}
+
+\define@key{blx@addbib}{type}{\def\blx@tempa{#1}}
+\define@key{blx@addbib}{datatype}{\def\blx@tempb{#1}}
+\define@key{blx@addbib}{location}{\def\blx@tempc{#1}}
+\define@key{blx@addbib}{label}{\edef\blx@tempd{\detokenize{#1}}}
+
+% \blx@res@type@<resource>	resource -> type
+% \blx@res@data@<resource>	resource -> datatype
+% \blx@res@loca@<resource>	resource -> datatype
+% \blx@res@labl@<resource>	label    -> resource
+
+\def\blx@addbib@register#1{%
+  \csxdef{blx@res@type@#1}{\blx@tempa}%
+  \csxdef{blx@res@data@#1}{\blx@tempb}%
+  \csxdef{blx@res@loca@#1}{\blx@tempc}%
+  \ifdef\blx@tempd
+    {\csxdef{blx@res@labl@\blx@tempd}{#1}}
+    {}}
 
-\def\blx@extrabibfile#1{%
-  \blx@addbibfile{#1}%
-  \ifdef\blx@bibfiles@extra
-    {\gappto\blx@bibfiles@extra{,#1}}
-    {\gdef\blx@bibfiles@extra{#1}}}
+\def\blx@addbib@resource#1{%
+  \blx@addbib@register{#1}%
+  \listgadd\blx@bibfiles{#1}%
+  \blx@regbibfile\jobname{#1}}
+
+\def\blx@addbib@global#1{%
+  \blx@addbib@resource{#1}%
+  \listgadd\blx@bibfiles@global{#1}}
 
 \let\blx@bibfiles\@empty
+\let\blx@bibfiles@global\@empty
+
+\def\blx@bibdata#1#2{%
+  \forlistloop{\blx@bibdata@i{#1}}#2}
+\def\blx@bibdata@i#1#2{%
+  \blx@xmlsanitizeafter{\blx@bibdata@ii{#1}{#2}}{#2}}
+\def\blx@bibdata@ii#1#2#3{%
+  \eappto#1{%
+    \blx@xml@datasource
+      {\ifcsdef{blx@res@type@#2}
+	 {\csuse{blx@res@type@#2}}
+	 {file}}
+      {\ifcsdef{blx@res@data@#2}
+	{\csuse{blx@res@data@#2}}
+	{bibtex}}
+      {#3}}}
 
 %% Citations
 
@@ -7817,6 +7991,10 @@
     \def\ifnameequals#1#2{\blx@TE{\blx@imc@ifnameequals{#1}{#2}}}%
     \def\ifnamesequal#1#2{\blx@TE{\blx@imc@ifnamesequal{#1}{#2}}}%
     \def\ifnameundef#1{\blx@TE{\blx@imc@ifnameundef{#1}}}%
+    \def\ifcategory#1{\blx@TE{\blx@imc@ifcategory{#1}}}%
+    \def\ifkeyword#1{\blx@TE{\blx@imc@ifkeyword{#1}}}%
+    \def\ifentrycategory#1#2{\blx@TE{\blx@imc@ifentrycategory{#1}{#2}}}%
+    \def\ifentrykeyword#1#2{\blx@TE{\blx@imc@ifentrykeyword{#1}{#2}}}%
     \def\ifcapital{\blx@TE\blx@imc@ifcapital}%
     \def\ifinteger#1{\blx@TE{\blx@imc@ifinteger{#1}}}%
     \def\iffieldint#1{\blx@TE{\blx@imc@iffieldint{#1}}}%
@@ -8209,6 +8387,26 @@
   ~~~~</bcf:option>\blx@nl}
 \xdef\blx@xml@ordered#1#2{%
   ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl}
+
+\xdef\blx@xml@inheritance#1{%
+  ~~<bcf:inheritance>\blx@nl
+  #1%
+  ~~</bcf:inheritance>\blx@nl}
+\xdef\blx@xml@inherit@defaults#1#2{%
+  ~~~~<bcf:defaults#1>\blx@nl
+  #2%
+  ~~~~</bcf:defaults>\blx@nl}
+\xdef\blx@xml@inherit@data#1{%
+  ~~~~<bcf:inherit>\blx@nl
+  #1%
+  ~~~~</bcf:inherit>\blx@nl}
+\xdef\blx@xml@inherit@type#1#2#3{%
+  ~~~~~~<bcf:type_pair source="#1" target="#2"#3/>\blx@nl}
+\xdef\blx@xml@inherit@field#1#2#3{%
+  ~~~~~~<bcf:field source="#1" target="#2"#3/>\blx@nl}
+\xdef\blx@xml@inherit@block#1{%
+  ~~~~~~<bcf:field source="#1" skip="true"/>\blx@nl}
+
 \xdef\blx@xml@sorting#1{%
   ~~<bcf:sorting>\blx@nl
   #1%
@@ -8237,8 +8435,8 @@
   ~~<bcf:bibdata section="#1">\blx@nl
   #2%
   ~~</bcf:bibdata>\blx@nl}
-\xdef\blx@xml@datasource#1#2{%
-  ~~~~<bcf:datasource type="#1">#2</bcf:datasource>\blx@nl}
+\xdef\blx@xml@datasource#1#2#3{%
+  ~~~~<bcf:datasource type="#1" datatype="#2">#3</bcf:datasource>\blx@nl}
 \xdef\blx@xml@citekey#1{%
   ~~~~<bcf:citekey>#1</bcf:citekey>}
 \xdef\blx@xml@citeset#1#2{%
@@ -8260,10 +8458,9 @@
   \blx@xml@options{biblatex}{global}{%
     \blx@xml@svalue{alphaothers}{\labelalphaothers}%
     \blx@xml@toggle{labelalpha}%
-    \blx@xml@mvalue{labelname}{\blx@bcf@labelname}%
-    \iftoggle{blx@labelyear}
-      {\blx@xml@mvalue{labelyear}{\blx@bcf@labelyear}}
-      {}%
+    \blx@xml@mvalue{labelnamespec}{\blx@bcf@labelnamespec}%
+    \blx@xml@toggle{labelyear}%
+    \blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}%
     \blx@xml@svalue{maxitems}{\the\c@maxitems}%
     \blx@xml@svalue{maxnames}{\the\c@maxnames}%
     \blx@xml@svalue{minitems}{\the\c@minitems}%
@@ -8284,16 +8481,15 @@
   \blx@xml@comment{#1}%
   \blx@xml@options{biblatex}{#1}{%
     \blx@xml@toggle{labelalpha}%
-    \blx@xml@mvalue{labelname}{%
-      \ifcsdef{blx@bcf@labelname@#1}
-	{\csuse{blx@bcf@labelname@#1}}
-	{\blx@bcf@labelname}}%
-    \iftoggle{blx@labelyear}
-      {\blx@xml@mvalue{labelyear}{%
-	 \ifcsdef{blx@bcf@labelyear@#1}
-           {\csuse{blx@bcf@labelyear@#1}}
-	   {\blx@bcf@labelyear}}}
-      {}%
+    \blx@xml@mvalue{labelnamespec}{%
+      \ifcsdef{blx@bcf@labelnamespec@#1}
+	{\csuse{blx@bcf@labelnamespec@#1}}
+	{\blx@bcf@labelnamespec}}%
+    \blx@xml@toggle{labelyear}%
+    \blx@xml@mvalue{labelyearspec}{%
+      \ifcsdef{blx@bcf@labelyearspec@#1}
+        {\csuse{blx@bcf@labelyearspec@#1}}
+	{\blx@bcf@labelyearspec}}%
     \blx@xml@toggle{singletitle}%
     \blx@xml@toggle{skipbib}%
     \blx@xml@toggle{skiplab}%
@@ -8346,6 +8542,7 @@
   \begingroup
   \blx@safe@actives
   \let\protect\string
+  % options
   \edef\labelalphaothers{\labelalphaothers}%
   \edef\sortalphaothers{\sortalphaothers}%
   \blx@xmlsanitizeafter{\def\labelalphaothers}{\labelalphaothers}%
@@ -8375,6 +8572,15 @@
        \endgroup}%
      \dolistloop\blx@opts@type}
     {}%
+  % data inheritance
+  \eappto\blx@tempa{%
+    \blx@xml@comment{CROSSREF}%
+    \blx@xml@inheritance{%
+      \csuse{blx@biber@inherit@default}%
+      \csuse{blx@biber@inherit@data}%
+    }%
+  }%
+  % sorting
   \def\do##1{%
     \eappto\blx@bcf@presort{\csuse{blx@bcf@presort@##1}}%
     \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}}%
@@ -8387,12 +8593,13 @@
       \csuse{blx@biber@sorting@\blx@sorting}%
     }%
   }%
-  \blx@xmlsanitizeafter{\def\blx@bibfiles}{\blx@bibfiles}%
-  \def\do{\blx@xml@datasource{file}}%
+  % files
+  \let\blx@tempb\@empty
+  \blx@bibdata\blx@tempb\blx@bibfiles
   \eappto\blx@tempa{%
     \blx@xml@comment{CITATION DATA}%
     \blx@xml@comment{section 0}%
-    \blx@xml@bibdata{0}{\expandafter\docsvlist\expandafter{\blx@bibfiles}}%
+    \blx@xml@bibdata{0}{\blx@tempb}%
     \blx@xml@section{0}%
   }%
   \immediate\openout\blx@auxout\jobname.bcf\relax
@@ -8407,6 +8614,92 @@
 
 %% Customization
 
+% [<exceptions>]{<options>}
+
+\newrobustcmd*{\DefaultInheritance}[2][]{%
+  \begingroup
+  \ifblank{#2}
+    {}
+    {\setkeys{blx@inherit@default}{#2}}%
+  \edef\blx@tempa{\space
+    inherit\string_all="\iftoggle{blx@inherit@all}{true}{false}"\space
+    override\string_target="\iftoggle{blx@inherit@override}{true}{false}"}%
+  \let\blx@tempb\@empty
+  \let\except\blx@inherit@except
+  #1%
+  \xdef\blx@biber@inherit@default{%
+    \blx@xml@inherit@defaults{\blx@tempa}{\blx@tempb}}%
+  \endgroup}
+\@onlypreamble\DefaultInheritance
+
+\newtoggle{blx@inherit@all}
+\newtoggle{blx@inherit@override}
+
+\define@key{blx@inherit@default}{all}[true]{% true|false
+  \settoggle{blx@inherit@all}{#1}}
+\define@key{blx@inherit@default}{override}[true]{% true|false
+  \settoggle{blx@inherit@override}{#1}}
+
+% {<source>}{<target>}{<options>}
+
+\newcommand{\blx@inherit@except}[3]{%
+  \let\blx@tempc\@empty
+  \ifblank{#3}
+    {}
+    {\setkeys{blx@inherit@except}{#3}}%
+  \eappto\blx@tempb{%
+    \blx@xml@inherit@type{#1}{#2}{\blx@tempc}}}
+
+\define@key{blx@inherit@except}{all}[true]{% true|false
+  \eappto\blx@tempc{ inherit\string_all="#1"}}
+\define@key{blx@inherit@except}{override}[true]{% true|false
+  \eappto\blx@tempc{ override\string_target="#1"}}
+
+% {<type,type,...>}{<type,type,...>}{<spec>}
+
+\newrobustcmd*{\DeclareDataInheritance}[3]{%
+  \begingroup
+  \let\blx@tempa\@empty
+  \forcsvlist{\blx@inherit@i{#2}}{#1}%
+  \let\blx@tempb\@empty
+  \let\inherit\blx@inherit@field
+  \let\noinherit\blx@inherit@block
+  #3%
+  \xappto\blx@biber@inherit@data{%
+    \blx@xml@inherit@data{%
+      \blx@tempa
+      \blx@tempb}}%
+  \endgroup}
+\@onlypreamble\DeclareDataInheritance
+
+\def\blx@inherit@i#1#2{%
+  \forcsvlist{\blx@inherit@ii{#2}}{#1}}
+
+\def\blx@inherit@ii#1#2{%
+  \eappto\blx@tempa{\blx@xml@inherit@type{#1}{#2}{}}}
+
+% [<options>]{<source>}{<target>}
+
+\newcommand{\blx@inherit@field}[3][]{%
+  \let\blx@tempc\@empty
+  \ifblank{#1}
+    {}
+    {\setkeys{blx@inherit@field}{#1}}%
+  \eappto\blx@tempb{%
+    \blx@xml@inherit@field{#2}{#3}{\blx@tempc}}}
+
+\newcommand{\blx@inherit@block}[1]{%
+  \eappto\blx@tempb{\blx@xml@inherit@block{#1}}}
+
+\define@key{blx@inherit@field}{override}[true]{% true|false
+  \ifstrequal{#1}{true}
+    {\def\blx@tempc{ override_target="true"}}
+    {\def\blx@tempc{ override_target="false"}}}
+
+\newrobustcmd*{\ResetDataInheritance}{%
+  \global\csundef{blx@biber@inherit@data}}
+\@onlypreamble\ResetDataInheritance
+
 % {<name>}{<spec>}
 
 \newrobustcmd*{\DeclareSortingScheme}[2]{%
@@ -8528,11 +8821,11 @@
 % [<type,type,...>]{<field,field,...>}
 
 \newrobustcmd*{\DeclareLabelname}[2][]{%
-  \blx@defmvalue{labelname}{#1}{#2}}
+  \blx@defmvalue{labelnamespec}{#1}{#2}}
 \@onlypreamble\DeclareLabelname
 
 \newrobustcmd*{\DeclareLabelyear}[2][]{%
-  \blx@defmvalue{labelyear}{#1}{#2}}
+  \blx@defmvalue{labelyearspec}{#1}{#2}}
 \@onlypreamble\Declarelabelyear
 
 \def\blx@defmvalue#1#2#3{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index ae0ac1878f5..24c602459c7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: blx-compat.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
  biblatex generic compatibility]
 
 % LaTeX
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
index aab6355d14a..fa80c341df2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
@@ -1,7 +1,7 @@
-% $Id: blx-mcite.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: blx-mcite.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{blx-mcite.def}
-[\abx@rcsid $Id: blx-mcite.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
+[\abx@rcsid $Id: blx-mcite.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
  mcite-like citation commands]
 
 \newrobustcmd*{\mcite}{\mcitelike\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 25fd33f207f..534db788170 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: blx-natbib.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
  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 e828ca41d1b..63ff428a8c5 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 263618abd32..d23af004baa 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: alphabetic.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 10ca49f5b8b..63fd9289f4b 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{sortcites,autocite=footnote}
 \newbool{cbx:parens}
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 2a173b1dea4..c610359298b 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
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 e864e227aa1..7ed9417632a 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
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 02c98fffd9b..d44010907e7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireCitationStyle{authortitle-comp}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
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 812a76d1163..e869ce30d3e 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireCitationStyle{authortitle}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 1239e27e155..2cae1c36733 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \RequireCitationStyle{authortitle-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index e90764df2a3..aa16238e717 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authortitle.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{autocite=footnote}
 \newbool{cbx:parens}
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 b3b24b13b9d..4ca4b47f411 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 6f2002efa45..02d2335b759 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 dac6faba1cb..5b61c6f5ed7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 2a1bed03929..29d157e70b7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: authoryear.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 46c72ef9cc4..567b0b16a08 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: debug.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 ae03d31f4a0..7d304f67683 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: draft.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 7054447a995..ae9d288f887 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
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 e6962da496f..0b44d0842fc 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{labelnumber,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index fd2a9830246..20219e9ed19 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: numeric.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \ExecuteBibliographyOptions{labelnumber,autocite=inline}
 \renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index 3728df7280d..3db8aabe68e 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: reading.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 6609b3a133f..c0a042a260b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
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 0889f9ac5a6..80de5141827 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-inote.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
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 22ca40d306e..f912d893c9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-note.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
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 f5b8ff4bbd1..617e230b05c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:ibidpage}
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 2560e6eab8b..663079ca156 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:fullcite}
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 1e3294e580b..f5e85d44141 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:loccit}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index 7d4b246972f..b2781a7d97b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: verbose.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index e0cf675c351..23197e83951 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: UKenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 209b76a9739..1e5aca96895 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: USenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 34cbc06dce5..ed5eabdc4f5 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: american.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index 71a6acc2be8..103788979d7 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: australian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index 175c5f3b2db..f1c4e135546 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: austrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
index 677f1e70c27..88f9606d03b 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: brazil.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 66735f0d1ea..78dedcda23f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -1,7 +1,7 @@
-% $Id: brazilian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: brazilian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Complete
@@ -337,6 +337,7 @@
   url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
   urlseen          = {{acesso em}{acesso em}},
   inpress          = {{na prensa}{na prensa}},
+% inpreparation    = {{}{}}, % FIXME: missing
   submitted        = {{submetido}{subm\adddot}},
   citedas          = {{doravante citado como}{doravante citado como}},
   seenote          = {{ver nota}{ver nota}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index 592b26ee39f..fbc9c7a76e4 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: british.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index 529ba5d87ec..b980f196294 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: canadian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index 184513f558a..7741dea9b9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -1,7 +1,7 @@
-% $Id: danish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: danish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -284,6 +284,7 @@
   url              = {{side}{side}},
   urlseen          = {{sidst set}{sidst set}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{herefter citeret som}{herefter cit\adddot\ som}},
 % thiscite         = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 10ceceace0f..edf864c4bd8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -1,7 +1,7 @@
-% $Id: dutch.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: dutch.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Complete
@@ -338,6 +338,7 @@
   url              = {{addres}{addres}},
   urlseen          = {{bezocht op}{bezocht op}},
   inpress          = {{in druk}{in druk}},
+% inpreparation    = {{}{}}, % FIXME: missing
   submitted        = {{ingediend}{ingediend}},
   citedas          = {{verder geciteerd als}{verder geciteerd als}},
   seenote          = {{zie voetnoot}{zie v\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index b8fd1038546..2dfe55d1545 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -1,7 +1,7 @@
-% $Id: english.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: english.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Complete
@@ -358,6 +358,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
   url              = {{address}{address}},
   urlseen          = {{visited on}{visited on}},
   inpress          = {{in press}{in press}},
+  inpreparation    = {{in preparation}{in preparation}},
   submitted        = {{submitted}{submitted}},
   citedas          = {{henceforth cited as}{henceforth cited as}},
   thiscite         = {{especially}{esp\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 46a4fb3c16f..9f1eb5bc9bb 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: finnish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -357,6 +357,7 @@
   url              = {{url}{url}},
   urlseen          = {{viitattu}{viitattu}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{jatkossa}{jatkossa}}, 
 % thiscite         = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 4e8476fb7ec..c4049bb5153 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -1,7 +1,7 @@
-% $Id: french.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: french.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -292,6 +292,7 @@
   url              = {{adresse}{adresse}},
   urlseen          = {{visit\'e le}{visit\'e le}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{d\'esign\'e ci-apr\`es par}{ci-apr\`es}},
 % thiscite         = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 6b3a6f75201..1e4be415137 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -1,7 +1,7 @@
-% $Id: german.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: german.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Complete
@@ -344,6 +344,7 @@
   url              = {{Adresse}{Adresse}},
   urlseen          = {{besucht am}{besucht am}},
   inpress          = {{im Druck}{im Druck}},
+  inpreparation    = {{in Vorbereitung}{in Vorbereitung}},
   submitted        = {{eingereicht}{eingereicht}},
   citedas          = {{im folgenden zitiert als}{im folgenden zit\adddotspace als}},
   thiscite         = {{hier}{hier}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index bb558eaab13..e0c1d683173 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: greek.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -345,6 +345,7 @@
   url              = {{διεύθυνση}{διεύθν\adddot}},
   urlseen          = {{επίσκεψη}{επίσκεψη}},
   inpress          = {{υπό έκδοση}{υπό έκδ.}},
+% inpreparation    = {{}{}}, % FIXME: missing
   submitted        = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender?
   citedas          = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}},
   thiscite         = {{αυτή η αναφορά}{αυτή η αναφορά}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 554a305c09e..083a712a1a3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -1,7 +1,7 @@
-% $Id: italian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: italian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -272,6 +272,7 @@
   url              = {{indirizzo}{indirizzo}},
   urlseen          = {{visitato il}{visitato il}},
   inpress          = {{in stampa}{in stampa}}, 
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{citato come}{cit\adddotspace come}},
 % thiscite         = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index 17070b797db..c883656fdc9 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: naustrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index 3fa40b3e6d1..947174301e4 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: newzealand.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index c656baad06d..0d71e318811 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: ngerman.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index 521723b11b4..266c2ae08a6 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: norsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - '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 bbfd21bf203..951d720f9a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -1,7 +1,7 @@
-% $Id: norwegian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: norwegian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -257,6 +257,7 @@
   url              = {{side}{side}},
   urlseen          = {{sjekket}{sjekket}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{fremover sitert som}{fremover sit\adddot\ som}},
 % thiscite         = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 6e0e878fd9e..7404c8648b6 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: nynorsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - '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 318f878c8a5..a1289bfa950 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: portuges.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 \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 4bab8031b8d..8e940f3cb2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,7 +1,7 @@
-% $Id: portuguese.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: portuguese.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Complete
@@ -347,6 +347,7 @@
   url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
   urlseen          = {{acedido em}{acedido em}},
   inpress          = {{na imprensa}{na imp\addot}},
+% inpreparation    = {{}{}}, % FIXME: missing
   submitted        = {{submetido}{subm\adddot}},
   citedas          = {{doravante citado como}{doravante citado como}},
   seenote          = {{ver nota}{ver nota}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 65f50533d22..8bf61d8b161 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -1,7 +1,7 @@
-% $Id: spanish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: spanish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -282,6 +282,7 @@
   url              = {{direcci\'on}{direcci\'on}},
   urlseen          = {{visitado}{visitado}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{citado en adelante como}{cit\adddotspace en adelante como}},
 % thiscite         = {{}{}}, % 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 2c89ed2915e..ad4d5184cfc 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 1.1b 2011/02/04 11:36:21 lehman stable $
+% $Id: swedish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
 
 \ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -316,6 +316,7 @@
   url              = {{webbadress}{URL}},
   urlseen          = {{senast h\"amtad}{h\"amtad}},
 % inpress          = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}}, % FIXME: missing
 % submitted        = {{}{}}, % FIXME: missing
   citedas          = {{h\"adanefter citerad som}{h\"adanefter cit\adddotspace som}},
 % thiscite         = {{}{}}, % FIXME: missing