summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-11 23:24:58 +0000
committerKarl Berry <karl@freefriends.org>2013-07-11 23:24:58 +0000
commitb566914cb449cd85779f6346019604feb6c1a09f (patch)
treed035f6fcce2869d6b8cab3bd15b83aafd5149bac /Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
parentcd19244f37a468b37244a760a0025106e326c9d3 (diff)
biblatex-apa (11jul13)
git-svn-id: svn://tug.org/texlive/trunk@31164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx26
1 files changed, 12 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 0ccedb54c6d..7e1c9bd9b1f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2013/03/20\space v5.9\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/07/09\space v6.0\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -362,8 +362,8 @@
\ifnameundef{with}
{}
{\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
- \printnames[apaauthor][-\value{listtotal}]{with}}
- \setunit*{\addspace}}}%
+ \printnames[apaauthor][-\value{listtotal}]{with}}
+ \setunit*{\addspace}}}%
\newunit\newblock%
\usebibmacro{labelyear+extrayear}}
@@ -663,7 +663,7 @@
{\usebibmacro{name:delim}{#4#1}%
\usebibmacro{name:hook}{#4#1}%
\ifblank{#4}{}{%
- \mkbibnameprefix{#4\isdot}%
+ \mkbibnameprefix{#4}%
\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamelast{#1\isdot}%
\ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot%
@@ -675,12 +675,13 @@
\usebibmacro{name:hook}{#1}%
\mkbibnamelast{#1}\isdot
\ifblank{#2#4}{}{\addcomma}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}}%
- \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}%
+ \ifblank{#4}{}{%
+ \addhighpenspace\mkbibnameprefix{#4}%
+ \ifpunctmark{'}{}{\addhighpenspace}}%
\ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
\newbibmacro*{name:apa:first-last}[5]{%
@@ -695,17 +696,14 @@
\mkbibnameprefix{#4\isdot}%
\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamelast{#1\isdot}%
- \ifblank{#5}{}{\mkbibnameaffix{#5}\isdot}}
+ \ifblank{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}\addspace}%
\mkbibnamelast{#1}\isdot
- \ifblank{#2#4}{}{\addcomma}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}%
\ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
%
@@ -977,7 +975,7 @@
% (APA 7.06) Reviews
% The title of the review depends on the entrytype of the thing reviewed
-\DeclareFieldFormat[review]{title}{
+\DeclareFieldFormat[review]{title}{%
\entrydata*{\thefield{related}}{%
\iffieldequalstr{entrytype}{article}
{\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
@@ -1383,7 +1381,7 @@
\newunit\newblock
\usebibmacro{location+publisher}%
\setunit{\addcomma\addspace}%
- \printtext{\printfield{number}}%
+ \printfield{number}%
\newunit\newblock
\printfield{series}%
\newunit\newblock