biblatex 3.4 (16may16)

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

23 files changed, 59 insertions, 59 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index be019d10e5f..26625b06fb7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -7,7 +7,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelalpha}%
     \printfield{extraalpha}}}
 
@@ -15,7 +15,7 @@
   \ifnameundef{labelname}
     {\printfield[citetitle]{labeltitle}}
     {\printnames{labelname}}%
-  \addspace\bibopenbracket
+  \printdelim{namelabeldelim}\bibopenbracket
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index d232ebfebc8..1e114d1bb81 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -10,7 +10,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelalpha}%
     \printfield{extraalpha}}}
 
@@ -22,7 +22,7 @@
        {\printnames{labelname}}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \addspace\bibopenbracket}%
+       \printdelim{namelabeldelim}\bibopenbracket}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
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 d5e5183de32..bbc4229864f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -28,7 +28,7 @@
        {\ifnameundef{labelname}
           {}
           {\printnames{labelname}%
-           \setunit{\nametitledelim}}%
+           \setunit{\printdelim{nametitledelim}}}%
         \savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title}}
     {\usebibmacro{cite:shorthand}%
@@ -49,7 +49,7 @@
        {\printnames{labelname}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \nametitledelim\bibopenparen}}%
+          \printdelim{nametitledelim}\bibopenparen}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 2f7c68df495..3b6618314b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -23,7 +23,7 @@
        {\ifnameundef{labelname}
           {}
           {\printnames{labelname}%
-           \setunit{\nametitledelim}}%
+           \setunit{\printdelim{nametitledelim}}}%
         \usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
 
@@ -42,7 +42,7 @@
     {\printnames{labelname}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \nametitledelim\bibopenparen}}%
+       \printdelim{nametitledelim}\bibopenparen}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
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 9d248a215eb..f8f2f7e5371 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -39,7 +39,7 @@
 	  {\ifnameundef{labelname}
              {}
              {\printnames{labelname}%
-              \setunit{\nametitledelim}}%
+              \setunit{\printdelim{nametitledelim}}}%
            \savefield{namehash}{\cbx@lasthash}}%
 	\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}%
@@ -62,7 +62,7 @@
        {\printnames{labelname}%
         \setunit{%
 	  \global\booltrue{cbx:parens}%
-	  \nametitledelim\bibopenparen}}%
+	  \printdelim{nametitledelim}\bibopenparen}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index c0e8a1fe57c..85cce7eedcd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -17,7 +17,7 @@
           {\ifsingletitle
              {\printtext[bibhyperref]{\printnames{labelname}}}
              {\printnames{labelname}%
-	      \setunit{\nametitledelim}%
+	      \setunit{\printdelim{nametitledelim}}%
 	      \usebibmacro{cite:title}}}%
         \savefield{namehash}{\cbx@lasthash}}}
     {\usebibmacro{cite:shorthand}%
@@ -53,7 +53,7 @@
           {\printnames{labelname}
            \setunit{%
 	     \global\booltrue{cbx:parens}%
-	     \nametitledelim\bibopenparen}%
+	     \printdelim{nametitledelim}\bibopenparen}%
 	   \ifnumequal{\value{citecount}}{1}
 	     {\usebibmacro{prenote}}
 	     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index a0f7fef85ac..d83c432fd56 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -11,7 +11,7 @@
        {\ifsingletitle
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}%
-	   \setunit{\nametitledelim}%
+	   \setunit{\printdelim{nametitledelim}}%
 	   \usebibmacro{cite:title}}}}%
     {\usebibmacro{cite:shorthand}}}
 
@@ -29,7 +29,7 @@
        {\printnames{labelname}%
 	\setunit{%
 	  \global\booltrue{cbx:parens}%
-	  \nametitledelim\bibopenparen}%
+	  \printdelim{nametitledelim}\bibopenparen}%
 	\ifnumequal{\value{citecount}}{1}
 	  {\usebibmacro{prenote}}
 	  {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index e485f4fadd9..54f10d6baaf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -19,7 +19,7 @@
              {\ifsingletitle
         	{\printtext[bibhyperref]{\printnames{labelname}}}
         	{\printnames{labelname}%
-		 \setunit{\nametitledelim}%
+		 \setunit{\printdelim{nametitledelim}}%
 		 \usebibmacro{cite:title}}}%
            \savefield{namehash}{\cbx@lasthash}}}}
     {\usebibmacro{cite:shorthand}%
@@ -61,7 +61,7 @@
           {\printnames{labelname}
            \setunit{%
 	     \global\booltrue{cbx:parens}%
-	     \nametitledelim\bibopenparen}%
+	     \printdelim{nametitledelim}\bibopenparen}%
 	   \ifnumequal{\value{citecount}}{1}
 	     {\usebibmacro{prenote}}
 	     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index aff0a63a496..8d52c873f3a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -12,7 +12,7 @@
     {\ifnameundef{labelname}
        {}
        {\printnames{labelname}%
-        \setunit{\nametitledelim}}%
+        \setunit{\printdelim{nametitledelim}}}%
      \usebibmacro{cite:title}}%
     {\usebibmacro{cite:shorthand}}}
 
@@ -27,7 +27,7 @@
     {\printnames{labelname}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \nametitledelim\bibopenparen}}%
+       \printdelim{nametitledelim}\bibopenparen}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
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 966e516fafa..a7774c5faa0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -27,7 +27,7 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
        {\usebibmacro{cite:label}%
-        \setunit{\nonameyeardelim}%
+        \setunit{\printdelim{nonameyeardelim}}%
         \usebibmacro{cite:labelyear+extrayear}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
@@ -39,7 +39,7 @@
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{labelyear}{\cbx@lastyear}}}
           {\printnames{labelname}%
-           \setunit{\nameyeardelim}%
+           \setunit{\printdelim{nameyeardelim}}%
            \usebibmacro{cite:labelyear+extrayear}%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
@@ -85,7 +85,7 @@
           {\usebibmacro{cite:label}%
            \setunit{%
              \global\booltrue{cbx:parens}%
-             \nonameyeardelim\bibopenparen}%
+             \printdelim{nonameyeardelim}\bibopenparen}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -94,7 +94,7 @@
        {\printnames{labelname}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \nameyeardelim\bibopenparen}%
+          \printdelim{nameyeardelim}\bibopenparen}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index bf8cc731263..96ffba35fba 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -22,9 +22,9 @@
        {\usebibmacro{cite:ibid}}
        {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
           {\usebibmacro{cite:label}%
-           \setunit{\nonameyeardelim}}
+           \setunit{\printdelim{nonameyeardelim}}}
           {\printnames{labelname}%
-           \setunit{\nameyeardelim}}%
+           \setunit{\printdelim{nameyeardelim}}}%
         \usebibmacro{cite:labelyear+extrayear}}}
     {\usebibmacro{cite:shorthand}}}
 
@@ -45,7 +45,7 @@
        {\usebibmacro{cite:label}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \nonameyeardelim\bibopenparen}%
+          \printdelim{nonameyeardelim}\bibopenparen}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -54,7 +54,7 @@
     {\printnames{labelname}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \nameyeardelim\bibopenparen}%
+       \printdelim{nameyeardelim}\bibopenparen}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
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 d662299bcb0..6481a00ae92 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -37,7 +37,7 @@
        {\usebibmacro{cite:ibid}}
        {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
           {\usebibmacro{cite:label}%
-           \setunit{\nonameyeardelim}%
+           \setunit{\printdelim{nonameyeardelim}}%
            \usebibmacro{cite:labelyear+extrayear}%
            \usebibmacro{cite:reinit}}
           {\iffieldequals{namehash}{\cbx@lasthash}
@@ -49,7 +49,7 @@
                  \usebibmacro{cite:labelyear+extrayear}%
                  \savefield{labelyear}{\cbx@lastyear}}}
              {\printnames{labelname}%
-              \setunit{\nameyeardelim}%
+              \setunit{\printdelim{nameyeardelim}}%
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
@@ -97,7 +97,7 @@
           {\usebibmacro{cite:label}%
            \setunit{%
              \global\booltrue{cbx:parens}%
-             \nonameyeardelim\bibopenparen}%
+             \printdelim{nonameyeardelim}\bibopenparen}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -108,7 +108,7 @@
        {\printnames{labelname}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \nameyeardelim\bibopenparen}%
+          \printdelim{nameyeardelim}\bibopenparen}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index c36c9729b8a..949a35be915 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -11,9 +11,9 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
        {\usebibmacro{cite:label}%
-        \setunit{\nonameyeardelim}}
+        \setunit{\printdelim{nonameyeardelim}}}
        {\printnames{labelname}%
-        \setunit{\nameyeardelim}}%
+        \setunit{\printdelim{nameyeardelim}}}%
      \usebibmacro{cite:labelyear+extrayear}}
     {\usebibmacro{cite:shorthand}}}
 
@@ -30,7 +30,7 @@
        {\usebibmacro{cite:label}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \nonameyeardelim\bibopenparen}%
+          \printdelim{nonameyeardelim}\bibopenparen}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -39,7 +39,7 @@
     {\printnames{labelname}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \nameyeardelim\bibopenparen}%
+       \printdelim{nameyeardelim}\bibopenparen}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
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 d1ecbd63e9c..0f8942fa118 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -35,9 +35,9 @@
 
 \newbibmacro*{cite:comp:comp}{%
   \ifboolexpr{
-    ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} )
+    ( test {\iffieldundef{labelprefix}} and test {\ifundef\cbx@lastprefix} )
     or
-    test {\iffieldequals{prefixnumber}{\cbx@lastprefix}}
+    test {\iffieldequals{labelprefix}{\cbx@lastprefix}}
   }
     {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
        {\savefield{entrykey}{\cbx@lastkey}%
@@ -50,11 +50,11 @@
              {\multicitedelim}
              {}%
            \printtext[bibhyperref]{%
-             \printfield{prefixnumber}%
+             \printfield{labelprefix}%
              \printfield{labelnumber}}}}}
     {\usebibmacro{cite:comp:end}}%
   \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
-  \savefield{prefixnumber}{\cbx@lastprefix}}
+  \savefield{labelprefix}{\cbx@lastprefix}}
 
 \newbibmacro*{cite:comp:end}{%
   \usebibmacro{cite:dump}%
@@ -62,7 +62,7 @@
     {\multicitedelim}
     {}%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelnumber}}}
 
 \newbibmacro*{cite:comp:inset}{%
@@ -71,7 +71,7 @@
     {\multicitedelim}
     {}%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelnumber}%
     \printfield{entrysetcount}}%
   \setcounter{cbx@tempcntb}{-1}}
@@ -91,7 +91,7 @@
        {\multicitedelim}%
      \bibhyperref[\cbx@lastkey]{%
        \ifdef\cbx@lastprefix
-         {\printtext[prefixnumber]{\cbx@lastprefix}}
+         {\printtext[labelprefix]{\cbx@lastprefix}}
          {}%
        \printtext[labelnumber]{\cbx@lastnumber}}}
     {}%
@@ -113,7 +113,7 @@
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
      \global\booltrue{cbx:parens}%
-     \addspace\bibopenbracket%
+     \printdelim{namelabeldelim}\bibopenbracket%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
index 065f2ad2c7c..e64e19e810f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -12,7 +12,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelnumber}%
     \ifbool{bbx:subentry}
       {\printfield{entrysetcount}}
@@ -22,7 +22,7 @@
   \ifnameundef{labelname}
     {\printfield[citetitle]{labeltitle}}
     {\printnames{labelname}}%
-  \addspace\bibopenbracket
+  \printdelim{namelabeldelim}\bibopenbracket
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 67af09ca407..5c6fa4b1009 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -14,7 +14,7 @@
 
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
-    \printfield{prefixnumber}%
+    \printfield{labelprefix}%
     \printfield{labelnumber}%
     \ifbool{bbx:subentry}
       {\printfield{entrysetcount}}
@@ -28,7 +28,7 @@
        {\printnames{labelname}}%
      \setunit{%
        \global\booltrue{cbx:parens}%
-       \addspace\bibopenbracket}%
+       \printdelim{namelabeldelim}\bibopenbracket}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index 846a0f75f38..d4a45642373 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -119,7 +119,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index df81985a88b..d4fc145459d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -120,7 +120,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
@@ -168,7 +168,7 @@
     {\printnames{labelname}}%
   \ifsingletitle
     {}
-    {\setunit*{\nametitledelim}%
+    {\setunit*{\printdelim{nametitledelim}}%
      \printfield[title]{labeltitle}}%
   \setunit*{\addcomma\space}%
   \printtext{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index b22c4da3cb9..de06094186f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -111,7 +111,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
@@ -145,7 +145,7 @@
     {\printnames{labelname}}%
   \ifsingletitle
     {}
-    {\setunit*{\nametitledelim}%
+    {\setunit*{\printdelim{nametitledelim}}%
      \printfield[title]{labeltitle}}%
   \setunit*{\addcomma\space}%
   \printtext{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index b1729fe0d91..fe450f85e38 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -134,11 +134,11 @@
 
 \newbibmacro*{cite:name}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}}
+  \setunit*{\printdelim{nametitledelim}}}
 
 \newbibmacro*{cite:idem}{%
   \bibstring[\mkibid]{idem\thefield{gender}}%
-  \setunit{\nametitledelim}}
+  \setunit{\printdelim{nametitledelim}}}
 
 \newbibmacro*{cite:title}{%
   \printtext[bibhyperlink]{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 6cdd7b1cde3..acf463877aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -135,16 +135,16 @@
 
 \newbibmacro*{cite:name}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}}
+  \setunit*{\printdelim{nametitledelim}}}
 
 \newbibmacro*{cite:idem}{%
   \bibstring[\mkibid]{idem\thefield{gender}}%
-  \setunit{\nametitledelim}}
+  \setunit{\printdelim{nametitledelim}}}
 
 \newbibmacro*{cite:title}{%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}%
-    \setunit{\nametitledelim}%
+    \setunit{\printdelim{nametitledelim}}%
     \bibstring[\mkibid]{opcit}}}
 
 \newbibmacro*{cite:ibid}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 5ef371196da..54e2b3aecfa 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -115,13 +115,13 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}
 
 \newbibmacro*{cite:opcit}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \bibstring[\mkibid]{opcit}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index f373895c82a..e798dec1839 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -100,7 +100,7 @@
 
 \newbibmacro*{cite:short}{%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \printtext[bibhyperlink]{%
     \printfield[citetitle]{labeltitle}}}