diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 92 |
1 files changed, 42 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 8a6faa23927..120a9eb7bd3 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 2018 Philip Kime +%% Copyright 2019 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.cbx}[2018/04/02\space v7.7\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2019/08/17\space v7.8\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -52,19 +52,19 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{citeyear}} - {} - {\usebibmacro{postnote}% + \usebibmacro{citeyear}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -184,25 +184,16 @@ % SHORTAUTHOR brackets in parencites \DeclareNameFormat{sabrackets}{% - \ifciteseen - {\usebibmacro{labelname:doname}% - {\namepartfamily}% - {\namepartfamilyi}% - {\namepartgiven}% - {\namepartgiveni}% - {\namepartprefix}% - {\namepartprefixi}% - {\namepartsuffix}% - {\namepartsuffixi}} - {\mkbibbrackets{\usebibmacro{labelname:doname}% - {\namepartfamily}% - {\namepartfamilyi}% - {\namepartgiven}% - {\namepartgiveni}% - {\namepartprefix}% - {\namepartprefixi}% - {\namepartsuffix}% - {\namepartsuffixi}}}} + \mkbibbrackets{% + \usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}} \DeclareFieldFormat{shorthand}{\ifciteseen {#1} @@ -386,13 +377,13 @@ {\usebibmacro{citeindex}% \global\booltrue{cbx:np}% \usebibmacro{textcite}% + \usebibmacro{cite:post} \global\boolfalse{cbx:np}}% {} {\iffieldundef{postnote} {} {\printdelim{nameyeardelim}% - \printfield{postnote}}% - \usebibmacro{cite:post}} + \printfield{postnote}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -431,10 +422,10 @@ \global\boolfalse{bbx:editorinauthpos}% \global\boolfalse{bbx:in}% \global\let\blx@related@loop\@empty} - {\thefield{entrytype}}} - {\multicitedelim} - {\usebibmacro{postnote}% + {\thefield{entrytype}}% \usebibmacro{cite:post}} + {\multicitedelim} + {\usebibmacro{postnote}} \DeclareCiteCommand{\fullcitebib} {\list{} @@ -449,10 +440,11 @@ \global\boolfalse{bbx:titleinauthpos}% \global\boolfalse{bbx:editorinauthpos}% \global\boolfalse{bbx:in}} - {\thefield{entrytype}}\finentry} - {\item} - {\endlist + {\thefield{entrytype}}% + \finentry \usebibmacro{cite:post}} + {\item} + {\endlist} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -499,29 +491,29 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{citeyear}} - {} - {\usebibmacro{postnote}% + \usebibmacro{citeyear}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\bibsentence \usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} @@ -529,18 +521,18 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}} - {} - {\usebibmacro{textcite:postnote}% + \usebibmacro{textcite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{textcite:postnote}} \DeclareCiteCommand{\citeauthor} {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite:author}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite:author}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \endinput |