biblatex 1.4a (6apr11)

git-svn-id: svn://tug.org/texlive/trunk@22001 c570f23f-e606-0410-a88d-b1316a301751

92 files changed, 253 insertions, 240 deletions

diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 27079e2a340..a79a144cc94 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -1,4 +1,4 @@
-% $Id: biblatex.bst,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: biblatex.bst,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 % Copyright (c) 2006-2011 Philipp Lehman.
 %
diff --git a/Master/texmf-dist/doc/latex/biblatex/README b/Master/texmf-dist/doc/latex/biblatex/README
index df444a79aed..64035a778a0 100644
--- a/Master/texmf-dist/doc/latex/biblatex/README
+++ b/Master/texmf-dist/doc/latex/biblatex/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 2011/03/31 21:55:36 lehman stable $
+$Id: README,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 ABOUT
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index f7f572872da..96e709ae619 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,4 +1,4 @@
-$Id: RELEASE,v 1.4 2011/03/31 21:55:36 lehman stable $
+$Id: RELEASE,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 RELEASE NOTES FOR VERSION 1.4
 
@@ -37,7 +37,7 @@ RELEASE NOTES FOR VERSION 1.4
    generated 'extrayear' field provided by the 'labelyear' option)
    disambiguates the citations. Many style guides, however, mandate
    that the extra letter be used to disambiguate works by the same
-   author(s) only, not works by different author with the same last
+   author(s) only, not works by different authors with the same last
    name. In order to disambiguate the author's last name, you're
    expected to add additional parts of the name, either as initials
    or in full. This is what the 'uniquename' option does. Here are
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 709b158effa..4432456af6d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index aff8301e48a..81a5501ab22 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -1,4 +1,4 @@
-% $Id: biblatex.tex,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: biblatex.tex,v 1.4a 2011/04/06 20:10:00 lehman stable $
 \documentclass{ltxdockit}[2010/11/19]
 \usepackage{btxdockit}
 \usepackage[latin9]{inputenc}
@@ -12,7 +12,7 @@
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
-\rcsid{$Id: biblatex.tex,v 1.4 2011/03/31 21:55:36 lehman stable $}
+\rcsid{$Id: biblatex.tex,v 1.4a 2011/04/06 20:10:00 lehman stable $}
 
 \newcommand*{\biber}{Biber\xspace}
 \newcommand*{\biblatex}{Biblatex\xspace}
@@ -37,9 +37,9 @@
 % tables
 
 \newcolumntype{H}{>{\sffamily\bfseries\spotcolor}l}
-\newcolumntype{L}{>{\raggedright\let\\\tabularnewline}p}
-\newcolumntype{R}{>{\raggedleft\let\\\tabularnewline}p}
-\newcolumntype{V}{>{\raggedright\let\\\tabularnewline\ttfamily}p}
+\newcolumntype{L}{>{\raggedright\let\\=\tabularnewline}p}
+\newcolumntype{R}{>{\raggedleft\let\\=\tabularnewline}p}
+\newcolumntype{V}{>{\raggedright\let\\=\tabularnewline\ttfamily}p}
 
 \newcommand*{\sorttablesetup}{%
   \tablesetup
@@ -61,7 +61,7 @@
 
 \newenvironment{namedelims}
   {\trivlist\item
-   \tabularx{\textwidth}{@{}c@{=}lX@{}}}
+   \tabularx{\textwidth}{@{}c@{=}l>{\raggedright\let\\=\tabularnewline}X@{}}}
   {\endtabularx\endtrivlist}
 
 \newenvironment{namesample}
@@ -2559,37 +2559,37 @@ This style implements an alphabetic citation scheme similar to the \path{alpha.b
 A verbose variant of the \texttt{alphabetic} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[Doe92; Doe95; Jon98]» this style would print «[Doe92]; [Doe95]; [Jon98]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
 
 \item[authoryear]
-This style implements an author"=year citation scheme. If the bibliography contains two or more works by the same author which were all published in the same year, a letter is appended to the year. For example, this style would print citations such as «Doe 1995a; Doe 1995b; Jones 1998». This style should be employed in conjunction with an author"=year bibliography style which prints the corresponding labels in the bibliography. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}.
+This style implements an author"=year citation scheme. If the bibliography contains two or more works by the same author which were all published in the same year, a letter is appended to the year. For example, this style would print citations such as «Doe 1995a; Doe 1995b; Jones 1998». This style should be employed in conjunction with an author"=year bibliography style which prints the corresponding labels in the bibliography. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authoryear-comp]
-A compact variant of the \texttt{authoryear} style which prints the author only once if subsequent references passed to a single citation command share the same author. If they share the same year as well, the year is also printed only once. For example, instead of «Doe 1995b; Doe 1992; Jones 1998; Doe 1995a» this style would print «Doe 1992, 1995a,b; Jones 1998». It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}.
+A compact variant of the \texttt{authoryear} style which prints the author only once if subsequent references passed to a single citation command share the same author. If they share the same year as well, the year is also printed only once. For example, instead of «Doe 1995b; Doe 1992; Jones 1998; Doe 1995a» this style would print «Doe 1992, 1995a,b; Jones 1998». It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authoryear-ibid]
-A variant of the \texttt{authoryear} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A variant of the \texttt{authoryear} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authoryear-icomp]
-A style combining \texttt{authoryear-comp} and \texttt{authoryear-ibid}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A style combining \texttt{authoryear-comp} and \texttt{authoryear-ibid}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authortitle]
-This style implements a simple author"=title citation scheme. It will make use of the \bibfield{shorttitle} field, if available. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}.
+This style implements a simple author"=title citation scheme. It will make use of the \bibfield{shorttitle} field, if available. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-comp]
-A compact variant of the \texttt{authortitle} style which prints the author only once if subsequent references passed to a single citation command share the same author. For example, instead of «Doe, \emph{First title}; Doe, \emph{Second title}» this style would print «Doe, \emph{First title}, \emph{Second title}». It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{sortcites}{true}.
+A compact variant of the \texttt{authortitle} style which prints the author only once if subsequent references passed to a single citation command share the same author. For example, instead of «Doe, \emph{First title}; Doe, \emph{Second title}» this style would print «Doe, \emph{First title}, \emph{Second title}». It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{sortcites}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-ibid]
-A variant of the \texttt{authortitle} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A variant of the \texttt{authortitle} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authortitle-icomp]
-A style combining the features of \texttt{authortitle-comp} and \texttt{authortitle-ibid}. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A style combining the features of \texttt{authortitle-comp} and \texttt{authortitle-ibid}. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authortitle-terse]
-A terse variant of the \texttt{authortitle} style which only prints the title if the bibliography contains more than one work by the respective author\slash editor. This style will make use of the \bibfield{shorttitle} field, if available. It is suitable for in-text citations as well as citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}.
+A terse variant of the \texttt{authortitle} style which only prints the title if the bibliography contains more than one work by the respective author\slash editor. This style will make use of the \bibfield{shorttitle} field, if available. It is suitable for in-text citations as well as citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-tcomp]
-A style combining the features of \texttt{authortitle-comp} and \texttt{authortitle-terse}. This style will make use of the \bibfield{shorttitle} field, if available. It is suitable for in-text citations as well as citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}.
+A style combining the features of \texttt{authortitle-comp} and \texttt{authortitle-terse}. This style will make use of the \bibfield{shorttitle} field, if available. It is suitable for in-text citations as well as citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-ticomp]
-A style combining the features of \texttt{authortitle-icomp} and \texttt{authortitle-terse}. In other words: a variant of the \texttt{authortitle-tcomp} style with an \emph{ibidem} feature. This style is suitable for in-text citations as well as citations given in footnotes. It will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A style combining the features of \texttt{authortitle-icomp} and \texttt{authortitle-terse}. In other words: a variant of the \texttt{authortitle-tcomp} style with an \emph{ibidem} feature. This style is suitable for in-text citations as well as citations given in footnotes. It will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}, \kvopt{singletitle}{true}, \kvopt{uniquename}{true}, \kvopt{uniquelist}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[verbose]
 A verbose citation style which prints a full citation similar to a bibliography entry when an entry is cited for the first time, and a short citation afterwards. If available, the \bibfield{shorttitle} field is used in all short citations. If the \bibfield{shorthand} field is defined, the shorthand is introduced on the first citation and used as the short citation thereafter. This style may be used without a list of references and shorthands since all bibliographic data is provided on the first citation. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{citetracker}{context}. This style also provides an additional preamble option called \opt{citepages}. See the style example for details.
@@ -4574,7 +4574,7 @@ The spacing and the line"=breaking behavior of names is controlled by four macro
 \begin{namedelims}
 a & \cmd{bibnamedelima} & Inserted by the backend after the first element of every name part if that element is less than three characters long and before the last element of every name part. \\
 b & \cmd{bibnamedelimb} & Inserted by the backend between all elements of a name part where \cmd{bibnamedelima} does not apply. \\
-c & \cmd{bibnamedelimc} & Inserted by a formatting directive between the name prefix and the last name if \kvopt{useprefix}{true}. If \kvopt{useprefix}{true}, \cmd{bibnamedelimd} is used instead. \\
+c & \cmd{bibnamedelimc} & Inserted by a formatting directive between the name prefix and the last name if \kvopt{useprefix}{true}. If \kvopt{useprefix}{false}, \cmd{bibnamedelimd} is used instead. \\
 d & \cmd{bibnamedelimd} & Inserted by a formatting directive between name parts where \cmd{bibnamedelimc} does not apply. \\
 i & \cmd{bibnamedelimi} & Replaces \cmd{bibnamedelima/b} after initials \\
 \end{namedelims}
@@ -8465,7 +8465,13 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
-\begin{release}{1.4}{2011-??-??}
+\begin{release}{1.4a}{2011-04-06}
+\item Enable \opt{uniquename} and \opt{uniquelist} in all \texttt{authortitle} styles\see{use:xbx:cbx}
+\item Enable \opt{uniquename} and \opt{uniquelist} in all \texttt{authoryear} styles\see{use:xbx:cbx}
+\item Fixed some bugs
+\end{release}
+
+\begin{release}{1.4}{2011-03-31}
 \item Added package option \opt{uniquelist}\see{use:opt:pre:int}\BiberOnlyMark
 \item Added special counter \cnt{uniquelist}\see{aut:aux:tst}\BiberOnlyMark
 \item Revised and improved package option \opt{uniquename}\see{use:opt:pre:int}\BiberOnlyMark
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 9570f07a062..888380cff99 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: alphabetic-verb.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.4a 2011/04/06 20:10:00 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 1c76e9813f0..8cae5300e42 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: alphabetic.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: alphabetic.bbx,v 1.4a 2011/04/06 20:10:00 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 676831e7c97..295ea04af17 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-comp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 1.4a 2011/04/06 20:10:00 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 d1552c15284..13727d12a74 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-ibid.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.4a 2011/04/06 20:10:00 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 9f344c216ff..f1f2cf531e5 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-icomp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.4a 2011/04/06 20:10:00 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 449f65142e4..c81cd85ddf8 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-tcomp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.4a 2011/04/06 20:10:00 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 ee8569ad274..678042dd51b 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-terse.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 1.4a 2011/04/06 20:10:00 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 45877d2ad4e..295faf977d7 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-ticomp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.4a 2011/04/06 20:10:00 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 d6ebf3a5868..3fbe0b8a0a3 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authortitle.bbx,v 1.4a 2011/04/06 20:10:00 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 f3fc02d35f1..fc2111f36b0 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-comp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 1.4a 2011/04/06 20:10:00 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 ad3d029a2e1..9e6a36e7dff 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-ibid.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.4a 2011/04/06 20:10:00 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 a6c2310be5c..1117539a07e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-icomp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.4a 2011/04/06 20:10:00 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 06a858d0b44..5b2ee117dad 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 \RequireBibliographyStyle{standard}
 
@@ -50,7 +50,7 @@
 
 \def\bbx@opt@mergedate@basic{%
   \renewbibmacro*{date+extrayear}{%
-    \iffieldundef{year}
+    \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
 	 \printfield{labelyear}%
@@ -75,7 +75,7 @@
 
 \def\bbx@opt@mergedate@minimum{%
   \renewbibmacro*{date+extrayear}{%
-    \iffieldundef{year}
+    \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
 	 \printfield{labelyear}%
@@ -106,7 +106,7 @@
 
 \def\bbx@opt@mergedate@false{%
   \renewbibmacro*{date+extrayear}{%
-    \iffieldundef{year}
+    \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
 	 \printfield{labelyear}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 38080838307..88a08c55d87 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: debug.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: debug.bbx,v 1.4a 2011/04/06 20:10:00 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 083c398c585..5e03a2376ec 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: draft.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: draft.bbx,v 1.4a 2011/04/06 20:10:00 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 bc7ec0d0f2f..564cba0418e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric-comp.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 1.4a 2011/04/06 20:10:00 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 2a5706f3c92..17a2472e3b2 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric-verb.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 1.4a 2011/04/06 20:10:00 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 aef1c398392..ec49aeaef4f 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: numeric.bbx,v 1.4a 2011/04/06 20:10:00 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 a3e62426691..3ccf8e001e8 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: reading.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: reading.bbx,v 1.4a 2011/04/06 20:10:00 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 e609f4a2b30..d847eacdbb4 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: standard.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: standard.bbx,v 1.4a 2011/04/06 20:10:00 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 8c077a3f0d3..51efbaa5a0e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-ibid.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 1.4a 2011/04/06 20:10:00 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 06b3c4a2e57..033342e77bf 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-inote.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 1.4a 2011/04/06 20:10:00 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 044d54fe67c..65e4746f228 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-note.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-note.bbx,v 1.4a 2011/04/06 20:10:00 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 78bbe3fcd56..42a92388f0b 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad1.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 1.4a 2011/04/06 20:10:00 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 a04438850a5..80a37547492 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad2.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 1.4a 2011/04/06 20:10:00 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 f22aa525f57..1d0950c4d3b 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad3.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 1.4a 2011/04/06 20:10:00 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 c809aadd8cd..1558beb28a3 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose.bbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@bbxid $Id: verbose.bbx,v 1.4a 2011/04/06 20:10:00 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 7a366f808c4..d69f56e2c86 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: biblatex.cfg,v 1.4a 2011/04/06 20:10:00 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 b62b75bf3df..b88df4fe151 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: biblatex.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.4 2011/03/31 21:55:36 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -271,7 +271,7 @@
 \DeclareFieldFormat
   [suppbook,suppcollection,suppperiodical]
   {citetitle}{#1}
-\DeclareFieldFormat{labelyear}{#1}% = the '1995' part in 'Jones 1995a'
+\DeclareFieldFormat{labelyear}{\stripzeros{#1}}% = the '1995' part in 'Jones 1995a'
 \DeclareFieldFormat{extrayear}{% = the 'a' in 'Jones 1995a'
   \iffieldnums{labelyear}
     {\mknumalph{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 91c0618171e..4495d9e1f7c 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: biblatex.sty,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 % Copyright (c) 2006-2011 Philipp Lehman.
 %
@@ -21,7 +21,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.4 2011/03/31 21:55:36 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.4a 2011/04/06 20:10:00 lehman stable $
  programmable bibliographies]
 
 \def\blx@bblversion$#1: #2 ${#2}
@@ -3531,7 +3531,7 @@
   \def\currentlist{#3}%
   \c@listcount\@ne
   \expandafter\c@listtotal\csname c@#3\endcsname
-  \letcs\blx@thedata{abx@list@#3}
+  \letcs\blx@thedata{abx@list@#3}%
   \ifblank{#1}
     {\c@liststart\@ne}
     {\ifnum#1<\@ne
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index b55bb755fa3..10fa7db0700 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: blx-compat.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.4 2011/03/31 21:55:36 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
  biblatex generic compatibility]
 
 % LaTeX
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
index 17c6ed99986..d087df66cc1 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: blx-mcite.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{blx-mcite.def}
-[\abx@rcsid $Id: blx-mcite.def,v 1.4 2011/03/31 21:55:36 lehman stable $
+[\abx@rcsid $Id: blx-mcite.def,v 1.4a 2011/04/06 20:10:00 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 20388860d5d..d24d612efc6 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: blx-natbib.def,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.4 2011/03/31 21:55:36 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.4a 2011/04/06 20:10:00 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 bd2cb3a5c30..378ee940c94 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.4a 2011/04/06 20:10:00 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 58dc0b7bbca..de79e00f075 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: alphabetic.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.4a 2011/04/06 20:10:00 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 2a291656026..40f402f6f82 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -1,9 +1,9 @@
-% $Id: authortitle-comp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{sortcites,autocite=footnote}
+\ExecuteBibliographyOptions{uniquename,uniquelist,sortcites,autocite=footnote}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite:init}{%
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 78eb4793ac9..65690b9ec36 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,9 +1,9 @@
-% $Id: authortitle-ibid.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
+\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,pagetracker,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
 \newbool{cbx:loccit}
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 6388be42d3e..a10fdf9ee11 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,9 +1,10 @@
-% $Id: authortitle-icomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
+\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,
+                            pagetracker,sortcites,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
 \newbool{cbx:loccit}
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 4b7b3008244..45bbd5f7fb3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,10 +1,10 @@
-% $Id: authortitle-tcomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 \RequireCitationStyle{authortitle-comp}
-\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
+\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
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 02bd2b0eeef..47e8a776b68 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,10 +1,10 @@
-% $Id: authortitle-terse.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 \RequireCitationStyle{authortitle}
-\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
+\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
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 315360cfd3a..20c868da30f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -1,10 +1,10 @@
-% $Id: authortitle-ticomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 \RequireCitationStyle{authortitle-icomp}
-\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
+\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 36bdbd08900..d80d0cad168 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,9 +1,9 @@
-% $Id: authortitle.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authortitle.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{autocite=footnote}
+\ExecuteBibliographyOptions{uniquename,uniquelist,autocite=footnote}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite}{%
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 594ab55efe3..5fe2f977dce 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,9 +1,9 @@
-% $Id: authoryear-comp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
+\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,sortcites,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite:init}{%
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 ffc5c935c30..4718fbcc77d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,9 +1,10 @@
-% $Id: authoryear-ibid.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
+\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker,
+                            ibidtracker=constrict,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
 \newbool{cbx:loccit}
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 6b17b86a4dc..c975dae4933 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,9 +1,9 @@
-% $Id: authoryear-icomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
+\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,ibidtracker=constrict,
                             pagetracker,sortcites,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 35c21fb9e12..043d24cad4f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,9 +1,9 @@
-% $Id: authoryear.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $
+% $Id: authoryear.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
+\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index aee64e6d61c..f86f2f45103 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: debug.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.4a 2011/04/06 20:10:00 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 e2b342865d4..dbb18fcc758 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: draft.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.4a 2011/04/06 20:10:00 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 9c934fa550a..ef3b75351b3 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric-comp.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.4a 2011/04/06 20:10:00 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 1c775c40ef7..562020b603d 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric-verb.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.4a 2011/04/06 20:10:00 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 47825972200..240e4f81294 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: numeric.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.4a 2011/04/06 20:10:00 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 c6c5c15c4b0..c5bb834b7a6 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: reading.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.4a 2011/04/06 20:10:00 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 5185db7b767..71b814245f2 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.4a 2011/04/06 20:10:00 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 a3533708e75..e5c33e3c75e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-inote.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.4a 2011/04/06 20:10:00 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 382b5ce29ab..23878e9994c 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-note.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.4a 2011/04/06 20:10:00 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 b0d88869a42..d662902122a 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.4a 2011/04/06 20:10:00 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 d50cf561ac8..d13cc49ab7b 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.4a 2011/04/06 20:10:00 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 8fa0de36113..3eb8adff10c 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.4a 2011/04/06 20:10:00 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 3d82d0ec074..e9f51aaa1f6 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: verbose.cbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.4a 2011/04/06 20:10:00 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 4d973e9bb26..08e3622740e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: UKenglish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.4a 2011/04/06 20:10:00 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 2c09665a7e0..cc3efe13c63 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: USenglish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.4a 2011/04/06 20:10:00 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 ca5b00f08b9..c38af6ae70a 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: american.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.4a 2011/04/06 20:10:00 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 da7a821f1e7..d7eadfe6f78 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: australian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - complete
@@ -18,7 +18,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index 117d0f339fc..7d53c90d09f 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: austrian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.4a 2011/04/06 20:10:00 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 7c33ce4763b..b85269471d1 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: brazil.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.4a 2011/04/06 20:10:00 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 5197547482e..b6256b98dc1 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: brazilian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Complete
@@ -28,7 +28,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -38,7 +38,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index f8e206a8e64..6bf061da533 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: british.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - complete
@@ -32,7 +32,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -42,7 +42,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index ad39f6e25fa..04f21ef5472 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: canadian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.4a 2011/04/06 20:10:00 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 064d3c81353..4293c147ca4 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: danish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -26,7 +26,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -35,7 +35,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
 }
 
 \DeclareBibliographyStrings{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 4241ca895f6..2b2ba17a077 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: dutch.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Complete
@@ -28,7 +28,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -38,7 +38,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\mbox{-}}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibrangeterse
   \protected\def\mkbibrangeterse{%
     \BibliographyWarning{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 645227ed198..8d171e16663 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: english.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Complete
@@ -37,7 +37,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
       {}
       {\stripzeros{\thefield{#3}}%
        \iffieldundef{#1}{}{,\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#2}
       {}
@@ -49,7 +49,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
       {}
       {\mkdatezeros{\thefield{#3}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangecompextra
   \savecommand\mkbibrangeterse
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 63361af03f7..88192aa65a3 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: finnish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -34,7 +34,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -46,7 +46,7 @@
        \iffieldundef{#1}
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index ed2fcfd8ffb..784c6b20e44 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: french.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -30,7 +30,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -40,7 +40,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \providecommand*{\FDP@thinspace}{\addnbthinspace}% FDP@* -> frenchb.ldf (babel)
   \providecommand*{\FDP@colonspace}{\addnbspace}%
   \def\abx@semicolon{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 01161a430f8..fcad905ad63 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: german.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Complete
@@ -27,7 +27,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -39,7 +39,7 @@
        \iffieldundef{#1}
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 310f1cd0880..fb9c29bfe37 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: greek.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -65,7 +65,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -75,7 +75,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 697cb94e4f0..fc8d290a4d4 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: italian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -31,7 +31,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -41,7 +41,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index b4ebd2db63e..bedd896328a 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: naustrian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.4a 2011/04/06 20:10:00 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 204ac67d998..eb25bca5248 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: newzealand.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - complete
@@ -18,7 +18,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index 9b10655f3db..364059fcb5c 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: ngerman.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.4a 2011/04/06 20:10:00 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 07d690c95b9..9453c9ac32f 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: norsk.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.4a 2011/04/06 20:10:00 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 8097a921a17..28d71b30bd9 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: norwegian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -26,7 +26,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -35,7 +35,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
 }
 
 \DeclareBibliographyStrings{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 751adaa8957..d2f74b0ed07 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: nynorsk.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.4a 2011/04/06 20:10:00 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 927b83b8f51..de7224ed925 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: portuges.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.4a 2011/04/06 20:10:00 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 f067dbdb450..0d6f253027e 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: portuguese.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Complete
@@ -38,7 +38,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -48,7 +48,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index e9ace9c14ae..66762037d20 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: spanish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -26,7 +26,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -36,7 +36,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\mbox{-}}}%
-    \thefield{#1}}%
+    \mkdatezeros{\thefield{#1}}}%
   \savecommand\mkbibrangeterse
   \protected\def\mkbibrangeterse{%
     \BibliographyWarning{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index 0dd2554d835..243e44fe85a 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.4 2011/03/31 21:55:36 lehman stable $
+% $Id: swedish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $
 
 \ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.4 2011/03/31 21:55:36 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.4a 2011/04/06 20:10:00 lehman stable $]
 
 % Status:
 % - Incomplete
@@ -61,11 +61,11 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \thefield{#1}}%
+    \stripzeros{\thefield{#1}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#1}
       {}
-      {\thefield{#1}%
+      {\mkdatezeros{\thefield{#1}}%
        \iffieldundef{#2}{}{\mbox{-}}}%
     \iffieldundef{#2}
       {}
diff --git a/Master/tlpkg/tlpsrc/metapost.tlpsrc b/Master/tlpkg/tlpsrc/metapost.tlpsrc
index 879f070d6d9..2dedb39576d 100644
--- a/Master/tlpkg/tlpsrc/metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/metapost.tlpsrc
@@ -1,13 +1,18 @@
 depend kpathsea
+#
 srcpattern f ignore
+#
 binpattern f bin/${ARCH}/dvitomp
 binpattern f bin/${ARCH}/mfplain
 binpattern f bin/${ARCH}/mpost
+#
 docpattern d texmf-dist/doc/metapost/base
 docpattern f texmf/doc/man/man1/dvitomp.*
 docpattern f texmf/doc/man/man1/mpost.*
+#
 runpattern d texmf-dist/metapost/base
 runpattern d texmf-dist/metapost/config
 runpattern d texmf-dist/metapost/misc
 runpattern d texmf-dist/metapost/support
 runpattern d texmf-dist/tex/generic/metapost
+runpattern d texmf-dist/fonts/tfm/metapost