diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 33 |
1 files changed, 22 insertions, 11 deletions
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 |