biblatex 2.5 (10jan13)

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

3 files changed, 46 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index 6dd58f4bd92..e6558181d28 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,6 +1,12 @@
+RELEASE NOTES FOR VERSION 2.5
+
+*  Biber version 1.5 is required for biblatex 2.5
+
+* New  sourcemap step "entrynull" can be used to completely skip an entry.
+
 RELEASE NOTES FOR VERSION 2.4
 
-*  Biber version 1.4 is required for biblatex 2.4
+* Biber version 1.4 is required for biblatex 2.4
 
 * New macro \DeclareStyleSourcemap for style authors who want to define source mappings which
   are not changed by users using \DeclareSourcemap. Style maps so defined are run after user
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 81d6f6f4f09..74664694af3 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 e30fecbbfd7..0f68a5cd523 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -42,8 +42,8 @@
   url={\biblatexhome},
   author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)},
   email={},
-  revision={2.4},
-  date={2012-11-28}}
+  revision={2.5},
+  date={10/01/2013}}
 
 \hypersetup{%
   pdftitle={The \biblatex Package},
@@ -315,6 +315,7 @@ compatibility matrix for the recent versions.
 \toprule
 Biber version & \biblatex\ version\\
 \midrule
+1.5 & 2.5\\
 1.4 & 2.4\\
 1.3 & 2.3\\
 1.2 & 2.1, 2.2\\
@@ -2315,7 +2316,7 @@ See \secref{use:use:epr} for details on support for arXiv and electronic publish
 
 \optitem[auto]{texencoding}{\opt{auto}, \prm{encoding}}
 
-Specifies the encoding of the \file{tex} file. This option affects the data transferred from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available:
+Specifies the encoding of the \file{tex} file. This option affects the data transferred from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--output_encoding| option. The following choices are available:
 
 \begin{valuelist}
 
@@ -2329,7 +2330,7 @@ Note that setting \kvopt{texencoding}{\prm{encoding}} will also affect the \opt{
 
 \optitem[auto]{bibencoding}{\opt{auto}, \prm{encoding}}
 
-Specifies the encoding of the \file{bib} files. When using \biber, this corresponds to \biber's |--bibencoding| option. The following choices are available:
+Specifies the encoding of the \file{bib} files. When using \biber, this corresponds to \biber's |--output_encoding| option. The following choices are available:
 
 \begin{valuelist}
 
@@ -5857,7 +5858,15 @@ The related entry feature is enabled by default by the package option \opt{relat
 \subsubsection{Dynamic Modification of Data}
 \label{aut:ctm:map}
 
-Bibliographic data sources which are automatically generated or which you have no control over can be a problem if you need to edit them in some way. For this reason, \biber has ability to modify data as it is read so that you can apply modifications to the source data stream without actually changing it. The modification can be defined in \biber's config file (see \biber docs), or via \sty{biblatex} macros in which case you can apply the modification only for specific documents. 
+Bibliographic data sources which are automatically generated or which you have no control over can be a problem if you need to edit them in some way. For this reason, \biber has the ability to modify data as it is read so that you can apply modifications to the source data stream without actually changing it. The modification can be defined in \biber's config file (see \biber docs), or via \sty{biblatex} macros in which case you can apply the modification only for specific documents, styles or globally.
+
+Source mappings can be defined at different «levels» which are applied
+in a defined order. See the \biblatex\ manual regarding these macros:\\[2ex]
+
+\noindent \texttt{user}-level maps defined with \cmd{DeclareSourcemap}$\rightarrow$\\
+\hspace*{1em}\texttt{user}-level maps defined in the \biber config file (see \biber docs)$\rightarrow$\\
+\hspace*{2em}\texttt{style}-level maps defined with \cmd{DeclareStyleSourcemap}$\rightarrow$\\
+\hspace*{3em}\texttt{driver}-level maps defined with \cmd{DeclareDriverSourcemap}\\[2ex]
 
 \begin{ltxsyntax}
 
@@ -5942,6 +5951,11 @@ For all boolean \cmd{step} options, the short form \opt{option} is equivalent to
 \renewcommand{\labelitemii}{$\circ$}
 
 \begin{itemize}
+\item If \texttt{entrynull} is set, processing of the \cmd{map}
+  immediately terminates and the current entry is not created. It is
+  as if it did not exist in the datasource. Obviously, you should
+  select the entries which you want to apply this to using prior
+  mapping steps.
 \item Change the \texttt{typesource} \prm{entrytype} to the
   \texttt{typetarget} \prm{entrytype}, if defined. If
   \texttt{final} is \texttt{true} then if the \prm{entrytype} of the entry is not \texttt{typesource}, processing of the parent \cmd{map} immediately terminates.
@@ -6109,7 +6123,7 @@ field to <pubmedid> and also sets the \bibfield{userd} field to the string
 }
 \end{lstlisting}
 %$<- to stop emacs highlighting breaking
-Here, the contents of the \bibfield{series} field have leading numbers stripped and the remainder of the contents lowercased. Since regular expressions usually contain all sort of special characters, it is best to enclose them in the provided \cmd{regexp} macro as shown---this will pass the expression through to \biber correctly.
+Here, the contents of the \bibfield{series} field have leading numbers stripped and the remainder of the contents lowercased. Since regular expressions usually contain all sort of special characters, it is best to enclose them in the provided \cmd{regexp} macro as shown---this will pass the expression through to \biber\ correctly.
 %
 \begin{lstlisting}[style=latex]{}
 \DeclareSourcemap{
@@ -6249,6 +6263,19 @@ This example demonstrates the sequential nature of the step processing and the \
 %
 This example assumes you have created a field called \bibfield{autourl} using the datamodel macros from \secref{aut:ctm:dm} in order to hold, for example, a Google Scholar query URL auto-created from elements of the entry. The example progressively extracts information from the entry, constructing the URL as it goes. It demonstrates that it is possible to refer to parenthetical matches from the most recent \texttt{match} in any following \texttt{fieldvalue} which allows extracting the lastname from the \bibfield{author}, assuming a <last, first> format. The resulting field could then be used as a hyperlink from, for example, the title of the work in the bibliography.
 %
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \step[fieldsource=<<title>>, match={A Title}, final]
+      \step[entrynull]
+    }
+  }
+}
+\end{lstlisting}
+%
+Any entry with a \bibfield{title} field matching <A Title> will be completely ignored.
+%
 \subsubsection{Data Model Specification}
 \label{aut:ctm:dm}
 
@@ -10775,6 +10802,12 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.5}{2013-01-10}
+\item Made \texttt{url} work as a localisation string, defaulting to previously hard-coded value <\textsc{URL}>.
+\item Changed some \biber\ option names to cohere with \biber\ 1.5.
+\item New sourcemap step for conditionally removing entire entries\see{aut:ctm:map}\BiberOnlyMark
+\end{release}
+
 \begin{release}{2.4}{2012-11-28}
 \item Added \bibfield{relatedoptions} field\see{aut:ctm:rel}\BiberOnlyMark
 \item Added \cmd{DeclareStyleSourcemap}\see{aut:ctm:map}\BiberOnlyMark