biblatex-ext (18jun22)

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

89 files changed, 260 insertions, 232 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md b/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
index c6a95f43519..dc1cf2dbca7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.16 (2022-06-18)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.15...v0.16>
+
+### Changed
+- Reworked the implementation of `citexref`.
+  The citation is no longer printed with a citation command,
+  it uses only bibmacros now.
+
 ## Version 0.15 (2022-03-06)
 
 See <https://github.com/moewew/biblatex-ext/compare/v0.14...v0.15>
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 f5d9a3af2b1..825d00e6dea 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 bc7c16c3ada..12ee61f9557 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
@@ -586,7 +586,7 @@
 
 \newcommand*{\ctan}{\mkbibacro{CTAN}}
 \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.15}
+\newcommand*{\extblxversion}{0.16}
 \newcommand*{\biber}{Biber}
 \newcommand*{\gitissuelink}[1]{%
   \href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -659,7 +659,7 @@
   author   = {Moritz Wemheuer},
   email    = {mwemheu@posteo.de},%
   revision = {\extblxversion},
-  date     = {\DTMDate{2022-03-06}},
+  date     = {\DTMDate{2022-06-18}},
 }
 
 \hypersetup{%
@@ -1368,8 +1368,8 @@ or implicitly via the \opt{minxrefs} or \opt{mincrossrefs} option.
       {\iffieldundef{crossref}
          {\iffieldundef{xref}
             {\usebibmacro{#1}}
-            {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-         {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+            {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+         {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
       {\usebibmacro{#1}}}}
 \makeatother
 \toggletrue{bbx:citexref}
@@ -1384,20 +1384,48 @@ or implicitly via the \opt{minxrefs} or \opt{mincrossrefs} option.
       {\iffieldundef{crossref}
          {\iffieldundef{xref}
             {\usebibmacro{#1}}
-            {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-         {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+            {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+         {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
       {\usebibmacro{#1}}}}
 \makeatother
 \togglefalse{bbx:citexref}
 \exampleprintbib{westfahl:space,westfahl:frontier}
 \end{bibexample}
 
-The citation produced by this option is implemented via
+For technical reasons the citation label is not produced with a real
+cite command.
+The user-definable parts of the citation output are controlled by the
+bibmacro~\bibmacro{bbx:xrefcite}.
+\begin{keymarglistbook}
+\keyitem[bbx:xrefcite]
+This bibmacro typesets the \enquote{citation} to the parent entry.
+With many citation styles it will just call the~\bibmacro{cite}
+bibmacro,
+but in more complex styles it may also call additional initialisation
+or clean-up code.
+\end{keymarglistbook}
+In order to reproduce the citation label accurately in the bibliography,
+some initialisation and housekeeping needs to be done.
+\begin{ltxsyntax}
+\cmditem{AtXrefcite}{code}
+\cmditem*{AtXrefcite}*{code}
+
+Appends the \prm{code} to an internal hook executed when initializing
+\cmd{xrefcite}.
+The starred variant of the command clears the initialisation hook,
+so the defaults can be overwritten.
+The default settings execute the internal macro
+\cs{extblx@bibcite@init}, which makes sure that the label produced
+for introcite takes into account the citation settings and suppresses
+unwanted citation tracking and hyperlinks.
+\end{ltxsyntax}
+
+Even though the citation produced by this option is not implemented
+via a citation command,
+the output can be configured as if it were
+produced by a citation command called
 \cmd{bbx@xrefcite},
-which is set up to inherit most styling from \cmd{cite}.
-\cmd{bbx@xrefcite} can be modified as usual
-(and independent of \cmd{cite})
-if the delimiter context alias is removed.
+which by default is set up to inherit most styling from \cmd{cite}.
 \begin{bibexample}[enhanced,
   title={Example customisation of \cmd{bbx@xrefcite}}]
 \begin{lstlisting}[style=extblxstylelatex]
@@ -1412,8 +1440,8 @@ if the delimiter context alias is removed.
       {\iffieldundef{crossref}
          {\iffieldundef{xref}
             {\usebibmacro{#1}}
-            {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-         {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+            {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+         {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
       {\usebibmacro{#1}}}}
 \makeatother
 \UndeclareDelimcontextAlias{bbx@xrefcite}
@@ -1422,25 +1450,10 @@ if the delimiter context alias is removed.
 \exampleprintbib{westfahl:space,westfahl:frontier}
 \end{bibexample}
 
-The bibliography macro that prints the citation in \cmd{bbx@xrefcite}
-is called \bibmacro{bbx:inxrefcite}.
-By default this bibliography macro just expands to the bibliography
-macro \bibmacro{cite}.
-In some cases it might be easier to obtain the desired result by
-redefining this bibliography macro than by redefining the complete
-citation command \cmd{bbx@xrefcite} with \cmd{DeclareCiteCommand}.
-\begin{remindbox}
-For general citation commands
-this strategy of only changing the bibliography macro and not
-the complete citation command will not always result in
-the expected output, but in the context of \opt{citexref},
-where we have control over how exactly the citation command is going
-to be used, we can sometimes use this shortcut.
-\end{remindbox}
 
 The following example shows the standard behaviour of \opt{citexref}
 with a numeric style and a customisation involving
-\bibmacro{bbx:inxrefcite} that emulates the output of \cmd{textcite}.
+\bibmacro{bbx:xrefcite} that emulates the output of \cmd{textcite}.
 
 \begin{bibexample}[enhanced,
   title={Standard behaviour of \cmd{bbx@xrefcite}
@@ -1456,8 +1469,8 @@ with a numeric style and a customisation involving
       {\iffieldundef{crossref}
          {\iffieldundef{xref}
             {\usebibmacro{#1}}
-            {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-         {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+            {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+         {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
       {\usebibmacro{#1}}}}
 \makeatother
 \UndeclareDelimcontextAlias{bbx@xrefcite}
@@ -1516,7 +1529,7 @@ with a numeric style and a customisation involving
 \UndeclareCiteDelims{bbx@xrefcite}
 \DeclareDelimcontextAlias{bbx@xrefcite}{textcite}
 
-\renewbibmacro*{bbx:inxrefcite}{%
+\renewbibmacro*{bbx:xrefcite}{%
   \usebibmacro{textcite:init}%
   \usebibmacro{textcite}%
   \usebibmacro{textcite:postnote}}
@@ -1529,8 +1542,8 @@ with a numeric style and a customisation involving
       {\iffieldundef{crossref}
          {\iffieldundef{xref}
             {\usebibmacro{#1}}
-            {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-         {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+            {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+         {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
       {\usebibmacro{#1}}}}
 % emulate all the 'numeric'/default behaviour
 \DeclareNameAlias{sortname}{given-family}
@@ -1613,7 +1626,7 @@ with a numeric style and a customisation involving
 \makeatother
 \UndeclareCiteDelims{bbx@xrefcite}
 \DeclareDelimcontextAlias{bbx@xrefcite}{textcite}
-\renewbibmacro*{bbx:inxrefcite}{%
+\renewbibmacro*{bbx:xrefcite}{%
   \usebibmacro{textcite:init}%
   \usebibmacro{textcite}%
   \usebibmacro{textcite:postnote}}
@@ -2076,7 +2089,7 @@ Appends the \prm{code} to an internal hook executed when initializing
 The starred variant of the command clears the initialisation hook,
 so the defaults can be overwritten.
 The default settings execute the internal macro
-\cs{extblx@introcite@init}, which makes sure that the label produced
+\cs{extblx@bibcite@init}, which makes sure that the label produced
 for introcite takes into account the citation settings and suppresses
 unwanted citation tracking and hyperlinks.
 \end{ltxsyntax}
@@ -2898,7 +2911,10 @@ Citation command & Outer & Inner\\
 \cmd{footcite} & \cmd{mkouterfootcitedelims} & \cmd{mkinnerfootcitedelims}\\
 \cmd{supercite}\footnote{If defined by the citation style.}
  & \cmd{mkoutersupercitedelims} & ---\\
-\cmd{bbx@xrefcite} & \cmd{mkouterbbx@xrefcitedelims} &
+\enquote{\cmd{bbx@xrefcite}}%
+  \footnote{Not implemented as a citation command, but can be
+    customised as if it were.}
+& \cmd{mkouterbbx@xrefcitedelims} &
   \cmd{mkinnerbbx@xrefcitedelims}\\
 \enquote{\cmd{bbx@introcite}} & ---%
     \footnote{Use the field format \bibfieldformat{bbx@introcite} instead,
@@ -4062,6 +4078,9 @@ See also \filename{CHANGES.md}.
 
 The numbers on the right indicate the relevant section of the manual.
 \begin{changelog}
+\begin{release}{0.16}{2022-06-18}
+  \item Reworked \hyperopt{citexref} implementation\see{sec:opt}
+\end{release}
 \begin{release}{0.15}{2022-03-06}
   \item New \hyperblxstyle[ext-authornumber]{ext-authornumber-*} style
     subfamily\see{sec:styles:new}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty
index 9a044048b3d..ead7525d942 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oa-doiapi}
-  [2022/03/06 v0.15 Obtain open access information from DOI via
+  [2022/06/18 v0.16 Obtain open access information from DOI via
    unpaywall.org and doi.org (MW)]
 
 \RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty
index 6d1ae6bb775..d3ba47fc06a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oa}
-  [2022/03/06 v0.15 mark open access in biblatex bibliographies (MW)]
+  [2022/06/18 v0.16 mark open access in biblatex bibliographies (MW)]
 
 \RequirePackage{etoolbox}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index 0c7d1cc69fa..9258f8bce16 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
 \RequirePackage{expl3}
 
 \ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
-  {2022/03/06} {0.15}
+  {2022/06/18} {0.16}
   {open access symbols with l3draw (MW)}
 
 \RequirePackage{xparse}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index f60d985a384..4cce43762f1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oasymb-pict2e}
-  [2022/03/06 v0.15 open access symbols with pict2e (MW)]
+  [2022/06/18 v0.16 open access symbols with pict2e (MW)]
 
 \RequirePackage{etoolbox}
 \RequirePackage{kvoptions}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index c7e5aad2284..598703615b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oasymb-tikz}
-  [2022/03/06 v0.15 open access symbols with TikZ (MW)]
+  [2022/06/18 v0.16 open access symbols with TikZ (MW)]
 
 \RequirePackage{etoolbox}
 \RequirePackage{kvoptions}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty
index e3c4c4f88ca..a1a65e638a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-tabular}
-  [2022/03/06 v0.15 tabular bibliographies for biblatex (MW)]
+  [2022/06/18 v0.16 tabular bibliographies for biblatex (MW)]
 
 % Code based on Audrey's
 % (https://tex.stackexchange.com/users/4483/audrey)
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/blxextdoiapi.lua b/Master/texmf-dist/tex/latex/biblatex-ext/blxextdoiapi.lua
index 20e5f7e9ed2..4e13ac2c664 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/blxextdoiapi.lua
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
 
 local blxextdoiapi_module = {
   name          = "blxextdoiapi",
-  version       = "v0.15",
-  date          = "2022/03/06",
+  version       = "v0.16",
+  date          = "2022/06/18",
   description   = "Obtain open access information from DOI via unpaywall.org",
   author        = "Moritz Wemheuer",
   license       = "LPPL v1.3c",
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 d0c9285e1fd..22657b5deb2 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}
-  [2022/03/06 v0.15 extended biblatex alphabetic-verb
+  [2022/06/18 v0.16 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 327df9ac59f..ddea05768ad 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}
-  [2022/03/06 v0.15 extended biblatex alphabetic-verb citation style
+  [2022/06/18 v0.16 extended biblatex alphabetic-verb citation style
    (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
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 aed09a1ca9d..8c0fcca71d0 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}
-  [2022/03/06 v0.15 extended biblatex alphabetic bibliography style (MW)]
+  [2022/06/18 v0.16 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 e973036d8e1..d9e0d963f79 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}
-  [2022/03/06 v0.15 extended biblatex alphabetic citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex alphabetic citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.bbx
index 4235479377f..cab62fa5382 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.cbx
index 1cf8e3b510a..4b600532c9b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-comp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -287,19 +287,18 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
+
 \DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
   \csuse{mkinner\blx@delimcontext delims}{#1}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
-
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \usebibmacro{cite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.bbx
index 4235479377f..cab62fa5382 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.cbx
index e24aa2f56aa..1719bc00ff9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-ecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-ecomp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -397,19 +397,18 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
+
 \DeclareFieldFormat{extblx@innerbbx@introcitedelims}{%
   \csuse{mkinner\blx@delimcontext delims}{#1}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
-
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \usebibmacro{cite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.bbx
index 0dd1bcdaa9f..c0f384ce081 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tcomp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber-terse}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.cbx
index 31b461d5698..6e4fb3b208e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tcomp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber-comp}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.bbx
index 59d5e17a9ef..578592e89bc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tecomp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber-terse}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.cbx
index 92781ee713b..e3df1d844ad 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-tecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tecomp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber-ecomp}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.bbx
index 4fbb237f019..31de6eddab6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-terse.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.cbx
index 3060f24e955..6e7e4c50719 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-terse.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.bbx
index 6eb1bbee2e5..cbf5219fade 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{ext-authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.cbx
index 7891e7fe484..b0c3cc231af 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authornumber.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
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 fc127a7417c..a11dae44ba3 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}
-  [2022/03/06 v0.15 common files for extended biblatex
+  [2022/06/18 v0.16 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 0c543849022..cae2bde0832 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-comp
+  [2022/06/18 v0.16 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 40abc2c08ee..b19a3ddc05d 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-comp
+  [2022/06/18 v0.16 extended biblatex authortitle-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -168,16 +168,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \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 100f2a339e8..f8df7a8dbc6 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-ibid
+  [2022/06/18 v0.16 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 373674d1446..7c904f83ae0 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-ibid
+  [2022/06/18 v0.16 extended biblatex authortitle-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
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 cf6faf5e60e..ba381c0a27c 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-icomp
+  [2022/06/18 v0.16 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 e78197f0dc9..da400c27399 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-icomp
+  [2022/06/18 v0.16 extended biblatex authortitle-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -176,16 +176,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \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 71fe81c6aff..f9e54a1c088 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-tcomp
+  [2022/06/18 v0.16 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 adf6cab2afe..5c9abc38c64 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-tcomp
+  [2022/06/18 v0.16 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 ca4505cb008..6c2b1721721 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-terse
+  [2022/06/18 v0.16 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 2cb08da66ef..716af58d42b 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-terse
+  [2022/06/18 v0.16 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 0ee08470c8c..ca3555bd8c4 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-ticomp
+  [2022/06/18 v0.16 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 26452f3a5bc..9ed75210612 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}
-  [2022/03/06 v0.15 extended biblatex authortitle-ticomp citation style
+  [2022/06/18 v0.16 extended biblatex authortitle-ticomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authortitle-icomp}
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 457c64d036d..541307177f6 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}
-  [2022/03/06 v0.15 extended biblatex authortitle
+  [2022/06/18 v0.16 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 f6aa3afd6b3..d35a9200597 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}
-  [2022/03/06 v0.15 extended biblatex authortitle citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authortitle citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
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 0a69324f5cc..1c1ec212e60 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}
-  [2022/03/06 v0.15 common files for extended biblatex
+  [2022/06/18 v0.16 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 116dea86929..6f086f03ad1 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-comp
+  [2022/06/18 v0.16 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 37420d524fe..dbc22bd4d05 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-comp
+  [2022/06/18 v0.16 extended biblatex authoryear-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -226,16 +226,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \usebibmacro{cite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx
index bb8ec16f938..12c4bd2257d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ecomp.bbx}
-  [2022/03/06 v0.15 biblatex authoryear-ecomp
+  [2022/06/18 v0.16 biblatex authoryear-ecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx
index c224da0f326..ecbeb3148b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ecomp.cbx}
-  [2022/03/06 v0.15 biblatex authoryear-ecomp
+  [2022/06/18 v0.16 biblatex authoryear-ecomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -322,17 +322,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:dump:extradate}%
-   \usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \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 91d6f9172d4..fe1d4919417 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-ibid
+  [2022/06/18 v0.16 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 279818515b6..74d64aa636e 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-ibid
+  [2022/06/18 v0.16 extended biblatex authoryear-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
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 64199a2c264..c6407a04555 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-icomp
+  [2022/06/18 v0.16 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 aac13b26c3c..20f45c54680 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-icomp
+  [2022/06/18 v0.16 extended biblatex authoryear-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -236,16 +236,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \usebibmacro{cite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx
index 21238f2daf8..537e37699e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-iecomp.bbx}
-  [2022/03/06 v0.15 biblatex authoryear-iecomp
+  [2022/06/18 v0.16 biblatex authoryear-iecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx
index 5e5b2009483..39d3ae90cfe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-iecomp.cbx}
-  [2022/03/06 v0.15 biblatex authoryear-iecomp
+  [2022/06/18 v0.16 biblatex authoryear-iecomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -332,17 +332,15 @@
 \DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
   {\smartcite}{\setunit{\multicitedelim}}
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {\usebibmacro{cite:dump:extradate}%
-   \usebibmacro{cite:postnote}}
+
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite}%
+  \clearfield{postnote}%
+  \usebibmacro{cite:postnote}}
 
 \renewbibmacro*{bbx:introcite}{%
+  \usebibmacro{cite:init}%
   \usebibmacro{cite}%
   \clearfield{postnote}%
   \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 7d63c228c95..bca8652c8bb 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-tcomp
+  [2022/06/18 v0.16 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 75762149365..282e8c59ea3 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-tcomp
+  [2022/06/18 v0.16 extended biblatex authoryear-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx
index 0a630ac107f..72c68f6d738 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tecomp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear-tecomp
+  [2022/06/18 v0.16 extended biblatex authoryear-tecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx
index 84000da6f51..8ec7615f75a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tecomp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear-tecomp
+  [2022/06/18 v0.16 extended biblatex authoryear-tecomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-ecomp}
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 184a05b9c11..9953ffe1ee5 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-terse
+  [2022/06/18 v0.16 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 9b4d66f251c..cfc3e8ebf3f 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-terse
+  [2022/06/18 v0.16 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 c30b987831f..bbed7bff740 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-ticomp
+  [2022/06/18 v0.16 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 b6b3877b78e..e1cfa0ee247 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}
-  [2022/03/06 v0.15 extended biblatex authoryear-ticomp citation style
+  [2022/06/18 v0.16 extended biblatex authoryear-ticomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authoryear-icomp}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx
index 38cb0b787f4..83f682bb0e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tiecomp.bbx}
-  [2022/03/06 v0.15 extended biblatex authoryear-tiecomp
+  [2022/06/18 v0.16 extended biblatex authoryear-tiecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx
index d9c66b0ccdf..1a2ea80cfb7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tiecomp.cbx}
-  [2022/03/06 v0.15 extended biblatex authoryear-tiecomp citation style
+  [2022/06/18 v0.16 extended biblatex authoryear-tiecomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authoryear-iecomp}
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 ef87abaf858..d7c30aa1ca2 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}
-  [2022/03/06 v0.15 extended biblatex authoryear bibliography style (MW)]
+  [2022/06/18 v0.16 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 db3a906660d..1835e776343 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}
-  [2022/03/06 v0.15 extended biblatex authoryear citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
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 924a5b10075..f54ad39faf6 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}
-  [2022/03/06 v0.15 auxiliaries for extended biblatex citation style
+  [2022/06/18 v0.16 auxiliaries for extended biblatex citation style
    (MW)]
 
 \def\extblx@requiredbiblatexversion{3.17}
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 f8500652076..246569a3bbf 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}
-  [2022/03/06 v0.15 common files for extended biblatex
+  [2022/06/18 v0.16 common files for extended biblatex
    dashed bibliography styles (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
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 2f3b119a47e..bbeb7faf638 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}
-  [2022/03/06 v0.15 extended biblatex numeric-comp
+  [2022/06/18 v0.16 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 5c8b8d1ee56..f77af8c920d 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}
-  [2022/03/06 v0.15 extended biblatex numeric-comp citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex numeric-comp citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -130,14 +130,10 @@
   {\smartcite}{\multicitedelim}
 
 
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}%
-   \usebibmacro{cite:init}}
-  {\usebibmacro{cite:comp}}
-  {\usebibmacro{cite:dump}}
-  {}
+\renewbibmacro*{bbx:xrefcite}{%
+  \usebibmacro{cite:init}%
+  \usebibmacro{cite:comp}%
+  \usebibmacro{cite:dump}}
 
 \renewbibmacro*{bbx:introcite}{%
   \usebibmacro{cite:init}%
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 c2c43d0615e..55eaacbfef1 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}
-  [2022/03/06 v0.15 extended biblatex numeric-verb
+  [2022/06/18 v0.16 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 8dcf14b5bad..4efbff94936 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}
-  [2022/03/06 v0.15 extended biblatex numeric-verb citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex numeric-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
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 03d5fc92974..53361a12434 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}
-  [2022/03/06 v0.15 extended biblatex numeric bibliography style (MW)]
+  [2022/06/18 v0.16 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 8145c2f8a1f..40647f2e4e5 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}
-  [2022/03/06 v0.15 extended biblatex numeric citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex numeric citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
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 9ff21547454..215ca654fe4 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.15 (2022-03-06)
+% biblatex-ext v0.16 (2022-06-18)
 % Maintainer:  Moritz Wemheuer
 % Licence:     LaTeX Project Public License v1.3c or later
 %
 \ProvidesFile{ext-standard.bbx}
-  [2022/03/06 v0.15 extended biblatex standard style (MW)]
+  [2022/06/18 v0.16 extended biblatex standard style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -82,9 +82,25 @@
 % maxbibnames         = 999,
 }
 
+% introcite & xrefcite and possibly more ...
+% initialise "cite" emulation in the bibliography
+% {<delimcontext>}
+\newcommand*{\extblx@bibcite@init}[1]{%
+  \iftoggle{blx@citation}
+    {}
+    {\togglefalse{blx@bibliography}%
+     \toggletrue{blx@citation}}%
+  \delimcontext{#1}%
+  \csuse{blx@hook@cite}%
+  \csuse{blx@hook@citekey}%
+  \undef\cbx@lasthash
+  \undef\cbx@lastyear
+  \citetrackerfalse\pagetrackerfalse\backtrackerfalse
+  \defcounter{maxnames}{\blx@maxcitenames}%
+  \defcounter{minnames}{\blx@mincitenames}%
+}
 
-\newbibmacro*{bbx:introcite}{\usebibmacro{cite}}
-
+% introcite
 \RegisterCiteDelims{inner}{bbx@introcite}
 \DeclareInnerCiteDelimsAlias{bbx@introcite}{cite}
 \DeclareFieldFormat{bbx@introcite}{#1}
@@ -97,38 +113,28 @@
 \newlength{\introcitesep}
 \setlength{\introcitesep}{\biblabelsep}
 
+
 \newrobustcmd*{\AtIntrocite}{%
   \@ifstar
     {\global\undef\extblx@hook@introcite
      \gappto\extblx@hook@introcite}
     {\gappto\extblx@hook@introcite}}
 
-\newcommand*{\extblx@introcite@init}{%
-  \iftoggle{blx@citation}
-    {}
-    {\togglefalse{blx@bibliography}%
-     \toggletrue{blx@citation}}%
-  \delimcontext{bbx@introcite}%
-  \csuse{blx@hook@cite}%
-  \csuse{blx@hook@citekey}%
-  \DeclareFieldFormat{bibhyperref}{##1}%
-  \undef\cbx@lasthash
-  \undef\cbx@lastyear
-  \citetrackerfalse\pagetrackerfalse\backtrackerfalse
-  \defcounter{maxnames}{\blx@maxcitenames}%
-  \defcounter{minnames}{\blx@mincitenames}%
-}
+% we also disable links
+\AtIntrocite{%
+  \extblx@bibcite@init{bbx@introcite}%
+  \DeclareFieldFormat{bibhyperref}{#1}}
 
-\AtIntrocite{\extblx@introcite@init}
+\newbibmacro*{bbx:introcite}{\usebibmacro{cite}}
 
-\newbibmacro{introcite:typeset}{%
+\newbibmacro*{introcite:typeset}{%
   \begingroup
     \csuse{extblx@hook@introcite}%
     \printtext[bbx@introcite]{\usebibmacro{bbx:introcite}}%
   \endgroup
 }
 
-\newbibmacro{introcite:plain}{%
+\newbibmacro*{introcite:plain}{%
   \ifcsequal{extblx@introcite}{extblx@opt@introcite@plain}
     {\usebibmacro{introcite:typeset}%
      \printunit*{\introcitepunct}}
@@ -142,16 +148,14 @@
     {\introcitebreak}
     {}}
 
+% xrefcite (for citexref option)
+\newrobustcmd*{\AtXrefcite}{%
+  \@ifstar
+    {\global\undef\extblx@hook@xrefcite
+     \gappto\extblx@hook@xrefcite}
+    {\gappto\extblx@hook@xrefcite}}
 
-\newbibmacro*{bbx:inxrefcite}{\usebibmacro{cite}}
-
-\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \boolfalse{backtracker}}
-  {\usebibmacro{bbx:inxrefcite}}
-  {}
-  {}
+\AtXrefcite{\extblx@bibcite@init{bbx@xrefcite}}
 
 \RegisterCiteDelims{outer}{bbx@xrefcite}
 \DeclareOuterCiteDelimsAlias{bbx@xrefcite}{cite}
@@ -159,14 +163,24 @@
 \DeclareInnerCiteDelimsAlias{bbx@xrefcite}{cite}
 \DeclareDelimcontextAlias{bbx@xrefcite}{cite}
 
+\DeclareFieldFormat{bbx@xrefcite}{%
+  \mkouterbbx@xrefcitedelims{#1}}
+
+\newbibmacro*{bbx@xrefcite}[1]{%
+  \entrydata*{#1}{%
+    \csuse{extblx@hook@xrefcite}%
+    \printtext[bbx@xrefcite]{%
+      \usebibmacro{bbx:xrefcite}}}}
+
+\newbibmacro*{bbx:xrefcite}{\usebibmacro{cite}}
 
 \newbibmacro*{crosscite}[1]{%
   \iftoggle{bbx:citexref}
     {\iffieldundef{crossref}
        {\iffieldundef{xref}
           {\usebibmacro{#1}}
-          {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
-       {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+          {\usebibmacro{bbx@xrefcite}{\thefield{xref}}}}
+       {\usebibmacro{bbx@xrefcite}{\thefield{crossref}}}}
     {\usebibmacro{#1}}}
 
 \DeclareDelimAlias{innametitledelim}{nametitledelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-common.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-common.cbx
index a28af1e7bf2..3a76030b912 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-common.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-common.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-common.cbx}
-  [2022/03/06 v0.15 extended biblatex verbose citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose citation 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 c798840e1e7..db3df1ce814 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}
-  [2022/03/06 v0.15 extended biblatex verbose-ibid
+  [2022/06/18 v0.16 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 b8ddd1f3ab0..91f4f7685c5 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}
-  [2022/03/06 v0.15 extended biblatex verbose-ibid citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-ibid citation 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-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
index 0554c8036f2..e489ac04605 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}
-  [2022/03/06 v0.15 extended biblatex verbose-inote
+  [2022/06/18 v0.16 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 998c09bdf81..8d58e61675b 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}
-  [2022/03/06 v0.15 extended biblatex verbose-inote citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-inote citation 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-note-common.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note-common.cbx
index 5ebc671f6af..01dc1baac2c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note-common.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note-common.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-note-common.cbx}
-  [2022/03/06 v0.15 extended biblatex verbose citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose citation 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-note.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
index 16d1ac927d3..d83c21bb8c7 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}
-  [2022/03/06 v0.15 extended biblatex verbose-note
+  [2022/06/18 v0.16 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 e11f86b9e16..1d66a439db7 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}
-  [2022/03/06 v0.15 extended biblatex verbose-note citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-note citation 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-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
index d6696f6ba49..8e9acd8c274 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad1
+  [2022/06/18 v0.16 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 4b5fe5e66ed..cbe0e5ca251 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad1 citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-trad1 citation 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-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
index af6d549ef54..52b19ab055d 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad2
+  [2022/06/18 v0.16 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 5df26759e2a..b752ef7dd08 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad2 citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-trad2 citation 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-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
index 277c7229bf0..24c40fb0cf4 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad3
+  [2022/06/18 v0.16 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 579a87aee65..ca0dfa236db 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}
-  [2022/03/06 v0.15 extended biblatex verbose-trad3 citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose-trad3 citation 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.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
index 47c21fd91bb..0847a361afe 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}
-  [2022/03/06 v0.15 extended biblatex verbose
+  [2022/06/18 v0.16 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 d9bd674b061..4b5af0622a2 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}
-  [2022/03/06 v0.15 extended biblatex verbose citation style (MW)]
+  [2022/06/18 v0.16 extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}