From 736bbc10d656b425590e7a4453c288fcd3fc77d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Sep 2016 22:21:25 +0000 Subject: biblatex-apa (14sep16) git-svn-id: svn://tug.org/texlive/trunk@42064 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx') diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 220709a82ff..ce17e03dff2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.cbx}[2016/05/13\space v6.9\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2016/07/01\space v7.0\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -322,14 +322,19 @@ \savefield{fullhash}{\cbx@lasthash}}}} \newbibmacro*{cite:plabelyear+extrayear}{% - \iffieldundef{labelyear} - {} + \iffieldundef{labelyear}{} {\printtext[bibhyperref]{% - \printfield[noformat]{origyear}\setunit*{\addslash}% - \printfield{labelyear}\printfield{extrayear}}}% - \iffieldundef{issue} - {} - {\addcomma\addspace\printfield{issue}}} + \iffieldundef{origyear}{} + {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} } + {\mkbibbrackets{\printorigdate}} + {\printorigdate}% + \setunit*{\addslash}}% + \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} } + {\mkbibbrackets{\printlabeldateextra}} + {\printlabeldateextra}}}% + \iffieldundef{issue} + {} + {\addcomma\addspace\printfield{issue}}} \newbibmacro*{cite:shorthand}{% \ifciteseen -- cgit v1.2.3