summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-06 22:30:46 +0000
committerKarl Berry <karl@freefriends.org>2023-03-06 22:30:46 +0000
commitdf90a592f583604c4450e6bbbdf6788c8bc74f58 (patch)
tree053a01fffdf69f633c246f5f5a4b878b702099a9 /Master/texmf-dist/tex
parentf6e6f59a409effaf942afb2b26bd4b4f65d9b8db (diff)
biblatex (6mar23)
git-svn-id: svn://tug.org/texlive/trunk@66403 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty80
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx2
11 files changed, 101 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 8e52b7fa0d2..3b4c4bd68a0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1398,6 +1398,11 @@
}
}
+\DeclareExtradateContext{%
+ \field{labelname}
+ \field{labeltitle}
+}
+
\DeclareLabeltitle{%
\field{shorttitle}
\field{title}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 8b33c5d0217..a006c5ecd2c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -12,8 +12,8 @@
% particular purpose.
% Set up the version strings here
-\def\abx@date{2022/07/12}
-\def\abx@version{3.18b}
+\def\abx@date{2023/03/05}
+\def\abx@version{3.19}
\def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/MW)}
\def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/MW)}
\def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/MW)}
@@ -22,7 +22,7 @@
% This is not updated by build script as the control file version
% does not necessarily change with the package version.
% This is used when writing the .bcf
-\def\blx@bcfversion{3.9}
+\def\blx@bcfversion{3.10}
% This is not updated by build script as the bbl version
% does not necessarily change with the package version.
@@ -9476,18 +9476,23 @@
{\blx@printbibchecks
\blx@notfilter\blx@tempa{blx@catg@#1}}}
+\let\blx@default@thefilter\@empty
+\blx@kv@defkey{blx@bibdefaults}{filter}{%
+ \def\blx@default@thefilter{#1}}
\blx@kv@defkey{blx@bib2}{filter}{\blx@key@filter{#1}}
\blx@kv@defkey{blx@biblist2}{filter}{\blx@key@filter{#1}}
\def\blx@key@filter#1{%
- \ifcsdef{blx@filter@#1}
- {\blx@printbibchecks
- \blx@bibfilter\blx@tempa{blx@filter@#1}}
- {\let\blx@tempa\@empty
- \blx@error
- {Filter '#1' not found}
- {The filter '#1' could not be found.\MessageBreak
- Use \string\defbibfilter\space to define it}}}
+ \ifblank{#1}
+ {}
+ {\ifcsdef{blx@filter@#1}
+ {\blx@printbibchecks
+ \blx@bibfilter\blx@tempa{blx@filter@#1}}
+ {\let\blx@tempa\@empty
+ \blx@error
+ {Filter '#1' not found}
+ {The filter '#1' could not be found.\MessageBreak
+ Use \string\defbibfilter\space to define it}}}}
\blx@kv@defkey{blx@bib2}{check}{\blx@key@bibcheck{#1}}
\blx@kv@defkey{blx@biblist2}{check}{\blx@key@bibcheck{#1}}
@@ -9672,6 +9677,7 @@
\let\blx@theprenote\blx@default@theprenote
\let\blx@thepostnote\blx@default@thepostnote
\let\blx@thetitle\blx@default@thetitle
+ \let\blx@thefilter\blx@default@thefilter
\undef\blx@thelabel
% defaults
\let\blx@tempa\@empty% before there is a .bbl, this must not be undef
@@ -9697,6 +9703,7 @@
% \printbibliography following one with this set will inherit any
% previous "true" value
\togglefalse{blx@omitnumbers}%
+ \expandafter\blx@key@filter\expandafter{\blx@thefilter}% Can only be defaulted once \blx@tempa is set since it filters on this
\blx@kv@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
@@ -9727,6 +9734,7 @@
\let\blx@theprenote\blx@default@theprenote
\let\blx@thepostnote\blx@default@thepostnote
\let\blx@thetitle\blx@default@thetitle
+ \let\blx@thefilter\blx@default@thefilter
\undef\blx@thelabel
\c@refsection\z@
\blx@safe@actives
@@ -9767,6 +9775,7 @@
\let\blx@theprenote\blx@default@theprenote
\let\blx@thepostnote\blx@default@thepostnote
\let\blx@thetitle\blx@default@thetitle
+ \let\blx@thefilter\blx@default@thefilter
\undef\blx@thelabel
\c@refsegment\@ne
\blx@safe@actives
@@ -9812,8 +9821,8 @@
\let\blx@theprenote\blx@default@theprenote
\let\blx@thepostnote\blx@default@thepostnote
\let\blx@thetitle\blx@default@thetitle
+ \let\blx@thefilter\blx@default@thefilter
\undef\blx@thelabel
- \c@refsection\z@
\blx@safe@actives
\blx@kv@setkeys{blx@bbc}{#1}%
\blx@rest@actives
@@ -10113,6 +10122,7 @@
\let\blx@theprenote\@empty
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
+ \let\blx@thefilter\@empty
\undef\blx@thelabel
% defaults
\let\blx@tempa\@empty% before there is a .bbl, this must not be undef
@@ -10559,6 +10569,12 @@
\newrobustcmd*{\AtBeginRefsection}{\gappto\blx@hook@refsectioninit}
\@onlypreamble\AtBeginRefsection
+\newrobustcmd*{\AtNextRefsection}{%
+ \ifundef\blx@hook@refsection@next
+ {\gdef\blx@hook@refsection@next{\global\undef\blx@hook@refsection@next}}
+ {}%
+ \gappto\blx@hook@refsection@next}
+
\newrobustcmd*{\newrefsection}{%
\endrefcontext
\ifnum\c@refsection>\z@
@@ -10592,6 +10608,7 @@
\stepcounter{blx@maxsection}%
\setcounter{refsection}{\value{blx@maxsection}}%
\csuse{blx@hook@refsectioninit}%
+ \csuse{blx@hook@refsection@next}%
\xifinlist{\the\c@refsection}\blx@allrefsections
{}
{\listxadd\blx@allrefsections{\the\c@refsection}}%
@@ -11388,6 +11405,21 @@
\blx@auxwrite\blx@bcfout{}{\blx@xml@citeset{\blx@tempa}{\blx@tempb}}%
\endgroup}
+
+\def\abx@warn@emptycite{%
+ \abx@warn@emptycite@print
+ \abx@warn@emptycite@log}
+
+\def\abx@warn@emptycite@print@text{%
+ \textless empty citation\textgreater}
+
+\def\abx@warn@emptycite@print{%
+ \abx@missing@entry{\abx@warn@emptycite@print@text}}
+
+\def\abx@warn@emptycite@log{%
+ \@latex@warning{\blx@msg@cundefon{}}}
+
+
% {<entrykey>,...}
% a crude way to check for a do-nothing argument:
% loop over it to see what happens
@@ -11397,8 +11429,7 @@
\expandafter\docsvlist\expandafter{\detokenize{#1}}%
\iftoggle{blx@tempa}
{\expandafter\blx@citeloop@i\expandafter{\detokenize{#1}}}
- {\abx@missing@entry{empty citation}%
- \@latex@warning{\blx@msg@cundefon{}}}}
+ {\abx@warn@emptycite}}
\protected\def\blx@citeloop@i#1{%
\begingroup
% This must be here and not after \blx@citeadd as this changes the refcontext
@@ -13422,6 +13453,7 @@
\blx@xml@comment{GLOBAL}%
\blx@xml@options{biblatex}{global}{%
\blx@xml@svalue{alphaothers}{\labelalphaothers}%
+ \blx@xml@mvalue{extradatecontext}{\blx@bcf@extradatecontext}%
\blx@xml@toggle{labelalpha}%
\blx@xml@mvalue{labelnamespec}{\blx@bcf@labelnamespec}%
\blx@xml@toggle{labeltitle}%
@@ -13467,6 +13499,10 @@
\def\blx@bcf@options@type#1{%
\blx@xml@comment{#1}%
\blx@xml@options{biblatex}{#1}{%
+ \blx@xml@mvalue{extradatecontext}{%
+ \ifcsdef{blx@bcf@extradatecontext@#1}
+ {\csuse{blx@bcf@extradatecontext@#1}}
+ {\blx@bcf@extradatecontext}}%
\blx@xml@toggle{labelalpha}%
\blx@xml@mvalue{labelnamespec}{%
\ifcsdef{blx@bcf@labelnamespec@#1}
@@ -14700,6 +14736,21 @@
\noexpand\blx@xml@edordered{\the\blx@tempcnta}{#1}}}
% [<type,type,...>]{<field,field,...>}
+\newrobustcmd*{\DeclareExtradateContext}[2][]{%
+ \begingroup
+ \let\blx@tempa\@empty
+ \def\blx@tempb{extradatecontext}%
+ \let\field\blx@ordered@field
+ \ifblank{#1}
+ {\global\cslet{blx@bcf@extradatecontext}\@empty}
+ {\def\blx@tempa{#1}%
+ \def\do##1{\global\cslet{blx@bcf@extradatecontext@##1}\@empty}%
+ \expandafter\docsvlist\expandafter{#1}}%
+ #2%
+ \endgroup}
+\@onlypreamble\DeclareExtradateContext
+\blx@DeclareBackendOption{global,type}[xml]{extradatecontext}
+
\newrobustcmd*{\DeclareLabelname}[2][]{%
\begingroup
\let\blx@tempa\@empty
@@ -16306,6 +16357,7 @@
\blx@bblinput
\setcounter{blx@maxsection}{0}%
\csuse{blx@hook@refsectioninit}%
+ \csuse{blx@hook@refsection@next}%
\csuse{abx@preamble}%
\blx@inf@refsec
\blx@inf@refseg}
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
index 7e84884ac7d..63f1420ef44 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
@@ -2,7 +2,7 @@
[\abx@cptid]
\blx@warning@noline{%
- Using fall-back BibTeX(8) backend:\MessageBreak
+ Using fall-back bibtex backend:\MessageBreak
functionality may be reduced/unavailable%
}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index e6f4d7d4253..b205b68bb90 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -129,7 +129,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index f27955b1136..cf60c11b10b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -174,7 +174,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index 81091101032..fdf5bcc2cca 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -203,7 +203,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index 11d91b054ed..d764eac8bf3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -246,7 +246,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index a194473beac..8897a7ad40a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -275,7 +275,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index 86dfce242df..187ca2bce66 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -305,7 +305,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 8ea47d1338d..68b10d891c9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -140,7 +140,10 @@
\newrobustcmd{\cbx@textcite@init}[2]{%
\setcounter{textcitetotal}{0}%
\setcounter{textcitecount}{0}%
- \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+ \def\cbx@savedcites{#1}#2%
+ \ifnumgreater{\value{textcitetotal}}{0}
+ {\cbx@savedcites}
+ {}}
\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx
index 0bcbb3a7b5e..07482617ffc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx
@@ -12,7 +12,7 @@
{The file 'lithuanian.lbx' requires UTF-8 encoding but you
seem\MessageBreak to be using a different encoding.
This is a fatal error. I will\MessageBreak abort loading
- russian.lbx now.}%
+ lithuanian.lbx now.}%
\endinput}
\DeclareBibliographyExtras{%