summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-09 23:32:31 +0000
committerKarl Berry <karl@freefriends.org>2010-10-09 23:32:31 +0000
commit2b1aece05c5cfa5fb2237f33be13352b8152c50d (patch)
treee6fa6a1b23534f63f5f03213f5378c2eb43a6966 /Master/texmf-dist/tex/latex/biblatex
parentad2a0c99a6985997ce7dadc86f280f1f54817c0a (diff)
biblatex 0.9e (9oct10)
git-svn-id: svn://tug.org/texlive/trunk@20029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx42
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def70
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty415
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-natbib.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx4
85 files changed, 498 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 3b9232a2d39..828f692f8d8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{alphabetic}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index 73c25c368fc..175a4db93b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: alphabetic.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index 3d8bbe68dd4..0527747b3f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
index bae7a30891d..3c3b0083ead 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
index 22d48fa135f..34b61f56aaf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
index 21dca612f13..01a2532408d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-tcomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
index 9e84f2523d7..813b79a4b4a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-terse.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
index f6ae2f26897..9a7126ccdbe 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ticomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 184e5249cd1..1f4123ee54f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{pagetracker}
@@ -53,6 +53,8 @@
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\renewbibmacro*{author}{%
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 e39175ca4b5..b89d1478cc0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
index 0b288eee160..44a67449b30 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
index b7026d43a13..17b73ff81af 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index c4fc460d66b..a7b45e05c92 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
@@ -53,6 +53,8 @@
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\renewbibmacro*{author}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 2a196206e55..0125f0986df 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,7 +1,7 @@
-% $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: debug.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: debug.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{sorting=debug}
\DeclareFieldFormat{entrykey}{\ttfamily[#1]}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index 18541bf5bf1..78b82914ae5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -1,7 +1,7 @@
-% $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: draft.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: draft.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{sorting=debug}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
index 7282ad5a4fe..8b26b988c9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
index b9bcec93050..7c982383dc6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 160036883b3..0d04d4cd4f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelnumber}
@@ -48,11 +48,14 @@
{\item}
\DeclareBibliographyDriver{set}{%
- \ifbool{bbx:subentry}
- {\entryset{%
- \printfield[bibentrysetcount]{entrysetcount}%
- \setunit*{\addnbspace}}{}}
- {\entryset{}{}}
+ \entryset
+ {\ifbool{bbx:subentry}
+ {\printfield[bibentrysetcount]{entrysetcount}%
+ \setunit*{\addnbspace}}
+ {}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index a9111ac67ce..8ac5d491ee2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -1,7 +1,7 @@
-% $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: reading.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: reading.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
@@ -165,6 +165,8 @@
\DeclareBibliographyDriver{set}{%
\renewbibmacro*{finentry}{\finentry}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\ifbibliography
{\usebibmacro{entrytail}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index a7ea8e96e04..f2632b06a98 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: standard.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
@@ -39,9 +39,9 @@
\newunit\newblock
\usebibmacro{in:}%
\usebibmacro{journal+issuetitle}%
- \newunit\newblock
+ \newunit
\usebibmacro{byeditor+others}%
- \newunit\newblock
+ \newunit
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -51,7 +51,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -94,7 +94,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -126,7 +126,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -167,7 +167,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -213,7 +213,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -257,7 +257,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -303,7 +303,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -345,7 +345,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -375,7 +375,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -407,7 +407,7 @@
\usebibmacro{url+urldate}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -440,7 +440,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -464,7 +464,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -507,7 +507,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -543,7 +543,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -571,7 +571,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -597,7 +597,7 @@
{}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -609,6 +609,8 @@
\DeclareBibliographyDriver{set}{%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\DeclareBibliographyAlias{bookinbook}{inbook}
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 468bbdc26b8..e8f20fbd8a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
index 4ef0943b977..e9e4ca22a8e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-inote.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
index 853bd821383..d5dbce6393d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-note.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-note.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
index a947435dd02..e19a1ace643 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad1.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
index 848a2b05e97..897e69fabd2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad2.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
index 8145890b9cc..055de9173f6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad3.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
index 17cec628b58..8f013d91584 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index 0f41241c1e1..f22c141c8c3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
@@ -1,4 +1,4 @@
-% $Id: biblatex.cfg,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.cfg,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{biblatex.cfg}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 3a8b62b2065..8622d7f3dbb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -53,6 +53,7 @@
\newcommand*{\subtitlepunct}{\newunitpunct}
\newcommand*{\intitlepunct}{\addcolon\space}
\newcommand*{\bibpagespunct}{\addcomma\space}
+\newcommand*{\bibpagerefpunct}{\addspace}
\newcommand*{\bibnamedash}{%
\ifdimless{\leftmargin}{0.75em}
{\mbox{\textemdash\space}}
@@ -615,33 +616,19 @@
% Formatting directives for name lists
% ------------------------------------------------------------------
-% The fallback used by \printnames
-\DeclareNameFormat{default}{%
+\DeclareNameFormat{first-last}{%
\iffirstinits
{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
{\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
\usebibmacro{name:andothers}}
-% The default used by \citename
-\DeclareNameAlias{citename}{default}
-
-% Used in all citations
-
-\DeclareNameFormat{labelname}{%
- \ifcase\value{uniquename}%
- \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
- \or
- \ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
- \or
- \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- \fi
+\DeclareNameFormat{last-first}{%
+ \iffirstinits
+ {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
\usebibmacro{name:andothers}}
-% Used in the bibliography
-
-\DeclareNameFormat{sortname}{%
+\DeclareNameFormat{last-first/first-last}{%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
@@ -654,12 +641,36 @@
{\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}%
\usebibmacro{name:andothers}}
-% Not used by default
-
\DeclareNameFormat{initsonly}{%
\usebibmacro{name:first-last}{#2}{#4}{#6}{#8}%
\usebibmacro{name:andothers}}
+% Fallback used by \printnames
+
+\DeclareNameAlias{default}{first-last}
+
+% Default used by \citename
+
+\DeclareNameAlias{citename}{default}
+
+% Used in some citations
+
+\DeclareNameFormat{labelname}{%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
+ {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
+ \or
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \fi
+ \usebibmacro{name:andothers}}
+
+% Used in the bibliography
+
+\DeclareNameAlias{sortname}{last-first/first-last}
+
\DeclareNameAlias{author}{default}
\DeclareNameAlias{bookauthor}{author}
\DeclareNameAlias{editor}{default}
@@ -1813,7 +1824,7 @@
\usebibmacro{withforeword}%
\clearname{foreword}%
\newunit
- \usebibmacro{withafterword}
+ \usebibmacro{withafterword}%
\clearname{afterword}}
\newbibmacro*{title}{%
@@ -1904,6 +1915,15 @@
{\bibstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}}}}
+\newbibmacro*{setpageref}{%
+ \iflistundef{pageref}
+ {}
+ {\printtext{%
+ \ifnumgreater{\value{pageref}}{1}
+ {\bibstring{backrefpages}\ppspace}
+ {\bibstring{backrefpage}\ppspace}%
+ \printlist[pageref][-\value{listtotal}]{pageref}}}}
+
\newbibmacro*{eprint}{%
\iffieldundef{eprinttype}
{\printfield{eprint}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 4af84cc06db..4d9db8f3182 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.sty,v 0.9e 2010/10/09 16:39:36 lehman beta $
% Copyright (c) 2006-2010 Philipp Lehman.
%
@@ -21,11 +21,11 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: biblatex.sty,v 0.9e 2010/10/09 16:39:36 lehman beta $
programmable bibliographies]
-\def\blx@version$#1: #2 ${#2}
-\edef\blx@version{\blx@version$Revision: 0.9c $}
+\def\blx@bblversion$#1: #2 ${#2}
+\edef\blx@bblversion{\blx@bblversion$Revision: 0.9e $}
%% Compatibility and requirements
@@ -153,10 +153,10 @@
{}%
\@ifpackageloaded{showkeys}
{\ifdef\SK@
- {\ifundef\SK@cite % = 'notcite' disabled
- {\AtEveryBibitem{\SK@\SK@@label{\thefield{entrykey}}}%
- \AtEveryLositem{\SK@\SK@@label{\thefield{entrykey}}}%
- \AtEveryCitekey{\SK@\SK@@ref{\thefield{entrykey}}}}
+ {\AtEveryBibitem{\SK@\SK@@label{\thefield{entrykey}}}%
+ \AtEveryLositem{\SK@\SK@@label{\thefield{entrykey}}}%
+ \ifundef\SK@cite % = 'notcite' disabled
+ {\AtEveryCitekey{\SK@\SK@@ref{\thefield{entrykey}}}}
{}}
{}}
{}%
@@ -231,15 +231,18 @@
\addtocontents{toc}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\addtocontents{lof}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\addtocontents{lot}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\let\do\noexpand}
\begingroup
@@ -352,6 +355,7 @@
\newbool{citetracker}
\newbool{pagetracker}
+\newbool{backtracker}
\newbool{citerequest}
\booltrue{citerequest}
@@ -364,7 +368,8 @@
\newtoggle{blx@insert}
\newtoggle{blx@lastins}
\newtoggle{blx@debug}
-\newtoggle{blx@cssort}
+\newtoggle{blx@sortcase}
+\newtoggle{blx@sortupper}
\newtoggle{blx@autolang}
\newtoggle{blx@clearlang}
\newtoggle{blx@defernumbers}
@@ -601,11 +606,7 @@
\ifx\blx@tempb\blx@tempc
\else
\blx@warning@noline{%
- File '#1.#2' created\MessageBreak
- by wrong version of
- \ifnumequal\blx@backend\blx@backend@biber
- {Biber}
- {biblatex}}%
+ File '#1.#2' created by wrong version}
\fi
\else
\blx@error
@@ -623,14 +624,14 @@
\expandafter\endgroup\blx@tempa}
\def\blx@sig@bib{@Comment{$ biblatex control file $}}
-\edef\blx@ver@bib{@Comment{$ biblatex version \blx@version\space $}}
+\edef\blx@ver@bib{@Comment{$ biblatex version \blx@bblversion\space $}}
\edef\blx@sig@aux{\@percentchar\space $ biblatex auxiliary file $}
-\edef\blx@ver@aux{\@percentchar\space$ biblatex version \blx@version\space $}
+\edef\blx@ver@aux{\@percentchar\space$ biblatex version \blx@bblversion\space $}
\let\blx@sig@bbl\blx@sig@aux
\let\blx@ver@bbl\blx@ver@aux
\edef\blx@sig@bcf{\detokenize{<?xml version="1.0" encoding="UTF-8"?>}}
\edef\blx@ver@bcf{%
- \detokenize{<bcf:controlfile version="}\blx@version
+ \detokenize{<bcf:controlfile version="}\blx@bblversion
\detokenize{" xmlns:bcf="https://sourceforge.net/projects/biblatex">}}
\edef\blx@msg@aux{%
@@ -1751,7 +1752,7 @@
\ifcsundef{abx@macro@\detokenize{#1}}
{\blx@defbibmacro\new@command{#1}}
{\blx@warning{%
- Bibliography macro '\detokenize{#1}' already defined.\MessageBreak
+ Macro '\detokenize{#1}' already defined.\MessageBreak
Using \string\renewbibmacro}
\blx@defbibmacro\renew@command{#1}}}
@@ -1761,7 +1762,7 @@
\def\blx@renewbibmacro#1{%
\ifcsundef{abx@macro@\detokenize{#1}}
{\blx@warning{%
- Bibliography macro '\detokenize{#1}' undefined.\MessageBreak
+ Macro '\detokenize{#1}' undefined.\MessageBreak
Using \string\newbibmacro}
\blx@defbibmacro\new@command{#1}}
{\blx@defbibmacro\renew@command{#1}}}
@@ -3371,11 +3372,8 @@
\def\blx@entryset#1{%
\blx@ifdata{#1}
{\begingroup
-% \begingroup
+ \blx@imc@clearlist{pageref}%
\blx@getdata{#1}%
-% \edef\blx@tempa{\endgroup
-% \def\noexpand\abx@field@entrytype{\abx@field@entrytype}}%
-% \blx@tempa
\def\abx@field@entrysetcount{1}%
\blx@set@precode
\blx@driver{\blx@imc@thefield{entrytype}}%
@@ -3539,17 +3537,17 @@
\let\blx@hook@uc\relax
\let\blx@hook@lc\relax
-\expandafter\patchcmd\csname MakeUppercase \endcsname
- {\protected@edef}
- {\blx@hook@uc\protected@edef}
- {}
- {\blx@err@patch{\string\MakeUppercase}}
-
-\expandafter\patchcmd\csname MakeLowercase \endcsname
- {\protected@edef}
- {\blx@hook@lc\protected@edef}
- {}
- {\blx@err@patch{\string\MakeLowercase}}
+\AtEndPreamble{%
+ \expandafter\patchcmd\csname MakeUppercase \endcsname
+ {\protected@edef}
+ {\blx@hook@uc\protected@edef}
+ {}
+ {\blx@err@patch{\string\MakeUppercase}}%
+ \expandafter\patchcmd\csname MakeLowercase \endcsname
+ {\protected@edef}
+ {\blx@hook@lc\protected@edef}
+ {}
+ {\blx@err@patch{\string\MakeLowercase}}}
\appto\blx@blxinit{%
\def\blx@hook@uc{%
@@ -3992,14 +3990,14 @@
{\expandafter\expandafter\expandafter\blx@lbxinput@i
\expandafter\expandafter\expandafter{%
\csname blx@lng@#1\endcsname}{#1}}
- {\blx@lbxinput@ii{#1}{#1.lbx}{language '#1'}}}
+ {\blx@lbxinput@ii{#1}{#1}{language '#1'}}}
% {<mapping>}{<language>}
\def\blx@lbxinput@i#1#2{%
\global\csundef{blx@lng@#2}%
\IfFileExists{#1.lbx}
- {\blx@lbxinput@ii{#2}{#1.lbx}{language '#2' -> '#1'}}
+ {\blx@lbxinput@ii{#2}{#1}{language '#2' -> '#1'}}
{\blx@warning@noline{%
File '#1.lbx' not found!\MessageBreak
Ignoring mapping '#2' -> '#1'}%
@@ -4011,12 +4009,13 @@
\begingroup
\setbox\@tempboxa=\hbox\bgroup
\aftergroup\endgroup
- \blx@inputonce{#2}{#3}
+ \blx@inputonce{#2.lbx}{#3}
{\global\cslet{abx@strings@#1}\@empty
\global\cslet{abx@extras@#1}\@empty
\global\cslet{abx@noextras@#1}\@empty
\blx@maplang{#1}{#1}%
- \def\InheritBibliographyStrings{\blx@letbibstrings{#1}}%
+ \def\InheritBibliographyStrings{%
+ \blx@letbibstrings{#1}}%
\def\DeclareBibliographyStrings####1{%
\begingroup
\let\blx@defstring\blx@lbx@defstring
@@ -4030,20 +4029,18 @@
\blx@saneccodes
\makeatletter}
{\endgroup
- \blx@lbxinput@iii{strings}{#1}%
- \blx@lbxinput@iii{extras}{#1}%
- \blx@lbxinput@iii{noextras}{#1}%
- \blx@lbxinput@iii{hyph}{#1}}
+ \csuse{blx@hook@strings@#1}%
+ \csuse{blx@hook@strings@#2}%
+ \csuse{blx@hook@extras@#1}%
+ \csuse{blx@hook@extras@#2}%
+ \csuse{blx@hook@noextras@#1}%
+ \csuse{blx@hook@noextras@#2}%
+ \csuse{blx@hook@hyph@#1}%
+ \csuse{blx@hook@hyph@#2}}
{\aftergroup\@firstoftwo}
{\aftergroup\@secondoftwo}%
\egroup}
-\def\blx@lbxinput@iii#1#2{%
- \ifcsdef{blx@hook@#1@#2}
- {\csuse{blx@hook@#1@#2}%
- \global\csundef{blx@hook@#1@#2}}
- {}}
-
% {<language>}
\def\blx@langsetup#1{%
@@ -4148,7 +4145,8 @@
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
\printfield{extrayear}}}}}}
-\newrobustcmd*{\mkbibrangeiso}[1]{%
+\expandafter\newrobustcmd
+\expandafter*\csname mkbibrangeiso8601\endcsname[1]{%
\iffieldundef{#1year}
{}
{\printtext{%
@@ -4157,7 +4155,8 @@
{}
{\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
-\newrobustcmd*{\mkbibrangeisoextra}[1]{%
+\expandafter\newrobustcmd
+\expandafter*\csname mkbibrangeiso8601extra\endcsname[1]{%
\iffieldundef{#1year}
{}
{\printtext{%
@@ -4547,7 +4546,7 @@
% {<entrykey>}{<refsection>}{<field>}{<value>}
\long\def\blx@bbl@addentryfield#1#2#3#4{%
- \csxappto{blx@data@#2@\detokenize{#1}}{%
+ \csxappto{blx@data@#2@#1}{%
\def\expandafter\noexpand\csname abx@field@#3\endcsname{#4}}}
% {<field>}{<value>}
@@ -4860,6 +4859,9 @@
\protected\def\blx@bbl@endentry{%
\csuse\blx@bbl@data
+ \ifcsundef{blx@pref@\the\c@refsection @\abx@field@entrykey}
+ {}
+ {\blx@addpageref{\abx@field@entrykey}}%
\iftoggle{blx@setonly}
{\global\toggletrue{blx@addset}%
\toggletrue{blx@skipbib}%
@@ -4872,10 +4874,7 @@
\listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}%
\ifdef\abx@field@entrysubtype
{\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}}
- {}%
- \ifcsundef{blx@pref@\the\c@refsection @\abx@field@entrykey}
- {}
- {\blx@addpageref{\abx@field@entrykey}}}%
+ {}}%
\iftoggle{blx@skiplos}
{}
{\blx@bbl@shorthand}%
@@ -5109,7 +5108,7 @@
% {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
\protected\def\blx@aux@number#1#2#3#4{%
- \blx@bbl@addentryfield{#2}{#3}{localnumber}{#4}%
+ \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}%
\ifblank{#4}
{}
{\csgdef{blx@labelnumber@#3}{#4}%
@@ -5121,33 +5120,41 @@
% {<entrykey>}{<refsection>}{<numberprefix>}
\protected\def\blx@aux@numprefix#1#2#3{%
- \blx@bbl@addentryfield{#1}{#2}{prefixnumber}{#3}}
+ \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
\def\blx@addlabelnumber{%
- \iftoggle{blx@skiplab}
- {}
- {\begingroup
- \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
- \iftoggle{blx@omitnumbers}
- {\blx@auxwrite\@mainaux{}{%
- \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{}}}
+ \begingroup
+ \iftoggle{blx@labelnumber}
+ {\nottoggle{blx@skiplab}
{\ifundef\abx@field@shorthand
{\ifundef\abx@field@localnumber
- {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
- \csuse{blx@labelnumber@\the\c@refsection}+1}%
- \blx@auxwrite\@mainaux{}{%
+ {\iftoggle{blx@omitnumbers}
+ {\let\abx@field@localnumber\@empty}
+ {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+ \csuse{blx@labelnumber@\the\c@refsection}+1}%
+ \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
+ \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
+ {localnumber}{\abx@field@localnumber}}%
+ \blx@auxwrite\@mainaux{}{%
\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\csuse{blx@labelnumber@\the\c@refsection}}}}
- {}}
- {}}%
- \ifdef\blx@prefixnumbers
- {\ifundef\abx@field@shorthand
- {\blx@auxwrite\@mainaux{}{%
- \string\blx@aux@numprefix{\abx@field@entrykey}%
- {\the\c@refsection}{\expandonce\blx@prefixnumbers}}}
+ {\the\c@refsection}{\abx@field@localnumber}}}
+ {}}
+ {}%
+ \ifdef\blx@prefixnumbers
+ {\ifundef\abx@field@shorthand
+ {\edef\abx@field@prefixnumber{\expandonce\blx@prefixnumbers}%
+ \ifundef\abx@field@prefixnumber
+ {\blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
+ {prefixnumber}{\expandonce\abx@field@prefixnumber}}
+ {}%
+ \blx@auxwrite\@mainaux{}{%
+ \string\blx@aux@numprefix{\abx@field@entrykey}%
+ {\the\c@refsection}{\expandonce\abx@field@prefixnumber}}}
+ {}}
{}}
- {}%
- \endgroup}}
+ {}}
+ {}%
+ \endgroup}
\def\blx@bbl@lossort{%
\begingroup
@@ -5603,7 +5610,7 @@
\define@key{blx@bib}{resetnumbers}[true]{%
\ifstrequal{#1}{true}
{\iftoggle{blx@defernumbers}
- {\csnumdef{blx@labelnumber@0}{0}}
+ {\csnumdef{blx@labelnumber@\the\c@refsection}{0}}
{\blx@warning{%
Option 'resetnumbers' requires 'defernumbers=true'.\MessageBreak
Ignoring 'resetnumbers=true'}}}
@@ -5620,7 +5627,7 @@
\define@key{blx@bib}{prefixnumbers}{%
\iftoggle{blx@defernumbers}
- {\csnumdef{blx@labelnumber@0}{0}%
+ {\csnumdef{blx@labelnumber@\the\c@refsection}{0}%
\def\blx@prefixnumbers{#1}}
{\blx@warning{%
Option 'prefixnumbers' requires 'defernumbers=true'.\MessageBreak
@@ -5690,7 +5697,7 @@
\let\blx@theprenote\@empty
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
- \c@refsection\@ne
+ \c@refsection\z@
\blx@safe@actives
\setkeys{blx@bbs}{#1}%
\blx@rest@actives
@@ -5885,12 +5892,14 @@
{}}
\def\blx@initsep{%
- \ifnum\c@instcount>\@ne
- \blx@imc@iffieldequals{sortinit}\blx@previnit
- {}
- {\addvspace{\bibinitsep}}%
- \fi
- \global\let\blx@previnit\abx@field@sortinit}
+ \blx@imc@iffieldundef{sortinit}
+ {}
+ {\ifnum\c@instcount>\@ne
+ \blx@imc@iffieldequals{sortinit}\blx@previnit
+ {}
+ {\addvspace{\bibinitsep}}%
+ \fi
+ \global\let\blx@previnit\abx@field@sortinit}}
\def\blx@namesep{%
\ifnum\c@instcount>\@ne
@@ -6443,7 +6452,7 @@
\blx@entrysetcount
\blx@setoptions@type\abx@field@entrytype
\blx@setoptions@entry
- \blx@backref
+ \blx@backref{#1}%
\blx@pagetracker
\csuse{blx@hook@citekey}%
\csuse{blx@hook@citekey@next}%
@@ -6789,21 +6798,63 @@
\global\undef\blx@saved@trackkeys@foot
\endgroup}
-\def\blx@backref@global{%
- \blx@leavevmode
- \if@filesw
- \protected@write\@mainaux{}{\string\abx@aux@backref
- {\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\thepage}{\noexpand\the\c@page}}%
+\def\blx@addbackref#1{%
+ \ifcsdef{blx@setp@\the\c@refsection @#1}
+ {\ifcase\blx@backrefsetstyle
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@ii{setp}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setp}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setp}{#1}%
+ \fi}
+ {\ifcsdef{blx@setc@\the\c@refsection @#1}
+ {\ifcase\blx@backrefsetstyle
+ \blx@addbackref@ii{setc}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setc}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setc}{#1}%
+ \fi}
+ {\blx@addbackref@i{#1}}}}
+
+\def\blx@addbackref@i#1{%
+ \ifbacktracker
+ \blx@leavevmode
+ \if@filesw
+ \protected@write\@mainaux{}{\string\abx@aux@backref
+ {\the\c@instcount}{#1}{\the\c@refsection}%
+ {\thepage}{\noexpand\the\c@page}}%
+ \fi
\fi}
+\def\blx@addbackref@ii#1#2{%
+ \expandafter\expandafter\expandafter\forcsvlist
+ \expandafter\expandafter\expandafter\blx@addbackref@i
+ \expandafter\expandafter\expandafter{%
+ \csname blx@#1@\the\c@refsection @#2\endcsname}}
+
% {<instcount>}{<entrykey>}{<refsection>}{<page>}{<page int>}
\protected\def\blx@aux@backref#1#2#3#4#5{%
\ifcsundef{blx@pref@#3@\detokenize{#2}}
{\global\cslet{blx@pref@#3@\detokenize{#2}}\@empty
- \expandafter\blx@onlypreamble
- \expandafter{\csname blx@pref@#3@\detokenize{#2}\endcsname}}
+ \expandafter\blx@onlypreamble\csname blx@pref@#3@\detokenize{#2}\endcsname}
{}%
\ifinlistcs{#4}{blx@pref@#3@\detokenize{#2}}
{}
@@ -7843,7 +7894,9 @@
\def\blx@bcf@options@global{%
\blx@bcf@comment{global}%
\blx@bcf@options{biblatex}{global}{%
- \blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+ \iftoggle{blx@labelalpha}
+ {\blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}}
+ {}%
\blx@bcf@toggle{labelalpha}%
\blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}%
\iftoggle{blx@labelyear}
@@ -7854,7 +7907,9 @@
\blx@bcf@svalue{minitems}{\the\c@minitems}%
\blx@bcf@svalue{minnames}{\the\c@minnames}%
\blx@bcf@toggle{singletitle}%
- \blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+ \iftoggle{blx@labelalpha}
+ {\blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}}
+ {}%
\blx@bcf@svalue{sortlos}{\blx@sortlos}%
\blx@bcf@toggle{terseinits}%
\blx@bcf@svalue{uniquename}{\blx@uniquename}%
@@ -7889,25 +7944,27 @@
}%
}
-\AtEndPreamble{%
- \xdef\blx@biber@options{\blx@bcf@options@global}%
- \begingroup
- \def\do#1{%
- \blx@setoptions@type{#1}%
- \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
- \ifdef\blx@opts@type
- {\dolistloop\blx@opts@type}
- {}%
- \def\do#1{%
- \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
- {\blx@bcf@comment{#1}%
- \csuse{blx@biber@sorting@\blx@sorting @#1}}
- {}}%
- \xdef\blx@biber@sorting{%
- \ifcsdef{blx@biber@sorting@\blx@sorting}
- {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
- {}}%
- \endgroup}
+\AtBeginDocument{%
+ \ifnum\blx@backend=\blx@backend@biber
+ \xdef\blx@biber@options{\blx@bcf@options@global}%
+ \begingroup
+ \def\do#1{%
+ \blx@setoptions@type{#1}%
+ \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
+ \ifdef\blx@opts@type
+ {\dolistloop\blx@opts@type}
+ {}%
+ \def\do#1{%
+ \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
+ {\blx@bcf@comment{#1}%
+ \csuse{blx@biber@sorting@\blx@sorting @#1}}
+ {}}%
+ \xdef\blx@biber@sorting{%
+ \ifcsdef{blx@biber@sorting@\blx@sorting}
+ {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
+ {}}%
+ \endgroup
+ \fi}
% [<entrytype>]{<name>}{<spec>}
@@ -8155,14 +8212,14 @@
\blx@msg@bib
@Control\string{biblatex-control,\blx@nl
\space\space options = \string{%
- \blx@version:%
+ \blx@bblversion:%
\noexpand\iftoggle{blx@debug}{1}{0}:%
\noexpand\ifnum\noexpand\blx@backend=\noexpand\blx@backend@bibtexviii
1:%
\noexpand\else
0:%
\noexpand\fi
- \noexpand\iftoggle{blx@cssort}{1}{0}:%
+ \noexpand\iftoggle{blx@sortcase}{1}{0}:%
\noexpand\iftoggle{blx@terseinits}{1}{0}:%
\noexpand\iftoggle{blx@useprefix}{1}{0}:%
\noexpand\iftoggle{blx@useauthor}{1}{0}:%
@@ -8172,7 +8229,7 @@
\noexpand\iftoggle{blx@labelyear}{1}{0}:%
\noexpand\iftoggle{blx@singletitle}{1}{0}:%
\noexpand\blx@uniquename:%
- \noexpand\csuse{blx@opt@sorting@\noexpand\blx@sorting}:%
+ \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
\noexpand\blx@sortlos:%
\noexpand\the\c@maxnames:%
\noexpand\the\c@minnames:%
@@ -8186,11 +8243,15 @@
\blx@bcf@file
\blx@bcf@comment{BIBER OPTIONS}%
\blx@bcf@options{biber}{global}{%
+ \blx@bcf@svalue{bblencoding}{\blx@inputencoding}%
\blx@bcf@svalue{bibencoding}{\blx@bibencoding}%
- \blx@bcf@toggle{cssort}%
\blx@bcf@toggle{debug}%
- \blx@bcf@svalue{inputenc}{\blx@inputenc}%
\blx@bcf@svalue{mincrossrefs}{\blx@mincrossrefs}%
+ \blx@bcf@toggle{sortcase}%
+ \ifdef\blx@sortlocale
+ {\blx@bcf@svalue{sortlocale}{\blx@sortlocale}}
+ {}%
+ \blx@bcf@toggle{sortupper}%
}%
\blx@bcf@comment{BIBLATEX OPTIONS}%
\csuse{blx@biber@options}%
@@ -8276,21 +8337,40 @@
\def\blx@bibencoding{#1}}
\DeclareBibliographyOption{sorting}{%
- \ifcsdef{blx@opt@sorting@#1}
- {\def\blx@sorting{#1}}
- {\blx@err@invopt{sorting=#1}{}}}
-\def\blx@opt@sorting@none{0}
-\def\blx@opt@sorting@nty{1}
-\def\blx@opt@sorting@nyt{2}
-\def\blx@opt@sorting@nyvt{3}
-\def\blx@opt@sorting@anyt{12}
-\def\blx@opt@sorting@anyvt{13}
-\def\blx@opt@sorting@ynt{21}
-\def\blx@opt@sorting@ydnt{22}
-\def\blx@opt@sorting@debug{99}
+ \def\blx@sorting{#1}}
+\def\blx@bibtex@sorting@none{0}
+\def\blx@bibtex@sorting@nty{1}
+\def\blx@bibtex@sorting@nyt{2}
+\def\blx@bibtex@sorting@nyvt{3}
+\def\blx@bibtex@sorting@anyt{12}
+\def\blx@bibtex@sorting@anyvt{13}
+\def\blx@bibtex@sorting@ynt{21}
+\def\blx@bibtex@sorting@ydnt{22}
+\def\blx@bibtex@sorting@debug{99}
+
+\AtEndPreamble{%
+ \ifnum\blx@backend=\blx@backend@biber
+ \ifcsdef{blx@biber@sorting@\blx@sorting @global}
+ {}
+ {\blx@err@invopt{sorting=\blx@sorting}{}%
+ \def\blx@sorting{nty}}%
+ \else
+ \ifcsdef{blx@bibtex@sorting@\blx@sorting}
+ {}
+ {\blx@err@invopt{sorting=\blx@sorting}{}%
+ \def\blx@sorting{nty}}%
+ \fi}
\DeclareBibliographyOption{sortcase}[true]{%
- \settoggle{blx@cssort}{#1}}
+ \settoggle{blx@sortcase}{#1}}
+
+\DeclareBibliographyOption{sortupper}[true]{%
+ \settoggle{blx@sortupper}{#1}}
+
+\DeclareBibliographyOption{sortlocale}{%
+ \ifblank{#1}
+ {\undef\blx@sortlocale}
+ {\edef\blx@sortlocale{\detokenize{#1}}}}
\DeclareBibliographyOption{sortlos}{%
\ifcsdef{blx@opt@sortlos@#1}
@@ -8451,10 +8531,23 @@
\DeclareBibliographyOption{backref}[true]{%
\ifstrequal{#1}{true}
- {\let\blx@backref\blx@backref@global
- \let\abx@aux@backref\blx@aux@backref}
- {\let\blx@backref\relax
- \let\abx@aux@backref\@gobblefive}}
+ {\let\blx@backref\blx@addbackref
+ \let\abx@aux@backref\blx@aux@backref
+ \booltrue{backtracker}}
+ {\let\blx@backref\@gobble
+ \let\abx@aux@backref\@gobblefive
+ \boolfalse{backtracker}}}
+
+\DeclareBibliographyOption{backrefsetstyle}{%
+ \ifcsdef{blx@opt@backrefsetstyle@#1}
+ {\letcs\blx@backrefsetstyle{blx@opt@backrefsetstyle@#1}}
+ {\blx@err@invopt{backrefsetstyle=#1}{}}}
+\def\blx@opt@backrefsetstyle@setonly{0}
+\def\blx@opt@backrefsetstyle@memonly{1}
+\def\blx@opt@backrefsetstyle@setormem{2}
+\def\blx@opt@backrefsetstyle@setandmem{3}
+\def\blx@opt@backrefsetstyle@memandset{4}
+\def\blx@opt@backrefsetstyle@setplusmem{5}
\appto\blx@mkhyperref{%
\ifHy@plainpages
@@ -8751,8 +8844,8 @@
\settoggle{blx@labelnumber}{#1}%
\iftoggle{blx@labelnumber}
{}
- {\KV@blx@opt@pre@defernumbers{false}}}
-\DeclareTypeOption{labelnumber}[true]{% FIXME: per-type check
+ {\setkeys{blx@opt@pre}{defernumbers=false}}}
+\DeclareTypeOption{labelnumber}[true]{%
\settoggle{blx@labelnumber}{#1}}
\DeclareBibliographyOption{labelalpha}[true]{%
@@ -8785,7 +8878,7 @@
\DeclareBibliographyOption{defernumbers}[true]{%
\settoggle{blx@defernumbers}{#1}%
\iftoggle{blx@defernumbers}
- {\KV@blx@opt@pre@labelnumber{true}%
+ {\setkeys{blx@opt@pre}{labelnumber}%
\let\blx@thelabelnumber\blx@addlabelnumber
\let\abx@aux@number\blx@aux@number}
{\let\blx@thelabelnumber\relax
@@ -8908,12 +9001,12 @@
\setkeys{blx@opt@ldt}{style=numeric}
\setkeys{blx@opt@pre}{%
- sorting=nty,sortlos=los,sortcase,sortcites=false,maxnames=3,minnames=1,
+ sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false,maxnames=3,minnames=1,
maxitems=3,minitems=1,mincrossrefs=2,useauthor=true,useeditor=true,
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
- backref=false,pagetracker=false,ibidtracker=false,idemtracker=false,
- opcittracker=false,loccittracker=false,citetracker=false,block=none,
- language=auto,clearlang=true,babel=none,date=comp,origdate=comp,
+ backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
+ idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
+ block=none,language=auto,clearlang=true,babel=none,date=comp,origdate=comp,
eventdate=comp,urldate=short,autopunct=true,punctfont=false,
defernumbers=false,refsection=none,refsegment=none,citereset=none,
hyperref=auto,maxline=79,parentracker,maxparens=3,bibwarn}
@@ -9052,28 +9145,28 @@
\ifundef\inputencodingname
{\ifundef\XeTeXrevision
{\ifundef\luatexversion
- {\def\blx@inputenc{ascii}%
+ {\def\blx@inputencoding{ascii}%
\blx@info@noline{%
No input encoding detected.\MessageBreak
- Assuming '\blx@inputenc'}}
- {\def\blx@inputenc{utf8}%
+ Assuming '\blx@inputencoding'}}
+ {\def\blx@inputencoding{utf8}%
\blx@info@noline{%
LuaTeX detected.\MessageBreak
- Assuming input encoding '\blx@inputenc'}}}
- {\def\blx@inputenc{utf8}%
+ Assuming input encoding '\blx@inputencoding'}}}
+ {\def\blx@inputencoding{utf8}%
\blx@info@noline{%
XeTeX detected.\MessageBreak
- Assuming input encoding '\blx@inputenc'}}}
- {\let\blx@inputenc\inputencodingname
+ Assuming input encoding '\blx@inputencoding'}}}
+ {\let\blx@inputencoding\inputencodingname
\ifboolexpr{
- test {\ifdefstring\blx@inputenc{utf8x}}
+ test {\ifdefstring\blx@inputencoding{utf8x}}
or
- test {\ifdefstring\blx@inputenc{lutf8}}
+ test {\ifdefstring\blx@inputencoding{lutf8}}
}
- {\def\blx@inputenc{utf8}}
+ {\def\blx@inputencoding{utf8}}
{}%
\blx@info@noline{%
- Input encoding '\blx@inputenc' detected}}%
+ Input encoding '\blx@inputencoding' detected}}%
\ifdef\blx@bibencoding
{\ifdefstring\blx@bibencoding{ascii}
{\blx@info@noline{%
@@ -9081,12 +9174,12 @@
No need to reencode data}%
\togglefalse{blx@reencode}}
{\ifdefstring\blx@bibencoding{inputenc}
- {\let\blx@bibencoding\blx@inputenc
+ {\let\blx@bibencoding\blx@inputencoding
\blx@info@noline{%
Data encoding '\blx@bibencoding' specified.\MessageBreak
No need to reencode data}
\togglefalse{blx@reencode}}
- {\ifdefequal\blx@bibencoding\blx@inputenc
+ {\ifdefequal\blx@bibencoding\blx@inputencoding
{\blx@info@noline{%
Data encoding '\blx@bibencoding' specified.\MessageBreak
No need to reencode data}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 25ed9a9fe4e..3418575b384 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
@@ -1,7 +1,7 @@
-% $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: blx-compat.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: blx-compat.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex generic compatibility]
% LaTeX
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 835c87aabc4..8c8d6d4e102 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
@@ -1,7 +1,7 @@
-% $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: blx-natbib.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: blx-natbib.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex natbib compatibility]
\renewcommand*{\nameyeardelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index 10d0ebfb92f..b849c96c8fa 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index 14a835427d3..d20ecf4360c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: alphabetic.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index df32026440e..b29a11290a3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 6338c38899c..6ef18cb8863 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 8a1d3d1925a..49d63d9a57d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 bddf31eebe2..fba3efe4724 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-tcomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 e79409f422e..a0f0402d31b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-terse.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 47cf2274050..40a865de101 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ticomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 c97a8d14e94..c6bb2ad2852 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 af107a90667..9a30823fbbd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index c311bfdb6e3..5b9fcea3339 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
\providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index c503c9ac161..4c527926fa8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 2a9031820ad..d75492eec3c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index 701f956efe4..dabc6395a46 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
@@ -1,7 +1,7 @@
-% $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: debug.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: debug.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index df3339bbac7..3549b169c14 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
@@ -1,7 +1,7 @@
-% $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: draft.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: draft.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index 03f185df895..e86c645e55d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 31921501429..db95ff916be 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 68ae4488b0d..5c0272837a0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 f52a2cfc403..17ecd066f01 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
@@ -1,7 +1,7 @@
-% $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: reading.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: reading.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireCitationStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index ea26e14379c..ff2c2e6c77e 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 1401d38f024..72bcc216242 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-inote.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 55ed02cc5ea..ff288bdaf69 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-note.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-note.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 e3c644b1d7d..7d91347cf5d 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad1.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 5abdb2bfbcb..33b74d04bfe 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad2.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 bcd8d124745..cb72f070da9 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad3.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 f8c8a2e9b06..9529aaabff4 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\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 30be0a1206c..09acbcdf395 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: UKenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: UKenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{british}
\InheritBibliographyStrings{british}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
index c7b94a9c987..ee424437c04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: USenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: USenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
index ba09bcdf7db..bfe75d3a09e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
@@ -1,7 +1,7 @@
-% $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: american.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: american.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index 1097a54c200..115be2a00f7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
@@ -1,7 +1,7 @@
-% $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: australian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: australian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index f2351c9ec70..532bc45ebea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
@@ -1,7 +1,7 @@
-% $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: austrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: austrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
index a0a542bd897..8401d4ef88a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
@@ -1,7 +1,7 @@
-% $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: brazil.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: brazil.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{brazilian}
\InheritBibliographyStrings{brazilian}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index 1181117f66b..d34ec3f8bf4 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: brazilian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: brazilian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index ff956b9f92b..6fe630cb74c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -1,7 +1,7 @@
-% $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: british.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: british.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index b82baad7991..ab42f351e96 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
@@ -1,7 +1,7 @@
-% $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: canadian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: canadian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index c240f538cef..93baf676e04 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: danish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: danish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 5926dee2d30..0d4dc4da1ed 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: dutch.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: dutch.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index cd373552c9c..f02d735893f 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: english.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: english.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index cf973ff0577..df151c9a703 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -1,7 +1,7 @@
-% $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: finnish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: finnish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 9a694b6f5b2..151c76afc80 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: french.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: french.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 430c5a2057f..0e65bb18f0a 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: german.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: german.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index b0c954cf058..0766ab0b78a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -1,7 +1,7 @@
-% $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: greek.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: greek.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index d9f8590abb4..8366d812f9d 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: italian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: italian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index 9885ffcaa48..c58f87dbde3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
@@ -1,7 +1,7 @@
-% $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: naustrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: naustrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index 078482f57aa..64f70bc49c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
@@ -1,7 +1,7 @@
-% $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: newzealand.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: newzealand.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index 711b13d6db3..0bedcdac44c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
@@ -1,7 +1,7 @@
-% $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: ngerman.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: ngerman.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index 1f699a3be89..15e3091536f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
@@ -1,7 +1,7 @@
-% $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: norsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: norsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index f54e373023e..2e9e9172c1f 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: norwegian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: norwegian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 17b8b1e22e4..3b02ce8d1e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -1,7 +1,7 @@
-% $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: nynorsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: nynorsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
index e3112d96e06..0fcccbbecbc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
@@ -1,7 +1,7 @@
-% $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: portuges.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: portuges.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{portuguese}
\InheritBibliographyStrings{portuguese}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index 4881f42b6a9..f4697cfd14d 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: portuguese.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: portuguese.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * initial draft based on brazilian.lbx
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 262276be20c..81485d92114 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 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: spanish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: spanish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index bb188b66b2a..c947aaa7d98 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -1,7 +1,7 @@
-% $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: swedish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: swedish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete