summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx57
1 files changed, 37 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index ac5e9c37500..4e52667c1f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -1,4 +1,4 @@
-%% Copyright 2013 Philip Kime
+%% Copyright 2016 Philip Kime
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2015/01/23\space v6.7\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2016/03/01\space v6.8\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -360,13 +360,24 @@
\DeclareNameAlias{default}{apaauthor}
\DeclareNameFormat{apaauthor}{%
+ \nameparts{#1}%
\ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
{\addcomma\addspace\ldots\addspace}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
{\iffieldequalstr{doubtfulauthor}{true}
- {\mkbibbrackets{\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}?}}
- {\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}}}}%
+ {\mkbibbrackets{\usebibmacro{name:apa:family-given}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}?}}
+ {\usebibmacro{name:apa:family-given}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
{\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
@@ -631,11 +642,17 @@
% (APA 7.02 Example 27) ... unless there is no author
\DeclareNameFormat{apanames}{%
+ \nameparts{#1}%
\ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
{\addcomma\addspace\ldots}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\usebibmacro{name:apa:first-last}{#1}{#3}{#4}{#5}{#7}}}%
+ {\usebibmacro{name:apa:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
{\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
@@ -676,53 +693,53 @@
% #4 = name prefix, a.k.a. 'von part'
% #5 = name affix, a.k.a. 'junior part'
-\newbibmacro*{name:apa:last-first}[5]{%
+\newbibmacro*{name:apa:family-given}[5]{%
\ifuseprefix
{\usebibmacro{name:delim}{#4#1}%
\usebibmacro{name:hook}{#4#1}%
- \ifblank{#4}{}{%
+ \ifempty{#4}{}{%
\mkbibnameprefix{#4}%
\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamelast{#1\isdot}%
- \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifempty{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}}%
- \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}
+ \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
\mkbibnamelast{#1}\isdot
- \ifblank{#2#4}{}{\addcomma}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}%
+ \ifempty{#2#4}{}{\addcomma}%
+ \ifempty{#2}{}{\addlowpenspace\mkbibnamefirst{#3}%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}}%
- \ifblank{#4}{}{%
+ \ifempty{#4}{}{%
\addhighpenspace\mkbibnameprefix{#4}%
\ifpunctmark{'}{}{\addhighpenspace}}%
- \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
+ \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
-\newbibmacro*{name:apa:first-last}[5]{%
+\newbibmacro*{name:apa:given-family}[5]{%
\ifuseprefix
{\usebibmacro{name:delim}{#2}%
\usebibmacro{name:hook}{#2}%
- \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot%
+ \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}\addspace}%
- \ifblank{#4}{}{%
+ \ifempty{#4}{}{%
\mkbibnameprefix{#4\isdot}%
\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamelast{#1\isdot}%
- \ifblank{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}}
+ \ifempty{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot%
+ \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot%
\ifthenelse{\value{uniquename}>1}
{\addspace\mkbibbrackets{#2}}
{}\addspace}%
\mkbibnamelast{#1}\isdot
- \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
+ \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2055,7 +2072,7 @@
\DeclareFieldFormat{doi}{%
doi\addcolon
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+ {\href{https://dx.doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}}
% APA 6th