diff options
3 files changed, 26 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.pdf b/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.pdf Binary files differindex 1d5ee3535f1..b41d9d0af33 100644 --- a/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.tex b/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.tex index c480c4e913f..f2a96a0b88c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.tex +++ b/Master/texmf-dist/doc/latex/biblatex-source-division/biblatex-source-division.tex @@ -24,8 +24,8 @@ email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, subtitle={}, - revision={2.4.1}, - date={09/07/2016}, + revision={2.4.2}, + date={21/09/2017}, url={https://github.com/maieul/biblatex-source-division}} % Hyphen \hyphenation{Ma-de-lei-ne} @@ -98,13 +98,17 @@ And we called them with : The division of source is put on the \bibfield{titleaddon} field. However, if a \bibfield{maintitle} field is used and if the \verb+after+ option is not set to \verb+title+, the division source is put on the \bibfield{maintitleaddon} field. -So you can stylize it with all the tools of biblatex. +So you can stylise it with all the tools of biblatex. \section{Revision History} \begin{changelog} +\begin{release}{2.4.2}{2017-09-21} + \item Fix bug with \biblatex option \option{ibidpage} when there is not any source division. + \item Fix potential conflicts with other package. +\end{release} \begin{release}{2.4.1}{2016-06-07} \item Fix bug when using \cs{volcite} command and related. 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}% } |