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 | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 49cb6e1bc2b..3974c535386 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.bbx}[2012/07/01\space v5.0\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2012/07/01\space v5.2\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -202,7 +202,12 @@ } } -\DeclareLabelyear{pubstate,year,eventyear,origyear,urlyear} +% Don't fall back on other year fields if there is no year, use +% "nodate" string +\DeclareLabelyear{% + \field{pubstate} + \field{year} +} % 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 @@ -393,9 +398,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 6.28) Use "(n.d.)." for references with no year. This depends -% on the noyear macros and strings from apa.cbx +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.28) Use "nodate" bibstring for references with no year % Months and days go into parenthesis with year, if set % (APA 6.29) Issue goes where month normally goes if it % is set. @@ -437,10 +441,14 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \biblcstring{nodate}} + \bibstring{nodate}% + \iffieldundef{extrayear} + {\setunit{\relax}} + {\setunit{\apashortdash}}% + \printfield{extrayear}} % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.29) General format of titles. @@ -915,6 +923,16 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Location only shows first item + +\DeclareListFormat{default}{% + \usebibmacro{list:delim}{#1}% + #1\isdot} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.30) Periodicals emph number, location % and pages (with no prefix) @@ -969,7 +987,7 @@ \DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}} \DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}} -\renewbibmacro*{reviewauthor}{% +\newbibmacro*{reviewauthor}{% \ifnameundef{author} {\booltrue{bbx:noreviewauthor}} {\usebibmacro{author}}} @@ -1928,8 +1946,9 @@ {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} +% APA 6th \newbibmacro*{location+publisher}{% - \printlist{location}% + \printlist[default][1-1]{location}% \setunit*{\addcolon\space}% \printlist{publisher}% \newunit} |