summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-05 00:05:06 +0000
committerKarl Berry <karl@freefriends.org>2011-02-05 00:05:06 +0000
commit3bedfd0f5f304f2676449252e192f4e43cfee7ec (patch)
tree828118bcb16bb502a2c175984ff5a6eabc50f2ed /Master/texmf-dist/tex/latex/biblatex/bbx
parent9a354cbbcf35c3a26b5234bc9dc6bb3d44b24dd4 (diff)
biblatex 1.1b (4feb11)
git-svn-id: svn://tug.org/texlive/trunk@21285 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx')
-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.bbx7
-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.bbx147
-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.bbx6
-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
27 files changed, 165 insertions, 91 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 973d74f0b91..7b8f25b5a50 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.1b 2011/02/04 11:36:21 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 a8b2e8c202c..947cdba6613 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: alphabetic.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.1b 2011/02/04 11:36:21 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 9787eed01b2..76fe2cb6153 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.1b 2011/02/04 11:36:21 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 baa3fd7c250..a52b94abbd7 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.1b 2011/02/04 11:36:21 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 2dc4edf091b..8414562b339 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.1b 2011/02/04 11:36:21 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 09b9bcd5fb1..2343abfe9ca 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.1b 2011/02/04 11:36:21 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 f2073a4c210..597dad3c62a 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.1b 2011/02/04 11:36:21 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 d5d774f9ff3..762109315db 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.1b 2011/02/04 11:36:21 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 789349f0af7..938a0388ef8 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{pagetracker}
@@ -10,8 +10,7 @@
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{pagetracker}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
- {\ExecuteBibliographyOptions{pagetracker=false}%
- \renewbibmacro*{bbx:savehash}{}}}
+ {\renewbibmacro*{bbx:savehash}{}}}
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}
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 1ee6bd60428..875bdaf7427 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.1b 2011/02/04 11:36:21 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 1a69921626d..518c0e512a5 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.1b 2011/02/04 11:36:21 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 33bb64f642c..513383a4ed6 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.1b 2011/02/04 11:36:21 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 5e0c024ae92..460661290bd 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
\RequireBibliographyStyle{standard}
@@ -9,12 +9,116 @@
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{pagetracker}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
- {\ExecuteBibliographyOptions{pagetracker=false}%
- \renewbibmacro*{bbx:savehash}{}}}
+ {\renewbibmacro*{bbx:savehash}{}}}
\DeclareBibliographyOption{mergedate}[true]{%
- \setbool{bbx:mergedate}{#1}}
-\newbool{bbx:mergedate}
+ \ifcsdef{bbx@opt@mergedate@#1}
+ {\csuse{bbx@opt@mergedate@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'mergedate=#1'}
+ {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
+ 'true' (=compact), and 'false'.}}}
+
+\providebibmacro*{date+extrayear}{}
+
+\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
+
+\def\bbx@opt@mergedate@maximum{%
+ \renewbibmacro*{date+extrayear}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdateextra}}}%
+ \renewbibmacro*{date}{}%
+ \renewbibmacro*{issue+date}{}%
+}
+
+\def\bbx@opt@mergedate@compact{%
+ \renewbibmacro*{date+extrayear}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[parens]{\printdateextra}}}%
+ \renewbibmacro*{date}{}%
+ \renewbibmacro*{issue+date}{%
+ \iffieldundef{issue}
+ {}
+ {\printtext[parens]{\printfield{issue}}}
+ \newunit}%
+}
+
+\def\bbx@opt@mergedate@basic{%
+ \renewbibmacro*{date+extrayear}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[parens]{%
+ \printfield{labelyear}%
+ \printfield{extrayear}}}}%
+ \renewbibmacro*{date}{%
+ \iffieldundef{month}
+ {}
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{
+ test {\iffieldundef{issue}}
+ and
+ test {\iffieldundef{month}}
+ }
+ {}
+ {\printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}%
+ \newunit}%
+}
+
+\def\bbx@opt@mergedate@minimum{%
+ \renewbibmacro*{date+extrayear}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[parens]{%
+ \printfield{labelyear}%
+ \printfield{extrayear}}}}%
+ \renewbibmacro*{date}{%
+ \ifboolexpr{
+ test {\iffieldundef{month}}
+ and
+ test {\iffieldundef{extrayear}}
+ }
+ {}
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{
+ test {\iffieldundef{issue}}
+ and
+ test {\iffieldundef{month}}
+ and
+ test {\iffieldundef{extrayear}}
+ }
+ {}
+ {\printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}%
+ \newunit}%
+}
+
+\def\bbx@opt@mergedate@false{%
+ \renewbibmacro*{date+extrayear}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[parens]{%
+ \printfield{labelyear}%
+ \printfield{extrayear}}}}%
+ \renewbibmacro*{date}{\printdate}%
+ \renewbibmacro*{issue+date}{%
+ \printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}%
+ \newunit}%
+}
\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker,mergedate}
@@ -145,15 +249,6 @@
{#1}
{#2}}
-\newbibmacro*{date+extrayear}{%
- \iffieldundef{year}
- {}
- {\printtext[parens]{%
- \ifbool{bbx:mergedate}
- {\printdateextra}
- {\printfield{labelyear}%
- \printfield{extrayear}}}}}
-
\newbibmacro*{labeltitle}{%
\iffieldundef{label}
{\iffieldundef{shorttitle}
@@ -162,26 +257,4 @@
{\printfield[title]{shorttitle}}}
{\printfield{label}}}
-\renewbibmacro*{issue+date}{%
- \ifbool{bbx:mergedate}
- {\iffieldundef{issue}
- {}
- {\printtext[parens]{\printfield{issue}}}}
- {\printtext[parens]{%
- \iffieldundef{issue}
- {\usebibmacro{date}}
- {\printfield{issue}%
- \setunit*{\addspace}%
- \usebibmacro{date}}}}
- \newunit}
-
-\renewbibmacro*{date}{%
- \ifboolexpr{
- bool {bbx:mergedate}
- or
- test {\iffieldundef{month}}
- }
- {}
- {\printdate}}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index d79928fb0cc..51db6407606 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: debug.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.1b 2011/02/04 11:36:21 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 24c67997ea2..50c4a5e1762 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: draft.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.1b 2011/02/04 11:36:21 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 01a028805d4..5969f70c686 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric-comp.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.1b 2011/02/04 11:36:21 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 01fbb3cafba..cf2870463aa 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric-verb.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.1b 2011/02/04 11:36:21 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 edd61dc9922..e3e9c0566cb 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.1b 2011/02/04 11:36:21 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 cea4398a18b..a4968857f83 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: reading.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.1b 2011/02/04 11:36:21 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 915a01809de..ae5656c7a25 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: standard.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
@@ -613,7 +613,9 @@
\usebibmacro{setpageref}%
\finentry}
+\DeclareBibliographyAlias{books}{book}
\DeclareBibliographyAlias{bookinbook}{inbook}
+\DeclareBibliographyAlias{collections}{collection}
\DeclareBibliographyAlias{reference}{collection}
\DeclareBibliographyAlias{inreference}{incollection}
\DeclareBibliographyAlias{review}{article}
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 3cf2659a6cf..4a8c3ef4f4a 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.1b 2011/02/04 11:36:21 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 b32dea07c74..24efe50153d 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-inote.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.1b 2011/02/04 11:36:21 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 966a604b23b..e61ce198992 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-note.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.1b 2011/02/04 11:36:21 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 fdf9101a2f5..daea3f3c18a 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.1b 2011/02/04 11:36:21 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 7e455e7b170..1ffa2a99dd6 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.1b 2011/02/04 11:36:21 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 8ed5dbc9302..02f6970ee27 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.1b 2011/02/04 11:36:21 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 75ff81cb2ac..edbd0f3f805 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
\RequireBibliographyStyle{authortitle}