biblatex (23aug20)

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

1 files changed, 12 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index e48b124277f..22da31e2612 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{2020/08/19}
-\def\abx@version{3.15}
+\def\abx@date{2020/08/23}
+\def\abx@version{3.15a}
 \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)}
@@ -4188,8 +4188,8 @@
     {\blx@defformat@i{#1}{#2}{#3}}
     {\blx@defformat@i{#1}{#2}{#3}[*]}}
 
-% {<macro>}{<class>}{<*>}[<entrytype>]{<name>}{<code>}
-\def\blx@defformat@i#1#2#3[#4]#5#6{%
+% {<macro>}{<class>}{<*>}[<entrytype>]{<name>}
+\def\blx@defformat@i#1#2#3[#4]#5{%
   \notblank{#3}
     {\blx@resetformat{#2}{#5}}
     {}%
@@ -4197,7 +4197,7 @@
   \def\blx@defformat@b{#4}%
   \blx@xsanitizeafter{\def\blx@defformat@c}{#5}%
   \afterassignment\blx@defformat@ii
-  #1{#6}}
+  #1}
 
 \def\blx@defformat@ii{%
   \expandafter\forcsvlist
@@ -4207,11 +4207,14 @@
 \def\blx@defformat@iii#1{%
   \cslet{abx@\blx@defformat@a @#1@\blx@defformat@c}\blx@defformat@d}
 
-\def\blx@defplainformat{%
-  \long\def\blx@defformat@d##1}
+% grab the argument explicitly, this avoids issues with spaces making it
+% into the argument specification of the macros
+% cf. \def\foo#1{<stuff>} vs. \def\foo#1 {<stuff>}
+\long\def\blx@defplainformat#1{%
+  \long\def\blx@defformat@d##1{#1}}
 
-\def\blx@defnameformat{%
-  \long\def\blx@defformat@d##1}
+\long\def\blx@defnameformat#1{%
+  \long\def\blx@defformat@d##1{#1}}
 
 \def\blx@resetformat#1#2{%
   \let\blx@saved@do\do