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 | 48 |
1 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 43a2f698078..64f9333f3f7 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 2016 Philip Kime +%% Copyright 2017 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,12 +12,34 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2016/10/24\space v7.2\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2017/01/06\space v7.4\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Automated capitalisation after colons +% (http://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html) +% Copied and adapted from ieee.bbx + +% {<process>} {*} {<text>} +\newcommand*{\bbx@colon@search}[3]{% + \bbx@colon@search@aux#1#2\empty#3: \stop +} +\long\def\bbx@colon@search@aux#1#2#3: #4\stop{% + \expandafter#1\expandafter#2\expandafter{#3}% + \ifblank{#4} + {} + {% + : % + \bbx@colon@search@aux#1#2\empty#4\stop + }% +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Used to join citations/references to % extrayear @@ -459,7 +481,7 @@ \iffieldundef{labelyear} {\iffieldundef{origyear} {} - {\printtext[apadate[{\printorigdate}}}% + {\printtext[apadate]{\printorigdate}}}% {\printtext[apadate]{\printlabeldateextra}}} \DeclareFieldFormat{apadate}{% @@ -474,21 +496,21 @@ % (APA 6.29) General format of titles. % Ugly Chicago-style lowercasing of English titles -\DeclareFieldFormat{apacase}{\MakeSentenceCase*{#1}} +\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}} \DeclareFieldFormat{issuetitle}{#1\isdot} \DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}} -\DeclareFieldFormat{origtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} +\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot} \DeclareFieldFormat[article]{title}{#1\isdot} -\DeclareFieldFormat[article]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[inbook]{title}{#1\isdot} -\DeclareFieldFormat[inbook]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[incollection]{title}{#1\isdot} -\DeclareFieldFormat[incollection]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[inproceedings]{title}{#1\isdot} -\DeclareFieldFormat[inproceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[proceedings]{title}{#1\isdot} -\DeclareFieldFormat[proceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -517,9 +539,9 @@ % (APA 6.29) Additional {main}title information in brackets (using) % {MAIN}TITLEADDON field. Colon after maintitle. -\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} -\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} -\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} \newbibmacro*{bookaddinfo}{% \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}} |