summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:35:15 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:35:15 +0000
commitc047122dd76be17f819bf86afd136bddf9f8c41f (patch)
treeb0068c3692a312dbad2025085e4e40bf0300d8dc /Master/texmf-dist/tex/latex/biblatex
parenta9aa077338c951ba3f5d90d923b4bb548dc7b3d8 (diff)
biblatex 1.6 2011/07/29
git-svn-id: svn://tug.org/texlive/trunk@23324 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.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.def8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty687
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-compat.def91
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-mcite.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-natbib.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx4
86 files changed, 608 insertions, 510 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 6829d32aae4..b2e3c3ca877 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 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 7144118dde6..b2cdff90412 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: alphabetic.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index 23ac02761a7..459300433c4 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 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 6b32f8415b9..381e33e4a2f 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 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 b130a9b09b3..2027772dee5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 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 c9a1d42ac9e..bb8c13b61be 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 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 4228e38f329..58a203d93c3 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 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 357b3550506..0a4697b69a9 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 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 21223195392..689f01f39c2 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.6 2011/07/29 19:21:28 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 2507a5d79b0..293199c7195 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 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 6261dbd70cd..ff0931b3dd6 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 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 5a1917f8a32..3084afda06b 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 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 0b15bd69b83..1fef8c1dd46 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\RequireBibliographyStyle{standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 405878672bb..490becc7818 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 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 c87ec304bec..f5f114697a3 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: draft.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.6 2011/07/29 19:21:28 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 facd0d792ba..33606b57f53 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 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 20fcf878370..790f1283d77 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 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 bbc4cd64de7..092f6ff2cc7 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.6 2011/07/29 19:21:28 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 08fd580174a..56e3e29417e 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: reading.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.6 2011/07/29 19:21:28 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 509339e4365..4a14e42177a 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: standard.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.6 2011/07/29 19:21:28 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 268d2c05507..be6e4e1239c 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 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 e4325f6c587..f8b07d0abb6 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 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 7cde1b119bc..51f7f976f8d 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 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 1bf960cc3f7..d0bdc60ba4c 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 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 2699527a88b..83d83986611 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 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 e4117833bb1..029cc5ae64a 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 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 749c3852076..41420ee61cb 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 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 afef32e934e..100c48ccd0e 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: biblatex.cfg,v 1.6 2011/07/29 19:21:28 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 058c0a5ebf9..fe50dcacf90 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.5 2011/06/08 18:45:46 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -145,7 +145,7 @@
\do\u\do\v\do\w\do\x\do\y\do\z
\let\do\noexpand}
-% The above code allows linebreaks after numbers as a last resort.
+% The above code allows linebreaks before numbers and letters.
% This is often the only way to break DOIs. It also allows breaks
% after hyphens and adjusts \Urlmuskip to add some stretchability
% to URLs.
@@ -286,6 +286,8 @@
% citation commands
\DeclareFieldFormat{prenote}{#1\isdot}
\DeclareFieldFormat{postnote}{\mkpageprefix[pagination]{#1}}
+\DeclareFieldFormat{volcitevolume}{\bibstring{volume}\ppspace#1}
+\DeclareFieldFormat{volcitepages}{\mkpageprefix[pagination]{#1}}
% multicite commands
\DeclareFieldFormat{multiprenote}{#1\isdot}
\DeclareFieldFormat{multipostnote}{\mkpageprefix[pagination]{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 691a718af65..ea050248981 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: biblatex.sty,v 1.6 2011/07/29 19:21:28 lehman stable $
% Copyright (c) 2006-2011 Philipp Lehman.
%
@@ -21,11 +21,11 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.5 2011/06/08 18:45:46 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.6 2011/07/29 19:21:28 lehman stable $
programmable bibliographies]
\def\blx@bblversion$#1: #2 ${#2}
-\edef\blx@bblversion{\blx@bblversion$Revision: 1.5 $}
+\edef\blx@bblversion{\blx@bblversion$Revision: 1.6 $}
%% Dependencies
@@ -235,8 +235,6 @@
\newcount\@quotereset
\newcommand*{\@setquotesfcodes}{}%
\let\@setquotesfcodes\relax
- \newcommand*{\@ifquotemarker}{}%
- \let\@ifquotemarker\@secondoftwo
\newrobustcmd*{\initoquote}{\@quotelevel\@ne}%
\newrobustcmd*{\initiquote}{\@quotelevel\tw@}%
\newrobustcmd*{\textooquote}{``}%
@@ -354,6 +352,7 @@
\newcount\blx@tempcnta
\newcount\blx@tempcntb
+\newcount\blx@tempcntc
\newcount\blx@maxsection
\newcount\blx@maxsegment
\newcount\blx@notetype
@@ -363,10 +362,12 @@
\def\blx@backend{0}
\def\blx@uniquename{0}
\def\blx@uniquelist{0}
-\def\blx@maxbibnames{\c@maxnames}
-\def\blx@minbibnames{\c@minnames}
-\def\blx@maxcitenames{\c@maxnames}
-\def\blx@mincitenames{\c@minnames}
+\def\blx@maxbibnames{0}
+\def\blx@minbibnames{0}
+\def\blx@maxcitenames{0}
+\def\blx@mincitenames{0}
+\def\blx@maxalphanames{0}
+\def\blx@minalphanames{0}
\newlength{\labelnumberwidth}
\newlength{\labelalphawidth}
@@ -630,7 +631,7 @@
\@addtofilelist{#1}}
{#5}}
-% {<string>}
+% {<write>}{<precode>}{<string>}
\protected\def\blx@auxwrite#1#2#3{%
\if@filesw
@@ -833,11 +834,8 @@
\def\blx@err@nodocdiv#1{%
\blx@error
- {Failed to hook into \@backslashchar#1}
- {There are two possible reasons for this error.
- Either\MessageBreak the document class does not
- support chapters or the\MessageBreak implementation
- is not compatible with biblatex}}
+ {\@backslashchar#1 not provided by class}
+ {The document class does not seems to support #1s}}
\def\blx@err@nosec#1{%
\blx@error
@@ -917,6 +915,9 @@
\def\blx@warn@conflopt#1{%
\blx@warning{Conflicting options.\MessageBreak#1}}
+\def\blx@warn@depropt#1{%
+ \blx@warning{Deprecated option.\MessageBreak Ignoring '#1'}}
+
\def\blx@warn@bibempty{%
\@latex@warning{Empty bibliography}}
@@ -2736,40 +2737,185 @@
\long\def\blx@mkpagetotal@i[#1]#2{#1{#2}\endgroup}
-% [<pagination>][<postpro>]{<string>}
-% <*>[<postpro>]{<string>}
+\newcounter{mincomprange}
+\newcounter{maxcomprange}
+\newcounter{mincompwidth}
+\setcounter{mincomprange}{10}
+\setcounter{maxcomprange}{100000}
+\setcounter{mincompwidth}{1}
+\def\abx@rangeproclimit{100000}
-\protected\def\blx@imc@mkpagefirst{%
- \@ifstar
- {\@ifnextchar[%]
- {\blx@pagefirst@i}
- {\blx@pagefirst@i[\@firstofone]}}
- {\blx@pagefirst@ii}}
+% [<postpro>]{<string>}
-\long\def\blx@pagefirst@i[#1]#2{%
+\newrobustcmd*{\mkcomprange}[2][\@firstofone]{%
\begingroup
+ \let\blx@tempa\@empty
+ \protected\def\blx@range@out{\appto\blx@tempa}%
+ \let\blx@range@split\blx@comprange@split
+ \blx@imc@ifpages{#2}
+ {\blx@range@chunk{#2}}
+ {\blx@range@out{#2}}%
\edef\blx@tempa{\endgroup
- \unexpanded{#1}{\blx@pagefirst@iii#2\bibrangedash&}}%
+ \unexpanded{#1}{\expandonce\blx@tempa}}%
\blx@tempa}
-\newrobustcmd*{\blx@pagefirst@ii}[1][pagination]{%
- \@ifnextchar[%]
- {\blx@pagefirst@iiA{#1}}
- {\blx@pagefirst@iiA{#1}[\@firstofone]}}
+\def\blx@comprange@split#1{%
+ \def\blx@comprange@abort{\blx@range@out{#1}}%
+ \blx@comprange@range#1\bibrangedash\bibrangedash&}
+
+\def\blx@comprange@range#1\bibrangedash#2\bibrangedash#3&{%
+ \ifblank{#3}
+ {\blx@comprange@hyphen#1--&}
+ {\ifblank{#2}
+ {\blx@range@out{#1\bibrangedash}}
+ {\ifblank{#1}
+ {\blx@range@out{\bibrangedash#2}}
+ {\blx@comprange@check{#1}{#2}}}}}
+
+\def\blx@comprange@hyphen#1-#2-#3&{%
+ \ifblank{#3}
+ {\blx@comprange@abort}
+ {\ifblank{#2}
+ {\ifblank{#1}
+ {\let\blx@tempb\@empty}
+ {\def\blx@tempb{#1}}%
+ \blx@comprange@hyphen@i#3&}
+ {\ifblank{#1}
+ {\blx@range@out{\bibrangedash#2}}
+ {\blx@comprange@check{#1}{#2}}}}}
+
+\def\blx@comprange@hyphen@i#1-#2&{%
+ \ifblank{#1#2}
+ {\expandafter\blx@range@out
+ \expandafter{\blx@tempb\bibrangedash}}
+ {\notblank{#1}
+ {\ifdefempty\blx@tempb
+ {\blx@range@out{\bibrangedash#1}}
+ {\expandafter\blx@comprange@check
+ \expandafter{\blx@tempb}{#1}}}
+ {\blx@comprange@hyphen@i#2&}}}
+
+\def\blx@comprange@check#1#2{%
+ \blx@imc@ifinteger{#1}
+ {\blx@imc@ifinteger{#2}
+ {\blx@comprange@comp{#1}{#2}}
+ {\blx@range@out{#1\bibrangedash#2}}}
+ {\blx@range@out{#1\bibrangedash#2}}}
+
+\def\blx@comprange@comp#1#2{%
+ \def\blx@tempb{#1}%
+ \def\blx@tempc{#2}%
+ \let\blx@tempd\blx@tempc
+ \ifnum\c@maxcomprange<\abx@rangeproclimit\relax
+ \numdef\blx@tempe\abx@rangeproclimit
+ \else
+ \numdef\blx@tempe\c@maxcomprange
+ \fi
+ \blx@tempcntc=\blx@tempe\relax
+ \ifnum
+ \ifnum\c@mincompwidth<1\space1\fi
+ \ifnum\c@maxcomprange<10\space1\fi
+ \ifnum\c@mincomprange<\blx@tempb\space\else1\fi
+ \ifnum\blx@tempb<\numexpr\blx@tempcntc*10\relax\else1\fi
+ 0=\z@
+ \expandafter\blx@comprange@comp@div
+ \else
+ \expandafter\blx@comprange@end
+ \fi}
+
+\def\blx@comprange@end{%
+ \numdef\blx@tempb\blx@tempb
+ \ifnum\blx@tempe>\c@maxcomprange\relax
+ \numdef\blx@tempc\blx@tempc
+ \else
+ \numdef\blx@tempc\blx@tempd
+ \fi
+ \edef\blx@tempb{\blx@range@out{\blx@tempb\noexpand\bibrangedash\blx@tempc}}%
+ \blx@tempb}
+
+\def\blx@comprange@comp@div{%
+ \unless\ifnum\blx@tempb<\blx@tempcntc
+ \blx@tempcnta\blx@tempb\relax
+ \blx@tempcntb\blx@tempc\relax
+ \divide\blx@tempcnta\blx@tempcntc
+ \divide\blx@tempcntb\blx@tempcntc
+ \ifnum\blx@tempcnta=\blx@tempcntb
+ \edef\blx@tempd{\expandafter\@gobble\blx@tempd}%
+ \numdef\blx@tempe\blx@tempcntc
+ \fi
+ \fi
+ \divide\blx@tempcntc10\relax
+ \ifnum
+ \ifnum\blx@tempcntc<10 1\fi
+ \ifnum\blx@tempcntc>\c@mincompwidth\else 1\fi
+ 0=\z@
+ \expandafter\blx@comprange@comp@div
+ \else
+ \expandafter\blx@comprange@end
+ \fi}
+
+\def\blx@range@chunk#1{%
+ \blx@range@chunk@semcol#1;&}
+
+\def\blx@range@chunk@semcol#1;#2&{%
+ \notblank{#1}
+ {\blx@range@chunk@comma#1,&}
+ {}%
+ \notblank{#2}
+ {\notblank{#1}{\blx@range@out{;\space}}{}%
+ \blx@range@chunk@semcol#2&}
+ {}}
+
+\def\blx@range@chunk@comma#1,#2&{%
+ \notblank{#1}
+ {\expandafter\blx@range@split
+ \expandafter{\@firstofone#1}}
+ {}%
+ \notblank{#2}
+ {\notblank{#1}{\blx@range@out{,\space}}{}%
+ \blx@range@chunk@comma#2&}
+ {}}
-\protected\long\def\blx@pagefirst@iiA#1[#2]#3{%
+% [<postpro>]{<string>}
+
+\newrobustcmd*{\mkfirstpage}[2][\@firstofone]{%
\begingroup
- \def\blx@tempa{\endgroup\mkpageprefix[#1][#2]}%
- \eappto\blx@tempa{{\blx@pagefirst@iii#3\bibrangedash&}}%
+ \let\blx@tempa\@empty
+ \protected\def\blx@range@out{\appto\blx@tempa}%
+ \let\blx@range@split\blx@firstpage@split
+ \blx@imc@ifpages{#2}
+ {\blx@range@chunk{#2}}
+ {\blx@range@out{#2}}%
+ \edef\blx@tempa{\endgroup
+ \unexpanded{#1}{\expandonce\blx@tempa}}%
\blx@tempa}
-\long\def\blx@pagefirst@iii#1\bibrangedash#2&{%
- \blx@pagefirst@iv#1\textendash&}
-\long\def\blx@pagefirst@iv#1\textendash#2&{%
- \blx@pagefirst@v#1\textemdash&}
-\long\def\blx@pagefirst@v#1\textemdash#2&{%
- \blx@pagefirst@vi#1-&}
-\long\def\blx@pagefirst@vi#1-#2&{#1}
+\def\blx@firstpage@split#1{%
+ \def\blx@firstpage@abort{\blx@range@out{#1}}%
+ \blx@firstpage@range#1\bibrangedash\bibrangedash&}
+
+\def\blx@firstpage@range#1\bibrangedash#2\bibrangedash#3&{%
+ \ifblank{#3}
+ {\blx@firstpage@hyphen#1--&}
+ {\ifblank{#1}
+ {\blx@range@out{\bibrangedash#2}}
+ {\blx@range@out{#1}}}}
+
+\def\blx@firstpage@hyphen#1-#2-#3&{%
+ \ifblank{#3}
+ {\blx@firstpage@abort}
+ {\ifblank{#1}
+ {\ifblank{#2}
+ {\blx@firstpage@hyphen@i#3&}
+ {\blx@range@out{\bibrangedash#2}}}
+ {\blx@range@out{#1}}}}
+
+\def\blx@firstpage@hyphen@i#1-#2&{%
+ \ifblank{#1}
+ {\ifblank{#2}
+ {\blx@firstpage@abort}
+ {\blx@firstpage@hyphen@i#2&}}
+ {\blx@range@out{\bibrangedash#1}}}
\newcommand*{\ppspace}{\addnbspace}
\newcommand*{\sqspace}{\addnbspace}
@@ -2812,11 +2958,6 @@
\global\let\blx@unitpunct\newunitpunct
\blx@imc@resetpunctfont}
-\def\blx@nounit{%
- \global\togglefalse{blx@lastins}}
-
-\def\blx@unitmark{23sp}
-
\def\blx@begunit{%
\toggletrue{blx@tempa}%
\iftoggle{blx@insert}
@@ -2824,6 +2965,7 @@
{\begingroup
\let\blx@begunit\@empty
\let\blx@endunit\@empty
+ \let\blx@endnounit\@empty
\blx@unitpunct\blx@postpunct
\endgroup
\global\togglefalse{blx@unit}%
@@ -2833,6 +2975,7 @@
{\begingroup
\let\blx@begunit\@empty
\let\blx@endunit\@empty
+ \let\blx@endnounit\@empty
\newblockpunct
\endgroup
\global\togglefalse{blx@block}%
@@ -2845,22 +2988,18 @@
{}
{\global\togglefalse{blx@insert}}%
\blx@leavevmode
- \@ifquotemarker
- {}
- {\penalty\@M
- \hskip-\blx@unitmark\relax
- \hskip\blx@unitmark\relax}%
\begingroup}
\def\blx@endunit{%
\endgroup
- \ifdim\lastskip=\blx@unitmark
- \unskip\unskip\unpenalty
- \global\togglefalse{blx@lastins}%
- \else
- \global\toggletrue{blx@insert}%
- \global\toggletrue{blx@lastins}%
- \fi}
+ \global\toggletrue{blx@insert}%
+ \global\toggletrue{blx@lastins}}
+
+\def\blx@nounit{%
+ \global\togglefalse{blx@lastins}}
+
+\def\blx@endnounit{%
+ \endgroup\blx@nounit}
\protected\def\blx@imc@newblock{%
\global\toggletrue{blx@block}}%
@@ -3456,6 +3595,7 @@
\define@key{blx@opt@name}{uniquelist}{\c@uniquelist#1\relax}
\define@key{blx@opt@name}{uniquename}{\c@uniquename#1\relax}
+\define@key{blx@opt@name}{hash}{\edef\abx@field@hash{\detokenize{#1}}}
\newrobustcmd*{\bibinitperiod}{\adddot}
\newrobustcmd*{\bibinitdelim}{\addnbspace}
@@ -3675,11 +3815,12 @@
\let\bibsstring\blx@imc@bibxsstring
\lowercase{\edef\blx@tempa{#3}}%
\ifcsundef{#2@\blx@tempa}
- {\blx@warn@nostring\blx@tempa}
+ {\blx@warn@nostring\blx@tempa
+ \blx@endnounit}
{\blx@imc@ifcapital
{#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}
- {#1{\csuse{#2@\blx@tempa}}}}%
- \blx@endunit}
+ {#1{\csuse{#2@\blx@tempa}}}%
+ \blx@endunit}}
% [<wrapper>]{<string>}
@@ -3700,9 +3841,10 @@
\let\bibsstring\blx@imc@bibxsstring
\lowercase{\edef\blx@tempa{#3}}%
\ifcsundef{#2@\blx@tempa}
- {\blx@warn@nostring\blx@tempa}
- {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}%
- \blx@endunit}
+ {\blx@warn@nostring\blx@tempa
+ \blx@endnounit}
+ {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}%
+ \blx@endunit}}
% [<wrapper>]{<string>}
@@ -3723,9 +3865,10 @@
\let\bibsstring\blx@imc@bibxsstring
\lowercase{\edef\blx@tempa{#3}}%
\ifcsundef{#2@\blx@tempa}
- {\blx@warn@nostring\blx@tempa}
- {#1{\MakeLowercase{\csuse{#2@\blx@tempa}}}}%
- \blx@endunit}
+ {\blx@warn@nostring\blx@tempa
+ \blx@endnounit}
+ {#1{\MakeLowercase{\csuse{#2@\blx@tempa}}}%
+ \blx@endunit}}
% [<wrapper>]{<string>}
@@ -3746,9 +3889,10 @@
\let\bibsstring\blx@imc@bibxsstring
\lowercase{\edef\blx@tempa{#3}}%
\ifcsundef{#2@\blx@tempa}
- {\blx@warn@nostring\blx@tempa}
- {#1{\MakeUppercase{\csuse{#2@\blx@tempa}}}}%
- \blx@endunit}
+ {\blx@warn@nostring\blx@tempa
+ \blx@endnounit}
+ {#1{\MakeUppercase{\csuse{#2@\blx@tempa}}}%
+ \blx@endunit}}
% {<string>}
@@ -5939,54 +6083,6 @@
{The check '#1' could not be found.\MessageBreak
Use \string\defbibcheck\space 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@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@setminval{names}{#1}%
- \fi}
-
-\define@key{blx@bib}{maxitems}{\blx@setmaxitems{#1}}
-\define@key{blx@los}{maxitems}{\blx@setmaxitems{#1}}
-\define@key{blx@bbs}{maxitems}{\blx@setmaxitems{#1}}
-\define@key{blx@bbg}{maxitems}{\blx@setmaxitems{#1}}
-\define@key{blx@bbc}{maxitems}{\blx@setmaxitems{#1}}
-
-\define@key{blx@bib}{minitems}{\blx@setminitems{#1}}
-\define@key{blx@los}{minitems}{\blx@setminitems{#1}}
-\define@key{blx@bbs}{minitems}{\blx@setminitems{#1}}
-\define@key{blx@bbg}{minitems}{\blx@setminitems{#1}}
-\define@key{blx@bbc}{minitems}{\blx@setminitems{#1}}
-
\define@key{blx@bhd}{heading}{\blx@key@heading{#1}}
\define@key{blx@bib}{heading}{\blx@key@heading{#1}}
\define@key{blx@los}{heading}{\blx@key@heading{#1}}
@@ -6110,7 +6206,8 @@
\let\blx@theprenote\@empty
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
- \blx@setmaxbibnames
+ \c@maxnames\blx@maxbibnames\relax
+ \c@minnames\blx@minbibnames\relax
\blx@safe@actives
\setkeys{blx@bib}{#1}%
\blx@rest@actives
@@ -6137,7 +6234,8 @@
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
\c@refsection\z@
- \blx@setmaxbibnames
+ \c@maxnames\blx@maxbibnames\relax
+ \c@minnames\blx@minbibnames\relax
\blx@safe@actives
\setkeys{blx@bbs}{#1}%
\blx@rest@actives
@@ -6178,7 +6276,8 @@
\let\blx@thetitle\@empty
\c@refsection\z@
\c@refsegment\@ne
- \blx@setmaxbibnames
+ \c@maxnames\blx@maxbibnames\relax
+ \c@minnames\blx@minbibnames\relax
\blx@safe@actives
\setkeys{blx@bbg}{#1}%
\blx@rest@actives
@@ -6221,7 +6320,8 @@
\let\blx@thetitle\@empty
\c@refsection\z@
\blx@safe@actives
- \blx@setmaxbibnames
+ \c@maxnames\blx@maxbibnames\relax
+ \c@minnames\blx@minbibnames\relax
\setkeys{blx@bbc}{#1}%
\blx@rest@actives
\togglefalse{blx@tempa}%
@@ -6441,7 +6541,8 @@
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
\let\blx@printbibchecks\relax
- \blx@setmaxbibnames
+ \c@maxnames\blx@maxbibnames\relax
+ \c@minnames\blx@minbibnames\relax
\blx@safe@actives
\setkeys{blx@los}{#1}%
\blx@rest@actives
@@ -6674,6 +6775,63 @@
\def\blx@endrefsegment{%
\global\c@refsegment\z@}
+% Reference section/segment auto-reset
+
+\def\blx@refpatch@part#1{%
+ \ifundef\part
+ {\blx@err@nodocdiv{part}}
+ {\toggletrue{blx@tempa}%
+ \def\do##1{%
+ \patchcmd##1{\@endpart}{#1\@endpart}
+ {\togglefalse{blx@tempa}\listbreak}
+ {}}%
+ \docsvlist{%
+ \H@old@part,% hyperref
+ \NR@part,% nameref
+ \@part}% latex/koma-script/memoir
+ \iftoggle{blx@tempa}
+ {\blx@err@patch{\string\@part}}
+ {}%
+ \let\do\noexpand}}
+
+\def\blx@refpatch@chapter#1{%
+ \ifundef\chapter
+ {\blx@err@nodocdiv{chapter}}
+ {\apptocmd\@makechapterhead{#1}
+ {}
+ {\blx@err@patch{\string\@makechapterhead}}}}
+
+\def\blx@refpatch@sect#1{%
+ \ifcsundef{#1}
+ {\blx@err@nodocdiv{#1}\@gobbletwo}
+ {\blx@refpatch@sect@i}}
+
+\edef\blx@refpatch@sect@i#1#2{%
+ \def\noexpand\do##1{%
+ \patchcmd##1%
+ {\noexpand\@xsect}
+ {\noexpand\blx@refpatch@sect@ii{#1}{#2}{\string#2}\noexpand\@xsect}
+ {\togglefalse{blx@tempa}\noexpand\listbreak}
+ {}}%
+ \noexpand\blx@refpatch@sect@iii}
+
+\def\blx@refpatch@sect@ii#1#2#3{%
+ \ifnumequal{#2}{#3}{#1}{}}
+
+\def\blx@refpatch@sect@iii{%
+ \toggletrue{blx@tempa}%
+ \docsvlist{% order does matter:
+ \H@old@sectm@m,% memoir+hyperref (what a mess...)
+ \M@sect,% memoir
+ \H@old@sect,% hyperref
+ \NR@sect,% nameref
+ \scr@sect,% koma-script 3.x
+ \@sect}% latex
+ \iftoggle{blx@tempa}
+ {\blx@err@patch{\string\@sect}}
+ {}%
+ \let\do\noexpand}
+
% Bibliography categories
\let\blx@categories\@empty
@@ -8479,21 +8637,20 @@
\def\blx@volcitecmd@ii[#1]#2{%
\appto\blx@tempa{[#1]}%
+ \blx@getformat\blx@tempb{ffd}{}{volcitevolume}%
\@ifnextchar[%]
{\blx@volcitecmd@iii{#2}}
- {\blx@tempa[\blx@volcite@vol{#2}]}}
+ {\edef\blx@tempa{\expandonce\blx@tempa[{%
+ \expandonce{\blx@tempb{#2}}}]}%
+ \blx@tempa}}
\def\blx@volcitecmd@iii#1[#2]{%
- \blx@tempa[\blx@volcite@vol{#1}\blx@volcite@page{#2}]}
-
-\protected\def\blx@volcite@vol#1{%
- \bibstring{volume}\ppspace#1}
-\protected\def\blx@volcite@page#1{%
- \addcomma\space\mkpageprefix{#1}}
-
-\appto\blx@hook@ifpages{%
- \let\blx@volcite@vol\@gobble
- \let\blx@volcite@page\@firstofone}
+ \blx@getformat\blx@tempc{ffd}{}{volcitepages}%
+ \edef\blx@tempa{\expandonce\blx@tempa[{%
+ \expandonce{\blx@tempb{#1}}%
+ \noexpand\addcomma\noexpand\space
+ \expandonce{\blx@tempc{#2}}}]}
+ \blx@tempa}
%% Control file
@@ -8542,7 +8699,7 @@
#1%
~~~~</bcf:inherit>\blx@nl}
\xdef\blx@xml@inherit@type#1#2#3{%
- ~~~~~~<bcf:type_pair source="#1" target="#2"#3/>\blx@nl}
+ ~~~~~~<bcf:type\string_pair source="#1" target="#2"#3/>\blx@nl}
\xdef\blx@xml@inherit@field#1#2#3{%
~~~~~~<bcf:field source="#1" target="#2"#3/>\blx@nl}
\xdef\blx@xml@inherit@block#1{%
@@ -8602,10 +8759,14 @@
\blx@xml@mvalue{labelnamespec}{\blx@bcf@labelnamespec}%
\blx@xml@toggle{labelyear}%
\blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}%
+ \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}%
+ \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}%
\blx@xml@svalue{maxitems}{\the\c@maxitems}%
- \blx@xml@svalue{maxnames}{\the\c@maxnames}%
+ \blx@xml@svalue{maxnames}{\blx@maxcitenames}%
+ \blx@xml@svalue{minalphanames}{\blx@minalphanames}%
+ \blx@xml@svalue{minbibnames}{\blx@minbibnames}%
\blx@xml@svalue{minitems}{\the\c@minitems}%
- \blx@xml@svalue{minnames}{\the\c@minnames}%
+ \blx@xml@svalue{minnames}{\blx@mincitenames}%
\blx@xml@toggle{singletitle}%
\blx@xml@svalue{sortalphaothers}{\sortalphaothers}%
\blx@xml@svalue{sortlos}{\blx@sortlos}%
@@ -8666,8 +8827,8 @@
\noexpand\iftoggle{blx@singletitle}{1}{0}:%
\noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
\noexpand\blx@sortlos:%
- \noexpand\the\c@maxnames:%
- \noexpand\the\c@minnames:%
+ \noexpand\blx@maxcitenames:%
+ \noexpand\blx@mincitenames:%
\noexpand\blx@maxline:%
\noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}%
\string},\blx@nl
@@ -8834,8 +8995,8 @@
\define@key{blx@inherit@field}{override}[true]{% true|false
\ifstrequal{#1}{true}
- {\def\blx@tempc{ override_target="true"}}
- {\def\blx@tempc{ override_target="false"}}}
+ {\edef\blx@tempc{ override\string_target="true"}}
+ {\edef\blx@tempc{ override\string_target="false"}}}
\newrobustcmd*{\ResetDataInheritance}{%
\global\csundef{blx@biber@inherit@data}}
@@ -8873,8 +9034,8 @@
\define@key{blx@sortdef@sort}{direction}{% ascending|descending
\ifstrequal{#1}{ascending}
- {\appto\blx@tempc{ sort_direction="ascending"}}
- {\appto\blx@tempc{ sort_direction="descending"}}}
+ {\eappto\blx@tempc{ sort\string_direction="ascending"}}
+ {\eappto\blx@tempc{ sort\string_direction="descending"}}}
\define@key{blx@sortdef@sort}{final}[true]{% true|false
\ifstrequal{#1}{true}
{\appto\blx@tempc{ final="1"}}
@@ -8905,19 +9066,19 @@
\define@key{blx@sortdef@field}{padside}{% left|right
\ifstrequal{#1}{right}
- {\appto\blx@tempd{ pad_side="right"}}
- {\appto\blx@tempd{ pad_side="left"}}}
+ {\eappto\blx@tempd{ pad\string_side="right"}}
+ {\eappto\blx@tempd{ pad\string_side="left"}}}
\define@key{blx@sortdef@field}{padwidth}{% integer
- \appto\blx@tempd{ pad_width="#1"}}
+ \eappto\blx@tempd{ pad\string_width="#1"}}
\define@key{blx@sortdef@field}{padchar}{% character
\blx@xmlsanitizeafter{\def\blx@tempe}{#1}%
- \eappto\blx@tempd{ pad_char="\blx@tempe"}}
+ \eappto\blx@tempd{ pad\string_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"}}}
+ {\eappto\blx@tempd{ substring\string_side="right"}}
+ {\eappto\blx@tempd{ substring\string_side="left"}}}
\define@key{blx@sortdef@field}{strwidth}{% integer
- \appto\blx@tempd{ substring_width="#1"}}
+ \eappto\blx@tempd{ substring\string_width="#1"}}
\def\blx@sortdef@literal#1{%
\advance\blx@tempcntb\@ne
@@ -9123,8 +9284,29 @@
\def\blx@opt@sortlos@bib{0}
\def\blx@opt@sortlos@los{1}
-\DeclareBibliographyOption{maxnames}{\blx@setmaxval{names}{#1}}
-\DeclareBibliographyOption{minnames}{\blx@setminval{names}{#1}}
+\DeclareBibliographyOption{maxnames}{%
+ \blx@setmaxval{names}{#1}%
+ \numdef\blx@maxbibnames{#1}%
+ \numdef\blx@maxcitenames{#1}}
+\DeclareBibliographyOption{minnames}{%
+ \blx@setminval{names}{#1}%
+ \numdef\blx@minbibnames{#1}%
+ \numdef\blx@mincitenames{#1}}
+
+\DeclareBibliographyOption{maxbibnames}{%
+ \blx@defmaxval{bibnames}{#1}}
+\DeclareBibliographyOption{minbibnames}{%
+ \blx@defminval{bibnames}{#1}}
+
+\DeclareBibliographyOption{maxcitenames}{%
+ \blx@defmaxval{citenames}{#1}}
+\DeclareBibliographyOption{mincitenames}{%
+ \blx@defminval{citenames}{#1}}
+
+\DeclareBibliographyOption{maxalphanames}{%
+ \blx@defmaxval{alphanames}{#1}}
+\DeclareBibliographyOption{minalphanames}{%
+ \blx@defminval{alphanames}{#1}}
\def\blx@setmaxval#1#2{%
\ifnumless{#2}\@ne
@@ -9144,12 +9326,6 @@
'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}{%
@@ -9168,34 +9344,10 @@
'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}
- {'maxitems' must be greater than zero}%
- \else
- \ifnum#1<\c@minitems
- \blx@err@confopt{maxitems/minitems}
- {'maxitems' must be greater than or equal to 'minitems'}%
- \else
- \c@maxitems#1\relax
- \fi
- \fi}
-
-\def\blx@setminitems#1{%
- \ifnum#1<\@ne
- \blx@err@invopt{minitems=#1}
- {'minitems' must be greater than zero}%
- \else
- \ifnum#1>\c@maxitems
- \blx@err@confopt{maxitems/minitems}
- {'minitems' must be less than or equal to 'maxitems'}%
- \else
- \c@minitems#1\relax
- \fi
- \fi}
+\DeclareBibliographyOption{maxitems}{%
+ \blx@setmaxval{items}{#1}}
+\DeclareBibliographyOption{minitems}{%
+ \blx@setminval{items}{#1}}
\DeclareBibliographyOption{maxline}{%
\ifnum#1<49
@@ -9701,7 +9853,7 @@
\DeclareBibliographyOption{refsection}{%
\ifcsdef{blx@opt@refsection@#1}
- {\letcs\blx@refhook@section{blx@opt@refsection@#1}}
+ {\letcs\blx@refsecreset@level{blx@opt@refsection@#1}}
{\blx@err@invopt{refsection=#1}{}}}
\def\blx@opt@refsection@none{0}
\def\blx@opt@refsection@part{1}
@@ -9709,9 +9861,21 @@
\def\blx@opt@refsection@section{3}
\def\blx@opt@refsection@subsection{4}
+\AtEndPreamble{%
+ \ifcase\blx@refsecreset@level
+ \or % 1
+ \blx@refpatch@part\newrefsection
+ \or % 2
+ \blx@refpatch@chapter\newrefsection
+ \or % 3
+ \blx@refpatch@sect{section}{\newrefsection}{1}%
+ \or % 4
+ \blx@refpatch@sect{subsection}{\newrefsection}{2}%
+ \fi}
+
\DeclareBibliographyOption{refsegment}{%
\ifcsdef{blx@opt@refsegment@#1}
- {\letcs\blx@refhook@segment{blx@opt@refsegment@#1}}
+ {\letcs\blx@refsegreset@level{blx@opt@refsegment@#1}}
{\blx@err@invopt{refsegment=#1}{}}}
\def\blx@opt@refsegment@none{0}
\def\blx@opt@refsegment@part{1}
@@ -9719,9 +9883,31 @@
\def\blx@opt@refsegment@section{3}
\def\blx@opt@refsegment@subsection{4}
+\AtEndPreamble{%
+ \ifnumgreater\blx@refsegreset@level\z@
+ {\ifnumgreater\blx@refsegreset@level\blx@refsecreset@level
+ {}
+ {\blx@err@confopt
+ {refsegment/refsection}
+ {The 'refsegment' option must point to a
+ lower-level\MessageBreak document division
+ than 'refsection'}%
+ \def\blx@refsegreset@level{0}}}
+ {}%
+ \ifcase\blx@refsegreset@level
+ \or % 1
+ \blx@refpatch@part\newrefsegment
+ \or % 2
+ \blx@refpatch@chapter\newrefsegment
+ \or % 3
+ \blx@refpatch@sect{section}{\newrefsegment}{1}%
+ \or % 4
+ \blx@refpatch@sect{subsection}{\newrefsegment}{2}%
+ \fi}
+
\DeclareBibliographyOption{citereset}{%
\ifcsdef{blx@opt@citereset@#1}
- {\letcs\blx@resethook{blx@opt@citereset@#1}}
+ {\letcs\blx@citereset@level{blx@opt@citereset@#1}}
{\blx@err@invopt{citereset=#1}{}}}
\def\blx@opt@citereset@none{0}
\def\blx@opt@citereset@part{1}
@@ -9729,6 +9915,18 @@
\def\blx@opt@citereset@section{3}
\def\blx@opt@citereset@subsection{4}
+\AtEndPreamble{%
+ \ifcase\blx@citereset@level
+ \or % 1
+ \blx@refpatch@part{\citereset\blx@inf@creset}%
+ \or % 2
+ \blx@refpatch@chapter{\citereset\blx@inf@creset}%
+ \or % 3
+ \blx@refpatch@sect{section}{\citereset\blx@inf@creset}{1}%
+ \or % 4
+ \blx@refpatch@sect{subsection}{\citereset\blx@inf@creset}{2}%
+ \fi}
+
\DeclareBibliographyOption{bibwarn}[true]{%
\ifstrequal{#1}{true}
{\let\blx@bbl@thewarn\blx@bbl@warn}
@@ -9816,7 +10014,8 @@
\setkeys{blx@opt@ldt}{style=numeric}
\setkeys{blx@opt@pre}{%
- sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false,maxnames=3,minnames=1,
+ sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false,
+ maxnames=3,minnames=1,maxalphanames=3,minalphanames=1,
maxitems=3,minitems=1,mincrossrefs=2,useauthor=true,useeditor=true,
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
@@ -9862,6 +10061,18 @@
% Deferred setup at end of preamble
\AtEndPreamble{%
+ \ifnumless\blx@maxbibnames\blx@maxcitenames
+ {\blx@warn@conflopt{%
+ 'maxbibnames' (=\the\numexpr\blx@maxbibnames\relax)
+ should not be smaller than\MessageBreak
+ 'maxcitenames' (=\the\numexpr\blx@maxcitenames\relax)}}
+ {}%
+ \ifnumless\blx@minbibnames\blx@mincitenames
+ {\blx@warn@conflopt{%
+ 'minbibnames' (=\the\numexpr\blx@minbibnames\relax)
+ should not be smaller than\MessageBreak
+ 'mincitenames' (=\the\numexpr\blx@mincitenames\relax)}}
+ {}%
\iftoggle{blx@firstinits}
{\ifnumequal\blx@uniquename\blx@opt@uniquename@full
{\blx@warn@conflopt{%
@@ -9889,95 +10100,7 @@
Setting 'uniquelist=true'}%
\setkeys{blx@opt@pre}{uniquelist}}
{}}
- {}%
- \ifnumgreater\blx@refhook@segment\z@
- {\ifnumgreater\blx@refhook@segment\blx@refhook@section
- {}
- {\blx@err@confopt
- {refsegment/refsection}
- {The 'refsegment' option must point to a
- lower-level\MessageBreak document division
- than 'refsection'}%
- \def\blx@refhook@segment{0}}}
- {}%
- \ifcase\blx@refhook@segment
- \or % 1
- \ifundef\part
- {\blx@err@nodocdiv{part}}
- {\pretocmd\part{\newrefsegment}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 2
- \ifundef\chapter
- {\blx@err@nodocdiv{chapter}}
- {\pretocmd\chapter{\newrefsegment}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 3
- \ifundef\section
- {\blx@err@nodocdiv{section}}
- {\pretocmd\section{\newrefsegment}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 4
- \ifundef\subsection
- {\blx@err@nodocdiv{subsection}}
- {\pretocmd\subsection{\newrefsegment}
- {}
- {\blx@err@patch{\string\part}}}%
- \fi
- \ifcase\blx@refhook@section
- \or % 1
- \ifundef\part
- {\blx@err@nodocdiv{part}}
- {\pretocmd\part{\newrefsection}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 2
- \ifundef\chapter
- {\blx@err@nodocdiv{chapter}}
- {\pretocmd\chapter{\newrefsection}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 3
- \ifundef\section
- {\blx@err@nodocdiv{section}}
- {\pretocmd\section{\newrefsection}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 4
- \ifundef\subsection
- {\blx@err@nodocdiv{subsection}}
- {\pretocmd\subsection{\newrefsection}
- {}
- {\blx@err@patch{\string\part}}}%
- \fi
- \ifcase\blx@resethook
- \or % 1
- \ifundef\part
- {\blx@err@nodocdiv{part}}
- {\pretocmd\part{\citereset\blx@inf@creset}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 2
- \ifundef\chapter
- {\blx@err@nodocdiv{chapter}}
- {\pretocmd\chapter{\citereset\blx@inf@creset}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 3
- \ifundef\section
- {\blx@err@nodocdiv{section}}
- {\pretocmd\section{\citereset\blx@inf@creset}
- {}
- {\blx@err@patch{\string\part}}}%
- \or % 4
- \ifundef\subsection
- {\blx@err@nodocdiv{subsection}}
- {\pretocmd\subsection{\citereset\blx@inf@creset}
- {}
- {\blx@err@patch{\string\part}}}%
- \fi}
+ {}}
\def\blx@checkencoding{%
\ifdef\blx@texencoding
@@ -10067,7 +10190,7 @@
or
test {\@ifpackageloaded{inputenx}} )
}
- {\def\blx@texencoding{ascii}
+ {\def\blx@texencoding{ascii}%
\blx@info@noline{%
Input encoding '\blx@texencoding' forced by\MessageBreak
'safeinputenc' option}}
@@ -10079,6 +10202,8 @@
\AtBeginDocument{%
\blx@checkbackend{style}%
\blx@checkencoding
+ \c@maxnames\blx@maxcitenames\relax
+ \c@minnames\blx@mincitenames\relax
\if@filesw
\ifnum\blx@backend=\blx@backend@biber
\blx@ifsigned{\jobname}{bcf}
@@ -10099,11 +10224,7 @@
\csuse{abx@preamble}%
\blx@checkbackend{.bib file}%
\blx@inf@refsec
- \blx@inf@refseg
- \numdef\blx@premaxnames{\c@maxnames}%
- \numdef\blx@preminnames{\c@minnames}%
- \c@maxnames\blx@maxcitenames\relax
- \c@minnames\blx@mincitenames\relax}
+ \blx@inf@refseg}
\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 12ceafc4e87..f976a1c996a 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.5 2011/06/08 18:45:46 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $
biblatex generic compatibility]
% LaTeX
@@ -9,71 +9,20 @@
\AtBeginDocument{%
\renewrobustcmd*{\bibliography}[1]{%
\blx@error
- {'\string\bibliography' invalid at this point}
- {'\string\bibliography' must be given in the
- preamble.\MessageBreak I'm ignoring the command}}}
+ {'\string\bibliography' invalid}
+ {Use '\string\addbibresource' instead.\MessageBreak
+ I'm ignoring this command}}}
\renewrobustcmd*{\bibliographystyle}[1]{%
\blx@error
{'\string\bibliographystyle' invalid}
{Use the package option 'style' instead.\MessageBreak
- I'm ignoring the command}}
+ I'm ignoring this command}}
-% Standard classes
+% standard classes
\DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}}
-% biblatex <0.9b
-
-\DeclareBibliographyOption{defernums}[true]{%
- \ExecuteBibliographyOptions{defernumbers=#1}}
-
-\newcommand*{\lbx@fromlang}{%
- \iffieldundef{origlanguage}
- {\unspace}
- {\bibstring{from\thefield{origlanguage}}}}
-
-% LaTeX, biblatex <0.9a
-
-\providecommand*{\thebibliography}{}
-\renewenvironment*{thebibliography}
- {\list{}{%
- \leftmargin\bibhang
- \itemindent-\leftmargin
- \itemsep\bibitemsep
- \parsep\bibparsep}}
- {\endlist}
-\newcommand*{\thebibitem}{\item}
-
-\defbibenvironment{bibliography}
- {\thebibliography}
- {\endthebibliography}
- {\thebibitem}
-
-\newenvironment*{theshorthands}
- {\list{\thefield{shorthand}}{%
- \labelwidth\shorthandwidth
- \labelsep\biblabelsep
- \leftmargin\labelwidth
- \advance\leftmargin\labelsep
- \itemsep\bibitemsep
- \parsep\bibparsep
- \def\makelabel##1{##1\hss}}}
- {\endlist}
-\newcommand*{\thelositem}{\item}
-
-\defbibenvironment{shorthands}
- {\theshorthands}
- {\endtheshorthands}
- {\thelositem}
-
-% Biblatex <0.8d
-
-\DeclareBibliographyOption{bibtex8}[true]{%
- \ifstrequal{#1}{true}
- {\ExecuteBibliographyOptions{backend=bibtex8}}
- {\ExecuteBibliographyOptions{backend=bibtex}}}
-
% memoir
\ifdef\ifnobibintoc
@@ -131,4 +80,30 @@
\let\ifkomabibtotocnumbered=\@firstoftwo}}
{}
+% biblatex <1.6
+
+\define@key{blx@bib}{maxnames}{\blx@warn@depropt{maxnames}}
+\define@key{blx@los}{maxnames}{\blx@warn@depropt{maxnames}}
+\define@key{blx@bbs}{maxnames}{\blx@warn@depropt{maxnames}}
+\define@key{blx@bbg}{maxnames}{\blx@warn@depropt{maxnames}}
+\define@key{blx@bbc}{maxnames}{\blx@warn@depropt{maxnames}}
+
+\define@key{blx@bib}{minnames}{\blx@warn@depropt{minnames}}
+\define@key{blx@los}{minnames}{\blx@warn@depropt{minnames}}
+\define@key{blx@bbs}{minnames}{\blx@warn@depropt{minnames}}
+\define@key{blx@bbg}{minnames}{\blx@warn@depropt{minnames}}
+\define@key{blx@bbc}{minnames}{\blx@warn@depropt{minnames}}
+
+\define@key{blx@bib}{maxitems}{\blx@warn@depropt{maxitems}}
+\define@key{blx@los}{maxitems}{\blx@warn@depropt{maxitems}}
+\define@key{blx@bbs}{maxitems}{\blx@warn@depropt{maxitems}}
+\define@key{blx@bbg}{maxitems}{\blx@warn@depropt{maxitems}}
+\define@key{blx@bbc}{maxitems}{\blx@warn@depropt{maxitems}}
+
+\define@key{blx@bib}{minitems}{\blx@warn@depropt{minitems}}
+\define@key{blx@los}{minitems}{\blx@warn@depropt{minitems}}
+\define@key{blx@bbs}{minitems}{\blx@warn@depropt{minitems}}
+\define@key{blx@bbg}{minitems}{\blx@warn@depropt{minitems}}
+\define@key{blx@bbc}{minitems}{\blx@warn@depropt{minitems}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
index 0f9415e5126..10bf0cada9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
@@ -1,7 +1,7 @@
-% $Id: blx-mcite.def,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{blx-mcite.def}
-[\abx@rcsid $Id: blx-mcite.def,v 1.5 2011/06/08 18:45:46 lehman stable $
+[\abx@rcsid $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $
mcite-like citation commands]
\newrobustcmd*{\mcite}{\mcitelike\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index d8e5c1b65d1..811b210413e 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.5 2011/06/08 18:45:46 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 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 027d7de7e6d..1f862602d39 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index c5985031186..9555f5a618a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index d974ef999b9..64f10d762e5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{uniquename,uniquelist,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 71c5f047934..b23d510624f 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{uniquename,uniquelist,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 aceee6564ed..23853ec9774 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,
pagetracker,sortcites,autocite=footnote}
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 a41d7c86a05..0f296410334 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 dc671d0fef9..dd4f91365fd 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\RequireCitationStyle{authortitle}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 4130a73a10a..225880f6bf2 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\RequireCitationStyle{authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 d6b5cdb9725..f8e68ebd271 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authortitle.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{uniquename,uniquelist,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 f51525ca6d3..6a8fce5d4d0 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 f52842f4ddd..51ef9333420 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker,
ibidtracker=constrict,autocite=inline}
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 8f78efc6fd9..8b81b50d1bb 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 87c25b991a8..e87ae85d47a 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: authoryear.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 8245c2d8941..3c725be98f5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 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 ea07f9d0b2d..e29517eaf00 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 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 845f3ee3acf..1334e6b0ac3 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.6 2011/07/29 19:21:28 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 9e8a3d7df5a..de60d874433 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 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 faf5c1fb7fb..74e22224ceb 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 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 6e6bffc5255..df6a55f20c0 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 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 e04059d617e..49baa86caf5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 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 fc16620149f..717b618966c 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 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 5f172868b1b..5d4340061fb 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 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 e304242c44c..06fcacf734c 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 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 47ef04643a4..385c0a41002 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 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 f52b9742792..60ea0cc218d 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 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 af0e66abd13..d2811badf9a 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 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 7c44b50f44e..c4d62b6f1a2 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 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 df660e9f5ee..cf1e41bec9f 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 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 c9bd75b97f7..ff3c1679fa5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: american.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.6 2011/07/29 19:21:28 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 5044280800d..dbeabb69306 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 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 3af817e77e5..f8917cce710 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 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 2ed55b602ad..4e077602104 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 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 24166a94262..632b6a09ef9 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
% Status:
% - Almost complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index 14530f6b3e6..8d907f8deb1 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: british.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.6 2011/07/29 19:21:28 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 927ba9cad6e..b5dc25698de 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 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 92596b850e3..c80e3f7f36e 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 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 b98dd2c0b82..f03aeb791e9 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
% Status:
% - Almost complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 02dd3bda204..be006230728 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: english.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.6 2011/07/29 19:21:28 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 750f4f274f1..4ab1e83cf4b 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 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 293e4c0158d..7540b0d1b8d 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: french.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.6 2011/07/29 19:21:28 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 ac7461eb1c6..9875e73d1d4 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: german.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.6 2011/07/29 19:21:28 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 f8966c6d2be..5f0a47fe829 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
% Status:
% - Incomplete
@@ -470,7 +470,7 @@
annotation = {{σχολιασμοί}{σχολιασμοί}},
}
-\protected\def\lbx@gr@mkbibmonth#1{%
+\protected\gdef\lbx@gr@mkbibmonth#1{%
\ifcase0#1\relax
#1\BibliographyWarning{Month out of range}%
\or\abx@bibmonth{datejanuary}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index bc654df7d5c..593886cb03d 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 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 0e4209c4d0d..f246b2bf3e0 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 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 5e9ba0f5b02..ce483016957 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 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 c6af64d1d79..3590c99ae54 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 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 e34a38eb864..91967cf4d43 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 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 f923980f8cd..b82b96138c2 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 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 e5fb1681efe..f3269df2f97 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 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 ab2ea352c08..e045bb38335 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 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 a12826eab83..d9dba9a54c2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,7 +1,7 @@
-% $Id: portuguese.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
% Status:
% - Almost complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 950cc25a33e..32076d14fab 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 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 fb463224541..918fa07b1a5 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.5 2011/06/08 18:45:46 lehman stable $
+% $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $
\ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $]
% Status:
% - Incomplete