summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-14 18:21:47 +0000
committerKarl Berry <karl@freefriends.org>2010-05-14 18:21:47 +0000
commit8ebefab8a722c3ea50bb5f257f167da258d89918 (patch)
tree02bbc76485e08de67b9152cf45b4fc61ae6fe218 /Master/texmf-dist/tex/latex/biblatex-apa
parent5149405bc761d8518999021fd0019b463bee1fd0 (diff)
biblatex-apa 1.0 (13may10)
git-svn-id: svn://tug.org/texlive/trunk@18245 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx31
2 files changed, 21 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index b25c394e5f3..91a4c1210ba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -47,6 +47,8 @@
october = {{October}{October}},
november = {{November}{November}},
december = {{December}{December}},
+ mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}},
+ phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
typechair = {{Chair}{Chair}},
typechairs = {{Chairs}{Chairs}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 2192505ccf1..be98aeef1d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -721,7 +721,10 @@
{\apanum{#1}}}
{\mkbibemph{\apanum{#1}}}}
-\DeclareFieldFormat[report]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat[report]{number}{\mkbibparens{\iffieldundef{type}
+ {}
+ {\printfield{type}\setunit{\addspace}}%
+ \bibcpstring{number}~\apanum{#1}}}
\newbibmacro*{apa:reportnum}{%
\iffieldundef{number}%
@@ -758,7 +761,7 @@
% (APA 7.02 Example 40--44) Theses titles and volume
% Titles are not emph if only an abstract
-\DeclareFieldFormat[thesis]{title}{\iffieldundef{abstract}{\mkbibemph{#1}}{#1}}
+\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}
@@ -952,13 +955,13 @@
\renewbibmacro*{url+urldate}{%
\def\@apaar{retrieved}% default
- \iffieldundef{url}
+ \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}}
{}
{\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
- \iffieldundef{abstract}
- {\printtext{\bibcpstring{\@apaar}}}
+ \iffieldequalstr{userb}{urlisabstract}
{\printtext{\bibcpstring{abstract}}\addspace%
- \printtext{\bibstring{\@apaar}}}%
+ \printtext{\bibstring{\@apaar}}}
+ {\printtext{\bibcpstring{\@apaar}}}%
\setunit{\addspace}%
\iffieldundef{urlyear}
{}
@@ -975,10 +978,10 @@
\iffieldundef{eprint}
{}
{\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
- \iffieldundef{abstract}
- {\printtext{\bibcpstring{\@apaar}}}
+ \iffieldequalstr{userb}{urlisabstract}
{\printtext{\bibcpstring{abstract}}\addspace%
- \printtext{\bibstring{\@apaar}}}%
+ \printtext{\bibstring{\@apaar}}}
+ {\printtext{\bibcpstring{\@apaar}}}%
\setunit{\addspace}%
\printtext{\bibstring{from}}%
\setunit*{\addspace}%
@@ -1045,6 +1048,8 @@
\setunit{\bibpagespunct}%
\printfield{pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
@@ -1346,7 +1351,7 @@
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \usebibmacro{type+institution+year}%
+ \usebibmacro{type+institution}%
\newunit\newblock
\usebibmacro{thesis:retrinfo}
\newunit\newblock
@@ -1605,7 +1610,7 @@
\printlist{publisher}%
\newunit}
-\newbibmacro*{type+institution+year}{%
+\newbibmacro*{type+institution}{%
\ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}}
{}
{\printtext[parens]{%
@@ -1614,7 +1619,9 @@
{\setunit*{\addcolon\space}}%
\printfield{type}%
\setunit*{\addcomma\space}%
- \printlist{institution}}%
+ \printlist{institution}%
+ \setunit*{\addcomma\space}%
+ \printlist{location}}%
\newunit}}
%