From fde9f1341f8b60d9193c41e45d1a5a43868f1757 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jan 2012 23:08:57 +0000 Subject: biblatex-apa (23jan12) git-svn-id: svn://tug.org/texlive/trunk@25183 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 54 ++++++++++++------------ 1 file changed, 26 insertions(+), 28 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 6aecd4fdf1f..7b3ac3e965a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -1,4 +1,4 @@ -%% apa.cbx v4.2 +%% apa.cbx v4.3 %% Copyright 2011 Philip Kime %% %% This work may be distributed and/or modified under the @@ -124,7 +124,12 @@ {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% {}% \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1}% first past ul is et al - {\andothersdelim\bibstring{andothers}}% + % but enforce plurality of et al - only truncate here if there is at + % least one more element after the current potential truncation point + % so that "et al" covers at least two elements. + {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}} + {\andothersdelim\bibstring{andothers}} + {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}% {}% \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1}% nothing thereafter {\relax}% @@ -165,14 +170,12 @@ {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}}% % Single cite - {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}} + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} % No author/editor {\usebibmacro{cite:noname}% \setunit{\nameyeardelim}% - \iffieldundef{labelyear} - {\usebibmacro{cite:noyear}} - {\usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}} + \usebibmacro{cite:plabelyear+extrayear}% + \savefield{namehash}{\cbx@lasthash}} % Normal cite {\ifnameundef{shortauthor} {\printnames[labelname][-\value{listtotal}]{labelname}} @@ -180,10 +183,8 @@ {\printnames{shortauthor}} {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% \setunit{\nameyeardelim}% - \iffieldundef{labelyear} - {\usebibmacro{cite:noyear}} - {\usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}}}% + \usebibmacro{cite:plabelyear+extrayear}% + \savefield{namehash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} \newbibmacro*{textcite}{% @@ -192,7 +193,7 @@ {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}} % Single cite - {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}} + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} % No author/editor or patent {\iffieldundef{shorthand}% % Cite using title @@ -222,10 +223,8 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \iffieldundef{labelyear}% - {\usebibmacro{cite:noyear}} % Actual year printing - {\usebibmacro{cite:plabelyear+extrayear}}% + \usebibmacro{cite:plabelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}}}% \setunit{% \ifbool{cbx:parens} @@ -234,20 +233,18 @@ % multicitedelim semi-colon doesn't make much sense for textcites \compcitedelim}} -\newcommand{\apashortdash}{-} - \newbibmacro*{cite:plabelyear+extrayear}{% \iffieldundef{labelyear} - {} - {\printtext[bibhyperref]{% - \printfield[noformat]{origyear}\setunit*{\addslash}% - \printfield{labelyear}% - \iffieldequalstr{labelyear}{in press} - {\iffieldundef{extrayear} - {\setunit{\relax}} - {\setunit{\apashortdash}}% - \printfield{extrayear}} - {\printfield{extrayear}}}}}% + {\usebibmacro{cite:noyear}} + {\ifthenelse{\iffieldequalstr{labelyear}{inpress}\OR\iffieldequalstr{labelyear}{in press}} + {\printtext[bibhyperref]{\bibxstring{inpress}% + \iffieldundef{extrayear} + {} + {\apashortdash}% + \printfield{extrayear}}} + {\printtext[bibhyperref]{% + \printfield[noformat]{origyear}\setunit*{\addslash}% + \printfield{labelyear}\printfield{extrayear}}}}}% \newbibmacro*{cite:shorthand}{% \ifciteseen @@ -278,6 +275,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.22) Fall back to "n.d." for citations without dates % Strings defined in apa.bbx +% (APA 6.16) "in press" for PUBSTATE "inpress" \newbibmacro*{cite:noyear}{% \ifnameundef{shortauthor} @@ -285,7 +283,7 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \printtext[bibhyperref]{\biblcstring{nodate}}} + \printtext[bibhyperref]{\biblcstring{nodate}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- cgit v1.2.3