summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-24 23:43:33 +0000
committerKarl Berry <karl@freefriends.org>2010-10-24 23:43:33 +0000
commit65cd4524ac65f0d15f8a509678773836c6d312a1 (patch)
tree83e93a91ec1d1101a62b233bb6f47dbdeec2426a /Master/texmf-dist/tex
parentc6d93700abb2fcedf57a97a32e13ceb0822330a7 (diff)
biblatex-apa (21oct10)
git-svn-id: svn://tug.org/texlive/trunk@20181 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx86
1 files changed, 37 insertions, 49 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index c75b5faf5a3..d99360ea55d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -29,6 +29,14 @@
\RequireBibliographyStyle{standard}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Allow variable max authors/editors limit
+
+\newcommand{\maxprtauth}{7}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.22) Force roman numerals into arabic
% using etoolbox macros
@@ -132,6 +140,23 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.09 Example 62) ERIC
+% eprint references
+
+\DeclareFieldFormat{eprint:eric}{%
+ \iffieldequalstr{userb}{urlisabstract}
+ {\printtext{\bibcpstring{abstract}}\addspace%
+ \printtext{\bibstring{retrieved}}}
+ {\printtext{\bibcpstring{retrieved}}}%
+ \setunit{\addspace}%
+ \printtext{\bibstring{from}}\addspace%
+ ERIC\addspace database\addspace%
+ \mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.12) Five author max before "et al" and a one author truncation
@@ -242,9 +267,9 @@
% (APA 7.10 Example 67) Unknown names and dates
\DeclareNameFormat{apaauthor}{%
- \ifthenelse{\value{listcount}=7\AND\value{listcount}<\value{liststop}}
+ \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{liststop}}
{\addcomma\addspace\ldots}
- {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
{}
{\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}}
{\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}}
@@ -269,7 +294,7 @@
% (APA 6.27) Use blank for long lists
\AtBeginBibliography{\renewcommand*{\finalnamedelim}{%
- \ifthenelse{\value{listcount}>7}
+ \ifthenelse{\value{listcount}>\maxprtauth}
{}
{\ifthenelse{\ifcurrentname{author}\OR\boolean{bbx:editorinauthpos}}
{\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
@@ -427,6 +452,7 @@
\printfield{series}
\setunit{\addcomma\space}}%
\printfield{volume}%
+ \setunit{\addspace}%
\printfield{number}%
\setunit{\addspace}\newblock
\usebibmacro{issuename}%
@@ -496,23 +522,23 @@
% (APA 7.02 Example 27) ... unless there is no author
\DeclareNameFormat{apatranslator}{%
- \ifthenelse{\value{listcount}=7}
+ \ifthenelse{\value{listcount}=\maxprtauth}
{\addcomma\addspace\ldots}
- {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
{}
{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
\DeclareNameFormat{apaeditor}{%
- \ifthenelse{\value{listcount}=7}
+ \ifthenelse{\value{listcount}=\maxprtauth}
{\addcomma\addspace\ldots}
- {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
{}
{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
\DeclareNameFormat{editorinauthpos}{%
- \ifthenelse{\value{listcount}=7}
+ \ifthenelse{\value{listcount}=\maxprtauth}
{\addcomma\addspace\ldots}
- {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
{}
{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}}}
@@ -815,29 +841,10 @@
% (APA 7.02 Example 40--44) Theses titles and volume
% Titles are not emph if only an abstract
-\DeclareFieldFormat[thesis]{title}{\iffieldequalstr{userb}{isabstract}{#1}{\mkbibemph{#1}}}
-\DeclareFieldFormat[thesis]{volume}{\mkbibemph{\apanum{#1}}\addspace}
-\DeclareFieldFormat[thesis]{number}{\mkbibparens{\apanum{#1}}\addspace}
-\DeclareFieldFormat[thesis]{eprinttype}{\mkbibemph{#1}\addspace}
-\DeclareFieldFormat[thesis]{eprint}{#1}
-\DeclareFieldFormat[thesis]{pages}{#1}
-
-\newbibmacro*{thesis:retrinfo}{%
- \printfield{eprinttype}%
- \clearfield{eprinttype}%
- \setunit{\addcomma\addspace}%
- \printfield{volume}%
- \setunit{\addspace}%
- \printfield{number}%
- \setunit{\addcomma\addspace}%
- \printfield{eprint}%
- \clearfield{eprint}%
- \setunit{\addcomma\addspace}%
- \printfield{pages}%
- \setunit{\relax}}
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.05) Unpublished theses
@@ -1004,8 +1011,6 @@
\DeclareFieldFormat{url}{\url{#1}}
\DeclareFieldFormat{urldate}{#1}
-\DeclareFieldFormat{eprinttype}{#1}
-\DeclareFieldFormat{eprint}{\mkbibparens{#1}}
\renewbibmacro*{url+urldate}{%
\def\@apaar{retrieved}% default
@@ -1027,21 +1032,6 @@
\setunit*{\addcolon\addspace}%
\iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
-\renewbibmacro*{eprint}{%
- \def\@apaar{retrieved}% default
- \iffieldundef{eprint}
- {}
- {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
- \iffieldequalstr{userb}{urlisabstract}
- {\printtext{\bibcpstring{abstract}}\addspace%
- \printtext{\bibstring{\@apaar}}}
- {\printtext{\bibcpstring{\@apaar}}}%
- \setunit{\addspace}%
- \printtext{\bibstring{from}}%
- \setunit*{\addspace}%
- \printfield{eprinttype}%
- \newunit
- \printfield{eprint}}}
%
%%%%%%%%%%%%%%%%%
@@ -1407,8 +1397,6 @@
\ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
\usebibmacro{type+institution}%
\newunit\newblock
- \usebibmacro{thesis:retrinfo}
- \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%