biblatex-ext (10jun18)

git-svn-id: svn://tug.org/texlive/trunk@47974 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2018-06-10 20:49:25 +0000
committer: Karl Berry <karl@freefriends.org> 2018-06-10 20:49:25 +0000
commit: 016c87e3d5d8da8e0d35d9e14dd234d234f1acdd (patch)
tree: 38227ee2163a6260725c9e5fdedeae40cacffdac /Master/texmf-dist/tex/latex
parent: 94f0b880cd88c2f9737d2f1c77cecbc88f195400 (diff)
57 files changed, 551 insertions, 435 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
index c8608760bc3..cf8b3350a10 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic-verb.bbx}
-  [2018/06/04 v0.3 extended biblatex alphabetic-verb
+  [2018/06/10 v0.4 extended biblatex alphabetic-verb
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
index 9df0657547d..c3cfddef779 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-alphabetic-verb.cbx}
-  [2018/06/04 v0.3 extended biblatex alphabetic-verb citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex alphabetic-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{alphabetic-verb}
 
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
 
 \renewbibmacro*{textcite}{%
   \ifnameundef{labelname}
     {\printfield[citetitle]{labeltitle}}
     {\printnames{labelname}}%
   \printdelim{namelabeldelim}%
-  \csuse{extblx@citedelim@textcite@inner@open}%
+  \csuse{extblx@citedelim@\blx@delimcontext @inner@open}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
@@ -35,7 +35,7 @@
   {\usebibmacro{postnote}%
    \csuse{extblx@citedelim@cite@outer@close}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -51,7 +51,7 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -59,15 +59,15 @@
      {\stepcounter{textcitetotal}%
       \textcitedelim}%
    \usebibmacro{textcite}}
-  {\csuse{extblx@citedelim@textcite@inner@close}}
+  {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
   {\usebibmacro{postnote}%
-   \csuse{extblx@citedelim@textcite@inner@close}}
+   \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
 
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
index 6c196cc1ffe..a33dd44ae51 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic.bbx}
-  [2018/06/04 v0.3 extended biblatex alphabetic bibliography style (MW)]
+  [2018/06/10 v0.4 extended biblatex alphabetic bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{alphabetic}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
index 776c5b6c410..b0a60e8cf24 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
@@ -1,15 +1,15 @@
 \ProvidesFile{ext-alphabetic.cbx}
-  [2018/06/04 v0.3 extended biblatex alphabetic citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex alphabetic citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{alphabetic}
 
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
 
 \renewbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -20,7 +20,7 @@
      \setunit{%
        \global\booltrue{cbx:parens}%
        \printdelim{namelabeldelim}%
-       \csuse{extblx@citedelim@textcite@inner@open}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
@@ -29,7 +29,7 @@
   \usebibmacro{cite}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -40,24 +40,24 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -73,19 +73,19 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx
index 4b9bb03f922..9be9b8d68ba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-common.bbx}
-  [2018/06/04 v0.3 common files for extended biblatex
+  [2018/06/10 v0.4 common files for extended biblatex
    authortitle bibliography styles (MW)]
 
 \RequireBibliographyStyle{ext-dashed-common}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
index 2217e53b1b7..670860436c6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-comp.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-comp
+  [2018/06/10 v0.4 extended biblatex authortitle-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
index 39ef2c6ad6f..6bb73ce0d52 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,17 +1,17 @@
 \ProvidesFile{ext-authortitle-comp.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-comp
+  [2018/06/10 v0.4 extended biblatex authortitle-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authortitle-comp}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
@@ -40,7 +40,7 @@
      \setunit*{%
        \global\booltrue{cbx:parens}%
        \printdelim{nametitledelim}%
-       \csuse{extblx@citedelim@textcite@inner@open}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
@@ -51,7 +51,7 @@
     {\usebibmacro{cite:shorthand}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -70,24 +70,24 @@
     {\setunit{%
        \global\booltrue{cbx:parens}%
        \extpostnotedelim
-       \csuse{extblx@citedelim@textcite@inner@open}}}
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}
     {\setunit{\postnotedelim}}%
   \printfield{postnote}%
   \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -95,7 +95,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -103,7 +103,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -111,7 +111,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -129,29 +129,29 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}%
    \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:cite:inxref}}
+  {\usebibmacro{bbx:inxrefcite}}
   {}
   {\usebibmacro{cite:postnote}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
index f5aa53643de..d1b1ccc351f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ibid.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-ibid
+  [2018/06/10 v0.4 extended biblatex authortitle-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
index e2ef96bee3a..506e1d9d316 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,25 +1,25 @@
 \ProvidesFile{ext-authortitle-ibid.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-ibid
+  [2018/06/10 v0.4 extended biblatex authortitle-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authortitle-ibid}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
 
-\DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innercitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innerparencitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx@innerfootcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \newbibmacro*{textcite}{%
   \global\boolfalse{cbx:loccit}%
@@ -27,7 +27,7 @@
     \setunit*{%
       \global\booltrue{cbx:parens}%
       \printdelim{nametitledelim}%
-      \csuse{extblx@citedelim@textcite@inner@open}}%
+      \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
@@ -38,44 +38,44 @@
     {\usebibmacro{cite:shorthand}}}
 
 \renewbibmacro*{cite:title}{%
-  \printtext[extblx@inner\blx@delimcontext delim]{%
+  \printtext[extblx@inner\blx@delimcontext delims]{%
     \printtext[bibhyperref]{%
       \printfield[citetitle]{labeltitle}}}}
 
 \newbibmacro*{textcite:postnote}{%
   \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
     {\ifbool{cbx:parens}
-       {\csuse{extblx@citedelim@textcite@inner@close}}
+       {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
        {}}
     {\ifbool{cbx:parens}
        {\postnotedelim}
        {\extpostnotedelim
-        \csuse{extblx@citedelim@textcite@inner@open}}%
+        \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \printfield{postnote}%
-     \csuse{extblx@citedelim@textcite@inner@close}}}
+     \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citetitle}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citetitle}}
@@ -91,7 +91,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -100,21 +100,21 @@
       \textcitedelim}%
    \usebibmacro{textcite}}
   {\ifbool{cbx:parens}
-     {\csuse{extblx@citedelim@textcite@inner@close}%
+     {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
       \global\boolfalse{cbx:parens}}
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
-\DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
index 7bb88eef749..193a00f9cab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-icomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-icomp
+  [2018/06/10 v0.4 extended biblatex authortitle-icomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
index 721b86f7d93..eeb1c3894ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,17 +1,17 @@
 \ProvidesFile{ext-authortitle-icomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-icomp
+  [2018/06/10 v0.4 extended biblatex authortitle-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authortitle-icomp}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
@@ -42,7 +42,7 @@
       \setunit*{%
         \global\booltrue{cbx:parens}%
         \printdelim{nametitledelim}%
-        \csuse{extblx@citedelim@textcite@inner@open}}%
+        \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
@@ -55,7 +55,7 @@
     {\usebibmacro{cite:shorthand}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -78,24 +78,24 @@
        {\setunit{%
           \global\booltrue{cbx:parens}%
           \extpostnotedelim
-          \csuse{extblx@citedelim@textcite@inner@open}}}
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}
        {\setunit{\postnotedelim}}%
      \printfield{postnote}}%
   \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -103,7 +103,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -111,7 +111,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -119,7 +119,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -137,29 +137,29 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}%
    \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:cite:inxref}}
+  {\usebibmacro{bbx:inxrefcite}}
   {}
   {\usebibmacro{cite:postnote}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
index 6d0c290c933..caa40d9e5a9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-tcomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-tcomp
+  [2018/06/10 v0.4 extended biblatex authortitle-tcomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
index 38e16177c00..3c0f7fb92dc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-tcomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-tcomp
+  [2018/06/10 v0.4 extended biblatex authortitle-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle-comp}
@@ -63,7 +63,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nametitledelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -74,7 +74,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -85,18 +85,18 @@
     {\setunit{%
        \global\booltrue{cbx:parens}%
        \extpostnotedelim
-       \csuse{extblx@citedelim@textcite@inner@open}}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
   \printfield{postnote}%
   \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
index 46fddb38749..739d61707ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-terse.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-terse
+  [2018/06/10 v0.4 extended biblatex authortitle-terse
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
index e3e4db7bb9e..f2c162831bf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-terse.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-terse
+  [2018/06/10 v0.4 extended biblatex authortitle-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle}
@@ -31,7 +31,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nametitledelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
index 975b90c17f4..25dcb90e7c5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ticomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-ticomp
+  [2018/06/10 v0.4 extended biblatex authortitle-ticomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
index dae1d4bdba7..593fe459281 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ticomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle-ticomp citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex authortitle-ticomp citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -70,7 +70,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nametitledelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -83,7 +83,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -94,7 +94,7 @@
     {\setunit{%
        \global\booltrue{cbx:parens}%
        \extpostnotedelim
-       \csuse{extblx@citedelim@textcite@inner@open}}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
   \ifbool{cbx:loccit}
     {}
     {\printfield{postnote}}%
@@ -102,12 +102,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
index 1ec2dce3806..aee2890f35f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle.bbx}
-  [2018/06/04 v0.3 extended biblatex authortitle
+  [2018/06/10 v0.4 extended biblatex authortitle
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
index 8d83b972e84..0d82c365ea0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
@@ -1,31 +1,31 @@
 \ProvidesFile{ext-authortitle.cbx}
-  [2018/06/04 v0.3 extended biblatex authortitle citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex authortitle citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authortitle}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
 
-\DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innercitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innerparencitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx@innerfootcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \renewbibmacro*{textcite}{%
   \printnames{labelname}%
   \setunit*{%
     \global\booltrue{cbx:parens}%
     \printdelim{nametitledelim}%
-    \csuse{extblx@citedelim@textcite@inner@open}}%
+    \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
@@ -34,44 +34,44 @@
     {\usebibmacro{cite:shorthand}}}
 
 \renewbibmacro*{cite:title}{%
-  \printtext[extblx@inner\blx@delimcontext delim]{%
+  \printtext[extblx@inner\blx@delimcontext delims]{%
     \printtext[bibhyperref]{%
       \printfield[citetitle]{labeltitle}}}}
 
 \renewbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}
     {\ifbool{cbx:parens}
-       {\csuse{extblx@citedelim@textcite@inner@close}}
+       {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
        {}}
     {\ifbool{cbx:parens}
        {\postnotedelim}
        {\extpostnotedelim
-        \csuse{extblx@citedelim@textcite@inner@open}}%
+        \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \printfield{postnote}%
-     \csuse{extblx@citedelim@textcite@inner@close}}}
+     \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citetitle}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citetitle}}
@@ -87,7 +87,7 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -96,21 +96,21 @@
       \textcitedelim}%
    \usebibmacro{textcite}}
   {\ifbool{cbx:parens}
-     {\csuse{extblx@citedelim@textcite@inner@close}%
+     {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
       \global\boolfalse{cbx:parens}}
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
-\DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx
index ce357619bd1..e625919a218 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-common.bbx}
-  [2018/06/04 v0.3 common files for extended biblatex
+  [2018/06/10 v0.4 common files for extended biblatex
    authoryear bibliography styles (MW)]
 
 \RequireBibliographyStyle{ext-dashed-common}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
index 7a9d39bdb38..c101ca97672 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-comp.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-comp
+  [2018/06/10 v0.4 extended biblatex authoryear-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
index 8ba8b9a3c15..ec06f4be801 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,14 +1,14 @@
 \ProvidesFile{ext-authoryear-comp.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-comp
+  [2018/06/10 v0.4 extended biblatex authoryear-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authoryear-comp}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -97,7 +97,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nonameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -107,7 +107,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -122,7 +122,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -133,17 +133,17 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -151,7 +151,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -159,7 +159,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -167,7 +167,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -201,29 +201,29 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}%
    \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:cite:inxref}}
+  {\usebibmacro{bbx:inxrefcite}}
   {}
   {\usebibmacro{cite:postnote}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
index e51f35f0b13..3b63a542c06 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ibid.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-ibid
+  [2018/06/10 v0.4 extended biblatex authoryear-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
index e4ebb8dae3b..ac1d66f56f6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-authoryear-ibid.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-ibid
+  [2018/06/10 v0.4 extended biblatex authoryear-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authoryear-ibid}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innercitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innerparencitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx@innerfootcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -26,7 +26,7 @@
 \renewbibmacro*{cite:labeldate+extradate}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[extblx@inner\blx@delimcontext delim]{%
+    {\printtext[extblx@inner\blx@delimcontext delims]{%
        \printtext[bibhyperref]{%
          \printtext[\blx@delimcontext labeldate]{%
            \printlabeldateextra}}}}}
@@ -39,7 +39,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nonameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -49,7 +49,7 @@
      \setunit{%
        \global\booltrue{cbx:parens}%
        \printdelim{nameyeardelim}%
-       \csuse{extblx@citedelim@textcite@inner@open}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
@@ -64,37 +64,37 @@
 \renewbibmacro*{textcite:postnote}{%
   \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
     {\ifbool{cbx:parens}
-       {\csuse{extblx@citedelim@textcite@inner@close}}
+       {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
        {}}
     {\ifbool{cbx:parens}
        {\postnotedelim}
        {\extpostnotedelim
-        \csuse{extblx@citedelim@textcite@inner@open}}%
+        \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \printfield{postnote}%
-     \csuse{extblx@citedelim@textcite@inner@close}}}
+     \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
@@ -110,7 +110,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -119,22 +119,22 @@
       \textcitedelim}%
    \usebibmacro{textcite}}
   {\ifbool{cbx:parens}
-     {\csuse{extblx@citedelim@textcite@inner@close}%
+     {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
       \global\boolfalse{cbx:parens}}
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
-\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
-\DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{bbx@introcitelabeldate}{#1}
+\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
index 1a012522e26..e1939937093 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-icomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-icomp
+  [2018/06/10 v0.4 extended biblatex authoryear-icomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
index 9b91e71aa21..667694dae73 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,14 +1,14 @@
 \ProvidesFile{ext-authoryear-icomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-icomp
+  [2018/06/10 v0.4 extended biblatex authoryear-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authoryear-icomp}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -101,7 +101,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nonameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -113,7 +113,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -130,7 +130,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -143,17 +143,17 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -161,7 +161,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -169,7 +169,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -177,7 +177,7 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -195,29 +195,29 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}%
    \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:cite:inxref}}
+  {\usebibmacro{bbx:inxrefcite}}
   {}
   {\usebibmacro{cite:postnote}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
index 22bc68262a0..22552c0f014 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tcomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-tcomp
+  [2018/06/10 v0.4 extended biblatex authoryear-tcomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
index 33d5090cd34..c31f2852034 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tcomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-tcomp
+  [2018/06/10 v0.4 extended biblatex authoryear-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-comp}
@@ -67,7 +67,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nonameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -80,7 +80,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -95,7 +95,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -106,18 +106,18 @@
     {\setunit{%
        \global\booltrue{cbx:parens}%
        \extpostnotedelim
-       \csuse{extblx@citedelim@textcite@inner@open}}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
   \printfield{postnote}%
   \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
index 869f2e23fd5..36eb0685d20 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-terse.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-terse
+  [2018/06/10 v0.4 extended biblatex authoryear-terse
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
index 99a69339710..9732f0be9bd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-terse.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-terse
+  [2018/06/10 v0.4 extended biblatex authoryear-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear}
@@ -24,7 +24,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nonameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -37,7 +37,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
index c0c9c6788e3..f65387a75e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ticomp.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-ticomp
+  [2018/06/10 v0.4 extended biblatex authoryear-ticomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
index 0013a94ad41..ba67893141f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ticomp.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear-ticomp citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex authoryear-ticomp citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -68,7 +68,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nonameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -83,7 +83,7 @@
            \setunit{%
              \global\booltrue{cbx:parens}%
              \printdelim{nameyeardelim}%
-             \csuse{extblx@citedelim@textcite@inner@open}}%
+             \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -100,7 +100,7 @@
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -111,7 +111,7 @@
     {\setunit{%
        \global\booltrue{cbx:parens}%
        \extpostnotedelim
-       \csuse{extblx@citedelim@textcite@inner@open}}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
   \ifbool{cbx:loccit}
     {}
     {\printfield{postnote}}%
@@ -119,12 +119,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
index 6499361fe82..c374bed4a9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear.bbx}
-  [2018/06/04 v0.3 extended biblatex authoryear bibliography style (MW)]
+  [2018/06/10 v0.4 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
index 0d55d5069b1..2eda60c3ce1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
@@ -1,21 +1,21 @@
 \ProvidesFile{ext-authoryear.cbx}
-  [2018/06/04 v0.3 extended biblatex authoryear citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{authoryear}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx@innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx@innercitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innerparencitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx@innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx@innerfootcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -25,7 +25,7 @@
 \renewbibmacro*{cite:labeldate+extradate}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[extblx@inner\blx@delimcontext delim]{%
+    {\printtext[extblx@inner\blx@delimcontext delims]{%
        \printtext[bibhyperref]{%
          \printtext[\blx@delimcontext labeldate]{%
            \printlabeldateextra}}}}}
@@ -37,7 +37,7 @@
         \setunit{%
           \global\booltrue{cbx:parens}%
           \printdelim{nonameyeardelim}%
-          \csuse{extblx@citedelim@textcite@inner@open}}%
+          \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -47,7 +47,7 @@
      \setunit{%
        \global\booltrue{cbx:parens}%
        \printdelim{nameyeardelim}%
-       \csuse{extblx@citedelim@textcite@inner@open}}%
+       \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
@@ -56,36 +56,37 @@
 \renewbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}
     {\ifbool{cbx:parens}
-       {\csuse{extblx@citedelim@textcite@inner@close}}
+       {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
        {}}
     {\ifbool{cbx:parens}
        {\setunit{\postnotedelim}}
        {\setunit{\extpostnotedelim
-                 \csuse{extblx@citedelim@textcite@inner@open}}}%
-     \printfield{postnote}\csuse{extblx@citedelim@textcite@inner@close}}}
+                 \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
+     \printfield{postnote}%
+     \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
@@ -101,7 +102,7 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -110,22 +111,22 @@
       \textcitedelim}%
    \usebibmacro{textcite}}
   {\ifbool{cbx:parens}
-     {\csuse{extblx@citedelim@textcite@inner@close}%
+     {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
       \global\boolfalse{cbx:parens}}
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
-\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
-\DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkinner\blx@delimcontext delim}{#1}}
+\DeclareFieldFormat{bbx@introcitelabeldate}{#1}
+\DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
+  \csuse{mkinner\blx@delimcontext delims}{#1}}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def b/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def
index 0560377494f..79ccb72e835 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def
@@ -1,60 +1,79 @@
 \ProvidesFile{ext-biblatex-aux.def}
-  [2018/06/04 v0.3 auxiliaries for extended biblatex citation style (MW)]
+  [2018/06/10 v0.4 auxiliaries for extended biblatex citation style (MW)]
 
 \def\extblx@requiredbiblatexversion{3.11}
 \def\extblx@requiredbiblatexdate{2018/02/20}
 
+\newrobustcmd*{\extblx@warning}[1]{\PackageWarning{biblatex-ext}{#1}}
+\newrobustcmd*{\extblx@warning@noline}[1]{\PackageWarningNoLine{biblatex-ext}{#1}}
+
+\newrobustcmd*{\extblx@error}[2]{\PackageError{biblatex-ext}{#1}{#2.}}
+
 \@ifpackagelater{biblatex}{\extblx@requiredbiblatexdate}
   {}
-  {\PackageWarningNoLine{extbiblatex}
-     {Outdated version of biblatex detected.\MessageBreak
+  {\extblx@warning@noline{%
+      Outdated version of biblatex detected.\MessageBreak
       Upgrade to biblatex \extblx@requiredbiblatexversion\space
       (\extblx@requiredbiblatexdate) or later.\MessageBreak
       I found '\csuse{abx@version} (\csuse{abx@date})'}}
 
 %{<context>}{<opening delim>}{<closing delim>}
-\newcommand*{\DeclareOuterCiteDelim}{%
-  \extblx@declareciteddelim{outer}}
-\newrobustcmd*{\DeclareInnerCiteDelim}{%
-  \extblx@declareciteddelim{inner}}
+\newrobustcmd*{\DeclareOuterCiteDelims}{%
+  \extblx@declareciteddelims{outer}}
+\newrobustcmd*{\DeclareInnerCiteDelims}{%
+  \extblx@declareciteddelims{inner}}
 
 %{<inner/outer>}{<cite context>}{<opening delim>}{<closing delim>}
-\def\extblx@declareciteddelim#1#2#3#4{%
+\def\extblx@declareciteddelims#1#2#3#4{%
   \csdef{extblx@citedelim@#2@#1@open}{#3}%
   \csdef{extblx@citedelim@#2@#1@close}{#4}}
 
 %{<context>}
-\newcommand*{\UndeclareOuterCiteDelim}{%
-  \extblx@undeclareciteddelim{outer}}
-\newrobustcmd*{\UndeclareInnerCiteDelim}{%
-  \extblx@undeclareciteddelim{inner}}
+\newrobustcmd*{\UndeclareOuterCiteDelims}{%
+  \extblx@undeclareciteddelims{outer}}
+\newrobustcmd*{\UndeclareInnerCiteDelims}{%
+  \extblx@undeclareciteddelims{inner}}
 
 %{<inner/outer>}{<cite context>}
-\def\extblx@undeclareciteddelim#1#2{%
+\def\extblx@undeclareciteddelims#1#2{%
   \csundef{extblx@citedelim@#2@#1@open}%
   \csundef{extblx@citedelim@#2@#1@close}}
 
 %{<alias>}{<cite context>}
-\newcommand*{\DeclareOuterCiteDelimAlias}{%
+\newrobustcmd*{\DeclareOuterCiteDelimsAlias}{%
   \@ifstar
-    {\extblx@declareciteddelim@alias@i{outer}}
-    {\extblx@declareciteddelim@alias{outer}}}
-\newcommand*{\DeclareInnerCiteDelimAlias}{%
+    {\extblx@declareciteddelims@alias@i{outer}}
+    {\extblx@declareciteddelims@alias{outer}}}
+\newrobustcmd*{\DeclareInnerCiteDelimsAlias}{%
   \@ifstar
-    {\extblx@declareciteddelim@alias@i{inner}}
-    {\extblx@declareciteddelim@alias{inner}}}
+    {\extblx@declareciteddelims@alias@i{inner}}
+    {\extblx@declareciteddelims@alias{inner}}}
 
 %{<inner/outer>}{<alias>}{<cite context>}
-\def\extblx@declareciteddelim@alias#1#2#3{%
+\def\extblx@declareciteddelims@alias#1#2#3{%
   \csdef{extblx@citedelim@#2@#1@open}{\csuse{extblx@citedelim@#3@#1@open}}%
   \csdef{extblx@citedelim@#2@#1@close}{\csuse{extblx@citedelim@#3@#1@close}}}
-\def\extblx@declareciteddelim@alias@i#1#2#3{%
+\def\extblx@declareciteddelims@alias@i#1#2#3{%
   \csletcs{extblx@citedelim@#2@#1@open}{extblx@citedelim@#3@#1@open}%
   \csletcs{extblx@citedelim@#2@#1@close}{extblx@citedelim@#3@#1@close}}
 
 % declare \mk...delim commands
-\newrobustcmd*{\extblx@create@mkcitedelim}[2]{%
-  \protected\csdef{mk#1#2delim}##1{%
+\newrobustcmd*{\RegisterCiteDelims}[2]{%
+  \ifcsundef{mk#1#2delims}
+    {}
+    {\extblx@error
+       {Command \expandafter\string\csname mk#1#2delims\endcsname\space
+        already defined}
+       {biblatex-ext needs to define this command for the citation delimiter
+        feature,\MessageBreak
+        but \expandafter\string\csname mk#1#2delims\endcsname\space
+        is already defined.\MessageBreak
+        I don't want to overwrite the existing definition to avoid breaking
+        your document.\MessageBreak
+        If you force compilation despite the error, the command will be
+        overwritten\MessageBreak
+        with potentially catastrophic consequences}}%
+  \protected\csdef{mk#1#2delims}##1{%
     \begingroup
       \blx@blxinit
       \blx@setsfcodes
@@ -63,15 +82,15 @@
       \csuse{extblx@citedelim@#2@#1@close}%
     \endgroup}}
 
-\extblx@create@mkcitedelim{outer}{cite}
-\extblx@create@mkcitedelim{outer}{parencite}
-\extblx@create@mkcitedelim{outer}{textcite}
-\extblx@create@mkcitedelim{outer}{bibinxrefcite}
+\RegisterCiteDelims{outer}{cite}
+\RegisterCiteDelims{outer}{parencite}
+\RegisterCiteDelims{outer}{textcite}
+
+\RegisterCiteDelims{inner}{cite}
+\RegisterCiteDelims{inner}{parencite}
+\RegisterCiteDelims{inner}{textcite}
+\RegisterCiteDelims{inner}{footcite}
 
-\extblx@create@mkcitedelim{inner}{cite}
-\extblx@create@mkcitedelim{inner}{parencite}
-\extblx@create@mkcitedelim{inner}{textcite}
-\extblx@create@mkcitedelim{inner}{footcite}
 
 % smartcite is special
 % According to the docs it is like \parencite in a footnote and \footcite in
@@ -82,13 +101,91 @@
 % with \mkbibfootnote from the body), so we need to do it earlier.
 \newrobustcmd*{\mksmartcite}[1]{%
   \iffootnote
-    {\mkouterparencitedelim{%
+    {\mkouterparencitedelims{%
        \def\extblx@thisdelimcontext{parencite}%
        #1}}
     {\mkbibfootnote{%
        \def\extblx@thisdelimcontext{footcite}%
        #1}}}
 
+% Legacy names
+
+% compability for versions < 0.3
+\def\extblx@deprecate@delimcommand@robust#1{%
+  \protected\csedef{#1}{%
+    \noexpand\extblx@warning{%
+      \expandafter\string\csname#1\endcsname\space is deprecated.
+      \MessageBreak
+      Use \expandafter\string\csname#1s\endcsname\space (with s) instead.
+      \MessageBreak
+      Using \expandafter\string\csname#1s\endcsname\space}%
+  \expandonce{\csname#1s\endcsname}}}
+
+\extblx@deprecate@delimcommand@robust{DeclareOuterCiteDelim}
+\extblx@deprecate@delimcommand@robust{DeclareInnerCiteDelim}
+\extblx@deprecate@delimcommand@robust{UndeclareOuterCiteDelim}
+\extblx@deprecate@delimcommand@robust{UndeclareInnerCiteDelim}
+\extblx@deprecate@delimcommand@robust{DeclareOuterCiteDelimAlias}
+\extblx@deprecate@delimcommand@robust{DeclareInnerCiteDelimAlias}
+
+\newrobustcmd*{\extblx@create@mkcitedelim}{%
+  \extblx@warning{%
+    \string\extblx@create@mkcitedelim\space is deprecated.\MessageBreak
+    Use \string\RegisterCiteDelims\space instead.\MessageBreak
+    Using \string\RegisterCiteDelims\MessageBreak}
+  \RegisterCiteDelims}
+
+% Some very rudimentary backwards warning code for old names
+% this only warns, it can't salvage anything
+
+\AtEndDocument{%
+  \ifcsundef{abx@ffd@*@bbx:introcite}
+    {}
+    {\extblx@warning@noline{%
+       Field format 'bbx:introcite' defined.\MessageBreak
+       The format has been renamed to 'bbx@introcite'.\MessageBreak
+       This could mean that you are using the old name\MessageBreak
+       which does not work any more.\MessageBreak
+       Please use 'bbx@introcite' instead}}%
+  \ifcsundef{abx@ffd@*@bbx:introcitelabeldate}
+    {}
+    {\extblx@warning@noline{%
+       Field format 'bbx:introcitelabeldate'\MessageBreak
+       defined.\MessageBreak
+       The format has been renamed to\MessageBreak
+       'bbx@introcitelabeldate'.\MessageBreak
+       This could mean that you are using the old name\MessageBreak
+       which does not work any more.\MessageBreak
+       Please use\MessageBreak'bbx@introcitelabeldate'\MessageBreak instead}}%
+  \ifcsundef{blx@delimcontextalias@bbx:introcite}
+    {}
+    {\extblx@warning@noline{%
+       Delimiter context 'bbx:introcite' detected.\MessageBreak
+       The context has been renamed to 'bbx@introcite'.\MessageBreak
+       This could mean that you are using the old name\MessageBreak
+       which does not work any more.\MessageBreak
+       Please use 'bbx@introcite' instead}}%
+  \ifcsundef{extblx@citedelim@bbx:introcite@inner@open}
+    {}
+    {\extblx@warning@noline{%
+       Opening inner delimiter 'bbx:introcite' found.\MessageBreak
+       The delimiters have been renamed to\MessageBreak
+       'bbx@introcite'.\MessageBreak
+       This could mean that you are using the old name\MessageBreak
+       which does not work any more.\MessageBreak
+       Please use 'bbx@introcite' instead}}%
+  \ifcsundef{extblx@citedelim@bbx:introcite@inner@close}
+    {}
+    {\extblx@warning@noline{%
+       Closing inner delimiter 'bbx:introcite' found.\MessageBreak
+       The delimiters have been renamed to\MessageBreak
+       'bbx@introcite'.\MessageBreak
+       This could mean that you are using the old name\MessageBreak
+       which does not work any more.\MessageBreak
+       Please use 'bbx@introcite' instead}}%
+}
+
+
 \endinput
 %
 % This file is part of the biblatex-ext bundle.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx
index 8b47e760663..c4661c22ae5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-dashed-common.bbx}
-  [2018/06/04 v0.3 common files for extended biblatex
+  [2018/06/10 v0.4 common files for extended biblatex
    dashed bibliography styles (MW)]
 
 % \DeclareBibliographyOption checks if an option is already defined.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx
index de0a5a96ea9..10479513159 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-comp.bbx}
-  [2018/06/04 v0.3 extended biblatex numeric-comp
+  [2018/06/10 v0.4 extended biblatex numeric-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx
index 68c0a460928..7b4949d230d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-numeric-comp.cbx}
-  [2018/06/04 v0.3 extended biblatex numeric-comp citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex numeric-comp citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{numeric-comp}
 
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
 
 \renewbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\usebibmacro{cite:comp}}
     {\usebibmacro{cite:dump}%
      \ifbool{cbx:parens}
-       {\printtext{\csuse{extblx@citedelim@textcite@inner@close}}%
+       {\printtext{\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}%
                    \global\boolfalse{cbx:parens}}
        {}%
      \iffirstcitekey
@@ -27,7 +27,7 @@
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
      \setunit*{\printdelim{namelabeldelim}}%
-     \printtext{\csuse{extblx@citedelim@textcite@inner@open}}%
+     \printtext{\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
                 \global\booltrue{cbx:parens}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
@@ -36,7 +36,7 @@
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -45,7 +45,7 @@
   {\usebibmacro{cite:dump}%
    \usebibmacro{postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -79,7 +79,7 @@
   {}
   {\usebibmacro{cite:dump}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
@@ -87,21 +87,21 @@
   {\usebibmacro{cite:dump}%
    \usebibmacro{postnote}%
    \ifbool{cbx:parens}
-     {\csuse{extblx@citedelim@textcite@inner@close}%
+     {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
       \global\boolfalse{cbx:parens}}
      {}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx
index ea449595f5b..1e076dc605d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-verb.bbx}
-  [2018/06/04 v0.3 extended biblatex numeric-verb
+  [2018/06/10 v0.4 extended biblatex numeric-verb
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx
index b1a65766446..bb59105fe88 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx
@@ -1,15 +1,15 @@
 \ProvidesFile{ext-numeric-verb.cbx}
-  [2018/06/04 v0.3 extended biblatex numeric-verb citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex numeric-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{numeric-verb}
 
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
 
 \renewbibmacro*{textcite}{%
   \ifnameundef{labelname}
@@ -35,7 +35,7 @@
   {\usebibmacro{postnote}%
    \csuse{extblx@citedelim@cite@outer@close}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -51,7 +51,7 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
   {}
   {\usebibmacro{citeindex}%
    \iffirstcitekey
@@ -59,15 +59,15 @@
      {\stepcounter{textcitetotal}%
       \textcitedelim}%
    \usebibmacro{textcite}}
-  {\csuse{extblx@citedelim@textcite@inner@close}}
+  {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
   {\usebibmacro{postnote}%
-   \csuse{extblx@citedelim@textcite@inner@close}}
+   \csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
 
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
 
 \endinput
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
index 9f2c20bc256..6b2fe24198c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric.bbx}
-  [2018/06/04 v0.3 extended biblatex numeric bibliography style (MW)]
+  [2018/06/10 v0.4 extended biblatex numeric bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
index 00595dd959d..88063e88388 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
@@ -1,15 +1,15 @@
 \ProvidesFile{ext-numeric.cbx}
-  [2018/06/04 v0.3 extended biblatex numeric citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex numeric citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{numeric}
 
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
 
 \renewbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -18,7 +18,7 @@
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
      \setunit*{\printdelim{namelabeldelim}}%
-     \printtext{\csuse{extblx@citedelim@textcite@inner@open}}%
+     \printtext{\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
      \global\booltrue{cbx:parens}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
@@ -28,7 +28,7 @@
   \usebibmacro{cite}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\csuse{extblx@citedelim@textcite@inner@close}%
+      {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
        \global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
@@ -39,24 +39,24 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\csuse{extblx@citedelim@textcite@inner@close}%
+         {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}%
           \global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -72,19 +72,19 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
index d9e51313603..d6dc96b9e3a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.3 (2018-06-04)
+% biblatex-ext v0.4 (2018-06-10)
 % Maintainer:  Moritz Wemheuer
 % Licence:     LaTeX Project Public License v1.3c or later
 %
 \ProvidesFile{ext-standard.bbx}
-  [2018/06/04 v0.3 extended biblatex standard style (MW)]
+  [2018/06/10 v0.4 extended biblatex standard style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -11,15 +11,20 @@
 
 \providecommand*{\mkibid}[1]{#1}
 
-\newtoggle{bbx:citeinxref}
+\newtoggle{bbx:citexref}
 \newtoggle{bbx:innamebeforetitle}
 \newtoggle{bbx:innameidem}
 \newtoggle{bbx:articlein}
 \newtoggle{bbx:maintitleaftertitle}
 \newtoggle{bbx:introcite:plain:keeprelated}
 
+\DeclareBibliographyOption[boolean]{citexref}[true]{%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareBibliographyOption[boolean]{citeinxref}[true]{%
-  \settoggle{bbx:citeinxref}{#1}}
+  \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak
+    Use 'citexref' (without in) instead.\MessageBreak
+    Setting 'citexref' now}%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareBibliographyOption[boolean]{innamebeforetitle}[true]{%
   \settoggle{bbx:innamebeforetitle}{#1}}
 \DeclareBibliographyOption[boolean]{innameidem}[true]{%
@@ -41,7 +46,7 @@
 \def\extblx@opt@introcite@plain{2}
 
 \ExecuteBibliographyOptions{%
-  citeinxref          = false,
+  citexref            = false,
   innamebeforetitle   = false,
   innameidem          = false,
   articlein           = true,
@@ -50,8 +55,13 @@
 % maxbibnames         = 999,
 }
 
+\DeclareTypeOption[boolean]{citexref}[true]{%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareTypeOption[boolean]{citeinxref}[true]{%
-  \settoggle{bbx:citeinxref}{#1}}
+  \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak
+    Use 'citexref' (without in) instead.\MessageBreak
+    Setting 'citexref' now}%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareTypeOption[boolean]{innamebeforetitle}[true]{%
   \settoggle{bbx:innamebeforetitle}{#1}}
 \DeclareTypeOption[boolean]{innameidem}[true]{%
@@ -61,8 +71,13 @@
 \DeclareTypeOption[boolean]{maintitleaftertitle}[true]{%
   \settoggle{bbx:maintitleaftertitle}{#1}}
 
+\DeclareEntryOption[boolean]{citexref}[true]{%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareEntryOption[boolean]{citeinxref}[true]{%
-  \settoggle{bbx:citeinxref}{#1}}
+  \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak
+    Use 'citexref' (without in) instead.\MessageBreak
+    Setting 'citexref' now}%
+  \settoggle{bbx:citexref}{#1}}
 \DeclareEntryOption[boolean]{innamebeforetitle}[true]{%
   \settoggle{bbx:innamebeforetitle}{#1}}
 \DeclareEntryOption[boolean]{innameidem}[true]{%
@@ -75,9 +90,9 @@
 
 \newbibmacro*{bbx:introcite}{\usebibmacro{cite}}
 
-\extblx@create@mkcitedelim{inner}{bbx:introcite}
-\DeclareInnerCiteDelimAlias{bbx:introcite}{cite}
-\DeclareFieldFormat{bbx:introcite}{#1}
+\RegisterCiteDelims{inner}{bbx@introcite}
+\DeclareInnerCiteDelimsAlias{bbx@introcite}{cite}
+\DeclareFieldFormat{bbx@introcite}{#1}
 \newcommand*{\introcitepunct}{\addcolon\space}
 \newcommand*{\introcitebreak}{\leavevmode\newline}
 
@@ -93,7 +108,7 @@
       {}
       {\togglefalse{blx@bibliography}%
        \toggletrue{blx@citation}}%
-    \delimcontext{bbx:introcite}%
+    \delimcontext{bbx@introcite}%
     \csuse{blx@hook@cite}%
     \csuse{blx@hook@citekey}%
     \DeclareFieldFormat{bibhyperref}{##1}%
@@ -101,7 +116,7 @@
     \undef\cbx@lastyear
     \citetrackerfalse\pagetrackerfalse\backtrackerfalse
     \defcounter{maxnames}{\blx@maxcitenames}%
-    \printtext[bbx:introcite]{\usebibmacro{bbx:introcite}}%
+    \printtext[bbx@introcite]{\usebibmacro{bbx:introcite}}%
   \endgroup
 }
 
@@ -119,27 +134,30 @@
     {}}
 
 
-\newbibmacro*{bbx:cite:inxref}{\usebibmacro{cite}}
+\newbibmacro*{bbx:inxrefcite}{\usebibmacro{cite}}
 
-\DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \boolfalse{backtracker}}
-  {\usebibmacro{bbx:cite:inxref}}
+  {\usebibmacro{bbx:inxrefcite}}
   {}
   {}
 
-\DeclareDelimcontextAlias{bbx@cite@inxref}{cite}
-\DeclareOuterCiteDelimAlias{bibinxrefcite}{cite}
+\RegisterCiteDelims{outer}{bbx@xrefcite}
+\DeclareOuterCiteDelimsAlias{bbx@xrefcite}{cite}
+\RegisterCiteDelims{inner}{bbx@xrefcite}
+\DeclareInnerCiteDelimsAlias{bbx@xrefcite}{cite}
+\DeclareDelimcontextAlias{bbx@xrefcite}{cite}
 
 
 \newbibmacro*{crosscite}[1]{%
-  \iftoggle{bbx:citeinxref}
+  \iftoggle{bbx:citexref}
     {\iffieldundef{crossref}
        {\iffieldundef{xref}
           {\usebibmacro{#1}}
-          {\printtext{\bbx@cite@inxref{\thefield{xref}}}}}
-       {\printtext{\bbx@cite@inxref{\thefield{crossref}}}}}
+          {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
+       {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
     {\usebibmacro{#1}}}
 
 \DeclareDelimAlias{innametitledelim}{nametitledelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
index e96fa284355..eedacbd2b97 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-ibid.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-ibid
+  [2018/06/10 v0.4 extended biblatex verbose-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
index 9197629db7f..d8d6043880e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-verbose-ibid.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-ibid citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-ibid citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-ibid}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -32,7 +32,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -45,12 +45,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
index d54700fc0b8..c6327562e58 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-inote.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-inote
+  [2018/06/10 v0.4 extended biblatex verbose-inote
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx
index b3b2a6e495f..97329726876 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx
@@ -1,15 +1,15 @@
 \ProvidesFile{ext-verbose-inote.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-inote citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-inote citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-inote}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
@@ -18,7 +18,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
@@ -38,7 +38,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -51,12 +51,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
index ac26eb83c75..ebdeaf1dc5b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-note.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-note
+  [2018/06/10 v0.4 extended biblatex verbose-note
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx
index 1ac656961e9..3579b64d4a7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx
@@ -1,15 +1,15 @@
 \ProvidesFile{ext-verbose-note.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-note citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-note citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-note}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
@@ -18,7 +18,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
@@ -38,7 +38,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -51,12 +51,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
index 7cc3a53be47..a5fd475e2b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad1.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad1
+  [2018/06/10 v0.4 extended biblatex verbose-trad1
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
index dee7806617f..6f1098c3e77 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-verbose-trad1.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad1 citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-trad1 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-trad1}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -32,7 +32,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -45,12 +45,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
index d0d5aeb7786..76cf3faa5d2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad2.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad2
+  [2018/06/10 v0.4 extended biblatex verbose-trad2
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
index fbcf4fdb0c9..f2dfde1cdf6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-verbose-trad2.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad2 citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-trad2 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-trad2}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -32,7 +32,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -45,12 +45,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
index 20326933268..1ac54a239ef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad3.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad3
+  [2018/06/10 v0.4 extended biblatex verbose-trad3
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
index bf9a993cb0f..64d5cf7ad3a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-verbose-trad3.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose-trad3 citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose-trad3 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose-trad3}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -32,7 +32,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -45,12 +45,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
index 01691b64803..991032923b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose.bbx}
-  [2018/06/04 v0.3 extended biblatex verbose
+  [2018/06/10 v0.4 extended biblatex verbose
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
index 985bf73589c..2f48449683e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
@@ -1,22 +1,22 @@
 \ProvidesFile{ext-verbose.cbx}
-  [2018/06/04 v0.3 extended biblatex verbose citation style (MW)]
+  [2018/06/10 v0.4 extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
 \RequireCitationStyle{verbose}
 
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
 
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -32,7 +32,7 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
      {}
@@ -45,12 +45,12 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims]
   {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
   {\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
   {\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
author	Karl Berry <karl@freefriends.org>	2018-06-10 20:49:25 +0000
committer	Karl Berry <karl@freefriends.org>	2018-06-10 20:49:25 +0000
commit	016c87e3d5d8da8e0d35d9e14dd234d234f1acdd (patch)
tree	38227ee2163a6260725c9e5fdedeae40cacffdac /Master/texmf-dist/tex/latex
parent	94f0b880cd88c2f9737d2f1c77cecbc88f195400 (diff)