From 8e2a55a7bd017271f6e865ccf545c1c810e75c7d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Jan 2014 22:38:35 +0000 Subject: biblatex-chicago (29jan14) git-svn-id: svn://tug.org/texlive/trunk@32816 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago') diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx index 9b41305c2eb..4f4cc556a58 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.cbx,v 0.9.7.87 2013/10/29 12:32:14 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.95 2014/01/29 11:26:57 dfussner Exp $ % This is a biblatex citation style file, adapted from Lehman's % authortitle-cverb.cbx. It is heavily modified, with the intention % of providing footnote citations and a bibliography formatted % according to the specifications of the Chicago Manual of Style. -\ProvidesFile{chicago-notes.cbx}[2013/10/29 v 2.8 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2014/01/29 v 2.8a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -61,13 +61,13 @@ {\toggletrue{cms@reprint}}% {\togglefalse{cms@reprint}}% \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - test {\iffieldundef{year}} + test {\iffieldundef{year}}% or - not test {\iffieldint{year}} + not test {\iffieldint{year}}% or - togl {cms@switchdates} + togl {cms@switchdates}% }% {}% {\ifboolexpr{% Needed for open-ended ranges @@ -404,7 +404,15 @@ \bibstring[\mkibid]{ibidem}}} {\printtext[cmshyperlink]{% \bibstring[\mkibid]{ibidem}}} - \ifloccit + \ifboolexpr{% + test {\ifloccit}% + or + ( + test {\ifciteibid}% + and + test {\iffieldequalcs{postnote}{cms@pnsaved}}% + ) + }% {\global\toggletrue{cms@loccit}}% {}}} @@ -4059,8 +4067,10 @@ {\usebibmacro{postnote}}} \newbibmacro*{semel:postnote}{% Fix to print postnote only once - \printfield{postnote}% - \global\let\abx@field@postnote\undefined} + \printfield{postnote}% Old form broke \ifloccit + \global\let\cms@pnsaved\abx@field@postnote% + \global\let\abx@field@postnote\undefined% + \AtNextCitekey{\ifciteibid{}{\global\let\cms@pnsaved\undefined}}}% \renewbibmacro*{postnote}{% \iftoggle{cms@fullnote}% -- cgit v1.2.3