texlive[47974] Master/texmf-dist: biblatex-ext (10jun18)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 10 22:49:25 CEST 2018
Revision: 47974
http://tug.org/svn/texlive?view=revision&revision=47974
Author: karl
Date: 2018-06-10 22:49:25 +0200 (Sun, 10 Jun 2018)
Log Message:
-----------
biblatex-ext (10jun18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-ext/CHANGES.md 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,3 +1,25 @@
+# Version 0.4 (2018-06-10)
+See https://github.com/moewew/biblatex-ext/compare/v0.3...v0.4
+- Renamed `\DeclareOuterCiteDelim` and friends to `\DeclareOuterCiteDelims`,
+ backwards compatibility for most of this change should be available.
+- **Incompatible change** Renamed the cite command `\bbx at cite@inxref` to
+ `\bbx at xrefcite` for consistency with other citation commands.
+ There are is no compatibility code set up for this change.
+- **Incompatible change** The "virtual" citation command `\bbx:introcite`
+ is now called `\bbx at introcite`. ("Virtual" because the appearance of the
+ introcite label can be changed mostly as if it were produced by this citation
+ command, but it isn't really produced by a citation command at all.)
+ This means that the delimiter context, inner citation delimiters and wrapper
+ field format are renamed from `bbx:introcite` to `bbx at introcite`.
+ There is no compatibility code set up for this change, but warnings are
+ issued if some typical uses of the old names are detected. This means that
+ people using older code should be warned, but still need to take action
+ themselves. Fortunately the introcite feature is quite a prominent bit of
+ the bibliography, so people will probably realise wrong output sooner than
+ later.
+- Renamed option `citeinxref` to `citexref`. Please use the new name.
+ Backwards compatibility is in place.
+
# Version 0.3 (2018-06-04)
See https://github.com/moewew/biblatex-ext/compare/v0.2...v0.3
- Added `titlecase:<titletype>` field formats for finer control over the title
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-ext/biblatex-ext.tex 2018-06-10 20:49:25 UTC (rev 47974)
@@ -116,8 +116,8 @@
iflistundef,iffieldundef,ifnameundef,
ExecuteBibliographyOptions,
DeclareFieldFormat,DeclareDelimFormat,DeclareDelimcontextAlias,
- DeclareInnerCiteDelim,UndeclareInnerCiteDelim,DeclareInnerCiteDelimAlias,
- DeclareOuterCiteDelim,UndeclareOuterCiteDelim,DeclareOuterCiteDelimAlias,
+ DeclareInnerCiteDelims,UndeclareInnerCiteDelims,DeclareInnerCiteDelimsAlias,
+ DeclareOuterCiteDelims,UndeclareOuterCiteDelims,DeclareOuterCiteDelimsAlias,
introcitepunct,volnumdelim,maintitletitledelim,voltitledelim,sernumdelim,
volnumdatedelim,locdatedelim,locpubdelim,publocdelim,pubdatedelim,
extradateonlycompcitedelim,introcitesep,introcitewidth,introcitesep},
@@ -391,11 +391,12 @@
\newrobustcmd*{\bibmacro}[1]{\sty{#1}}
\renewrobustcmd*{\bibtype}[1]{\sty{@#1}}
\renewrobustcmd*{\cmd}[1]{\sty{\textbackslash #1}}
+\let\cs\cmd
\newrobustcmd*{\bibfieldformat}[1]{{\bibfieldformatfont #1}}
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.3}
+\newcommand*{\extblxversion}{0.4}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -412,7 +413,7 @@
author = {Moritz Wemheuer},
link = {mwemheu at gmail.com},%
revision = {\extblxversion},
- date = {\DTMDate{2018-06-04}},
+ date = {\DTMDate{2018-06-10}},
}
\hypersetup{%
@@ -446,7 +447,7 @@
styles that come with \sty{biblatex}.
For each standard style this bundle provides a style with the same name
prefixed with \texttt{ext-} which can be used as a drop-in replacement for the
-standard style -- for example, the replacement for \sty{authoryear-icomp}
+standard style~-- for example, the replacement for \sty{authoryear-icomp}
is called \sty{ext-authoryear-icomp}.
The aim of the styles of this bundle is to offer a simple interface to change
@@ -470,7 +471,7 @@
\footnote{See \url{https://tex.stackexchange.com/q/122218/} and
\url{https://tex.stackexchange.com/q/173638/} for example.}
the modifications needed to do this in a stable, safe and clean manner by
-redefining the bibliography drivers can easily amass hundred lines of code --
+redefining the bibliography drivers can easily amass hundred lines of code~--
code you may not want to see in your preamble.
Some contributed \sty{biblatex} styles already place the editor in the
desired position, but you may not want to commit to the other changes implied
@@ -522,6 +523,32 @@
their implementation, but many \sty{biblatex} standard features only work
properly with \biber{}.
+\subsection{Compatibility with earlier versions}\label{sec:backw}
+In an ideal world all changes to the styles in this bundle would be fully
+backwards compatible. Unfortunately we do not live in this ideal world.
+Most changes to this bundle should introduce new features that have little
+relevant impact on existing functionality. But the occasional change
+may have more lasting consequences and may cause existing customisations to
+fail.
+In fact all changes have the potential to break someone's code, since
+\sty{biblatex} styles have little to no distinction between public and internal
+code.
+Still, some changes are more likely to be problematic than others and those
+should be kept to a minimum. They can, however, be required to move development
+forward.
+
+If possible, backwards compatiblity measures that allow old code to
+continue to work are in place. Sometimes that is not feasible and in those
+cases the next best solution is to warn if old code is used, so please check
+the log file for warnings~-- especially after an update.
+But at times not even that is possible, so it is always a good idea to consult
+the change history after an update and to examine the output with extra
+scrutiny.
+Higher-level changes are found in the revision history in \cref{sec:log},
+more technical changes and commentary can be found in \sty{CHANGES.md},
+the full set of changes can be investigated by comparing the tagged and
+publicly available source code.
+
\subsection{Installation}\label{sec:install}
This style bundle is available on \ctan.%
\fnurl{https://ctan.org/pkg/biblatex-ext}
@@ -534,8 +561,8 @@
and install the \sty{.bbx}, \sty{.cbx} and \sty{.def} files preferably to
\path{tex/latex/biblatex-ext} of your local or home \TeX{} tree, the other
files (\path{CHANGES.md}, \path{README.md}, \path{biblatex-ext.tex},
-\path{biblatex-ext.pdf} and \path{biblatex-ext-examples.bib}) go to
-\path{doc/latex/biblatex-ext}, you may have to refresh your file name database
+\path{biblatex-ext.pdf} and \path{biblatex-ext-examples.bib}) go into
+\path{doc/latex/biblatex-ext}. You may have to refresh your file name database
afterwards, so \tex{} can find the files.
\subsection{License}\label{sec:license}
@@ -554,8 +581,11 @@
If you do not want to report a bug or request a feature, but are simply in need
of assistance, you might want to consider posting your question on the
-\texttt{comp.text.tex} newsgroup or \tex{} -- \latex{} Stack Exchange.%
+\texttt{comp.text.tex} newsgroup or \tex{}~--~\latex{} Stack Exchange.%
\fnurl{https://tex.stackexchange.com/questions/tagged/biblatex}
+If after a consultation on one of these sites it turns out you have happened
+upon a bug or that you can formulate a request for a new feature that could be
+useful, please head over to GitHub or send me an email.
\section{Use}\label{sec:use}
The \sty{biblatex-ext} bundle is a collection of \sty{biblatex} style files.
@@ -581,10 +611,10 @@
the author particularly likes
Knut Hegna and Dag Langmyhr's \emph{Local Guide to \sty{biblatex}}%
\fnurl{http://dag.at.ifi.uio.no/public/doc/biblatex-guide.pdf}
-and Paul Stanley's \emph{\sty{biblatex} -- An Easier Read}%
+and Paul Stanley's \emph{\sty{biblatex}~-- An Easier Read}%
\fnurl{https://github.com/PaulStanley/biblatex-tutorial/releases}.
French speakers may want to consider Maïeul Rouquette's
-\foreignlanguage{french}{\emph{(Xe)\LaTeX{} Appliqué aux sciences humaines}}%
+\foreignlanguage{french}{\emph{(Xe)\LaTeX{} Appliqué aux sciences humaines}}
available on \ctan\fnurl{https://ctan.org/pkg/latex-sciences-humaines}.
If you read German you may be interested in Dominik Waßenhoven's two-part
series \foreignlanguage{ngerman}{\emph{Bibliographien erstellen mit
@@ -851,12 +881,12 @@
\makeatother
\endgroup
-\boolitem[false]{citeinxref}
+\boolitem[false]{citexref}
This option controls if \bibtype{inbook}, \bibtype{incollection} and
\bibtype{inproceedings} entries that are tied to a parent entry with
\bibfield{xref} or \bibfield{crossref} should cite their parent in the
bibliography if the parent is listed in the bibliography as a separate entry.
-With the default setting \kvopt{citeinxref}{false} the parent is not cited, the
+With the default setting \kvopt{citexref}{false} the parent is not cited, the
entry is shown as in the standard styles. If the option is set to
\opt{true}, the block following the \enquote{in:} is replaced by a citation
to the parent entry.
@@ -866,35 +896,35 @@
\opt{mincrossrefs} option.
\nocite{westfahl:frontier}
-\begin{bibexample}[title={\kvopt{citeinxref}{true}}]
+\begin{bibexample}[title={\kvopt{citexref}{true}}]
\makeatletter
\renewbibmacro*{crosscite}[1]{%
\printtext[highlight1]{%
- \iftoggle{bbx:citeinxref}
+ \iftoggle{bbx:citexref}
{\iffieldundef{crossref}
{\iffieldundef{xref}
{\usebibmacro{#1}}
- {\printtext{\bbx at cite@inxref{\thefield{xref}}}}}
- {\printtext{\bbx at cite@inxref{\thefield{crossref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{crossref}}}}}
{\usebibmacro{#1}}}}
\makeatother
-\toggletrue{bbx:citeinxref}
+\toggletrue{bbx:citexref}
\exampleprintbib{westfahl:space}
\end{bibexample}
-\begin{bibexample}[title={\kvopt{citeinxref}{false}}]
+\begin{bibexample}[title={\kvopt{citexref}{false}}]
\makeatletter
\renewbibmacro*{crosscite}[1]{%
\printtext[highlight1]{%
- \iftoggle{bbx:citeinxref}
+ \iftoggle{bbx:citexref}
{\iffieldundef{crossref}
{\iffieldundef{xref}
{\usebibmacro{#1}}
- {\printtext{\bbx at cite@inxref{\thefield{xref}}}}}
- {\printtext{\bbx at cite@inxref{\thefield{crossref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{crossref}}}}}
{\usebibmacro{#1}}}}
\makeatother
-\togglefalse{bbx:citeinxref}
+\togglefalse{bbx:citexref}
\exampleprintbib{westfahl:space}
\end{bibexample}
@@ -1166,7 +1196,7 @@
\begingroup
\togglefalse{bbx:doi}
\setlength{\introcitewidth}{5.5\biblabelsep}
-\DeclareFieldFormat{bbx:introcite}{\highlight{#1}}
+\DeclareFieldFormat{bbx at introcite}{\highlight{#1}}
\renewcommand*{\introcitepunct}{\highlight{\addcolon}\space}
\makeatletter
\begin{bibexample}[title={\kvopt{introcite}{false}}]
@@ -1218,7 +1248,7 @@
\renewbibmacro*{related:init}{%
\csundef{bbx:relatedloop}%
\iftoggle{bbx:introcite:plain:keeprelated}{%
- \DeclareFieldFormat{bbx:introcite}{\highlight{##1}}%
+ \DeclareFieldFormat{bbx at introcite}{\highlight{##1}}%
\renewcommand*{\introcitepunct}{\highlight{\addcolon}\space}%
}{\renewbibmacro{introcite:plain}{}}}
\csuse{extblx at opt@dashed at false}
@@ -1225,6 +1255,10 @@
\csletcs{extblx at introcite}{extblx at opt@introcite at plain}
\exampleprintbib{vizedom:related}
\end{bibexample}
+Note that the implementation of some related types automatically suppresses
+the introcite label~-- or rather, does not add the label in the first place.
+That means that the resulting bibliography should be checked for consistency
+if the toggle is set to \opt{true}.
\end{keymarglistbook}
The \opt{label} option can be configured to not allow the label to run into
@@ -1288,25 +1322,26 @@
\makeatother
The appearance of the citation label can be customised mostly as if it were
-produced by a true citation command called \cmd{bbx:introcite}.
-The delimiter context is \sty{bbx:introcite}, the inner citation delimiters
-can be accessed as \sty{bbx:introcite} as well.
+produced by a true citation command called \cmd{bbx at introcite}.
+The delimiter context is \sty{bbx at introcite}, the inner citation delimiters
+can be accessed as \sty{bbx at introcite} as well.
The label does not have outer citation delimiters, you can use the wrapper
-field format \sty{bbx:introcite} instead. In fact this approach is more
+field format \sty{bbx at introcite} instead. In fact this approach is more
versatile than the outer citation delimiter feature (see the discussion in
\cref{sec:opt:citedelims}).
+The default settings for \cmd{bbx at introcite} emulate the output of \cmd{cite}.
\begin{bibexample}[title={Example customisations for \kvopt{introcite}{plain}}]
\begin{lstlisting}[style=extblxstylelatex]
-\DeclareFieldFormat{bbx:introcite}{\mkbibbrackets{#1}}
-\DeclareDelimFormat[bbx:introcite]{nameyeardelim}{\addcomma\space}
-\UndeclareInnerCiteDelim{bbx:introcite}
+\DeclareFieldFormat{bbx at introcite}{\mkbibbrackets{#1}}
+\DeclareDelimFormat[bbx at introcite]{nameyeardelim}{\addcomma\space}
+\UndeclareInnerCiteDelims{bbx at introcite}
\renewcommand*{\introcitepunct}{\quad}
\end{lstlisting}
\tcblower
-\DeclareFieldFormat{bbx:introcite}{\mkbibbrackets{#1}}
-\DeclareDelimFormat[bbx:introcite]{nameyeardelim}{\addcomma\space}
-\UndeclareInnerCiteDelim{bbx:introcite}
+\DeclareFieldFormat{bbx at introcite}{\mkbibbrackets{#1}}
+\DeclareDelimFormat[bbx at introcite]{nameyeardelim}{\addcomma\space}
+\UndeclareInnerCiteDelims{bbx at introcite}
\renewcommand*{\introcitepunct}{\quad}
\csuse{extblx at opt@dashed at false}
\csletcs{extblx at introcite}{extblx at opt@introcite at plain}
@@ -1315,16 +1350,16 @@
\begin{bibexample}[title={Example customisations for \kvopt{introcite}{label}}]
\begin{lstlisting}[style=extblxstylelatex]
-\DeclareFieldFormat{bbx:introcite}{\mkbibbold{#1}}
-\DeclareDelimcontextAlias{bbx:introcite}{textcite}
-\DeclareInnerCiteDelim{bbx:introcite}{\bibopenparen}{\bibcloseparen}
+\DeclareFieldFormat{bbx at introcite}{\mkbibbold{#1}}
+\DeclareDelimFormat[bbx at introcite]{nameyeardelim}{\addspace}
+\DeclareInnerCiteDelims{bbx at introcite}{\bibopenparen}{\bibcloseparen}
\setlength{\introcitewidth}{0pt}
\setlength{\introcitesep}{\bibhang}
\end{lstlisting}
\tcblower
-\DeclareFieldFormat{bbx:introcite}{\mkbibbold{#1}}
-\DeclareDelimcontextAlias{bbx:introcite}{textcite}
-\DeclareInnerCiteDelim{bbx:introcite}{\bibopenparen}{\bibcloseparen}
+\DeclareFieldFormat{bbx at introcite}{\mkbibbold{#1}}
+\DeclareDelimFormat[bbx at introcite]{nameyeardelim}{\addspace}
+\DeclareInnerCiteDelims{bbx at introcite}{\bibopenparen}{\bibcloseparen}
\setlength{\introcitewidth}{0pt}
\setlength{\introcitesep}{\bibhang}
\csuse{extblx at opt@dashed at false}
@@ -1331,7 +1366,7 @@
\csletcs{extblx at introcite}{extblx at opt@introcite at label}
\exampleprintbib{coleridge,geer}
\end{bibexample}
-\csgundef{blx at delimcontextalias@bbx:introcite}
+\csgundef{blx at delimcontextalias@bbx at introcite}
% because \DeclareDelimcontextAlias is global ... at the moment, this can go
% with biblatex >= 3.12
@@ -1760,10 +1795,16 @@
{closing delimiter}
Sets up the outer delimiters for the citation command
-\cmd{$\langle$\emph{cite command}$\rangle$}. The name of the \prm{cite command}
+\cmd{\prm{cite command}}. The name of the \prm{cite command}
is given without leading backslash in the argument, it normally corresponds to
the delimiter context.
+Note that outer citation delimiters are often hard-coded so they usually do not
+respond to delimiter context alises.
+Inner citation delimiters, on the other hand, usually follow delimiter context
+aliases.
+This may lead to initially surprising results if aliases are used.
+
You may use almost any input for \prm{opening delimiter} and
\prm{closing delimiter} as long as typesetting of
\enquote{\prm{opening delimiter}text\prm{closing delimiter}} does not lead to
@@ -1787,8 +1828,8 @@
\cmditem{DeclareOuterCiteDelimAlias}{cite alias}{cite command}
\cmditem*{DeclareOuterCiteDelimAlias*}{cite alias}{cite command}
-Use the outer delimiters of \cmd{$\langle$\emph{cite command}$\rangle$} for
-\cmd{$\langle$\emph{cite alias}$\rangle$} as well.
+Use the outer delimiters of \cmd{\prm{cite command}} for
+\cmd{\prm{cite alias}} as well.
The unstarred version uses \cmd{def} assignment while the starred version uses
\cmd{let}. This means that the starred version copies the values of the
definitions at the time of executing the aliasing command,
@@ -1795,25 +1836,30 @@
whereas the alias created by the unstarred version will only evaluate the
delimiters whenever the citation command is called.
-\cmditem{UndeclareOuterCiteDelim}{cite command}
+\cmditem{UndeclareOuterCiteDelims}{cite command}
Completely remove the definitions of the outer delimiters for
-\cmd{$\langle$\emph{cite command}$\rangle$}.
+\cmd{\prm{cite command}}.
\cmditem{DeclareInnerCiteDelim}{cite command}{opening delimiter}
{closing delimiter}
Sets up the inner delimiters for the citation command
-\cmd{$\langle$\emph{cite command}$\rangle$}.
+\cmd{\prm{cite command}}.
This command is similar to \cmd{DeclareOuterCiteDelim} and the same
restrictions for the arguments apply.
+Note that inner citation delimiters usually follow context delimiter aliases.
+Outer citation delimiters, on the other hand, do not respond to context
+delimiter aliases.
+This may lead to initially surprising results if aliases are used.
+
\cmditem{DeclareInnerCiteDelimAlias}{cite alias}{cite command}
\cmditem*{DeclareInnerCiteDelimAlias*}{cite alias}{cite command}
-Use the inner delimiters of \cmd{$\langle$\emph{cite command}$\rangle$} for
-\cmd{$\langle$\emph{cite alias}$\rangle$} as well.
+Use the inner delimiters of \cmd{\prm{cite command}} for
+\cmd{\prm{cite alias}} as well.
The unstarred version uses \cmd{def} assignment while the starred version uses
\cmd{let}. This means that the starred version copies the values of the
definitions at the time of executing the aliasing command,
@@ -1820,33 +1866,77 @@
whereas the alias created by the unstarred version will only evaluate the
delimiters whenever the citation command is called.
-\cmditem{UndeclareInnerCiteDelim}{cite command}
+\cmditem{UndeclareInnerCiteDelims}{cite command}
Completely remove the definitions of the inner delimiters for
-\cmd{$\langle$\emph{cite command}$\rangle$}.
+\cmd{\prm{cite command}}.
+\cmditem{RegisterCiteDelims}{modifier}{cite command}
+
+Register a pair of \prm{modifier} citation delimiters for
+\cmd{\prm{cite command}}.
+This command will define a delimiter wrapper command
+\cmd{mk\prm{modifier}\prm{cite command}s} that places its argument between
+the opening delimiter
+\cs{ext\allowbreak blx@\allowbreak cite\allowbreak delim@\allowbreak
+ \prm{cite command}@\allowbreak\prm{modifier}@\allowbreak open} and
+the closing delimiter
+\cs{ext\allowbreak blx@\allowbreak cite\allowbreak delim@\allowbreak
+ \prm{cite command}@\allowbreak\prm{modifier}@\allowbreak close}.
+No error will be raised if the opening or closing delimiters are not defined,
+but an error will be raised if \cmd{mk\prm{modifier}\prm{cite command}s} is
+already defined.
+
+The styles of this bundle only use the values \opt{outer} and \opt{inner} for
+\prm{modifier}, but other values are possible. With \opt{outer} and \opt{inner}
+you can use \cmd{DeclareOuterCiteDelim} or \cmd{DeclareInnerCiteDelim} and
+friends to define the opening and closing delimiters, otherwise you need to
+define them manually.
+
+All styles of \sty{biblatex-ext} define the following wrapper commands
+\begin{table}[btph]
+\centering
+\caption{Delimiter wrappers defined by \sty{biblatex-ext}}
+\label{tab:delimwrappers}
+\begin{tabular}{@{}lll@{}}
+\toprule
+ & \multicolumn{2}{c}{Modifier} \\
+ \cmidrule(lr){2-3}
+Citation command & Outer & Inner\\
+\midrule
+\cmd{cite} & \cmd{mkoutercitedelims} & \cmd{mkinnercitedelims}\\
+\cmd{parencite} & \cmd{mkouterparencitedelims} & \cmd{mkinnerparencitedelims}\\
+\cmd{textcite} & \cmd{mkoutertextcitedelims} & \cmd{mkinnertextcitedelims}\\
+\cmd{footcite} & & \cmd{mkinnerfootcitedelims}\\
+\cmd{bbx at xrefcite} & \cmd{mkouterbbx at xrefcitedelims} & \cmd{mkinnerbbx at xrefcitedelims}\\
+\enquote{\cmd{bbx at introcite}} & & \cmd{mkinnerbbx at introcitedelims}\\
+\bottomrule
+\end{tabular}
+\end{table}
+
+
The \sty{authoryear} and \sty{authortitle} styles have \cmd{parencite},
e.g.\ \parencite{knuth:ct:a}, \parencite{sigfridsson}, set up with
\begin{biblatexcode}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{parencite}{}{}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{parencite}{}{}
\end{biblatexcode}
and \cmd{textcite}, e.g.\ \textcite{knuth:ct:a}, \textcite{sigfridsson}, with
\begin{biblatexcode}
-\DeclareOuterCiteDelim{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{textcite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
\end{biblatexcode}
If you wanted \cmd{parencite} of \sty{authoryear} to look like
\enquote{[Sigfridsson and Worman (1998)]} you would use
\begin{biblatexcode}
-\DeclareOuterCiteDelim{parencite}{|1\bibopenbracket1|}{|1\bibclosebracket1|}
-\DeclareInnerCiteDelim{parencite}{|2\bibopenparen2|}{|2\bibcloseparen2|}
+\DeclareOuterCiteDelims{parencite}{|1\bibopenbracket1|}{|1\bibclosebracket1|}
+\DeclareInnerCiteDelims{parencite}{|2\bibopenparen2|}{|2\bibcloseparen2|}
\end{biblatexcode}
\citereset
\begin{bibexample}
-\DeclareOuterCiteDelim{parencite}{\highlightbf[1]{\bibopenbracket}}{%
+\DeclareOuterCiteDelims{parencite}{\highlightbf[1]{\bibopenbracket}}{%
\highlightbf[1]{\bibclosebracket}}
-\DeclareInnerCiteDelim{parencite}{\highlightbf[2]{\bibopenparen}}{%
+\DeclareInnerCiteDelims{parencite}{\highlightbf[2]{\bibopenparen}}{%
\highlightbf[2]{\bibcloseparen}}
\parencite{sigfridsson}\quad\parencite{worman,geer}\quad
\parencite{knuth:ct:a,knuth:ct:b,knuth:ct:c}
@@ -1937,6 +2027,16 @@
the changes in source code there.\footnote{\url{\gitbaseurl/compare/}}
See also \sty{CHANGES.md}.
\begin{changelog}
+\begin{release}{0.4}{2018-06-10}
+\item Renamed \cmd{DeclareOuterCiteDelim} and friends to
+ \cmd{DeclareOuterCiteDelims}
+ \see{sec:opt:citedelims}
+\item Added \cmd{RegisterCiteDelims}
+ \see{sec:opt:citedelims}
+\item Renamed \enquote{virtual} cite command \cmd{bbx:introcite} to
+ \cmd{bbx at introcite}
+ \see{sec:opt:style}
+\end{release}
\begin{release}{0.3}{2018-06-04}
\item Added \bibfieldformat{titlecase:\dots title} field formats%
\see{sec:opt:field}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2018/06/04 v0.3 extended biblatex alphabetic-verb
+ [2018/06/10 v0.4 extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2018/06/04 v0.3 extended biblatex alphabetic-verb citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex alphabetic-verb citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{alphabetic-verb}
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
\renewbibmacro*{textcite}{%
\ifnameundef{labelname}
@@ -16,7 +16,7 @@
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
\printdelim{namelabeldelim}%
- \csuse{extblx at citedelim@textcite at inner@open}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -35,7 +35,7 @@
{\usebibmacro{postnote}%
\csuse{extblx at citedelim@cite at outer@close}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -51,7 +51,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -59,15 +59,15 @@
{\stepcounter{textcitetotal}%
\textcitedelim}%
\usebibmacro{textcite}}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{\usebibmacro{postnote}%
- \csuse{extblx at citedelim@textcite at inner@close}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
\endinput
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2018/06/04 v0.3 extended biblatex alphabetic bibliography style (MW)]
+ [2018/06/10 v0.4 extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2018/06/04 v0.3 extended biblatex alphabetic citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex alphabetic citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{alphabetic}
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
\renewbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx at lasthash}
@@ -20,7 +20,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{namelabeldelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\stepcounter{textcitecount}%
\savefield{namehash}{\cbx at lasthash}}%
\ifnumequal{\value{citecount}}{1}
@@ -29,7 +29,7 @@
\usebibmacro{cite}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -40,17 +40,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -57,7 +57,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -73,7 +73,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -80,12 +80,12 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2018/06/04 v0.3 common files for extended biblatex
+ [2018/06/10 v0.4 common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-comp
+ [2018/06/10 v0.4 extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-comp
+ [2018/06/10 v0.4 extended biblatex authortitle-comp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,12 +6,12 @@
\RequireCitationStyle{authortitle-comp}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
@@ -40,7 +40,7 @@
\setunit*{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\stepcounter{textcitecount}%
\savefield{namehash}{\cbx at lasthash}}%
\ifnumequal{\value{citecount}}{1}
@@ -51,7 +51,7 @@
{\usebibmacro{cite:shorthand}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -70,7 +70,7 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}
{\setunit{\postnotedelim}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
@@ -77,17 +77,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -95,7 +95,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -103,7 +103,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -111,7 +111,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -129,7 +129,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -136,22 +136,22 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}%
\usebibmacro{cite:init}}
- {\usebibmacro{bbx:cite:inxref}}
+ {\usebibmacro{bbx:inxrefcite}}
{}
{\usebibmacro{cite:postnote}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-ibid
+ [2018/06/10 v0.4 extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-ibid
+ [2018/06/10 v0.4 extended biblatex authortitle-ibid
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,20 +6,20 @@
\RequireCitationStyle{authortitle-ibid}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
-\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innercitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innerparencitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx at innerfootcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
\newbibmacro*{textcite}{%
\global\boolfalse{cbx:loccit}%
@@ -27,7 +27,7 @@
\setunit*{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -38,7 +38,7 @@
{\usebibmacro{cite:shorthand}}}
\renewbibmacro*{cite:title}{%
- \printtext[extblx at inner\blx at delimcontext delim]{%
+ \printtext[extblx at inner\blx at delimcontext delims]{%
\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}}
@@ -45,16 +45,16 @@
\newbibmacro*{textcite:postnote}{%
\ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
{\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\printfield{postnote}%
- \csuse{extblx at citedelim@textcite at inner@close}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -61,7 +61,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citetitle}}
@@ -68,7 +68,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -75,7 +75,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citetitle}}
@@ -91,7 +91,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -100,21 +100,21 @@
\textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
-\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innerbbx@introcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-icomp
+ [2018/06/10 v0.4 extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-icomp
+ [2018/06/10 v0.4 extended biblatex authortitle-icomp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,12 +6,12 @@
\RequireCitationStyle{authortitle-icomp}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
@@ -42,7 +42,7 @@
\setunit*{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\stepcounter{textcitecount}%
\savefield{namehash}{\cbx at lasthash}}%
\ifnumequal{\value{citecount}}{1}
@@ -55,7 +55,7 @@
{\usebibmacro{cite:shorthand}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -78,7 +78,7 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}
{\setunit{\postnotedelim}}%
\printfield{postnote}}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
@@ -85,17 +85,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -103,7 +103,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -111,7 +111,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -119,7 +119,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -137,7 +137,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -144,22 +144,22 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}%
\usebibmacro{cite:init}}
- {\usebibmacro{bbx:cite:inxref}}
+ {\usebibmacro{bbx:inxrefcite}}
{}
{\usebibmacro{cite:postnote}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-tcomp
+ [2018/06/10 v0.4 extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-tcomp
+ [2018/06/10 v0.4 extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
@@ -63,7 +63,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -74,7 +74,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -85,18 +85,18 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-terse
+ [2018/06/10 v0.4 extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-terse
+ [2018/06/10 v0.4 extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
@@ -31,7 +31,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle-ticomp
+ [2018/06/10 v0.4 extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle-ticomp citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex authortitle-ticomp citation style (MW)]
\RequireCitationStyle{ext-authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -70,7 +70,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -83,7 +83,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -94,7 +94,7 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}%
\ifbool{cbx:loccit}
{}
{\printfield{postnote}}%
@@ -102,12 +102,12 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2018/06/04 v0.3 extended biblatex authortitle
+ [2018/06/10 v0.4 extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,24 +1,24 @@
\ProvidesFile{ext-authortitle.cbx}
- [2018/06/04 v0.3 extended biblatex authortitle citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex authortitle citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{authortitle}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{cite}{}{}
-\DeclareInnerCiteDelim{parencite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{footcite}{}{}
+\DeclareInnerCiteDelims{cite}{}{}
+\DeclareInnerCiteDelims{parencite}{}{}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{footcite}{}{}
-\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innercitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innerparencitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx at innerfootcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
\renewbibmacro*{textcite}{%
\printnames{labelname}%
@@ -25,7 +25,7 @@
\setunit*{%
\global\booltrue{cbx:parens}%
\printdelim{nametitledelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -34,7 +34,7 @@
{\usebibmacro{cite:shorthand}}}
\renewbibmacro*{cite:title}{%
- \printtext[extblx at inner\blx at delimcontext delim]{%
+ \printtext[extblx at inner\blx at delimcontext delims]{%
\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}}
@@ -41,16 +41,16 @@
\renewbibmacro*{textcite:postnote}{%
\iffieldundef{postnote}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
{\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\printfield{postnote}%
- \csuse{extblx at citedelim@textcite at inner@close}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -57,7 +57,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citetitle}}
@@ -64,7 +64,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -71,7 +71,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citetitle}}
@@ -87,7 +87,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -96,21 +96,21 @@
\textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
-\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innerbbx@introcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2018/06/04 v0.3 common files for extended biblatex
+ [2018/06/10 v0.4 common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-comp
+ [2018/06/10 v0.4 extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-comp
+ [2018/06/10 v0.4 extended biblatex authoryear-comp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,9 +6,9 @@
\RequireCitationStyle{authoryear-comp}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -97,7 +97,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -107,7 +107,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -122,7 +122,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -133,17 +133,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -151,7 +151,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -159,7 +159,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -167,7 +167,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -201,7 +201,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -208,22 +208,22 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}%
\usebibmacro{cite:init}}
- {\usebibmacro{bbx:cite:inxref}}
+ {\usebibmacro{bbx:inxrefcite}}
{}
{\usebibmacro{cite:postnote}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-ibid
+ [2018/06/10 v0.4 extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-ibid
+ [2018/06/10 v0.4 extended biblatex authoryear-ibid
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,17 +6,17 @@
\RequireCitationStyle{authoryear-ibid}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innercitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innerparencitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx at innerfootcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -26,7 +26,7 @@
\renewbibmacro*{cite:labeldate+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[extblx at inner\blx at delimcontext delim]{%
+ {\printtext[extblx at inner\blx at delimcontext delims]{%
\printtext[bibhyperref]{%
\printtext[\blx at delimcontext labeldate]{%
\printlabeldateextra}}}}}
@@ -39,7 +39,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -49,7 +49,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -64,16 +64,16 @@
\renewbibmacro*{textcite:postnote}{%
\ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
{\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\printfield{postnote}%
- \csuse{extblx at citedelim@textcite at inner@close}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -80,7 +80,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}}
@@ -87,7 +87,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -94,7 +94,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}}
@@ -110,7 +110,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -119,22 +119,22 @@
\textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
-\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
-\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{bbx at introcitelabeldate}{#1}
+\DeclareFieldFormat{extblx at innerbbx@introcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-icomp
+ [2018/06/10 v0.4 extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-icomp
+ [2018/06/10 v0.4 extended biblatex authoryear-icomp
citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -6,9 +6,9 @@
\RequireCitationStyle{authoryear-icomp}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -101,7 +101,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -113,7 +113,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -130,7 +130,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -143,17 +143,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -161,7 +161,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -169,7 +169,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -177,7 +177,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -195,7 +195,7 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -202,22 +202,22 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\setunit{\multicitedelim}}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}%
\usebibmacro{cite:init}}
- {\usebibmacro{bbx:cite:inxref}}
+ {\usebibmacro{bbx:inxrefcite}}
{}
{\usebibmacro{cite:postnote}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-tcomp
+ [2018/06/10 v0.4 extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-tcomp
+ [2018/06/10 v0.4 extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
@@ -67,7 +67,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -80,7 +80,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -95,7 +95,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -106,18 +106,18 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-terse
+ [2018/06/10 v0.4 extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-terse
+ [2018/06/10 v0.4 extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
@@ -24,7 +24,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -37,7 +37,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear-ticomp
+ [2018/06/10 v0.4 extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear-ticomp citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex authoryear-ticomp citation style (MW)]
\RequireCitationStyle{ext-authoryear-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
@@ -68,7 +68,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -83,7 +83,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -100,7 +100,7 @@
\savefield{namehash}{\cbx at lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -111,7 +111,7 @@
{\setunit{%
\global\booltrue{cbx:parens}%
\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}%
\ifbool{cbx:loccit}
{}
{\printfield{postnote}}%
@@ -119,12 +119,12 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2018/06/04 v0.3 extended biblatex authoryear bibliography style (MW)]
+ [2018/06/10 v0.4 extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,21 +1,21 @@
\ProvidesFile{ext-authoryear.cbx}
- [2018/06/04 v0.3 extended biblatex authoryear citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex authoryear citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{authoryear}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareFieldFormat{extblx at innercitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innerparencitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
-\DeclareFieldFormat{extblx at innertextcitedelim}{#1}
-\DeclareFieldFormat{extblx at innerfootcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{extblx at innercitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innerparencitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
+\DeclareFieldFormat{extblx at innertextcitedelims}{#1}
+\DeclareFieldFormat{extblx at innerfootcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#1}}
\DeclareFieldFormat{citelabeldate}{#1}
\DeclareFieldFormat{parencitelabeldate}{#1}
@@ -25,7 +25,7 @@
\renewbibmacro*{cite:labeldate+extradate}{%
\iffieldundef{labelyear}
{}
- {\printtext[extblx at inner\blx at delimcontext delim]{%
+ {\printtext[extblx at inner\blx at delimcontext delims]{%
\printtext[bibhyperref]{%
\printtext[\blx at delimcontext labeldate]{%
\printlabeldateextra}}}}}
@@ -37,7 +37,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nonameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -47,7 +47,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\printdelim{nameyeardelim}%
- \csuse{extblx at citedelim@textcite at inner@open}}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -56,15 +56,16 @@
\renewbibmacro*{textcite:postnote}{%
\iffieldundef{postnote}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{}}
{\ifbool{cbx:parens}
{\setunit{\postnotedelim}}
{\setunit{\extpostnotedelim
- \csuse{extblx at citedelim@textcite at inner@open}}}%
- \printfield{postnote}\csuse{extblx at citedelim@textcite at inner@close}}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at open}}}%
+ \printfield{postnote}%
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -71,7 +72,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand*{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand*{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}}
@@ -78,7 +79,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -85,7 +86,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand*{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand*{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}}
@@ -101,7 +102,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -110,22 +111,22 @@
\textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
-\DeclareFieldFormat{bbx:introcitelabeldate}{#1}
-\DeclareFieldFormat{extblx at innerbbx:introcitedelim}{%
- \csuse{mkinner\blx at delimcontext delim}{#1}}
+\DeclareFieldFormat{bbx at introcitelabeldate}{#1}
+\DeclareFieldFormat{extblx at innerbbx@introcitedelims}{%
+ \csuse{mkinner\blx at delimcontext delims}{#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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,60 +1,79 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2018/06/04 v0.3 auxiliaries for extended biblatex citation style (MW)]
+ [2018/06/10 v0.4 auxiliaries for extended biblatex citation style (MW)]
\def\extblx at requiredbiblatexversion{3.11}
\def\extblx at requiredbiblatexdate{2018/02/20}
+\newrobustcmd*{\extblx at warning}[1]{\PackageWarning{biblatex-ext}{#1}}
+\newrobustcmd*{\extblx at warning@noline}[1]{\PackageWarningNoLine{biblatex-ext}{#1}}
+
+\newrobustcmd*{\extblx at error}[2]{\PackageError{biblatex-ext}{#1}{#2.}}
+
\@ifpackagelater{biblatex}{\extblx at requiredbiblatexdate}
{}
- {\PackageWarningNoLine{extbiblatex}
- {Outdated version of biblatex detected.\MessageBreak
+ {\extblx at warning@noline{%
+ Outdated version of biblatex detected.\MessageBreak
Upgrade to biblatex \extblx at requiredbiblatexversion\space
(\extblx at requiredbiblatexdate) or later.\MessageBreak
I found '\csuse{abx at version} (\csuse{abx at date})'}}
%{<context>}{<opening delim>}{<closing delim>}
-\newcommand*{\DeclareOuterCiteDelim}{%
- \extblx at declareciteddelim{outer}}
-\newrobustcmd*{\DeclareInnerCiteDelim}{%
- \extblx at declareciteddelim{inner}}
+\newrobustcmd*{\DeclareOuterCiteDelims}{%
+ \extblx at declareciteddelims{outer}}
+\newrobustcmd*{\DeclareInnerCiteDelims}{%
+ \extblx at declareciteddelims{inner}}
%{<inner/outer>}{<cite context>}{<opening delim>}{<closing delim>}
-\def\extblx at declareciteddelim#1#2#3#4{%
+\def\extblx at declareciteddelims#1#2#3#4{%
\csdef{extblx at citedelim@#2@#1 at open}{#3}%
\csdef{extblx at citedelim@#2@#1 at close}{#4}}
%{<context>}
-\newcommand*{\UndeclareOuterCiteDelim}{%
- \extblx at undeclareciteddelim{outer}}
-\newrobustcmd*{\UndeclareInnerCiteDelim}{%
- \extblx at undeclareciteddelim{inner}}
+\newrobustcmd*{\UndeclareOuterCiteDelims}{%
+ \extblx at undeclareciteddelims{outer}}
+\newrobustcmd*{\UndeclareInnerCiteDelims}{%
+ \extblx at undeclareciteddelims{inner}}
%{<inner/outer>}{<cite context>}
-\def\extblx at undeclareciteddelim#1#2{%
+\def\extblx at undeclareciteddelims#1#2{%
\csundef{extblx at citedelim@#2@#1 at open}%
\csundef{extblx at citedelim@#2@#1 at close}}
%{<alias>}{<cite context>}
-\newcommand*{\DeclareOuterCiteDelimAlias}{%
+\newrobustcmd*{\DeclareOuterCiteDelimsAlias}{%
\@ifstar
- {\extblx at declareciteddelim@alias at i{outer}}
- {\extblx at declareciteddelim@alias{outer}}}
-\newcommand*{\DeclareInnerCiteDelimAlias}{%
+ {\extblx at declareciteddelims@alias at i{outer}}
+ {\extblx at declareciteddelims@alias{outer}}}
+\newrobustcmd*{\DeclareInnerCiteDelimsAlias}{%
\@ifstar
- {\extblx at declareciteddelim@alias at i{inner}}
- {\extblx at declareciteddelim@alias{inner}}}
+ {\extblx at declareciteddelims@alias at i{inner}}
+ {\extblx at declareciteddelims@alias{inner}}}
%{<inner/outer>}{<alias>}{<cite context>}
-\def\extblx at declareciteddelim@alias#1#2#3{%
+\def\extblx at declareciteddelims@alias#1#2#3{%
\csdef{extblx at citedelim@#2@#1 at open}{\csuse{extblx at citedelim@#3@#1 at open}}%
\csdef{extblx at citedelim@#2@#1 at close}{\csuse{extblx at citedelim@#3@#1 at close}}}
-\def\extblx at declareciteddelim@alias at i#1#2#3{%
+\def\extblx at declareciteddelims@alias at i#1#2#3{%
\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 \mk...delim commands
-\newrobustcmd*{\extblx at create@mkcitedelim}[2]{%
- \protected\csdef{mk#1#2delim}##1{%
+\newrobustcmd*{\RegisterCiteDelims}[2]{%
+ \ifcsundef{mk#1#2delims}
+ {}
+ {\extblx at error
+ {Command \expandafter\string\csname mk#1#2delims\endcsname\space
+ already defined}
+ {biblatex-ext needs to define this command for the citation delimiter
+ feature,\MessageBreak
+ but \expandafter\string\csname mk#1#2delims\endcsname\space
+ is already defined.\MessageBreak
+ I don't want to overwrite the existing definition to avoid breaking
+ your document.\MessageBreak
+ If you force compilation despite the error, the command will be
+ overwritten\MessageBreak
+ with potentially catastrophic consequences}}%
+ \protected\csdef{mk#1#2delims}##1{%
\begingroup
\blx at blxinit
\blx at setsfcodes
@@ -63,16 +82,16 @@
\csuse{extblx at citedelim@#2@#1 at close}%
\endgroup}}
-\extblx at create@mkcitedelim{outer}{cite}
-\extblx at create@mkcitedelim{outer}{parencite}
-\extblx at create@mkcitedelim{outer}{textcite}
-\extblx at create@mkcitedelim{outer}{bibinxrefcite}
+\RegisterCiteDelims{outer}{cite}
+\RegisterCiteDelims{outer}{parencite}
+\RegisterCiteDelims{outer}{textcite}
-\extblx at create@mkcitedelim{inner}{cite}
-\extblx at create@mkcitedelim{inner}{parencite}
-\extblx at create@mkcitedelim{inner}{textcite}
-\extblx at create@mkcitedelim{inner}{footcite}
+\RegisterCiteDelims{inner}{cite}
+\RegisterCiteDelims{inner}{parencite}
+\RegisterCiteDelims{inner}{textcite}
+\RegisterCiteDelims{inner}{footcite}
+
% smartcite is special
% According to the docs it is like \parencite in a footnote and \footcite in
% the body.
@@ -82,7 +101,7 @@
% with \mkbibfootnote from the body), so we need to do it earlier.
\newrobustcmd*{\mksmartcite}[1]{%
\iffootnote
- {\mkouterparencitedelim{%
+ {\mkouterparencitedelims{%
\def\extblx at thisdelimcontext{parencite}%
#1}}
{\mkbibfootnote{%
@@ -89,6 +108,84 @@
\def\extblx at thisdelimcontext{footcite}%
#1}}}
+% Legacy names
+
+% compability for versions < 0.3
+\def\extblx at deprecate@delimcommand at robust#1{%
+ \protected\csedef{#1}{%
+ \noexpand\extblx at warning{%
+ \expandafter\string\csname#1\endcsname\space is deprecated.
+ \MessageBreak
+ Use \expandafter\string\csname#1s\endcsname\space (with s) instead.
+ \MessageBreak
+ Using \expandafter\string\csname#1s\endcsname\space}%
+ \expandonce{\csname#1s\endcsname}}}
+
+\extblx at deprecate@delimcommand at robust{DeclareOuterCiteDelim}
+\extblx at deprecate@delimcommand at robust{DeclareInnerCiteDelim}
+\extblx at deprecate@delimcommand at robust{UndeclareOuterCiteDelim}
+\extblx at deprecate@delimcommand at robust{UndeclareInnerCiteDelim}
+\extblx at deprecate@delimcommand at robust{DeclareOuterCiteDelimAlias}
+\extblx at deprecate@delimcommand at robust{DeclareInnerCiteDelimAlias}
+
+\newrobustcmd*{\extblx at create@mkcitedelim}{%
+ \extblx at warning{%
+ \string\extblx at create@mkcitedelim\space is deprecated.\MessageBreak
+ Use \string\RegisterCiteDelims\space instead.\MessageBreak
+ Using \string\RegisterCiteDelims\MessageBreak}
+ \RegisterCiteDelims}
+
+% Some very rudimentary backwards warning code for old names
+% this only warns, it can't salvage anything
+
+\AtEndDocument{%
+ \ifcsundef{abx at ffd@*@bbx:introcite}
+ {}
+ {\extblx at warning@noline{%
+ Field format 'bbx:introcite' defined.\MessageBreak
+ The format has been renamed to 'bbx at introcite'.\MessageBreak
+ This could mean that you are using the old name\MessageBreak
+ which does not work any more.\MessageBreak
+ Please use 'bbx at introcite' instead}}%
+ \ifcsundef{abx at ffd@*@bbx:introcitelabeldate}
+ {}
+ {\extblx at warning@noline{%
+ Field format 'bbx:introcitelabeldate'\MessageBreak
+ defined.\MessageBreak
+ The format has been renamed to\MessageBreak
+ 'bbx at introcitelabeldate'.\MessageBreak
+ This could mean that you are using the old name\MessageBreak
+ which does not work any more.\MessageBreak
+ Please use\MessageBreak'bbx at introcitelabeldate'\MessageBreak instead}}%
+ \ifcsundef{blx at delimcontextalias@bbx:introcite}
+ {}
+ {\extblx at warning@noline{%
+ Delimiter context 'bbx:introcite' detected.\MessageBreak
+ The context has been renamed to 'bbx at introcite'.\MessageBreak
+ This could mean that you are using the old name\MessageBreak
+ which does not work any more.\MessageBreak
+ Please use 'bbx at introcite' instead}}%
+ \ifcsundef{extblx at citedelim@bbx:introcite at inner@open}
+ {}
+ {\extblx at warning@noline{%
+ Opening inner delimiter 'bbx:introcite' found.\MessageBreak
+ The delimiters have been renamed to\MessageBreak
+ 'bbx at introcite'.\MessageBreak
+ This could mean that you are using the old name\MessageBreak
+ which does not work any more.\MessageBreak
+ Please use 'bbx at introcite' instead}}%
+ \ifcsundef{extblx at citedelim@bbx:introcite at inner@close}
+ {}
+ {\extblx at warning@noline{%
+ Closing inner delimiter 'bbx:introcite' found.\MessageBreak
+ The delimiters have been renamed to\MessageBreak
+ 'bbx at introcite'.\MessageBreak
+ This could mean that you are using the old name\MessageBreak
+ which does not work any more.\MessageBreak
+ Please use 'bbx at introcite' instead}}%
+}
+
+
\endinput
%
% This file is part of the biblatex-ext bundle.
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2018/06/04 v0.3 common files for extended biblatex
+ [2018/06/10 v0.4 common files for extended biblatex
dashed bibliography styles (MW)]
% \DeclareBibliographyOption checks if an option is already defined.
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2018/06/04 v0.3 extended biblatex numeric-comp
+ [2018/06/10 v0.4 extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2018/06/04 v0.3 extended biblatex numeric-comp citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex numeric-comp citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{numeric-comp}
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
\renewbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx at lasthash}
@@ -16,7 +16,7 @@
{\usebibmacro{cite:comp}}
{\usebibmacro{cite:dump}%
\ifbool{cbx:parens}
- {\printtext{\csuse{extblx at citedelim@textcite at inner@close}}%
+ {\printtext{\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}%
\global\boolfalse{cbx:parens}}
{}%
\iffirstcitekey
@@ -27,7 +27,7 @@
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
\setunit*{\printdelim{namelabeldelim}}%
- \printtext{\csuse{extblx at citedelim@textcite at inner@open}}%
+ \printtext{\csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\global\booltrue{cbx:parens}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
@@ -36,7 +36,7 @@
\stepcounter{textcitecount}%
\savefield{namehash}{\cbx at lasthash}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -45,7 +45,7 @@
{\usebibmacro{cite:dump}%
\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -79,7 +79,7 @@
{}
{\usebibmacro{cite:dump}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -87,21 +87,21 @@
{\usebibmacro{cite:dump}%
\usebibmacro{postnote}%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}%
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2018/06/04 v0.3 extended biblatex numeric-verb
+ [2018/06/10 v0.4 extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2018/06/04 v0.3 extended biblatex numeric-verb citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex numeric-verb citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{numeric-verb}
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
\renewbibmacro*{textcite}{%
\ifnameundef{labelname}
@@ -35,7 +35,7 @@
{\usebibmacro{postnote}%
\csuse{extblx at citedelim@cite at outer@close}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -51,7 +51,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\textcite}[\mkoutertextcitedelims]
{}
{\usebibmacro{citeindex}%
\iffirstcitekey
@@ -59,15 +59,15 @@
{\stepcounter{textcitetotal}%
\textcitedelim}%
\usebibmacro{textcite}}
- {\csuse{extblx at citedelim@textcite at inner@close}}
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
{\usebibmacro{postnote}%
- \csuse{extblx at citedelim@textcite at inner@close}}
+ \csuse{extblx at citedelim@\blx at delimcontext @inner at close}}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelim]{\textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\mkoutertextcitedelims]{\textcite}{}
\endinput
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2018/06/04 v0.3 extended biblatex numeric bibliography style (MW)]
+ [2018/06/10 v0.4 extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-numeric.cbx}
- [2018/06/04 v0.3 extended biblatex numeric citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex numeric citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{numeric}
-\DeclareOuterCiteDelim{cite}{\bibopenbracket}{\bibclosebracket}
-\DeclareOuterCiteDelimAlias{parencite}{cite}
-\DeclareOuterCiteDelim{textcite}{}{}
+\DeclareOuterCiteDelims{cite}{\bibopenbracket}{\bibclosebracket}
+\DeclareOuterCiteDelimsAlias{parencite}{cite}
+\DeclareOuterCiteDelims{textcite}{}{}
-\DeclareInnerCiteDelim{textcite}{\bibopenbracket}{\bibclosebracket}
+\DeclareInnerCiteDelims{textcite}{\bibopenbracket}{\bibclosebracket}
\renewbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx at lasthash}
@@ -18,7 +18,7 @@
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
\setunit*{\printdelim{namelabeldelim}}%
- \printtext{\csuse{extblx at citedelim@textcite at inner@open}}%
+ \printtext{\csuse{extblx at citedelim@\blx at delimcontext @inner at open}}%
\global\booltrue{cbx:parens}%
\stepcounter{textcitecount}%
\savefield{namehash}{\cbx at lasthash}}%
@@ -28,7 +28,7 @@
\usebibmacro{cite}%
\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}
@@ -39,17 +39,17 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}}}
{\setunit{%
\ifbool{cbx:parens}
- {\csuse{extblx at citedelim@textcite at inner@close}%
+ {\csuse{extblx at citedelim@\blx at delimcontext @inner at close}%
\global\boolfalse{cbx:parens}}
{}%
\textcitedelim}}}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -56,7 +56,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -72,7 +72,7 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
@@ -79,12 +79,12 @@
{}
{\usebibmacro{textcite:postnote}}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,9 +1,9 @@
-% biblatex-ext v0.3 (2018-06-04)
+% biblatex-ext v0.4 (2018-06-10)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2018/06/04 v0.3 extended biblatex standard style (MW)]
+ [2018/06/10 v0.4 extended biblatex standard style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
@@ -11,7 +11,7 @@
\providecommand*{\mkibid}[1]{#1}
-\newtoggle{bbx:citeinxref}
+\newtoggle{bbx:citexref}
\newtoggle{bbx:innamebeforetitle}
\newtoggle{bbx:innameidem}
\newtoggle{bbx:articlein}
@@ -18,8 +18,13 @@
\newtoggle{bbx:maintitleaftertitle}
\newtoggle{bbx:introcite:plain:keeprelated}
+\DeclareBibliographyOption[boolean]{citexref}[true]{%
+ \settoggle{bbx:citexref}{#1}}
\DeclareBibliographyOption[boolean]{citeinxref}[true]{%
- \settoggle{bbx:citeinxref}{#1}}
+ \blx at warning{The option 'citeinxref' is deprecated.\MessageBreak
+ Use 'citexref' (without in) instead.\MessageBreak
+ Setting 'citexref' now}%
+ \settoggle{bbx:citexref}{#1}}
\DeclareBibliographyOption[boolean]{innamebeforetitle}[true]{%
\settoggle{bbx:innamebeforetitle}{#1}}
\DeclareBibliographyOption[boolean]{innameidem}[true]{%
@@ -41,7 +46,7 @@
\def\extblx at opt@introcite at plain{2}
\ExecuteBibliographyOptions{%
- citeinxref = false,
+ citexref = false,
innamebeforetitle = false,
innameidem = false,
articlein = true,
@@ -50,8 +55,13 @@
% maxbibnames = 999,
}
+\DeclareTypeOption[boolean]{citexref}[true]{%
+ \settoggle{bbx:citexref}{#1}}
\DeclareTypeOption[boolean]{citeinxref}[true]{%
- \settoggle{bbx:citeinxref}{#1}}
+ \blx at warning{The option 'citeinxref' is deprecated.\MessageBreak
+ Use 'citexref' (without in) instead.\MessageBreak
+ Setting 'citexref' now}%
+ \settoggle{bbx:citexref}{#1}}
\DeclareTypeOption[boolean]{innamebeforetitle}[true]{%
\settoggle{bbx:innamebeforetitle}{#1}}
\DeclareTypeOption[boolean]{innameidem}[true]{%
@@ -61,8 +71,13 @@
\DeclareTypeOption[boolean]{maintitleaftertitle}[true]{%
\settoggle{bbx:maintitleaftertitle}{#1}}
+\DeclareEntryOption[boolean]{citexref}[true]{%
+ \settoggle{bbx:citexref}{#1}}
\DeclareEntryOption[boolean]{citeinxref}[true]{%
- \settoggle{bbx:citeinxref}{#1}}
+ \blx at warning{The option 'citeinxref' is deprecated.\MessageBreak
+ Use 'citexref' (without in) instead.\MessageBreak
+ Setting 'citexref' now}%
+ \settoggle{bbx:citexref}{#1}}
\DeclareEntryOption[boolean]{innamebeforetitle}[true]{%
\settoggle{bbx:innamebeforetitle}{#1}}
\DeclareEntryOption[boolean]{innameidem}[true]{%
@@ -75,9 +90,9 @@
\newbibmacro*{bbx:introcite}{\usebibmacro{cite}}
-\extblx at create@mkcitedelim{inner}{bbx:introcite}
-\DeclareInnerCiteDelimAlias{bbx:introcite}{cite}
-\DeclareFieldFormat{bbx:introcite}{#1}
+\RegisterCiteDelims{inner}{bbx at introcite}
+\DeclareInnerCiteDelimsAlias{bbx at introcite}{cite}
+\DeclareFieldFormat{bbx at introcite}{#1}
\newcommand*{\introcitepunct}{\addcolon\space}
\newcommand*{\introcitebreak}{\leavevmode\newline}
@@ -93,7 +108,7 @@
{}
{\togglefalse{blx at bibliography}%
\toggletrue{blx at citation}}%
- \delimcontext{bbx:introcite}%
+ \delimcontext{bbx at introcite}%
\csuse{blx at hook@cite}%
\csuse{blx at hook@citekey}%
\DeclareFieldFormat{bibhyperref}{##1}%
@@ -101,7 +116,7 @@
\undef\cbx at lastyear
\citetrackerfalse\pagetrackerfalse\backtrackerfalse
\defcounter{maxnames}{\blx at maxcitenames}%
- \printtext[bbx:introcite]{\usebibmacro{bbx:introcite}}%
+ \printtext[bbx at introcite]{\usebibmacro{bbx:introcite}}%
\endgroup
}
@@ -119,27 +134,30 @@
{}}
-\newbibmacro*{bbx:cite:inxref}{\usebibmacro{cite}}
+\newbibmacro*{bbx:inxrefcite}{\usebibmacro{cite}}
-\DeclareCiteCommand{\bbx at cite@inxref}[\mkouterbibinxrefcitedelim]
+\DeclareCiteCommand{\bbx at xrefcite}[\mkouterbbx at xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\boolfalse{backtracker}}
- {\usebibmacro{bbx:cite:inxref}}
+ {\usebibmacro{bbx:inxrefcite}}
{}
{}
-\DeclareDelimcontextAlias{bbx at cite@inxref}{cite}
-\DeclareOuterCiteDelimAlias{bibinxrefcite}{cite}
+\RegisterCiteDelims{outer}{bbx at xrefcite}
+\DeclareOuterCiteDelimsAlias{bbx at xrefcite}{cite}
+\RegisterCiteDelims{inner}{bbx at xrefcite}
+\DeclareInnerCiteDelimsAlias{bbx at xrefcite}{cite}
+\DeclareDelimcontextAlias{bbx at xrefcite}{cite}
\newbibmacro*{crosscite}[1]{%
- \iftoggle{bbx:citeinxref}
+ \iftoggle{bbx:citexref}
{\iffieldundef{crossref}
{\iffieldundef{xref}
{\usebibmacro{#1}}
- {\printtext{\bbx at cite@inxref{\thefield{xref}}}}}
- {\printtext{\bbx at cite@inxref{\thefield{crossref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx at xrefcite{\thefield{crossref}}}}}
{\usebibmacro{#1}}}
\DeclareDelimAlias{innametitledelim}{nametitledelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-ibid
+ [2018/06/10 v0.4 extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-ibid citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-ibid citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-ibid}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -16,7 +16,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -32,7 +32,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -45,12 +45,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-inote
+ [2018/06/10 v0.4 extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-inote citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-inote citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-inote}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
@@ -18,7 +18,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
@@ -38,7 +38,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -51,12 +51,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-note
+ [2018/06/10 v0.4 extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-note citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-note citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-note}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
@@ -18,7 +18,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\iffootnote
@@ -38,7 +38,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -51,12 +51,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad1
+ [2018/06/10 v0.4 extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad1 citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-trad1 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-trad1}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -16,7 +16,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -32,7 +32,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -45,12 +45,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad2
+ [2018/06/10 v0.4 extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad2 citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-trad2 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-trad2}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -16,7 +16,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -32,7 +32,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -45,12 +45,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad3
+ [2018/06/10 v0.4 extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
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-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2018/06/04 v0.3 extended biblatex verbose-trad3 citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose-trad3 citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose-trad3}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -16,7 +16,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -32,7 +32,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -45,12 +45,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2018/06/04 v0.3 extended biblatex verbose
+ [2018/06/10 v0.4 extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx 2018-06-10 06:12:41 UTC (rev 47973)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx 2018-06-10 20:49:25 UTC (rev 47974)
@@ -1,15 +1,15 @@
\ProvidesFile{ext-verbose.cbx}
- [2018/06/04 v0.3 extended biblatex verbose citation style (MW)]
+ [2018/06/10 v0.4 extended biblatex verbose citation style (MW)]
\blx at inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
\RequireCitationStyle{verbose}
-\DeclareOuterCiteDelim{parencite}{\bibopenparen}{\bibcloseparen}
+\DeclareOuterCiteDelims{parencite}{\bibopenparen}{\bibcloseparen}
-\DeclareInnerCiteDelim{textcite}{\bibopenparen}{\bibcloseparen}
+\DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen}
-\DeclareCiteCommand{\cite}[\mkoutercitedelim]
+\DeclareCiteCommand{\cite}[\mkoutercitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -16,7 +16,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\parencite}[\mkouterparencitedelim]
+\DeclareCiteCommand{\parencite}[\mkouterparencitedelims]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -32,7 +32,7 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelim]
+\DeclareCiteCommand{\cbx at textcite}[\mkoutertextcitedelims]
{\usebibmacro{textcite:init}}
{\iffieldequals{namehash}{\cbx at lasthash}
{}
@@ -45,12 +45,12 @@
{}
{}
-\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelim]
+\DeclareMultiCiteCommand{\cbx at textcites}[\mkoutertextcitedelims]
{\cbx at textcite}{}
-\DeclareMultiCiteCommand{\cites}[\mkoutercitedelim]
+\DeclareMultiCiteCommand{\cites}[\mkoutercitedelims]
{\cite}{\multicitedelim}
-\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelim]
+\DeclareMultiCiteCommand{\parencites}[\mkouterparencitedelims]
{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
More information about the tex-live-commits
mailing list