diff options
| author | Karl Berry <karl@freefriends.org> | 2018-10-02 21:39:16 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-10-02 21:39:16 +0000 |
| commit | 1a6674f16762a7b9b71d62c545e49c83ddcd7989 (patch) | |
| tree | 3827bb6860a7d2721145933512720c1538549295 /Master/texmf-dist/tex | |
| parent | 44309fd5467358b33ce06716f1eb4b475fdfdf2b (diff) | |
biblatex-ext (2oct18)
git-svn-id: svn://tug.org/texlive/trunk@48818 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
66 files changed, 1837 insertions, 100 deletions
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 new file mode 100644 index 00000000000..b26e12ff761 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty @@ -0,0 +1,243 @@ +\ProvidesPackage{biblatex-ext-tabular} + [2018/10/02 v0.5 tabular bibliographies for biblatex (MW)] + +% Code based on Audrey's (https://tex.stackexchange.com/users/4483/audrey) +% answer https://tex.stackexchange.com/a/71454/35864 on TeX.SX +% relicensed under CC0, see +% https://tex.meta.stackexchange.com/a/1755/35864 +% ultimately based on LPPL code from biblatex.sty +% Additional modifications by me in +% https://tex.stackexchange.com/a/440356/35864 + +\protected\def\extblxtab@error#1#2{% + \PackageError{biblatex-ext-tabular}{#1}{#2.}} + +\protected\def\extblxtab@warning@noline#1{% + \PackageWarningNoLine{biblatex-ext-tabular}{#1}} + +\let\extblxtab@warning\extblxtab@warning@noline +\AtEndOfPackage{% + \protected\def\extblxtab@warning#1{% + \PackageWarning{biblatex-ext-tabular}{#1}}} + +% user-level command for printing tabular bibliography + +\newrobustcmd*{\printbibtabular}{% + \begingroup % closed in \extblxtab@bibtabular + \delimcontext{bib}% + \edef\on@line{\on@line}% + \@ifnextchar[%] + {\extblxtab@printbibtabular} + {\extblxtab@printbibtabular[]}} + +\def\extblxtab@printbibtabular[#1]{% + \toggletrue{blx@tempa}% + \toggletrue{blx@tempb}% + \def\blx@theheading{bibliography}% + \def\blx@theenv{bibtabular}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty + % defaults + \let\blx@tempa\@empty% before there is a .bbl, this must not be undef + \edef\blx@tempe{\the\c@refsection}% default refsection is current + \blx@safe@actives + \togglefalse{blx@resetnumsexplicit}% + \setkeys{blx@bib1}{#1}% First pass options keys - section and resetnumbers + % Is there a user-specified option for resetnumbers + % If so, this overrides the default + % "labelprefix implies resetnumbers" behaviour + \iftoggle{blx@resetnumsexplicit} + {} + {\ifdefempty\blx@refcontext@labelprefix + {} + {\setkeys{blx@bib2}{resetnumbers}}}% + \blx@rest@actives + \ifcsvoid{blx@dlist@entry@\blx@tempe @\blx@refcontext@context} + {} + {\letcs\blx@tempa{blx@dlist@entry@\blx@tempe @\blx@refcontext@context}}% + \blx@safe@actives + % Must reset omitnumbers as it's a global macro and if we don't, any + % \printbibliography following one with this set will inherit any + % previous "true" value + \togglefalse{blx@omitnumbers}% + \setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, + % set rest of options + \blx@rest@actives + % Add datalist to list of seen datalists to prevent duplicates + \xifinlist{\blx@refcontext@context @\blx@tempe @entry}\blx@dlistnames + {} + {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @entry}% + \csxappto{blx@dlists}{% + \blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{% + \blx@xml@dlist@refcontext + {\blx@refcontext@sortingtemplatename} + {\blx@refcontext@sortingnamekeytemplatename} + {\blx@refcontext@labelprefix} + {\blx@refcontext@uniquenametemplatename} + {\blx@refcontext@labelalphanametemplatename}}{}}}% + \ifdefvoid\blx@tempa + {\blx@warn@bibempty\endgroup} + {\extblxtab@bibtabular\blx@tempa}} + +% underlying macros +\def\extblxtab@bibtabular#1{% + \blx@langstrings + \blx@bibheading\blx@theheading\blx@thetitle + \blx@bibnote\blx@theprenote + \begingroup + \blx@bibinit + \let\@noitemerr\@empty + \let\blx@noitem\blx@warn@bibempty + \ifnum\bibinitsep=\z@ + \let\blx@initsep\relax + \fi + \ifnum\bibnamesep=\z@ + \let\blx@namesep\relax + \fi + \csuse{blx@hook@bibinit}% + \csuse{blx@hook@bibinit@next}% + % copy filtered list of entries to internal list macro + \let\blx@tempb\@empty + \def\blx@do##1{% + \blx@ifdata{##1}{% + \begingroup + \blx@getdata{##1}% + \blx@bibcheck + \iftoggle{blx@skipentry}{}{% + \global\let\blx@noitem\@empty + \listgadd\blx@tempb{##1}}% + \endgroup}{}}% + \let\blx@done\relax + \blx@listloop{#1}% + \begingroup + % sane names for wrapper macros + \def\plain {\extblxtab@tab@item@plain {\extblxtab@tabrow@entrykey}}% + \def\plainlang {\extblxtab@tab@item@plainlang {\extblxtab@tabrow@entrykey}}% + \def\anchor {\extblxtab@tab@item@anchor {\extblxtab@tabrow@entrykey}}% + \def\anchorlang{\extblxtab@tab@item@anchorlang{\extblxtab@tabrow@entrykey}}% + \def\driver {\extblxtab@tab@item@driver {\extblxtab@tabrow@entrykey}}% + % tabular output for each item in list + % note that each cell is in its own group, hence we need \gdef to break + % out of the first cell as soon as the row format has a & in it since + % the assignment will be counted as being in the first cell + \def\do##1{% + \gdef\extblxtab@tabrow@entrykey{##1}% + \csuse{extblxtab@tabrow@format@\blx@theenv}}% + \csuse{extblxtab@env@\blx@theenv}% + \dolistloop{\blx@tempb}% + \csuse{extblxtab@endenv@\blx@theenv}% + \endgroup + \blx@bibnote\blx@thepostnote + \endgroup + \endgroup % this closes the group opened by \printbibtabular +} + +\def\extblxtab@tab@item@aux@lang#1{% + \blx@initunit + \blx@beglangbib + \bibsentence + #1% + \blx@postpunct + \blx@endlangbib +} + +\def\extblxtab@tab@item@plain#1#2{% + \begingroup + \blx@getdata{#1}% + \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry + \blx@thelabelnumber + \csuse{blx@hook@bibitem}% + \blx@execute + #2% + \endgroup +} + +\def\extblxtab@tab@item@plainlang#1#2{% + \extblxtab@tab@item@plain{#1}{% + \extblxtab@tab@item@aux@lang{#2}}} + +\def\extblxtab@tab@item@anchor#1#2{% + \extblxtab@tab@item@plain{#1}{% + \addtocounter{instcount}\@ne + \blx@anchor + \blx@pagetracker + #2}} + +\def\extblxtab@tab@item@anchorlang#1#2{% + \extblxtab@tab@item@anchor{#1}{% + \extblxtab@tab@item@aux@lang{#2}}} + +\def\extblxtab@tab@item@driver#1#2{% + \begingroup + \blx@getdata{#1}% + \blx@setdefaultrefcontext{#1}% + \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry + \blx@thelabelnumber + \csuse{blx@hook@bibitem}% + \blx@execute + #2% + \blx@initunit + \blx@beglangbib + \bibsentence + \blx@driver\abx@field@entrytype + \blx@postpunct + \blx@endlangbib + \endgroup +} + +% user-level command for defining tabular bibliography format +\newrobustcmd*{\defbibtabular}[4]{% + \long\csdef{extblxtab@env@#1}{#2}% + \long\csdef{extblxtab@endenv@#1}{#3}% + \long\csdef{extblxtab@tabrow@format@#1}{#4}} + +% error message in case user does not initialise bibtabular +\defbibtabular{bibtabular} + {\extblxtab@error{% + tabular bibliography environment\MessageBreak + 'bibtabular' undefined} + {Please supply a suitable definition with \string\defbibtabular.% + \MessageBreak + See the documentation for more details}} + {\textbf{Error! + The tabular bibliography environment `bibtabular' is undefined. + No tabular bibliography was produced. + Please supply a suitable definition with + \mbox{\string\defbibtabular}. + See the manual for more information.}} + {} + +\newrobustcmd*{\defbibtabulartwocolumn}[5]{% + \long\csdef{extblxtab@env@#1}{#2}% + \long\csdef{extblxtab@endenv@#1}{#3}% + \long\csdef{extblxtab@tabrow@format@#1}{% + \anchorlang{#4} & \driver{#5}\\ + }% +} + +% Two useful bibmacros for tabular bibliographies + +% print the labelname/sortname with editor or translator string if appropriate +\newbibmacro*{tabular:sortname}{% + \ifnameundef{labelname} + {\usebibmacro{labeltitle}} + {\printnames[sortname]{labelname}% + \iffieldequalstr{labelnamesource}{editor} + {\setunit{\printdelim{editortypedelim}}% + \usebibmacro{editor+othersstrg}} + {\iffieldequalstr{labelnamesource}{translator} + {\setunit{\printdelim{translatortypedelim}}% + \usebibmacro{translator+othersstrg}} + {}}}} + +% bibitem hook to suppress redundant sortname list +% useful for \driver since it usually lives in its own group +\newbibmacro*{tabular:omitsortname}{% + \ifnameundef{labelname} + {} + {\clearname{\thefield{labelnamesource}}}} + +\endinput 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 cf8b3350a10..e1463ce8746 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.bbx} - [2018/06/10 v0.4 extended biblatex alphabetic-verb + [2018/10/02 v0.5 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 c3cfddef779..20c24d4f8f5 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/06/10 v0.4 extended biblatex alphabetic-verb citation style (MW)] + [2018/10/02 v0.5 extended biblatex alphabetic-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -42,6 +42,20 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -67,6 +81,10 @@ {\parencite}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx index a33dd44ae51..ec2d55c2fca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.bbx} - [2018/06/10 v0.4 extended biblatex alphabetic bibliography style (MW)] + [2018/10/02 v0.5 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 b0a60e8cf24..1f8ee72a241 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/06/10 v0.4 extended biblatex alphabetic citation style (MW)] + [2018/10/02 v0.5 extended biblatex alphabetic citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -64,6 +64,20 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -87,6 +101,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx index 9be9b8d68ba..8e404030635 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-common.bbx} - [2018/06/10 v0.4 common files for extended biblatex + [2018/10/02 v0.5 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 670860436c6..3857a038bd7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-comp + [2018/10/02 v0.5 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 6bb73ce0d52..631ede43aef 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/06/10 v0.4 extended biblatex authortitle-comp + [2018/10/02 v0.5 extended biblatex authortitle-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -119,6 +119,22 @@ {} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -143,6 +159,10 @@ {\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\setunit{\multicitedelim}} 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 d1b1ccc351f..f1ee99ea943 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-ibid + [2018/10/02 v0.5 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 506e1d9d316..e70f5a18588 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/06/10 v0.4 extended biblatex authortitle-ibid + [2018/10/02 v0.5 extended biblatex authortitle-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -82,6 +82,20 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -109,6 +123,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{} 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 193a00f9cab..9103d66b522 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-icomp + [2018/10/02 v0.5 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 eeb1c3894ae..25b80e48f1e 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/06/10 v0.4 extended biblatex authortitle-icomp + [2018/10/02 v0.5 extended biblatex authortitle-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -127,6 +127,22 @@ {} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -151,6 +167,10 @@ {\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\setunit{\multicitedelim}} 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 caa40d9e5a9..d2d98b5bd3f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-tcomp + [2018/10/02 v0.5 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 3c0f7fb92dc..7cd9883cbbb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.cbx} - [2018/06/10 v0.4 extended biblatex authortitle-tcomp + [2018/10/02 v0.5 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 739d61707ea..c4303cfe987 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-terse + [2018/10/02 v0.5 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 f2c162831bf..06d9d6fff5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.cbx} - [2018/06/10 v0.4 extended biblatex authortitle-terse + [2018/10/02 v0.5 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 25dcb90e7c5..6e47bd0d6d3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.bbx} - [2018/06/10 v0.4 extended biblatex authortitle-ticomp + [2018/10/02 v0.5 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 593fe459281..0fe34fe8b7c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.cbx} - [2018/06/10 v0.4 extended biblatex authortitle-ticomp citation style (MW)] + [2018/10/02 v0.5 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 aee2890f35f..145844b5d0f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.bbx} - [2018/06/10 v0.4 extended biblatex authortitle + [2018/10/02 v0.5 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 0d82c365ea0..9f59cbe86a1 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/06/10 v0.4 extended biblatex authortitle citation style (MW)] + [2018/10/02 v0.5 extended biblatex authortitle citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -78,6 +78,20 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -105,6 +119,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{} 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 e625919a218..4243bc87844 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-common.bbx} - [2018/06/10 v0.4 common files for extended biblatex + [2018/10/02 v0.5 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 c101ca97672..816ab3462a5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-comp + [2018/10/02 v0.5 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 ec06f4be801..6e32137bfaf 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/06/10 v0.4 extended biblatex authoryear-comp + [2018/10/02 v0.5 extended biblatex authoryear-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -175,7 +175,7 @@ {} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\footcite}[\mkbibfootnote] +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -183,7 +183,7 @@ {} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcite] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -215,6 +215,10 @@ {\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\setunit{\multicitedelim}} 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 new file mode 100644 index 00000000000..a087499a56f --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx @@ -0,0 +1,22 @@ +\ProvidesFile{ext-authoryear-ecomp.bbx} + [2018/10/02 v0.5 biblatex authoryear-ecomp + bibliography style (MW)] + +\RequireBibliographyStyle{ext-standard} +\RequireBibliographyStyle{authoryear-comp} +\RequireBibliographyStyle{ext-authoryear-common} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 new file mode 100644 index 00000000000..9832d52fe80 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx @@ -0,0 +1,347 @@ +\ProvidesFile{ext-authoryear-ecomp.cbx} + [2018/10/02 v0.5 biblatex authoryear-ecomp + citation style (MW)] + +\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} + +\RequireCitationStyle{authoryear-comp} + +\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen} + +\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen} + +\DeclareFieldFormat{citelabeldate}{#1} +\DeclareFieldFormat{parencitelabeldate}{#1} +\DeclareFieldFormat{textcitelabeldate}{#1} +\DeclareFieldFormat{footcitelabeldate}{#1} + +\DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} +\DeclareDelimFormat{extradateonlycompciterangedelim}{\bibrangedash} + +\newcounter{cbx@extradatecount} + +\renewbibmacro*{cite:init}{% + \ifnumless{\value{multicitecount}}{2} + {\global\boolfalse{cbx:parens}% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + {\iffieldundef{prenote} + {} + {\global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}}}} + +\renewbibmacro*{cite:reinit}{% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + +\newbibmacro*{generic:dump:extradate}{% + \ifundef\cbx@lastkey + {} + {\entrydata{\cbx@lastkey} + {\ifnumless{\value{cbx@extradatecount}}{1} + {\extblx@warning{% This should not happen, so warn when it does + Uh-oh! + The extradate compression is quite likely\MessageBreak + wrong for \cbx@lastkey}}% + {}% + \ifnumgreater{\value{cbx@extradatecount}}{1} + {\setunit{\printdelim{extradateonlycompciterangedelim}}} + {\setunit{\printdelim{extradateonlycompcitedelim}}}% + \usebibmacro{cite:extradate}}% + \setunit{\cbx@thiscitedelim}}% + \global\undef\cbx@lastkey + \setcounter{cbx@extradatecount}{0}% +} + +\newbibmacro*{cite:dump:extradate}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}% + \usebibmacro{generic:dump:extradate}} + +\newbibmacro*{textcite:dump:extradate}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}% + \usebibmacro{generic:dump:extradate}} + +\newbibmacro*{cite:comp:extradate}{% + \ifnumequal{\cbx@lastextradate+1}{\thefield{extradate}} + {\stepcounter{cbx@extradatecount}% + \savefield{entrykey}{\cbx@lastkey}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\extradateonlycompcitedelim}% + \usebibmacro{cite:extradate}}% + \savefield{extradate}{\cbx@lastextradate}% +} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifboolexpr{test {\ifnameundef{labelname}} + or test {\iffieldundef{labelyear}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{cite:dump:extradate}% + \printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{namehash}{\cbx@lasthash}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\renewbibmacro*{cite:labeldate+extradate}{% + \iffieldundef{labelyear} + {} + {\printtext[bibhyperref]{% + \printtext[\blx@delimcontext labeldate]{% + \printlabeldateextra}}}} + +\renewbibmacro*{cite:extradate}{% + \iffieldundef{extradate} + {} + {\printtext[bibhyperref]{% + \printtext[\blx@delimcontext labeldate]{% + \printfield{extradate}}}}} + +\newbibmacro*{cite:postnote}{% + \setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}% + \usebibmacro{postnote}} + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{textcite:dump:extradate} + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}} + {\usebibmacro{textcite:dump:extradate}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labeldate+extradate}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labeldate+extradate}}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}} + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\renewbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\DeclareCiteCommand{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +% 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}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims] + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{textcite:postnote}} + +\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims] + {\cbx@textcite}{} + +\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims] + {\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] + {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} +\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:introcite}{% + \usebibmacro{cite}% + \clearfield{postnote}% + \usebibmacro{cite:postnote}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 3b63a542c06..2f1e849e7c0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-ibid + [2018/10/02 v0.5 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 ac1d66f56f6..b8e4f32c74a 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/06/10 v0.4 extended biblatex authoryear-ibid + [2018/10/02 v0.5 extended biblatex authoryear-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -101,6 +101,20 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -128,6 +142,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{} 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 e1939937093..22ebaf9f0b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-icomp + [2018/10/02 v0.5 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 667694dae73..5cd7e70881d 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/06/10 v0.4 extended biblatex authoryear-icomp + [2018/10/02 v0.5 extended biblatex authoryear-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -185,6 +185,22 @@ {} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -209,6 +225,10 @@ {\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\setunit{\multicitedelim}} 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 new file mode 100644 index 00000000000..32dd8eea902 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx @@ -0,0 +1,22 @@ +\ProvidesFile{ext-authoryear-iecomp.bbx} + [2018/10/02 v0.5 biblatex authoryear-iecomp + bibliography style (MW)] + +\RequireBibliographyStyle{ext-standard} +\RequireBibliographyStyle{authoryear-icomp} +\RequireBibliographyStyle{ext-authoryear-common} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 new file mode 100644 index 00000000000..6b286bca92e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx @@ -0,0 +1,357 @@ +\ProvidesFile{ext-authoryear-iecomp.cbx} + [2018/10/02 v0.5 biblatex authoryear-iecomp + citation style (MW)] + +\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} + +\RequireCitationStyle{authoryear-icomp} + +\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen} + +\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen} + +\DeclareFieldFormat{citelabeldate}{#1} +\DeclareFieldFormat{parencitelabeldate}{#1} +\DeclareFieldFormat{textcitelabeldate}{#1} +\DeclareFieldFormat{footcitelabeldate}{#1} + +\DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} +\DeclareDelimFormat{extradateonlycompciterangedelim}{\bibrangedash} + +\newcounter{cbx@extradatecount} + +\renewbibmacro*{cite:init}{% + \global\boolfalse{cbx:loccit}% + \ifnumless{\value{multicitecount}}{2} + {\global\boolfalse{cbx:parens}% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + {\iffieldundef{prenote} + {} + {\global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}}}} + +\renewbibmacro*{cite:reinit}{% + \global\undef\cbx@lastkey + \global\undef\cbx@lasthash + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + +\newbibmacro*{generic:dump:extradate}{% + \ifundef\cbx@lastkey + {} + {\entrydata{\cbx@lastkey} + {\ifnumless{\value{cbx@extradatecount}}{1} + {\extblx@warning{% This should not happen, so warn when it does + Uh-oh! + The extradate compression is quite likely\MessageBreak + wrong for \cbx@lastkey}}% + {}% + \ifnumgreater{\value{cbx@extradatecount}}{1} + {\setunit{\printdelim{extradateonlycompciterangedelim}}} + {\setunit{\printdelim{extradateonlycompcitedelim}}}% + \usebibmacro{cite:extradate}}% + \setunit{\cbx@thiscitedelim}}% + \global\undef\cbx@lastkey + \setcounter{cbx@extradatecount}{0}% +} + +\newbibmacro*{cite:dump:extradate}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}% + \usebibmacro{generic:dump:extradate}} + +\newbibmacro*{textcite:dump:extradate}{% + \def\cbx@thiscitedelim{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}% + \usebibmacro{generic:dump:extradate}} + +\newbibmacro*{cite:comp:extradate}{% + \ifnumequal{\cbx@lastextradate+1}{\thefield{extradate}} + {\stepcounter{cbx@extradatecount}% + \savefield{entrykey}{\cbx@lastkey}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\extradateonlycompcitedelim}% + \usebibmacro{cite:extradate}}% + \savefield{extradate}{\cbx@lastextradate}% +} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:ibid}} + {\ifboolexpr{test {\ifnameundef{labelname}} + or test {\iffieldundef{labelyear}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{cite:dump:extradate}% + \printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{namehash}{\cbx@lasthash}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\renewbibmacro*{cite:labeldate+extradate}{% + \iffieldundef{labelyear} + {} + {\printtext[bibhyperref]{% + \printtext[\blx@delimcontext labeldate]{% + \printlabeldateextra}}}} + +\renewbibmacro*{cite:extradate}{% + \iffieldundef{extradate} + {} + {\printtext[bibhyperref]{% + \printtext[\blx@delimcontext labeldate]{% + \printfield{extradate}}}}} + +\renewbibmacro*{cite:postnote}{% + \setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}% + \ifbool{cbx:loccit} + {} + {\usebibmacro{postnote}}} + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}} + {\usebibmacro{textcite:dump:extradate}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:labeldate+extradate}}}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}} + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\renewbibmacro*{textcite:postnote}{% + \ifbool{cbx:loccit} + {} + {\usebibmacro{postnote}}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\DeclareCiteCommand{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\cite}[\mkoutercitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{cite:postnote}} + +% 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}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\cbx@textcite}[\mkoutertextcitedelims] + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{textcite:postnote}} + +\DeclareMultiCiteCommand{\cbx@textcites}[\mkoutertextcitedelims] + {\cbx@textcite}{} + +\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims] + {\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] + {\parencite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\setunit{\multicitedelim}} +\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:introcite}{% + \usebibmacro{cite}% + \clearfield{postnote}% + \usebibmacro{cite:postnote}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 22552c0f014..cf86e888985 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-tcomp + [2018/10/02 v0.5 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 c31f2852034..7937f21ef19 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.cbx} - [2018/06/10 v0.4 extended biblatex authoryear-tcomp + [2018/10/02 v0.5 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 new file mode 100644 index 00000000000..a113ce778ff --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx @@ -0,0 +1,22 @@ +\ProvidesFile{ext-authoryear-tecomp.bbx} + [2018/10/02 v0.5 extended biblatex authoryear-tecomp + bibliography style (MW)] + +\RequireBibliographyStyle{ext-standard} +\RequireBibliographyStyle{authoryear-comp} +\RequireBibliographyStyle{ext-authoryear-common} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 new file mode 100644 index 00000000000..206c61c38e7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx @@ -0,0 +1,156 @@ +\ProvidesFile{ext-authoryear-tecomp.cbx} + [2018/10/02 v0.5 extended biblatex authoryear-tecomp + citation style (MW)] + +\RequireCitationStyle{ext-authoryear-ecomp} +\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} + +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifboolexpr{test {\ifnameundef{labelname}} + or test {\iffieldundef{labelyear}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{cite:dump:extradate}% + \ifsingletitle + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}}% + \savefield{namehash}{\cbx@lasthash}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{textcite:dump:extradate} + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}} + {\usebibmacro{textcite:dump:extradate}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labeldate+extradate}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\ifsingletitle\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} + {\printtext[bibhyperref]{\printnames{labelname}}% + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labeldate+extradate}}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}} + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}}}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\renewbibmacro*{textcite:postnote}{% + \ifbool{cbx:parens} + {\setunit{\postnotedelim}} + {\setunit{% + \global\booltrue{cbx:parens}% + \extpostnotedelim + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}% + \printfield{postnote}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 36eb0685d20..cb5e6ebe2d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-terse + [2018/10/02 v0.5 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 9732f0be9bd..5f4fd12f063 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.cbx} - [2018/06/10 v0.4 extended biblatex authoryear-terse + [2018/10/02 v0.5 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 f65387a75e0..312e3ad5b33 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.bbx} - [2018/06/10 v0.4 extended biblatex authoryear-ticomp + [2018/10/02 v0.5 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 ba67893141f..1dec32cf434 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.cbx} - [2018/06/10 v0.4 extended biblatex authoryear-ticomp citation style (MW)] + [2018/10/02 v0.5 extended biblatex authoryear-ticomp citation style (MW)] \RequireCitationStyle{ext-authoryear-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} 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 new file mode 100644 index 00000000000..2d7798a3f03 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx @@ -0,0 +1,22 @@ +\ProvidesFile{ext-authoryear-tiecomp.bbx} + [2018/10/02 v0.5 extended biblatex authoryear-tiecomp + bibliography style (MW)] + +\RequireBibliographyStyle{ext-standard} +\RequireBibliographyStyle{authoryear-icomp} +\RequireBibliographyStyle{ext-authoryear-common} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 new file mode 100644 index 00000000000..c2108adb0dc --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx @@ -0,0 +1,164 @@ +\ProvidesFile{ext-authoryear-tiecomp.cbx} + [2018/10/02 v0.5 extended biblatex authoryear-tiecomp citation style (MW)] + +\RequireCitationStyle{ext-authoryear-icomp} +\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} + +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + +\renewbibmacro*{cite}{% + \iffieldundef{shorthand} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:ibid}} + {\ifboolexpr{test {\ifnameundef{labelname}} + or test {\iffieldundef{labelyear}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:reinit}} + {\iffieldequals{namehash}{\cbx@lasthash} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{cite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{cite:dump:extradate}% + \ifsingletitle + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{namehash}{\cbx@lasthash}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}}}} + {\usebibmacro{cite:dump:extradate}% + \usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \multicitedelim}} + +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}} + and (test {\ifnumequal{\value{multicitecount}}{0}} + or test {\iffieldundef{postnote}})} + {\usebibmacro{cite:comp:extradate}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}}} + {\usebibmacro{textcite:dump:extradate}% + \setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}} + {\usebibmacro{textcite:dump:extradate}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\ifsingletitle\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} + {\printtext[bibhyperref]{\printnames{labelname}}% + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}% + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:labeldate+extradate}}}% + \savefield{labelyear}{\cbx@lastyear}% + \savefield{extradate}{\cbx@lastextradate}% + \setcounter{cbx@extradatecount}{0}} + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear + \global\undef\cbx@lastextradate + \setcounter{cbx@extradatecount}{0}}}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}} + +\renewbibmacro*{textcite:postnote}{% + \ifbool{cbx:parens} + {\setunit{\postnotedelim}} + {\setunit{% + \global\booltrue{cbx:parens}% + \extpostnotedelim + \csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}% + \ifbool{cbx:loccit} + {} + {\printfield{postnote}}% + \ifnumequal{\value{multicitecount}}{\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\csuse{extblx@citedelim@\blx@delimcontext @inner@close}% + \global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% 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 c374bed4a9c..ff136a34191 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.bbx} - [2018/06/10 v0.4 extended biblatex authoryear bibliography style (MW)] + [2018/10/02 v0.5 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 2eda60c3ce1..6d453aeddfc 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/06/10 v0.4 extended biblatex authoryear citation style (MW)] + [2018/10/02 v0.5 extended biblatex authoryear citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -92,6 +92,20 @@ \usebibmacro{citeyear}} {\multicitedelim} {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] @@ -120,6 +134,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\smartcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{} 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 79ccb72e835..bcfc5a13862 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,9 +1,10 @@ \ProvidesFile{ext-biblatex-aux.def} - [2018/06/10 v0.4 auxiliaries for extended biblatex citation style (MW)] + [2018/10/02 v0.5 auxiliaries for extended biblatex citation style (MW)] \def\extblx@requiredbiblatexversion{3.11} \def\extblx@requiredbiblatexdate{2018/02/20} +\newrobustcmd*{\extblx@info}[1]{\PackageInfo{biblatex-ext}{#1}} \newrobustcmd*{\extblx@warning}[1]{\PackageWarning{biblatex-ext}{#1}} \newrobustcmd*{\extblx@warning@noline}[1]{\PackageWarningNoLine{biblatex-ext}{#1}} @@ -85,13 +86,25 @@ \RegisterCiteDelims{outer}{cite} \RegisterCiteDelims{outer}{parencite} \RegisterCiteDelims{outer}{textcite} +\RegisterCiteDelims{outer}{footcite} +\RegisterCiteDelims{outer}{footcitetext} +\DeclareOuterCiteDelimsAlias{footcite}{footcitetext} \RegisterCiteDelims{inner}{cite} \RegisterCiteDelims{inner}{parencite} \RegisterCiteDelims{inner}{textcite} \RegisterCiteDelims{inner}{footcite} +\RegisterCiteDelims{inner}{footcitetext} +\DeclareInnerCiteDelimsAlias{footcite}{footcitetext} +\newrobustcmd*{\mkextblxfootcite}[1]{% + \mkbibfootnote{% + \mkouterfootcitedelims{#1}}} +\newrobustcmd*{\mkextblxfootcitetext}[1]{% + \mkbibfootnotetext{% + \mkouterfootcitetextdelims{#1}}} + % smartcite is special % According to the docs it is like \parencite in a footnote and \footcite in % the body. @@ -104,7 +117,7 @@ {\mkouterparencitedelims{% \def\extblx@thisdelimcontext{parencite}% #1}} - {\mkbibfootnote{% + {\mkextblxfootcite{% \def\extblx@thisdelimcontext{footcite}% #1}}} @@ -146,6 +159,7 @@ The format has been renamed to 'bbx@introcite'.\MessageBreak This could mean that you are using the old name\MessageBreak which does not work any more.\MessageBreak + No effort is made to switch to the new name.\MessageBreak Please use 'bbx@introcite' instead}}% \ifcsundef{abx@ffd@*@bbx:introcitelabeldate} {} @@ -156,6 +170,7 @@ 'bbx@introcitelabeldate'.\MessageBreak This could mean that you are using the old name\MessageBreak which does not work any more.\MessageBreak + No effort is made to switch to the new name.\MessageBreak Please use\MessageBreak'bbx@introcitelabeldate'\MessageBreak instead}}% \ifcsundef{blx@delimcontextalias@bbx:introcite} {} @@ -164,6 +179,7 @@ The context has been renamed to 'bbx@introcite'.\MessageBreak This could mean that you are using the old name\MessageBreak which does not work any more.\MessageBreak + No effort is made to switch to the new name.\MessageBreak Please use 'bbx@introcite' instead}}% \ifcsundef{extblx@citedelim@bbx:introcite@inner@open} {} @@ -173,6 +189,7 @@ 'bbx@introcite'.\MessageBreak This could mean that you are using the old name\MessageBreak which does not work any more.\MessageBreak + No effort is made to switch to the new name.\MessageBreak Please use 'bbx@introcite' instead}}% \ifcsundef{extblx@citedelim@bbx:introcite@inner@close} {} @@ -182,6 +199,7 @@ 'bbx@introcite'.\MessageBreak This could mean that you are using the old name\MessageBreak which does not work any more.\MessageBreak + No effort is made to switch to the new name.\MessageBreak Please use 'bbx@introcite' instead}}% } 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 c4661c22ae5..cc65dcbd698 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-dashed-common.bbx} - [2018/06/10 v0.4 common files for extended biblatex + [2018/10/02 v0.5 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 10479513159..d04db30e8a0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.bbx} - [2018/06/10 v0.4 extended biblatex numeric-comp + [2018/10/02 v0.5 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 7b4949d230d..8b0b7c3070e 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/06/10 v0.4 extended biblatex numeric-comp citation style (MW)] + [2018/10/02 v0.5 extended biblatex numeric-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -54,6 +54,24 @@ {\usebibmacro{cite:dump}% \usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:comp}} + {} + {\usebibmacro{cite:dump}% + \usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:comp}} + {} + {\usebibmacro{cite:dump}% + \usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -98,6 +116,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} 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 1e076dc605d..7caa98c779f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.bbx} - [2018/06/10 v0.4 extended biblatex numeric-verb + [2018/10/02 v0.5 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 bb59105fe88..66e364bae19 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/06/10 v0.4 extended biblatex numeric-verb citation style (MW)] + [2018/10/02 v0.5 extended biblatex numeric-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -42,6 +42,20 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -65,6 +79,10 @@ \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} \DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\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 6b2fe24198c..7a9f106737e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.bbx} - [2018/06/10 v0.4 extended biblatex numeric bibliography style (MW)] + [2018/10/02 v0.5 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 88063e88388..8d6deb2dd3e 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/06/10 v0.4 extended biblatex numeric citation style (MW)] + [2018/10/02 v0.5 extended biblatex numeric citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -63,6 +63,20 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -86,6 +100,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\parencite}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx index d6dc96b9e3a..be871e682a4 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.4 (2018-06-10) +% biblatex-ext v0.5 (2018-10-02) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2018/06/10 v0.4 extended biblatex standard style (MW)] + [2018/10/02 v0.5 extended biblatex standard style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -178,7 +178,7 @@ \newunit\newblock \usebibmacro{bytranslator+others}% \newunit\newblock - \printfield{version}% + \usebibmacro{version}% \newunit\newblock \iftoggle{bbx:articlein}{\usebibmacro{in:}}{}% \usebibmacro{journal+issuetitle}% @@ -228,7 +228,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isbn}% \newunit\newblock @@ -320,7 +320,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isbn}% \newunit\newblock @@ -418,7 +418,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isbn}% \newunit\newblock @@ -516,7 +516,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock @@ -551,7 +551,7 @@ \newunit\newblock \printfield{type}% \newunit - \printfield{version}% + \usebibmacro{version}% \newunit \usebibmacro{note}% \newunit\newblock @@ -561,7 +561,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isbn}% \newunit\newblock @@ -592,7 +592,7 @@ \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{version}% + \usebibmacro{version}% \newunit \usebibmacro{note}% \newunit\newblock @@ -633,7 +633,7 @@ \newunit\newblock \printfield{type}% \newunit - \printfield{version}% + \usebibmacro{version}% \newunit \usebibmacro{note}% \newunit\newblock @@ -733,7 +733,7 @@ \newunit\newblock \usebibmacro{type+number}% \newunit\newblock - \printfield{version}% + \usebibmacro{version}% \newunit \usebibmacro{note}% \newunit\newblock @@ -741,7 +741,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isrn}% \newunit\newblock @@ -778,7 +778,7 @@ \newunit\newblock \usebibmacro{chapter+pages}% \newunit - \printfield{pagetotal}% + \usebibmacro{pagetotal}% \newunit\newblock \usebibmacro{isbn}% \newunit\newblock @@ -831,6 +831,7 @@ {}% \usebibmacro{finentry}} + \DeclareFieldAlias{titlecase:title}{titlecase} \renewbibmacro*{title}{% \ifboolexpr{ @@ -1023,6 +1024,8 @@ \newbibmacro*{edition}{\printfield{edition}} +\newbibmacro*{version}{\printfield{version}} +\newbibmacro*{pagetotal}{\printfield{pagetotal}} \newcommand*{\jourvoldelim}{\addspace} \newcommand*{\jourserdelim}{\newunitpunct} @@ -1193,38 +1196,43 @@ % Copyright 2017-2018 Moritz Wemheuer % -% This work consists of the `.bbx`, `.cbx` and `.def` files +% This work consists of the `.bbx`, `.cbx`, `.def` and `.sty` files % ext-standard.bbx % ext-biblatex-aux.def % ext-dashed-common.bbx % ext-authortitle-common.bbx % ext-authoryear-common.bbx -% ext-alphabetic.bbx ext-alphabetic.cbx -% ext-alphabetic-verb.bbx ext-alphabetic-verb.cbx -% ext-authortitle.bbx ext-authortitle.cbx -% ext-authortitle-comp.bbx ext-authortitle-comp.cbx -% ext-authortitle-ibid.bbx ext-authortitle-ibid.cbx -% ext-authortitle-icomp.bbx ext-authortitle-icomp.cbx -% ext-authortitle-terse.bbx ext-authortitle-terse.cbx -% ext-authortitle-tcomp.bbx ext-authortitle-tcomp.cbx -% ext-authortitle-ticomp.bbx ext-authortitle-ticomp.cbx -% ext-authoryear.bbx ext-authoryear.cbx -% ext-authoryear-comp.bbx ext-authoryear-comp.cbx -% ext-authoryear-ibid.bbx ext-authoryear-ibid.cbx -% ext-authoryear-icomp.bbx ext-authoryear-icomp.cbx -% ext-authoryear-terse.bbx ext-authoryear-terse.cbx -% ext-authoryear-tcomp.bbx ext-authoryear-tcomp.cbx -% ext-authoryear-ticomp.bbx ext-authoryear-ticomp.cbx -% ext-numeric.bbx ext-numeric.cbx -% ext-numeric-comp.bbx ext-numeric-comp.cbx -% ext-numeric-verb.bbx ext-numeric-verb.cbx -% ext-verbose.bbx ext-verbose.cbx -% ext-verbose-ibid.bbx ext-verbose-ibid.cbx -% ext-verbose-note.bbx ext-verbose-note.cbx -% ext-verbose-inote.bbx ext-verbose-inote.cbx -% ext-verbose-trad1.bbx ext-verbose-trad1.cbx -% ext-verbose-trad2.bbx ext-verbose-trad2.cbx -% ext-verbose-trad3.bbx ext-verbose-trad3.cbx +% ext-alphabetic.bbx ext-alphabetic.cbx +% ext-alphabetic-verb.bbx ext-alphabetic-verb.cbx +% ext-authortitle.bbx ext-authortitle.cbx +% ext-authortitle-comp.bbx ext-authortitle-comp.cbx +% ext-authortitle-ibid.bbx ext-authortitle-ibid.cbx +% ext-authortitle-icomp.bbx ext-authortitle-icomp.cbx +% ext-authortitle-terse.bbx ext-authortitle-terse.cbx +% ext-authortitle-tcomp.bbx ext-authortitle-tcomp.cbx +% ext-authortitle-ticomp.bbx ext-authortitle-ticomp.cbx +% ext-authoryear.bbx ext-authoryear.cbx +% ext-authoryear-comp.bbx ext-authoryear-comp.cbx +% ext-authoryear-ecomp.bbx ext-authoryear-ecomp.cbx +% ext-authoryear-ibid.bbx ext-authoryear-ibid.cbx +% ext-authoryear-icomp.bbx ext-authoryear-icomp.cbx +% ext-authoryear-iecomp.bbx ext-authoryear-iecomp.cbx +% ext-authoryear-terse.bbx ext-authoryear-terse.cbx +% ext-authoryear-tcomp.bbx ext-authoryear-tcomp.cbx +% ext-authoryear-tecomp.bbx ext-authoryear-tecomp.cbx +% ext-authoryear-ticomp.bbx ext-authoryear-ticomp.cbx +% ext-authoryear-tiecomp.bbx ext-authoryear-tiecomp.cbx +% ext-numeric.bbx ext-numeric.cbx +% ext-numeric-comp.bbx ext-numeric-comp.cbx +% ext-numeric-verb.bbx ext-numeric-verb.cbx +% ext-verbose.bbx ext-verbose.cbx +% ext-verbose-ibid.bbx ext-verbose-ibid.cbx +% ext-verbose-note.bbx ext-verbose-note.cbx +% ext-verbose-inote.bbx ext-verbose-inote.cbx +% ext-verbose-trad1.bbx ext-verbose-trad1.cbx +% ext-verbose-trad2.bbx ext-verbose-trad2.cbx +% ext-verbose-trad3.bbx ext-verbose-trad3.cbx +% biblatex-ext-tabular.sty % % Refer also to README.md. % 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 eedacbd2b97..ce7ea46e9bb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.bbx} - [2018/06/10 v0.4 extended biblatex verbose-ibid + [2018/10/02 v0.5 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 d8d6043880e..589b96b16f4 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/06/10 v0.4 extended biblatex verbose-ibid citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -23,6 +23,20 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -52,6 +66,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx index c6327562e58..585b999b7da 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.bbx} - [2018/06/10 v0.4 extended biblatex verbose-inote + [2018/10/02 v0.5 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 97329726876..a499f175851 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/06/10 v0.4 extended biblatex verbose-inote citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-inote citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -26,6 +26,20 @@ {\usebibmacro{cite}}} {\multicitedelim} {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{footcite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{footcite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] @@ -58,6 +72,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx index ebdeaf1dc5b..a866f2e6c63 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.bbx} - [2018/06/10 v0.4 extended biblatex verbose-note + [2018/10/02 v0.5 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 3579b64d4a7..966e6e9f698 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/06/10 v0.4 extended biblatex verbose-note citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-note citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -27,6 +27,20 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{footcite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{footcite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -58,6 +72,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx index a5fd475e2b1..dc403667715 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.bbx} - [2018/06/10 v0.4 extended biblatex verbose-trad1 + [2018/10/02 v0.5 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 6f1098c3e77..b184bcdb1b7 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/06/10 v0.4 extended biblatex verbose-trad1 citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-trad1 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -22,6 +22,20 @@ \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] @@ -52,6 +66,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx index 76cf3faa5d2..59c14cf2fa1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.bbx} - [2018/06/10 v0.4 extended biblatex verbose-trad2 + [2018/10/02 v0.5 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 f2dfde1cdf6..2ae17074b08 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/06/10 v0.4 extended biblatex verbose-trad2 citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-trad2 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -22,6 +22,20 @@ \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] @@ -52,6 +66,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx index 1ac54a239ef..79cfb9d604c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.bbx} - [2018/06/10 v0.4 extended biblatex verbose-trad3 + [2018/10/02 v0.5 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 64d5cf7ad3a..3db7b392b24 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/06/10 v0.4 extended biblatex verbose-trad3 citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose-trad3 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -23,6 +23,20 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] {\delimcontext{\extblx@thisdelimcontext}% @@ -52,6 +66,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx index 991032923b1..b44a25dfb8d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.bbx} - [2018/06/10 v0.4 extended biblatex verbose + [2018/10/02 v0.5 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 2f48449683e..a146036f1cd 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/06/10 v0.4 extended biblatex verbose citation style (MW)] + [2018/10/02 v0.5 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -22,6 +22,20 @@ \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcite}[\mkextblxfootcite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkextblxfootcitetext] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} % smartcite's delimcontext needs special attention (see ext-biblatex-aux.def) \DeclareCiteCommand{\smartcite}[\mksmartcite] @@ -52,6 +66,10 @@ {\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims] {\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcites}[\mkextblxfootcite] + {\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\footcitetexts}[\mkextblxfootcitetext] + {\footcitetext}{\multicitedelim} \DeclareMultiCiteCommand{\smartcites}[\mksmartcite] {\smartcite}{\multicitedelim} |