texlive[47046] Master/texmf-dist: biblatex-ext (20mar18)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 20 22:59:43 CET 2018
Revision: 47046
http://tug.org/svn/texlive?view=revision&revision=47046
Author: karl
Date: 2018-03-20 22:59:43 +0100 (Tue, 20 Mar 2018)
Log Message:
-----------
biblatex-ext (20mar18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib
trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,2 +1,8 @@
+# Version 0.1a (2018-03-20)
+- Fixed inner cite delims for authoryear/authortitle and their ibid versions.
+- Fixed delimiters for `\smartcite`.
+ `\smartcite` really behaves like `\parencite` and `\footcite` now.
+ This needed some trickery to get the delimiter context right.
+
# Version 0.1 (2018-03-18)
- First public release.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext-examples.bib 2018-03-20 21:59:43 UTC (rev 47046)
@@ -22,4 +22,4 @@
title = {On the Theory of Einiosauruses},
date = {1973},
options = {maxnames=1, uniquelist=false},
-}
\ No newline at end of file
+}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex 2018-03-20 21:59:43 UTC (rev 47046)
@@ -315,7 +315,7 @@
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.1}
+\newcommand*{\extblxversion}{0.1a}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -327,7 +327,7 @@
author = {Moritz Wemheuer},
link = {mwemheu at gmail.com},%
revision = {\extblxversion},
- date = {\DTMDate{2018-03-18}},
+ date = {\DTMDate{2018-03-20}},
}
\hypersetup{%
@@ -1563,6 +1563,11 @@
the changes in source code there.\footnote{\url{\gitbaseurl/compare/}}
See also \sty{CHANGES.md}.
\begin{changelog}
+\begin{release}{0.1a}{2018-03-20}
+\item Fixed inner citation delimiters for \sty{ext-authoryear},
+ \sty{ext-authortitle} and their \sty{-ibid} versions.
+\item Fixed \cmd{smartcite} delimiters.
+\end{release}
\begin{release}{0.1}{2018-03-18}
\item First public release.
\end{release}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2018/03/18 v0.1 extended biblatex alphabetic-verb
+ [2018/03/20 v0.1a extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2018/03/18 v0.1 extended biblatex alphabetic-verb citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex alphabetic-verb citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -22,7 +22,6 @@
{}%
\usebibmacro{cite}}
-
\DeclareCiteCommand{\cite}
{\csuse{extblx at citedelim@cite at outer@open}%
\usebibmacro{prenote}}
@@ -43,8 +42,10 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -62,8 +63,9 @@
{\usebibmacro{postnote}%
\csuse{extblx at citedelim@textcite at inner@close}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2018/03/18 v0.1 extended biblatex alphabetic bibliography style (MW)]
+ [2018/03/20 v0.1a extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2018/03/18 v0.1 extended biblatex alphabetic citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex alphabetic citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -64,8 +64,10 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -78,11 +80,14 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2018/03/18 v0.1 common files for extended biblatex
+ [2018/03/20 v0.1a common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-comp
+ [2018/03/20 v0.1a extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-comp
+ [2018/03/20 v0.1a extended biblatex authortitle-comp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -119,8 +119,10 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -134,12 +136,14 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-ibid
+ [2018/03/20 v0.1a extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-ibid
+ [2018/03/20 v0.1a extended biblatex authortitle-ibid
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -14,12 +14,12 @@
\DeclareInnerCiteDelim{footcite}{}{}
\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\newbibmacro*{textcite}{%
\global\boolfalse{cbx:loccit}%
@@ -82,8 +82,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -103,13 +105,15 @@
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-icomp
+ [2018/03/20 v0.1a extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-icomp
+ [2018/03/20 v0.1a extended biblatex authortitle-icomp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -127,8 +127,10 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -142,12 +144,14 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-tcomp
+ [2018/03/20 v0.1a extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-tcomp
+ [2018/03/20 v0.1a extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-terse
+ [2018/03/20 v0.1a extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-terse
+ [2018/03/20 v0.1a extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle-ticomp
+ [2018/03/20 v0.1a extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle-ticomp citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex authortitle-ticomp citation style (MW)]
\RequireCitationStyle{ext-authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2018/03/18 v0.1 extended biblatex authortitle
+ [2018/03/20 v0.1a extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2018/03/18 v0.1 extended biblatex authortitle citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex authortitle citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -13,12 +13,12 @@
\DeclareInnerCiteDelim{footcite}{}{}
\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\renewbibmacro*{textcite}{%
\printnames{labelname}%
@@ -50,7 +50,6 @@
\printfield{postnote}%
\csuse{extblx at citedelim@textcite at inner@close}}}
-
\DeclareCiteCommand{\cite}[\mkoutercitedelim]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -79,8 +78,10 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -100,13 +101,15 @@
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2018/03/18 v0.1 common files for extended biblatex
+ [2018/03/20 v0.1a common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-comp
+ [2018/03/20 v0.1a extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-comp
+ [2018/03/20 v0.1a extended biblatex authoryear-comp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -19,7 +19,8 @@
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
- {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+ {\ifboolexpr{test {\ifnameundef{labelname}}
+ or test {\iffieldundef{labelyear}}}
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
@@ -190,8 +191,10 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -205,12 +208,14 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}
- {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-ibid
+ [2018/03/20 v0.1a extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-ibid
+ [2018/03/20 v0.1a extended biblatex authoryear-ibid
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -11,12 +11,12 @@
\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -101,8 +101,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -122,14 +124,16 @@
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-icomp
+ [2018/03/20 v0.1a extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-icomp
+ [2018/03/20 v0.1a extended biblatex authoryear-icomp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -21,7 +21,8 @@
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
- {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+ {\ifboolexpr{test {\ifnameundef{labelname}}
+ or test {\iffieldundef{labelyear}}}
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
@@ -184,8 +185,10 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -199,13 +202,14 @@
{}
{\usebibmacro{textcite:postnote}}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
-
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-tcomp
+ [2018/03/20 v0.1a extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-tcomp
+ [2018/03/20 v0.1a extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
@@ -10,7 +10,8 @@
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
- {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+ {\ifboolexpr{test {\ifnameundef{labelname}}
+ or test {\iffieldundef{labelyear}}}
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-terse
+ [2018/03/20 v0.1a extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-terse
+ [2018/03/20 v0.1a extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear-ticomp
+ [2018/03/20 v0.1a extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear-ticomp citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex authoryear-ticomp citation style (MW)]
\RequireCitationStyle{ext-authoryear-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -11,7 +11,8 @@
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
- {\ifboolexpr{test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}}
+ {\ifboolexpr{test {\ifnameundef{labelname}}
+ or test {\iffieldundef{labelyear}}}
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2018/03/18 v0.1 extended biblatex authoryear bibliography style (MW)]
+ [2018/03/20 v0.1a extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2018/03/18 v0.1 extended biblatex authoryear citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex authoryear citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -10,12 +10,12 @@
\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -92,14 +92,15 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
-
\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
@@ -114,14 +115,16 @@
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkpairedinner\blx at delimcontext delim}{#1}}
+ \csuse{mkinner\blx at delimcontext delim}{#1}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2018/03/18 v0.1 auxiliaries for extended biblatex citation style (MW)]
+ [2018/03/20 v0.1a auxiliaries for extended biblatex citation style (MW)]
\def\extblx at requiredbiblatexversion{3.11}
\def\extblx at requiredbiblatexdate{2018/02/20}
@@ -52,7 +52,7 @@
\csletcs{extblx at citedelim@#2@#1 at open}{extblx at citedelim@#3@#1 at open}%
\csletcs{extblx at citedelim@#2@#1 at close}{extblx at citedelim@#3@#1 at close}}
-% declare \mkpaired...delim commands
+% declare \mk...delim commands
\newrobustcmd*{\extblx at create@mkcitedelim}[2]{%
\protected\csdef{mk#1#2delim}##1{%
\begingroup
@@ -73,4 +73,20 @@
\extblx at create@mkcitedelim{inner}{textcite}
\extblx at create@mkcitedelim{inner}{footcite}
+% smartcite is special
+% According to the docs it is like \parencite in a footnote and \footcite in
+% the body.
+% To mirror that as closely as possible, we need to change the delimiter
+% context. The delimcontext is set in the pre-code, it is too late to detect
+% a footnote at that point (since we will have started the footnote ourselves
+% with \mkbibfootnote from the body), so we need to do it earlier.
+\newrobustcmd*{\mksmartcite}[1]{%
+ \iffootnote
+ {\mkouterparencitedelim{%
+ \def\extblx at thisdelimcontext{parencite}%
+ #1}}
+ {\mkbibfootnote{%
+ \def\extblx at thisdelimcontext{footcite}%
+ #1}}}
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2018/03/18 v0.1 common files for extended biblatex
+ [2018/03/20 v0.1a common files for extended biblatex
dashed bibliography styles (MW)]
% \DeclareBibliographyOption checks if an option is already defined.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2018/03/18 v0.1 extended biblatex numeric-comp
+ [2018/03/20 v0.1a extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2018/03/18 v0.1 extended biblatex numeric-comp citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex numeric-comp citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -54,8 +54,10 @@
{\usebibmacro{cite:dump}%
\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{cite:init}%
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite:comp}}
@@ -89,11 +91,14 @@
\global\boolfalse{cbx:parens}}
{}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2018/03/18 v0.1 extended biblatex numeric-verb
+ [2018/03/20 v0.1a extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2018/03/18 v0.1 extended biblatex numeric-verb citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex numeric-verb citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -15,7 +15,8 @@
\ifnameundef{labelname}
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
- \printdelim{namelabeldelim}\csuse{extblx at citedelim@\blx at delimcontext @inner at open}%
+ \printdelim{namelabeldelim}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -41,8 +42,10 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -60,8 +63,9 @@
{\usebibmacro{postnote}%
\csuse{extblx at citedelim@textcite at inner@close}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2018/03/18 v0.1 extended biblatex numeric bibliography style (MW)]
+ [2018/03/20 v0.1a extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2018/03/18 v0.1 extended biblatex numeric citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex numeric citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -63,8 +63,10 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -77,11 +79,14 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-standard.bbx}
- [2018/03/18 v0.1 extended biblatex standard style (MW)]
+ [2018/03/20 v0.1a extended biblatex standard style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-ibid
+ [2018/03/20 v0.1a extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-ibid citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-ibid citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -23,8 +23,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -43,11 +45,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,9 +1,8 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-inote
+ [2018/03/20 v0.1a extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{verbose-inote}
-
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-inote citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-inote citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -27,8 +27,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
{\usebibmacro{footcite}}
@@ -49,11 +51,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-note
+ [2018/03/20 v0.1a extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-note citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-note citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -27,8 +27,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
{\usebibmacro{footcite}}
@@ -36,7 +38,6 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-
\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
@@ -50,12 +51,14 @@
{}
{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
-
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad1
+ [2018/03/20 v0.1a extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad1 citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-trad1 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -23,8 +23,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -43,11 +45,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad2
+ [2018/03/20 v0.1a extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad2 citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-trad2 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -23,8 +23,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -43,11 +45,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad3
+ [2018/03/20 v0.1a extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2018/03/18 v0.1 extended biblatex verbose-trad3 citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose-trad3 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -23,8 +23,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -43,11 +45,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2018/03/18 v0.1 extended biblatex verbose
+ [2018/03/20 v0.1a extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx 2018-03-20 21:59:12 UTC (rev 47045)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx 2018-03-20 21:59:43 UTC (rev 47046)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2018/03/18 v0.1 extended biblatex verbose citation style (MW)]
+ [2018/03/20 v0.1a extended biblatex verbose citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -23,8 +23,10 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
- {\usebibmacro{prenote}}
+% smartcite's delimcontext needs special attention (see ext-biblatex-aux.def)
+\DeclareCiteCommand{\smartcite}[\mksmartcite]
+ {\delimcontext{\extblx at thisdelimcontext}%
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
@@ -43,11 +45,14 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+ {\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkouterparencitedelim\mkbibfootnote]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+ {\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+ {\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
\endinput
More information about the tex-live-commits
mailing list