summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-22 22:53:46 +0000
committerKarl Berry <karl@freefriends.org>2017-09-22 22:53:46 +0000
commit1955f37bc0ea94dd3c82c5fb8b7b7a3473dab9fd (patch)
tree1b601c827f3762802c47397d63b00115328b13c0 /Master/texmf-dist/tex
parent2d60c50b1c92322f75ced8943e1274b706d8cfc7 (diff)
biblatex-source-division (22sep17)
git-svn-id: svn://tug.org/texlive/trunk@45379 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-source-division/biblatex-source-division.sty34
1 files changed, 19 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-source-division/biblatex-source-division.sty b/Master/texmf-dist/tex/latex/biblatex-source-division/biblatex-source-division.sty
index 25a5ba5b30d..938b3403d6a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-source-division/biblatex-source-division.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-source-division/biblatex-source-division.sty
@@ -15,7 +15,7 @@
% This work consists of the file biblatex-source-division.sty
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{biblatex-source-division}[2016/07/09 v2.4.1 source division for biblatex]
+\ProvidesPackage{biblatex-source-division}[2017/09/21 v2.4.2 source division for biblatex]
\RequirePackage{xpatch}
% The options
@@ -41,14 +41,18 @@
% Get source division, put in in titladdon field, and delete source division from the postnote field
\newbibmacro{getsourcedivision}{%
\iffieldundef{postnote}{}{%
- \global\undef\volpostnote%
+ \global\undef\blxsd@volpostnote%
\usefield{\getsourcedivision@}{postnote}%
- \ifboolexpr{test {\iffieldundef{maintitle}} or test{\ifdefstring{\biblatexsourcedivision@after}{title}}}%
- {\restorefield{titleaddon}{\titleaddon}}
- {\restorefield{maintitleaddon}{\titleaddon}}%
- \ifdefempty{\postnote}%
+ \ifdefempty{\blxsd@titleaddon}%
+ {}%
+ {%
+ \ifboolexpr{test {\iffieldundef{maintitle}} or test{\ifdefstring{\biblatexsourcedivision@after}{title}}}%
+ {\restorefield{titleaddon}{\blxsd@titleaddon}}
+ {\restorefield{maintitleaddon}{\blxsd@titleaddon}}%
+ }%
+ \ifdefempty{\blxsd@postnote}%
{\clearfield{postnote}}%
- {\restorefield{postnote}{\postnote}}%
+ {\restorefield{postnote}{\blxsd@postnote}}%
}%
}
@@ -65,25 +69,25 @@
%% Put the source division and "true" postnote in macro
\def\getsourcedivision@ii(#1)#2++{%
- \ifdefmacro{\volpostnote}{%
- \gdef\titleaddon{#1}%
- \gdef\postnote{{\volvol}{#2}}%
+ \ifdefmacro{\blxsd@volpostnote}{%
+ \gdef\blxsd@titleaddon{#1}%
+ \gdef\blxsd@postnote{{\volvol}{#2}}%
}{%
\iftoggle{volcite}{%
\volgetsourcedivision@#2%
}%
{%
- \gdef\titleaddon{#1}%
- \gdef\postnote{#2}%
+ \gdef\blxsd@titleaddon{#1}%
+ \gdef\blxsd@postnote{#2}%
}%
}%
}
\newrobustcmd*{\volgetsourcedivision@}[2]{%
- \gdef\volpostnote{#2}%
+ \gdef\blxsd@volpostnote{#2}%
\gdef\volvol{#1}%
- \ifdefempty{\volpostnote}%
+ \ifdefempty{\blxsd@volpostnote}%
{\clearfield{volpostnote}}%
- {\restorefield{volpostnote}{\volpostnote}}%
+ {\restorefield{volpostnote}{\blxsd@volpostnote}}%
\usefield{\getsourcedivision@}{volpostnote}%
}