summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-08 00:40:13 +0000
committerKarl Berry <karl@freefriends.org>2011-01-08 00:40:13 +0000
commit686b506d441e4258181e3c918e94f3bc767b9b34 (patch)
tree76447946afa14a129ad641b43ec73b7bcbbacc85 /Master/texmf-dist/tex/latex/biblatex
parent3fa71c8703f40728cf20c8d9f6ed721cbe9bfd44 (diff)
biblatex 1.1 (5jan11)
git-svn-id: svn://tug.org/texlive/trunk@20968 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.bbx7
-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.bbx60
-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.bbx4
-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.def374
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty1492
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-mcite.def78
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-natbib.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx5
-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.lbx6
-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.lbx455
-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, 1905 insertions, 883 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 396e025b6ce..f8a902a2bbe 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.1 2011/01/05 21:45:11 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 4270a2fd843..cdd8743113d 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: alphabetic.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
@@ -16,7 +16,8 @@
\defbibenvironment{bibliography}
{\list
{\printtext[labelalphawidth]{%
- \printfield{labelalpha}%
+ \printfield{prefixnumber}%
+ \printfield{labelalpha}%
\printfield{extraalpha}}}
{\setlength{\labelwidth}{\labelalphawidth}%
\setlength{\leftmargin}{\labelwidth}%
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 925373eb6e1..b91c016c1c5 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.1 2011/01/05 21:45:11 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 11df3dc8ec7..7673969e613 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.1 2011/01/05 21:45:11 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 ca69cebf4e7..912da0e564a 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.1 2011/01/05 21:45:11 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 dfad9a38f6c..5b7394b0c44 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.1 2011/01/05 21:45:11 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 c90133daad8..9b434e09cb1 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.1 2011/01/05 21:45:11 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 b6f88330b1e..b36df0b681f 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.1 2011/01/05 21:45:11 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 359fd16945d..341ff8c9901 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.1 2011/01/05 21:45:11 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 f5d0068c6df..d2e2998cb9c 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.1 2011/01/05 21:45:11 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 b93f2af0045..b282b9b7523 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.1 2011/01/05 21:45:11 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 902fccee8e5..404336c429c 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.1 2011/01/05 21:45:11 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 220875f605a..65f2920e45b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,10 +1,9 @@
-% $Id: authoryear.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\RequireBibliographyStyle{standard}
-\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
@@ -13,6 +12,12 @@
{\ExecuteBibliographyOptions{pagetracker=false}%
\renewbibmacro*{bbx:savehash}{}}}
+\DeclareBibliographyOption{mergedate}[true]{%
+ \setbool{bbx:mergedate}{#1}}
+\newbool{bbx:mergedate}
+
+\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker,mergedate}
+
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}
@@ -143,7 +148,11 @@
\newbibmacro*{date+extrayear}{%
\iffieldundef{year}
{}
- {\printtext[parens]{\printdateextra}}}
+ {\printtext[parens]{%
+ \ifbool{bbx:mergedate}
+ {\printdateextra}
+ {\printfield{labelyear}%
+ \printfield{extrayear}}}}}
\newbibmacro*{labeltitle}{%
\iffieldundef{label}
@@ -153,33 +162,26 @@
{\printfield[title]{shorttitle}}}
{\printfield{label}}}
-\renewbibmacro*{publisher+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- \newunit}
-
-\renewbibmacro*{institution+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{institution}%
- \newunit}
-
-\renewbibmacro*{organization+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{organization}%
- \newunit}
-
-\renewbibmacro*{location+date}{%
- \printlist{location}}
-
\renewbibmacro*{issue+date}{%
- \iffieldundef{issue}
- {}
- {\printtext[parens]{\printfield{issue}}}%
+ \ifbool{bbx:mergedate}
+ {\iffieldundef{issue}
+ {}
+ {\printtext[parens]{\printfield{issue}}}}
+ {\printtext[parens]{%
+ \iffieldundef{issue}
+ {\usebibmacro{date}}
+ {\printfield{issue}%
+ \setunit*{\addspace}%
+ \usebibmacro{date}}}}
\newunit}
-\renewbibmacro*{date}{}
+\renewbibmacro*{date}{%
+ \ifboolexpr{
+ bool {bbx:mergedate}
+ or
+ test {\iffieldundef{month}}
+ }
+ {}
+ {\printdate}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index f82211c0bc6..8739ff26d3e 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: debug.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.1 2011/01/05 21:45:11 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 29fb249dded..aa66d7eb988 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: draft.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.1 2011/01/05 21:45:11 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 140d0c9bd9e..f1a4e5f7c2c 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric-comp.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.1 2011/01/05 21:45:11 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 9d40638a221..d204950c8ae 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric-verb.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.1 2011/01/05 21:45:11 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 db938f58a3c..daabb005119 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.1 2011/01/05 21:45:11 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 d0dd920c1eb..0d9474063b6 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: reading.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.1 2011/01/05 21:45:11 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 9fc0523d92d..85052cd9eba 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: standard.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
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 87014177672..e10bf52db20 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.1 2011/01/05 21:45:11 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 eda8b06781a..c213e2e91f4 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-inote.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.1 2011/01/05 21:45:11 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 5d27dccef2d..a1b790d0177 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-note.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.1 2011/01/05 21:45:11 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 84e63c9c09d..6ea16ad3485 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.1 2011/01/05 21:45:11 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 6761fcd8356..0c8b413ce80 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.1 2011/01/05 21:45:11 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 f946eaa7e95..018ec90381e 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.1 2011/01/05 21:45:11 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 2e7cc70d811..b61007d06c1 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.1 2011/01/05 21:45:11 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 bc37007d08e..0e603dc8af2 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: biblatex.cfg,v 1.1 2011/01/05 21:45:11 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 f3f495a6619..a10317f12a6 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: biblatex.def,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.0 2010/11/19 16:16:35 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.1 2011/01/05 21:45:11 lehman stable $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -255,16 +255,12 @@
% Used in citations
\DeclareFieldFormat{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[article]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[incollection]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[inproceedings]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[patent]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[thesis]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[unpublished]{citetitle}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[suppbook]{citetitle}{#1}
-\DeclareFieldFormat[suppcollection]{citetitle}{#1}
-\DeclareFieldFormat[suppperiodical]{citetitle}{#1}
+\DeclareFieldFormat
+ [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
+ {citetitle}{\mkbibquote{#1\isdot}}
+\DeclareFieldFormat
+ [suppbook,suppcollection,suppperiodical]
+ {citetitle}{#1}
\DeclareFieldFormat{labelyear}{#1}% = the '1995' part in 'Jones 1995a'
\DeclareFieldFormat{extrayear}{\mknumalph{#1}}% = the 'a' in 'Jones 1995a'
\DeclareFieldFormat{labelalpha}{#1}% = the 'Jon95' part of 'Jon95a'
@@ -354,39 +350,31 @@
\DeclareFieldFormat{month}{\mkbibmonth{#1}}
\DeclareFieldFormat{note}{#1\isdot}
\DeclareFieldFormat{number}{#1}% number in a series
-\DeclareFieldFormat[article]{number}{#1}% number of a journal
+\DeclareFieldFormat[article,periodical]{number}{#1}% number of a journal
\DeclareFieldFormat{pages}{\mkpageprefix[bookpagination]{#1}}
\DeclareFieldFormat{pagetotal}{\mkpagetotal[bookpagination]{#1}}
\DeclareFieldFormat{part}{.#1}% physical part of a logical volume
\DeclareFieldFormat{series}{#1}% publication series
-\DeclareFieldFormat[article]{series}{% series of a journal
+\DeclareFieldFormat[article,periodical]{series}{% series of a journal
\ifinteger{#1}
{\mkbibordseries{#1}~\bibstring{jourser}}
{\ifbibstring{#1}{\bibstring{#1}}{#1}}}
\DeclareFieldFormat{pubstate}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
\DeclareFieldFormat{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[article]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[inbook]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[incollection]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[inproceedings]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[patent]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[thesis]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[unpublished]{title}{\mkbibquote{#1\isdot}}
-\DeclareFieldFormat[suppbook]{title}{#1}
-\DeclareFieldFormat[suppcollection]{title}{#1}
-\DeclareFieldFormat[suppperiodical]{title}{#1}
+\DeclareFieldFormat
+ [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
+ {title}{\mkbibquote{#1\isdot}}
+\DeclareFieldFormat
+ [suppbook,suppcollection,suppperiodical]
+ {title}{#1}
\DeclareFieldFormat{type}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
\DeclareFieldFormat{url}{\mkbibacro{URL}\addcolon\space\url{#1}}
\DeclareFieldFormat{urldate}{\mkbibparens{\bibstring{urlseen}\space#1}}
\DeclareFieldFormat{version}{\bibstring{version}~#1}
\DeclareFieldFormat{volume}{\bibstring{volume}~#1}% volume of a book
-\DeclareFieldFormat[article]{volume}{#1}% volume of a journal
+\DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal
\DeclareFieldFormat{volumes}{#1~\bibstring{volumes}}
-\DeclareFieldAlias[periodical]{number}[article]{number}
-\DeclareFieldAlias[periodical]{series}[article]{series}
-\DeclareFieldAlias[periodical]{volume}[article]{volume}
-
% Generic formats for \printtext and \printfield
\DeclareFieldFormat{emph}{\mkbibemph{#1}}
@@ -904,6 +892,254 @@
\endgroup}
% ------------------------------------------------------------------
+% CUSTOMIZATION
+% ------------------------------------------------------------------
+
+\DeclareLabelname{%
+ shortauthor,
+ author,
+ shorteditor,
+ editor,
+ translator}
+
+\DeclareLabelyear{%
+ year,
+ eventyear,
+ origyear,
+ urlyear}
+
+% ------------------------------------------------------------------
+% SORTING
+% ------------------------------------------------------------------
+
+\DeclarePresort{mm}
+
+\DeclareSortingScheme{none}{
+ \sort{\citeorder}
+}
+
+\DeclareSortingScheme{debug}{
+ \sort{
+ \field{entrykey}
+ }
+}
+
+\DeclareSortingScheme{nty}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+}
+
+\DeclareSortingScheme{nyt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+}
+
+\DeclareSortingScheme{nyvt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+}
+
+\DeclareSortingScheme{anyt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[pass=label]{
+ \field{labelalpha}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort[pass=final]{
+ \field{labelalpha}
+ }
+ \sort[pass=final]{
+ \field[padside=left,padwidth=4,padchar=0]{extraalpha}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+}
+
+\DeclareSortingScheme{anyvt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[pass=label]{
+ \field{labelalpha}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort[pass=final]{
+ \field{labelalpha}
+ }
+ \sort[pass=final]{
+ \field[padside=left,padwidth=4,padchar=0]{extraalpha}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+}
+
+\DeclareSortingScheme{ynt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ \literal{9999}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+}
+
+\DeclareSortingScheme{ydnt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort[direction=descending]{
+ \field[strside=left,strwidth=4]{sortyear}
+ \field[strside=left,strwidth=4]{year}
+ \literal{9999}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{editor}
+ \name{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+}
+
+% ------------------------------------------------------------------
% MACROS FOR LBX FILES
% ------------------------------------------------------------------
@@ -993,18 +1229,18 @@
\ifcase\abx@classtype\relax % article
\defbibheading{bibliography}[\refname]{%
\section*{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{shorthands}[\losname]{%
\section*{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibintoc}[\refname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{losintoc}[\losname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
@@ -1022,18 +1258,18 @@
\or % book/report
\defbibheading{bibliography}[\bibname]{%
\chapter*{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{shorthands}[\losname]{%
\chapter*{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{losintoc}[\losname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
@@ -1057,26 +1293,26 @@
{\ifkomabibtotoc
{\addsec{#1}}
{\section*{#1}}%
- \@mkboth{#1}{#1}}}
+ \markboth{#1}{#1}}}
\defbibheading{shorthands}[\losname]{%
\ifkomabibtotocnumbered
{\section{#1}}
{\ifkomabibtotoc
{\addsec{#1}}
{\section*{#1}}%
- \@mkboth{#1}{#1}}}
+ \markboth{#1}{#1}}}
\defbibheading{bibintoc}[\refname]{%
\addsec{#1}%
- \@mkboth{#1}{#1}}
+ \markboth{#1}{#1}}
\defbibheading{losintoc}[\losname]{%
\addsec{#1}%
- \@mkboth{#1}{#1}}
+ \markboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
- \@mkboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+ \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
\defbibheading{losnumbered}[\losname]{%
\section{#1}%
- \@mkboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+ \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
\defbibheading{subbibliography}[\refname]{%
\subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
@@ -1092,60 +1328,61 @@
{\ifkomabibtotoc
{\addchap{#1}}
{\chapter*{#1}}%
- \@mkboth{#1}{#1}}}
+ \markboth{#1}{#1}}}
\defbibheading{shorthands}[\losname]{%
\ifkomabibtotocnumbered
{\chapter{#1}}
{\ifkomabibtotoc
{\addchap{#1}}
{\chapter*{#1}}%
- \@mkboth{#1}{#1}}}
+ \markboth{#1}{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\addchap{#1}%
- \@mkboth{#1}{#1}}
+ \markboth{#1}{#1}}
\defbibheading{losintoc}[\losname]{%
\addchap{#1}%
- \@mkboth{#1}{#1}}
+ \markboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
- \@mkboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+ \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
\defbibheading{losnumbered}[\losname]{%
\chapter{#1}%
- \@mkboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+ \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
\if@twoside\markright{\sectionmarkformat#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
\addsec{#1}%
- \@mkboth{#1}{#1}}
+ \markboth{#1}{#1}}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
\or % memoir (article)
+ \providecommand*{\memUChead}{\MakeUppercase}
\defbibheading{bibliography}[\refname]{%
\section*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{section}{#1}}
{}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{shorthands}[\losname]{%
\section*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{section}{#1}}
{}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{bibintoc}[\refname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{losintoc}[\losname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}}
\defbibheading{losnumbered}[\losname]{%
@@ -1156,58 +1393,59 @@
{\phantomsection
\addcontentsline{toc}{subsection}{#1}}
{}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibintoc}[\refname]{%
\subsection*{#1}%
\phantomsection
\addcontentsline{toc}{subsection}{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibnumbered}[\refname]{%
\subsection{#1}}
\or % memoir (book)
+ \providecommand*{\memUChead}{\MakeUppercase}
\defbibheading{bibliography}[\bibname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{shorthands}[\losname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{losintoc}[\losname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{losnumbered}[\losname]{%
\chapter{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{section}{#1}}
{}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibintoc}[\refname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
@@ -1274,6 +1512,14 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\citedate}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\printdate}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\citeurl}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index cb8272e6568..47318578479 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,6 +1,6 @@
-% $Id: biblatex.sty,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: biblatex.sty,v 1.1 2011/01/05 21:45:11 lehman stable $
-% Copyright (c) 2006-2010 Philipp Lehman.
+% Copyright (c) 2006-2011 Philipp Lehman.
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -21,13 +21,13 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.0 2010/11/19 16:16:35 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.1 2011/01/05 21:45:11 lehman stable $
programmable bibliographies]
\def\blx@bblversion$#1: #2 ${#2}
-\edef\blx@bblversion{\blx@bblversion$Revision: 1.0 $}
+\edef\blx@bblversion{\blx@bblversion$Revision: 1.1 $}
-%% Compatibility and requirements
+%% Dependencies
\RequirePackage{etoolbox}
\RequirePackage{keyval}
@@ -35,15 +35,38 @@
\RequirePackage{ifthen}
\RequirePackage{url}
-\@ifpackagelater{etoolbox}{2010/08/21}
+\@ifpackagelater{etoolbox}{2010/11/29}
{}
{\PackageError{biblatex}
{Outdated 'etoolbox' package}
- {Upgrade to etoolbox v2.0 (2010/08/21) or later.\MessageBreak
+ {Upgrade to etoolbox v2.1 (2010/11/29) or later.\MessageBreak
I found: '\csuse{ver@etoolbox.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
+%% Category codes
+
+\def\blx@docatcodes{%
+ \do\=\do\<\do\>\do\-\do\"\do\'\do\`\do\.%
+ \do\,\do\;\do\:\do\!\do\?\do\/}
+\def\do#1{\catcode\number`#1=\the\catcode`#1\relax}
+\edef\blx@catcodes{\blx@docatcodes\do\^\do\~\do\&\do\|}
+\let\do\noexpand
+
+\def\blx@saneccodes{%
+ \catcode`\~=\active
+ \let\do\@makeother
+ \blx@docatcodes
+ \let\do\noexpand}
+
+\blx@saneccodes
+\catcode`\&=3
+\catcode`\|=3
+\catcode`\^=7
+\def\blx@nl{^^J}
+
+%% Compatibility
+
\AtEndPreamble{%
\def\do#1{%
\@ifpackageloaded{#1}
@@ -183,14 +206,14 @@
{Outdated 'csquotes' package}
{Upgrade to csquotes v4.4 (2009/05/30) or later.\MessageBreak
I found: '\csuse{ver@csquotes.sty}'}}%
+ \BlockquoteDisable{\let\blx@thecheckpunct\@gobble}%
\@ifpackagelater{csquotes}{2009/08/27}
{\appto\@blockquote@prehook{\abx@savetrackers}%
\appto\@blockquote@posthook{\abx@resttrackers\abx@cleartrackers}}
- {\BlockquoteDisable{\let\blx@thecheckpunct\@gobble}}%
+ {}%
\@ifpackagelater{csquotes}{2010/06/09}
{}
- {\newcommand*{\@quotereset}{}%
- \newcount\@quotereset}}
+ {\newcommand*{\@quotereset}{}\newcount\@quotereset}}
{\@ifpackageloaded{babel}
{\blx@warning@noline{%
'babel' detected but 'csquotes' missing.\MessageBreak
@@ -228,29 +251,30 @@
\appto\blx@setsfcodes{%
\sfcode`\`=\z@
\sfcode`\'=\z@}}%
- \addtocontents{toc}{%
- \string\boolfalse{citerequest}%
- \string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}%
- \string\boolfalse{backtracker}}%
- \addtocontents{lof}{%
- \string\boolfalse{citerequest}%
- \string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}%
- \string\boolfalse{backtracker}}%
- \addtocontents{lot}{%
- \string\boolfalse{citerequest}%
- \string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}%
- \string\boolfalse{backtracker}}%
\let\do\noexpand}
\begingroup
\@makeother\#
+% \relax: gobble newline -> titletoc.sty
\AtEndPreamble{%
+ \addtocontents{toc}{%
+ \boolfalse{citerequest}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \boolfalse{backtracker}\relax}%
+ \addtocontents{lof}{%
+ \boolfalse{citerequest}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \boolfalse{backtracker}\relax}%
+ \addtocontents{lot}{%
+ \boolfalse{citerequest}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \boolfalse{backtracker}\relax}%
\patchcmd\addtocontents
{\string\@writefile}
- {\string\@writefile{#1}{\string\defcounter{refsection}{\the\c@refsection}}\blx@nl
+ {\string\@writefile{#1}{\defcounter{refsection}{\the\c@refsection}\relax}%
\string\@writefile}
{}
{\blx@err@patch{\string\addtocontents}}}
@@ -261,27 +285,6 @@
% trick showkeys into believing we're havard
\let\HAR@checkdef\@empty
-%% Category codes
-
-\def\blx@docatcodes{%
- \do\=\do\<\do\>\do\-\do\"\do\'\do\`\do\.%
- \do\,\do\;\do\:\do\!\do\?\do\/}
-\def\do#1{\catcode\number`#1=\the\catcode`#1\relax}
-\edef\blx@catcodes{\blx@docatcodes\do\^\do\~\do\&\do\|}
-\let\do\noexpand
-
-\def\blx@saneccodes{%
- \catcode`\~=\active
- \let\do\@makeother
- \blx@docatcodes
- \let\do\noexpand}
-
-\blx@saneccodes
-\catcode`\&=3
-\catcode`\|=3
-\catcode`\^=7
-\def\blx@nl{^^J}
-
%% Allocation
\providecommand{\@gobblefive}[5]{}
@@ -314,6 +317,8 @@
\def\theminitems{\the\c@minitems}
\newcounter{uniquename}
\def\theuniquename{\the\c@uniquename}
+\newcounter{saveduniquename}
+\def\thesaveduniquename{\the\c@saveduniquename}
\newcounter{refsection}
\def\therefsection{\the\c@refsection}
\newcounter{refsegment}
@@ -341,6 +346,13 @@
\newcount\blx@parenlevel@text
\newcount\blx@parenlevel@foot
+\def\blx@backend{0}
+\def\blx@uniquename{0}
+\def\blx@maxbibnames{\c@maxnames}
+\def\blx@minbibnames{\c@minnames}
+\def\blx@maxcitenames{\c@maxnames}
+\def\blx@mincitenames{\c@minnames}
+
\newlength{\labelnumberwidth}
\newlength{\labelalphawidth}
\newlength{\shorthandwidth}
@@ -365,6 +377,7 @@
\newtoggle{blx@runbtx}
\newtoggle{blx@block}
\newtoggle{blx@unit}
+\newtoggle{blx@skipentry}
\newtoggle{blx@insert}
\newtoggle{blx@lastins}
\newtoggle{blx@debug}
@@ -379,6 +392,7 @@
\newtoggle{blx@labelnumber}
\newtoggle{blx@labelyear}
\newtoggle{blx@natbib}
+\newtoggle{blx@mcite}
\newtoggle{blx@loadfiles}
\newtoggle{blx@singletitle}
\newtoggle{blx@terseinits}
@@ -399,9 +413,6 @@
\newtoggle{blx@citeindex}
\newtoggle{blx@bibindex}
-\def\blx@backend{0}
-\def\blx@uniquename{0}
-
\newread\blx@auxin
\newwrite\blx@auxout
@@ -421,6 +432,7 @@
\edef\blx@auxfile@bibtex{\jobname}
\let\blx@auxout@bibtex\@mainaux
\newcommand*{\labelalphaothers}{+}
+\newcommand*{\sortalphaothers}{\labelalphaothers}
\newcommand*{\blxauxsuffix}{-blx}
\begingroup
@@ -545,6 +557,37 @@
\blx@safe@actives
\let\protect\string}
+% {<code>}{<string>} => <code>{<string>}
+
+\begingroup
+\catcode`\<=\active
+\catcode`\>=\active
+\catcode`\&=\active
+\catcode`\"=\active
+\catcode`\'=\active
+\protected\gdef\blx@xmlsanitizeafter#1#2{%
+ \begingroup
+ \abx@hook@xsanitize
+ \def\blx@tempa{\endgroup#1}%
+ \edef\blx@tempb{#2}%
+ \let\do\@makeother\dospecials
+ \catcode`\<=\active
+ \catcode`\>=\active
+ \catcode`\&=\active
+ \catcode`\"=\active
+ \catcode`\'=\active
+ \edef<{\string&lt\string;}%
+ \edef>{\string&gt\string;}%
+ \edef&{\string&amp\string;}%
+ \edef"{\string&quot\string;}%
+ \edef'{\string&apos\string;}%
+ \endlinechar\m@ne
+ \everyeof{\noexpand}%
+ \edef\blx@tempb{\scantokens\expandafter{\blx@tempb}}%
+ \expandafter\blx@tempa
+ \expandafter{\detokenize\expandafter{\blx@tempb}}}
+\endgroup
+
% {<file>}{<message>}{<preload>}{<postload>}{<success>}{<failure>}
\protected\long\def\blx@inputonce#1#2#3#4#5#6{%
@@ -870,6 +913,32 @@
\def\blx@msg@cundefon#1{%
Citation '#1' on page \the\c@page\space undefined}
+\newrobustcmd*{\RequireBiber}[1][2]{%
+ \ifnumgreater{#1}\blx@reqbiber
+ {\numgdef\blx@reqbiber{#1}}
+ {}}
+\@onlypreamble\RequireBiber
+\let\blx@reqbiber\z@
+
+\def\blx@checkbackend#1{%
+ \ifnumequal\blx@backend\blx@backend@biber
+ {}
+ {\ifcase\blx@reqbiber
+ \or
+ \blx@info@noline{%
+ backend=biber recommended by #1}%
+ \or
+ \blx@warning@noline{%
+ backend=biber required by #1.\MessageBreak
+ Some features may not work properly}%
+ \else
+ \blx@error
+ {backend=biber required by #1}
+ {The selected style or one of the .bib files
+ requires backend=biber.\MessageBreak It will
+ not work at all with any other backend}%
+ \fi}}
+
% \blx@list@active active aux files (basename)
% [internal list]
% \blx@list@inactive inactive aux files (basename)
@@ -2169,19 +2238,14 @@
{\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
{\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
-\def\blx@ifciteidem@strict{%
- \blx@ifcitesingle
- {\blx@ifciteidem@global}
- {\@secondoftwo}}%
+\let\blx@ifciteidem@strict\blx@ifciteidem@global
\def\blx@ifciteidem@constrict{%
- \blx@ifcitesingle
- {\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
- {\@secondoftwo}}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
- {\@secondoftwo}}%
+ \iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
% {<true>}{<false>}
@@ -3018,12 +3082,80 @@
%% Main formatting commands
-% {<name>}{<definition>}
+% [<entrytype>]{<name>}{<definiton>}
+
+\newrobustcmd*{\DeclareNameFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defnameformat{nfd}*}
+ {\blx@defformat\blx@defnameformat{nfd}{}}}
+\newrobustcmd*{\DeclareIndexNameFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defnameformat{nid}*}
+ {\blx@defformat\blx@defnameformat{nid}{}}}
+
+\newrobustcmd*{\DeclareListFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defplainformat{lfd}*}
+ {\blx@defformat\blx@defplainformat{lfd}{}}}
+\newrobustcmd*{\DeclareIndexListFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defplainformat{lid}*}
+ {\blx@defformat\blx@defplainformat{lid}{}}}
+
+\newrobustcmd*{\DeclareFieldFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defplainformat{ffd}*}
+ {\blx@defformat\blx@defplainformat{ffd}{}}}
+\newrobustcmd*{\DeclareIndexFieldFormat}{%
+ \@ifstar
+ {\blx@defformat\blx@defplainformat{fid}*}
+ {\blx@defformat\blx@defplainformat{fid}{}}}
+
+% {<macro>}{<class>}{<*>}
+
+\def\blx@defformat#1#2#3{%
+ \@ifnextchar[%]
+ {\blx@defformat@i{#1}{#2}{#3}}
+ {\blx@defformat@i{#1}{#2}{#3}[*]}}
+
+% {<macro>}{<class>}{<*>}[<entrytype>]{<name>}
+
+\def\blx@defformat@i#1#2#3[#4]#5{%
+ \notblank{#3}
+ {\blx@resetformat{#2}{#5}}
+ {}%
+ \def\blx@defformat@a{#2}%
+ \def\blx@defformat@b{#4}%
+ \blx@xsanitizeafter{\def\blx@defformat@c}{#5}%
+ \afterassignment\blx@defformat@ii
+ #1}
+
+\def\blx@defformat@ii{%
+ \expandafter\forcsvlist
+ \expandafter\blx@defformat@iii
+ \expandafter{\blx@defformat@b}}
+
+\def\blx@defformat@iii#1{%
+ \cslet{abx@\blx@defformat@a @#1@\blx@defformat@c}\blx@defformat@d}
+
+\def\blx@defplainformat{%
+ \long\def\blx@defformat@d##1}
+
+\def\blx@defnameformat{%
+ \long\def\blx@defformat@d##1##2##3##4##5##6##7##8}
-\def\blx@defformat#1{%
+\def\blx@resetformat#1#2{%
+ \let\blx@saved@do\do
+ \def\do##1{\blx@resetformat@i{#1}{#2}{##1}}%
\blx@safe@actives
- \afterassignment\blx@rest@actives
- \long\csdef{#1}}
+ \abx@dotypes
+ \blx@rest@actives
+ \let\do\blx@saved@do}
+
+\def\blx@resetformat@i#1#2#3{%
+ \ifcsdef{abx@#1@#3@#2}
+ {\csundef{abx@#1@#3@#2}}
+ {}}
% {<name>}{<name>}
@@ -3073,23 +3205,6 @@
\newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}}
\newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}}
-% [<entrytype>]{<name>}{<definiton>}
-
-\newrobustcmd*{\DeclareNameFormat}[2][*]{%
- \blx@defformat{abx@nfd@#1@#2}##1##2##3##4##5##6##7##8}
-\newrobustcmd*{\DeclareIndexNameFormat}[2][*]{%
- \blx@defformat{abx@nid@#1@#2}##1##2##3##4##5##6##7##8}
-
-\newrobustcmd*{\DeclareListFormat}[2][*]{%
- \blx@defformat{abx@lfd@#1@#2}##1}
-\newrobustcmd*{\DeclareIndexListFormat}[2][*]{%
- \blx@defformat{abx@lid@#1@#2}##1}
-
-\newrobustcmd*{\DeclareFieldFormat}[2][*]{%
- \blx@defformat{abx@ffd@#1@#2}##1}
-\newrobustcmd*{\DeclareIndexFieldFormat}[2][*]{%
- \blx@defformat{abx@fid@#1@#2}##1}
-
% [<entrytype>]{<alias>}[<entrytype>]{<name>}
\newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}}
@@ -3343,22 +3458,25 @@
\long\def\blx@listbreak#1&{}
-% {<key>}{<code>}
+% <*>{<key>}{<code>}
\protected\def\blx@imc@entrydata{%
- \blx@xsanitizeafter\blx@imc@entrydata@i}
+ \@ifstar
+ {\blx@xsanitizeafter{\blx@imc@entrydata@i\blx@saveentry}}
+ {\blx@xsanitizeafter{\blx@imc@entrydata@i{}}}}
-\long\def\blx@imc@entrydata@i#1#2{%
- \blx@ifdata{#1}
+\long\def\blx@imc@entrydata@i#1#2#3{%
+ \blx@ifdata{#2}
{\begingroup
+ #1%
\blx@resetdata
- \blx@getdata{#1}%
+ \blx@getdata{#2}%
\blx@entrysetcount
\blx@setoptions@type\abx@field@entrytype
\blx@setoptions@entry
\addtocounter{instcount}\@ne
\blx@execute
- \blx@beglang#2\blx@endlang
+ \blx@beglang#3\blx@endlang
\endgroup}
{}}
@@ -3366,8 +3484,8 @@
\blx@imc@iffieldundef{entrykey}
{}
{\begingroup
- \long\def\blx@set@precode{#1}%
- \long\def\blx@set@postcode{#2}%
+ \long\def\blx@entryset@precode{#1}%
+ \long\def\blx@entryset@postcode{#2}%
\let\finentry\blx@finentry@inset
\let\do\blx@entryset
\blx@imc@docsvfield{entryset}%
@@ -3379,18 +3497,18 @@
\blx@imc@clearlist{pageref}%
\blx@getdata{#1}%
\def\abx@field@entrysetcount{1}%
- \blx@set@precode
+ \blx@entryset@precode
\blx@driver{\blx@imc@thefield{entrytype}}%
- \blx@set@postcode
+ \blx@entryset@postcode
\endgroup}
{}%
\let\do\blx@entryset@i}
\def\blx@entryset@i#1{%
\blx@imc@entrydata{#1}{%
- \blx@set@precode
+ \blx@entryset@precode
\blx@driver{\blx@imc@thefield{entrytype}}
- \blx@set@postcode}}
+ \blx@entryset@postcode}}
\blx@regimcs{%
\printtext \printfield \printlist \printnames \printfile
@@ -4306,6 +4424,53 @@
%% Bibtex data interface
+\def\abx@dotypes{%
+ \do{set}%
+ \do{article}%
+ \do{book}%
+ \do{bookinbook}%
+ \do{booklet}%
+ \do{collection}%
+ \do{inbook}%
+ \do{incollection}%
+ \do{inproceedings}%
+ \do{manual}%
+ \do{misc}%
+ \do{online}%
+ \do{patent}%
+ \do{periodical}%
+ \do{proceedings}%
+ \do{report}%
+ \do{suppbook}%
+ \do{suppcollection}%
+ \do{suppperiodical}%
+ \do{thesis}%
+ \do{unpublished}%
+ \do{artwork}%
+ \do{audio}%
+ \do{commentary}%
+ \do{image}%
+ \do{inreference}%
+ \do{jurisdiction}%
+ \do{legal}%
+ \do{legislation}%
+ \do{letter}%
+ \do{movie}%
+ \do{music}%
+ \do{performance}%
+ \do{reference}%
+ \do{review}%
+ \do{software}%
+ \do{standard}%
+ \do{video}%
+ \do{customa}%
+ \do{customb}%
+ \do{customc}%
+ \do{customd}%
+ \do{custome}%
+ \do{customf}%
+}
+
\def\abx@donames{%
\do{labelname}%
\do{author}%
@@ -4346,14 +4511,16 @@
}
\def\abx@dofields{%
+ \do{crossref}%
+ \do{xref}%
\do{entrykey}%
\do{childentrykey}%
\do{entrytype}%
\do{entrysubtype}%
\do{entryset}%
\do{entrysetcount}%
- \do{crossref}%
- \do{xref}%
+ \do{related}%
+ \do{relatedtype}%
\do{hyphenation}%
\do{keywords}%
\do{authortype}%
@@ -4478,7 +4645,9 @@
\def\do#1{%
\newcounter{#1}%
+ \newcounter{saved#1}%
\csedef{the#1}{\noexpand\the\expandonce{\csname c@#1\endcsname}}%
+ \csedef{thesaved#1}{\noexpand\the\expandonce{\csname c@saved#1\endcsname}}%
\appto\abx@dobooleans{\do{more#1}}}
\abx@donames
\abx@dolists
@@ -4486,7 +4655,7 @@
\abx@dobooleans
\protected\def\blx@resetdata{%
- \let\blx@savedo\do
+ \let\blx@saved@do\do
\let\do\blx@imc@clearname
\abx@donames
\let\do\blx@imc@clearlist
@@ -4496,7 +4665,36 @@
\def\do##1{\togglefalse{abx@bool@##1}}%
\abx@dobooleans
\c@uniquename\z@
- \let\do\blx@savedo}
+ \let\do\blx@saved@do}
+
+\protected\def\blx@saveentry{%
+ \let\blx@saved@do\do
+ \let\do\blx@savename
+ \abx@donames
+ \let\do\blx@savelist
+ \abx@dolists
+ \let\do\blx@savefield
+ \abx@dofields\do{execute}\do{options}%
+ \let\do\blx@savebool
+ \abx@dobooleans
+ \c@saveduniquename\c@uniquename
+ \let\do\blx@saved@do}
+
+\protected\def\blx@savename#1{%
+ \csletcs{etb@tgl@abx@bool@moresaved#1}{etb@tgl@abx@bool@more#1}%
+ \csletcs{abx@name@saved#1}{abx@name@#1}%
+ \csname c@saved#1\endcsname\csname c@#1\endcsname}
+
+\protected\def\blx@savelist#1{%
+ \csletcs{etb@tgl@abx@bool@moresaved#1}{etb@tgl@abx@bool@more#1}%
+ \csletcs{abx@list@saved#1}{abx@list@#1}%
+ \csname c@saved#1\endcsname\csname c@#1\endcsname}
+
+\protected\def\blx@savefield#1{%
+ \csletcs{abx@field@saved#1}{abx@field@#1}}
+
+\protected\def\blx@savebool#1{%
+ \csletcs{abx@bool@saved#1}{abx@bool@#1}}
% {<code>}
@@ -4691,14 +4889,14 @@
% {<entrykey>}
-\protected\def\blx@bbl@xref#1{%
+\protected\def\blx@bbl@xref#1{% BibTeX only
\ifcsdef{blx@refp@\the\c@refsection @\detokenize{#1}}
{}
{\listcsxadd{blx@refs@\the\c@refsection}{\detokenize{#1}}}%
\listcsxadd{blx@refp@\the\c@refsection @\detokenize{#1}}{\abx@field@entrykey}%
\csxdef{blx@refc@\the\c@refsection @\abx@field@entrykey}{\detokenize{#1}}}
-\def\blx@addxref#1{%
+\def\blx@addxref#1{% BibTeX only
\blx@ifdata{#1}
{\begingroup
\def\do##1{%
@@ -4767,6 +4965,8 @@
% section -> keys [internal list]
% \blx@catg@<category> category hash, global
% category -> keys [internal list]
+% \blx@set@<section>@<entrykey> parent -> child mapping (dynamic entry sets)
+% key -> key,key,... [csv list]
% \blx@setp@<section>@<entrykey> parent -> child mapping (entry sets)
% key -> key,key,... [csv list]
% \blx@setc@<section>@<entrykey> child -> parent mapping (entry sets)
@@ -4777,10 +4977,13 @@
% key -> pages [internal list]
% \blx@refs@<section> xref hash, temporary
% section -> parents [internal list]
+% (BibTeX only)
% \blx@refp@<section>@<entrykey> parent -> child mapping (xrefs), temporary
% key -> keys [internal list]
+% (BibTeX only)
% \blx@refc@<section>@<entrykey> child -> parent mapping (xrefs)
% key -> key [internal list]
+% (BibTeX only)
\def\blx@ifdata#1{%
\ifcsdef{blx@data@\the\c@refsection @#1}}
@@ -4866,24 +5069,23 @@
\ifcsundef{blx@pref@\the\c@refsection @\abx@field@entrykey}
{}
{\blx@addpageref{\abx@field@entrykey}}%
- \iftoggle{blx@setonly}
+ \nottoggle{blx@setonly}
+ {\listcsxadd{blx@sort@\the\c@refsection}{\abx@field@entrykey}}
{\global\toggletrue{blx@addset}%
\toggletrue{blx@skipbib}%
\toggletrue{blx@skiplos}%
- \toggletrue{blx@skiplab}}
- {\listcsxadd{blx@sort@\the\c@refsection}{\abx@field@entrykey}}%
- \iftoggle{blx@skipbib}
- {}
+ \toggletrue{blx@skiplab}}%
+ \nottoggle{blx@skipbib}
{\listcsxadd{blx@sbib@\the\c@refsection}{\abx@field@entrykey}%
\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}}
- {}}%
- \iftoggle{blx@skiplos}
- {}
- {\blx@bbl@shorthand}%
- \iftoggle{blx@skiplab}
- {}
+ {}}
+ {}%
+ \nottoggle{blx@skiplos}
+ {\blx@bbl@shorthand}
+ {}%
+ \nottoggle{blx@skiplab}
{\iftoggle{blx@labelnumber}
{\blx@bbl@labelnumber}
{}%
@@ -4892,8 +5094,12 @@
{}%
\iftoggle{blx@labelyear}
{\blx@bbl@labelyear}
- {}}%
- \blx@bbl@labelname
+ {}%
+ \blx@bbl@prefixnumber}
+ {}%
+ \ifnumless\blx@backend\blx@backend@biber
+ {\blx@bbl@labelname}
+ {}%
\blx@bbl@titles
\blx@bbl@hooks
\endgroup}
@@ -4939,14 +5145,17 @@
{\blx@setlabwidth{\labelnumberwidth}{%
\csuse{abx@ffd@*@labelnumberwidth}{%
\ifdef\abx@field@prefixnumber
- {\abx@field@prefixnumber\abx@field@localnumber}
- {\abx@field@localnumber}}}}}
+ {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
+ {}%
+ \abx@field@localnumber}}}}
{\csgappto\blx@bbl@data{%
\let\abx@field@labelnumber\abx@field@shorthand}%
\iftoggle{blx@skipbib}
{}
{\blx@setlabwidth{\labelnumberwidth}{%
- \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}%
+ \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}}
+
+\def\blx@bbl@prefixnumber{%
\ifdef\abx@field@prefixnumber
{\blx@bbl@fieldedef{prefixnumber}{\abx@field@prefixnumber}}
{}}
@@ -4964,6 +5173,9 @@
{}
{\blx@setlabwidth{\labelalphawidth}{%
\csuse{abx@ffd@*@labelalphawidth}{%
+ \ifdef\abx@field@prefixnumber
+ {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
+ {}%
\csuse{abx@ffd@*@labelalpha}{\abx@field@labelalpha}%
\ifundef\abx@field@extraalpha
{}
@@ -4982,7 +5194,7 @@
\global\c@maxextrayear\abx@field@extrayear\relax
\fi}}
-\def\blx@bbl@labelname{%
+\def\blx@bbl@labelname{% BibTeX only
\iftoggle{blx@useauthor}
{\ifundef\abx@name@shortauthor
{\ifundef\abx@name@author
@@ -5084,7 +5296,7 @@
\let\endlossort\blx@bbl@endlossort
\let\set\blx@bbl@set
\let\inset\blx@bbl@inset
- \let\xref\blx@bbl@xref
+ \let\xref\blx@bbl@xref % BibTeX only
\let\keyw\blx@bbl@keyw
\let\name\blx@bbl@namedef
\let\list\blx@bbl@listdef
@@ -5097,7 +5309,7 @@
\let\endverb\blx@bbl@verbend}
\def\blx@bblend{%
- \ifcsdef{blx@refs@\the\c@refsection}
+ \ifcsdef{blx@refs@\the\c@refsection}% BibTeX only
{\begingroup
\let\do\blx@addxref
\dolistcsloop{blx@refs@\the\c@refsection}%
@@ -5121,15 +5333,10 @@
\AtEndDocument{%
\def\abx@aux@number#1#2#3#4{\blx@addchecksum{#1}{#4}}}
-% {<entrykey>}{<refsection>}{<numberprefix>}
-
-\protected\def\blx@aux@numprefix#1#2#3{%
- \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
-
\def\blx@addlabelnumber{%
\begingroup
- \iftoggle{blx@labelnumber}
- {\nottoggle{blx@skiplab}
+ \nottoggle{blx@skiplab}
+ {\iftoggle{blx@labelnumber}
{\ifundef\abx@field@shorthand
{\ifundef\abx@field@localnumber
{\iftoggle{blx@omitnumbers}
@@ -5143,23 +5350,32 @@
\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
{\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}
+\def\blx@addprefixnumber{%
+ \nottoggle{blx@skiplab}
+ {\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}}}
+ {}}
+ {}}
+ {}}
+
+% {<entrykey>}{<refsection>}{<numberprefix>}
+
+\protected\def\blx@aux@numprefix#1#2#3{%
+ \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
+
\def\blx@bbl@lossort{%
\begingroup
\def\key##1{\listcsxadd{blx@losh@\the\c@refsection}{\detokenize{##1}}}}
@@ -5372,6 +5588,14 @@
\def\blx@flt@category#1{%
test {\xifinlistcs\blx@flt@item{blx@catg@#1}}}
+% {<name>}{<code>}
+
+\newrobustcmd*{\defbibcheck}[2]{%
+ \csdef{blx@bibcheck@#1}{%
+ \togglefalse{blx@skipentry}%
+ \def\skipentry{\toggletrue{blx@skipentry}}%
+ #2\undef\skipentry}}
+
% options
\define@key{blx@bib}{section}{%
@@ -5519,32 +5743,51 @@
Custom filter '#1' not found.\MessageBreak
Skipping this custom filter}}}
+\define@key{blx@bib}{check}{\blx@key@bibcheck{#1}}
+\define@key{blx@los}{check}{\blx@key@bibcheck{#1}}
+
+\def\blx@key@bibcheck#1{%
+ \ifcsdef{blx@bibcheck@#1}
+ {\letcs\blx@bibcheck{blx@bibcheck@#1}}
+ {\blx@error
+ {Hook '#1' undefined}
+ {The bibliography check '#1' is undefined.\MessageBreak
+ Use '\defbibcheck' to define it}}}
+
\define@key{blx@bib}{maxnames}{\blx@key@maxnames{#1}}
\define@key{blx@los}{maxnames}{\blx@key@maxnames{#1}}
\define@key{blx@bbs}{maxnames}{\blx@key@maxnames{#1}}
\define@key{blx@bbg}{maxnames}{\blx@key@maxnames{#1}}
\define@key{blx@bbc}{maxnames}{\blx@key@maxnames{#1}}
+
\def\blx@key@maxnames#1{%
\ifnum#1<\c@maxnames
\blx@err@confopt{maxnames}{%
The value may not be smaller than the
global 'maxnames' (=\the\c@maxnames)}%
\else
- \blx@setmaxnames{#1}%
+ \blx@setmaxval{names}{#1}%
\fi}
+\def\blx@setmaxbibnames{%
+ \c@maxnames=\blx@premaxnames\relax
+ \c@maxnames=\blx@maxbibnames\relax
+ \c@minnames=\blx@preminnames\relax
+ \c@minnames=\blx@minbibnames\relax}
+
\define@key{blx@bib}{minnames}{\blx@key@minnames{#1}}
\define@key{blx@los}{minnames}{\blx@key@minnames{#1}}
\define@key{blx@bbs}{minnames}{\blx@key@minnames{#1}}
\define@key{blx@bbg}{minnames}{\blx@key@minnames{#1}}
\define@key{blx@bbc}{minnames}{\blx@key@minnames{#1}}
+
\def\blx@key@minnames#1{%
\ifnum#1<\c@minnames
\blx@err@confopt{minnames}{%
The value may not be smaller than the
global 'minnames' (=\the\c@minnames)}%
\else
- \blx@setminnames{#1}%
+ \blx@setminval{names}{#1}%
\fi}
\define@key{blx@bib}{maxitems}{\blx@setmaxitems{#1}}
@@ -5564,6 +5807,7 @@
\define@key{blx@los}{heading}{\blx@key@heading{#1}}
\define@key{blx@bbs}{heading}{\blx@key@heading{#1}}
\define@key{blx@bbg}{heading}{\blx@key@heading{#1}}
+
\def\blx@key@heading#1{%
\ifcsundef{blx@head@#1}
{\blx@error
@@ -5576,6 +5820,7 @@
\define@key{blx@bbs}{env}{\blx@key@env{#1}}
\define@key{blx@bbg}{env}{\blx@key@env{#1}}
\define@key{blx@bbc}{env}{\blx@key@env{#1}}
+
\def\blx@key@env#1{%
\ifcsundef{blx@env@#1}
{\blx@error
@@ -5604,6 +5849,7 @@
\define@key{blx@bbs}{postnote}{\blx@key@postnote{#1}}
\define@key{blx@bbg}{postnote}{\blx@key@postnote{#1}}
\define@key{blx@bbc}{postnote}{\blx@key@postnote{#1}}
+
\def\blx@key@postnote#1{%
\ifcsundef{blx@note@#1}
{\blx@error
@@ -5630,12 +5876,14 @@
{}}
\define@key{blx@bib}{prefixnumbers}{%
+ \def\blx@prefixnumbers{#1}%
\iftoggle{blx@defernumbers}
- {\csnumdef{blx@labelnumber@\the\c@refsection}{0}%
- \def\blx@prefixnumbers{#1}}
- {\blx@warning{%
- Option 'prefixnumbers' requires 'defernumbers=true'.\MessageBreak
- Ignoring 'prefixnumbers=\detokenize{#1}'}}}
+ {\csnumdef{blx@labelnumber@\the\c@refsection}{0}}
+ {\iftoggle{blx@labelnumber}
+ {\blx@warning{%
+ Option 'prefixnumbers' requires global\MessageBreak
+ 'defernumbers=true'}}
+ {}}}
% [<options>]
@@ -5676,6 +5924,7 @@
\let\blx@theprenote\@empty
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
+ \blx@setmaxbibnames
\blx@safe@actives
\setkeys{blx@bib}{#1}%
\blx@rest@actives
@@ -5702,6 +5951,7 @@
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
\c@refsection\z@
+ \blx@setmaxbibnames
\blx@safe@actives
\setkeys{blx@bbs}{#1}%
\blx@rest@actives
@@ -5742,6 +5992,7 @@
\let\blx@thetitle\@empty
\c@refsection\z@
\c@refsegment\@ne
+ \blx@setmaxbibnames
\blx@safe@actives
\setkeys{blx@bbg}{#1}%
\blx@rest@actives
@@ -5784,6 +6035,7 @@
\let\blx@thetitle\@empty
\c@refsection\z@
\blx@safe@actives
+ \blx@setmaxbibnames
\setkeys{blx@bbc}{#1}%
\blx@rest@actives
\togglefalse{blx@tempa}%
@@ -5867,27 +6119,30 @@
\def\blx@bibitem#1{%
\blx@ifdata{#1}
- {\global\let\blx@noitem\@empty
- \begingroup
+ {\begingroup
\blx@getdata{#1}%
\blx@ifdriver{\abx@field@entrytype}
- {\blx@setoptions@type\abx@field@entrytype
- \blx@setoptions@entry
- \blx@thelabelnumber
- \addtocounter{instcount}\@ne
- \csuse{blx@item@\blx@theenv}\relax
- \blx@initsep
- \blx@namesep
- \csuse{blx@hook@bibitem}%
- \blx@execute
- \blx@initunit
- \blx@anchor
- \blx@beglang
- \bibsentence
- \blx@pagetracker
- \blx@driver{\abx@field@entrytype}%
- \blx@postpunct
- \blx@endlang}
+ {\blx@bibcheck
+ \iftoggle{blx@skipentry}{}{%
+ \global\let\blx@noitem\@empty
+ \blx@setoptions@type\abx@field@entrytype
+ \blx@setoptions@entry
+ \blx@thelabelnumber
+ \blx@addprefixnumber
+ \addtocounter{instcount}\@ne
+ \csuse{blx@item@\blx@theenv}\relax
+ \blx@initsep
+ \blx@namesep
+ \csuse{blx@hook@bibitem}%
+ \blx@execute
+ \blx@initunit
+ \blx@anchor
+ \blx@beglang
+ \bibsentence
+ \blx@pagetracker
+ \blx@driver{\abx@field@entrytype}%
+ \blx@postpunct
+ \blx@endlang}}
{\blx@warning{%
No driver for entry type
'\abx@field@entrytype'.\MessageBreak
@@ -5895,6 +6150,8 @@
\endgroup}
{}}
+\let\blx@bibcheck\relax
+
\def\blx@initsep{%
\blx@imc@iffieldundef{sortinit}
{}
@@ -5998,6 +6255,7 @@
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
\let\blx@printbibchecks\relax
+ \blx@setmaxbibnames
\blx@safe@actives
\setkeys{blx@los}{#1}%
\blx@rest@actives
@@ -6050,22 +6308,24 @@
\def\blx@lositem#1{%
\blx@ifdata{#1}
- {\global\let\blx@noitem\@empty
- \begingroup
+ {\begingroup
\blx@getdata{#1}%
- \blx@setoptions@type\abx@field@entrytype
- \blx@setoptions@entry
- \addtocounter{instcount}\@ne
- \csuse{blx@item@\blx@theenv}\relax
- \csuse{blx@hook@lositem}%
- \blx@execute
- \blx@initunit
- \blx@beglang
- \bibsentence
- \blx@pagetracker
- \blx@driver{shorthands}%
- \blx@postpunct
- \blx@endlang
+ \blx@bibcheck
+ \iftoggle{blx@skipentry}{}{%
+ \global\let\blx@noitem\@empty
+ \blx@setoptions@type\abx@field@entrytype
+ \blx@setoptions@entry
+ \addtocounter{instcount}\@ne
+ \csuse{blx@item@\blx@theenv}\relax
+ \csuse{blx@hook@lositem}%
+ \blx@execute
+ \blx@initunit
+ \blx@beglang
+ \bibsentence
+ \blx@pagetracker
+ \blx@driver{shorthands}%
+ \blx@postpunct
+ \blx@endlang}%
\endgroup}
{}}
@@ -6118,14 +6378,16 @@
\def\blx@refsection@biber#1{%
\blx@regbibfiles{\jobname}{#1}%
+ \begingroup
+ \blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
\blx@auxwrite\blx@auxout
- {\def\do##1{\blx@bcf@datasource{file}{##1}}}
- {\blx@bcf@endsection\blx@nl
- \blx@bcf@comment{section \the\c@refsection}%
- \blx@bcf@bibdata{\the\c@refsection}{%
- \expandafter\docsvlist
- \expandafter{#1}}%
- \blx@bcf@section{\the\c@refsection}}}
+ {\def\do##1{\blx@xml@datasource{file}{##1}}}
+ {\blx@xml@endsection\blx@nl
+ \blx@xml@comment{section \the\c@refsection}%
+ \blx@xml@bibdata{\the\c@refsection}{%
+ \expandafter\docsvlist\expandafter{\blx@tempa}}%
+ \blx@xml@section{\the\c@refsection}}%
+ \endgroup}
\def\blx@refsection@bibtex#1{%
\xdef\blx@auxfile@bibtex{\jobname\the\c@refsection\blxauxsuffix}%
@@ -6153,9 +6415,9 @@
\def\blx@endrefsection@biber{%
\ifnum\c@refsection>\z@
\blx@auxwrite\blx@auxout{}{%
- \blx@bcf@endsection\blx@nl
- \blx@bcf@comment{section 0 (cont.)}%
- \blx@bcf@section{0}}%
+ \blx@xml@endsection\blx@nl
+ \blx@xml@comment{section 0 (cont.)}%
+ \blx@xml@section{0}}%
\fi}
\def\blx@endrefsection@bibtex{%
@@ -6308,12 +6570,14 @@
\def\blx@citation#1#2{%
\ifbool{citerequest}
- {\ifcsdef{blx@setp@\the\c@refsection @#1}
- {\blx@citation@set{#1}{#2}}
- {\ifcsdef{blx@setc@\the\c@refsection @#1}
- {\blx@citation@inset{#1}{#2}}
- {\blx@citation@entry{#1}{#2}}}%
- \ifcsdef{blx@refc@\the\c@refsection @#1}
+ {\ifnumless\blx@backend\blx@backend@biber % BibTeX only
+ {\ifcsdef{blx@setp@\the\c@refsection @#1}
+ {\blx@citation@set{#1}{#2}}
+ {\ifcsdef{blx@setc@\the\c@refsection @#1}
+ {\blx@citation@inset{#1}{#2}}
+ {}}}
+ {\blx@citation@entry{#1}{#2}}%
+ \ifcsdef{blx@refc@\the\c@refsection @#1}% BibTeX only
{\blx@citation@xref{#1}}
{}}
{}}
@@ -6347,7 +6611,7 @@
{\blx@citation@set{#1}}
{\blx@citation@entry{#1}}}
-\def\blx@citation@xref#1{%
+\def\blx@citation@xref#1{% BibTeX only
\begingroup
\edef\blx@tempa{blx@refp@\the\c@refsection @%
\csname blx@refc@\the\c@refsection @#1\endcsname}%
@@ -6378,13 +6642,57 @@
{}}
{}}
-\def\blx@bibreq#1{%
+\protected\def\blx@bibreq#1{%
\ifnum\blx@backend=\blx@backend@biber
- \blx@auxwrite\blx@auxout{}{\blx@bcf@citekey{#1}}%
+ \begingroup
+ \blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
+ \blx@auxwrite\blx@auxout{}{\blx@xml@citekey{\blx@tempa}}%
+ \endgroup
\else
\blx@auxwrite\blx@auxout@bibtex{}{\string\citation{#1}}%
\fi}
+% {<set>}{<key1,key2,key3>}
+
+\newrobustcmd*{\defbibentryset}[2]{%
+ \@bsphack
+ \begingroup
+ \blx@xsanitizeafter{\def\blx@tempa}{#1}%
+ \let\blx@tempb\@empty
+ \let\blx@tempc\@empty
+ \blx@xsanitizeafter{\forcsvlist\blx@defentryset@add}{#2}%
+ \ifcsdef{blx@set@\the\c@refsection @\blx@tempa}
+ {\expandafter\ifdefequal
+ \csname blx@set@\the\c@refsection @\blx@tempa\endcsname
+ \blx@tempb
+ {}
+ {\blx@error
+ {Conflicting definitions of '\blx@tempa'}
+ {The entry set '\blx@tempa' been defined before.\MessageBreak
+ old: \blx@tempa\space = %
+ \csuse{blx@set@\the\c@refsection @\blx@tempa}\MessageBreak
+ new: \blx@tempa\space = \blx@tempb\MessageBreak
+ I'm ignoring the new definition}}}
+ {\global\cslet{blx@set@\the\c@refsection @\blx@tempa}\blx@tempb
+ \edef\blx@tempa{%
+ \AfterPreamble{\blx@setreq{\blx@tempa}{\blx@tempb}}}%
+ \blx@tempa}%
+ \endgroup
+ \@esphack}
+
+\def\blx@defentryset@add#1{%
+ \edef\blx@tempb{\blx@tempb\blx@tempc#1}%
+ \def\blx@tempc{,}}
+
+\protected\def\blx@setreq#1#2{%
+ \ifnum\blx@backend=\blx@backend@biber
+ \begingroup
+ \blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
+ \blx@xmlsanitizeafter{\def\blx@tempb}{#2}%
+ \blx@auxwrite\blx@auxout{}{\blx@xml@citeset{\blx@tempa}{\blx@tempb}}%
+ \endgroup
+ \fi}
+
% {<entrykey>,...}
\protected\def\blx@citeloop#1{%
@@ -6570,16 +6878,11 @@
{\global\let\blx@lasthash@text\abx@field@fullhash}}
{}}
-\def\blx@idemtracker@strict{%
- \blx@ifcitesingle
- {\blx@idemtracker@gobal}
- {\blx@idemreset@gobal}}%
+\let\blx@idemtracker@strict\blx@idemtracker@gobal
\def\blx@idemtracker@constrict{%
- \blx@ifcitesingle
- {\blx@mpfnsave
- \blx@idemtracker@context}
- {\blx@idemreset@context}}%
+ \blx@mpfnsave
+ \blx@idemtracker@context}
\def\blx@idemreset@force{%
\global\undef\blx@lasthash@text
@@ -7828,7 +8131,7 @@
\let\blx@volcite@vol\@gobble
\let\blx@volcite@page\@firstofone}
-%% Control file writers
+%% Control file
\begingroup
\let~\space
@@ -7841,459 +8144,397 @@
\@makeother\-
\@makeother\=
\@makeother\/
-\xdef\blx@bcf@file{%
+\xdef\blx@xml@file{%
\blx@sig@bcf\blx@nl
\blx@ver@bcf\blx@nl}
-\xdef\blx@bcf@endfile{%
+\xdef\blx@xml@endfile{%
\blx@nl</bcf:controlfile>}
-\xdef\blx@bcf@comment#1{%
+\xdef\blx@xml@comment#1{%
~~<!-- #1 -->\blx@nl}
-\xdef\blx@bcf@options#1#2#3{%
+\xdef\blx@xml@options#1#2#3{%
~~<bcf:options%
\noexpand\ifblank{#1}{}{ component="#1"}%
\noexpand\ifblank{#2}{}{ type="#2"}%
>\blx@nl
#3%
~~</bcf:options>\blx@nl}
-\xdef\blx@bcf@option#1#2{%
+\xdef\blx@xml@option#1#2{%
~~~~<bcf:option type="#1">\blx@nl
#2%
~~~~</bcf:option>\blx@nl}
-\xdef\blx@bcf@ordered#1#2{%
+\xdef\blx@xml@ordered#1#2{%
~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl}
-\xdef\blx@bcf@sorting#1#2{%
- ~~<bcf:sorting type="#1">\blx@nl
- #2%
+\xdef\blx@xml@sorting#1{%
+ ~~<bcf:sorting>\blx@nl
+ #1%
~~</bcf:sorting>\blx@nl}
-\xdef\blx@bcf@sort#1#2{%
+\xdef\blx@xml@presort#1#2{%
+ ~~~~<bcf:presort\noexpand\ifblank{#1}{}{ type="#1"}>%
+ #2</bcf:presort>\blx@nl}
+
+\xdef\blx@xml@sortexclude#1#2{%
+ ~~~~<bcf:sortexclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl
+ #2%
+ ~~~~</bcf:sortexclusion>\blx@nl}
+\xdef\blx@xml@exclude#1{%
+ ~~~~~~<bcf:exclusion>#1</bcf:exclusion>\blx@nl}
+\xdef\blx@xml@sort#1#2{%
~~~~<bcf:sort #1>\blx@nl
#2%
~~~~</bcf:sort>\blx@nl}
-\xdef\blx@bcf@sortitem#1#2{%
+\xdef\blx@xml@sortitem#1#2{%
~~~~~~<bcf:sortitem #1>#2</bcf:sortitem>\blx@nl}
-\xdef\blx@bcf@section#1{%
+\xdef\blx@xml@section#1{%
~~<bcf:section number="#1">}
-\xdef\blx@bcf@endsection{%
+\xdef\blx@xml@endsection{%
~~</bcf:section>}
-\xdef\blx@bcf@bibdata#1#2{%
+\xdef\blx@xml@bibdata#1#2{%
~~<bcf:bibdata section="#1">\blx@nl
#2%
~~</bcf:bibdata>\blx@nl}
-\xdef\blx@bcf@datasource#1#2{%
+\xdef\blx@xml@datasource#1#2{%
~~~~<bcf:datasource type="#1">#2</bcf:datasource>\blx@nl}
-\xdef\blx@bcf@citekey#1{%
+\xdef\blx@xml@citekey#1{%
~~~~<bcf:citekey>#1</bcf:citekey>}
-\xdef\blx@bcf@svalue#1#2{%
- \blx@bcf@option{singlevalued}{%
+\xdef\blx@xml@citeset#1#2{%
+ ~~~~<bcf:citekey type="set" members="#2">#1</bcf:citekey>}
+\xdef\blx@xml@svalue#1#2{%
+ \blx@xml@option{singlevalued}{%
~~~~~~<bcf:key>#1</bcf:key>\blx@nl
~~~~~~<bcf:value>#2</bcf:value>\blx@nl}}
-\xdef\blx@bcf@mvalue#1#2{%
- \blx@bcf@option{multivalued}{%
+\xdef\blx@xml@mvalue#1#2{%
+ \blx@xml@option{multivalued}{%
~~~~~~<bcf:key>#1</bcf:key>\blx@nl
#2}}
-\xdef\blx@bcf@toggle#1{%
- \blx@bcf@svalue{#1}{\noexpand\iftoggle{blx@#1}{1}{0}}}
+\xdef\blx@xml@toggle#1{%
+ \blx@xml@svalue{#1}{\noexpand\iftoggle{blx@#1}{1}{0}}}
\endgroup
\def\blx@bcf@options@global{%
- \blx@bcf@comment{global}%
- \blx@bcf@options{biblatex}{global}{%
- \iftoggle{blx@labelalpha}
- {\blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}}
- {}%
- \blx@bcf@toggle{labelalpha}%
- \blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}%
+ \blx@xml@comment{global}%
+ \blx@xml@options{biblatex}{global}{%
+ \blx@xml@svalue{alphaothers}{\labelalphaothers}%
+ \blx@xml@toggle{labelalpha}%
+ \blx@xml@mvalue{labelname}{\blx@bcf@labelname}%
\iftoggle{blx@labelyear}
- {\blx@bcf@mvalue{labelyear}{\blx@bcf@labelyear@global}}
- {}%
- \blx@bcf@svalue{maxitems}{\the\c@maxitems}%
- \blx@bcf@svalue{maxnames}{\the\c@maxnames}%
- \blx@bcf@svalue{minitems}{\the\c@minitems}%
- \blx@bcf@svalue{minnames}{\the\c@minnames}%
- \blx@bcf@toggle{singletitle}%
- \iftoggle{blx@labelalpha}
- {\blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}}
+ {\blx@xml@mvalue{labelyear}{\blx@bcf@labelyear}}
{}%
- \blx@bcf@svalue{sortlos}{\blx@sortlos}%
- \blx@bcf@toggle{terseinits}%
- \blx@bcf@svalue{uniquename}{\blx@uniquename}%
- \blx@bcf@toggle{useauthor}%
- \blx@bcf@toggle{useeditor}%
- \blx@bcf@toggle{useprefix}%
- \blx@bcf@toggle{usetranslator}%
+ \blx@xml@svalue{maxitems}{\the\c@maxitems}%
+ \blx@xml@svalue{maxnames}{\the\c@maxnames}%
+ \blx@xml@svalue{minitems}{\the\c@minitems}%
+ \blx@xml@svalue{minnames}{\the\c@minnames}%
+ \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}%
+ \blx@xml@toggle{useprefix}%
+ \blx@xml@toggle{usetranslator}%
}%
}
\def\blx@bcf@options@type#1{%
- \blx@bcf@comment{#1}%
- \blx@bcf@options{biblatex}{#1}{%
- \blx@bcf@toggle{labelalpha}%
- \ifcsdef{blx@bcf@labelname@#1}
- {\blx@bcf@mvalue{labelname}{\csuse{blx@bcf@labelname@#1}}}
- {}%
+ \blx@xml@comment{#1}%
+ \blx@xml@options{biblatex}{#1}{%
+ \blx@xml@toggle{labelalpha}%
+ \blx@xml@mvalue{labelname}{%
+ \ifcsdef{blx@bcf@labelname@#1}
+ {\csuse{blx@bcf@labelname@#1}}
+ {\blx@bcf@labelname}}%
\iftoggle{blx@labelyear}
- {\ifcsdef{blx@bcf@labelyear@#1}
- {\blx@bcf@mvalue{labelyear}{\csuse{blx@bcf@labelyear@#1}}}
- {}}
+ {\blx@xml@mvalue{labelyear}{%
+ \ifcsdef{blx@bcf@labelyear@#1}
+ {\csuse{blx@bcf@labelyear@#1}}
+ {\blx@bcf@labelyear}}}
{}%
- \blx@bcf@toggle{singletitle}%
- \blx@bcf@toggle{skipbib}%
- \blx@bcf@toggle{skiplab}%
- \blx@bcf@toggle{skiplos}%
- \blx@bcf@svalue{uniquename}{\blx@uniquename}%
- \blx@bcf@toggle{useauthor}%
- \blx@bcf@toggle{useeditor}%
- \blx@bcf@toggle{useprefix}%
- \blx@bcf@toggle{usetranslator}%
+ \blx@xml@toggle{singletitle}%
+ \blx@xml@toggle{skipbib}%
+ \blx@xml@toggle{skiplab}%
+ \blx@xml@toggle{skiplos}%
+ \blx@xml@svalue{uniquename}{\blx@uniquename}%
+ \blx@xml@toggle{useauthor}%
+ \blx@xml@toggle{useeditor}%
+ \blx@xml@toggle{useprefix}%
+ \blx@xml@toggle{usetranslator}%
}%
}
-\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}
+\edef\blx@ctrl@bibtex{%
+ \blx@msg@bib
+ @Control\string{biblatex-control,\blx@nl
+ \space\space options = \string{%
+ \blx@bblversion:%
+ \noexpand\iftoggle{blx@debug}{1}{0}:%
+ \noexpand\ifnum\noexpand\blx@backend>\noexpand\blx@backend@bibtex
+ 1:%
+ \noexpand\else
+ 0:%
+ \noexpand\fi
+ \noexpand\iftoggle{blx@sortcase}{1}{0}:%
+ \noexpand\iftoggle{blx@terseinits}{1}{0}:%
+ \noexpand\iftoggle{blx@useprefix}{1}{0}:%
+ \noexpand\iftoggle{blx@useauthor}{1}{0}:%
+ \noexpand\iftoggle{blx@useeditor}{1}{0}:%
+ \noexpand\iftoggle{blx@usetranslator}{1}{0}:%
+ \noexpand\iftoggle{blx@labelalpha}{1}{0}:%
+ \noexpand\iftoggle{blx@labelyear}{1}{0}:%
+ \noexpand\iftoggle{blx@singletitle}{1}{0}:%
+ \noexpand\blx@uniquename:%
+ \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
+ \noexpand\blx@sortlos:%
+ \noexpand\the\c@maxnames:%
+ \noexpand\the\c@minnames:%
+ \noexpand\blx@maxline:%
+ \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}%
+ \string},\blx@nl
+ \string}%
+}
-% [<entrytype>]{<name>}{<spec>}
+\def\blx@ctrlwrite@bibtex{%
+ \immediate\openout\blx@auxout\blx@ctrlfile\blxauxsuffix.bib\relax
+ \blx@auxwrite\blx@auxout{}{\blx@ctrl@bibtex}%
+ \immediate\closeout\blx@auxout}
-\newrobustcmd*{\DeclareSortingScheme}[3][global]{%
+\def\blx@ctrlwrite@biber{%
\begingroup
- \let\item\blx@sortdef@item
+ \blx@safe@actives
+ \let\protect\string
+ \edef\labelalphaothers{\labelalphaothers}%
+ \edef\sortalphaothers{\sortalphaothers}%
+ \blx@xmlsanitizeafter{\def\labelalphaothers}{\labelalphaothers}%
+ \blx@xmlsanitizeafter{\def\sortalphaothers}{\sortalphaothers}%
+ \edef\blx@tempa{%
+ \blx@xml@file
+ \blx@xml@comment{BIBER OPTIONS}%
+ \blx@xml@options{biber}{global}{%
+ \blx@xml@svalue{bblencoding}{\blx@inputencoding}%
+ \blx@xml@svalue{bibencoding}{\blx@bibencoding}%
+ \blx@xml@toggle{debug}%
+ \blx@xml@svalue{mincrossrefs}{\blx@mincrossrefs}%
+ \blx@xml@toggle{sortcase}%
+ \ifdef\blx@sortlocale
+ {\blx@xml@svalue{sortlocale}{\blx@sortlocale}}
+ {}%
+ \blx@xml@toggle{sortupper}%
+ }%
+ \blx@xml@comment{BIBLATEX OPTIONS}%
+ \blx@bcf@options@global
+ }%
+ \ifdef\blx@opts@type
+ {\def\do##1{%
+ \begingroup
+ \blx@setoptions@type{##1}%
+ \xappto\blx@tempa{\blx@bcf@options@type{##1}}%
+ \endgroup}%
+ \dolistloop\blx@opts@type}
+ {}%
+ \def\do##1{%
+ \eappto\blx@bcf@presort{\csuse{blx@bcf@presort@##1}}%
+ \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}}%
+ \abx@dotypes
+ \eappto\blx@tempa{%
+ \blx@xml@comment{SORTING}%
+ \blx@xml@sorting{%
+ \blx@bcf@presort
+ \blx@bcf@exclude
+ \csuse{blx@biber@sorting@\blx@sorting}%
+ }%
+ }%
+ \blx@xmlsanitizeafter{\def\blx@bibfiles}{\blx@bibfiles}%
+ \def\do{\blx@xml@datasource{file}}%
+ \eappto\blx@tempa{%
+ \blx@xml@comment{CITATION DATA}%
+ \blx@xml@comment{section 0}%
+ \blx@xml@bibdata{0}{\expandafter\docsvlist\expandafter{\blx@bibfiles}}%
+ \blx@xml@section{0}%
+ }%
+ \immediate\openout\blx@auxout\jobname.bcf\relax
+ \blx@auxwrite\blx@auxout{}{\blx@tempa}%
+ \global\undef\blx@tempa
+ \endgroup
+ \AfterEndDocument{%
+ \blx@auxwrite\blx@auxout{}{%
+ \blx@xml@endsection
+ \blx@xml@endfile}%
+ \immediate\closeout\blx@auxout}}
+
+%% Customization
+
+% {<name>}{<spec>}
+
+\newrobustcmd*{\DeclareSortingScheme}[2]{%
+ \begingroup
+ \let\sort\blx@sortdef@sort
+ \let\name\blx@sortdef@list
+ \let\list\blx@sortdef@list
\let\field\blx@sortdef@field
\let\literal\blx@sortdef@literal
+ \def\citeorder{\blx@sortdef@field{citeorder}}%
\blx@tempcnta\z@
\let\blx@tempa\@empty
- #3%
- \csxdef{blx@biber@sorting@#2@#1}{\blx@bcf@sorting{#1}{\blx@tempa}}%
- \ifcsdef{blx@biber@sorting@#2}
- {\ifinlistcs{#1}{blx@biber@sorting@#2}
- {}
- {\listcsgadd{blx@biber@sorting@#2}{#1}}}
- {\listcsgadd{blx@biber@sorting@#2}{#1}}%
+ #2%
+ \global\cslet{blx@biber@sorting@#1}\blx@tempa
\endgroup}
\@onlypreamble\DeclareSortingScheme
-\def\blx@sortdef@item#1{%
+\newcommand{\blx@sortdef@sort}[2][]{%
\advance\blx@tempcnta\@ne
\blx@tempcntb\z@
\let\blx@tempb\@empty
+ \edef\blx@tempc{order="\the\blx@tempcnta"}%
+ \ifblank{#1}
+ {}
+ {\setkeys{blx@sortdef@sort}{#1}}%
\let\do\@firstofone
- #1%
+ #2%
\eappto\blx@tempa{%
- \blx@bcf@sort{order="\the\blx@tempcnta"}{\blx@tempb}}}
+ \blx@xml@sort{\blx@tempc}{\blx@tempb}}}
+
+\define@key{blx@sortdef@sort}{pass}{% final|label
+ \ifstrequal{#1}{label}
+ {\appto\blx@tempc{ pass="label"}}
+ {\appto\blx@tempc{ pass="final"}}}
+\define@key{blx@sortdef@sort}{direction}{% ascending|descending
+ \ifstrequal{#1}{ascending}
+ {\appto\blx@tempc{ sort_direction="ascending"}}
+ {\appto\blx@tempc{ sort_direction="descending"}}}
+\define@key{blx@sortdef@sort}{final}[true]{% true|false
+ \ifstrequal{#1}{true}
+ {\appto\blx@tempc{ final="1"}}
+ {}}
+\define@key{blx@sortdef@sort}{sortcase}[true]{% true|false
+ \ifstrequal{#1}{true}
+ {\appto\blx@tempc{ sortcase="1"}}
+ {\appto\blx@tempc{ sortcase="0"}}}
+\define@key{blx@sortdef@sort}{sortupper}[true]{% true|false
+ \ifstrequal{#1}{true}
+ {\appto\blx@tempc{ sortupper="1"}}
+ {\appto\blx@tempc{ sortupper="0"}}}
+
+\def\blx@sortdef@list#1{%
+ \advance\blx@tempcntb\@ne
+ \edef\blx@tempd{order="\the\blx@tempcntb"}%
+ \eappto\blx@tempb{%
+ \blx@xml@sortitem{\blx@tempd}{#1}}}
\newcommand*{\blx@sortdef@field}[2][]{%
\advance\blx@tempcntb\@ne
- \edef\blx@tempc{order="\the\blx@tempcntb"}%
+ \edef\blx@tempd{order="\the\blx@tempcntb"}%
\ifblank{#1}
{}
{\setkeys{blx@sortdef@field}{#1}}%
\eappto\blx@tempb{%
- \blx@bcf@sortitem{\blx@tempc}{#2}}}
+ \blx@xml@sortitem{\blx@tempd}{#2}}}
-\define@key{blx@sortdef@field}{final}[true]{% true|false
- \ifstrequal{#1}{true}
- {\appto\blx@tempc{ final="1"}}
- {}}
-\define@key{blx@sortdef@field}{pass}{% final|label
- \ifstrequal{#1}{label}
- {\appto\blx@tempc{ pass="label"}}
- {\appto\blx@tempc{ pass="final"}}}
-\define@key{blx@sortdef@field}{direction}{% descending|ascending
- \ifstrequal{#1}{ascending}
- {\appto\blx@tempc{ sort_direction="ascending"}}
- {\appto\blx@tempc{ sort_direction="descending"}}}
-\define@key{blx@sortdef@field}{strside}{% left|right
- \ifstrequal{#1}{right}
- {\appto\blx@tempc{ substring_side="right"}}
- {\appto\blx@tempc{ substring_side="left"}}}
\define@key{blx@sortdef@field}{padside}{% left|right
\ifstrequal{#1}{right}
- {\appto\blx@tempc{ pad_side="right"}}
- {\appto\blx@tempc{ pad_side="left"}}}
-\define@key{blx@sortdef@field}{strwidth}{% integer
- \appto\blx@tempc{ substring_width="#1"}}
+ {\appto\blx@tempd{ pad_side="right"}}
+ {\appto\blx@tempd{ pad_side="left"}}}
\define@key{blx@sortdef@field}{padwidth}{% integer
- \appto\blx@tempc{ pad_width="#1"}}
+ \appto\blx@tempd{ pad_width="#1"}}
\define@key{blx@sortdef@field}{padchar}{% character
- \appto\blx@tempc{ pad_char="#1"}}
+ \blx@xmlsanitizeafter{\def\blx@tempe}{#1}%
+ \eappto\blx@tempd{ pad_char="\blx@tempe"}}
+\define@key{blx@sortdef@field}{strside}{% left|right
+ \ifstrequal{#1}{right}
+ {\appto\blx@tempd{ substring_side="right"}}
+ {\appto\blx@tempd{ substring_side="left"}}}
+\define@key{blx@sortdef@field}{strwidth}{% integer
+ \appto\blx@tempd{ substring_width="#1"}}
\def\blx@sortdef@literal#1{%
\advance\blx@tempcntb\@ne
+ \blx@xmlsanitizeafter{\def\blx@tempe}{#1}%
\eappto\blx@tempb{%
- \blx@bcf@sortitem{order="\the\blx@tempcntb"}{#1}}}
+ \blx@xml@sortitem{order="\the\blx@tempcntb"}{\blx@tempe}}}
-\DeclareSortingScheme{none}{%
- \item{\field{citeorder}}
-}
+% [<type,type,...>]{<string>}
-\DeclareSortingScheme{debug}{%
- \item{\field{entrykey}}
-}
+\newrobustcmd*{\DeclarePresort}[2][]{%
+ \begingroup
+ \blx@xmlsanitizeafter{\def\blx@tempa}{#2}%
+ \ifblank{#1}
+ {\xdef\blx@bcf@presort{\blx@xml@presort{}{\blx@tempa}}}
+ {\notblank{#2}
+ {\forcsvlist{\blx@defpresort\blx@tempa}{#1}}
+ {\forcsvlist\blx@undefpresort{#1}}}%
+ \endgroup}
+\@onlypreamble\DeclarePresort
-\DeclareSortingScheme{nty}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[final]{sortkey}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sorttitle}
- \field{title}}
- \item{\field{sortyear}
- \field{year}}
- \item{\field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}}
-}
+\def\blx@defpresort#1#2{%
+ \csxdef{blx@bcf@presort@#2}{\blx@xml@presort{#2}{#1}}}
+\def\blx@undefpresort#1{%
+ \global\csundef{blx@bcf@presort@#1}}
-\DeclareSortingScheme{nyt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[final]{sortkey}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sortyear}
- \field{year}}
- \item{\field{sorttitle}
- \field{title}}
- \item{\field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}}
-}
+\newrobustcmd*{\DeclareSortExclusion}[2]{%
+ \forcsvlist{\blx@sortexlude{#2}}{#1}}
-\DeclareSortingScheme{nyvt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[final]{sortkey}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sortyear}
- \field{year}}
- \item{\field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}}
- \item{\field{sorttitle}
- \field{title}}
-}
+\def\blx@sortexlude#1#2{%
+ \begingroup
+ \ifblank{#1}
+ {\global\csundef{blx@bcf@exclude@#2}}
+ {\let\blx@tempa\@empty
+ \forcsvlist\blx@sortexlude@i{#1}%
+ \csxdef{blx@bcf@exclude@#2}{%
+ \blx@xml@sortexclude{#2}{\blx@tempa}}}
+ \endgroup}
-\DeclareSortingScheme{anyt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[pass=label]{labelalpha}}
- \item{\field[final]{sortkey}}
- \item{\field[pass=final]{labelalpha}}
- \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sortyear}
- \field{year}}
- \item{\field{sorttitle}
- \field{title}}
- \item{\field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}}
-}
+\def\blx@sortexlude@i#1{%
+ \appto\blx@tempa{\blx@xml@exclude{#1}}}
-\DeclareSortingScheme{anyvt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[pass=label]{labelalpha}}
- \item{\field[final]{sortkey}}
- \item{\field[pass=final]{labelalpha}}
- \item{\field[pass=final,padside=left,padwidth=4,padchar=0]{extraalpha}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sortyear}
- \field{year}}
- \item{\field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}}
- \item{\field{sorttitle}
- \field{title}}
-}
+% [<type,type,...>]{<field,field,...>}
-\DeclareSortingScheme{ynt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[final]{sortkey}}
- \item{\field{sortyear}
- \field{year}
- \literal{9999}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sorttitle}
- \field{title}}
-}
+\newrobustcmd*{\DeclareLabelname}[2][]{%
+ \blx@defmvalue{labelname}{#1}{#2}}
+\@onlypreamble\DeclareLabelname
-\DeclareSortingScheme{ydnt}{%
- \item{\field[strside=left,strwidth=2]{presort}
- \literal{mm}}
- \item{\field[final]{sortkey}}
- \item{\field[strside=left,strwidth=4,direction=descending]{sortyear}
- \field[strside=left,strwidth=4,direction=descending]{year}
- \literal{9999}}
- \item{\field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}}
- \item{\field{sorttitle}
- \field{title}}
-}
+\newrobustcmd*{\DeclareLabelyear}[2][]{%
+ \blx@defmvalue{labelyear}{#1}{#2}}
+\@onlypreamble\Declarelabelyear
+
+\def\blx@defmvalue#1#2#3{%
+ \ifblank{#2}
+ {\expandafter\blx@defmvalue@ii\csname blx@bcf@#1\endcsname{#3}}
+ {\forcsvlist{\blx@defmvalue@i{#1}{#3}}{#2}}}
-\def\blx@deflabel#1#2{%
+\def\blx@defmvalue@i#1#2#3{%
+ \blx@addtypeopt{#3}%
+ \expandafter\blx@defmvalue@ii\csname blx@bcf@#1@#3\endcsname{#2}}
+
+\def\blx@defmvalue@ii#1#2{%
\begingroup
\global\let#1\@empty
\blx@tempcnta\z@
\def\do##1{%
\advance\blx@tempcnta\@ne
- \xappto#1{\noexpand\blx@bcf@ordered{\the\blx@tempcnta}{##1}}}%
+ \xappto#1{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{##1}}}%
\docsvlist{#2}%
\endgroup}
-% [<entrytype>]{<cslist>}
-
-\newrobustcmd*{\DeclareLabelname}[1][global]{%
- \expandafter\blx@deflabel\csname blx@bcf@labelname@#1\endcsname}
-\@onlypreamble\DeclareLabelname
-
-% [<entrytype>]{<cslist>}
-
-\newrobustcmd*{\DeclareLabelyear}[1][global]{%
- \expandafter\blx@deflabel\csname blx@bcf@labelyear@#1\endcsname}
-\@onlypreamble\Declarelabelyear
-
-\DeclareLabelname{%
- shortauthor,
- author,
- shorteditor,
- editor,
- translator}
-
-\DeclareLabelyear{%
- year,
- eventyear,
- origyear,
- urlyear}
-
-\edef\blx@ctrl@bibtex{%
- \blx@msg@bib
- @Control\string{biblatex-control,\blx@nl
- \space\space options = \string{%
- \blx@bblversion:%
- \noexpand\iftoggle{blx@debug}{1}{0}:%
- \noexpand\ifnum\noexpand\blx@backend>\noexpand\blx@backend@bibtex
- 1:%
- \noexpand\else
- 0:%
- \noexpand\fi
- \noexpand\iftoggle{blx@sortcase}{1}{0}:%
- \noexpand\iftoggle{blx@terseinits}{1}{0}:%
- \noexpand\iftoggle{blx@useprefix}{1}{0}:%
- \noexpand\iftoggle{blx@useauthor}{1}{0}:%
- \noexpand\iftoggle{blx@useeditor}{1}{0}:%
- \noexpand\iftoggle{blx@usetranslator}{1}{0}:%
- \noexpand\iftoggle{blx@labelalpha}{1}{0}:%
- \noexpand\iftoggle{blx@labelyear}{1}{0}:%
- \noexpand\iftoggle{blx@singletitle}{1}{0}:%
- \noexpand\blx@uniquename:%
- \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
- \noexpand\blx@sortlos:%
- \noexpand\the\c@maxnames:%
- \noexpand\the\c@minnames:%
- \noexpand\blx@maxline:%
- \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}%
- \string},\blx@nl
- \string}%
-}
-
-\def\blx@bcf@start{%
- \blx@bcf@file
- \blx@bcf@comment{BIBER OPTIONS}%
- \blx@bcf@options{biber}{global}{%
- \blx@bcf@svalue{bblencoding}{\blx@inputencoding}%
- \blx@bcf@svalue{bibencoding}{\blx@bibencoding}%
- \blx@bcf@toggle{debug}%
- \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}%
- \blx@bcf@comment{SORTING}%
- \csuse{blx@biber@sorting}%
- \blx@bcf@comment{CITATION DATA}%
- \blx@bcf@comment{section 0}%
-}
-
-\AtEndPreamble{%
- \ifnum\blx@backend=\blx@backend@biber
- \begingroup
- \def\do#1{\blx@bcf@datasource{file}{#1}}%
- \xappto\blx@bcf@start{%
- \blx@bcf@bibdata{0}{\expandafter\docsvlist\expandafter{\blx@bibfiles}}%
- \blx@bcf@section{0}}%
- \endgroup
- \fi}
-
-\def\blx@bcf@end{%
- \blx@bcf@endsection
- \blx@bcf@endfile
-}
-
%% Package options
-% [<entrytype>]{<options>}
+% [<entrytype,entrytype,...>]{<options>}
\newrobustcmd*{\ExecuteBibliographyOptions}[2][]{%
\ifblank{#1}
{\setkeys{blx@opt@pre}{#2}}
+ {\forcsvlist{\blx@typeoptions{#2}}{#1}}}
+\@onlypreamble\ExecuteBibliographyOptions
+
+\def\blx@typeoptions#1#2{%
+ \blx@addtypeopt{#2}%
+ \csappto{blx@opts@type@#2}{#1}}
+
+\def\blx@addtypeopt#1{%
+ \notblank{#1}
{\ifdef\blx@opts@type
{\ifinlist{#1}{\blx@opts@type}
- {}
+ {}
{\listadd\blx@opts@type{#1}}}
- {\listadd\blx@opts@type{#1}}%
- \csappto{blx@opts@type@#1}{#2}}}
-\@onlypreamble\ExecuteBibliographyOptions
+ {\listadd\blx@opts@type{#1}}}
+ {}}
% load-time only
@@ -8310,6 +8551,9 @@
\define@key{blx@opt@ldt}{natbib}[true]{%
\settoggle{blx@natbib}{#1}}
+\define@key{blx@opt@ldt}{mcite}[true]{%
+ \settoggle{blx@mcite}{#1}}
+
% load-time and preamble
\DeclareBibliographyOption{debug}[true]{%
@@ -8358,7 +8602,7 @@
\AtEndPreamble{%
\ifnum\blx@backend=\blx@backend@biber
- \ifcsdef{blx@biber@sorting@\blx@sorting @global}
+ \ifcsdef{blx@biber@sorting@\blx@sorting}
{}
{\blx@err@invopt{sorting=\blx@sorting}{}%
\def\blx@sorting{nty}}%
@@ -8387,35 +8631,54 @@
\def\blx@opt@sortlos@bib{0}
\def\blx@opt@sortlos@los{1}
-\DeclareBibliographyOption{maxnames}{\blx@setmaxnames{#1}}
-\def\blx@setmaxnames#1{%
- \ifnum#1<\@ne
- \blx@err@invopt{maxnames=#1}
- {'maxnames' must be greater than zero}%
- \else
- \ifnum#1<\c@minnames
- \blx@err@confopt{maxnames/minnames}
- {'maxnames' must be greater than or equal to 'minnames'}%
- \else
- \c@maxnames#1\relax
- \fi
- \fi}
-
-\DeclareBibliographyOption{minnames}{\blx@setminnames{#1}}
-\def\blx@setminnames#1{%
- \ifnum#1<\@ne
- \blx@err@invopt{minnames=#1}
- {'minnames' must be greater than zero}%
- \else
- \ifnum#1>\c@maxnames
- \blx@err@confopt{maxnames/minnames}
- {'minnames' must be less than or equal to 'maxnames'}%
- \else
- \c@minnames#1\relax
- \fi
- \fi}
+\DeclareBibliographyOption{maxnames}{\blx@setmaxval{names}{#1}}
+\DeclareBibliographyOption{minnames}{\blx@setminval{names}{#1}}
+
+\def\blx@setmaxval#1#2{%
+ \ifnumless{#2}\@ne
+ {\blx@err@invopt{max#1=#2}{%
+ 'max#1' must be greater than zero}}
+ {\ifnumless{#2}{\csname c@min#1\endcsname}
+ {\blx@err@confopt{max#1/min#1}{%
+ 'max#1' must be greater than or equal to 'min#1'}}
+ {\defcounter{max#1}{#2}}}}
+
+\def\blx@setminval#1#2{%
+ \ifnumless{#2}\@ne
+ {\blx@err@invopt{min#1=#2}{%
+ min#1' must be greater than zero}}
+ {\ifnumgreater{#2}{\csname c@max#1\endcsname}
+ {\blx@err@confopt{max#1/min#1}{%
+ 'min#1' must be less than or equal to 'max#1'}}
+ {\defcounter{min#1}{#2}}}}
+
+\DeclareBibliographyOption{maxbibnames}{\blx@defmaxval{bibnames}{#1}}
+\DeclareBibliographyOption{minbibnames}{\blx@defminval{bibnames}{#1}}
+
+\DeclareBibliographyOption{maxcitenames}{\blx@defmaxval{citenames}{#1}}
+\DeclareBibliographyOption{mincitenames}{\blx@defminval{citenames}{#1}}
+
+\def\blx@defmaxval#1#2{%
+ \ifnumless{#2}\@ne
+ {\blx@err@invopt{max#1=#2}{%
+ 'max#1' must be greater than zero}}
+ {\ifnumless{#2}{\csname blx@min#1\endcsname}
+ {\blx@err@confopt{max#1/min#1}{%
+ 'max#1' must be greater than or equal to 'min#1'}}
+ {\csnumdef{blx@max#1}{#2}}}}
+
+\def\blx@defminval#1#2{%
+ \ifnumless{#2}\@ne
+ {\blx@err@invopt{min#1=#2}{%
+ min#1' must be greater than zero}}
+ {\ifnumgreater{#2}{\csname blx@max#1\endcsname}
+ {\blx@err@confopt{max#1/min#1}{%
+ 'min#1' must be less than or equal to 'max#1'}}
+ {\csnumdef{blx@min#1}{#2}}}}
\DeclareBibliographyOption{maxitems}{\blx@setmaxitems{#1}}
+\DeclareBibliographyOption{minitems}{\blx@setminitems{#1}}
+
\def\blx@setmaxitems#1{%
\ifnum#1<\@ne
\blx@err@invopt{maxitems=#1}
@@ -8429,7 +8692,6 @@
\fi
\fi}
-\DeclareBibliographyOption{minitems}{\blx@setminitems{#1}}
\def\blx@setminitems#1{%
\ifnum#1<\@ne
\blx@err@invopt{minitems=#1}
@@ -8506,6 +8768,12 @@
\def\blx@hook@endlang{\blx@postpunct}}
\DeclareBibliographyOption{indexing}[true]{%
+ \blx@opt@index{#1}}
+\DeclareTypeOption{indexing}[true]{%
+ \blx@opt@index{#1}}
+\DeclareEntryOption{indexing}[true]{%
+ \blx@opt@index{#1}}
+\def\blx@opt@index#1{%
\ifcsdef{blx@opt@index@#1}
{\csuse{blx@opt@index@#1}}
{\blx@err@invopt{indexing=#1}{}}}
@@ -9038,6 +9306,9 @@
\iftoggle{blx@natbib}
{\blx@inputonce{blx-natbib.def}{natbib compatibility}{}{}{}{}}
{}
+\iftoggle{blx@mcite}
+ {\blx@inputonce{blx-mcite.def}{mcite-like commands}{}{}{}{}}
+ {}
\RequireBibliographyStyle{\blx@bbxfile}
\RequireCitationStyle{\blx@cbxfile}
\blx@secinit
@@ -9149,6 +9420,11 @@
\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{%
\ifundef\inputencodingname
{\ifundef\XeTeXrevision
@@ -9165,14 +9441,9 @@
\blx@info@noline{%
XeTeX detected.\MessageBreak
Assuming input encoding '\blx@inputencoding'}}}
- {\let\blx@inputencoding\inputencodingname
- \ifboolexpr{
- test {\ifdefstring\blx@inputencoding{utf8x}}
- or
- test {\ifdefstring\blx@inputencoding{lutf8}}
- }
- {\def\blx@inputencoding{utf8}}
- {}%
+ {\ifcsdef{blx@enc@\inputencodingname}
+ {\letcs\blx@inputencoding{blx@enc@\inputencodingname}}
+ {\let\blx@inputencoding\inputencodingname}%
\blx@info@noline{%
Input encoding '\blx@inputencoding' detected}}%
\ifdef\blx@bibencoding
@@ -9187,7 +9458,7 @@
Automatic encoding selection.\MessageBreak
Assuming data encoding '\blx@bibencoding'}
\togglefalse{blx@reencode}}
- {\ifdefequal\blx@bibencoding\blx@inputencoding
+ {\ifdefstrequal\blx@bibencoding\blx@inputencoding
{\blx@info@noline{%
Data encoding '\blx@bibencoding' specified.\MessageBreak
No need to reencode data}%
@@ -9235,29 +9506,32 @@
% Deferred last minute setup
\AtBeginDocument{%
+ \blx@checkbackend{style}%
\if@filesw
\ifnum\blx@backend=\blx@backend@biber
\blx@ifsigned{\jobname}{bcf}
- {\immediate\openout\blx@auxout\jobname.bcf\relax
- \blx@auxwrite\blx@auxout{}{\blx@bcf@start}%
- \AfterEndDocument{%
- \blx@auxwrite\blx@auxout{}{\blx@bcf@end}%
- \immediate\closeout\blx@auxout}}
- {}%
+ {\blx@ctrlwrite@biber}
+ {}%
\else
\blx@auxinit@bibtex\blx@bibfiles
\blx@ifsigned{\blx@ctrlfile\blxauxsuffix}{bib}
- {\immediate\openout\blx@auxout\blx@ctrlfile\blxauxsuffix.bib\relax
- \blx@auxwrite\blx@auxout{}{\blx@ctrl@bibtex}%
- \immediate\closeout\blx@auxout}
- {}%
+ {\blx@ctrlwrite@bibtex}
+ {}%
\fi
- \blx@bblinput
+ \ifnumless\blx@reqbiber\thr@@
+ {\blx@bblinput}
+ {}%
\blx@maxsection\z@
\fi
+ \let\blx@reqbiber\z@
\csuse{abx@preamble}%
+ \blx@checkbackend{.bib file}%
\blx@inf@refsec
- \blx@inf@refseg}
+ \blx@inf@refseg
+ \numdef\blx@premaxnames{\c@maxnames}%
+ \numdef\blx@preminnames{\c@minnames}%
+ \c@maxnames\blx@maxcitenames\relax
+ \c@minnames\blx@mincitenames\relax}
\AtEndOfPackage{%
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 6cad1dd1673..311d31cce62 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: blx-compat.def,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.0 2010/11/19 16:16:35 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.1 2011/01/05 21:45:11 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
new file mode 100644
index 00000000000..db56f8ce2f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
@@ -0,0 +1,78 @@
+% $Id: blx-mcite.def,v 1.1 2011/01/05 21:45:11 lehman stable $
+
+\ProvidesFile{blx-mcite.def}
+[\abx@rcsid $Id: blx-mcite.def,v 1.1 2011/01/05 21:45:11 lehman stable $
+ mcite-like citation commands]
+
+\newrobustcmd*{\mcite}{\mcitelike\cite}
+\newrobustcmd*{\Mcite}{\mcitelike\Cite}
+\newrobustcmd*{\mparencite}{\mcitelike\parencite}
+\newrobustcmd*{\Mparencite}{\mcitelike\Parencite}
+\newrobustcmd*{\mfootcite}{\mcitelike\footcite}
+\newrobustcmd*{\mfootcitetext}{\mcitelike\footcitetext}
+\newrobustcmd*{\mtextcite}{\mcitelike\textcite}
+\newrobustcmd*{\Mtextcite}{\mcitelike\Textcite}
+\newrobustcmd*{\msupercite}{\mcitelike\supercite}
+
+% \mcite{key1,setA,*keyA1,*keyA2,*keyA3,key2,setB,*keyB1,*keyB2,*keyB3}
+% => \mcitelike\cite{key1,setA,*keyA1,*keyA2,*keyA3,key2,setB,*keyB1,*keyB2,*keyB3}
+% => \defbibentryset{setA}{keyA1,keyA2,keyA3}
+% \defbibentryset{setB}{keyB1,keyB2,keyB3}
+% \cite{key1,setA,key2,setB}
+
+\newrobustcmd*{\mcitelike}[1]{%
+ \@ifstar
+ {\blx@citeargs{\blx@mclike{#1*}}}
+ {\blx@citeargs{\blx@mclike{#1}}}}
+
+\long\def\blx@mclike#1#2#3#4{%
+ \begingroup
+ \let\blx@mclike@tempa\@empty
+ \let\blx@mclike@tempb\@empty
+ \let\blx@mclike@tempc\@empty
+ \blx@xsanitizeafter\blx@mclike@i{#4}%
+ \edef\blx@mclike@tempa{\endgroup\unexpanded{#1[#2][#3]}{\blx@mclike@tempa}}%
+ \blx@mclike@tempa}
+
+\def\blx@mclike@i#1{%
+ \forcsvlist\blx@mclike@ii{#1}%
+ \blx@mclike@iv}
+
+\def\blx@mclike@ii#1{\blx@mclike@iii#1&}
+
+\def\blx@mclike@iii#1#2&{%
+ \if*#1%
+ \blx@mclike@tail{#2}%
+ \else
+ \blx@mclike@head{#1#2}%
+ \fi}
+
+\def\blx@mclike@iv{%
+ \ifx\blx@mclike@tempb\@empty
+ \else
+ \ifx\blx@mclike@tempc\@empty
+ \nocite{\blx@mclike@tempb}% preserve citation order for sorting=none
+ \else
+ \defbibentryset{\blx@mclike@tempb}{\blx@mclike@tempc}%
+ \let\blx@mclike@tempc\@empty
+ \fi
+ \let\blx@mclike@tempb\@empty
+ \fi}
+
+\def\blx@mclike@head#1{%
+ \blx@mclike@iv
+ \edef\blx@mclike@tempa{%
+ \ifx\blx@mclike@tempa\@empty
+ \else
+ \blx@mclike@tempa,%
+ \fi#1}%
+ \def\blx@mclike@tempb{#1}}
+
+\def\blx@mclike@tail#1{%
+ \edef\blx@mclike@tempc{%
+ \ifx\blx@mclike@tempc\@empty
+ \else
+ \blx@mclike@tempc,%
+ \fi#1}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 8790f7f1084..86202caa66f 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: blx-natbib.def,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.0 2010/11/19 16:16:35 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.1 2011/01/05 21:45:11 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 7afd69ab88f..fab16c65659 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,12 +1,13 @@
-% $Id: alphabetic-verb.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
\printfield{labelalpha}%
\printfield{extraalpha}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index ee29c6c1575..d90024beae1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,12 +1,13 @@
-% $Id: alphabetic.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: alphabetic.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
\printfield{labelalpha}%
\printfield{extraalpha}}}
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 9c2e924c22d..89be65f66b4 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{sortcites,autocite=footnote}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 4121c6fec52..21b73a50655 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index d477f85f889..985d7af1f92 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index 022e220ac8d..2a1fb288929 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.1 2011/01/05 21:45:11 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 c87ba174efa..3e8446a3fe8 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.1 2011/01/05 21:45:11 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 49e2504d498..92f423c08c9 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.1 2011/01/05 21:45:11 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 15b6f7f20f0..cdf5376b533 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authortitle.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{autocite=footnote}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index 5a798234c9e..7dc49d962c0 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index c65d181361f..0f9949bb626 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
\providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index b1045c2ae0c..7fced014986 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 935e6901906..e7598c68d8c 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index e41b095c03d..5021609b30d 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: debug.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{autocite=plain}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index 0b501b2a9ba..fb804ff33bd 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: draft.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{autocite=plain}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index ec00385b93b..31c6acfd941 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
index 51c17db6e04..0aea3afbd64 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric-verb.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 1394a638f11..cd340813d54 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: numeric.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index 86a0afabf5a..34d045dc721 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: reading.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.1 2011/01/05 21:45:11 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 6388937d3a4..ce5d6bdd100 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index 123a14834aa..ea1a5c3ef8f 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-inote.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index 7db457a1f27..b7687db4e8e 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-note.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index 5b7e07fe7a9..a24ce197512 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:ibidpage}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 12330e50ba0..d18696daa0a 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:fullcite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 73e744cf9fc..5f43a95e084 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:loccit}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index 00cfd9a97e1..eadb02de9b7 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: verbose.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index 36cd206314d..a64fd7719ee 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: UKenglish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.1 2011/01/05 21:45:11 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 10b190a8caf..66630e7b404 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: USenglish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.1 2011/01/05 21:45:11 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 29f581b837b..eb4cfae5734 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: american.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.1 2011/01/05 21:45:11 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 244ae563c55..06a02a59ce4 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: australian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.1 2011/01/05 21:45:11 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 bffad893230..0716de5c712 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: austrian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.1 2011/01/05 21:45:11 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 998fc713366..f231a6cf6e9 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: brazil.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.1 2011/01/05 21:45:11 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 1a146eb4a6b..08f2eca320f 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: brazilian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
% Status:
% - Complete
@@ -304,7 +304,7 @@
jourvol = {{volume}{vol\adddot}},
jourser = {{s\'erie}{s\'er\adddot}},
newseries = {{nova s\'erie}{nova s\'er\adddot}},
- oldseries = {{s\'erie antiga}{ser\adddot\ antiga}},
+ oldseries = {{s\'erie antiga}{s\'er\adddot\ antiga}},
edition = {{edi\c{c}\~ao}{ed\adddot}},
reprint = {{reimpress\~ao}{reimpr\adddot}},
reprintof = {{reimpress\~ao de}{reimpr\adddotspace de}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index de643240998..94041f21e06 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: british.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.1 2011/01/05 21:45:11 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 7dc85385a47..85884bda8f3 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: canadian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.1 2011/01/05 21:45:11 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 ffcd49dd2ec..67e36d46c68 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: danish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.1 2011/01/05 21:45:11 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 a06a7dc81a9..fa693bb7a05 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: dutch.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.1 2011/01/05 21:45:11 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 00d899bec80..dd73456306f 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: english.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.1 2011/01/05 21:45:11 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 f0b7e2dd560..571e63477af 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: finnish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.1 2011/01/05 21:45:11 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 384a01c4812..cd7bce67757 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: french.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.1 2011/01/05 21:45:11 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 1100c8452e7..455cd53894b 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: german.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.1 2011/01/05 21:45:11 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 126ae2e4ac5..6dfbd303860 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: greek.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.1 2011/01/05 21:45:11 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 77c3bea3586..529f79839ac 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: italian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.1 2011/01/05 21:45:11 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 1a95e07a9ce..4e7fff53646 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: naustrian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.1 2011/01/05 21:45:11 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 8475ee679e3..225d8ac1bfc 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: newzealand.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.1 2011/01/05 21:45:11 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 38131e79446..e069d316331 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: ngerman.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.1 2011/01/05 21:45:11 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 feb18f1dc8c..2238df900a9 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: norsk.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.1 2011/01/05 21:45:11 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 6585c71248c..ca16ae91352 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: norwegian.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.1 2011/01/05 21:45:11 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 078530afc10..f392de6f1e0 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: nynorsk.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.1 2011/01/05 21:45:11 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 7fe386e1c67..a71925f4da4 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: portuges.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.1 2011/01/05 21:45:11 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 bb062a58f09..e1545e363a8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,30 +1,449 @@
-% $Id: portuguese.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: portuguese.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
% Status:
-% - Draft based on brazilian.lbx
-% - Needs review by a native speaker from Portugal
+% - Complete
+% - Translations by native speakers
+%
+% Changes:
+% 2010-11-21 Update by Jos\'e Carlos Santos
+
+% Translator's notes:
+%
+% Recently (since January 2010) a change was introduced in the
+% way Portuguese is written and according to the new rules month
+% names should not be capitalized. These new rules are optional
+% at present, but they will become mandatory after 2015.
\DeclareRedundantLanguages{portuguese}{portuges,brazil}
-\InheritBibliographyExtras{brazilian}
+\DeclareBibliographyExtras{%
+ \protected\def\bibrangedash{%
+ \textendash\penalty\hyphenpenalty}% breakable dash
+ \protected\def\bibdatedash{\bibrangedash}%
+ \let\finalandcomma=\empty
+ \def\mkbibordinal{\mkbibmascord}%
+ \protected\def\mkbibmascord#1{%
+ \stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty
+ \protected\def\mkbibfemord#1{%
+ \stripzeros{#1}\textordfeminine}% \textordfeminine -> textcomp.sty
+ \protected\def\mkbibdatelong#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\stripzeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{\nobreakspace de\space}}%
+ \iffieldundef{#2}
+ {}
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\nobreakspace de\space}}%
+ \thefield{#1}}%
+ \protected\def\mkbibdateshort#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\mkdatezeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{/}}%
+ \iffieldundef{#2}
+ {}
+ {\mkdatezeros{\thefield{#2}}%
+ \iffieldundef{#1}{}{/}}%
+ \thefield{#1}}%
+ \savecommand\mkbibordedition
+ \savecommand\mkbibordseries
+ \def\mkbibordedition{\mkbibfemord}%
+ \def\mkbibordseries{\mkbibfemord}%
+}
+
+\UndeclareBibliographyExtras{%
+ \restorecommand\mkbibordedition
+ \restorecommand\mkbibordseries
+}
\DeclareBibliographyStrings{%
- inherit = {brazilian},
- january = {{Janeiro}{Jan\adddot}},
- february = {{Fevereiro}{Fev\adddot}},
- march = {{Mar\c{c}o}{Mar\adddot}},
- april = {{Abril}{Abr\adddot}},
- may = {{Maio}{Mai\adddot}},
- june = {{Junho}{Jun\adddot}},
- july = {{Julho}{Jul\adddot}},
- august = {{Agosto}{Ago\adddot}},
- september = {{Setembro}{Set\adddot}},
- october = {{Outubro}{Out\adddot}},
- november = {{Novembro}{Nov\adddot}},
- december = {{Dezembro}{Dez\adddot}},
+ bibliography = {{Bibliografia}{Bibliografia}},
+ references = {{Refer\^encias}{Refer\^encias}},
+ shorthands = {{Lista de Abreviaturas}{Abreviaturas}},
+ editor = {{editor}{ed\adddot}},
+ editors = {{editores}{eds\adddot}},
+ compiler = {{compilador}{comp\adddot}},
+ compilers = {{compiladores}{comp\adddot}},
+ redactor = {{redator}{red\adddot}},
+ redactors = {{redatores}{red\adddot}},
+ founder = {{fundador}{fund\adddot}},
+ founders = {{fundadores}{fund\adddot}},
+ continuator = {{continuador}{cont\adddot}},
+ continuators = {{continuadores}{cont\adddot}},
+ collaborator = {{colaborador}{col\adddot}},
+ collaborators = {{colaboradores}{cols\adddot}},
+ translator = {{tradutor}{trad\adddot}},
+ translators = {{tradutores}{trads\adddot}},
+ commentator = {{comentador}{coment\adddot}},
+ commentators = {{comentadores}{coments\adddot}},
+ annotator = {{anotador}{anot\adddot}},
+ annotators = {{anotadores}{anots\adddot}},
+ commentary = {{coment\'ario}{coment\adddot}},
+ annotations = {{notas}{notas}},
+ introduction = {{introdu\c{c}\~ao}{introd\adddot}},
+ foreword = {{pref\'acio}{pref\adddot}},
+ afterword = {{posf\'acio}{posf\adddot}},
+ editortr = {{editor e tradutor}%
+ {ed\adddotspace e trad\adddot}},
+ editorstr = {{editores e tradutores}%
+ {eds\adddotspace e trads\adddot}},
+ editorco = {{editor e comentador}%
+ {ed\adddotspace e coment\adddot}},
+ editorsco = {{editores e comentadores}%
+ {eds\adddotspace e coments\adddot}},
+ editoran = {{editor e anotador}%
+ {ed\adddotspace e anot\adddot}},
+ editorsan = {{editores e anotadores}%
+ {eds\adddotspace e anots\adddot}},
+ editorin = {{editor e introdu\c{c}\~ao}%
+ {ed\adddotspace e introd\adddot}},
+ editorsin = {{editores e introdu\c{c}\~ao}%
+ {eds\adddotspace e introd\adddot}},
+ editorfo = {{editor e pref\'acio}%
+ {ed\adddotspace e pref\adddot}},
+ editorsfo = {{editores e pref\'acio}%
+ {eds\adddotspace e pref\adddot}},
+ editoraf = {{editor e posf\'acio}%
+ {ed\adddotspace e posf\adddot}},
+ editorsaf = {{editores e posf\'acio}%
+ {eds\adddotspace e posf\adddot}},
+ editortrco = {{editor, tradutor e comentador}%
+ {ed., trad\adddot\ e coment\adddot}},
+ editorstrco = {{editores, tradutores e comentadores}%
+ {eds., trads\adddot\ e coments\adddot}},
+ editortran = {{editor, tradutor e anotador}%
+ {ed., trad\adddot\ e anot\adddot}},
+ editorstran = {{editores, tradutores e anotadores}%
+ {eds., trads\adddot\ e anots\adddot}},
+ editortrin = {{editor, tradutor e introdu\c{c}\~ao}%
+ {ed., trad\adddot\ e introd\adddot}},
+ editorstrin = {{editores, tradutores e introdu\c{c}\~ao}%
+ {eds., trads\adddot\ e introd\adddot}},
+ editortrfo = {{editor, tradutor e pref\'acio}%
+ {ed., trad\adddot\ e pref\adddot}},
+ editorstrfo = {{editores, tradutores e pref\'acio}%
+ {eds., trads\adddot\ e pref\adddot}},
+ editortraf = {{editor, tradutor e posf\'acio}%
+ {ed., trad\adddot\ e posf\adddot}},
+ editorstraf = {{editores, tradutores e posf\'acio}%
+ {eds., trads\adddot\ e posf\adddot}},
+ editorcoin = {{editor, comentador e introdu\c{c}\~ao}%
+ {ed., coment\adddot\ e introd\adddot}},
+ editorscoin = {{editores, comentadores e introdu\c{c}\~ao}%
+ {eds., coments\adddot\ e introd\adddot}},
+ editorcofo = {{editor, comentador e pref\'acio}%
+ {ed., coment\adddot\ e pref\adddot}},
+ editorscofo = {{editores, comentadores e pref\'acio}%
+ {eds., coments\adddot\ e pref\adddot}},
+ editorcoaf = {{editor, comentador e posf\'acio}%
+ {ed., coment\adddot\ e posf\adddot}},
+ editorscoaf = {{editores, comentadores e posf\'acio}%
+ {eds., coments\adddot\ e posf\adddot}},
+ editoranin = {{editor, anotador e introdu\c{c}\~ao}%
+ {ed., anot\adddot\ e introd\adddot}},
+ editorsanin = {{editores, anotadores e introdu\c{c}\~ao}%
+ {eds., anots\adddot\ e introd\adddot}},
+ editoranfo = {{editor, anotador e pref\'acio}%
+ {ed., anot\adddot\ e pref\adddot}},
+ editorsanfo = {{editores, anotadores e pref\'acio}%
+ {eds., anots\adddot\ e pref\adddot}},
+ editoranaf = {{editor, anotador e posf\'acio}%
+ {ed., anot\adddot\ e posf\adddot}},
+ editorsanaf = {{editores, anotadores e posf\'acio}%
+ {eds., anots\adddot\ e posf\adddot}},
+ editortrcoin = {{editor, tradutor, comentador e introdu\c{c}\~ao}%
+ {ed., trad., coment\adddot\ e introd\adddot}},
+ editorstrcoin = {{editores, tradutores, comentadores e introdu\c{c}\~ao}%
+ {eds., trads., coments\adddot\ e introd\adddot}},
+ editortrcofo = {{editor, tradutor, comentador e pref\'acio}%
+ {ed., trad., coment\adddot\ e pref\adddot}},
+ editorstrcofo = {{editores, tradutores, comentadores e pref\'acio}%
+ {eds., trads., coments\adddot\ e pref\adddot}},
+ editortrcoaf = {{editor, tradutor, comentador e posf\'acio}%
+ {ed., trad., coment\adddot\ e posf\adddot}},
+ editorstrcoaf = {{editores, tradutores, comentadores e posf\'acio}%
+ {eds., trads., coments\adddot\ e posf\adddot}},
+ editortranin = {{editor, tradutor, anotador e introdu\c{c}\~ao}%
+ {ed., trad., anot\adddot\ e introd\adddot}},
+ editorstranin = {{editores, tradutores, anotadores e introdu\c{c}\~ao}%
+ {eds., trads., anots\adddot\ e introd\adddot}},
+ editortranfo = {{editor, tradutor, anotador e pref\'acio}%
+ {ed., trad., anot\adddot\ e pref\adddot}},
+ editorstranfo = {{editores, tradutores, anotadores e pref\'acio}%
+ {eds., trads., anots\adddot\ e pref\adddot}},
+ editortranaf = {{editor, tradutor, anotador e posf\'acio}%
+ {ed., trad., anot\adddot\ e posf\adddot}},
+ editorstranaf = {{editores, tradutores, anotadores e posf\'acio}%
+ {eds., trads., anots\adddot\ e posf\adddot}},
+ translatorco = {{tradutor e comentador}%
+ {trad\adddot\ e coment\adddot}},
+ translatorsco = {{tradutores e comentadores}%
+ {trads\adddot\ e coments\adddot}},
+ translatoran = {{tradutor e anotador}%
+ {trad\adddot\ e anot\adddot}},
+ translatorsan = {{tradutores e anotadores}%
+ {trads\adddot\ e anots\adddot}},
+ translatorin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
+ {trad\adddot\ e introd\adddot}},
+ translatorsin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
+ {trad\adddot\ e introd\adddot}},
+ translatorfo = {{tradu\c{c}\~ao e pref\'acio}%
+ {trad\adddot\ e pref\adddot}},
+ translatorsfo = {{tradu\c{c}\~ao e pref\'acio}%
+ {trad\adddot\ e pref\adddot}},
+ translatoraf = {{tradu\c{c}\~ao e posf\'acio}%
+ {trad\adddot\ e posf\adddot}},
+ translatorsaf = {{tradu\c{c}\~ao e posf\'acio}%
+ {trad\adddot\ e posf\adddot}},
+ translatorcoin = {{tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao}%
+ {trad., coment\adddot\ e introd\adddot}},
+ translatorscoin = {{tradu\c{c}\~ao, coment\'ario e introdu\c{c}\~ao}%
+ {trad., coment\adddot\ e introd\adddot}},
+ translatorcofo = {{tradu\c{c}\~ao, coment\'ario e pref\'acio}%
+ {trad., coment\adddot\ e pref\adddot}},
+ translatorscofo = {{tradu\c{c}\~ao, coment\'ario e pref\'acio}%
+ {trad., coment\adddot\ e pref\adddot}},
+ translatorcoaf = {{tradu\c{c}\~ao, coment\'ario e posf\'acio}%
+ {trad., coment\adddot\ e posf\adddot}},
+ translatorscoaf = {{tradu\c{c}\~ao, coment\'ario e posf\'acio}%
+ {trad., coment\adddot\ e posf\adddot}},
+ translatoranin = {{tradu\c{c}\~ao, notas e introdu\c{c}\~ao}%
+ {trad., notas e introd\adddot}},
+ translatorsanin = {{tradu\c{c}\~ao, notas e introdu\c{c}\~ao}%
+ {trad., notas e introd\adddot}},
+ translatoranfo = {{tradu\c{c}\~ao, notas e pref\'acio}%
+ {trad., notas e pref\adddot}},
+ translatorsanfo = {{tradu\c{c}\~ao, notas e pref\'acio}%
+ {trad., notas e pref\adddot}},
+ translatoranaf = {{tradu\c{c}\~ao, notas e posf\'acio}%
+ {trad., notas e posf\adddot}},
+ translatorsanaf = {{tradu\c{c}\~ao, notas e posf\'acio}%
+ {trad., notas e posf\adddot}},
+ byauthor = {{por}{por}},
+ byeditor = {{editado por}{ed\adddotspace por}},
+ bycompiler = {{compilado por}{comp\adddotspace por}},
+ byredactor = {{redigido por}{red\adddotspace por}},
+ byfounder = {{fundado por}{fund\adddotspace por}},
+ bycontinuator = {{continuado por}{cont\adddotspace por}},
+ bycollaborator = {{em colabora\c{a}\~o com}{em col\adddotspace com}},
+ bytranslator = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
+ bycommentator = {{comentado por}{com\adddot\ por}},
+ byannotator = {{notas de}{not\adddot\ de}},
+ withcommentator = {{com coment\'arios de}{com coment\adddot\ de}},
+ withannotator = {{com notas de}{com notas de}},
+ withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}},
+ withforeword = {{com pref\'acio de}{com pref\adddot\ de}},
+ withafterword = {{com posf\'acio de}{com posf\adddot\ de}},
+ byeditortr = {{editado e traduzido \lbx@lfromlang\ por}%
+ {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}},
+ byeditorco = {{editado e comentado por}%
+ {ed\adddotspace e com\adddot\ por}},
+ byeditoran = {{editado e anotado por}%
+ {ed\adddotspace e anot\adddot\ por}},
+ byeditorin = {{editado e introduzido por}%
+ {ed\adddotspace e introd\adddot\ por}},
+ byeditorfo = {{editado e prefaciado por}%
+ {ed\adddotspace e pref\adddot\ por}},
+ byeditoraf = {{editado e posfaciado por}%
+ {ed\adddotspace e posf\adddot\ por}},
+ byeditortrco = {{editado, traduzido \lbx@lfromlang\ e comentado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
+ byeditortran = {{editado, traduzido \lbx@lfromlang\ e anotado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
+ byeditortrin = {{editado, traduzido \lbx@lfromlang\ e introduzido por}%
+ {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}},
+ byeditortrfo = {{editado, traduzido \lbx@lfromlang\ e prefaciado por}%
+ {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}},
+ byeditortraf = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}%
+ {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}},
+ byeditorcoin = {{editado, comentado e introduzido por}%
+ {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
+ byeditorcofo = {{editado, comentado e prefaciado por}%
+ {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}},
+ byeditorcoaf = {{editado, comentado e posfaciado por}%
+ {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}},
+ byeditoranin = {{editado, anotado e introduzido por}%
+ {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
+ byeditoranfo = {{editado, anotado e prefaciado por}%
+ {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}},
+ byeditoranaf = {{editado, anotado e posfaciado por}%
+ {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
+ byeditortrcoin = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+ byeditortrcofo = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
+ byeditortrcoaf = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
+ byeditortranin = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+ byeditortranfo = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
+ byeditortranaf = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
+ bytranslatorco = {{traduzido \lbx@lfromlang\ e comentado por}%
+ {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
+ bytranslatoran = {{traduzido \lbx@lfromlang\ e anotado por}%
+ {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
+ bytranslatorin = {{traduzido \lbx@lfromlang\ e introduzido por}%
+ {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}},
+ bytranslatorfo = {{traduzido \lbx@lfromlang\ e prefaciado por}%
+ {trad\adddot\ \lbx@sfromlang\ e pref\adddot\ por}},
+ bytranslatoraf = {{traduzido \lbx@lfromlang\ e posfaciado por}%
+ {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}},
+ bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}%
+ {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
+ bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}%
+ {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
+ bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}%
+ {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
+ bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}%
+ {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
+ bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}%
+ {trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
+ bytranslatoranaf = {{traduzido \lbx@lfromlang, anotado e posfaciado por}%
+ {trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
+ and = {{e}{e}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ volume = {{volume}{vol\adddot}},
+ volumes = {{volumes}{vols\adddot}},
+ jourvol = {{volume}{vol\adddot}},
+ jourser = {{s\'erie}{s\'er\adddot}},
+ newseries = {{nova s\'erie}{nova s\'er\adddot}},
+ oldseries = {{s\'erie antiga}{s\'er\adddot\ antiga}},
+ edition = {{edi\c{c}\~ao}{ed\adddot}},
+ reprint = {{reimpress\~ao}{reimpr\adddot}},
+ reprintof = {{reimpress\~ao de}{reimpr\adddotspace de}},
+ reprintas = {{reimpresso como}{reimpr\adddotspace como}},
+ page = {{p\'agina}{p\adddot}},
+ pages = {{p\'aginas}{pp\adddot}},
+ column = {{coluna}{col\adddot}},
+ columns = {{colunas}{cols\adddot}},
+ line = {{linha}{l\adddot}},
+ lines = {{linhas}{ll\adddot}},
+ verse = {{verso}{v\adddot}},
+ verses = {{versos}{vv\adddot}},
+ section = {{se\c{c}\~ao}{\S}},
+ sections = {{se\c{c}\~oes}{\S\S}},
+ paragraph = {{par\'agrafo}{par\adddot}},
+ paragraphs = {{par\'agrafo}{pars\adddot}},
+ in = {{em}{em}},
+ inseries = {{em}{em}},
+ ofseries = {{de}{de}},
+ number = {{n\'umero}{n\textordmasculine}},
+ chapter = {{cap\'\i tulo}{cap\adddot}},
+ mathesis = {{tese de mestrado}{tese de mestrado}},
+ phdthesis = {{tese de doutoramento}{tese de doutoramento}},
+ resreport = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}},
+ techreport = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}},
+ software = {{software}{software}},
+ datacd = {{CD-ROM}{CD-ROM}},
+ audiocd = {{CD \'audio}{CD \'audio}},
+ version = {{vers\~ao}{vers\~ao}},
+ url = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
+ urlseen = {{acedido em}{acedido em}},
+ inpress = {{na imprensa}{na imp\addot}},
+ submitted = {{submetido}{subm\adddot}},
+ citedas = {{doravante citado como}{doravante citado como}},
+ seenote = {{ver nota}{ver nota}},
+ quotedin = {{apud}{apud}},
+ idem = {{idem}{idem}},
+ idemsm = {{idem}{idem}},
+ idemsf = {{eadem}{eadem}},
+ idemsn = {{idem}{idem}},
+ idempm = {{eidem}{eidem}},
+ idempf = {{eaedem}{eaedem}},
+ idempn = {{eadem}{eadem}},
+ idempp = {{eidem}{eidem}},
+ ibidem = {{ibidem}{ibid\adddot}},
+ opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+ confer = {{cf\adddot}{cf\adddot}},
+ sequens = {{sq\adddot}{sq\adddot}},
+ sequentes = {{sqq\adddot}{sqq\adddot}},
+ passim = {{passim}{pass\adddot}},
+ see = {{ver}{ver}},
+ seealso = {{ver tamb\'em}{ver tamb\'em}},
+ backrefpage = {{ver p\'agina}{ver p\adddot}},
+ backrefpages = {{ver p\'aginas}{ver pp\adddot}},
+% january = {{Janeiro}{Jan\adddot}},
+% february = {{Fevereiro}{Fev\adddot}},
+% march = {{Mar\c{c}o}{Mar\adddot}},
+% april = {{Abril}{Abr\adddot}},
+% may = {{Maio}{Mai\adddot}},
+% june = {{Junho}{Jun\adddot}},
+% july = {{Julho}{Jul\adddot}},
+% august = {{Agosto}{Ago\adddot}},
+% september = {{Setembro}{Set\adddot}},
+% october = {{Outubro}{Out\adddot}},
+% november = {{Novembro}{Nov\adddot}},
+% december = {{Dezembro}{Dez\adddot}},
+ january = {{janeiro}{jan\adddot}},
+ february = {{fevereiro}{fev\adddot}},
+ march = {{mar\c{c}o}{mar\adddot}},
+ april = {{abril}{abr\adddot}},
+ may = {{maio}{mai\adddot}},
+ june = {{junho}{jun\adddot}},
+ july = {{julho}{jul\adddot}},
+ august = {{agosto}{ago\adddot}},
+ september = {{setembro}{set\adddot}},
+ october = {{outubro}{out\adddot}},
+ november = {{novembro}{nov\adddot}},
+ december = {{dezembro}{dez\adddot}},
+ langamerican = {{ingl\^es}{ingl\^es}},
+ langbrazilian = {{portugu{\^e}s}{portugu{\^e}s}},
+ langdanish = {{dinamarqu\^es}{dinamarqu\^es}},
+ langdutch = {{holand{\^e}s}{holand{\^e}s}},
+ langenglish = {{ingl\^es}{ingl\^es}},
+ langfrench = {{franc\^es}{franc\^es}},
+ langgerman = {{alem\~ao}{alem\~ao}},
+ langgreek = {{grego}{grego}},
+ langitalian = {{italiano}{italiano}},
+ langlatin = {{latim}{latim}},
+ langnorwegian = {{noruegu\^es}{noruegu\^es}},
+ langportuguese = {{portugu{\^e}s}{portugu{\^e}s}},
+ langspanish = {{espanhol}{espanhol}},
+ langswedish = {{sueco}{sueco}},
+ fromamerican = {{do ingl\^es}{do ingl\^es}},
+ frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}},
+ fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}},
+ fromdutch = {{do holand{\^e}s}{do holand{\^e}s}},
+ fromenglish = {{do ingl\^es}{do ingl\^es}},
+ fromfrench = {{do franc\^es}{do franc\^es}},
+ fromgerman = {{do alem\~ao}{do alem\~ao}},
+ fromgreek = {{do grego}{do grego}},
+ fromitalian = {{do italiano}{do italiano}},
+ fromlatin = {{do latim}{do latim}},
+ fromnorwegian = {{do noruegu\^es}{do noruegu\^es}},
+ fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}},
+ fromspanish = {{do espanhol}{do espanhol}},
+ fromswedish = {{do sueco}{do sueco}},
+ countryde = {{Alemanha}{DE}},
+ countryeu = {{Uni\~ao Europeia}{EU}},
+ countryep = {{Uni\~ao Europeia}{EP}},
+ countryfr = {{Fran\c{c}a}{FR}},
+ countryuk = {{Reino Unido}{GB}},
+ countryus = {{Estados Unidos da Am\'erica}{US}},
+ patent = {{patente}{pat\adddot}},
+ patentde = {{patente alem\~a}{pat\adddot\ alem\~a}},
+ patenteu = {{patente europ\'eia}{pat\adddot\ europ\'eia}},
+ patentfr = {{patente francesa}{pat\adddot francesa}},
+ patentuk = {{patente brit\^anica}{pat\adddot\ brit\^anica}},
+ patentus = {{patente americana}{pat\adddot\ americana}},
+ patreq = {{pedido de patente}{ped\adddot\ de pat\adddot}},
+ patreqde = {{pedido de patente alem\~a}{ped\adddot\ de pat\adddot\ alem\~a}},
+ patreqeu = {{pedido de patente europ\'eia}{ped\adddot\ de pat\adddot\ europ\'eia}},
+ patreqfr = {{pedido de patente francesa}{ped\adddot\ de pat\adddot\ francesa}},
+ patrequk = {{pedido de patente brit\^anica}{ped\adddot\ de pat\adddot\ brit\^anica}},
+ patrequs = {{pedido de patente americana}{ped\adddot\ de pat\adddot\ americana}},
+ file = {{arquivo}{arquivo}},
+ library = {{biblioteca}{biblioteca}},
+ abstract = {{resumo}{resumo}},
+ annotation = {{notas}{notas}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 1ae99afe6d8..e8ef874d5d2 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: spanish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.1 2011/01/05 21:45:11 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 3c092939fbe..4aec27a17ca 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.0 2010/11/19 16:16:35 lehman stable $
+% $Id: swedish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
% Status:
% - Incomplete