summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib6
-rw-r--r--Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/README4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/RELEASE16
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.pdfbin1392583 -> 1396472 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.tex151
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.pdf (renamed from Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf)bin182797 -> 182797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.tex (renamed from Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.pdf (renamed from Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf)bin184600 -> 184600 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex (renamed from Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.pdfbin0 -> 88891 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex87
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx30
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty9
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex1.sty47
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex2.sty327
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-dm.def29
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx400
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx1
37 files changed, 1013 insertions, 197 deletions
diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
index b86e9bf01f6..994b91995db 100644
--- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
@@ -594,7 +594,7 @@
sorttitle = {Computers & Typesetting A},
indexsorttitle = {The TeXbook},
author = {Knuth, Donald E.},
- indextitle = {\TeX book, The},
+ indextitle = {\protect\TeX book, The},
title = {The \TeX book},
shorttitle = {\TeX book},
maintitle = {Computers \& Typesetting},
@@ -605,7 +605,9 @@
annotation = {The first volume of a five-volume book. Note the
\texttt{sorttitle} and \texttt{sortyear} fields. We want this volume to
be listed after the entry referring to the entire five-volume set. Also
- note the \texttt{indextitle} and \texttt{indexsorttitle} fields}
+ note the \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
+ packages that don't generate robust index entries require some control
+ sequences to be protected from expansion}
}
@book{knuth:ct:b,
hyphenation = {american},
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index cff4f4d0493..4e67edf8f78 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -173,7 +173,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 2.2 $"
+ "$Revision: 2.3 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
diff --git a/Master/texmf-dist/doc/latex/biblatex/README b/Master/texmf-dist/doc/latex/biblatex/README
index 09e2ccfdad0..88e856e9cfa 100644
--- a/Master/texmf-dist/doc/latex/biblatex/README
+++ b/Master/texmf-dist/doc/latex/biblatex/README
@@ -30,8 +30,8 @@ the babel package.
LICENSE
-Copyright (c) 2006-2012 Philipp Lehman, 2012-present Philip Lehman, Joseph Wright,
-Audrey Boruvka, Philip Kime). Permission is granted to copy,
+Copyright (c) 2006-2012 Philipp Lehman, 2012-present Philip Lehman,
+Joseph Wright, Audrey Boruvka, Philip Kime). Permission is granted to copy,
distribute and/or modify this software under the terms of the LaTeX
Project Public License (LPPL), version 1.3. This software is provided
'as is', without warranty of any kind, either expressed or implied,
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index df60bd3b9c4..f52473f346b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,8 +1,22 @@
+RELEASE NOTES FOR VERSION 2.3
+
+* Biber version 1.3 is required for biblatex 2.3
+
+* New "append" mode for \DeclareSourcemap so that fields can be combined
+
+* Detection of some situations which requires biber or latex reruns.
+ Specifically, when sorting schemes are added or removed, when citations are added
+ or removed, when sorting=none and citation order changes and the interactions of
+ these situations when defernumbers=true. Biblatex should now report that a re-run is
+ required in such situations.
+
+* Bugfixes
+
RELEASE NOTES FOR VERSION 2.2
* Biber version 1.2 is required for biblatex 2.2
-* Bugfix release
+* Bugfixes
RELEASE NOTES FOR VERSION 2.1
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 164b011ce53..09a4396084a 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index ff0e91b9fe9..2837a13be10 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.2},
- date={08/2012}}
+ revision={2.3},
+ date={11/2012}}
\hypersetup{%
pdftitle={The \biblatex Package},
@@ -315,6 +315,7 @@ compatibility matrix for the recent versions.
\toprule
Biber version & \biblatex\ version\\
\midrule
+1.3 & 2.3\\
1.2 & 2.1, 2.2\\
1.1 & 2.1\\
1.0 & 2.0\\
@@ -664,7 +665,9 @@ In datasources such as a \file{bib} file, all bibliographic data is specified in
\item[Date fields] hold a date specification in \texttt{yyyy-mm-dd} format or a date range in \texttt{yyyy-mm-dd/yyyy-mm-dd} format. Date fields are special in that the date is parsed and split up into its components. See \secref{bib:use:dat} for details. A typical example is the \bibfield{date} field.
-\item[Verbatim fields] are processed in verbatim mode and may contain special characters. Typical examples of verbatim fields are \bibfield{url} and \bibfield{doi}.
+\item[Verbatim fields] are processed in verbatim mode and may contain special characters. Typical examples of verbatim fields are \bibfield{file and }\bibfield{doi}.
+
+\item[URI fields] are processed in verbatim mode and may contain special characters. They are also URL-escaped if they don't look like they already are. The typical example of a uri field is \bibfield{url}.
\item[Comma"=separated value fields] A comma"=separated list of literal values. Examples are the \bibfield{keywords} and \bibfield{options} fields.
@@ -1032,9 +1035,9 @@ The translator(s) of the \bibfield{title} or \bibfield{booktitle}, depending on
The type of a \bibfield{manual}, \bibfield{patent}, \bibfield{report}, or \bibfield{thesis}. This field may also be useful for the custom types listed in \secref{bib:typ:ctm}.
-\fielditem{url}{verbatim}
+\fielditem{url}{uri}
-The \acr{URL} of an online publication.
+The \acr{URL} of an online publication. If it is not URL-escaped (no <\%> chars), with \biber, it will be URI-escaped according to RFC 3987, that is, even Unicode chars will be correctly escaped.
\fielditem{urldate}{date}
@@ -2264,7 +2267,7 @@ This option controls whether \texttt{long} and \texttt{comp} dates are printed w
\boolitem[false]{defernumbers}
-In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation.
+In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation. This option requires two \latex runs after the data has been exported to the \file{bbl} file by the backend. See \secref{aut:int}.
\boolitem[false]{punctfont}
@@ -2930,7 +2933,7 @@ Since the \prm{resource} string is read in a verbatim-like mode, it may contain
\valitem{label}{identifier}
-Assigns a label to a resource. The \prm{identifier} may be used in place of the full resource name in the optional argument of \env{refsection} (see \ref{use:bib:sec}).
+Assigns a label to a resource. The \prm{identifier} may be used in place of the full resource name in the optional argument of \env{refsection} (see \secref{use:bib:sec}).
\valitem[local]{location}{location}
@@ -2964,7 +2967,7 @@ This command differs from \cmd{addbibresource} in that the \prm{resource} is add
\cmditem{addsectionbib}[options]{resource}
-This command differs from \cmd{addbibresource} in that the resource \prm{options} are registered but the \prm{resource} not added to any resource list. This is only required for resources which 1) are given exclusively in the optional argument of \env{refsection} (\ref{use:bib:sec}) and 2) require options different from the default settings. In this case, \cmd{addsectionbib} is employed to qualify the \prm{resource} prior to using it by setting the appropriate \prm{options} in the preamble. The \opt{label} option may be useful to assign a short name to the resource.
+This command differs from \cmd{addbibresource} in that the resource \prm{options} are registered but the \prm{resource} not added to any resource list. This is only required for resources which 1) are given exclusively in the optional argument of \env{refsection} (\secref{use:bib:sec}) and 2) require options different from the default settings. In this case, \cmd{addsectionbib} is employed to qualify the \prm{resource} prior to using it by setting the appropriate \prm{options} in the preamble. The \opt{label} option may be useful to assign a short name to the resource.
\cmditem{bibliography}{bibfile, \dots}|\DeprecatedMark|
@@ -3386,7 +3389,7 @@ The following additional citation commands are only provided by some of the cita
\cmditem{textcite}[prenote][postnote]{key}
\cmditem{Textcite}[prenote][postnote]{key}
-These citation commands are provided by all non-verbose styles which ship with this package. They are intended for use in the flow of text, replacing the subject of a sentence. They print the authors or editors followed by a citation label which is enclosed in parentheses. Depending on the citation style, the label may be a number, the year of publication, an abridged version of the title, or something else. The numeric and alphabetic styles use square brackets instead of parentheses. \cmd{Textcite} is similar to \cmd{textcite} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix.
+These citation commands are provided by all styles that ship with this package. They are intended for use in the flow of text, replacing the subject of a sentence. They print the authors or editors followed by a citation label which is enclosed in parentheses. Depending on the citation style, the label may be a number, the year of publication, an abridged version of the title, or something else. The numeric and alphabetic styles use square brackets instead of parentheses. \cmd{Textcite} is similar to \cmd{textcite} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix.
\cmditem{smartcite}[prenote][postnote]{key}
\cmditem{Smartcite}[prenote][postnote]{key}
@@ -4298,7 +4301,7 @@ With traditional \bibtex, the \cmd{bibliography} command serves two purposes. It
\end{enumerate}
-Whenever a reference to a work which has not been cited before is added, this procedure must be repeated. This is also the case if the last reference to a work which has been cited before is removed because some citation labels may change in this case. In contrast to traditional \bibtex, there is normally no need to run \bin{latex} twice after running the backend as far as the handling of bibliographic data is concerned.\footnote{That is, unless the \opt{defernumbers} package option is enabled. This option requires two \latex runs after the data has been exported to the \file{bbl} file by \bibtex.}
+Whenever a reference to a work which has not been cited before is added, this procedure must be repeated. This is also the case if the last reference to a work which has been cited before is removed because some citation labels may change in this case. In contrast to traditional \bibtex, there is normally no need to run \bin{latex} twice after running the backend as far as the handling of bibliographic data is concerned.\footnote{That is, unless the \opt{defernumbers} package option is enabled. See \secref{aut:int}}
\BibTeXOnlyMark Note that when using \bibtex as the backend this only applies to the most basic case. Using the \bibfield{xref} field or the \bibfield{entryset} field may require an additional \latex/\bibtex/\latex cycle. Some other facilities provided by \sty{biblatex} may also require an additional \bin{latex} run to get certain references and the page tracking right. In this case, the usual warning messages such as There were undefined references and Label(s) may have changed. Rerun to get cross-references right will be printed.
@@ -5793,7 +5796,7 @@ The special fields are \bibfield{related}, \bibfield{relatedtype} and \bibfield{
\item[relatedstring] If an entry contains this field, then if value of the field resolves to a localization string identifier, the localization key value specified is printed before data from the related entries. If the field does not specify a localization key, its value is printed literally. If both \bibfield{relatedtype} and \bibfield{relatedstring} are present in an entry, \bibfield{relatedstring} is used for the pre-data string (but \bibfield{relatedtype} is still used to determine the macro and format to use when printing the data).
\end{keymarglist}
-The related entry feature is enabled by default by the package option \opt{related} from \secref{use:opt:pre:gen}. The related information entry data from the related entries is included via a \cmd{usebibmacro\{related\}} call. Standard styles call this macro towards the end of each driver. Style authors should ensure the existence of (or take note of existing) localization strings which are useful as values for the \bibfield{relatedtype} field, such as \texttt{translationof} or perhaps \texttt{translatedas}. They can then define macros and/or formats with the name \texttt{related:\prm{relatedtype}} which will be used to format the data. The file \path{biblatex.def} contains macros and formats for some common relation types which can be used as templates. In particular, the \cmd{entrydata*} command is essential in such macros in order to make the data of the related entries available. Examples of entries using this feature can be found in the \sty{biblatex} distribution examples file \path{biblatex-examples.bib}. There are some specific formatting macros for this feature which control delimiters and separators in related entry information, see \secref{aut:fmt:fmt}.
+The related entry feature is enabled by default by the package option \opt{related} from \secref{use:opt:pre:gen}. The related information entry data from the related entries is included via a \cmd{usebibmacro\{related\}} call. Standard styles call this macro towards the end of each driver. Style authors should ensure the existence of (or take note of existing) localization strings which are useful as values for the \bibfield{relatedtype} field, such as \texttt{translationof} or perhaps \texttt{translatedas}. A plural variant can be identified with the localization key \prm{relatedtype}\texttt{s}. This key's corresponding string is printed whenever more than one entry is specified in \bibfield{related}. Bibliography macros and formatting directives for printing entries related by \prm{relatedtype} should be defined using the name \texttt{related:\prm{relatedtype}}. The file \path{biblatex.def} contains macros and formats for some common relation types which can be used as templates. In particular, the \cmd{entrydata*} command is essential in such macros in order to make the data of the related entries available. Examples of entries using this feature can be found in the \sty{biblatex} distribution examples file \path{biblatex-examples.bib}. There are some specific formatting macros for this feature which control delimiters and separators in related entry information, see \secref{aut:fmt:fmt}.
\subsubsection{Dynamic Modification of Data}
\label{aut:ctm:map}
@@ -5819,7 +5822,7 @@ Defines source data modification (mapping) rules which can be used to perform an
entrytype
\end{itemize}
-The \prm{specification} is an undelimited list of \cmd{maps} directives which specify containers for mappings rules applying to a particular data source type (\ref{use:bib:res}). Spaces, tabs, and line endings may be used freely to visually arrange the \prm{specification}. Blank lines are not permissible. This command may only be used in the preamble.
+The \prm{specification} is an undelimited list of \cmd{maps} directives which specify containers for mappings rules applying to a particular data source type (\secref{use:bib:res}). Spaces, tabs, and line endings may be used freely to visually arrange the \prm{specification}. Blank lines are not permissible. This command may only be used in the preamble.
\cmditem{maps}{elements}
@@ -5829,7 +5832,7 @@ Contains an ordered set of \cmd{map} elements each of which is a logically relat
\choitem{datatype}{bibtex, biblatexml, ris, zoterordfxml, endnotexml}
-Data source type which the contained \cmd{map} directives apply to (\ref{use:bib:res}).
+Data source type to which the contained \cmd{map} directives apply (\secref{use:bib:res}).
\boolitem[false]{overwrite}
@@ -5871,6 +5874,7 @@ A mapping step. Each step is applied sequentially to every relevant entry where
\valitem{replace}{regexp}
\valitem{fieldset}{entryfield}
\valitem{fieldvalue}{string}
+\boolitem[false]{append}
\boolitem[false]{final}
\boolitem[false]{null}
\boolitem[false]{origfield}
@@ -5890,9 +5894,16 @@ For all boolean \cmd{step} options, the short form \opt{option} is equivalent to
\texttt{final} is \texttt{true} then if there is no \texttt{fieldsource} \prm{entryfield} in the entry, processing of the parent \cmd{map} immediately terminates.
\item If \texttt{match} is defined but
\texttt{replace} is not, only apply the step if the \texttt{fieldsource} \prm{entryfield} matches the
- \texttt{match} regular expression\footnote{Regular expressions are full Perl 5.14 regular expressions. This means you may need to deal with special characters, see examples.}
+ \texttt{match} regular expression\footnote{Regular expressions are full Perl 5.14 regular expressions. This means you may need to deal with special characters, see examples.}. You may use capture parenthesis as usual and refer to these (\$1\ldots\$9) in later \texttt{fieldvalue} specifications. This allows you to pull out parts of some fields and put these parts in other fields.
\item Perform a regular expression match and replace on the value of the \texttt{fieldsource} \prm{entryfield} if \texttt{match} and \texttt{replace} are defined.
-\item If \texttt{fieldset} is defined, then one and only one of the following other options is then mandatory:
+\item If \texttt{fieldset} is defined, then its value is \prm{entryfield}
+ which will be set to a value specified by further options. If
+ \texttt{overwrite} is false for this step and the field to set already
+ exists then the map step is ignored. If \texttt{final} is also true for
+ this step, then processing of the parent map stops at this point. If
+ \texttt{append} is true, then the value to set is appended to the current
+ value of \prm{entryfield}. The value to set is specified by a mandatory
+ one and only one of the following options:
\begin{itemize}
\item\ \texttt{fieldvalue} --- The \texttt{fieldset} \prm{entryfield} is set to the \texttt{fieldvalue} \prm{string}
\item\ \texttt{null} --- The \texttt{fieldset} \prm{entryfield} is ignored, as if it did not exist in the datasource
@@ -5910,7 +5921,7 @@ For all boolean \cmd{step} options, the short form \opt{option} is equivalent to
\cmditem{DeclareDefaultSourcemap}[datatype=driver]{specification}|\BiberOnlyMark|
-This command sets the driver default source mappings for the specified \prm{driver}. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and consist of mappings which are part of the driver setup. Users should not normally need to change these. User mappings defined with \cmd{DeclareSourcemap} are applied before the driver defaults. These defaults are described in Appendix \ref{apx:maps}. The \prm{specification} is identical to that for \cmd{DeclareSourcemap} but without the \cmd{maps} elements: the \prm{specification} is just a list of \cmd{map} elements since each \cmd{DeclareDefaultSourcemap} only applies to one datatype driver. See the default definitions in Appendix \ref{apx:maps} for examples.
+This command sets the driver default source mappings for the specified \prm{driver}. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and consist of mappings which are part of the driver setup. Users should not normally need to change these. User mappings defined with \cmd{DeclareSourcemap} are applied before the driver defaults. These defaults are described in Appendix \secref{apx:maps}. The \prm{specification} is identical to that for \cmd{DeclareSourcemap} but without the \cmd{maps} elements: the \prm{specification} is just a list of \cmd{map} elements since each \cmd{DeclareDefaultSourcemap} only applies to one datatype driver. See the default definitions in Appendix \secref{apx:maps} for examples.
\end{ltxsyntax}
@@ -6061,6 +6072,23 @@ If an entry has a \bibfield{lista} field which matches regular expression <regex
\begin{lstlisting}[style=latex]{}
\DeclareSourcemap{
\maps[datatype=bibtex]{
+ \map[overwrite=false]{
+ \step[fieldsource=<<author>>]
+ \step[fieldset=<<editor>>, origfieldval, final]
+ \step[fieldsource=<<editor>>, match=\regexp{<<\A(.+?)\s+and.*>>}, replace={<<$1>>}]
+ }
+ }
+}
+\end{lstlisting}
+%$<- to stop emacs highlighting breaking
+For any entry with an \bibfield{author} field, try to set
+\bibfield{sortname} to the same as \bibfield{author}. If this fails because
+\bibfield{sortname} already exists, stop, otherwise truncate
+\bibfield{sortname} to just the first name in the name list.
+%
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+ \maps[datatype=bibtex]{
\map{
\step[fieldsource=<<author>>,
match={<<Smith, Bill>>},
@@ -6111,7 +6139,46 @@ Here, we have used the hexadecimal escape sequence <|\x20|> in place of literal
\end{lstlisting}
%
Only applies to entries with an \bibfield{author} field matching <Doe,>. First the \bibfield{author} field is copied to both the \bibfield{shortauthor} and \bibfield{sortname} fields, overwriting them if they already exist. Then, these two new fields are modified to canonicalise a particular name, which presumably has some variants in the data source.
-
+%
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite]{
+ \step[fieldsource=<<verba>>, final]
+ \step[fieldset=<<verbb>>, fieldvalue=<</>>, append]
+ \step[fieldset=<<verbb>>, origfieldval, append]
+ \step[fieldsource=<<verbb>>, final]
+ \step[fieldset=<<verbc>>, fieldvalue=<</>>, append]
+ \step[fieldset=<<verbc>>, origfieldval, append]
+ }
+ }
+}
+\end{lstlisting}
+%
+This example demonstrates the sequential nature of the step processing and the \opt{append} option. If an entry has a \bibfield{verba} field then first, a forward slash is appended to the \bibfield{verbb} field. Then, the contents of \bibfield{verba} are appended to the \bibfield{verbb} field. A slash is then appended to the \bibfield{verbc} field and the contents of \bibfield{verbb} are appended to the \bibfield{verbc} field.
+%
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite]{
+ \step[fieldset=<<autourl>>, fieldvalue={<<http://scholar.google.com/scholar?q=">>}]
+ \step[fieldsource=<<title>>]
+ \step[fieldset=<<autourl>>, origfieldval, append]
+ \step[fieldset=<<autourl>>, fieldvalue={<<"+author:>>}, append]
+ \step[fieldsource=<<author>>, match=\regexp{<<\A([^,]+)\s*,>>}]
+ \step[fieldset=<<autourl>>, fieldvalue={<<$1>>}, append]
+ \step[fieldset=<autourl>>, fieldvalue={<<&as_ylo=>>}, append]
+ \step[fieldsource=<<year>>]
+ \step[fieldset=<<autourl>>, origfieldval, append]
+ \step[fieldset=<<autourl>>, fieldvalue={<<&as_yhi=>>}, append]
+ \step[fieldset=<<autourl>>, origfieldval, append]
+ }
+ }
+}
+\end{lstlisting}%$ <- keep AucTeX highlighting happy
+%
+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.
+%
\subsubsection{Data Model Specification}
\label{aut:ctm:dm}
@@ -6147,10 +6214,18 @@ Alternatively, the name of the data model file can be different from any of the
\begin{ltxsyntax}
-\cmditem{DeclareDatamodelEntrytypes}{entrytypes}|\BiberOnlyMark|
+\cmditem{DeclareDatamodelEntrytypes}[options]{entrytypes}|\BiberOnlyMark|
Declares the comma"=separated list of \prm{entrytypes} to be valid entrytypes in the data model. This command may only be used in a data model configuration file.
+\begin{optionlist*}
+
+\boolitem[false]{skipout}
+
+This entrytype is not output to the \file{.bbl}. Typically used for special entrytypes which are processed and consumed by the backend such as \bibtype{xdata}.
+
+\end{optionlist*}
+
\cmditem{DeclareDatamodelFields}[options]{fields}|\BiberOnlyMark|
Declares the comma"=separated list of \prm{fields} to be valid fields in the data model with associated comma"=separated \prm{options}. This command may only be used in a data model configuration file. Valid \prm{options} are:
@@ -6994,6 +7069,14 @@ Expands to the unformatted \prm{field}. If the \prm{field} is undefined, this co
Similar to \cmd{thefield}, except that the field is automatically sanitized such that its value may safely be used in the formation of a control sequence name.
+\cmditem{csfield}{field}
+
+Similar to \cmd{thefield}, but prevents expansion.
+
+\cmditem{usefield}{command}{field}
+
+Executes \prm{command} using the unformatted \prm{field} as its argument.
+
\cmditem{thelist}{literal list}
Expands to the unformatted \prm{literal list}. If the list is undefined, this command expands to an empty string. Note that this command will dump the \prm{literal list} in the internal format used by this package. This format is not suitable for printing.
@@ -7403,8 +7486,10 @@ Similar to \cmd{newbibmacro} but redefines \prm{name}. In contrast to \cmd{renew
Similar to \cmd{newbibmacro} but only defines \prm{name} if it is undefined. This command is similar in concept to \cmd{providecommand}.
\cmditem{usebibmacro}{name}
+\cmditem*{usebibmacro*}{name}
-Executes the macro \prm{name}, as defined with \cmd{newbibmacro}. If the macro takes any arguments, they are simply appended after \prm{name}. \cmd{usebibmacro} is robust.
+This command executes the macro \prm{name}, as defined with \cmd{newbibmacro}. If the macro takes any arguments, they are simply appended after \prm{name}. The regular variant of this command sanitizes
+\prm{name} while the starred variant does not.
\cmditem{savecommand}{command}
\cmditem{restorecommand}{command}
@@ -7431,6 +7516,17 @@ These commands save and restore the formatting directive \prm{format}, as define
These commands save and restore the formatting directive \prm{format}, as defined with \cmd{DeclareNameFormat}. Both commands work within a local scope. They are mainly provided for use in localization files.
+\cmditem{ifbibmacroundef}{name}{true}{false}
+
+Expands to \prm{true} if the bibliography macro \prm{name} is undefined, and to \prm{false} otherwise.
+
+\cmditem{iffieldformatundef}[entry type]{name}{true}{false}
+\cmditem{iflistformatundef}[entry type]{name}{true}{false}
+\cmditem{ifnameformatundef}[entry type]{name}{true}{false}
+
+Expands to \prm{true} if the formatting directive \prm{format} is undefined, and to \prm{false}
+otherwise.
+
\cmditem{usedriver}{code}{entrytype}
Executes the bibliography driver for an \prm{entrytype}. Calling this command in the \prm{loopcode} of a citation command defined with \cmd{DeclareCiteCommand} is a simple way to print full citations similar to a bibliography entry. Commands such as \cmd{newblock}, which are not applicable in a citation, are disabled automatically. Additional initialization commands may be passed as the \prm{code} argument. This argument is executed inside the group in which \cmd{usedriver} runs the respective driver. Note that it is mandatory in terms of the syntax but may be left empty. Also note that this command will automatically switch languages if the \opt{babel} package option is enabled.
@@ -8421,6 +8517,7 @@ Roles which are related to supplementary material may also be expressed as objec
\item[submitted] The expression <submitted> (the manuscript has been submitted to a journal or conference).
\item[forthcoming] The expression <forthcoming> (the manuscript has been accepted by a press or journal).
\item[inpress] The expression <in press> (the manuscript is fully copyedited and out of the author's hands; it is in the final stages of the production process).
+\item[prepublished] The expression <pre-published> (the manuscript is published in a preliminary form or location, such as online version in advance of print publication).
\end{keymarglist}
\paragraph{Pagination}
@@ -9825,7 +9922,7 @@ In order to minimize the risk of name clashes, \latex packages typically prefix
These are the driver default source mappings. For drivers other than \opt{bibtex} and \opt{ris}, they are highly experimental and subject to change (because the driver datatype itself is unstable or not well suited to bibliographic data).
\subsection{\opt{bibtex}}
-The \opt{bibtex} driver is of course the most comprehensive and mature of the \biblatex/\biber supported data formats. These source mapping defaults are how the aliases from sections \ref{bib:typ:als} and \ref{bib:fld:als} are implemented.
+The \opt{bibtex} driver is of course the most comprehensive and mature of the \biblatex/\biber supported data formats. These source mapping defaults are how the aliases from sections \secref{bib:typ:als} and \secref{bib:fld:als} are implemented.
\begin{lstlisting}[style=latex]{}
\DeclareDefaultSourcemap[datatype=bibtex]{
@@ -10497,7 +10594,19 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{changelog}
-\begin{release}{2.2}{2012}
+\begin{release}{2.3}{2012-11-01}
+\item Better detection of situations which require a \biber\ or \LaTeX\ re-run
+\item New append mode for \cmd{DeclareSourcemap} so that fields can be combined\see{aut:ctm:map}\BiberOnlyMark
+\item Extended auxiliary indexing macros
+\item Added support for plural localization strings with \bibfield{relatedtype}\see{aut:ctm:rel}\BiberOnlyMark
+\item Added \cmd{csfield} and \cmd{usefield}\see{aut:aux:dat}
+\item Added starred variant of \cmd{usebibmacro}\see{aut:aux:msc}
+\item Added \cmd{ifbibmacroundef}, \cmd{iffieldformatundef}, \cmd{iflistformatundef}
+ and \cmd{ifnameformatundef}\see{aut:aux:msc}
+\item Misc bug fixes
+\end{release}
+
+\begin{release}{2.2}{2012-08-17}
\item Misc bug fixes
\item Added \cmd{revsdnamepunct}\see{use:fmt:fmt}
\item Added \cmd{ifterseinits}\see{aut:aux:tst}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.pdf
index fa30d6b1a1b..fa30d6b1a1b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.tex
index d905168b33e..d905168b33e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.pdf
index 940b0590293..940b0590293 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex
index fef863a4516..fef863a4516 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.pdf
new file mode 100644
index 00000000000..0909dec8697
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex
new file mode 100644
index 00000000000..ff4f8fb32ec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex
@@ -0,0 +1,87 @@
+%
+% This file demonstrates indexing with the 'imakeidx' package.
+% This file is processed as follows:
+%
+% latex file
+% bibtex/biber file
+% latex file
+% latex file
+%
+% Note that the file name suffix may be omitted. It's 'latex file' and not
+% 'latex file.tex'. Also note that '-t <file>' is optional.
+%
+\documentclass[a4paper]{article}
+\usepackage[T1]{fontenc}
+%
+% The 'imakeidx' package provides advanced indexing facilities with support for
+% multiple indexes. Unlike the 'index' package, 'imakeidx' does not generate
+% "self-protecting" index entries. So we need to protect control sequences in
+% indexing fields from expansion. For an example see the 'knuth:ct:a' entry in
+% biblatex-examples.bib.
+%
+\usepackage{imakeidx}
+\usepackage[american]{babel}
+\usepackage{csquotes}
+%
+% We set the 'indexing' package option and use the 'authortitle'
+% style in this example.
+%
+\usepackage[indexing=cite,style=authortitle,babel=hyphen,backend=biber]{biblatex}
+\addbibresource{biblatex-examples.bib}
+%
+% We want two indexes: an index of names with title subentries, an index of
+% titles organized by year. They are defined by way of \makeindex, see the
+% documentation of the 'imakeidx' package for details.
+%
+\makeindex[name=name-title,title={Name and Title Index}]
+\makeindex[name=year-title,title={Year and Title Index}]
+%
+% A 'name:title' indexing bibmacro can be found in biblatex.def. It takes the same
+% arguments as the 'index:name' bibmacro. Note that the title fields are accessed
+% inside the name indexing directive. So we have to test for missing titles.
+%
+\DeclareIndexNameFormat{name:title}{%
+ \iffieldundef{title}
+ {\usebibmacro{index:name}{\index[name-title]}{#1}{#3}{#5}{#7}}
+ {\usebibmacro{index:name:title}{\index[name-title]}{#1}{#3}{#5}{#7}}}
+%
+% Auxiliary indexing macros in biblatex.def can be used to define additional
+% indexing directives with subentries. The following directive creates entries
+% for the year-title index.
+%
+\DeclareIndexFieldFormat{with:year}{%
+ \iffieldundef{year}
+ {\usebibmacro{index:entry}{\index[year-title]}{%
+ \mkbibindexentry{0}{Not dated}%
+ \subentryoperator%
+ \mkbibindexfield{\thefield{indexsorttitle}}{\emph{#1}}}}
+ {\usebibmacro{index:entry}{\index[year-title]}{%
+ \thefield{year}\subentryoperator%
+ \mkbibindexfield{\thefield{indexsorttitle}}{\emph{#1}}}}}
+%
+% We redefine the 'citeindex' bibmacro to use the new indexing directives.
+%
+\renewbibmacro*{citeindex}{%
+ \ifciteindex
+ {\indexnames[name:title]{labelname}%
+ \indexfield[with:year]{indextitle}}
+ {}}
+
+\begin{document}
+
+\section*{Indexing with the \texttt{imakeidx} package}
+
+% We cite a few items. These citations will be added to the indexes.
+\cite{knuth:ct,knuth:ct:a,knuth:ct:c,knuth:ct:d}
+\cite{aristotle:anima,aristotle:poetics,aristotle:physics,aristotle:rhetoric}
+
+\clearpage
+
+% We print the printbibliography...
+\printbibliography
+% ...and the indexes
+\raggedright
+\printindex[name-title] % the name-title index
+\printindex[year-title] % the year-title index
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
index b86e9bf01f6..994b91995db 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
@@ -594,7 +594,7 @@
sorttitle = {Computers & Typesetting A},
indexsorttitle = {The TeXbook},
author = {Knuth, Donald E.},
- indextitle = {\TeX book, The},
+ indextitle = {\protect\TeX book, The},
title = {The \TeX book},
shorttitle = {\TeX book},
maintitle = {Computers \& Typesetting},
@@ -605,7 +605,9 @@
annotation = {The first volume of a five-volume book. Note the
\texttt{sorttitle} and \texttt{sortyear} fields. We want this volume to
be listed after the entry referring to the entire five-volume set. Also
- note the \texttt{indextitle} and \texttt{indexsorttitle} fields}
+ note the \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
+ packages that don't generate robust index entries require some control
+ sequences to be protected from expansion}
}
@book{knuth:ct:b,
hyphenation = {american},
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 60585d04d8f..ba0d4422610 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -79,6 +79,7 @@
\def\do{\printlist[debug][-\thelisttotal]}%
\abx@dolists
\def\do{\printfield[debug]}%
+ \abx@dointernalfields
\abx@dofields\do{options}\do{execute}%
\item\begingroup\ttfamily\leavevmode
\xleaders\hbox to 0.75em{\hss-\hss}\hfill\kern\z@
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index d237fba1534..06d73b16a75 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -831,6 +831,7 @@
\printfield{pubstate}}
\newcounter{bbx:relatedcount}
+\newcounter{bbx:relatedtotal}
\newbibmacro*{related}{%
\ifboolexpr{
@@ -840,22 +841,31 @@
}
{}
{\setcounter{bbx:relatedcount}{0}%
+ \setcounter{bbx:relatedtotal}{0}%
+ \def\do##1{\stepcounter{bbx:relatedtotal}}%
+ \docsvfield{related}%
\def\do{%
\stepcounter{bbx:relatedcount}%
\ifnumgreater{\value{bbx:relatedcount}}{1}
{\printtext{\relateddelim}}
{}}%
- \ifcsundef{abx@macro@related:\strfield{relatedtype}}
- {\appto{\do}{\csuse{abx@macro@related:default}}}
- {\appto{\do}{\csuse{abx@macro@related:\strfield{relatedtype}}}}%
- \ifcsundef{abx@ffd@*@related:\strfield{relatedtype}}
- {\def\abx@tempa{related}}
- {\def\abx@tempa{related:\strfield{relatedtype}}}%
- \printtext[\abx@tempa]{%
+ \ifbibmacroundef{related:\strfield{relatedtype}}
+ {\appto{\do}{\usebibmacro{related:default}}}
+ {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
+ \iffieldformatundef{related:\strfield{relatedtype}}
+ {\def\bbx@tempa{related}}
+ {\def\bbx@tempa{related:\strfield{relatedtype}}}%
+ \printtext[\bbx@tempa]{%
\iffieldundef{relatedstring}
- {\iffieldbibstring{relatedtype}
- {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
- {}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
+ and
+ test {\ifbibxstring{\thefield{relatedtype}s}}
+ }
+ {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}}
+ {\iffieldbibstring{relatedtype}
+ {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
+ {}}}
{\iffieldbibstring{relatedstring}
{\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}}
{\printtext{\printfield{relatedstring}\relatedpunct}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 840af8ea3c5..055f73791cd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -822,12 +822,20 @@
\usebibmacro{index:field}{#1}{\thefield{indexsorttitle}}{\emph{#2}}}
\newbibmacro*{index:field}[3]{%
+ \usebibmacro{index:entry}{#1}{\mkbibindexfield{#2}{#3}}}
+
+% Auxiliary macros for field indexing directives
+% ------------------------------------------------------------------
+
+\newbibmacro*{index:entry}[2]{%
\begingroup
- \protected@edef\theindexentry{%
- \unexpanded{#1}{#2\actualoperator\unexpanded{#3}}}%
+ \protected@edef\theindexentry{\unexpanded{#1}{#2}}%
\theindexentry
\endgroup}
+\newcommand*{\mkbibindexfield}[2]{\mkbibindexentry{#1}{\unexpanded{#2}}}
+\newcommand*{\mkbibindexentry}[2]{#1\actualoperator#2}
+
% ------------------------------------------------------------------
% INDEX FORMATS FOR LITERAL LISTS (#1 is the current item)
% ------------------------------------------------------------------
@@ -891,36 +899,54 @@
% We also use \ifuseprefix to ensure that the name prefix is handled
% properly. \actualoperator is the so-called actual operator, as
% defined by the 'actual' specifier in the .ist file. The makeindex
-% programm will use the part preceeding the \actualoperator
+% program will use the part preceeding the \actualoperator
% delimiter for sorting. The part after the delimiter is used as the
% index is printed. Note that this is not specific to biblatex, see
% the makeindex documentation for details.
\newcommand*{\actualoperator}{@}
+\newcommand*{\subentryoperator}{!}
\newbibmacro*{index:name}[5]{%
- \begingroup
+ \usebibmacro{index:entry}{#1}{\mkbibindexname{#2}{#3}{#4}{#5}}}
+
+% {<last name>}{<first name>}{<first initials>}{<last name prefix>}
+
+\newcommand*{\mkbibindexname}[4]{%
\ifuseprefix
- {\protected@edef\theindexentry{%
- \unexpanded{#1}{%
- \ifblank{#4}{}{#4 }%
- \@firstofone #2% remove spurious braces
- \ifblank{#5}{}{ #5}%
- \ifblank{#3}{}{, #3}%
- \actualoperator
- \ifblank{#4}{}{\MakeCapital{#4} }%
- #2%
- \ifblank{#5}{}{ #5}%
- \ifblank{#3}{}{, #3}}}}
- {\protected@edef\theindexentry{%
- \unexpanded{#1}{%
- \@firstofone #2% remove spurious braces
- \ifblank{#5}{}{ #5}%
- \ifblank{#3#4}{}{,}%
- \ifblank{#3}{}{ #3}%
- \ifblank{#4}{}{ #4}}}}%
- \theindexentry
- \endgroup}
+ {\ifblank{#3}{}{#3 }%
+ \@firstofone #1% remove spurious braces
+ \ifblank{#4}{}{ #4}%
+ \ifblank{#2}{}{, #2}%
+ \actualoperator
+ \ifblank{#3}{}{\MakeCapital{#3} }%
+ #1%
+ \ifblank{#4}{}{ #4}%
+ \ifblank{#2}{}{, #2}}
+ {\@firstofone #1% remove spurious braces
+ \ifblank{#4}{}{ #4}%
+ \ifblank{#2#3}{}{,}%
+ \ifblank{#2}{}{ #2}%
+ \ifblank{#3}{}{ #3}}}
+
+% {<control sequence>}{<control sequence>}
+
+\newcommand*{\mkbibindexsubentry}[2]{%
+ \ifblank{#1}{}{\subentryoperator#1\actualoperator#2}}
+
+% Additional macros with subentries
+
+\newbibmacro*{index:name:field}[6]{%
+ \usebibmacro{index:name:subentry}{#1}{#2}{#3}{#4}{#5}
+ {\thefield{#6}}{\csfield{#6}}}
+
+\newbibmacro*{index:name:title}[5]{%
+ \usebibmacro{index:name:subentry}{#1}{#2}{#3}{#4}{#5}
+ {\thefield{indexsorttitle}}{\emph{\csfield{indextitle}}}}
+
+\newbibmacro*{index:name:subentry}[7]{%
+ \usebibmacro{index:entry}{#1}{%
+ \mkbibindexname{#2}{#3}{#4}{#5}\mkbibindexsubentry{#6}{#7}}}
% ------------------------------------------------------------------
% Driver sourcemaps
@@ -1816,7 +1842,7 @@
\markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
- \if@twoside\markright{\sectionmarkformat#1}\fi}
+ \if@twoside\markright{#1}\fi}
\defbibheading{subbibintoc}[\refname]{%
\addsec{#1}%
\markboth{#1}{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 450f3621f32..fe3d920786c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -3,8 +3,8 @@
%%
% Set up the version strings here, so they are the same for both branches
-\def\abx@date{2012/08/17}
-\def\abx@version{2.2}
+\def\abx@date{2012/10/29}
+\def\abx@version{2.3}
\def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)}
\def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)}
\def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)}
@@ -12,7 +12,7 @@
% This is not updated by build script as the controlfile version
% does not necessarily change with the package version.
% This is used when writing the .bcf
-\def\blx@bcfversion{2.0}
+\def\blx@bcfversion{2.1}
% This is not updated by build script as the bbl version
% does not necessarily change with the package version.
% This is used when checking the .bbl
@@ -76,10 +76,11 @@
\expandafter\@secondoftwo
\fi
{%
- % A few things not defined by v1, but defined in biblatex.def so has to be handled
+ % A few things not defined by v1 so has to be handled if using v1
\protected\long\def\DeclareDefaultSourcemap[#1]#2{}%
\protected\long\def\DeclareLabelalphaTemplate#1{}%
\protected\long\def\DeclareLabeltitle#1{}%
+ \protected\long\def\abx@dointernalfields{}%
\RequirePackage{biblatex1}%
}
{\RequirePackage{biblatex2}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 6a9aeac7dd9..ef59ba0505b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -155,6 +155,7 @@
{}}%
\docsvlist{%
\@footnotetext,% patch twice
+ \H@@footnotetext,% patch twice
\@plainfootnotetext}}
{}%
\iftoggle{blx@tempa}
@@ -1935,12 +1936,25 @@
% {<name>}
-\newrobustcmd*{\usebibmacro}[1]{%
- \ifcsundef{abx@macro@\detokenize{#1}}
+\newrobustcmd*{\usebibmacro}{%
+ \@ifstar
+ {\blx@usebibmacro@i}
+ {\blx@usebibmacro}}
+
+\def\blx@usebibmacro#1{%
+ \blx@usebibmacro@i{\detokenize{#1}}}
+
+\def\blx@usebibmacro@i#1{%
+ \ifcsundef{abx@macro@#1}
{\blx@error
- {Bibliography macro '\detokenize{#1}' undefined}
+ {Bibliography macro '#1' undefined}
{Use '\string\newbibmacro' to define this macro}}
- {\csuse{abx@macro@\detokenize{#1}}}}
+ {\csuse{abx@macro@#1}}}
+
+% {<name>}{<true>}{<false>}
+
+\def\blx@imc@ifbibmacroundef#1{%
+ \ifcsundef{abx@macro@#1}}
% {<field>}
@@ -1952,6 +1966,14 @@
{\csname abx@field@#1\endcsname}}
{}}
+\def\blx@imc@csfield#1{\usefield{\unexpanded}{#1}}
+
+% {<command>}{<field>}
+
+\def\blx@imc@usefield#1#2{%
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{\csname abx@field@#2\endcsname}}
+
% {<plainlist>}
\def\blx@imc@thelist#1{\csuse{abx@list@#1}}
@@ -3132,13 +3154,13 @@
\global\toggletrue{blx@block}}
\blx@regimcs{%
- \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist
- \clearname \restorefield \restorelist \restorename
+ \ifdriver \thefield \strfield \csfield \usefield \thelist \thename
+ \clearfield \clearlist \clearname \restorefield \restorelist \restorename
\ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
\ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
\ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
\iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
- \iffieldundef \iffieldxref \iflistequalcs \iflistequals
+ \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
\iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems
\ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref
\iffirstonpage \ifsamepage \savefield \savefieldcs \savelist
@@ -3558,6 +3580,12 @@
\newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}}
\newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}}
+% [<entrytype>]{<name>}{<true>}{<false>}
+
+\newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}}
+\newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}}
+\newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}}
+
% [<entrytype>]{<alias>}[<entrytype>]{<name>}
\newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}}
@@ -4326,6 +4354,7 @@
\do{inpreparation}%
\do{submitted}%
\do{inpress}%
+ \do{prepublished}%
\do{forthcoming}%
\do{library}%
\do{abstract}%
@@ -9554,14 +9583,14 @@
\DeclareBibliographyOption{maxcitenames}{%
\numdef\blx@maxcitenames{#1}}
\DeclareBibliographyOption{mincitenames}{%
- \numdef\blx@minbibnames{#1}}
+ \numdef\blx@mincitenames{#1}}
\DeclareTypeOption{maxcitenames}{%
\numdef\blx@maxcitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@maxnames#1\relax}}
\DeclareTypeOption{mincitenames}{%
- \numdef\blx@minbibnames@type{#1}%
+ \numdef\blx@mincitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@minnames#1\relax}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index cb3b9ccd304..841261f358a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -150,6 +150,7 @@
{}}%
\docsvlist{%
\@footnotetext,% patch twice
+ \H@@footnotetext,% patch twice
\@plainfootnotetext}}
{}%
\iftoggle{blx@tempa}
@@ -448,6 +449,17 @@
\newtoggle{blx@reencode}
\newtoggle{blx@citeindex}
\newtoggle{blx@bibindex}
+\newtoggle{blx@localnumber}
+
+% Initialise some lists which track changing citations/sortschemes
+% etc. between runs
+\global\let\blx@cites\@empty
+\global\let\blx@sortschemes\@empty
+\global\let\blx@lastsortschemes\@empty
+\global\let\blx@sortschemeslos\@empty
+\global\let\blx@lastsortschemeslos\@empty
+\global\let\blx@lastcites\@empty
+\global\let\blx@localnumaux\@empty
\newread\blx@bcfin
\newwrite\blx@bcfout
@@ -1754,12 +1766,25 @@
% {<name>}
-\newrobustcmd*{\usebibmacro}[1]{%
- \ifcsundef{abx@macro@\detokenize{#1}}
+\newrobustcmd*{\usebibmacro}{%
+ \@ifstar
+ {\blx@usebibmacro@i}
+ {\blx@usebibmacro}}
+
+\def\blx@usebibmacro#1{%
+ \blx@usebibmacro@i{\detokenize{#1}}}
+
+\def\blx@usebibmacro@i#1{%
+ \ifcsundef{abx@macro@#1}
{\blx@error
- {Bibliography macro '\detokenize{#1}' undefined}
+ {Bibliography macro '#1' undefined}
{Use '\string\newbibmacro' to define this macro}}
- {\csuse{abx@macro@\detokenize{#1}}}}
+ {\csuse{abx@macro@#1}}}
+
+% {<name>}{<true>}{<false>}
+
+\def\blx@imc@ifbibmacroundef#1{%
+ \ifcsundef{abx@macro@#1}}
% {<field>}
@@ -1771,6 +1796,14 @@
{\csname abx@field@#1\endcsname}}
{}}
+\def\blx@imc@csfield#1{\usefield{\unexpanded}{#1}}
+
+% {<command>}{<field>}
+
+\def\blx@imc@usefield#1#2{%
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{\csname abx@field@#2\endcsname}}
+
% {<plainlist>}
\def\blx@imc@thelist#1{\csuse{abx@list@#1}}
@@ -2942,13 +2975,13 @@
\global\toggletrue{blx@block}}
\blx@regimcs{%
- \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist
- \clearname \restorefield \restorelist \restorename
+ \ifdriver \thefield \strfield \csfield \usefield \thelist \thename
+ \clearfield \clearlist \clearname \restorefield \restorelist \restorename
\ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
\ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
\ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
\iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
- \iffieldundef \iffieldxref \iflistequalcs \iflistequals
+ \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
\iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems
\ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref
\iffirstonpage \ifsamepage \savefield \savefieldcs \savelist
@@ -2978,7 +3011,7 @@
\let\nopp\relax
\protected\def\psq{\sqspace\bibstring{sequens}}%
\protected\def\psqq{\sqspace\bibstring{sequentes}}}
-
+
% Make sure that commands which might pop up inside an \edef will be defined
% as something. If they are taken \AtBeginDocument then we assume that all will
% be well. If not, then provide a definition which will give an error outside
@@ -3368,6 +3401,12 @@
\newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}}
\newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}}
+% [<entrytype>]{<name>}{<true>}{<false>}
+
+\newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}}
+\newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}}
+\newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}}
+
% [<entrytype>]{<alias>}[<entrytype>]{<name>}
\newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}}
@@ -3854,7 +3893,7 @@
{\@firstoftwo}}}
\blx@regimcs{%
- \bibstring \biblstring \bibsstring
+ \bibstring \biblstring \bibsstring
\bibxstring \bibxlstring \bibxsstring
\bibcpstring \bibcplstring \bibcpsstring
\biblcstring \biblclstring \biblcsstring
@@ -4133,6 +4172,7 @@
\do{inpreparation}%
\do{submitted}%
\do{inpress}%
+ \do{prepublished}%
\do{forthcoming}%
\do{library}%
\do{abstract}%
@@ -4790,12 +4830,11 @@
\do{localnumber}%
\do{namehash}%
\do{prefixnumber}%
- \do{sortinit}%
-}
+ \do{sortinit}}
\def\abx@dobooleans{%
- \do{singletitle}%
-}
+ \do{singletitle}}
+
\def\do#1{%
\newcounter{#1}%
\newcounter{saved#1}%
@@ -5226,7 +5265,6 @@
\blx@setoptions@entry
\edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
\csuse\blx@bbl@data
- \cslet\blx@bbl@data\@empty
\blx@bbl@addfield{entrykey}{\abx@field@entrykey}%
\blx@bbl@addfield{entrytype}{#2}%
\blx@imc@iffieldundef{options}
@@ -5256,21 +5294,21 @@
{}%
\nottoggle{blx@skiplab}
{\iftoggle{blx@labelnumber}
- {\blx@bbl@labelnumber}
- {}%
- \iftoggle{blx@labelalpha}
- {\blx@bbl@labelalpha}
- {}%
- \iftoggle{blx@labeltitle}
- {\blx@bbl@labeltitle}
- {}%
- \iftoggle{blx@labeltitleyear}
- {\blx@bbl@labeltitleyear}
- {}%
- \iftoggle{blx@labelyear}
- {\blx@bbl@labelyear}
- {}%
- \blx@bbl@prefixnumber}
+ {\blx@bbl@labelnumber}
+ {}%
+ \iftoggle{blx@labelalpha}
+ {\blx@bbl@labelalpha}
+ {}%
+ \iftoggle{blx@labeltitle}
+ {\blx@bbl@labeltitle}
+ {}%
+ \iftoggle{blx@labeltitleyear}
+ {\blx@bbl@labeltitleyear}
+ {}%
+ \iftoggle{blx@labelyear}
+ {\blx@bbl@labelyear}
+ {}%
+ \blx@bbl@prefixnumber}
{}%
\blx@bbl@titles
\blx@bbl@hooks
@@ -5307,30 +5345,35 @@
\csuse{abx@ffd@*@shorthandwidth}{\abx@field@shorthand}}}}
\def\blx@bbl@labelnumber{%
- \ifdefempty\abx@field@localnumber
- {}
- {\ifundef\abx@field@shorthand
- {\ifdef\abx@field@localnumber
- {}
+ % Used at endentry
+ % only do this for the global sorting list otherwise we increment
+ % the labelnumbers for each sortlist
+ \ifdefstrequal{\blx@slist@name}{\blx@sorting}
+ {\ifdefempty\abx@field@localnumber
+ {}% only if omitnumbers=true
+ {\ifundef\abx@field@shorthand
+ {\ifdef\abx@field@localnumber
+ {}% only if defernumbers=true
{\csnumgdef{blx@labelnumber@\the\c@refsection}{%
- \csuse{blx@labelnumber@\the\c@refsection}+1}%
- \edef\abx@field@localnumber{%
- \csuse{blx@labelnumber@\the\c@refsection}}}%
- \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
- \iftoggle{blx@skipbib}
+ \csuse{blx@labelnumber@\the\c@refsection}+1}%
+ \edef\abx@field@localnumber{%
+ \csuse{blx@labelnumber@\the\c@refsection}}}%
+ \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
+ \iftoggle{blx@skipbib}
{}
{\blx@setlabwidth{\labelnumberwidth}{%
- \csuse{abx@ffd@*@labelnumberwidth}{%
- \ifdef\abx@field@prefixnumber
- {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
- {}%
- \abx@field@localnumber}}}}
- {\csgappto\blx@bbl@data{%
- \let\abx@field@labelnumber\abx@field@shorthand}%
- \iftoggle{blx@skipbib}
+ \csuse{abx@ffd@*@labelnumberwidth}{%
+ \ifdef\abx@field@prefixnumber
+ {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
+ {}%
+ \abx@field@localnumber}}}}
+ {\csgappto\blx@bbl@data{%
+ \let\abx@field@labelnumber\abx@field@shorthand}%
+ \iftoggle{blx@skipbib}
{}
{\blx@setlabwidth{\labelnumberwidth}{%
- \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}}
+ \csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}}
+ {}}
\def\blx@bbl@prefixnumber{%
\ifdef\abx@field@prefixnumber
@@ -5436,14 +5479,29 @@
\def\blx@bblend{%
}
+% {<entrykey>}
+% Get the saved information on which citations were mentioned last run
+\protected\def\abx@aux@cite#1{%
+ \listxadd{\blx@lastcites}{\detokenize{#1}}}
+
+% {<sortschemename>}
+% Get the saved information on which sorting schemes were mentioned last run
+\protected\def\abx@aux@sortscheme#1{%
+ \listgadd{\blx@lastsortschemes}{#1}}
+
+% {<sortschemename>}
+% Get the saved information on which shorthand sorting schemes were mentioned last run
+\protected\def\abx@aux@sortschemelos#1{%
+ \listgadd{\blx@lastsortschemeslos}{#1}}
+
% {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
\protected\def\blx@aux@number#1#2#3#4{%
\blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}%
+ \global\toggletrue{blx@localnumber}%
\ifblank{#4}
{}
- {\csgdef{blx@labelnumber@#3}{#4}%
- \blx@addchecksum{#1}{#4}}}
+ {\csgdef{blx@labelnumber@#3}{#4}}}
\AtEndDocument{%
\def\abx@aux@number#1#2#3#4{%
@@ -5451,22 +5509,79 @@
{}
{\blx@addchecksum{#1}{#4}}}}
+\AtEndDocument{%
+ % Here we run some tests to decide if we need to issue re-run
+ % messages in certain circumstances. In general, if we add/remove
+ % any citations or add/remove any sorting schemes, we need to re-run
+ % biber. Also, if we have to re-run biber, we need to defer writing
+ % the defernumbers .aux information because it will not yet be correct.
+
+ % Test to see if we *removed* any citations since last run
+ % (adding citations is dealt with naturally in \blx@citation@entry)
+ % If so, give a rerun biber message. This also sets the
+ % rerun biber toggle so defernums doesn't consume the localnumbers
+ % in the .aux but instead, re-writes them, which is what we need.
+ \begingroup
+ \def\do#1{\ifinlist{#1}{\blx@cites}{}{\blx@logreq@active{}}\relax}%
+ \dolistloop\blx@lastcites
+ % Special case - if we are using sortscheme "none" anywhere, then changes
+ % in citation order matter and we need to re-run biber. So a special test
+ % to see if the cites from last run are identical in order. We have
+ % already tested for more or less cites between runs by now, we are
+ % testing here for exactly the same cites by treating the cite and
+ % lastcite lists as strings and comparing them. This doesn't apply
+ % to shorthand sortschemes as nobody wants to sort shorthands with
+ % "none" anyway, it makes no sense
+ \ifinlist{none}{\blx@sortschemes}
+ {\ifdefstrequal{\blx@cites}{\blx@lastcites}
+ {}
+ {\blx@logreq@active{}}}
+ {}%
+ % Test to see if we removed any mention of a sorting scheme since last run.
+ % If we did, we need to re-run biber
+ \def\do#1{\ifinlist{#1}{\blx@sortschemes}{}{\blx@logreq@active{}}\relax}%
+ \dolistloop\blx@lastsortschemes
+ % Test to see if we added any mention of a sorting scheme since last run
+ % If we did, we need to re-run biber
+ \def\do#1{\ifinlist{#1}{\blx@lastsortschemes}{}{\blx@logreq@active{}}\relax}%
+ \dolistloop\blx@sortschemes
+ % Test to see if we removed any mention of a shorthand sorting scheme since last run.
+ % If we did, we need to re-run biber
+ \def\do#1{\ifinlist{#1}{\blx@sortschemeslos}{}{\blx@logreq@active{}}\relax}%
+ \dolistloop\blx@lastsortschemeslos
+ % Test to see if we added any mention of a shorthand sorting scheme since last run
+ % If we did, we need to re-run biber
+ \def\do#1{\ifinlist{#1}{\blx@lastsortschemeslos}{}{\blx@logreq@active{}}\relax}%
+ \dolistloop\blx@sortschemeslos
+ % If we have to run biber or latex again and we are using defernumbers,
+ % don't write the localnumber information to the .aux file yet as we will
+ % potentially have to regenerate sorting order first in biber
+ \iftoggle{blx@defernumbers}
+ {\iftoggle{blx@runbiber}
+ {}
+ {\def\do#1{\blx@auxwrite\@mainaux{}{#1}}
+ \dolistloop\blx@localnumaux}}
+ {}%
+ \endgroup}
+
+% Only used when defernumbers=true
\def\blx@addlabelnumber{%
\begingroup
\nottoggle{blx@skiplab}
{\iftoggle{blx@labelnumber}
{\ifundef\abx@field@shorthand
- {\ifundef\abx@field@localnumber
- {\iftoggle{blx@omitnumbers}
- {\let\abx@field@localnumber\@empty}
- {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
- \csuse{blx@labelnumber@\the\c@refsection}+1}%
+ % Need to know if we set any localnumber from .aux file, not
+ % just current item. Otherwise, we may just write new
+ % localnumbers but not existing ones
+ {\nottoggle{blx@localnumber}
+ {\iftoggle{blx@omitnumbers}
+ {\let\abx@field@localnumber\@empty}
+ {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+ \csuse{blx@labelnumber@\the\c@refsection}+1}%
\edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
\blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
{localnumber}{\abx@field@localnumber}}%
- \blx@auxwrite\@mainaux{}{%
- \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\abx@field@localnumber}}}
+ \listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}}
{}}
{}}%
{}}
@@ -5495,7 +5610,6 @@
\blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
\def\blx@bbl@slist#1#2{%
- \csnumgdef{blx@labelnumber@\the\c@refsection}{0}%
\begingroup
\def\blx@slist@name{#2}%
% This macro (\key) will only be called in shorthand lists
@@ -5740,15 +5854,27 @@
{\blx@err@invopt{sorting=#1}{}}%
{\blx@printbibchecks
\def\blx@tempc{#1}%
+ % Add the sortscheme to the list of sortschemes
+ % so we can compare on next run
+ \ifinlist{#1}{\blx@sortschemes}
+ {}
+ {\listgadd\blx@sortschemes{#1}%
+ \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{#1}}}%
\edef\blx@tempd{%
\blx@xml@sorting{%
\csuse{blx@biber@sorting@#1}}}}}
-
+
\define@key{blx@los1}{sorting}{%
\ifcsundef{blx@biber@sorting@#1}
{\blx@err@invopt{sorting=#1}{}}%
{\blx@printbibchecks
\def\blx@tempc{#1}%
+ % Add the sortscheme to the list of shorthand sortschemes
+ % so we can compare on next run
+ \ifinlist{#1}{\blx@sortschemeslos}
+ {}
+ {\listgadd\blx@sortschemeslos{#1}%
+ \blx@auxwrite\@mainaux{}{\string\abx@aux@sortschemelos{#1}}}%
\edef\blx@tempd{%
\blx@xml@sorting{%
\csuse{blx@biber@sorting@#1}}}}}
@@ -6243,7 +6369,8 @@
\csuse{blx@bibsetup}}
% {<entrykey>}
-
+% output a bib item, this is why \blx@thelabelnumber is here so that
+% labelnumber is deferred if defernumbers=true
\def\blx@bibitem#1{%
\blx@ifdata{#1}
{\begingroup
@@ -6377,10 +6504,10 @@
\let\blx@thetitle\@empty
% defaults
\let\blx@tempa\@empty% before there is a .bbl, this must not be undef
- \def\blx@tempc{shorthand}% sorting scheme name from "sorting" option
+ \def\blx@tempc{shorthand}% default sorting scheme for shorthands
\edef\blx@tempd{%
\blx@xml@sorting{%
- \csuse{blx@biber@sorting@shorthand}}}% sorting scheme from "sorting" option
+ \csuse{blx@biber@sorting@shorthand}}}% default sorting scheme for shorthands
\let\blx@printbibchecks\relax
\edef\blx@tempe{\the\c@refsection}% default refsection is current
\blx@safe@actives
@@ -6854,7 +6981,7 @@
\blx@loccitreset}
% {<entrykey>}{<message>}
-
+% Just a wrapper to suppress citation tracking in toc/lof etc.
\def\blx@citation#1#2{%
\ifbool{citerequest}
{\blx@citation@entry{#1}{#2}}
@@ -6862,6 +6989,10 @@
\def\blx@citation@entry#1#2{%
\blx@bibreq{#1}%
+ \ifinlist{#1}{\blx@cites}
+ {}
+ {\listgadd{\blx@cites}{#1}%
+ \blx@auxwrite\@mainaux{}{\string\abx@aux@cite{#1}}}%
\ifinlistcs{#1}{blx@segm@\the\c@refsection @\the\c@refsegment}
{}
{\listcsgadd{blx@segm@\the\c@refsection @\the\c@refsegment}{#1}}%
@@ -6907,7 +7038,7 @@
\protected\def\blx@bibreq#1{%
\begingroup
\blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
- % citeall is always order "0" - this make no real difference as biber
+ % citeall is always order "0" - this makes no real difference as biber
% ignores all other citekeys in the section if citeall is present
\ifstrequal{*}{#1}
{\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{0}}}
@@ -6930,7 +7061,7 @@
{}
{\blx@error
{Conflicting definitions of '\blx@tempa'}
- {The entry set '\blx@tempa' been defined before.\MessageBreak
+ {The entry set '\blx@tempa' been defined before.\MessageBreak
old: \blx@tempa\space = %
\csuse{blx@set@\the\c@refsection @\blx@tempa}\MessageBreak
new: \blx@tempa\space = \blx@tempb\MessageBreak
@@ -8504,19 +8635,6 @@
\xdef\blx@xml@sourcemap@step#1{%
~~~~~~~~<bcf:map_step#1/>\blx@nl}
-\xdef\blx@xml@displaymodes#1#2{%
- ~~<bcf:displaymodes type="#1">\blx@nl
- #2%
- ~~</bcf:displaymodes>\blx@nl}
-\xdef\blx@xml@displaymode#1{%
- ~~~~<bcf:displaymode>\blx@nl
- #1%
- ~~~~</bcf:displaymode>\blx@nl}
-\xdef\blx@xml@dtarget#1{%
- ~~~~~~<bcf:dtarget>#1</bcf:dtarget>\blx@nl}
-\xdef\blx@xml@dmode#1#2{%
- ~~~~~~<bcf:dmode order="#1">#2</bcf:dmode>\blx@nl}
-
\xdef\blx@xml@labelalphatemplate#1#2{%
~~<bcf:labelalphatemplate type="#1">\blx@nl
#2%
@@ -8728,13 +8846,6 @@
\endgroup}%
\dolistloop\blx@opts@type}
{}%
- % displaymode
- \eappto\blx@tempa{%
- \blx@xml@comment{DISPLAYMODES}%
- \blx@xml@displaymodes{global}{%
- \csuse{blx@biber@displaymodes@global}%
- }%
- }%
% sourcemap
\ifbool{sourcemap}
{\eappto\blx@tempa{%
@@ -8960,8 +9071,15 @@
\eappto\blx@tempf{ map\string_field\string_target="#1"}}
\define@key{blx@sourcemap@step}{fieldset}{% characters
\eappto\blx@tempf{ map\string_field\string_set="#1"}}
+% We are sanitising the XML here as it's the value of an attribute which
+% might contain quotes or ampersands (URLs, for example)
\define@key{blx@sourcemap@step}{fieldvalue}{% characters
- \eappto\blx@tempf{ map\string_field\string_value="#1"}}
+ \blx@xmlsanitizeafter{\def\blx@temps}{#1}%
+ \eappto\blx@tempf{ map\string_field\string_value="\blx@temps"}}
+\define@key{blx@sourcemap@step}{append}[true]{% true|false
+ \ifstrequal{#1}{true}
+ {\appto\blx@tempf{ map\string_append="1"}}
+ {}}
\define@key{blx@sourcemap@step}{null}[true]{% true|false
\ifstrequal{#1}{true}
{\appto\blx@tempf{ map\string_null="1"}}
@@ -9027,6 +9145,9 @@
\eappto\blx@tempb{%
\blx@xml@labelalpha@part{\blx@tempc}{#2}}}
+% script form - original | translated | romanised | uniform
+\define@key{blx@latem@field}{form}{%
+ \appto\blx@tempc{ form="#1"}}
\define@key{blx@latem@field}{uppercase}[true]{% true|false
\ifstrequal{#1}{true}
{\appto\blx@tempc{ uppercase="1"}}
@@ -9212,6 +9333,9 @@
\eappto\blx@tempb{%
\blx@xml@sortitem{\blx@tempd}{#2}}}
+% script form - original | translated | romanised | uniform
+\define@key{blx@sortdef@field}{form}{%
+ \appto\blx@tempd{ form="#1"}}
\define@key{blx@sortdef@field}{padside}{% left|right
\ifstrequal{#1}{right}
{\eappto\blx@tempd{ pad\string_side="right"}}
@@ -9301,25 +9425,6 @@
\docsvlist{#2}%
\endgroup}
-% experimental
-
-\newrobustcmd*{\DeclareDisplaymode}[2][global]{%
- \begingroup
- \blx@tempcnta\z@
- \def\blx@tempa{\blx@xml@dtarget{*}}%
- \forcsvlist\blx@defdisplaymode{#2}%
- \csxdef{blx@biber@displaymodes@#1}{%
- \blx@xml@displaymode{\blx@tempa}}%
- \endgroup}
-
-\def\blx@defdisplaymode#1{%
- \advance\blx@tempcnta\@ne
- \edef\blx@tempa{%
- \blx@tempa
- \blx@xml@dmode{\the\blx@tempcnta}{#1}}}
-
-\DeclareDisplaymode{original,romanised,uniform,translated}
-
%% Package options
% [<entrytype,entrytype,...>]{<options>}
@@ -9419,7 +9524,8 @@
\ifcsdef{blx@biber@sorting@\blx@sorting}
{}
{\blx@err@invopt{sorting=\blx@sorting}{}%
- \def\blx@sorting{nty}}}
+ \def\blx@sorting{nty}}%
+ \listxadd\blx@sortschemes{\blx@sorting}}
\DeclareBibliographyOption{sortcase}[true]{%
\settoggle{blx@sortcase}{#1}}
@@ -9481,14 +9587,14 @@
\DeclareBibliographyOption{maxcitenames}{%
\numdef\blx@maxcitenames{#1}}
\DeclareBibliographyOption{mincitenames}{%
- \numdef\blx@minbibnames{#1}}
+ \numdef\blx@mincitenames{#1}}
\DeclareTypeOption{maxcitenames}{%
\numdef\blx@maxcitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@maxnames#1\relax}}
\DeclareTypeOption{mincitenames}{%
- \numdef\blx@minbibnames@type{#1}%
+ \numdef\blx@mincitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@minnames#1\relax}}
@@ -9584,7 +9690,7 @@
\renewrobustcmd*{\bibinitperiod}{\adddot}
\renewrobustcmd*{\bibinitdelim}{\addnbspace}
\renewrobustcmd*{\bibinithyphendelim}{\adddot\mbox{-}}}}
-
+
\DeclareBibliographyOption{firstinits}[true]{%
\settoggle{blx@firstinits}{#1}}
@@ -10389,6 +10495,7 @@
% Deferred last minute setup
\AtBeginDocument{%
+ \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@sorting}}%
\blx@checkencoding
\if@filesw
\blx@ctrlwrite@biber
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
index 0da6bc8e7cd..dcee0112012 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
@@ -11,8 +11,8 @@
~~~~<bcf:entrytypes>\blx@nl
#1%
~~~~</bcf:entrytypes>\blx@nl}
-\xdef\blx@xml@datamodel@entrytype#1{%
- ~~~~~~<bcf:entrytype>#1</bcf:entrytype>\blx@nl}
+\xdef\blx@xml@datamodel@entrytype#1#2{%
+ ~~~~~~<bcf:entrytype#1>#2</bcf:entrytype>\blx@nl}
\xdef\blx@xml@datamodel@fields#1{%
~~~~<bcf:fields>\blx@nl
#1%
@@ -75,14 +75,25 @@
\newrobustcmd*{\ResetDatamodelConstraints}{%
\global\cslet{blx@bcf@datamodel@constraints}\@empty}
-\newrobustcmd*{\DeclareDatamodelEntrytypes}[1]{%
+\newrobustcmd*{\DeclareDatamodelEntrytypes}[2][]{%
+ \begingroup
+ \let\blx@tempa\@empty
\def\do##1{%
\ifinlistcs{##1}{blx@biber@datamodel@entrytypes}
{}
{\listcsgadd{blx@biber@datamodel@entrytypes}{##1}}%
\xappto\blx@bcf@datamodel@entrytypes{%
- \blx@xml@datamodel@entrytype{##1}}}%
- \docsvlist{#1}}
+ \blx@xml@datamodel@entrytype{\blx@tempa}{##1}}}%
+ \ifblank{#1}
+ {\docsvlist{#2}}
+ {\setkeys{blx@datamodel@entrytypes}{#1}
+ \docsvlist{#2}}%
+ \endgroup}
+
+\define@key{blx@datamodel@entrytypes}{skipout}[true]{% true|false
+ \ifstrequal{#1}{true}
+ {\appto\blx@tempa{ skip\string_output="true"}}
+ {}}
\newrobustcmd*{\DeclareDatamodelFields}[2][]{%
\begingroup
@@ -300,8 +311,9 @@
suppcollection,
thesis,
unpublished,
- video,
- xdata}
+ video}
+
+\DeclareDatamodelEntrytypes[skipout]{xdata}
\DeclareDatamodelFields[type=field, datatype=integer]{
day,
@@ -473,11 +485,12 @@
doi,
eprint,
file,
- url,
verba,
verbb,
verbc}
+\DeclareDatamodelFields[type=field, datatype=uri]{url}
+
\DeclareDatamodelFields[type=field, datatype=csv]{keywords}
\DeclareDatamodelFields[type=field, datatype=csv, skipout]{options}
\DeclareDatamodelFields[type=field, datatype=range]{pages}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index dc08a17d6f9..f557a38826a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -353,6 +353,7 @@
submitted = {{submetido}{subm\adddot}},
% forthcoming = {{}{}}, % FIXME: missing
inpress = {{na prensa}{na prensa}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{doravante citado como}{doravante citado como}},
seenote = {{ver nota}{ver nota}},
quotedin = {{apud}{apud}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
new file mode 100644
index 00000000000..4a4d425a8aa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
@@ -0,0 +1,400 @@
+% -*- latex -*-
+\ProvidesFile{catalan.lbx}
+
+% Changes:
+% 2012-4-23 Translation by Sebastià Vila-Marta
+
+\DeclareRedundantLanguages{catalan}{catalan}
+
+\DeclareBibliographyExtras{%
+ \protected\def\bibrangedash{\bibendash{}}%
+ \protected\def\bibdatedash{\bibrangedash}%
+ \let\finalandcomma=\empty%
+ \protected\def\deap#1{\@ifnextchar{ yes }{ no }}%
+ \protected\def\mkbibordinalm#1{%
+ \begingroup
+ \@tempcnta0#1\relax\number\@tempcnta
+ \ifcase\@tempcnta x\or er\or n\or er\or rt\else \`e\fi
+ \endgroup}%
+ \protected\def\mkbibordinalf#1{%
+ \begingroup
+ \@tempcnta0#1\relax\number\@tempcnta
+ \ifcase\@tempcnta x\or era\or na\or era\else a\fi
+ \endgroup}%
+ \protected\def\mkbibmascord#1{\mkbibordinalm{#1}}%
+ \protected\def\mkbibfemord#1{\mkbibordinalf{#1}}%
+ \protected\def\mkbibdatelong#1#2#3{%
+ \iffieldundef{#3}{}{%
+ \stripzeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{%
+ \nobreakspace%
+ \ifthenelse{\thefield{#2}=4}{d'}{%
+ \ifthenelse{\thefield{#2}=8}{d'}{%
+ \ifthenelse{\thefield{#2}=10}{d'}{%
+ de\space}}}%
+ }%
+ }%
+ \iffieldundef{#2}{}{%
+ \mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{%
+ \space de\nobreakspace%
+ }%
+ }%
+ \iffieldundef{#1}{}{\thefield{#1}}%
+ }%
+ \protected\def\mkbibdateshort#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\mkdatezeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{\mbox{-}}}%
+ \iffieldundef{#2}
+ {}
+ {\mkdatezeros{\thefield{#2}}%
+ \iffieldundef{#1}{}{\mbox{-}}}%
+ \thefield{#1}}%
+ \savecommand\mkbibrangeterse
+ \protected\def\mkbibrangeterse{%
+ \BibliographyWarning{%
+ Date format 'terse' not applicable to\MessageBreak
+ Catalan dates. Using format 'short' instead}%
+ \mkbibrangefull{short}}%
+ \savecommand\mkbibordedition
+ \savecommand\mkbibordseries
+ \def\mkbibordedition{\mkbibfemord}%
+ \def\mkbibordseries{\mkbibfemord}%
+ %
+ \DeclareFieldFormat{urldate}{\mkbibparens{\bibstring{urlseen}#1}}
+}
+
+\UndeclareBibliographyExtras{%
+ \restorecommand\mkbibrangeterse
+ \restorecommand\lbx@finalnamedelim
+ \restorecommand\lbx@finallistdelim
+ \restorecommand\mkbibordedition
+ \restorecommand\mkbibordseries
+}
+
+\DeclareBibliographyStrings{%
+ bibliography = {{Bibliografia}{Bibliografia}},
+ references = {{Refer\`encies}{Refer\`encies}},
+ shorthands = {{Llista de abreviatures}{Abreviatures}},
+ editor = {{editor}{ed\adddot}},
+ editors = {{editors}{eds\adddot}},
+ compiler = {{compilador}{comp\adddot}},
+ compilers = {{compiladors}{comps\adddot}},
+ redactor = {{redactor}{red\adddot}},
+ redactors = {{redactors}{reds\adddot}},
+ reviser = {{revisor}{rev\adddot}},
+ revisers = {{revisors}{revs\adddot}},
+ founder = {{fundador}{fund\adddot}},
+ founders = {{fundadors}{funds\adddot}},
+ continuator = {{continuador}{cont\adddot}},
+ continuators = {{continuadors}{conts\adddot}},
+ collaborator = {{co\l.laborador}{co\l.l\adddot}}, %require babel
+ collaborators = {{co\l.laboradors}{co\l.ls\adddot}},
+ translator = {{traductor}{trad\adddot}},
+ translators = {{traductors}{trads\adddot}},
+ commentator = {{comentarista}{com\adddot}},
+ commentators = {{comentaristes}{coms\adddot}},
+ annotator = {{autor de les notes}{autor de les notes}},
+ annotators = {{autors de les notes}{autors de les notes}},
+ commentary = {{comentari}{com\adddot}},
+ annotations = {{notes}{notes}},
+ introduction = {{introducci\'o}{intr\adddot}},
+ foreword = {{pr\`oleg}{pr\`ol\adddot}},
+ afterword = {{ep\'{\i}leg}{ep\'{\i}l\adddot}},
+ editortr = {{editor i traductor}{ed\adddotspace i trad\adddot}},
+ editorstr = {{editors i traductors}{eds\adddotspace i trads\adddot}},
+ editorco = {{editor i comentarista}{ed\adddotspace i com\adddot}},
+ editorsco = {{editors i comentaristes}{eds\adddotspac i coms\adddot}},
+ editoran = {{editor i autor de les notes}{ed\adddotspace i autor de les notes}},
+ editorsan = {{editors i autors de les notes}{eds\adddotspace i autors de les notes}},
+ editorin = {{editor i autor de la introducci\'o}{ed\adddotspace i autor de la intr\addot}},
+ editorsin = {{editors i autors de la introducci\'o}{eds\adddotspace i autors de la intr\adddot}},
+ editorfo = {{editor i autor del pròleg}{ed\adddotspace i autor del pr\`ol\addot}},
+ editorsfo = {{editors i autors del pròleg}{eds\adddotspace i autors del pr\`ol\addot}},
+% editoraf = {{}{}}, % FIXME: missing
+% editorsaf = {{}{}}, % FIXME: missing
+% editortrco = {{}{}}, % FIXME: missing
+% editorstrco = {{}{}}, % FIXME: missing
+% editortran = {{}{}}, % FIXME: missing
+% editorstran = {{}{}}, % FIXME: missing
+% editortrin = {{}{}}, % FIXME: missing
+% editorstrin = {{}{}}, % FIXME: missing
+% editortrfo = {{}{}}, % FIXME: missing
+% editorstrfo = {{}{}}, % FIXME: missing
+% editortraf = {{}{}}, % FIXME: missing
+% editorstraf = {{}{}}, % FIXME: missing
+% editorcoin = {{}{}}, % FIXME: missing
+% editorscoin = {{}{}}, % FIXME: missing
+% editorcofo = {{}{}}, % FIXME: missing
+% editorscofo = {{}{}}, % FIXME: missing
+% editorcoaf = {{}{}}, % FIXME: missing
+% editorscoaf = {{}{}}, % FIXME: missing
+% editoranin = {{}{}}, % FIXME: missing
+% editorsanin = {{}{}}, % FIXME: missing
+% editoranfo = {{}{}}, % FIXME: missing
+% editorsanfo = {{}{}}, % FIXME: missing
+% editoranaf = {{}{}}, % FIXME: missing
+% editorsanaf = {{}{}}, % FIXME: missing
+% editortrcoin = {{}{}}, % FIXME: missing
+% editorstrcoin = {{}{}}, % FIXME: missing
+% editortrcofo = {{}{}}, % FIXME: missing
+% editorstrcofo = {{}{}}, % FIXME: missing
+% editortrcoaf = {{}{}}, % FIXME: missing
+% editorstrcoaf = {{}{}}, % FIXME: missing
+% editortranin = {{}{}}, % FIXME: missing
+% editorstranin = {{}{}}, % FIXME: missing
+% editortranfo = {{}{}}, % FIXME: missing
+% editorstranfo = {{}{}}, % FIXME: missing
+% editortranaf = {{}{}}, % FIXME: missing
+% editorstranaf = {{}{}}, % FIXME: missing
+% translatorco = {{}{}}, % FIXME: missing
+% translatorsco = {{}{}}, % FIXME: missing
+% translatoran = {{}{}}, % FIXME: missing
+% translatorsan = {{}{}}, % FIXME: missing
+% translatorin = {{}{}}, % FIXME: missing
+% translatorsin = {{}{}}, % FIXME: missing
+% translatorfo = {{}{}}, % FIXME: missing
+% translatorsfo = {{}{}}, % FIXME: missing
+% translatoraf = {{}{}}, % FIXME: missing
+% translatorsaf = {{}{}}, % FIXME: missing
+% translatorcoin = {{}{}}, % FIXME: missing
+% translatorscoin = {{}{}}, % FIXME: missing
+% translatorcofo = {{}{}}, % FIXME: missing
+% translatorscofo = {{}{}}, % FIXME: missing
+% translatorcoaf = {{}{}}, % FIXME: missing
+% translatorscoaf = {{}{}}, % FIXME: missing
+% translatoranin = {{}{}}, % FIXME: missing
+% translatorsanin = {{}{}}, % FIXME: missing
+% translatoranfo = {{}{}}, % FIXME: missing
+% translatorsanfo = {{}{}}, % FIXME: missing
+% translatoranaf = {{}{}}, % FIXME: missing
+% translatorsanaf = {{}{}}, % FIXME: missing
+ byauthor = {{per}{per}},
+ byeditor = {{edici\´o a cura de}{ed\adddotspace de}},
+ bycompiler = {{compilaci\'o a cura de}{comp\adddotspace de}},
+ byredactor = {{redacci\'o a cura de}{red\adddotspace de}},
+ byreviser = {{revisió a cura de}{rev\adddotspace de}},
+ byfounder = {{fundat per}{\fund\adddotspace per}},
+ bycontinuator = {{continuat per}{cont\adddotspace per}},
+ bycollaborator = {{amb la co\l.laboraci\'o de}{amb la co\l.l\adddotspace de}},
+ bytranslator = {{traducció \lbx@fromlang\ a cura de}{trad\adddotspace\lbx@fromlang\ de}},
+ bycommentator = {{comentaris a cura de}{com\adddotspace de}},
+ byannotator = {{notes a cura de}{notes de}},
+ withcommentator = {{amb comentaris a cura de}{amb com\adddotspace a cura de}},
+ withannotator = {{amb notes a cura de}{amb notes de}},
+ withintroduction = {{amb l'introducci\'o a cura de}{amb l'intr\adddotspace de}},
+ withforeword = {{amb el pr\`oleg a cura de}{amb el pr\`ol\adddotspace de}},
+ withafterword = {{amb l'ep\'{\i}leg a cura de}{amb l'ep\'{\i}l\adddotspace de}},
+ byeditortr = {{edici\'o i traducci\'o \lbx@fromlang\ a cura de}%
+ {ed\adddotspace i trad\adddotspace\lbx@fromlang\ de}},
+ byeditorco = {{edició i comentaris a cura de}%
+ {ed\adddotspace i com\adddotspace de}},
+ byeditoran = {{edició i notes a cura de}%
+ {ed\adddotspace i not\adddotspace de}},
+ byeditorin = {{edició i introduccio a cura de}%
+ {ed\adddotspace i intr\adddotspace de}},
+ byeditorfo = {{edició i pr\`oleg a cura de}%
+ {ed\adddotspace i pr\`ol\adddotspace de}},
+ byeditoraf = {{edició i ep\'{\i}leg a cura de}%
+ {ed\adddotspace i ep\'{\i}l\adddotspace de}},
+ byeditortrco = {{edici\'o, traducci\'o \lbx@fromlang\ i comentaris a cura de}%
+ {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddotspace de}},
+ byeditortran = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura de}%
+ {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i not\adddotspace de}},
+ byeditortrin = {{edici\'o, traducci\'o \lbx@fromlang\ i introducci\'o a cura de}%
+ {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddotspace de}},
+ byeditortrfo = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura de}%
+ {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddotspace de}},
+ byeditortraf = {{edici\'o, traducci\'o \lbx@fromlang\ i ep\'{\i}leg a cura de}%
+ {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep\'{\i}l\adddotspace de}},
+ byeditorcoin = {{edici\'o, comentaris i introducci\'o a cura de}
+ {ed\adddot,\addabbrvspace com\adddotspace i intr\adddotspace de}},
+ byeditorcofo = {{edici\'o, comentaris i pr\`oleg a cura de}
+ {ed\adddot com\adddotspace i pr\`ol\adddotspace de}},
+ byeditorcoaf = {{edici\'o, comentaris i ep\'{\i}leg a cura de}%
+ {ed\adddot, com\adddotspace y epil\adddotspace de}},
+ byeditoranin = {{edici\'o, notes i introducci\'o a cura de}%
+ {ed\adddot, not\adddotspace i introd\adddotspace de}},
+ byeditoranfo = {{edici\'o, notes y pr\`oleg a cura de}%
+ {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace de}},
+ byeditoranaf = {{edici\'o, notes i ep\'{\i}leg a cura de}%
+ {ed.,\addabbrvspace not\adddotspace y ep\'{\i}l\adddotspace de}},
+ byeditortrcoin = {{edici\'o, traducció \lbx@fromlang, comentaris i introducci\'o a cura de}%
+ {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace de}},
+ byeditortrcofo = {{edici\'o, traducció \lbx@fromlang, comentaris i pr\`oleg a cura de}%
+ {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace de}},
+ byeditortrcoaf = {{edici\´o, traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{i}l\adddot\ de}},
+ byeditortranin = {{edici\´o, traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i intr\adddot\ de}},
+ byeditortranfo = {{edici\´o, traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i pr\`ol\adddot\ de}},
+ byeditortranaf = {{edici\´o, traducci\´o \lbx@fromlang, notes i ep\´{\i}leg a cura de}%
+ {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i ep\´{\i}l\adddot\ de}},
+ bytranslatorco = {{traducci\´o \lbx@fromlang\ i comentaris a cura de}%
+ {trad\adddot\ \lbx@fromlang\ i com\adddot\ de}},
+ bytranslatoran = {{traducci\´o \lbx@fromlang\ i notes a cura de}%
+ {trad\adddot\ \lbx@fromlang\ i not\adddot\ de}},
+ bytranslatorin = {{traducci\´o \lbx@fromlang\ i introducci\`o a cura de}%
+ {trad\adddot\ \lbx@fromlang\ i introd\adddot\ de}},
+ bytranslatorfo = {{traducci\´o \lbx@fromlang\ i pr\`oleg a cura de}%
+ {trad\adddot\ \lbx@fromlang\ i pr\`ol\adddot\ de}},
+ bytranslatoraf = {{traducci\´o \lbx@fromlang\ i ep\´{\i}leg a cura de}%
+ {trad\adddot\ \lbx@fromlang\ i ep\´{\i}l\adddot\ de}},
+ bytranslatorcoin = {{traducci\´o \lbx@fromlang, comentaris i introducci\´o a cura de}%
+ {trad\adddot\ \lbx@fromlang, com\adddot\ i introd\adddot\ de}},
+ bytranslatorcofo = {{traducci\´o \lbx@fromlang, comentaris y pr\`oleg a cura de}%
+ {trad\adddot\ \lbx@fromlang, com\adddot\ y pr\`ol\adddot\ de}},
+ bytranslatorcoaf = {{traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}%
+ {trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{\i}l\adddot\ de}},
+ bytranslatoranin = {{traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}%
+ {trad\adddot\ \lbx@fromlang, anot\adddot\ i introd\adddot\ de}},
+ bytranslatoranfo = {{traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}%
+ {trad\adddot\ \lbx@fromlang, not\adddot\ i pr\'ol\adddot\ de}},
+ bytranslatoranaf = {{traducci\´o \lbx@fromlang, notes i ep\´{\i}leg a cura de}%
+ {trad\adddot\ \lbx@fromlang, not\adddot\ y ep\´{\i}l\adddot\ de}},
+ and = {{i}{i}},
+ andothers = {{i d'altres\adddot}{i d'altres\adddot}},
+ andmore = {{\textit{et al.}}{\textit{et al.}}},
+ volume = {{volum}{vol\adddot}},
+ volumes = {{volums}{vols\adddot}},
+ jourvol = {{volum}{vol\adddot}},
+ jourser = {{\`epoca}{\`ep\adddot}},
+ book = {{llibre}{llib\addot}},
+ part = {{part}{part}},
+ issue = {{n\´umero}{n\´um\adddot}},
+ newseries = {{nova \`epoca}{n\adddotspace\`ep\adddot}},
+ oldseries = {{antiga \`epoca}{ant\adddotspace\`ep\adddot}},
+ edition = {{edici\'o}{ed\adddot}},
+ reprint = {{reimpressi\'o}{reimpr\adddot}},
+ reprintof = {{reimpressi\'o de}{reimpr\adddotspace de}},
+ reprintas = {{reimpr\`es com}{reimpr\adddotspace com}},
+ page = {{p\`agina}{p\adddot}},
+ pages = {{p\`agines}{pp\adddot}},
+ column = {{columna}{col\adddot}},
+ columns = {{columnes}{cols\adddot}},
+ line = {{l\'{\i}nia}{l\´{\i}n\adddot}},
+ lines = {{l\'{\i}nies}{l\´{\i}ns\adddot}},
+ verse = {{vers}{ver\adddot}},
+ verses = {{versos}{vers\adddot}},
+ section = {{apartat}{\S}},
+ sections = {{apartats}{\S\S}},
+ paragraph = {{par\`agraf}{par\adddot}},
+ paragraphs = {{par\`agrafs}{pars\adddot}},
+ in = {{a}{a}},
+ inseries = {{a}{a}},
+ ofseries = {{de}{de}},
+ number = {{n\'umero}{n\'um\adddot}},
+ chapter = {{cap\'{\i}tol}{cap\adddot}},
+ mathesis = {{tesi de m\`aster}{tesi de m\`aster}},
+ phdthesis = {{tesi doctoral}{tesi doct\adddot}},
+ resreport = {{informe de recerca}{inf\adddotspace de rec\adddot}},
+ techreport = {{informe t\`ecnic}{inf\adddotspace t\`ec\adddot}},
+ software = {{programari}{prog\adddot}},
+ datacd = {{CD de dades}{CD de dades}},
+ audiocd = {{CD d'audio}{CD d'audio}},
+ version = {{versi\'o}{ver\adddot}},
+ url = {{adreça}{adr\adddot}},
+ urlseen = {{visitat \ifthenelse{\thefield{urlday}=1}{l'}{el\space}}{vis\adddotspace}},
+ inpreparation = {{en preparaci\´o}{en prep\adddot}},
+ inpress = {{a impremta}{a impr\adddot}}, % Per revisar
+ submitted = {{enviat}{env\adddot}}, % Per revisar
+ forthcoming = {{disponible en breu}{disp\adddotspace en breu}},
+ citedas = {{citat en endavant com}{cit\adddotspace en endavant com}},
+ thiscite = {{aquesta citaci\´o}{cit\adddot}},
+ seenote = {{vegeu la nota}{veg\adddotspace la not\adddot}},
+ quotedin = {{citat a}{cit\adddot a}},
+ idem = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idemsf = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idemsm = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idemsn = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idempf = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idempm = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idempn = {{\'{\i}dem}{\'{\i}d\adddot}},
+ idempp = {{\'{\i}dem}{\'{\i}d\adddot}},
+ ibidem = {{ib\'{\i}dem}{ib\'{\i}d\adddot}},
+ opcit = {{\`op\adddotspace cit\adddot}{\`op\adddotspace cit\adddot}},
+ loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+ confer = {{cf\adddot}{cf\adddot}},
+ sequens = {{s\adddot}{s\adddot}},
+ sequentes = {{ss\adddot}{ss\adddot}},
+ passim = {{p\`assim}{p\`assim}},
+ see = {{vegeu}{vegeu}},
+ seealso = {{vegeu tamb\'e}{veg\adddotspace tamb\'e}},
+ backrefpage = {{vegeu la p\`agina}{veg\adddotspace la p\`ag\adddot}},
+ backrefpages = {{vegeu les p\`agines}{veg\adddotspace les p\`ag\adddot}},
+ january = {{gener}{gen\adddot}},
+ february = {{febrer}{feb\adddot}},
+ march = {{març}{març}},
+ april = {{abril}{abr\adddot}},
+ may = {{maig}{maig}},
+ june = {{juny}{juny}},
+ july = {{juliol}{jul\adddot}},
+ august = {{agost}{ago\adddot}},
+ september = {{setembre}{set\adddot}},
+ october = {{octubre}{oct\adddot}},
+ november = {{novembre}{nov\adddot}},
+ december = {{desembre}{des\adddot}},
+ langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}},
+ langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}},
+ langcroatian = {{croat}{croat}},
+% langcatalan = {{catal\`a}{catal\`a}},
+ langdanish = {{dan\`es}{dan\adddot}},
+ langdutch = {{neerland\`es}{neerland\`es}},
+ langenglish = {{angl\`es}{ang\adddot}},
+ langfinish = {{fin\`es}{fin\`es}},
+ langfrench = {{franc\`es}{fran\adddot}},
+ langgerman = {{alemany}{alem\adddot}},
+ langgreek = {{grec}{grec}},
+ langitalian = {{italià}{ital\adddot}},
+ langlatin = {{llat\'{\i}}{llat\'{\i}}},
+ langnorwegian = {{noruec}{noruec}},
+ langportuguese = {{portugu\`es}{port\adddot}},
+ langrussian = {{rus}{rus}},
+ langspanish = {{castell\`a}{cast\adddot}},
+ langswedish = {{suec}{suec}},
+ fromamerican = {{de l'anglès americ\`a}{de l'ang\adddotspace amer\adddot}},
+ frombrazilian = {{del portugu\`es brasiler}{del port\adddot bras\adddot}},
+ fromcroatian = {{del croat}{del croat}},
+% fromcatalan = {{del catal\`a}{del catal\`a}},
+ fromdanish = {{del dan\`es}{del dan\ès}},
+ fromdutch = {{del neerland\`es}{del neerl\adddot}},
+ fromenglish = {{de l'angl\`es}{de l'ang\adddot}},
+ fromfinish = {{del fin\`es}{del fin\`es}},
+ fromfrench = {{del franc\`es}{del fran\adddot}},
+ fromgerman = {{de l'alemany}{de l'alem\adddot}},
+ fromgreek = {{del grec}{del grec}},
+ fromitalian = {{de l'itali\`a}{de l'ital\adddot}},
+ fromlatin = {{del llat\'{\i}}{del llat\'{\i}}},
+ fromnorwegian = {{del noruec}{del noruec}},
+ fromportuguese = {{del portugu\`es}{del port\adddot}},
+ fromrussian = {{del rus}{del rus}},
+ fromspanish = {{del castell\`a}{del cast\adddot}},
+ fromswedish = {{del suec}{del suec}},
+% countryca = {{Catalunya}{CAT}},
+ countryde = {{Alemanya}{DE}},
+ countryeu = {{Uni\'o Europea}{UE}},
+ countryep = {{Uni\'o Europea}{UE}},
+ countryfr = {{França}{FR}},
+ countryuk = {{Regne Unit}{GB}},
+ countryus = {{Estats Units d'Am\`erica}{US}},
+ patent = {{patent}{pat\adddot}},
+ patentde = {{patent alemana}{pat\adddot\ alem\adddot}},
+ patenteu = {{patent europea}{pat\adddot\ eur\adddot}},
+ patentfr = {{patent francesa}{pat\adddot\ fran\adddot}},
+ patentuk = {{patent brit\`anica}{pat\adddot\ brit\adddot\adddot}},
+ patentus = {{patent americana}{pat\adddot\ amer\adddot}},
+ patreq = {{so\l.licitud de patent}{so\l.l\adddotspace de pat\adddot}},
+ patreqde = {{so\l.licitud de patent alemana}{so\l.l\adddotspace de pat\adddot\ alem\adddot}},
+ patreqeu = {{so\l.licitud de patent europea}{so\l.l\adddotspace de pat\adddot\ eur\adddot}},
+ patreqfr = {{so\l.licitud de patent francesa}{so\l.l\adddotspace de pat\adddot\ fran\adddot}},
+ patrequk = {{so\l.licitud de patent brit\`anica}{so\l.l\adddotspace de pat\adddot\ brit\adddot}},
+ patrequs = {{so\l.licitud de patent americana}{so\l. l\adddotspace de pat\adddot\ amer\adddot}},
+ file = {{fitxer}{fitx\adddot}},
+ library = {{biblioteca}{bibl\adddot}},
+ abstract = {{resum}{resum}},
+ annotation = {{anotaci\´o}{anot\adddot}},
+}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index 9fd7c10b7bb..021b6da470b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -298,6 +298,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
% inpress = {{}{}}, % FIXME: missing
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{herefter citeret som}{herefter cit\adddot\ som}},
% thiscite = {{}{}}, % FIXME: missing
seenote = {{se note}{se note}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 66d8e787507..a14fce51fe5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -336,6 +336,7 @@
submitted = {{ingediend}{ingedied}},
% forthcoming = {{}{}}, % FIXME: missing
inpress = {{in druk}{in druk}},
+% prepublished = {{}{}}, % FIXME: missing
page = {{pagina}{p\adddot}},
pages = {{pagina's}{p\adddot}},
column = {{kolom}{kol\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index e4e1ec50117..0d8622e5635 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -374,6 +374,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
submitted = {{submitted}{submitted}},
forthcoming = {{forthcoming}{forthcoming}},
inpress = {{in press}{in press}},
+ prepublished = {{pre-published}{pre-published}},
citedas = {{henceforth cited as}{henceforth cited as}},
thiscite = {{especially}{esp\adddot}},
seenote = {{see note}{see n\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 499bbaf4afc..930334fea5e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -373,6 +373,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
% inpress = {{}{}}, % FIXME: missing
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{jatkossa}{jatkossa}},
% thiscite = {{}{}}, % FIXME: missing
seenote = {{katso viite}{katso viite}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 903bd0e636d..1a2b9dd0f19 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -309,6 +309,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
% inpress = {{}{}}, % FIXME: missing
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{d\'esign\'e ci-apr\`es par}{ci-apr\`es}},
% thiscite = {{}{}}, % FIXME: missing
seenote = {{voir note}{cf\adddotspace note}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index a6785385041..4f2355d129d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -360,6 +360,7 @@
submitted = {{eingereicht}{eingereicht}},
forthcoming = {{im Erscheinen}{im Erscheinen}},
inpress = {{im Druck}{im Druck}},
+ prepublished = {{Vorver\"offentlichung}{Vorver\"offentlichung}},
citedas = {{im folgenden zitiert als}{im folgenden zit\adddotspace als}},
thiscite = {{hier}{hier}},
seenote = {{siehe Anmerkung}{s\adddotspace Anm\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 6d3164c5fa0..beae0ffc979 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -361,6 +361,7 @@
submitted = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender?
% forthcoming = {{}{}}, % FIXME: missing
inpress = {{υπό έκδοση}{υπό έκδ.}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}},
thiscite = {{αυτή η αναφορά}{αυτή η αναφορά}},
seenote = {{βλέπε σημείωση}{βλ\adddot\ σημ\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
index 8209165695e..4d11804fd68 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
@@ -308,6 +308,7 @@
submitted = {{afhent til birtingar}{afhent til birtingar}},
forthcoming = {{mun birtast}{mun birtast}},
inpress = {{\'{\i} prentun}{\'{\i} prentun}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{h\'er eftir skammstafa}{h\'er eftir skst\adddot}},
seenote = {{sj\'a athugasemd}{sj\'a aths\adddot}},
quotedin = {{tilvitnun samkv\ae{}mt}{tilvitnun skv\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 048c1fcf099..c679d36a711 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -288,6 +288,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
inpress = {{in stampa}{in stampa}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{citato come}{cit\adddotspace come}},
% thiscite = {{}{}}, % FIXME: missing
seenote = {{vedi nota}{v\adddotspace nota}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index eca364cc13d..263bbef6961 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -295,7 +295,7 @@
part = {{del}{del}},
issue = {{nummer}{nr\adddot}},
newseries = {{ny serie}{ny ser\adddot}},
- oldseries = {{gammel serie}{gml\adddotspace ser\adddot}},
+ oldseries = {{gammel serie}{gl\adddotspace ser\adddot}},
edition = {{utgave}{utg\adddot}},
reprint = {{opptrykk}{opptr\adddot}},
reprintof = {{opptrykk av}{opptr\adddotspace av}},
@@ -341,6 +341,7 @@
submitted = {{innsendt}{innsendt}},
forthcoming = {{under utgivelse}{under utgiv\adddot}},
inpress = {{i trykken}{i trykken}},
+ prepublished = {{prepublisert}{prepubl\adddot}},
citedas = {{fremover sitert som}{fremover sit\adddotspace som}},
thiscite = {{her}{her}},
seenote = {{se note}{se n\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 6919932e93b..cefa9aa80a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -231,7 +231,7 @@
{oms\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
andothers = {{med fleire}{mfl\adddot}},
andmore = {{med meir}{m.m\adddot}},
- oldseries = {{gamal serie}{gml\adddotspace ser\adddot}},
+ oldseries = {{gamal serie}{gl\adddotspace ser\adddot}},
edition = {{utg{\aa}ve}{utg\adddot}},
reprintfrom = {{opptrykk fr{\aa}}{opptr\adddotspace fr{\aa}}},
translationof = {{omsetjing av}{oms\adddotspace av}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index b67cd53037f..ff53eb131fd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -363,6 +363,7 @@
submitted = {{submetido}{subm\adddot}},
% forthcoming = {{}{}}, % FIXME: missing
inpress = {{na imprensa}{na imp\addot}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{doravante citado como}{doravante citado como}},
seenote = {{ver nota}{ver nota}},
quotedin = {{apud}{apud}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
index 6125e498ed5..1dbac38c81e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
@@ -383,6 +383,7 @@
submitted = {{представлено}{предст\adddot}},
forthcoming = {{в печати}{в печ\adddot}},
inpress = {{в\addabbrvspace печати}{в печ\adddot}},
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{далее цитируется как}{далее цит\addabbrvspace как}},
thiscite = {{здесь}{здесь}},
seenote = {{смотри сноску}{см\adddotspace сн\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index bab99bc453c..922a67069d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -298,6 +298,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
% inpress = {{}{}}, % FIXME: missing
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{citado en adelante como}{cit\adddotspace en adelante como}},
% thiscite = {{}{}}, % FIXME: missing
% seenote = {{}{}}, % FIXME: missing
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index 0015404cca8..785a9a42287 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -332,6 +332,7 @@
% submitted = {{}{}}, % FIXME: missing
% forthcoming = {{}{}}, % FIXME: missing
% inpress = {{}{}}, % FIXME: missing
+% prepublished = {{}{}}, % FIXME: missing
citedas = {{h\"adanefter citerad som}{h\"adanefter cit\adddotspace som}},
% thiscite = {{}{}}, % FIXME: missing
seenote = {{se not}{se not}},