biblatex 1.1b (4feb11)

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

99 files changed, 823 insertions, 437 deletions

diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index d6f475537ba..f7a0b39cd2c 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: biblatex.bst,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 % Copyright (c) 2006-2011 Philipp Lehman.
 %
@@ -1667,6 +1667,7 @@ FUNCTION {set}            { type$ output:entry }
 FUNCTION {article}        { type$ output:entry }
 FUNCTION {bibnote}        { type$ output:entry }
 FUNCTION {book}           { type$ output:entry }
+FUNCTION {books}          { type$ output:entry }
 FUNCTION {bookinbook}     { type$ output:entry }
 FUNCTION {booklet}        { type$ output:entry }
 FUNCTION {collection}     { type$ output:entry }
diff --git a/Master/texmf-dist/doc/latex/biblatex/README b/Master/texmf-dist/doc/latex/biblatex/README
index e15ab1fff6a..0103c434118 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.1a 2011/01/08 13:30:00 lehman stable $
+$Id: README,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 ABOUT
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index f7544b077da..b442a3751f5 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.1a 2011/01/08 13:30:00 lehman stable $
+$Id: RELEASE,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 RELEASE NOTES FOR VERSION 1.1
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 7cdec4879a0..61a1d9b56d8 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 1716985cf0b..a44602b0fa0 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: biblatex.tex,v 1.1b 2011/02/04 11:36:21 lehman stable $
 \documentclass{ltxdockit}[2010/11/19]
 \usepackage{btxdockit}
 \usepackage[latin9]{inputenc}
@@ -11,7 +11,7 @@
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
-\rcsid{$Id: biblatex.tex,v 1.1a 2011/01/08 13:30:00 lehman stable $}
+\rcsid{$Id: biblatex.tex,v 1.1b 2011/02/04 11:36:21 lehman stable $}
 
 \newcommand*{\BiblatexHome}{http://sourceforge.net/projects/biblatex/}
 \newcommand*{\BiblatexOnCTAN}{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex/}
@@ -236,7 +236,7 @@ The \sty{natbib} package supports numeric and author"=year citation schemes, inc
 The \sty{splitbib} package provides support for bibliographies subdivided by topic. See \sty{bibtopic}.
 
 \item[ucs]
-The \sty{ucs} package provides support for \acr{UTF-8} encoded input. Either use \sty{inputenc}'s standard \file{utf8} module or a Unicode enabled engine such as \xetex or \luatex instead.
+The \sty{ucs} package provides support for \utf encoded input. Either use \sty{inputenc}'s standard \file{utf8} module or a Unicode enabled engine such as \xetex or \luatex instead.
 
 \end{marglist}
 
@@ -453,7 +453,7 @@ Audio recordings, typically on audio \acr{CD}, \acr{DVD}, audio casette, or simi
 
 \typeitem{bibnote}
 
-This special entry type is not meant to be used in the \file{bib} file like other types. It is provided for third-party packages like \sty{notes2bib} which merge notes into the bibliography. The notes should go into the \bibfield{note} field. By advised that the \bibtype{bibnote} type is not related to the \cmd{defbibnote} command in any way. \cmd{defbibnote} is for adding comments at the beginning or the end of the bibliography, whereas the \bibtype{bibnote} type is meant for packages which render endnotes as bibliography entries.
+This special entry type is not meant to be used in the \file{bib} file like other types. It is provided for third-party packages like \sty{notes2bib} which merge notes into the bibliography. The notes should go into the \bibfield{note} field. Be advised that the \bibtype{bibnote} type is not related to the \cmd{defbibnote} command in any way. \cmd{defbibnote} is for adding comments at the beginning or the end of the bibliography, whereas the \bibtype{bibnote} type is meant for packages which render endnotes as bibliography entries.
 
 \typeitem{commentary}
 
@@ -1531,7 +1531,7 @@ sortname   = {Ba<<sszz>>mann, Paul},
 Not only \bibtex, \latex needs to know about the encoding as well. See \secref{bib:cav:enc:enc} on how to specify encodings.
 
 \paragraph{Biber}
-Biber handles Ascii, 8-bit encodings such as Latin\,1, and \acr{UTF-8}. It features true Unicode support and is capable of reencoding the \file{bib} data on the fly in a robust way. For sorting, Biber uses a Perl implementation of the Unicode Collation Algorithm (\acr{UCA}), as outlined in Unicode Technical Standard \#10.\fnurl{http://unicode.org/reports/tr10/} Collation tailoring based on the Unicode Common Locale Data Repository (\acr{CLDR}) is in the process of being added.\fnurl{http://cldr.unicode.org/} The bottom line is that Biber will deliver sorting results far superior to both \bibtex and \file{bibtex8} in many cases. If you are interested in the technical details, section 1.8 of Unicode Technical Standard \#10 will provide you with a very concise summary of why the inadequateness of traditional \bibtex and even \bin{bibtex8} is of a very general nature and not limited to the lack of \utf support.\fnurl{http://unicode.org/reports/tr10/#Common_Misperceptions}
+Biber handles Ascii, 8-bit encodings such as Latin\,1, and \utf. It features true Unicode support and is capable of reencoding the \file{bib} data on the fly in a robust way. For sorting, Biber uses a Perl implementation of the Unicode Collation Algorithm (\acr{UCA}), as outlined in Unicode Technical Standard \#10.\fnurl{http://unicode.org/reports/tr10/} Collation tailoring based on the Unicode Common Locale Data Repository (\acr{CLDR}) is in the process of being added.\fnurl{http://cldr.unicode.org/} The bottom line is that Biber will deliver sorting results far superior to both \bibtex and \file{bibtex8} in many cases. If you are interested in the technical details, section 1.8 of Unicode Technical Standard \#10 will provide you with a very concise summary of why the inadequateness of traditional \bibtex and even \bin{bibtex8} is of a very general nature and not limited to the lack of \utf support.\fnurl{http://unicode.org/reports/tr10/#Common_Misperceptions}
 
 Supporting Unicode implies much more than handling \utf input. Unicode is a complex standard covering more than its most well-known parts, the Unicode character encoding and transport encodings such as \utf. It also standardizes aspects such as string collation, which is required for language-sensitive sorting. For example, by using the Unicode Collation Algorithm, Biber can handle the character <ß> mentioned as an example in \secref{bib:cav:enc:bt8} without any manual intervention. All you need to do to get localized sorting is specify the locale:
 
@@ -1576,27 +1576,27 @@ Since \kvopt{bibencoding}{auto} is the default setting, the option is omissible.
 \usepackage{biblatex}
 \end{lstlisting}
 
-\item \acr{UTF-8} encoding in the \file{tex} file, Latin\,1 (\acr{ISO}-8859-1) in the \file{bib} file with \pdftex or traditional \tex (\file{bibtex8}, Biber):
+\item \utf encoding in the \file{tex} file, Latin\,1 (\acr{ISO}-8859-1) in the \file{bib} file with \pdftex or traditional \tex (\file{bibtex8}, Biber):
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[utf8]{inputenc}
 \usepackage[bibencoding=latin1]{biblatex}
 \end{lstlisting}
 
-The same scenario with \xetex or \luatex in native \acr{UTF-8} mode:
+The same scenario with \xetex or \luatex in native \utf mode:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[bibencoding=latin1]{biblatex}
 \end{lstlisting}
 
-\item Using \acr{UTF-8} encoding in both the \file{tex} and the \file{bib} file is not possible with traditional \bibtex or \bin{bibtex8} since neither of them is capable of handling \acr{UTF-8}. Unless you switch to Biber, you need to use an 8-bit encoding such as Latin\,1 (see above) or resort to Ascii notation in this case:
+\item Using \utf encoding in both the \file{tex} and the \file{bib} file is not possible with traditional \bibtex or \bin{bibtex8} since neither of them is capable of handling \utf. Unless you switch to Biber, you need to use an 8-bit encoding such as Latin\,1 (see above) or resort to Ascii notation in this case:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[utf8]{inputenc}
 \usepackage[bibencoding=ascii]{biblatex}
 \end{lstlisting}
 
-The same scenario with \xetex or \luatex in native \acr{UTF-8} mode:
+The same scenario with \xetex or \luatex in native \utf mode:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[bibencoding=ascii]{biblatex}
@@ -1604,11 +1604,11 @@ The same scenario with \xetex or \luatex in native \acr{UTF-8} mode:
 
 \end{itemize}
 
-Biber can handle Ascii notation, 8-bit encodings such as Latin\,1, and \acr{UTF-8}. It is also capable of reencoding the \file{bib} data on the fly (replacing the limited macro-level reencoding feature of \sty{biblatex}). This will happen automatically if required, provided that you specify the encoding of the \file{bib} files properly. In addition to the scenarios discussed above, Biber can also handle the following cases:
+Biber can handle Ascii notation, 8-bit encodings such as Latin\,1, and \utf. It is also capable of reencoding the \file{bib} data on the fly (replacing the limited macro-level reencoding feature of \sty{biblatex}). This will happen automatically if required, provided that you specify the encoding of the \file{bib} files properly. In addition to the scenarios discussed above, Biber can also handle the following cases:
 
 \begin{itemize}
 
-\item Transparent \acr{UTF-8} workflow, \ie \acr{UTF-8} encoding in both the \file{tex} and the \file{bib} file with \pdftex or traditional \tex:
+\item Transparent \utf workflow, \ie \utf encoding in both the \file{tex} and the \file{bib} file with \pdftex or traditional \tex:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[utf8]{inputenc}
@@ -1622,13 +1622,13 @@ Since \kvopt{bibencoding}{auto} is the default setting, the option is omissible:
 \usepackage{biblatex}
 \end{lstlisting}
 
-The same scenario with \xetex or \luatex in native \acr{UTF-8} mode:
+The same scenario with \xetex or \luatex in native \utf mode:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage{biblatex}
 \end{lstlisting}
 
-\item It is even possible to combine an 8-bit encoded \file{tex} file with \acr{UTF-8} encoding in the \file{bib} file, provided that all characters in the \file{bib} file are also covered by the selected 8-bit encoding:
+\item It is even possible to combine an 8-bit encoded \file{tex} file with \utf encoding in the \file{bib} file, provided that all characters in the \file{bib} file are also covered by the selected 8-bit encoding:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[latin1]{inputenc}
@@ -1637,6 +1637,23 @@ The same scenario with \xetex or \luatex in native \acr{UTF-8} mode:
 
 \end{itemize}
 
+Some workarounds may be required when using traditional \tex or \pdftex with \utf encoding because \sty{inputenc}'s \file{utf8} module does not cover all of Unicode. Roughly speaking, it only convers the Western European Unicode range. When loading \sty{inputenc} with the \file{utf8} option, \sty{biblatex} will normally instruct Biber to reencode the \file{bib} data to \utf. This may lead to \sty{inputenc} errors if some of the characters in the \file{bib} file are outside the limited Unicode range supported by \sty{inputenc}.
+
+\begin{itemize}
+
+\item If you are affected by this problem, try setting the \opt{safeinputenc} option:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[utf8]{inputenc}
+\usepackage[safeinputenc]{biblatex}
+\end{lstlisting}
+%
+If this option is enabled, \sty{biblatex} will ignore \sty{inputenc}'s \opt{utf8} option and use Ascii. Biber will then try to convert the \file{bib} data to Ascii notation. For example, it will convert \texttt{\k{S}} to |\k{S}|. This option is similar to setting \kvopt{texencoding}{ascii} but will only take effect in this specific scenario (\sty{inputenc}\slash \sty{inputenx} with \utf). This workaround takes advantage of the fact that both Unicode and the \utf transport encoding are backwards compatible with Ascii.
+
+\end{itemize}
+
+This solution may be acceptable as a workaround if the data in the \file{bib} file is mostly Ascii anyway, with only a few strings, such as some authors' names, causing problems. However, keep in mind that it will not magically make traditional \tex or \pdftex support Unicode. It may help if the occasional odd character is not supported by \sty{inputenc}, but may still be processed by \tex when using an accent command (\eg |\d{S}| instead of \texttt{\d{S}}). If you need full Unicode support, however, switch to \xetex or \luatex.
+
 \subsubsection{Editors and Compiler Scripts}
 \label{bib:cav:ide}
 
@@ -2058,19 +2075,37 @@ Specifies the database backend. The following backends are supported:
 
 This option will typically be set permanently in the configuration file, see \secref{use:cfg} for details. Also see \secref{bib:cav:enc} for further instructions concerning the encoding of \file{bib} files.
 
+\optitem[auto]{texencoding}{\opt{auto}, \prm{encoding}}
+
+Specifies the encoding of the \file{tex} file. This option affects the data transfered from the backend to \sty{biblatex}. When using Biber, this corresponds to Biber's |--bblencoding| option. The following choices are available:
+
+\begin{valuelist}
+
+\item[auto] Try to auto-detect the input encoding. If the \sty{inputenc}\slash \sty{inputenx}\slash \sty{luainputenc} package is available, \sty{biblatex} will get the main encoding from that package. If not, it assumes \utf encoding if \xetex or \luatex has been detected, and Ascii otherwise.
+
+\item[\prm{encoding}] Specifies the \prm{encoding} explicitly. This is for odd cases in which auto-detection fails or you want to force a certain encoding for some reason.
+
+\end{valuelist}
+%
+Note that setting \kvopt{texencoding}{\prm{encoding}} will also affect the \opt{bibencoding} option if \kvopt{bibencoding}{auto}.
+
 \optitem[auto]{bibencoding}{\opt{auto}, \prm{encoding}}
 
-Specifies the encoding of the \file{bib} files. The following choices are available:
+Specifies the encoding of the \file{bib} files. When using Biber, this corresponds to Biber's |--bibencoding| option. The following choices are available:
 
 \begin{valuelist}
 
-\item[auto] Use this option if the workflow is transparent, \ie if the encoding of the \file{bib} file is identical to the encoding of the \file{tex} file. The \sty{biblatex} package will try to auto-detect the encoding of the \file{tex} file. If the \sty{inputenc}\slash\sty{inputenx}\slash\sty{luainputenc} package is available, \sty{biblatex} will get the main encoding from that package. If not, it assumes \texttt{utf8} if \xetex or \luatex has been detected, and \texttt{ascii} otherwise.
+\item[auto] Use this option if the workflow is transparent, \ie if the encoding of the \file{bib} file is identical to the encoding of the \file{tex} file.
 
-\item[\prm{encoding}] If the encoding of the \file{bib} file is different from the one of the \file{tex} file, you need to specify it explicitly. When using the \sty{inputenc}\slash\sty{inputenx}\slash\sty{luainputenc} package, the \prm{encoding} must be an encoding name known to that package.
+\item[\prm{encoding}] If the encoding of the \file{bib} file is different from the one of the \file{tex} file, you need to specify it explicitly.
 
 \end{valuelist}
 
-By default, \sty{biblatex} assumes that the \file{tex} file and the \file{bib} file use the same encoding. Note that some backends only support a limited number of encodings. See \secref{bib:cav:enc} for further instructions.
+By default, \sty{biblatex} assumes that the \file{tex} file and the \file{bib} file use the same encoding (\kvopt{bibencoding}{auto}). Note that some backends only support a limited number of encodings. See \secref{bib:cav:enc} for further instructions.
+
+\boolitem[false]{safeinputenc}[\BiberOnly]
+
+If this option is enabled, \sty{biblatex} will automatically force \kvopt{texencoding}{ascii} if the \sty{inputenc}\slash \sty{inputenx} package has been loaded and the input encoding is \utf, \ie it will ignore any macro-based \utf support and use Ascii only. Biber will then try to convert any non-Ascii data in the \file{bib} file to Ascii. For example, it will convert \texttt{\d{S}} to |\d{S}|. See \secref{bib:cav:enc:enc} for an explanation of why you may want to enable this option.
 
 \boolitem[true]{bibwarn}
 
@@ -5291,10 +5326,6 @@ The sort direction, which may be either \texttt{ascending} or \texttt{descending
 
 This option marks a \cmd{sort} directive as the final one in the \prm{specification}. If one of the \prm{elements} is available, the remainder of the \prm{specification} will be ignored. The short form \opt{final} is equivalent to \kvopt{final}{true}.
 
-\choitem[both]{pass}{label, final}
-
-When generating special fields such as \bibfield{extraalpha}, the sorting routine may need to sort the entries twice because label generation may require a sort order different from the final order of the bibliography. This option indicates that the directive should be considered on the first (\texttt{label}) or the second (\texttt{final}) pass only. See the examples below for details.
-
 \boolitem{sortcase}
 
 Whether to sort case"=sensitively. The default setting depends on the global \opt{sortcase} option.
@@ -5349,7 +5380,7 @@ The number of characters to match.
 
 \cmditem{literal}{string}
 
-The \cmd{literal} element adds a literal \prm{string} to the sorting specification. This is useful as a fallback if certain fields are not available.
+The \cmd{literal} element adds a literal \prm{string} to the sorting specification. This is useful as a fallback if some fields are not available.
 
 \csitem{citeorder}
 
@@ -5409,48 +5440,6 @@ In the next example, we define the same scheme in a more elaborate way, consider
   }
 }
 \end{lstlisting}
-%
-The next example is more complex still. In some cases, the backend needs to sort the entries twice. An example is the \texttt{anyt} scheme, which includes the automatically generated \bibfield{labelalpha} and \bibfield{extraalpha} fields. We want the \bibfield{extraalpha} field to be considered in the sorting process because the bibliography of \texttt{alphabetic} styles is usually sorted by label and it would be odd to have |Abc95a| after |Abc95b|. However, generating \bibfield{extraalpha} requires that the entries be already sorted (by \bibfield{labelalpha}). Therefore, we establish the sorting order required for the generation of the \bibfield{extraalpha} field on the first pass. On the second and final pass, the newly generated field is considered in the sorting process. Note that \bibfield{labelalpha} is shifting positions:
-
-\begin{lstlisting}[style=latex]{}
-\DeclareSortingScheme{anyt}{%
-  \sort{
-    \field{presort}
-  }
-  \sort[<<pass=label>>]{
-    \field{<<labelalpha>>}
-  }
-  \sort{
-    \field[final]{sortkey}
-  }
-  \sort[<<pass=final>>]{
-    \field{<<labelalpha>>}
-  }
-  \sort[<<pass=final>>]{
-    \field[padside=left,padwidth=4,padchar=0]{<<extraalpha>>}
-  }
-  \sort{
-    \name{sortname}
-    \name{author}
-    \name{editor}
-    \name{translator}
-    \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field{sortyear}
-    \field{year}
-  }
-  \sort{
-    \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field[padside=left,padwidth=4,padchar=0]{volume}
-    \literal{0000}
-  }
-}
-\end{lstlisting}
 
 \begin{ltxsyntax}
 
@@ -7895,9 +7884,18 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{1.1b}{2011-02-04}
+\item Added option \opt{texencoding}\see{use:opt:pre:gen}\BiberOnlyMark
+\item Added option \opt{safeinputenc}\see{use:opt:pre:gen}\BiberOnlyMark
+\item Expanded documentation\see{bib:cav:enc:enc}
+\item Improved \opt{mergedate} option of bibliography style \texttt{authoryear}\see{use:xbx:bbx}
+\item Removed \opt{pass} option of \cmd{DeclareSortingScheme}\see{aut:ctm:srt}\BiberOnlyMark
+\item Fixed some bugs
+\end{release}
+
 \begin{release}{1.1a}{2011-01-08}
 \item Added unsupported entry type \bibtype{bibnote}\see{bib:typ:ctm}
-\item Added \cmd{bibliography*}\see{use:bib:sec}
+\item Added \cmd{bibliography*}\see{use:bib:bib}
 \item Fixed some bugs
 \end{release}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
index 0e6ec71d2d8..52add3b353b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
index 0a5659a29a4..d6330a3c91d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
@@ -12,6 +12,10 @@
 % Some generic settings.
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \setlength{\parindent}{0pt}
+\newenvironment{bibsample}
+  {\trivlist\samepage
+   \setlength{\itemsep}{0pt}}
+  {\endtrivlist}
 \begin{document}
 
 \section*{The \texttt{authoryear} style}
@@ -31,27 +35,90 @@ preamble will disable this feature. The default setting is
 
 \subsubsection*{The \texttt{mergedate} option}
 
-The \texttt{mergedate} option controls whether or not date
-specifications are merged with the date label which is printed after
-the author in the bibliography. For example, while
-\texttt{mergedate=false} outputs:
-
-\begin{quote}
-Doe, John (2008a). \enquote{Article}. In: \emph{Journal} 23.5 (May
-2008), pp.~5--24.
-\end{quote}
-%
-\texttt{mergedate=true} will print:
-
-\begin{quote}
-Doe, John (May 2008a). \enquote{Article}. In: \emph{Journal} 23.5,
-pp.~15--34.
-\end{quote}
-%
-The default setting is \texttt{mergedate=true}. Note that this
-options only affects the bibliography. Citations never include full
-dates anyway. In this example, the citation will be \enquote{Doe
-2008a} in both cases.
+Since this style prints the date label after the author/editor in the
+bibliography, there are effectively two dates in the bibliography:
+the full date specification (e.g., \enquote{2001}, \enquote{June
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
+
+\begin{bibsample}
+\item Doe 2000
+\item Doe 2003a
+\item Doe 2003b
+\item Doe 2006a
+\item Doe 2006b
+\end{bibsample}
+
+\texttt{mergedate=false} strictly separates the date specification
+from the date label. The year will always be printed twice:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=basic} is similar in concept but more economical.
+It will always omit the date specification if the date is a bare year
+number:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=compact} merges all date specifications with the
+date labels. It will still treat the \texttt{issue} field specially:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
+This is the default setting.
 
 \subsection*{\cmd{cite} examples}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
index 0a1baabbd11..449926d8cd5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
index 1e4bccaa058..6f24171d301 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
@@ -11,6 +11,10 @@
 % Some generic settings:
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \setlength{\parindent}{0pt}
+\newenvironment{bibsample}
+  {\trivlist\samepage
+   \setlength{\itemsep}{0pt}}
+  {\endtrivlist}
 \begin{document}
 
 \section*{The \texttt{authoryear-ibid} style}
@@ -45,27 +49,90 @@ preamble will disable this feature. The default setting is
 
 \subsubsection*{The \texttt{mergedate} option}
 
-The \texttt{mergedate} option controls whether or not date
-specifications are merged with the date label which is printed after
-the author in the bibliography. For example, while
-\texttt{mergedate=false} outputs:
-
-\begin{quote}
-Doe, John (2008a). \enquote{Article}. In: \emph{Journal} 23.5 (May
-2008), pp.~5--24.
-\end{quote}
-%
-\texttt{mergedate=true} will print:
-
-\begin{quote}
-Doe, John (May 2008a). \enquote{Article}. In: \emph{Journal} 23.5,
-pp.~15--34.
-\end{quote}
-%
-The default setting is \texttt{mergedate=true}. Note that this
-options only affects the bibliography. Citations never include full
-dates anyway. In this example, the citation will be \enquote{Doe
-2008a} in both cases.
+Since this style prints the date label after the author/editor in the
+bibliography, there are effectively two dates in the bibliography:
+the full date specification (e.g., \enquote{2001}, \enquote{June
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
+
+\begin{bibsample}
+\item Doe 2000
+\item Doe 2003a
+\item Doe 2003b
+\item Doe 2006a
+\item Doe 2006b
+\end{bibsample}
+
+\texttt{mergedate=false} strictly separates the date specification
+from the date label. The year will always be printed twice:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=basic} is similar in concept but more economical.
+It will always omit the date specification if the date is a bare year
+number:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=compact} merges all date specifications with the
+date labels. It will still treat the \texttt{issue} field specially:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
+This is the default setting.
 
 \subsection*{Hints}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
index ffcb90a41d2..e0af1b85ce1 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
index e5bb56d347a..9d9bf34e8c7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
@@ -11,6 +11,10 @@
 % Some generic settings.
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \setlength{\parindent}{0pt}
+\newenvironment{bibsample}
+  {\trivlist\samepage
+   \setlength{\itemsep}{0pt}}
+  {\endtrivlist}
 \begin{document}
 
 \section*{The \texttt{authoryear-comp} style}
@@ -35,27 +39,90 @@ preamble will disable this feature. The default setting is
 
 \subsubsection*{The \texttt{mergedate} option}
 
-The \texttt{mergedate} option controls whether or not date
-specifications are merged with the date label which is printed after
-the author in the bibliography. For example, while
-\texttt{mergedate=false} outputs:
+Since this style prints the date label after the author/editor in the
+bibliography, there are effectively two dates in the bibliography:
+the full date specification (e.g., \enquote{2001}, \enquote{June
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
 
-\begin{quote}
-Doe, John (2008a). \enquote{Article}. In: \emph{Journal} 23.5 (May
-2008), pp.~5--24.
-\end{quote}
-%
-\texttt{mergedate=true} will print:
+\begin{bibsample}
+\item Doe 2000
+\item Doe 2003a
+\item Doe 2003b
+\item Doe 2006a
+\item Doe 2006b
+\end{bibsample}
 
-\begin{quote}
-Doe, John (May 2008a). \enquote{Article}. In: \emph{Journal} 23.5,
-pp.~15--34.
-\end{quote}
-%
-The default setting is \texttt{mergedate=true}. Note that this
-options only affects the bibliography. Citations never include full
-dates anyway. In this example, the citation will be \enquote{Doe
-2008a} in both cases.
+\texttt{mergedate=false} strictly separates the date specification
+from the date label. The year will always be printed twice:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=basic} is similar in concept but more economical.
+It will always omit the date specification if the date is a bare year
+number:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=compact} merges all date specifications with the
+date labels. It will still treat the \texttt{issue} field specially:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
+This is the default setting.
 
 \subsection*{Multiple citations}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
index c7bc160f401..8b07ff76f2d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
index 8b15dfeb341..9de339f8995 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
@@ -11,6 +11,10 @@
 % Some generic settings.
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \setlength{\parindent}{0pt}
+\newenvironment{bibsample}
+  {\trivlist\samepage
+   \setlength{\itemsep}{0pt}}
+  {\endtrivlist}
 \begin{document}
 
 \section*{The \texttt{authoryear-icomp} style}
@@ -43,27 +47,90 @@ preamble will disable this feature. The default setting is
 
 \subsubsection*{The \texttt{mergedate} option}
 
-The \texttt{mergedate} option controls whether or not date
-specifications are merged with the date label which is printed after
-the author in the bibliography. For example, while
-\texttt{mergedate=false} outputs:
-
-\begin{quote}
-Doe, John (2008a). \enquote{Article}. In: \emph{Journal} 23.5 (May
-2008), pp.~5--24.
-\end{quote}
-%
-\texttt{mergedate=true} will print:
-
-\begin{quote}
-Doe, John (May 2008a). \enquote{Article}. In: \emph{Journal} 23.5,
-pp.~15--34.
-\end{quote}
-%
-The default setting is \texttt{mergedate=true}. Note that this
-options only affects the bibliography. Citations never include full
-dates anyway. In this example, the citation will be \enquote{Doe
-2008a} in both cases.
+Since this style prints the date label after the author/editor in the
+bibliography, there are effectively two dates in the bibliography:
+the full date specification (e.g., \enquote{2001}, \enquote{June
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
+
+\begin{bibsample}
+\item Doe 2000
+\item Doe 2003a
+\item Doe 2003b
+\item Doe 2006a
+\item Doe 2006b
+\end{bibsample}
+
+\texttt{mergedate=false} strictly separates the date specification
+from the date label. The year will always be printed twice:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher, 2003.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher, 2003.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=basic} is similar in concept but more economical.
+It will always omit the date specification if the date is a bare year
+number:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6
+(June~2006), pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall~2006), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=compact} merges all date specifications with the
+date labels. It will still treat the \texttt{issue} field specially:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
+(Fall), pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
+
+\begin{bibsample}
+\item Doe, John (2000). \emph{Book~1}. Location: Publisher.
+\item Doe, John (2003a). \emph{Book~2}. Location: Publisher.
+\item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
+\item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
+\item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
+\end{bibsample}
+
+\texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
+This is the default setting.
 
 \subsection*{Hints}
 
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}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index dfc05055f14..ea6cb793e6e 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: biblatex.cfg,v 1.1b 2011/02/04 11:36:21 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 d33ec1a3a1c..bdafa671adf 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: biblatex.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.1a 2011/01/08 13:30:00 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -1015,18 +1015,12 @@
   \sort{
     \field{presort}
   }
-  \sort[pass=label]{
+  \sort{
     \field{labelalpha}
   }
   \sort[final]{
     \field{sortkey}
   }
-  \sort[pass=final]{
-    \field{labelalpha}
-  }
-  \sort[pass=final]{
-    \field[padside=left,padwidth=4,padchar=0]{extraalpha}
-  }
   \sort{
     \name{sortname}
     \name{author}
@@ -1053,18 +1047,12 @@
   \sort{
     \field{presort}
   }
-  \sort[pass=label]{
+  \sort{
     \field{labelalpha}
   }
   \sort[final]{
     \field{sortkey}
   }
-  \sort[pass=final]{
-    \field{labelalpha}
-  }
-  \sort[pass=final]{
-    \field[padside=left,padwidth=4,padchar=0]{extraalpha}
-  }
   \sort{
     \name{sortname}
     \name{author}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 94fe2dfdf73..61a6ae51e73 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: biblatex.sty,v 1.1b 2011/02/04 11:36:21 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.1a 2011/01/08 13:30:00 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.1b 2011/02/04 11:36:21 lehman stable $
  programmable bibliographies]
 
 \def\blx@bblversion$#1: #2 ${#2}
@@ -4428,9 +4428,11 @@
   \do{set}%
   \do{article}%
   \do{book}%
+  \do{books}%
   \do{bookinbook}%
   \do{booklet}%
   \do{collection}%
+  \do{collections}%
   \do{inbook}%
   \do{incollection}%
   \do{inproceedings}%
@@ -4521,6 +4523,7 @@
   \do{entrysetcount}%
   \do{related}%
   \do{relatedtype}%
+  \do{relatedstring}%
   \do{hyphenation}%
   \do{keywords}%
   \do{authortype}%
@@ -5658,14 +5661,14 @@
 
 \def\blx@key@type#1{%
   \ifcsundef{blx@type@\the\c@refsection @#1}
-    {\blx@warning{%
-       Entry type '#1' not found.\MessageBreak
-       Skipping this type filter}}
+    {\blx@warning{Type '#1' not found}%
+     \let\blx@tempa\@empty}
     {\blx@printbibchecks
      \iftoggle{blx@tempb}
        {\togglefalse{blx@tempb}%
         \blx@filter\blx@tempa{blx@type@\the\c@refsection @#1}}
-       {\blx@error
+       {\let\blx@tempa\@empty
+        \blx@error
           {'type' used multiple times}
           {When passing multiple filter options, each entry\MessageBreak
 	   must satisfy all conditions (AND conjunction),\MessageBreak
@@ -5686,14 +5689,14 @@
 
 \def\blx@key@subtype#1{%
   \ifcsundef{blx@subt@\the\c@refsection @#1}
-    {\blx@warning{%
-       Entry subtype '#1' not found.\MessageBreak
-       Skipping this subtype filter}}
+    {\blx@warning{Subtype '#1' not found}%
+     \let\blx@tempa\@empty}
     {\blx@printbibchecks
      \iftoggle{blx@tempb}
        {\togglefalse{blx@tempb}%
         \blx@filter\blx@tempa{blx@subt@\the\c@refsection @#1}}
-       {\blx@error
+       {\let\blx@tempa\@empty
+        \blx@error
           {'subtype' used multiple times}
           {When passing multiple filter options, each entry\MessageBreak
 	   must satisfy all conditions (AND conjunction),\MessageBreak
@@ -5714,9 +5717,8 @@
 
 \def\blx@key@keyword#1{%
   \ifcsundef{blx@keyw@\the\c@refsection @\detokenize{#1}}
-    {\blx@warning{%
-       Keyword '\detokenize{#1}' not found.\MessageBreak
-       Skipping this keyword filter}}
+    {\blx@warning{Keyword '\detokenize{#1}' not found}%
+     \let\blx@tempa\@empty}
     {\blx@printbibchecks
      \blx@filter\blx@tempa{blx@keyw@\the\c@refsection @\detokenize{#1}}}}
 
@@ -5733,12 +5735,11 @@
 \define@key{blx@los}{category}{\blx@key@category{#1}}
 
 \def\blx@key@category#1{%
-  \ifcsundef{blx@catg@#1}
-    {\blx@warning{%
-       Category '#1' not found.\MessageBreak
-       Skipping this category filter}}
+  \ifcsundef{blx@catg@\detokenize{#1}}
+    {\blx@warning{Category '\detokenize{#1}' not found}%
+     \let\blx@tempa\@empty}
     {\blx@printbibchecks
-     \blx@filter\blx@tempa{blx@catg@#1}}}
+     \blx@filter\blx@tempa{blx@catg@\detokenize{#1}}}}
 
 \define@key{blx@bib}{notcategory}{\blx@key@notcategory{#1}}
 \define@key{blx@los}{notcategory}{\blx@key@notcategory{#1}}
@@ -5756,9 +5757,11 @@
   \ifcsdef{blx@filter@#1}
     {\blx@printbibchecks
      \blx@bibfilter\blx@tempa{blx@filter@#1}}
-    {\blx@warning{%
-       Custom filter '#1' not found.\MessageBreak
-       Skipping this custom filter}}}
+    {\let\blx@tempa\@empty
+     \blx@error
+       {Filter '#1' not found}
+       {The filter '#1' could not be found.\MessageBreak
+        Use \string\defbibfilter\space to define it}}}
 
 \define@key{blx@bib}{check}{\blx@key@bibcheck{#1}}
 \define@key{blx@los}{check}{\blx@key@bibcheck{#1}}
@@ -5766,10 +5769,11 @@
 \def\blx@key@bibcheck#1{%
   \ifcsdef{blx@bibcheck@#1}
     {\letcs\blx@bibcheck{blx@bibcheck@#1}}
-    {\blx@error
-       {Hook '#1' undefined}
-       {The bibliography check '#1' is undefined.\MessageBreak
-        Use '\defbibcheck' to define it}}}
+    {\let\blx@tempa\@empty
+     \blx@error
+       {Check '#1' not found}
+       {The check '#1' could not be found.\MessageBreak
+        Use \string\defbibcheck\space to define it}}}
 
 \define@key{blx@bib}{maxnames}{\blx@key@maxnames{#1}}
 \define@key{blx@los}{maxnames}{\blx@key@maxnames{#1}}
@@ -5828,8 +5832,9 @@
 \def\blx@key@heading#1{%
   \ifcsundef{blx@head@#1}
      {\blx@error
-        {Heading '#1' undefined}
-        {Use \string\defbibheading\space to define it}}
+        {Heading '#1' not found}
+        {The heading '#1' could not be found.\MessageBreak
+	 Use \string\defbibheading\space to define it}}
      {\def\blx@theheading{#1}}}
 
 \define@key{blx@bib}{env}{\blx@key@env{#1}}
@@ -5841,8 +5846,9 @@
 \def\blx@key@env#1{%
   \ifcsundef{blx@env@#1}
      {\blx@error
-        {Environment '#1' undefined}
-        {Use \string\defbibenvironment\space to define it}}
+        {Environment '#1' not found}
+        {The environment '#1' could not be found.\MessageBreak
+	 Use \string\defbibenvironment\space to define it}}
      {\def\blx@theenv{#1}}}
 
 \define@key{blx@bhd}{title}{\long\def\blx@thetitle{#1}}
@@ -5857,8 +5863,9 @@
 \def\blx@key@prenote#1{%
   \ifcsundef{blx@note@#1}
      {\blx@error
-        {Note '#1' undefined}
-        {Use \string\defbibnote\space to define it}}
+        {Note '#1' not found}
+        {The note '#1' could not be found.\MessageBreak
+	 Use \string\defbibnote\space to define it}}
      {\def\blx@theprenote{#1}}}
 
 \define@key{blx@bib}{postnote}{\blx@key@postnote{#1}}
@@ -5870,8 +5877,9 @@
 \def\blx@key@postnote#1{%
   \ifcsundef{blx@note@#1}
      {\blx@error
-        {Note '#1' undefined}
-        {Use \string\defbibnote\space to define it}}
+        {Note '#1' not found}
+        {The note '#1' could not be found.\MessageBreak
+	 Use \string\defbibnote\space to define it}}
      {\def\blx@thepostnote{#1}}}
 
 \define@key{blx@bib}{resetnumbers}[true]{%
@@ -6536,8 +6544,8 @@
 
 \renewrobustcmd*{\bibliography}{%
   \@ifstar
-    {\blx@xsanitizeafter{\forcsvlist\blx@addbibfile}}
-    {\blx@xsanitizeafter{\forcsvlist\blx@extrabibfile}}}
+    {\blx@xsanitizeafter{\forcsvlist\blx@extrabibfile}}
+    {\blx@xsanitizeafter{\forcsvlist\blx@addbibfile}}}
 \@onlypreamble\bibliography
 
 \def\blx@addbibfile#1{%
@@ -8346,7 +8354,7 @@
     \blx@xml@file
     \blx@xml@comment{BIBER OPTIONS}%
     \blx@xml@options{biber}{global}{%
-      \blx@xml@svalue{bblencoding}{\blx@inputencoding}%
+      \blx@xml@svalue{bblencoding}{\blx@texencoding}%
       \blx@xml@svalue{bibencoding}{\blx@bibencoding}%
       \blx@xml@toggle{debug}%
       \blx@xml@svalue{mincrossrefs}{\blx@mincrossrefs}%
@@ -8429,10 +8437,6 @@
   \eappto\blx@tempa{%
     \blx@xml@sort{\blx@tempc}{\blx@tempb}}}
 
-\define@key{blx@sortdef@sort}{pass}{% final|label
-  \ifstrequal{#1}{label}
-    {\appto\blx@tempc{ pass="label"}}
-    {\appto\blx@tempc{ pass="final"}}}
 \define@key{blx@sortdef@sort}{direction}{% ascending|descending
   \ifstrequal{#1}{ascending}
     {\appto\blx@tempc{ sort_direction="ascending"}}
@@ -8619,11 +8623,19 @@
   \fi}
 \def\blx@minxrefs{2}
 
+\DeclareBibliographyOption{texencoding}{%
+  \ifstrequal{#1}{auto}
+    {\undef\blx@texencoding}
+    {\def\blx@texencoding{#1}}}
+
 \DeclareBibliographyOption{bibencoding}{%
-  \def\blx@bibencoding{#1}
-  \ifdefstring\blx@bibencoding{inputenc}
+  \ifstrequal{#1}{inputenc}
     {\def\blx@bibencoding{auto}}
-    {}}
+    {\def\blx@bibencoding{#1}}}
+
+\DeclareBibliographyOption{safeinputenc}[true]{%
+  \settoggle{blx@safeinputenc}{#1}}
+\newtoggle{blx@safeinputenc}
 
 \DeclareBibliographyOption{sorting}{%
   \def\blx@sorting{#1}}
@@ -9463,26 +9475,29 @@
 \abx@mapinpenc{x-ascii}{ascii}
 
 \def\blx@checkencoding{%
-  \ifundef\inputencodingname
-    {\ifundef\XeTeXrevision
-       {\ifundef\luatexversion
-	  {\def\blx@inputencoding{ascii}%
-	   \blx@info@noline{%
-	     No input encoding detected.\MessageBreak
-	     Assuming '\blx@inputencoding'}}
-	  {\def\blx@inputencoding{utf8}%
-	   \blx@info@noline{%
-             LuaTeX detected.\MessageBreak
-	     Assuming input encoding '\blx@inputencoding'}}}
-       {\def\blx@inputencoding{utf8}%
-        \blx@info@noline{%
-	  XeTeX detected.\MessageBreak
-	  Assuming input encoding '\blx@inputencoding'}}}
-    {\ifcsdef{blx@enc@\inputencodingname}
-       {\letcs\blx@inputencoding{blx@enc@\inputencodingname}}
-       {\let\blx@inputencoding\inputencodingname}%
-     \blx@info@noline{%
-       Input encoding '\blx@inputencoding' detected}}%
+  \ifdef\blx@texencoding
+    {\blx@info@noline{%
+       Input encoding '\blx@texencoding' specified}}
+    {\ifundef\inputencodingname
+       {\ifundef\XeTeXrevision
+	  {\ifundef\luatexversion
+	     {\def\blx@texencoding{ascii}%
+	      \blx@info@noline{%
+		No input encoding detected.\MessageBreak
+		Assuming '\blx@texencoding'}}
+	     {\def\blx@texencoding{utf8}%
+	      \blx@info@noline{%
+        	LuaTeX detected.\MessageBreak
+		Assuming input encoding '\blx@texencoding'}}}
+	  {\def\blx@texencoding{utf8}%
+           \blx@info@noline{%
+	     XeTeX detected.\MessageBreak
+	     Assuming input encoding '\blx@texencoding'}}}
+       {\ifcsdef{blx@enc@\inputencodingname}
+	  {\letcs\blx@texencoding{blx@enc@\inputencodingname}}
+	  {\let\blx@texencoding\inputencodingname}%
+	\blx@info@noline{%
+	  Input encoding '\blx@texencoding' detected}}}%
   \ifdef\blx@bibencoding
     {\ifdefstring\blx@bibencoding{ascii}
        {\blx@info@noline{%
@@ -9490,12 +9505,12 @@
 	  No need to reencode data}%
         \togglefalse{blx@reencode}}
        {\ifdefstring\blx@bibencoding{auto}
-	  {\let\blx@bibencoding\blx@inputencoding
+	  {\let\blx@bibencoding\blx@texencoding
 	   \blx@info@noline{%
 	     Automatic encoding selection.\MessageBreak
 	     Assuming data encoding '\blx@bibencoding'}
            \togglefalse{blx@reencode}}
-	  {\ifdefstrequal\blx@bibencoding\blx@inputencoding
+	  {\ifdefstrequal\blx@bibencoding\blx@texencoding
 	     {\blx@info@noline{%
 	        Data encoding '\blx@bibencoding' specified.\MessageBreak
 		No need to reencode data}%
@@ -9530,7 +9545,7 @@
        {\ifnumless\blx@backend\blx@backend@bibtexu
 	  {\blx@warning@noline{%
 	     Data encoding is '\blx@bibencoding'.\MessageBreak
-	     Use backend=bibtexu or backend=biber}}
+	     Use backend=biber}}
 	  {}}
        {\ifnumodd\blx@backend
 	  {\ifnumequal\blx@backend\blx@backend@bibtexe
@@ -9538,7 +9553,21 @@
 	     {}}
 	  {\blx@warning@noline{%
 	     Data encoding is '\blx@bibencoding'.\MessageBreak
-	     Use backend=bibtex8 or backend=biber}}}}}
+	     Use backend=bibtex8 or backend=biber}}}}%
+  \ifboolexpr{%
+    togl {blx@safeinputenc}
+    and test {\ifdefstring\blx@texencoding{utf8}}
+    and test {\ifnumequal\blx@backend\blx@backend@biber}
+    and ( test {\@ifpackageloaded{inputenc}}
+	  or
+	  test {\@ifpackageloaded{inputenx}} )
+  }
+    {\def\blx@texencoding{ascii}
+     \blx@info@noline{%
+	Input encoding '\blx@texencoding' forced by\MessageBreak
+	'safeinputenc' option}}
+    {}%
+}
 
 % Deferred last minute setup
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 730f0b65fd5..ae0ac1878f5 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: blx-compat.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 1.1a 2011/01/08 13:30:00 lehman stable $
+[\abx@rcsid $Id: blx-compat.def,v 1.1b 2011/02/04 11:36:21 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 49650f188cb..aab6355d14a 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: blx-mcite.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{blx-mcite.def}
-[\abx@rcsid $Id: blx-mcite.def,v 1.1a 2011/01/08 13:30:00 lehman stable $
+[\abx@rcsid $Id: blx-mcite.def,v 1.1b 2011/02/04 11:36:21 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 151d20a504f..25fd33f207f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: blx-natbib.def,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 1.1a 2011/01/08 13:30:00 lehman stable $
+[\abx@rcsid $Id: blx-natbib.def,v 1.1b 2011/02/04 11:36:21 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 91f40ffff3c..e828ca41d1b 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: alphabetic-verb.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.1b 2011/02/04 11:36:21 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 f368bb40b26..263618abd32 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: alphabetic.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: alphabetic.cbx,v 1.1b 2011/02/04 11:36:21 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 6af9f98f8ba..10ca49f5b8b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{sortcites,autocite=footnote}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 7fe026eaeca..2a173b1dea4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index 218a702e104..e864e227aa1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
 \providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index 61a4e825480..02c98fffd9b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-tcomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \RequireCitationStyle{authortitle-comp}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index 3a5a81c6f9b..812a76d1163 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-terse.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \RequireCitationStyle{authortitle}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 41b041b9533..1239e27e155 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle-ticomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \RequireCitationStyle{authortitle-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 7f4e602aaa6..e90764df2a3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authortitle.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authortitle.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{autocite=footnote}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index daa722759b5..b3b24b13b9d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 9a5b699832f..6f2002efa45 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index 5a1f57f32f1..dac6faba1cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
                             pagetracker,sortcites,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 3c6a39b58fd..2a1bed03929 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: authoryear.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: authoryear.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index cc5aa553a4b..46c72ef9cc4 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: debug.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: debug.cbx,v 1.1b 2011/02/04 11:36:21 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 f8a54a3b822..ae03d31f4a0 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: draft.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: draft.cbx,v 1.1b 2011/02/04 11:36:21 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 8da24bb1576..7054447a995 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric-comp.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 1.1b 2011/02/04 11:36:21 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 d959ee56736..e6962da496f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric-verb.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 1.1b 2011/02/04 11:36:21 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 160e4bb8bed..fd2a9830246 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: numeric.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: numeric.cbx,v 1.1b 2011/02/04 11:36:21 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 ae6d6850905..3728df7280d 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: reading.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: reading.cbx,v 1.1b 2011/02/04 11:36:21 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 786e15b02ce..6609b3a133f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
@@ -27,6 +27,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
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 7e5f2f64543..0889f9ac5a6 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-inote.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
@@ -28,6 +28,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
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 433bcf329fc..22ca40d306e 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-note.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-note.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \DeclareFieldFormat{bibhyperlink}{%
   \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
@@ -25,6 +25,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
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 8292e4da428..f5b8ff4bbd1 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad1.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:ibidpage}
@@ -23,6 +23,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
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 c7df02f7a5f..2560e6eab8b 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad2.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:fullcite}
@@ -28,6 +28,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
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 66194ac6518..1e3294e580b 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose-trad3.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \providecommand*{\mkibid}[1]{#1}
 \newtoggle{cbx:loccit}
@@ -18,6 +18,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index 168cdb3d4c0..7d4b246972f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: verbose.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@cbxid $Id: verbose.cbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
 \DeclareFieldFormat{bibhyperlink}{%
@@ -20,6 +20,10 @@
        {Invalid option 'citepages=#1'}
        {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
 
+\providebibmacro*{cite:citepages}{}
+\providebibmacro*{cite:full:citepages}{}
+\providebibmacro*{cite:postnote}{}
+
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
   \renewbibmacro*{cite:full:citepages}{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index 1dc29fde80d..e0cf675c351 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: UKenglish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: UKenglish.lbx,v 1.1b 2011/02/04 11:36:21 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 3183ebfc32e..209b76a9739 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: USenglish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: USenglish.lbx,v 1.1b 2011/02/04 11:36:21 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 5cdc3e841f3..34cbc06dce5 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: american.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: american.lbx,v 1.1b 2011/02/04 11:36:21 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 97d610573ed..71a6acc2be8 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: australian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: australian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index 9e35513cd6d..175c5f3b2db 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: austrian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: austrian.lbx,v 1.1b 2011/02/04 11:36:21 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 8550753fcfd..677f1e70c27 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: brazil.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: brazil.lbx,v 1.1b 2011/02/04 11:36:21 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 c9890a836fc..66735f0d1ea 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: brazilian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: brazilian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index f4ead59d5e1..592b26ee39f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: british.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: british.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index 7411268d672..529ba5d87ec 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: canadian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: canadian.lbx,v 1.1b 2011/02/04 11:36:21 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 f89aa9f2f6c..184513f558a 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: danish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: danish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 9c4affb1ad9..10ceceace0f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: dutch.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: dutch.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 63726b04023..b8fd1038546 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: english.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: english.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index a6635894505..46a4fb3c16f 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: finnish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: finnish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index e6802507ffd..4e8476fb7ec 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: french.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: french.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 2d59c09c1fa..6b3a6f75201 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: german.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: german.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 4a5276b12d2..bb558eaab13 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: greek.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: greek.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 910793ff56e..554a305c09e 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: italian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: italian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index 284c8b2625e..17070b797db 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: naustrian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: naustrian.lbx,v 1.1b 2011/02/04 11:36:21 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 4c721a0e9ef..3fa40b3e6d1 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: newzealand.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: newzealand.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index d60ea67cb70..c656baad06d 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: ngerman.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: ngerman.lbx,v 1.1b 2011/02/04 11:36:21 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 50972eec082..521723b11b4 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: norsk.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: norsk.lbx,v 1.1b 2011/02/04 11:36:21 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 170edb360af..bbfd21bf203 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: norwegian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: norwegian.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 3b06719adeb..6e0e878fd9e 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: nynorsk.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: nynorsk.lbx,v 1.1b 2011/02/04 11:36:21 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 3ae9726a653..318f878c8a5 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: portuges.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: portuges.lbx,v 1.1b 2011/02/04 11:36:21 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 18d454950de..4bab8031b8d 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: portuguese.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: portuguese.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index dd4be5cb2ed..65f50533d22 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: spanish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: spanish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index f515a09ce05..2c89ed2915e 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.1a 2011/01/08 13:30:00 lehman stable $
+% $Id: swedish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $
 
 \ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 1.1a 2011/01/08 13:30:00 lehman stable $]
+[\abx@lbxid $Id: swedish.lbx,v 1.1b 2011/02/04 11:36:21 lehman stable $]
 
 % Status:
 % - Incomplete