diff options
14 files changed, 193 insertions, 152 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex/CHANGES.org b/Master/texmf-dist/doc/latex/biblatex/CHANGES.md index 31c4e2dbe59..6e6d0382fb9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/CHANGES.org +++ b/Master/texmf-dist/doc/latex/biblatex/CHANGES.md @@ -1,60 +1,81 @@ -* RELEASE NOTES FOR VERSION 3.8a -** Bug fix release +# RELEASE NOTES FOR VERSION 3.9 +## Bug fix release +- Fix `\mkpagetotal` +- Fix issue with refcontexts not appearing in some circumstances +- ** DEPRECATION NOTICE ** The coming update to the ISO8601 standard + supercedes the draft EDTF (Extended Date Time Format) extensions. + When the new ISO8601 standard is public, biblatex will therefore + support the ISO8601-2 Clause 4, Level 1 Extended Format which is + equivalent to the draft EDTF standard but with different syntax. This + syntax is in some cases not backwards compatible. Biblatex will not + support backwards compatibility for the draft EDTF syntax because it is + too messy to do so and few people were using this anyway since it is a + relatively new and specialised feature. Please note these syntax changes + which will effect only the formatting of DATE fields in bibliography + datasources: + - The "unspecified" marker `u` is now `X` + - An approximate+uncertain date is now indicated with `%` rather than `?~` + - Open dates are now marked with `..` instead of `open` or blank start/end dates. + - Unknown dates are now indicated by blank start/end dates rather than `unknown` or `*` + +# RELEASE NOTES FOR VERSION 3.8a +## Bug fix release - Documentation version fix and loop fix in certain styles -* RELEASE NOTES FOR VERSION 3.8 -** Requirements + +# RELEASE NOTES FOR VERSION 3.8 +## Requirements Biber version 2.8 is required for biblatex 3.8 -** In order to standardise terminology, some commands and options have dropped the "scheme" naming convention and switched to "template" -- ~\DeclareSortingScheme~ is now ~\DeclareSortingTemplate~ -- ~\DeclareSortingNamekeyScheme~ is now ~\DeclareSortingNamekeyTemplate~ +## In order to standardise terminology, some commands and options have dropped the "scheme" naming convention and switched to "template" +- `\DeclareSortingScheme` is now `\DeclareSortingTemplate` +- `\DeclareSortingNamekeyScheme` is now `\DeclareSortingNamekeyTemplate` - The "sortingnamekeyscheme" option is now "sortingnamekeytemplate" -** ~\DeclareLabelalphaNameTemplate~ no longer has entrytype scope -- *INCOMPATIBLE CHANGE* The optional first argument to - ~\DeclareLabelalphaNameTemplate~ was previously an entrytype but is now an - arbitrary template name, as with ~\DeclareUniquenameTemplate~. This is to +## `\DeclareLabelalphaNameTemplate` no longer has entrytype scope +- **INCOMPATIBLE CHANGE** The optional first argument to + `\DeclareLabelalphaNameTemplate` was previously an entrytype but is now an + arbitrary template name, as with `\DeclareUniquenameTemplate`. This is to allow multiple definitions which can be referred to at different scopes. It is unlikely that anyone used this with entrytype scope anyway. -** ~origlanguage~ is now a list instead of a field. -- *INCOMPATIBLE CHANGE* Since this is mostly used to generate localisation strings like - 'Translated from the <language>' via the internal macros ~lbx@lfromlang~ - and ~\lbx@sfromlang~, users and style authors should not see any - differences. However, if your style prints ~origlanguage~ directly using - ~\printfield~, this will need to be changed to ~\printlist~. +## `origlanguage` is now a list instead of a field. +- **INCOMPATIBLE CHANGE** Since this is mostly used to generate localisation strings like + 'Translated from the <language>' via the internal macros `lbx@lfromlang` + and `\lbx@sfromlang`, users and style authors should not see any + differences. However, if your style prints `origlanguage` directly using + `\printfield`, this will need to be changed to `\printlist`. -** Name handling enhancements +## Name handling enhancements - Name handling is now fully generalised to cover arbitrary name parts. The final few pieces have been completed to allow fully customisable name handling, allowing for better internationalisation. The code for name uniqueness calculation and label generation for names is now fully - abstracted: templates created with ~\DeclareUniquenameTemplate~ and - ~\DeclareLabelalphaNameTemplate~ may now be specified at per-refcontext, + abstracted: templates created with `\DeclareUniquenameTemplate` and + `\DeclareLabelalphaNameTemplate` may now be specified at per-refcontext, per-entry, per-namelist and per-name scope, which allows complete control over all aspects of name usage. See the comments in the enhanced - ~93-nameparts.tex~ example file. + `93-nameparts.tex` example file. -** ~extrayear~ is now ~extradate~ and the information used to track this can be customised -- ~extrayear~ is called ~extradate~ now. Limited backwards compatibility is +## `extrayear` is now `extradate` and the information used to track this can be customised +- `extrayear` is called `extradate` now. Limited backwards compatibility is in place to allow a smooth transition, but style developers should use the new name. - The new \DeclareExtradate command allows users to track authoryear disambiguation in arbitrary ways now, for example allowing disambiguation at month or day level instead of just year. See the PDF doc for details. -- Some bibmacros from the ~authoryear~ style family were renamed, - ~cite:labelyear+extrayear~ becomes ~cite:labeldate+extradate~, - ~cite:extrayear~ is ~cite:extradate~ now, and ~date+extrayear~ - is ~date+extradate~. Some backwards compatibility code is present, +- Some bibmacros from the `authoryear` style family were renamed, + `cite:labelyear+extrayear` becomes `cite:labeldate+extradate`, + `cite:extrayear` is `cite:extradate` now, and `date+extrayear` + is `date+extradate`. Some backwards compatibility code is present, but developers should make sure their code works as expected. -** Date formatting -- The ~mergedate~ output has been restored to its earlier form, +## Date formatting +- The `mergedate` output has been restored to its earlier form, it has also been extended to cover all EDTF date parts. In order to facilitate this, a few date-related tests were introduced - ~\iflabeldateisdate~, ~\ifdatehasyearonlyprecision~, ~\ifdatehastime~ - and ~\ifdateshavedifferentprecision~. -- The ~authoryear~ citation styles now use ~\printlabeldateextra~ - instead of ~\printfield{labelyear}\printfield{extrayear}~. + `\iflabeldateisdate`, `\ifdatehasyearonlyprecision`, `\ifdatehastime` + and `\ifdateshavedifferentprecision`. +- The `authoryear` citation styles now use `\printlabeldateextra` + instead of `\printfield{labelyear}\printfield{extrayear}`. This should have no consequences for end users (except that dates in citations and bibliography don't differ any more - previously there were subtle differences when many EDTF features @@ -63,7 +84,7 @@ Biber version 2.8 is required for biblatex 3.8 Style developers are invited to have a look at the changes and to get inspired to offer full EDTF format for their styles as well. -** Set handling +## Set handling - Static entry sets used to have the behaviour that when citing a member of a set, the data for the citation came from the set parent which was in turn taken from the first member of the set. In most use cases, the only @@ -72,19 +93,19 @@ Biber version 2.8 is required for biblatex 3.8 citations for set members. This has been refactored so that when citing set members, the member data is used along with some labelling data injected from the set parent. This means that things like - ~\citeauthor{somesetmember}~ now give the expected results. + `\citeauthor{somesetmember}` now give the expected results. *PLEASE NOTE* that this means that citing sets directly in default styles *not* - based on labels (~authoryear~, ~authortitle~, ~verbose~ etc.) will result + based on labels (`authoryear`, `authortitle`, `verbose` etc.) will result in blank citations as it is not envisaged that sets are useful in such styles. - The members of a set can now be sorted according to the active - sorting scheme, this is enabled via the ~sortsets~ option. + sorting scheme, this is enabled via the `sortsets` option. By default the option is set to false and set members appear in the order given in the data source. -- The ~alphabetic~ style family now also supports the ~subentry~ +- The `alphabetic` style family now also supports the `subentry` option. -** Localisation and styles +## Localisation and styles - Styles which supply their own location strings in .lbx files typically use \DeclareLanguageMapping to map a document language to the supplied language files. This is not ideal because the mapping has to be done by @@ -115,79 +136,79 @@ Biber version 2.8 is required for biblatex 3.8 will be loaded. \DeclareLanguageMapping, if present, will override \DeclareLanguageMappingSuffix. -** Context-sensitive delimiters +## Context-sensitive delimiters - Several delimiter macros now use the context-sensitive delimiter interface - introduced in version 3.4 (~\DeclareDelimFormat~). This change is fully + introduced in version 3.4 (`\DeclareDelimFormat`). This change is fully backwards compatible, but style developers should feel encouraged to use the - new commands ~\DeclareDelimFormat~ and ~\printdelim~. -- Three new delimiters are introduced. ~authortypedelim~, ~editortypedelim~, - and ~translatortypedelim~ control the delimiter between the respective name - and the following ~<name>~ bibstring. - This together with ~\DeclareFieldFormat{<name>type}~ allows one to go from + new commands `\DeclareDelimFormat` and `\printdelim`. +- Three new delimiters are introduced. `authortypedelim`, `editortypedelim`, + and `translatortypedelim` control the delimiter between the respective name + and the following `<name>` bibstring. + This together with `\DeclareFieldFormat{<name>type}` allows one to go from 'E. Ditor, ed.' to 'E. Ditor (ed.)' more easily without the need to redefine entire bibmacros. -- ~\DeclareDelimAlias~ allows one to alias one delimiter to another. - E.g. ~\DeclareDelimAlias{finalnamedelim}{multinamedelim}~ - will make ~finalnamedelim~ an alias for ~multinamedelim~. - The starred version ~\DeclareDelimAlias*~ is local to the +- `\DeclareDelimAlias` allows one to alias one delimiter to another. + E.g. `\DeclareDelimAlias{finalnamedelim}{multinamedelim}` + will make `finalnamedelim` an alias for `multinamedelim`. + The starred version `\DeclareDelimAlias*` is local to the specified contexts. -** Misc changes -- The initialisation code for ~\usedriver~ can now be modified via - ~\AtUsedriver~, the code can be executed with ~\UseUsedriverHook~. +## Misc changes +- The initialisation code for `\usedriver` can now be modified via + `\AtUsedriver`, the code can be executed with `\UseUsedriverHook`. The default settings retain backwards compatibility with earlier versions. -- The field ~urlraw~ contains the unencoded, raw version of the URL. - If the URL includes Unicode characters, ~urlraw~ will show them - unencoded while the standard ~url~ field will contain them in +- The field `urlraw` contains the unencoded, raw version of the URL. + If the URL includes Unicode characters, `urlraw` will show them + unencoded while the standard `url` field will contain them in percent-encoded form. -- ~\mkpagetotal~ now has its own bibstrings ~<pagination>total(s)~ - Previously it relied on the ~<pagination>(s)~ bibstrings. -- ~sortyear~ is now a literal field and not an integer. -- The ~etextools~ package is now officially incompatible. -- ~bidi~-support for footnotes was improved. -- ~\ifentryseen~, ~\ifentryinbib~, ~\ifentrycategory~ - and ~\ifentrykeyword~ can now be used outside of - ~biblatex~ macros directly in the document. -- ~\letbibmacro~ can be used to create bibmacro aliases as if - using ~\let~. -- ~\DeprecateFieldWithReplacement~, ~\DeprecateListWithReplacement~ - and ~\DeprecateNameWithReplacement~ can be used to deprecate a field, +- `\mkpagetotal` now has its own bibstrings `<pagination>total(s)` + Previously it relied on the `<pagination>(s)` bibstrings. +- `sortyear` is now a literal field and not an integer. +- The `etextools` package is now officially incompatible. +- `bidi`-support for footnotes was improved. +- `\ifentryseen`, `\ifentryinbib`, `\ifentrycategory` + and `\ifentrykeyword` can now be used outside of + `biblatex` macros directly in the document. +- `\letbibmacro` can be used to create bibmacro aliases as if + using `\let`. +- `\DeprecateFieldWithReplacement`, `\DeprecateListWithReplacement` + and `\DeprecateNameWithReplacement` can be used to deprecate a field, name or list and replace it with a new one. -* RELEASE NOTES FOR VERSION 3.7 -** Requirements +# RELEASE NOTES FOR VERSION 3.7 +## Requirements Biber version 2.7 is required for biblatex 3.7 Bugfix release. -* RELEASE NOTES FOR VERSION 3.6 -** Requirements +# RELEASE NOTES FOR VERSION 3.6 +## Requirements Biber version 2.6 is required for biblatex 3.6 This is a minor bugfix release. -* RELEASE NOTES FOR VERSION 3.5 -** Requirements +# RELEASE NOTES FOR VERSION 3.5 +## Requirements Biber version 2.6 is required for biblatex 3.5 -** Name support -- *INCOMPATIBLE CHANGE* The labelling system has been generalised - to be able to deal better with names. ~\DeclareLabelalphaTemplate~ no +## Name support +- **INCOMPATIBLE CHANGE** The labelling system has been generalised + to be able to deal better with names. `\DeclareLabelalphaTemplate` no longer uses hard-coded name parts (prefix, family) when extracting label parts from name fields. Name field label extraction now obeys the new - ~\DeclareLabelalphaNameTemplate~ specification which details how to extract + `\DeclareLabelalphaNameTemplate` specification which details how to extract label information from each namepart known to the data model. The default setting is backwards compatible with the old hard-coded behaviour. - However, if you have custom ~\DeclareLabelalphaTemplate~ specifications, - you should note that the "pcompound" and "pstrwidth" options to ~\field~ - are now gone and replaced with the relevant settings on ~\namepart~ in - ~\DeclareLabelalphaNameTemplate~. The old options will generate warnings. + However, if you have custom `\DeclareLabelalphaTemplate` specifications, + you should note that the "pcompound" and "pstrwidth" options to `\field` + are now gone and replaced with the relevant settings on `\namepart` in + `\DeclareLabelalphaNameTemplate`. The old options will generate warnings. It is too complex to provide backwards compat for this, sorry - please update your templates if necessary. This is one of the last changes needed to fully generalise name handling. -** Date input and output +## Date input and output Major enhancements to the dates parsed by biblatex and the output formats available. Biblatex now supports [[http://www.loc.gov/standards/datetime/pre-submission.html][EDTF]] level 0 and 1. This is an enhanced ISO8601v2004 format suitable for bibliographic data. The new support is a @@ -201,68 +222,68 @@ manual and its changelog for details of usage. The new date format functionality is backwards compatible. The following changes are more detailed and mostly of interest to style authors: -- The ~iso8601~ date output format is now called ~edtf~. The old name will - automatically use ~edtf~ and issue a deprecation warning. -- ~\bibdatedash~ is now ~\bibdaterangesep~ as this name is more +- The `iso8601` date output format is now called `edtf`. The old name will + automatically use `edtf` and issue a deprecation warning. +- `\bibdatedash` is now `\bibdaterangesep` as this name is more informative and more descriptive of how it is actually used. A backwards compat alias is provided. -- Pre-biblatex 2.0 legacy sorting scheme definition macros ~\name~ and - ~\list~ are now deprecated with warnings. -- *INCOMPATIBLE CHANGE* The ~labeldate~ option is renamed to - ~labeldateparts~. The ~datelabel~ option is renamed to ~labeldate~ to +- Pre-biblatex 2.0 legacy sorting scheme definition macros `\name` and + `\list` are now deprecated with warnings. +- **INCOMPATIBLE CHANGE** The `labeldate` option is renamed to + `labeldateparts`. The `datelabel` option is renamed to `labeldate` to provide consistency with all other date options. Backwards compatibility is provided and warnings will be issued. - The new date system necessitated changes to the default year printing routine for citations in the default authoryear styles. If you wish to take advantage of the new date features like circa, uncertainty and eras, when printing citations in authoryear styles, see the enhanced - ~cite:labelyear+extrayear~ macros in any of the default authoryear + `cite:labelyear+extrayear` macros in any of the default authoryear styles. -- The ~labelyear~ field was inconsistently implemented and in fact could +- The `labelyear` field was inconsistently implemented and in fact could sometimes contain a date range which made handling it rather difficult. It is now guaranteed to contain only one year, when it is a copy of an - existing datepart field found by ~\DeclareLabeldate~ (~labelyear~ can + existing datepart field found by `\DeclareLabeldate` (`labelyear` can contain a literal/bibstring or non date field too). A new field - ~labelendyear~ will contain the end of the labeldate year range. The same + `labelendyear` will contain the end of the labeldate year range. The same applies to labelmonth and labelday. -- The internal macros ~\mkbibrange*~ have all been changed to - ~\mkdaterange*~ to make the name more obvious (since they only deal with - dates) and for consistency with the new ~\mktimerange*~ macros. These +- The internal macros `\mkbibrange*` have all been changed to + `\mkdaterange*` to make the name more obvious (since they only deal with + dates) and for consistency with the new `\mktimerange*` macros. These macros are usually only used in style .lbx files and the old names will generate a deprecation warning. -- The option ~datezeros~ was inconsistent as it did not enforce zeros when +- The option `datezeros` was inconsistent as it did not enforce zeros when set to 'true', it merely preserved the field. In the new date internals, leading zeros are not present after date parsing as this should always be - a formatting/style decision. Now, ~datezeros~ enforces leading zeros and + a formatting/style decision. Now, `datezeros` enforces leading zeros and also handles all date parts. -- ~\mkdatezeros~ has been replaced with ~\mkyearzeros~, ~\mkmonthzeros~ and - ~\mkdayzeros~ due to the date internals changes which are more consistent - about integer formats of date parts. ~\mkdatezeros~ now generates a - deprecation warning and calls ~\mkmonthzeros~ which is backwards compatible +- `\mkdatezeros` has been replaced with `\mkyearzeros`, `\mkmonthzeros` and + `\mkdayzeros` due to the date internals changes which are more consistent + about integer formats of date parts. `\mkdatezeros` now generates a + deprecation warning and calls `\mkmonthzeros` which is backwards compatible with its old behaviour. -- *INCOMPATIBLE CHANGE* The .bbl field ~datelabelsource~ has been renamed to - ~labeldatesource~ to prevent confusion with other fields. In the unlikely +- **INCOMPATIBLE CHANGE** The .bbl field `datelabelsource` has been renamed to + `labeldatesource` to prevent confusion with other fields. In the unlikely event that you referenced this field in a style, please change the name. -- *INCOMPATIBLE CHANGE* The macro ~\printdatelabel~ has been renamed to - ~\printlabeldate~ in line with the naming of all other date printing +- **INCOMPATIBLE CHANGE** The macro `\printdatelabel` has been renamed to + `\printlabeldate` in line with the naming of all other date printing macros. Please use the new name. The old one will issue a deprecation warning. -- *INCOMPATIBLE CHANGE* The macro ~\printdatelabelextra~ has been renamed to - ~\printlabeldateextra~ in line with the naming of all other date printing +- **INCOMPATIBLE CHANGE** The macro `\printdatelabelextra` has been renamed to + `\printlabeldateextra` in line with the naming of all other date printing macros. Please use the new name. The old one will issue a deprecation warning. -** Misc changes +## Misc changes - The experimental RIS format support is no longer available as it was rarely used and made biber maintenance more complicated. RIS is a very primitive format and not much use anyway. -- *INCOMPATIBLE CHANGE* The ~singletitle~ option no longer considers the +- **INCOMPATIBLE CHANGE** The `singletitle` option no longer considers the presence of labeltitle if labelname does not exist. This has always been potentially confusing. For several versions now, there has been a separate test and option for labeltitle called "uniquetitle". -- *INCOMPATIBLE CHANGE* The ~sortgiveninits~ option has been deprecated and +- **INCOMPATIBLE CHANGE** The `sortgiveninits` option has been deprecated and the functionality generalised. It is replaced by the "inits" option to - ~\namepart~ in ~\DeclareSortingNamekeyScheme~. Any nameparts may now + `\namepart` in `\DeclareSortingNamekeyScheme`. Any nameparts may now therefore be sorted using initials only. -- *INCOMPATIBLE CHANGE* The sorting subsystem in biber has been completely +- **INCOMPATIBLE CHANGE** The sorting subsystem in biber has been completely re-engineered to support better sorting of different datatypes. Previously, due to bibtex limitations, all sorting was lexical, even for numbers. This is why the padding options for things like volume in the diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex d40ab5abd90..4b0237ba8d1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex index 10854ad0fab..bff2ce812b5 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -60,7 +60,7 @@ url={\biblatexhome}, author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)}, email={}, - revision={3.8a}, + revision={3.9}, date={\today}} \hypersetup{% @@ -168,7 +168,7 @@ This package provides advanced bibliographic facilities for use with \latex. The \subsection{License} -Copyright \textcopyright\ 2006--2012 Philipp Lehman, 2012--2016 Philip Kime, Audrey Boruvka, Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.latex-project.org/lppl.txt} +Copyright \textcopyright\ 2006--2012 Philipp Lehman, 2012--2017 Philip Kime, Audrey Boruvka, Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.latex-project.org/lppl.txt} \subsection{Feedback} \label{int:feb} @@ -353,6 +353,7 @@ compatibility matrix for the recent versions. \sffamily\bfseries\spotcolor Biber version & \sffamily\bfseries\spotcolor \biblatex\ version\\ \midrule +2.9 & 3.9\\ 2.8 & 3.8\\ 2.7 & 3.7\\ 2.6 & 3.5, 3.6\\ @@ -9622,7 +9623,11 @@ Similar to \cmd{ifbibstring}, but the \prm{string} is expanded. \cmditem{iffieldbibstring}{field}{true}{false} -Similar to \cmd{ifbibstring}, but uses the value of a \prm{field} rather than a literal string in the test. If the \prm{field} is undefined, it expands to \prm{false}. +Similar to \cmd{ifbibstring}, but uses the value of a \prm{field} rather than a literal string in the test. If the \prm{field} is undefined, it expands to \prm{false}. + +\cmditem{iffieldplusstringbibstring}{field}{string}{true}{false} + +Similar to \cmd{iffieldplusstringbibstring}, but appends \prm{string} to the value of \prm{field} and checks if the resulting string is a known localisation key. Expands to \prm{false} if \prm{field} is undefined. \cmditem{ifdriver}{entrytype}{true}{false} @@ -13206,6 +13211,10 @@ use$<$name$>$ &\+&\+&\_&\+&\+&\_&\_\\ This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. More technical details are to be found in the \file{CHANGES.org} file. The numbers on the right indicate the relevant section of this manual. \begin{changelog} +\begin{release}{3.9}{2017-11-21} +\item Added \cmd{iffieldplusstringbibstring}\see{aut:aux:tst} +\item Fixed \cmd{mkpagetotal}\see{aut:aux:msc} +\end{release} \begin{release}{3.8}{2017-11-04} \item Added \kvopt{hyperref}{manual} option\see{use:opt:pre:gen} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf Binary files differindex b66e6106e53..3a5dd04f341 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf Binary files differindex 3d56b171906..c3fcf384f0e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf Binary files differindex 9157a730a2e..fdd03a8b375 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf Binary files differindex 16d6eae2c7d..f43f98e8e9f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf Binary files differindex 77d7d34fa4b..42495d57c85 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf Binary files differindex 5290b564ced..a6e3696e8c4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf Binary files differindex 96064cf4d05..85eda57f103 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf Binary files differindex 3b3b19e7ce6..f5526b3feb9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf Binary files differindex 8a6a9e26030..416d6fc3311 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index a20692d4af3..ca14c7e0be1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -11,8 +11,8 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2017/11/05} -\def\abx@version{3.8a} +\def\abx@date{2017/11/21} +\def\abx@version{3.9} \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)} @@ -2923,10 +2923,10 @@ {} {\iffieldequalstr{#1}{none} {\def\blx@tempa{\blx@mkpagetotal@i}} - {\iffieldbibstring{#1total} - {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1total}}}} + {\iffieldplusstringbibstring{#1}{total} + {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}total}}} {\blx@warning@entry{% - Unknown pagination type '\strfield{#1total}'}}}}% + Unknown pagination type '\strfield{#1}total'}}}}% \@ifnextchar[%] {\blx@tempa} {\blx@tempa[\@firstofone]}} @@ -4402,6 +4402,16 @@ \csname abx@field@#1\endcsname}} {\@secondoftwo} {\@firstoftwo}}} + +% {<field>}{<string>}{<true>}{<false>} +\def\blx@imc@iffieldplusstringbibstring#1#2{% + \blx@imc@iffieldundef{#1} + {\@secondoftwo} + {\ifcsundef{\abx@str @\detokenize\expandafter + \expandafter\expandafter{% + \csname abx@field@#1\endcsname}#2} + {\@secondoftwo} + {\@firstoftwo}}} \blx@regimcs{% \bibstring \biblstring \bibsstring @@ -4409,7 +4419,8 @@ \bibcpstring \bibcplstring \bibcpsstring \biblcstring \biblclstring \biblcsstring \bibucstring \bibuclstring \bibucsstring - \ifbibstring \ifbibxstring \iffieldbibstring} + \ifbibstring \ifbibxstring \iffieldbibstring + \iffieldplusstringbibstring} \let\blx@hook@uc\relax \let\blx@hook@lc\relax @@ -7814,9 +7825,9 @@ \setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options \blx@rest@actives % Add datalist to list of seen datalists to prevent duplicates - \xifinlist{\blx@refcontext@context @entry}\blx@dlistnames + \xifinlist{\blx@refcontext@context @\blx@tempe @entry}\blx@dlistnames {} - {\listxadd\blx@dlistnames{\blx@refcontext@context @entry}% + {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @entry}% \csxappto{blx@dlists}{% \blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@refcontext@sortingtemplatename}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{}}}% \ifdefvoid\blx@tempa @@ -8227,9 +8238,9 @@ {}% \blx@rest@actives % Add datalist to list of seen datalists to prevent duplicates - \xifinlist{\blx@refcontext@context @list}\blx@dlistnames + \xifinlist{\blx@refcontext@context @\blx@tempe @list}\blx@dlistnames {} - {\listxadd\blx@dlistnames{\blx@refcontext@context @list}% + {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @list}% \csxappto{blx@dlists}{% \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@#2}}}}% \ifdefvoid\blx@tempa @@ -13226,7 +13237,7 @@ \DeclareBibliographyOption[boolean]{bibwarn}[true]{% \ifstrequal{#1}{true} - {\let\blx@bbl@thewarn\blx@bbl@warn} + {\def\blx@bbl@thewarn{\blx@bbl@warn}} {\let\blx@bbl@thewarn\@gobble}} % Name field options diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 954b3da99f3..1319d6bc5b3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -150,13 +150,13 @@ {\'ed\adddotspace et introd\adddot}}, editorsin = {{\'editeurs et introduction}% {\'ed\adddotspace et introd\adddot}}, - editorfo = {{\'editeur et pr\'eface}% + editorfo = {{\'editeur et pr\'efacier}% {\'ed\adddotspace et pr\'ef\adddot}}, - editorsfo = {{\'editeurs et pr\'eface}% + editorsfo = {{\'editeurs et pr\'efaciers}% {\'ed\adddotspace et pr\'ef\adddot}}, - editoraf = {{\'editeur et postface}% + editoraf = {{\'editeur et postfacier}% {\'ed\adddotspace et postf\adddot}}, - editorsaf = {{\'editeurs et postface}% + editorsaf = {{\'editeurs et postfaciers}% {\'ed\adddotspace et postf\adddot}}, editortrco = {{\'editeur, traducteur et commentateur}% {\'ed.,\addabbrvspace trad\adddotspace et comm\adddot}}, @@ -170,61 +170,61 @@ {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}}, editorstrin = {{\'editeurs, traducteurs et introduction}% {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}}, - editortrfo = {{\'editeur, traducteur et pr\'eface}% + editortrfo = {{\'editeur, traducteur et pr\'efacier}% {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}}, - editorstrfo = {{\'editeurs, traducteurs et pr\'eface}% + editorstrfo = {{\'editeurs, traducteurs et pr\'efaciers}% {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}}, - editortraf = {{\'editeur, traducteur et postface}% + editortraf = {{\'editeur, traducteur et postfacier}% {\'ed.,\addabbrvspace trad\adddotspace et postf\adddot}}, - editorstraf = {{\'editeurs, traducteurs et postface}% + editorstraf = {{\'editeurs, traducteurs et postfaciers}% {\'ed.,\addabbrvspace trad\adddot et postf\adddot}}, editorcoin = {{\'editeur, commentateur et introduction}% {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}}, editorscoin = {{\'editeurs, commentateurs et introduction}% {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}}, - editorcofo = {{\'editeur, commentateur et pr\'eface}% + editorcofo = {{\'editeur, commentateur et pr\'efacier}% {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}}, - editorscofo = {{\'editeurs, commentateurs et pr\'eface}% + editorscofo = {{\'editeurs, commentateurs et pr\'efaciers}% {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}}, - editorcoaf = {{\'editeur, commentateur et postface}% + editorcoaf = {{\'editeur, commentateur et postfacier}% {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}}, - editorscoaf = {{\'editeurs, commentateurs et postface}% + editorscoaf = {{\'editeurs, commentateurs et postfaciers}% {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}}, editoranin = {{\'editeur, annotateur et introduction}% {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}}, editorsanin = {{\'editeurs, annotateurs et introduction}% {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}}, - editoranfo = {{\'editeur, annotateur et pr\'eface}% + editoranfo = {{\'editeur, annotateur et pr\'efacier}% {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}}, - editorsanfo = {{\'editeurs, annotateurs et pr\'eface}% + editorsanfo = {{\'editeurs, annotateurs et pr\'efaciers}% {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}}, - editoranaf = {{\'editeur, annotateur et postface}% + editoranaf = {{\'editeur, annotateur et postfacier}% {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}}, - editorsanaf = {{\'editeurs, annotateurs et postface}% + editorsanaf = {{\'editeurs, annotateurs et postfaciers}% {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}}, editortrcoin = {{\'editeur, traducteur, commentateur et introduction}% {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}}, editorstrcoin = {{\'editeurs, traducteurs, commentateurs et introduction}% {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}}, - editortrcofo = {{\'editeur, traducteur, commentateur et pr\'eface}% + editortrcofo = {{\'editeur, traducteur, commentateur et pr\'efacier}% {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}}, - editorstrcofo = {{\'editeurs, traducteurs, commentateurs et pr\'eface}% + editorstrcofo = {{\'editeurs, traducteurs, commentateurs et pr\'efaciers}% {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}}, - editortrcoaf = {{\'editeur, traducteur, commentateur et postface}% + editortrcoaf = {{\'editeur, traducteur, commentateur et postfacier}% {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}}, - editorstrcoaf = {{\'editeurs, traducteurs, commentateurs et postface}% + editorstrcoaf = {{\'editeurs, traducteurs, commentateurs et postfaciers}% {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}}, editortranin = {{\'editeur, traducteur, annotateur et introduction}% {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}}, editorstranin = {{\'editeurs, traducteurs, annotateurs et introduction}% {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}}, - editortranfo = {{\'editeur, traducteur, annotateur et pr\'eface}% + editortranfo = {{\'editeur, traducteur, annotateur et pr\'efacier}% {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}}, - editorstranfo = {{\'editeurs, traducteurs, annotateurs et pr\'eface}% + editorstranfo = {{\'editeurs, traducteurs, annotateurs et pr\'efaciers}% {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}}, - editortranaf = {{\'editeur, traducteur, annotateur et postface}% + editortranaf = {{\'editeur, traducteur, annotateur et postfacier}% {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}}, - editorstranaf = {{\'editeurs, traducteurs, annotateurs et postface}% + editorstranaf = {{\'editeurs, traducteurs, annotateurs et postfaciers}% {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}}, translatorco = {{traducteur et commentateur}% {trad\adddotspace et comm\adddot}}, |