biblatex-ext (20mar18)

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

61 files changed, 312 insertions, 199 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md b/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
index 1266c271260..ee3148cdfad 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
@@ -1,2 +1,8 @@
+# Version 0.1a (2018-03-20)
+- Fixed inner cite delims for authoryear/authortitle and their ibid versions.
+- Fixed delimiters for `\smartcite`.
+  `\smartcite` really behaves like `\parencite` and `\footcite` now.
+  This needed some trickery to get the delimiter context right.
+
 # Version 0.1 (2018-03-18)
 - First public release.
diff --git a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib
index db2841814d2..c63234d418b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib
@@ -22,4 +22,4 @@
   title   = {On the Theory of Einiosauruses},
   date    = {1973},
   options = {maxnames=1, uniquelist=false},
-}
\ No newline at end of file
+}
diff --git a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf
index 38fa9dd3b54..4e2591e103d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
index 919677aab40..3b12f971709 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
@@ -315,7 +315,7 @@
 
 
 \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.1}
+\newcommand*{\extblxversion}{0.1a}
 \newcommand*{\biber}{Biber}
 \newcommand*{\gitissuelink}[1]{%
   \href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -327,7 +327,7 @@
   author   = {Moritz Wemheuer},
   link     = {mwemheu@gmail.com},%
   revision = {\extblxversion},
-  date     = {\DTMDate{2018-03-18}},
+  date     = {\DTMDate{2018-03-20}},
 }
 
 \hypersetup{%
@@ -1563,6 +1563,11 @@ The GitHub repository of this project uses release tags, so you can compare
 the changes in source code there.\footnote{\url{\gitbaseurl/compare/}}
 See also \sty{CHANGES.md}.
 \begin{changelog}
+\begin{release}{0.1a}{2018-03-20}
+\item Fixed inner citation delimiters for \sty{ext-authoryear},
+  \sty{ext-authortitle} and their \sty{-ibid} versions.
+\item Fixed \cmd{smartcite} delimiters.
+\end{release}
 \begin{release}{0.1}{2018-03-18}
 \item First public release.
 \end{release}
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 74c08f098e4..2298f6481cb 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/03/18 v0.1 extended biblatex alphabetic-verb
+  [2018/03/20 v0.1a 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 be169705d50..271b282536a 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,5 +1,5 @@
 \ProvidesFile{ext-alphabetic-verb.cbx}
-  [2018/03/18 v0.1 extended biblatex alphabetic-verb citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex alphabetic-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -22,7 +22,6 @@
     {}%
   \usebibmacro{cite}}
 
-
 \DeclareCiteCommand{\cite}
   {\csuse{extblx@citedelim@cite@outer@open}%
    \usebibmacro{prenote}}
@@ -43,8 +42,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -62,8 +63,9 @@
   {\usebibmacro{postnote}%
    \csuse{extblx@citedelim@textcite@inner@close}}
 
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
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 a7f8e7d19f2..30b0e412009 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/03/18 v0.1 extended biblatex alphabetic bibliography style (MW)]
+  [2018/03/20 v0.1a 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 fd2fc28d276..62f99284a73 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic.cbx}
-  [2018/03/18 v0.1 extended biblatex alphabetic citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex alphabetic citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -64,8 +64,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -78,11 +80,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 f15d3e672a7..c7c108c0a26 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/03/18 v0.1 common files for extended biblatex
+  [2018/03/20 v0.1a 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 6cc5be19fd4..26a1b06d869 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/03/18 v0.1 extended biblatex authortitle-comp
+  [2018/03/20 v0.1a 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 b76570a4844..0c9e700a679 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,5 +1,5 @@
 \ProvidesFile{ext-authortitle-comp.cbx}
-  [2018/03/18 v0.1 extended biblatex authortitle-comp
+  [2018/03/20 v0.1a extended biblatex authortitle-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -119,8 +119,10 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -134,12 +136,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
   {\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
 \DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
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 e3e9956ecc5..faa1b13599f 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/03/18 v0.1 extended biblatex authortitle-ibid
+  [2018/03/20 v0.1a 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 e5c7521d076..2a6beb9fbb3 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,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ibid.cbx}
-  [2018/03/18 v0.1 extended biblatex authortitle-ibid
+  [2018/03/20 v0.1a extended biblatex authortitle-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -14,12 +14,12 @@
 \DeclareInnerCiteDelim{footcite}{}{}
 
 \DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innertextcitedelim}{#1}
 \DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 
 \newbibmacro*{textcite}{%
   \global\boolfalse{cbx:loccit}%
@@ -82,8 +82,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -103,13 +105,15 @@
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
 \DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#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 7b50a19a1a4..cf23ecce876 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/03/18 v0.1 extended biblatex authortitle-icomp
+  [2018/03/20 v0.1a 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 b8274a646e2..703b1f0b397 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,5 +1,5 @@
 \ProvidesFile{ext-authortitle-icomp.cbx}
-  [2018/03/18 v0.1 extended biblatex authortitle-icomp
+  [2018/03/20 v0.1a extended biblatex authortitle-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -127,8 +127,10 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -142,12 +144,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
   {\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
 \DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
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 11e3a74f94e..954d666b1dd 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/03/18 v0.1 extended biblatex authortitle-tcomp
+  [2018/03/20 v0.1a 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 3fe7871013a..060a1a07b59 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/03/18 v0.1 extended biblatex authortitle-tcomp
+  [2018/03/20 v0.1a extended biblatex authortitle-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle-comp}
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 fd5378a8dee..cd91591bfae 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/03/18 v0.1 extended biblatex authortitle-terse
+  [2018/03/20 v0.1a 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 f5f354aacf2..6c8c21e761c 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/03/18 v0.1 extended biblatex authortitle-terse
+  [2018/03/20 v0.1a extended biblatex authortitle-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle}
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 6fca297cb87..92dab599c00 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/03/18 v0.1 extended biblatex authortitle-ticomp
+  [2018/03/20 v0.1a 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 411c895b0ca..258dd7d4a06 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/03/18 v0.1 extended biblatex authortitle-ticomp citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex authortitle-ticomp citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
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 7616fdbbfa4..54337476ef1 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/03/18 v0.1 extended biblatex authortitle
+  [2018/03/20 v0.1a 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 6cc421d1722..fa984816b6f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle.cbx}
-  [2018/03/18 v0.1 extended biblatex authortitle citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex authortitle citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -13,12 +13,12 @@
 \DeclareInnerCiteDelim{footcite}{}{}
 
 \DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innertextcitedelim}{#1}
 \DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 
 \renewbibmacro*{textcite}{%
   \printnames{labelname}%
@@ -50,7 +50,6 @@
      \printfield{postnote}%
      \csuse{extblx@citedelim@textcite@inner@close}}}
 
-
 \DeclareCiteCommand{\cite}[\mkoutercitedelim]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -79,8 +78,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -100,13 +101,15 @@
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
 \DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#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 13107d8bc2f..51e9541cffc 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/03/18 v0.1 common files for extended biblatex
+  [2018/03/20 v0.1a 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 a4fa40fdc79..01291fa3ef9 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/03/18 v0.1 extended biblatex authoryear-comp
+  [2018/03/20 v0.1a 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 0b909a413d7..756e970156a 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,5 +1,5 @@
 \ProvidesFile{ext-authoryear-comp.cbx}
-  [2018/03/18 v0.1 extended biblatex authoryear-comp
+  [2018/03/20 v0.1a extended biblatex authoryear-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -19,7 +19,8 @@
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+    {\ifboolexpr{test {\ifnameundef{labelname}}
+                 or test {\iffieldundef{labelyear}}}
        {\usebibmacro{cite:label}%
         \setunit{%
           \global\booltrue{cbx:parens}%
@@ -190,8 +191,10 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -205,12 +208,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}
-  {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
 \DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
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 be1fa7159a6..6c074649465 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/03/18 v0.1 extended biblatex authoryear-ibid
+  [2018/03/20 v0.1a 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 2afa6d0f823..79326c429f4 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,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ibid.cbx}
-  [2018/03/18 v0.1 extended biblatex authoryear-ibid
+  [2018/03/20 v0.1a extended biblatex authoryear-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -11,12 +11,12 @@
 \DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
 
 \DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innertextcitedelim}{#1}
 \DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -101,8 +101,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -122,14 +124,16 @@
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
 \DeclareFieldFormat{bbx:introcitelabeldate}{#1}
 \DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#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 c536ec08002..9fde38ba71e 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/03/18 v0.1 extended biblatex authoryear-icomp
+  [2018/03/20 v0.1a 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 3c35e97952b..27ed1192575 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,5 +1,5 @@
 \ProvidesFile{ext-authoryear-icomp.cbx}
-  [2018/03/18 v0.1 extended biblatex authoryear-icomp
+  [2018/03/20 v0.1a extended biblatex authoryear-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -21,7 +21,8 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
-       {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+       {\ifboolexpr{test {\ifnameundef{labelname}}
+                    or test {\iffieldundef{labelyear}}}
           {\usebibmacro{cite:label}%
            \setunit{%
              \global\booltrue{cbx:parens}%
@@ -184,8 +185,10 @@
   {}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
@@ -199,13 +202,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
-
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\setunit{\multicitedelim}}
 \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
   {\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
 \DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
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 a53e81c8e3d..f056b034dad 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/03/18 v0.1 extended biblatex authoryear-tcomp
+  [2018/03/20 v0.1a 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 a1070eb3d55..0da18d5638b 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/03/18 v0.1 extended biblatex authoryear-tcomp
+  [2018/03/20 v0.1a extended biblatex authoryear-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-comp}
@@ -10,7 +10,8 @@
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+    {\ifboolexpr{test {\ifnameundef{labelname}}
+                 or test {\iffieldundef{labelyear}}}
        {\usebibmacro{cite:label}%
         \setunit{%
           \global\booltrue{cbx:parens}%
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 350845537e2..37e625a659a 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/03/18 v0.1 extended biblatex authoryear-terse
+  [2018/03/20 v0.1a 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 e450938a7b5..86608e11c49 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/03/18 v0.1 extended biblatex authoryear-terse
+  [2018/03/20 v0.1a extended biblatex authoryear-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear}
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 e698737b756..38f86039b55 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/03/18 v0.1 extended biblatex authoryear-ticomp
+  [2018/03/20 v0.1a 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 fb8f51b3f34..50c9b54c235 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/03/18 v0.1 extended biblatex authoryear-ticomp citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex authoryear-ticomp citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-icomp}
 \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -11,7 +11,8 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
-       {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+       {\ifboolexpr{test {\ifnameundef{labelname}}
+                    or test {\iffieldundef{labelyear}}}
           {\usebibmacro{cite:label}%
            \setunit{%
              \global\booltrue{cbx:parens}%
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 e61d25b2909..0bec30adc19 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/03/18 v0.1 extended biblatex authoryear bibliography style (MW)]
+  [2018/03/20 v0.1a 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 520179ffaa3..667734aa98c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear.cbx}
-  [2018/03/18 v0.1 extended biblatex authoryear citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -10,12 +10,12 @@
 \DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
 
 \DeclareFieldFormat{extblx@innercitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innerparencitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 \DeclareFieldFormat{extblx@innertextcitedelim}{#1}
 \DeclareFieldFormat{extblx@innerfootcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#1}}
 
 \DeclareFieldFormat{citelabeldate}{#1}
 \DeclareFieldFormat{parencitelabeldate}{#1}
@@ -92,14 +92,15 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-
 \DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
   {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
@@ -114,14 +115,16 @@
      {}}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
 \DeclareFieldFormat{bbx:introcitelabeldate}{#1}
 \DeclareFieldFormat{extblx@innerbbx:introcitedelim}{%
-  \csuse{mkpairedinner\blx@delimcontext delim}{#1}}
+  \csuse{mkinner\blx@delimcontext delim}{#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 d7c970daa43..97f51add42c 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,5 +1,5 @@
 \ProvidesFile{ext-biblatex-aux.def}
-  [2018/03/18 v0.1 auxiliaries for extended biblatex citation style (MW)]
+  [2018/03/20 v0.1a auxiliaries for extended biblatex citation style (MW)]
 
 \def\extblx@requiredbiblatexversion{3.11}
 \def\extblx@requiredbiblatexdate{2018/02/20}
@@ -52,7 +52,7 @@
   \csletcs{extblx@citedelim@#2@#1@open}{extblx@citedelim@#3@#1@open}%
   \csletcs{extblx@citedelim@#2@#1@close}{extblx@citedelim@#3@#1@close}}
 
-% declare \mkpaired...delim commands
+% declare \mk...delim commands
 \newrobustcmd*{\extblx@create@mkcitedelim}[2]{%
   \protected\csdef{mk#1#2delim}##1{%
     \begingroup
@@ -73,4 +73,20 @@
 \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
+% the body.
+% To mirror that as closely as possible, we need to change the delimiter
+% context. The delimcontext is set in the pre-code, it is too late to detect
+% a footnote at that point (since we will have started the footnote ourselves
+% with \mkbibfootnote from the body), so we need to do it earlier.
+\newrobustcmd*{\mksmartcite}[1]{%
+  \iffootnote
+    {\mkouterparencitedelim{%
+       \def\extblx@thisdelimcontext{parencite}%
+       #1}}
+    {\mkbibfootnote{%
+       \def\extblx@thisdelimcontext{footcite}%
+       #1}}}
+
 \endinput
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 9cc19172a35..b8311e3d42f 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/03/18 v0.1 common files for extended biblatex
+  [2018/03/20 v0.1a 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 f6d5b31bcc3..69326b0a5aa 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/03/18 v0.1 extended biblatex numeric-comp
+  [2018/03/20 v0.1a 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 131ae73da83..d45cd47caf7 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,5 +1,5 @@
 \ProvidesFile{ext-numeric-comp.cbx}
-  [2018/03/18 v0.1 extended biblatex numeric-comp citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex numeric-comp citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -54,8 +54,10 @@
   {\usebibmacro{cite:dump}%
    \usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:comp}}
@@ -89,11 +91,14 @@
       \global\boolfalse{cbx:parens}}
      {}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \DeclareCiteCommand{\bbx@cite@inxref}[\mkouterbibinxrefcitedelim]
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 328abc7bb35..1d8e1e6a8e6 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/03/18 v0.1 extended biblatex numeric-verb
+  [2018/03/20 v0.1a 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 e50f4a44794..f5c39d13072 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,5 +1,5 @@
 \ProvidesFile{ext-numeric-verb.cbx}
-  [2018/03/18 v0.1 extended biblatex numeric-verb citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex numeric-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -15,7 +15,8 @@
   \ifnameundef{labelname}
     {\printfield[citetitle]{labeltitle}}
     {\printnames{labelname}}%
-  \printdelim{namelabeldelim}\csuse{extblx@citedelim@\blx@delimcontext @inner@open}%
+  \printdelim{namelabeldelim}%
+  \csuse{extblx@citedelim@\blx@delimcontext @inner@open}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
@@ -41,8 +42,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -60,8 +63,9 @@
   {\usebibmacro{postnote}%
    \csuse{extblx@citedelim@textcite@inner@close}}
 
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
 
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 b7207c45ec4..b01252c001b 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/03/18 v0.1 extended biblatex numeric bibliography style (MW)]
+  [2018/03/20 v0.1a 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 4074467bedf..6e39f7cf953 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric.cbx}
-  [2018/03/18 v0.1 extended biblatex numeric citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex numeric citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -63,8 +63,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -77,11 +79,14 @@
   {}
   {\usebibmacro{textcite:postnote}}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 187bf667329..e82ffb6f62e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-standard.bbx}
-  [2018/03/18 v0.1 extended biblatex standard style (MW)]
+  [2018/03/20 v0.1a extended biblatex standard style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
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 323a65c4cad..408fcf5a6df 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/03/18 v0.1 extended biblatex verbose-ibid
+  [2018/03/20 v0.1a 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 87d28e9c084..372d6b1ac7c 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-ibid.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-ibid citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-ibid citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -23,8 +23,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -43,11 +45,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 52e35da5511..328bfdde6e8 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,9 +1,8 @@
 \ProvidesFile{ext-verbose-inote.bbx}
-  [2018/03/18 v0.1 extended biblatex verbose-inote
+  [2018/03/20 v0.1a extended biblatex verbose-inote
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{verbose-inote}
 
-
 \endinput
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 a59778d6c05..57670b2ca54 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-inote.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-inote citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-inote citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -27,8 +27,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
      {\usebibmacro{footcite}}
@@ -49,11 +51,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 90c8b6387ac..eaf1f0b557b 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/03/18 v0.1 extended biblatex verbose-note
+  [2018/03/20 v0.1a 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 666629f00db..c3c075ceea1 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-note.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-note citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-note citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -27,8 +27,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \iffootnote
      {\usebibmacro{footcite}}
@@ -36,7 +38,6 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-
 \DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelim]
   {\usebibmacro{textcite:init}}
   {\iffieldequals{namehash}{\cbx@lasthash}
@@ -50,12 +51,14 @@
   {}
   {}
 
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
-
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 13756084060..6415e08815b 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/03/18 v0.1 extended biblatex verbose-trad1
+  [2018/03/20 v0.1a 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 de0c95ad2ac..8f11cf0e5eb 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad1.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-trad1 citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-trad1 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -23,8 +23,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -43,11 +45,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 b878166bb7c..e9d33dd033c 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/03/18 v0.1 extended biblatex verbose-trad2
+  [2018/03/20 v0.1a 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 2e89eb2f546..6716367a460 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad2.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-trad2 citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-trad2 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -23,8 +23,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -43,11 +45,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 f0ed834292f..d4b4d585583 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/03/18 v0.1 extended biblatex verbose-trad3
+  [2018/03/20 v0.1a 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 7f1e43ab3c9..42fa11d539b 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,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad3.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose-trad3 citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose-trad3 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -23,8 +23,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -43,11 +45,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput
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 f0e958001b6..8b7e4dd07b0 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/03/18 v0.1 extended biblatex verbose
+  [2018/03/20 v0.1a 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 67056ea0689..69da5e9f7a4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose.cbx}
-  [2018/03/18 v0.1 extended biblatex verbose citation style (MW)]
+  [2018/03/20 v0.1a extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -23,8 +23,10 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
-  {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+  {\delimcontext{\extblx@thisdelimcontext}%
+   \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -43,11 +45,14 @@
   {}
   {}
 
-\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelim]
+  {\cbx@textcite}{}
 
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+  {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+  {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\multicitedelim}
 
 \endinput