summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx49
1 files changed, 11 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index ae483689653..f3c49e42f49 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 @@
-%% Copyright 2012 Philip Kime
+%% Copyright 2013 Philip Kime
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,13 +25,14 @@
%% biblatex-apa-test-citations.bib (Style examples - citations)
%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.cbx}[2012/12/28\space v5.7\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/03/20\space v5.9\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.16) year postfix is not emphasised or italic
+% (APA 6.16) labelyear postfix is not emphasised or italic
+% Dashes between labelyear and non-numeric year (or pseudo-year)
-\DeclareFieldFormat{extrayear}{\mknumalph{#1}}
+\DeclareFieldFormat{extrayear}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -160,8 +161,6 @@
% (APA 6.16) Multiple same author cites in a compact citation call do not
% need to be repeated but the full years must be repeated with
% their extrayear postfixes
-% "in press" extrayear needs a short dash to join to label
-% (APA 6.28) If no date, use "(n.d.)"
% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
\newbibmacro*{cite:author}{%
@@ -254,16 +253,10 @@
\newbibmacro*{cite:plabelyear+extrayear}{%
\iffieldundef{labelyear}
- {\usebibmacro{cite:noyear}}
- {\ifthenelse{\iffieldequalstr{labelyear}{inpress}\OR\iffieldequalstr{labelyear}{in press}}
- {\printtext[bibhyperref]{\bibxstring{inpress}%
- \iffieldundef{extrayear}
- {}
- {\apashortdash}%
- \printfield{extrayear}}}
- {\printtext[bibhyperref]{%
+ {}
+ {\printtext[bibhyperref]{%
\printfield[noformat]{origyear}\setunit*{\addslash}%
- \printfield{labelyear}\printfield{extrayear}}}}}%
+ \printfield{labelyear}\printfield{extrayear}}}}
\newbibmacro*{cite:shorthand}{%
\ifciteseen
@@ -291,26 +284,6 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.22) Fall back to "nodate" bibstring for citations without dates
-% Strings defined in apa.bbx
-% (APA 6.16) "in press" for PUBSTATE "inpress"
-
-\newbibmacro*{cite:noyear}{%
- \ifnameundef{shortauthor}
- {}
- {\ifciteseen
- {}
- {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
- \printtext[bibhyperref]{\bibstring{nodate}%
- \iffieldundef{extrayear}
- {\setunit{\relax}}
- {\setunit{\apashortdash}}%
- \printfield{extrayear}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.21) No parens round year for cites when the cite is in
% parentheses. Use new command \nptextcite for such cites.
@@ -341,8 +314,7 @@
%
\newbibmacro*{citeyear}{%
\iffieldundef{labelyear}
- {\usebibmacro{cite:noyear}%
- \usebibmacro{cite:init}}
+ {\usebibmacro{cite:init}}
{\iffieldequals{namehash}{\cbx@lasthash}
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extrayear}}
@@ -366,7 +338,8 @@
\global\boolfalse{bbx:volseen}%
\global\boolfalse{bbx:titleinauthpos}%
\global\boolfalse{bbx:editorinauthpos}%
- \global\boolfalse{bbx:in}}
+ \global\boolfalse{bbx:in}%
+ \global\let\blx@related@loop\@empty}
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}