diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 203 |
1 files changed, 131 insertions, 72 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 199b147c21f..0ccedb54c6d 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 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 @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2012/12/28\space v5.7\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2013/03/20\space v5.9\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -191,17 +191,19 @@ % Don't fall back on other year fields if there is no year, use % "nodate" string -\DeclareLabelyear{% +\DeclareLabeldate{% \field{pubstate} - \field{year} + \field{date} + \literal{nodate} } % Due to APA strange requirements like truncation after first cite and % ellipsis from 7th to n-1 in bib, there might be some really strange % edge cases which can't be handled as this needs treating in the style % after biber has finished. Very unlikely though. -\ExecuteBibliographyOptions{labelyear=true,% +\ExecuteBibliographyOptions{labeldate=true,% sorting=apa,% + autocite=inline,% backref=true,% pagetracker=true,% useprefix=true,% @@ -216,6 +218,7 @@ abbreviate=true,% mincrossrefs=999,% date=apalong,% + datelabel=apalong,% origdate=apalong,% urldate=apalong,% eventdate=comp} @@ -404,34 +407,14 @@ \newbibmacro*{labelyear+extrayear}{% \iffieldundef{labelyear} {\iffieldundef{origyear} - {\printtext[parens]{\usebibmacro{noyear}}} + {} {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}% - {\ifthenelse{\iffieldequalstr{labelyear}{inpress}\OR\iffieldequalstr{labelyear}{in press}} - {\printtext[parens]{\biblcstring{inpress}% - \iffieldundef{extrayear} - {\setunit{\relax}} - {\setunit{\apashortdash}}% - \printfield{extrayear}}} - {\printtext[yearorunkyear]{\printdateextra}}}} + {\printtext[yearorunkyear]{\printdateextralabel}}} \DeclareFieldFormat{yearorunkyear}{% \ifthenelse{\iffieldequalstr{doubtfuldate}{true}} {\mkbibbrackets{ca\adddot\addspace#1}} - {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND\iffieldundef{day}} - {\mkbibparens{\usebibmacro{noyear}}} - {\mkbibparens{#1}}}} - -\newbibmacro*{noyear}{% - \ifnameundef{shortauthor} - {} - {\ifciteseen - {} - {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \bibstring{nodate}% - \iffieldundef{extrayear} - {\setunit{\relax}} - {\setunit{\apashortdash}}% - \printfield{extrayear}} + {\mkbibparens{#1}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -462,7 +445,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.01 Example 10) Newspapers have prefix for pages. -\DeclareFieldFormat[newsarticle]{pages}{\mkpageprefix{#1}} +\DeclareFieldFormat[newsarticle]{pages}{% + \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}% + \mkpageprefix{#1}% + \DeclareNumChars{.}} + \DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}} \DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}} \DeclareFieldFormat[newsarticle]{title}{#1} @@ -661,16 +648,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 7.01 Example 20) Even non-numeral pages need prefix - -\NumCheckSetup{\ifcurrentfield{pages} - {\DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}} - {}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.27) Name format. Don't capitalise prefixes % (APA 6.27) Full name disambiguation using brackets @@ -681,7 +658,7 @@ % #4 = name prefix, a.k.a. 'von part' % #5 = name affix, a.k.a. 'junior part' -\renewbibmacro*{name:apa:last-first}[5]{% +\newbibmacro*{name:apa:last-first}[5]{% \ifuseprefix {\usebibmacro{name:delim}{#4#1}% \usebibmacro{name:hook}{#4#1}% @@ -706,7 +683,7 @@ \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}% \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} -\renewbibmacro*{name:apa:first-last}[5]{% +\newbibmacro*{name:apa:first-last}[5]{% \ifuseprefix {\usebibmacro{name:delim}{#2}% \usebibmacro{name:hook}{#2}% @@ -1220,7 +1197,7 @@ \DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}} \DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}} -\newbibmacro*{related:reprintfrom}[1]{% +\renewbibmacro*{related:reprintfrom}[1]{% \entrydata*{#1}{% \printtext{\mkbibemph{\printfield[apacase]{title}}}% \setunit{\bibpagespunct}% @@ -1230,7 +1207,9 @@ \printnames[apanames][-\value{listtotal}]{editor}% \printnames[apanames][-\value{listtotal}]{author}% \setunit{\addcomma\addspace}% - \usebibmacro{location+publisher}}} + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{related}}} \newbibmacro*{related:reviewof}[1]{% \setunit{}% Sanitize this in case no author @@ -1244,7 +1223,9 @@ \printnames[apanames][-\value{listtotal}]{producer}% \printnames[apanames][-\value{listtotal}]{director}% \setunit{\addcomma\addspace}% - \printdateextra}} + \printdateextra + \newunit\newblock + \usebibmacro{related}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1269,7 +1250,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:finpunct}% \usebibmacro{apa:pageref}% \usebibmacro{finentry}} @@ -1293,7 +1277,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:finpunct}% \usebibmacro{apa:pageref}% \usebibmacro{finentry}} @@ -1313,13 +1300,16 @@ \newunit\newblock \usebibmacro{location+publisher}% \newunit\newblock - \usebibmacro{origyear}% - \newunit\newblock \usebibmacro{doi+eprint+url}% + \setunit*{\addspace}\newblock + \usebibmacro{origyear}% \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1343,7 +1333,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1373,7 +1366,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1397,7 +1393,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1427,7 +1426,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1457,7 +1459,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1495,7 +1500,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1525,7 +1533,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1554,7 +1565,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1579,7 +1593,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1605,7 +1622,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1628,7 +1648,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1648,7 +1671,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1660,7 +1686,10 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \newunit\newblock \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}% \newunit\newblock @@ -1702,7 +1731,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1728,7 +1760,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1752,7 +1787,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1776,7 +1814,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1802,7 +1843,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1828,7 +1872,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1852,7 +1899,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1869,7 +1919,10 @@ \usebibmacro{location+publisher}% \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1886,7 +1939,10 @@ \usebibmacro{doi+eprint+url}% \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1910,7 +1966,10 @@ \newunit\newblock \printfield{addendum}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct} \usebibmacro{finentry}} |