summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-16 22:15:37 +0000
committerKarl Berry <karl@freefriends.org>2011-03-16 22:15:37 +0000
commitd34bf77a2d4ca330856db5dce536f6f65345b2d4 (patch)
tree5cdc5e41ec50be2e693ece37435231cb4107f2cc /Master/texmf-dist/tex/latex/biblatex
parentae6ef6b688e802ee3a36dde35e801dd71cc982a5 (diff)
biblatex 1.3 (15mar11)
git-svn-id: svn://tug.org/texlive/trunk@21736 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.bbx4
-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.bbx4
-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.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx8
-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.def37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty209
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-mcite.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.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx14
-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.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx11
-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
86 files changed, 525 insertions, 234 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 b1496215540..f1b0fa22e90 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{alphabetic}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index 1db55785b75..6b84c1d97f2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: alphabetic.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index b65c8ee16c3..e8933fd0f90 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
index b7e2624dba8..ad40432d856 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
index 49687b7176e..f13ac7a575d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
index 293409e9a58..0200fbafd02 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
index f7c366e968d..719c6f05fcc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
index 827f1d529f2..d09eb6e9076 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index ae89d6192f6..50dc162c293 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{pagetracker}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
index aab27d1d6d5..f4f70506f10 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
index e92ceb65505..6915a3ba962 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
index f66566ac369..7550d5b3a00 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 710609095bb..9da5682b9ca 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 1a5c220ab06..219d3173b90 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,7 +1,7 @@
-% $Id: debug.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: debug.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\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 fe4eef8d288..64d5a32cc52 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -1,7 +1,7 @@
-% $Id: draft.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: draft.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{sorting=debug}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
index 9f8cf56e447..8e3d54a0a99 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
index bdc8bb474a8..09740c2308d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric-verb.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 9fa87734615..8882b3c6a2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelnumber}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index bea9d4a2c05..ac8e042c126 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -1,7 +1,7 @@
-% $Id: reading.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: reading.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 76ab28ce00a..18feeff2b0e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: standard.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
@@ -568,6 +568,10 @@
\newunit
\printfield{pagetotal}%
\newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
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 bd5b788c814..8b302934ac5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
index e607ef30c49..2641e45adbe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-inote.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
index 9cd4ca9d9b7..c07242284f6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-note.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
index 4061f108b79..a89d820defd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
index 84520444b05..c7459b29a05 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
index 0f9ef96429d..92e7b989586 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
index 460f583d4ec..1da94a05333 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index 3c2c93676f4..55760236d86 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
@@ -1,4 +1,4 @@
-% $Id: biblatex.cfg,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: biblatex.cfg,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{biblatex.cfg}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 36f149d3b65..a210229c8da 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: biblatex.def,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.3 2011/03/14 18:25:44 lehman stable $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -262,7 +262,10 @@
[suppbook,suppcollection,suppperiodical]
{citetitle}{#1}
\DeclareFieldFormat{labelyear}{#1}% = the '1995' part in 'Jones 1995a'
-\DeclareFieldFormat{extrayear}{\mknumalph{#1}}% = the 'a' in 'Jones 1995a'
+\DeclareFieldFormat{extrayear}{% = the 'a' in 'Jones 1995a'
+ \iffieldnums{labelyear}
+ {\mknumalph{#1}}
+ {\mkbibparens{\mknumalph{#1}}}}
\DeclareFieldFormat{labelalpha}{#1}% = the 'Jon95' part of 'Jon95a'
\DeclareFieldFormat{extraalpha}{\mknumalph{#1}}% = the 'a' in 'Jon95a'
\DeclareFieldFormat{shorthand}{#1\isdot}
@@ -696,7 +699,7 @@
{\ifcapital
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}
{\mkbibnameprefix{#3}\isdot}%
- \ifpunctmark{'}{}{\addhighpenspace}}}
+ \ifpunctmark{'}{}{\bibnamedelimc}}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}}%
\mkbibnamelast{#1}}%
@@ -704,14 +707,14 @@
\newbibmacro*{name:first-last}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+ \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\bibnamedelimd}%
\ifblank{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
- {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+ {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
\mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
\newbibmacro*{name:last-first}[4]{%
\ifuseprefix
@@ -721,17 +724,17 @@
\ifcapital
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}
{\mkbibnameprefix{#3}\isdot}%
- \ifpunctmark{'}{}{\addhighpenspace}}%
+ \ifpunctmark{'}{}{\bibnamedelimc}}%
\mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
- \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}}
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+ \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
\mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
\ifblank{#2#3}{}{\addcomma}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
+ \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
+ \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
\newbibmacro*{name:hook}[1]{%
\ifnumequal{\value{listcount}}{1}
@@ -1643,6 +1646,7 @@
\newrobustcmd*{\pvolcite}{\volcitecmd\parencite}
\newrobustcmd*{\fvolcite}{\volcitecmd\footcite}
\newrobustcmd*{\ftvolcite}{\volcitecmd\footcitetext}
+\newrobustcmd*{\svolcite}{\volcitecmd\smartcite}
\newrobustcmd*{\tvolcite}{\volcitecmd\textcite}
\newrobustcmd*{\avolcite}{\volcitecmd\autocite}
@@ -1650,6 +1654,7 @@
\newrobustcmd*{\Parencite}{\bibsentence\parencite}
\newrobustcmd*{\Footcite}{\footcite}
\newrobustcmd*{\Footcitetext}{\footcitetext}
+\newrobustcmd*{\Smartcite}{\bibsentence\smartcite}
\newrobustcmd*{\Textcite}{\bibsentence\textcite}
\newrobustcmd*{\Citeauthor}{\bibsentence\citeauthor}
\newrobustcmd*{\Citetitle}{\bibsentence\citetitle}
@@ -1658,6 +1663,7 @@
\newrobustcmd*{\Pvolcite}{\volcitecmd\Parencite}
\newrobustcmd*{\Fvolcite}{\volcitecmd\Footcite}
\newrobustcmd*{\Ftvolcite}{\volcitecmd\Footcitetext}
+\newrobustcmd*{\Svolcite}{\volcitecmd\Smartcite}
\newrobustcmd*{\Tvolcite}{\volcitecmd\Textcite}
\newrobustcmd*{\Avolcite}{\volcitecmd\Autocite}
@@ -1669,6 +1675,7 @@
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\multicitedelim}
\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\supercites}[\mkbibsuperscript]{\supercite}{\supercitedelim}
\DeclareMultiCiteCommand{\textcites}{\textcite}{\multicitedelim}
@@ -1676,11 +1683,13 @@
\newrobustcmd*{\Parencites}{\bibsentence\parencites}
\newrobustcmd*{\Footcites}{\footcites}
\newrobustcmd*{\Footcitetexts}{\footcitetexts}
+\newrobustcmd*{\Smartcites}{\bibsentence\smartcites}
\newrobustcmd*{\Textcites}{\bibsentence\textcites}
\DeclareAutoCiteCommand{plain}{\cite}{\cites}
\DeclareAutoCiteCommand{inline}{\parencite}{\parencites}
-\DeclareAutoCiteCommand{footnote}[l]{\footcite}{\footcites}
+%\DeclareAutoCiteCommand{footnote}[l]{\footcite}{\footcites}
+\DeclareAutoCiteCommand{footnote}[f]{\smartcite}{\smartcites}
\DeclareAutoCiteCommand{superscript}[l]{\supercite}{\supercites}
\newrobustcmd*{\Autocite}{\bibsentence\autocite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index fb6d3810573..ee938a6b7cf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: biblatex.sty,v 1.3 2011/03/14 18:25:44 lehman stable $
% Copyright (c) 2006-2011 Philipp Lehman.
%
@@ -21,11 +21,11 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.3 2011/03/14 18:25:44 lehman stable $
programmable bibliographies]
\def\blx@bblversion$#1: #2 ${#2}
-\edef\blx@bblversion{\blx@bblversion$Revision: 1.2 $}
+\edef\blx@bblversion{\blx@bblversion$Revision: 1.3 $}
%% Dependencies
@@ -124,9 +124,8 @@
\toggletrue{blx@tempa}%
\def\do#1{%
\patchcmd#1%
- {\interlinepenalty\interfootnotelinepenalty}
- {\toggletrue{blx@footnote}%
- \interlinepenalty\interfootnotelinepenalty}
+ {\color@begingroup}
+ {\color@begingroup\toggletrue{blx@footnote}}
{\togglefalse{blx@tempa}\listbreak}
{}}%
\docsvlist{%
@@ -137,16 +136,16 @@
\l@dold@footnotetext,% ledmac
\l@doldold@footnotetext,% ledmac
\@fntORI}% frenchle
+ \def\do#1{%
+ \patchcmd#1%
+ {\color@begingroup}
+ {\color@begingroup\toggletrue{blx@footnote}}
+ {}
+ {}}%
\@ifclassloaded{memoir}% memoir
- {\togglefalse{blx@tempa}%
- \def\do#1{%
- \patchcmd#1%
- {\color@begingroup}
- {\color@begingroup\toggletrue{blx@footnote}}
- {}
- {\toggletrue{blx@tempa}}}%
- \docsvlist{%
+ {\docsvlist{%
\m@mold@footnotetext,%
+ \@plainfootnotetext,%
\@twocolfootnotetext,%
\@threecolfootnotetext,%
\@parafootnotetext}}
@@ -315,6 +314,10 @@
\def\themaxitems{\the\c@maxitems}
\newcounter{minitems}
\def\theminitems{\the\c@minitems}
+\newcounter{citecounter}
+\def\thecitecount{\the\c@citecounter}
+\newcounter{savedcitecounter}
+\def\thecitecount{\the\c@savedcitecounter}
\newcounter{uniquename}
\def\theuniquename{\the\c@uniquename}
\newcounter{saveduniquename}
@@ -395,7 +398,7 @@
\newtoggle{blx@mcite}
\newtoggle{blx@loadfiles}
\newtoggle{blx@singletitle}
-\newtoggle{blx@terseinits}
+\newtoggle{blx@terseinits}% BibTeX only
\newtoggle{blx@firstinits}
\newtoggle{blx@useauthor}
\newtoggle{blx@useeditor}
@@ -3409,11 +3412,18 @@
\fi}%
\def\currentname{#3}%
\letcs\blx@thedata{abx@name@#3}%
- \let~\abx@btxnbspacefix
+ \ifnumequal\blx@backend\blx@backend@biber
+ {}
+ {\let~\bibnamedelima}%
\blx@namecodes}
-\protected\def\abx@btxnbspacefix{%
- \leavevmode\penalty\value{highnamepenalty}\space}
+\newrobustcmd*{\bibinitperiod}{\adddot}
+\newrobustcmd*{\bibinitdelim}{\addnbspace}
+\newrobustcmd*{\bibinithyphendelim}{.\mbox{-}}
+\newrobustcmd*{\bibnamedelima}{\addhighpenspace}
+\newrobustcmd*{\bibnamedelimb}{\addlowpenspace}
+\newrobustcmd*{\bibnamedelimc}{\addhighpenspace}
+\newrobustcmd*{\bibnamedelimd}{\addlowpenspace}
% [<format>][<start>-<stop>]{<namelist>}
@@ -4746,6 +4756,7 @@
\def\do##1{\togglefalse{abx@bool@##1}}%
\abx@dobooleans
\c@uniquename\z@
+ \c@citecounter\z@
\let\do\blx@saved@do}
\protected\def\blx@saveentry{%
@@ -4759,6 +4770,7 @@
\let\do\blx@savebool
\abx@dobooleans
\c@saveduniquename\c@uniquename
+ \c@savedcitecounter\c@citecounter
\let\do\blx@saved@do}
\protected\def\blx@savename#1{%
@@ -5072,7 +5084,8 @@
\ifcsdef{blx@data@\the\c@refsection @#1}}
\def\blx@getdata#1{%
- \csuse{blx@data@\the\c@refsection @#1}}
+ \csuse{blx@data@\the\c@refsection @#1}%
+ \blx@setcitecounter}
\def\blx@getdata@cite#1{%
\ifcsdef{blx@setc@\the\c@refsection @#1}
@@ -6458,10 +6471,7 @@
\def\blx@refsection{%
\begingroup
- \let\do\@makeother
- \dospecials
- \catcode`\{=\@ne
- \catcode`\}=\tw@
+ \blx@hook@fileverb
\blx@refsection@i}
\def\blx@refsection@i[#1]{%
@@ -6637,15 +6647,15 @@
\def\blx@tempa{file}%
\def\blx@tempb{bibtex}%
\def\blx@tempc{local}%
- \forcsvlist\blx@addbib@legacy{#1}%
+ \blx@xsanitizeafter{\forcsvlist\blx@addbib@legacy}{#1}%
\endgroup}
\@onlypreamble\bibliography
\def\blx@addbib@legacy#1{%
\begingroup
- \blx@xsanitizeafter{\def\blx@tempa}{\blx@stripbib{#1}\detokenize{.bib}}
- \edef\blx@tempb{\endgroup\noexpand\blx@addbib@resource{\blx@tempa}}%
- \blx@tempb}
+ \edef\blx@tempa{\endgroup
+ \noexpand\blx@addbib@resource{\blx@stripbib{#1}\detokenize{.bib}}}%
+ \blx@tempa}
\def\blx@stripbib#1{%
\expandafter\blx@stripbib@i\detokenize{#1.bib}&}
@@ -6674,10 +6684,7 @@
\def\blx@addbib@i#1[#2]{%
\begingroup
- \let\do\@makeother
- \dospecials
- \catcode`\{=\@ne
- \catcode`\}=\tw@
+ \blx@hook@fileverb
\blx@addbib@ii{#1}{#2}}
\def\blx@addbib@ii#1#2#3{%
@@ -6691,6 +6698,13 @@
\blx@xsanitizeafter{#1}{#3}%
\endgroup}
+\def\blx@hook@fileverb{%
+ \let\do\@makeother
+ \dospecials
+ \catcode`\\=\z@
+ \catcode`\{=\@ne
+ \catcode`\}=\tw@}
+
\define@key{blx@addbib}{type}{\def\blx@tempa{#1}}
\define@key{blx@addbib}{datatype}{\def\blx@tempb{#1}}
\define@key{blx@addbib}{location}{\def\blx@tempc{#1}}
@@ -6989,6 +7003,7 @@
\csuse{blx@hook@citekey@next}%
\blx@execute
\blx@loopcode
+ \blx@citecounter
\blx@citetracker
\blx@ibidtracker
\blx@idemtracker
@@ -7000,6 +7015,54 @@
\fi
\endgroup}
+% cite counter
+
+\def\blx@citecounter@global{%
+ \ifbool{@filesw}
+ {\ifbool{citetracker}
+ {\immediate\write\@mainaux{%
+ \string\abx@aux@count
+ {\the\c@refsection}{\abx@field@entrykey}}}
+ {}}
+ {}}
+
+\def\blx@citecounter@context{%
+ \ifbool{@filesw}
+ {\ifbool{citetracker}
+ {\immediate\write\@mainaux{%
+ \iftoggle{blx@footnote}
+ {\string\abx@aux@fncount}
+ {\string\abx@aux@count}%
+ {\the\c@refsection}{\abx@field@entrykey}}}
+ {}}
+ {}}
+
+% {<refsection>}{<entrykey>}
+
+\protected\def\blx@aux@count#1#2{%
+ \csnumgdef{blx@count@#1@\detokenize{#2}}{\csuse{blx@count@#1@\detokenize{#2}}+1}}
+\protected\def\blx@aux@fncount#1#2{%
+ \csnumgdef{blx@fncount@#1@\detokenize{#2}}{\csuse{blx@fncount@#1@\detokenize{#2}}+1}}
+
+\let\abx@aux@count\@gobbletwo
+\let\abx@aux@fncount\@gobbletwo
+
+\AtEndDocument{%
+ \let\abx@aux@count\@gobbletwo
+ \let\abx@aux@fncount\@gobbletwo}
+
+\protected\def\blx@setcitecounter@global{%
+ \c@citecounter0%
+ \csuse{blx@count@\the\c@refsection @\abx@field@entrykey}%
+ \relax}
+
+\protected\def\blx@setcitecounter@context{%
+ \c@citecounter0%
+ \iftoggle{blx@footnote}
+ {\csuse{blx@fncount@\the\c@refsection @\abx@field@entrykey}}
+ {\csuse{blx@count@\the\c@refsection @\abx@field@entrykey}}%
+ \relax}
+
% cite tracker
\def\blx@citetracker@global{%
@@ -7578,9 +7641,9 @@
\def\blx@defcitecmd@i#1#2{%
\blx@checkcitecmd{#2}{#1}%
- \protected\csedef{#2}{%
+ \protected\csdef{#2}{%
\blx@citecmdinit
- \noexpand\@ifstar
+ \@ifstar
{\blx@citepunct{\blxcitecmd{#2*}}}
{\blx@citepunct{\blxcitecmd{#2}}}}%
\@ifnextchar[%]
@@ -7815,9 +7878,11 @@
\csedef{blx@acitei@#1}##1##2##3##4##5{%
\begingroup
\blx@citeinit
- \if l#2\unspace##5\fi
+ \if l#2\noexpand\unspace##5\fi
+ \if f#2\noexpand\iffootnote{}{\unspace##5}\fi
\blxcitecmd{#3##1}{##2}{##3}{##4}{}%
\if r#2##5\fi
+ \if f#2\noexpand\iffootnote{##5}{}\fi
\endgroup}%
\protected\csedef{blx@macite@#1}{%
\blx@citecmdinit
@@ -7831,9 +7896,11 @@
\expandafter\noexpand
\csname blx@macitei@#1\endcsname}}%
\csedef{blx@macitei@#1}##1##2##3{%
- \if l#2\unspace##3\fi
+ \if l#2\noexpand\unspace##3\fi
+ \if f#2\noexpand\iffootnote{}{\unspace##3}\fi
##1{##2}%
\if r#2##3\fi
+ \if f#2\noexpand\iffootnote{##3}{}\fi
\endgroup}}
% {<characters>}
@@ -7945,6 +8012,8 @@
\let\blx@cite@footcite\relax
\newrobustcmd*{\footcitetext}{\blx@warn@citecmd\footcitetext\cite}
\let\blx@cite@footcitetext\relax
+\newrobustcmd*{\smartcite}{\blx@warn@citecmd\smartcite\cite}
+\let\blx@cite@smartcite\relax
\newrobustcmd*{\textcite}{\blx@warn@citecmd\textcite\cite}
\let\blx@cite@textcite\relax
\newrobustcmd*{\supercite}{\blx@warn@citecmd\supercite\cite}
@@ -8247,7 +8316,7 @@
\newrobustcmd{\blx@mkbibfootnote}[2]{%
\iftoggle{blx@footnote}
{\blx@warning{Nested notes}%
- \addspace\mkbibparens{#1}}
+ \addspace\mkbibparens{#2}}
{\unspace
\ifnum\blx@notetype=\tw@
\expandafter\@firstoftwo
@@ -8262,7 +8331,7 @@
\newrobustcmd{\blx@mkbibendnote}[2]{%
\iftoggle{blx@footnote}
{\blx@warning{Nested notes}%
- \addspace\mkbibparens{#1}}
+ \addspace\mkbibparens{#2}}
{\unspace
\ifnum\blx@notetype=\@ne
\expandafter\@firstoftwo
@@ -8468,7 +8537,6 @@
\blx@xml@toggle{singletitle}%
\blx@xml@svalue{sortalphaothers}{\sortalphaothers}%
\blx@xml@svalue{sortlos}{\blx@sortlos}%
- \blx@xml@toggle{terseinits}%
\blx@xml@svalue{uniquename}{\blx@uniquename}%
\blx@xml@toggle{useauthor}%
\blx@xml@toggle{useeditor}%
@@ -8922,10 +8990,19 @@
{\def\blx@texencoding{#1}}}
\DeclareBibliographyOption{bibencoding}{%
- \ifstrequal{#1}{inputenc}
- {\def\blx@bibencoding{auto}}
+ \ifcsdef{blx@inpenc@#1}
+ {\letcs\blx@bibencoding{blx@bibenc@#1}}
{\def\blx@bibencoding{#1}}}
+\def\abx@mapbibenc#1#2{\csdef{blx@bibenc@#1}{#2}}
+\abx@mapbibenc{inputenc}{auto}
+\abx@mapbibenc{x-ascii}{ascii}
+
+\def\abx@mapinpenc#1#2{\csdef{blx@inpenc@#1}{#2}}
+\abx@mapinpenc{utf8x}{utf8}
+\abx@mapinpenc{lutf8}{utf8}
+\abx@mapinpenc{x-ascii}{ascii}
+
\DeclareBibliographyOption{safeinputenc}[true]{%
\settoggle{blx@safeinputenc}{#1}}
\newtoggle{blx@safeinputenc}
@@ -9059,8 +9136,16 @@
\fi}
\DeclareBibliographyOption{terseinits}[true]{%
- \settoggle{blx@terseinits}{#1}}
-
+ \ifstrequal{#1}{true}
+ {\toggletrue{blx@terseinits}% BibTeX only
+ \renewrobustcmd*{\bibinitperiod}{}
+ \renewrobustcmd*{\bibinitdelim}{}
+ \renewrobustcmd*{\bibinithyphendelim}{}}
+ {\togglefalse{blx@terseinits}% BibTeX only
+ \renewrobustcmd*{\bibinitperiod}{\adddot}
+ \renewrobustcmd*{\bibinitdelim}{\addnbspace}
+ \renewrobustcmd*{\bibinithyphendelim}{\adddot\mbox{-}}}}
+
\DeclareBibliographyOption{firstinits}[true]{%
\settoggle{blx@firstinits}{#1}}
@@ -9239,6 +9324,28 @@
\blx@opt@pagetracker@page
\fi}
+\DeclareBibliographyOption{citecounter}[true]{%
+ \ifcsdef{blx@opt@citecounter@#1}
+ {\csuse{blx@opt@citecounter@#1}}
+ {\blx@err@invopt{citecounter=#1}{}}}
+\def\blx@opt@citecounter@true{%
+ \let\blx@setcitecounter\blx@setcitecounter@global
+ \let\blx@citecounter\blx@citecounter@global
+ \let\abx@aux@count\blx@aux@count
+ \let\abx@aux@fncount\blx@aux@fncount
+ \booltrue{citetracker}}
+\def\blx@opt@citecounter@context{%
+ \let\blx@setcitecounter\blx@setcitecounter@context
+ \let\blx@citecounter\blx@citecounter@context
+ \let\abx@aux@count\blx@aux@count
+ \let\abx@aux@fncount\blx@aux@fncount
+ \booltrue{citetracker}}
+\def\blx@opt@citecounter@false{%
+ \let\blx@setcitecounter\relax
+ \let\blx@citecounter\relax
+ \let\abx@aux@count\@gobbletwo
+ \let\abx@aux@fncount\@gobbletwo}
+
\DeclareBibliographyOption{citetracker}[true]{%
\ifcsdef{blx@opt@citetracker@#1}
{\csuse{blx@opt@citetracker@#1}}
@@ -9624,10 +9731,11 @@
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
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,
- parentracker,maxparens=3,maxline=79,bibencoding=auto,bibwarn}
+ citecounter=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,parentracker,maxparens=3,maxline=79,
+ bibencoding=auto,bibwarn}
% Load compatibility code
@@ -9762,11 +9870,6 @@
\fi
\blx@checkencoding}
-\def\abx@mapinpenc#1#2{\csdef{blx@enc@#1}{#2}}
-\abx@mapinpenc{utf8x}{utf8}
-\abx@mapinpenc{lutf8}{utf8}
-\abx@mapinpenc{x-ascii}{ascii}
-
\def\blx@checkencoding{%
\ifdef\blx@texencoding
{\blx@info@noline{%
@@ -9786,8 +9889,8 @@
\blx@info@noline{%
XeTeX detected.\MessageBreak
Assuming input encoding '\blx@texencoding'}}}
- {\ifcsdef{blx@enc@\inputencodingname}
- {\letcs\blx@texencoding{blx@enc@\inputencodingname}}
+ {\ifcsdef{blx@inpenc@\inputencodingname}
+ {\letcs\blx@texencoding{blx@inpenc@\inputencodingname}}
{\let\blx@texencoding\inputencodingname}%
\blx@info@noline{%
Input encoding '\blx@texencoding' detected}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 24c602459c7..c4233d8946f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
@@ -1,7 +1,7 @@
-% $Id: blx-compat.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: blx-compat.def,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.3 2011/03/14 18:25:44 lehman stable $
biblatex generic compatibility]
% LaTeX
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
index fa80c341df2..ec956ffb2bf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
@@ -1,7 +1,7 @@
-% $Id: blx-mcite.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: blx-mcite.def,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{blx-mcite.def}
-[\abx@rcsid $Id: blx-mcite.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: blx-mcite.def,v 1.3 2011/03/14 18:25:44 lehman stable $
mcite-like citation commands]
\newrobustcmd*{\mcite}{\mcitelike\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 534db788170..32ad68e86ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
@@ -1,7 +1,7 @@
-% $Id: blx-natbib.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: blx-natbib.def,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.3 2011/03/14 18:25:44 lehman stable $
biblatex natbib compatibility]
\renewcommand*{\nameyeardelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index 63ff428a8c5..81843b1e6f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
@@ -54,6 +54,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{}
{\usebibmacro{citeindex}%
@@ -63,5 +70,6 @@
\bibclosebracket}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index d23af004baa..b8669cd3e8f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: alphabetic.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
@@ -54,6 +54,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\let\cbx@tempa=\empty
\undef\cbx@lasthash}
@@ -65,5 +72,6 @@
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
\endinput
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 63fd9289f4b..e41f11bcd24 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{sortcites,autocite=footnote}
\newbool{cbx:parens}
@@ -132,6 +132,14 @@
{}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
@@ -143,6 +151,8 @@
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
+ {\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
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 c610359298b..7089cd86305 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -120,6 +120,13 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
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 7ed9417632a..db3f91c75ab 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -160,6 +160,14 @@
{}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {}
+ {\usebibmacro{cite:postnote}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
@@ -171,6 +179,8 @@
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
+ {\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
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 d44010907e7..97fa89d8447 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index e869ce30d3e..7c79fb194c6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireCitationStyle{authortitle}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 2cae1c36733..bf8da589b15 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireCitationStyle{authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index aa16238e717..274acf9d356 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authortitle.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{autocite=footnote}
\newbool{cbx:parens}
@@ -93,6 +93,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
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 4ca4b47f411..f99ffa25798 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
\newbool{cbx:parens}
@@ -191,6 +191,14 @@
{}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
@@ -202,6 +210,8 @@
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
+ {\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
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 02d2335b759..9b1f3b168b5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
\providecommand*{\mkibid}[1]{#1}
@@ -142,6 +142,13 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
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 5b61c6f5ed7..b2497046004 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
@@ -221,6 +221,14 @@
{}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {}
+ {\usebibmacro{cite:postnote}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
@@ -232,6 +240,8 @@
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
+ {\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 29d157e70b7..abba0ac11d6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: authoryear.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
\newbool{cbx:parens}
@@ -111,6 +111,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index 567b0b16a08..6d4eb0c5f7a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
@@ -1,7 +1,7 @@
-% $Id: debug.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: debug.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{autocite=plain}
@@ -67,6 +67,12 @@
{\usebibmacro{next}}
{\usebibmacro{end}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{begin}{smartcite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{begin}{textcite}}
{\usebibmacro{key}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index 7d304f67683..298c24028d1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
@@ -1,7 +1,7 @@
-% $Id: draft.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: draft.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{autocite=plain}
@@ -57,6 +57,12 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{textcite}}
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 ae9d288f887..ee9e3e3dc35 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -146,6 +146,15 @@
{\usebibmacro{cite:dump}%
\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite:comp}}
+ {}
+ {\usebibmacro{cite:dump}%
+ \usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
@@ -170,5 +179,6 @@
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
\endinput
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 0b44d0842fc..91d4e5a18e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric-verb.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -59,6 +59,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{}
{\usebibmacro{citeindex}%
@@ -80,5 +87,6 @@
{}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 20219e9ed19..bb086e0a474 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: numeric.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -59,6 +59,13 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\textcite}
{\let\cbx@tempa=\empty
\undef\cbx@lasthash}
@@ -82,5 +89,6 @@
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index 3db8aabe68e..fdfa05ecf5e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
@@ -1,7 +1,7 @@
-% $Id: reading.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: reading.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\RequireCitationStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index c0a042a260b..4b5a602d089 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
@@ -162,4 +162,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 80de5141827..a21642c31ab 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-inote.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
@@ -219,4 +219,13 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \iffootnote
+ {\usebibmacro{footcite}}
+ {\usebibmacro{cite}}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 f912d893c9c..84cf0e8f68f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-note.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
@@ -189,4 +189,13 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \iffootnote
+ {\usebibmacro{footcite}}
+ {\usebibmacro{cite}}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index 617e230b05c..e5789f84ce6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:ibidpage}
@@ -190,4 +190,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 663079ca156..48dd1eb718a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:fullcite}
@@ -182,4 +182,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
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 f5e85d44141..60e534e7846 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:loccit}
@@ -157,4 +157,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index b2781a7d97b..0434622256d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: verbose.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
@@ -132,4 +132,11 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index 23197e83951..b30059218b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: UKenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: UKenglish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InheritBibliographyExtras{british}
\InheritBibliographyStrings{british}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
index 1e5aca96895..e29c06c0715 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: USenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: USenglish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
index ed5eabdc4f5..c56ea16a4e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
@@ -1,7 +1,7 @@
-% $Id: american.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: american.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index 103788979d7..4516c556084 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
@@ -1,7 +1,7 @@
-% $Id: australian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: australian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index f1c4e135546..d1fd9b6fa5d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
@@ -1,7 +1,7 @@
-% $Id: austrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: austrian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
index 88f9606d03b..bbc8d62b412 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
@@ -1,7 +1,7 @@
-% $Id: brazil.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: brazil.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InheritBibliographyExtras{brazilian}
\InheritBibliographyStrings{brazilian}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index 78dedcda23f..384286ad680 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -1,7 +1,7 @@
-% $Id: brazilian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: brazilian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index fbc9c7a76e4..97f5c183c8d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -1,7 +1,7 @@
-% $Id: british.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: british.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index b980f196294..e9fd9298c08 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
@@ -1,7 +1,7 @@
-% $Id: canadian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: canadian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index 7741dea9b9a..f462eeab40a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -1,7 +1,7 @@
-% $Id: danish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: danish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index edf864c4bd8..1558c0120b2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -1,7 +1,7 @@
-% $Id: dutch.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: dutch.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 2dfe55d1545..e11d6c6fb27 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -1,7 +1,7 @@
-% $Id: english.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: english.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 9f1eb5bc9bb..2f8c97388bf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -1,7 +1,7 @@
-% $Id: finnish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: finnish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index c4049bb5153..cb7014cc729 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -1,7 +1,7 @@
-% $Id: french.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: french.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 1e4be415137..3120288603a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -1,7 +1,7 @@
-% $Id: german.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: german.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index e0c1d683173..add26a1f49e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -1,7 +1,7 @@
-% $Id: greek.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: greek.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 083a712a1a3..a29a8f63b03 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -1,7 +1,7 @@
-% $Id: italian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: italian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index c883656fdc9..d597d248f6a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
@@ -1,7 +1,7 @@
-% $Id: naustrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: naustrian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index 947174301e4..6e30b5eb4de 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
@@ -1,7 +1,7 @@
-% $Id: newzealand.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: newzealand.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index 0d71e318811..3ce8c3b0f51 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
@@ -1,7 +1,7 @@
-% $Id: ngerman.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: ngerman.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index 266c2ae08a6..3e188218f9f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
@@ -1,7 +1,7 @@
-% $Id: norsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: norsk.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index 951d720f9a6..e43426ea0e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -1,7 +1,7 @@
-% $Id: norwegian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: norwegian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 7404c8648b6..5717d57df1d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -1,7 +1,7 @@
-% $Id: nynorsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: nynorsk.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
index a1289bfa950..aef877fdcb4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
@@ -1,7 +1,7 @@
-% $Id: portuges.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: portuges.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
\InheritBibliographyExtras{portuguese}
\InheritBibliographyStrings{portuguese}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index 8e940f3cb2a..91422b9c88a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,7 +1,7 @@
-% $Id: portuguese.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: portuguese.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 8bf61d8b161..b95d0fae1ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -1,7 +1,7 @@
-% $Id: spanish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: spanish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index ad4d5184cfc..e5d10f985f3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -1,7 +1,7 @@
-% $Id: swedish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: swedish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $
\ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.2a 2011/02/13 12:05:37 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.3 2011/03/14 18:25:44 lehman stable $]
% Status:
% - Incomplete