summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/apacite/apacite.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/apacite/apacite.sty')
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacite.sty33
1 files changed, 23 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty
index b0fe680309a..710737939e0 100644
--- a/Master/texmf-dist/tex/latex/apacite/apacite.sty
+++ b/Master/texmf-dist/tex/latex/apacite/apacite.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-2013 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -44,7 +44,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{apacite}
- [2012/02/25 v6.01 APA citation]
+ [2013/07/04 v6.02 APA citation]
%%
%% apacite.sty : citation and reference list according to APA manual
%% Written by Erik Meijer
@@ -113,12 +113,16 @@
\newif\if@numberedbib
\DeclareOption{numberedbib}{\@numberedbibtrue}
\DeclareOption{unnumberedbib}{\@numberedbibfalse}
+\newif\if@sectionbib
+\newif\if@sectionbibdefault
+\@sectionbibfalse
+\@sectionbibdefaulttrue
\DeclareOption{sectionbib}{%
- \@ifundefined{@sectionbibtrue}{\newif\if@sectionbib}{}%
+ \@sectionbibdefaultfalse
\@sectionbibtrue
}
\DeclareOption{nosectionbib}{%
- \@ifundefined{@sectionbibfalse}{\newif\if@sectionbib}{}%
+ \@sectionbibdefaultfalse
\@sectionbibfalse
}
\newif\if@tocbib
@@ -989,8 +993,14 @@
\fi
}
\if@APAC@natbib@apa
-\AtEndOfPackage{%
-\RequirePackage[longnamesfirst,sort]{natbib}
+ \AtEndOfPackage{%
+ \if@sectionbibdefault
+ \RequirePackage[longnamesfirst,sort]{natbib}
+ \else\if@sectionbib
+ \RequirePackage[longnamesfirst,sort,sectionbib]{natbib}
+ \else
+ \RequirePackage[longnamesfirst,sort]{natbib}
+ \fi\fi
\renewcommand\NAT@parse@date{}
\def\NAT@parse@date#1#2#3#4#5#6@@{%
\def\NAT@year{#1#2}\def\NAT@exlab{{#3}}}
@@ -1014,7 +1024,9 @@
\DeclareRobustCommand{\Citefullauthort}{\Citeauthort*}
\DeclareRobustCommand{\Citefullauthorp}{\Citeauthorp*}
\providecommand\bibstyle@apacite{%
- \renewcommand{\BBAY}{,\ignorespaces }%
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBC}{;}%
+ \renewcommand{\BBYY}{,}%
\bibpunct[\BBN ]{\BBOP }{\BBCP }{\BBC }{a}{\BBAY }{\BBYY }%
\setlength{\bibhang}{2.5em}%
\setlength{\bibsep}{0pt}%
@@ -1187,7 +1199,7 @@
\def\thebibliography#1{%
\@ifundefined{chapter}%
{\st@rtbibsection}%
- {\@ifundefined{@sectionbibtrue}%
+ {\if@sectionbibdefault
{\@ifundefined{@mainmatterfalse}%
{\st@rtbibchapter}%
{\if@mainmatter
@@ -1197,12 +1209,13 @@
\fi
}%
}%
- {\if@sectionbib
+ \else
+ \if@sectionbib
\st@rtbibsection
\else
\st@rtbibchapter
\fi
- }%
+ \fi
}%
\bibliographytypesize % e.g., to put the bibliography in \small type
\bibliographyprenote % some explanatory note before the references