summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-08 21:59:50 +0000
committerKarl Berry <karl@freefriends.org>2013-07-08 21:59:50 +0000
commit4550b1cb3cc63b73ebca0d72cafc0e7b8c6f9397 (patch)
treebd988c6cc4f5dd56173db354af36fc2f655879de /Master/texmf-dist/tex/latex
parent4fa56fbb23e2c4f58ec892731a6acb431846c5da (diff)
apacite (8jul13)
git-svn-id: svn://tug.org/texlive/trunk@31135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacdoc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacite.sty33
-rw-r--r--Master/texmf-dist/tex/latex/apacite/dutch.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/english.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/finnish.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/french.apc8
-rw-r--r--Master/texmf-dist/tex/latex/apacite/german.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/greek.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/ngerman.apc4
-rw-r--r--Master/texmf-dist/tex/latex/apacite/norsk.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/spanish.apc10
-rw-r--r--Master/texmf-dist/tex/latex/apacite/swedish.apc10
12 files changed, 98 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
index 8d2073dfce6..a301b52d413 100644
--- a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
+++ b/Master/texmf-dist/tex/latex/apacite/apacdoc.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{apacdoc}
- [2012/02/25 v6.01 apacite documentation style]
+ [2013/07/04 v6.02 apacite documentation style]
%%
%% apacdoc.sty : Style package that is used for the apacite documentation.
%% Written by Erik Meijer
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
diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc
index 273093cd043..6e66b9656e4 100644
--- a/Master/texmf-dist/tex/latex/apacite/dutch.apc
+++ b/Master/texmf-dist/tex/latex/apacite/dutch.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{dutch.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% dutch.apc - dutch translation of apacite elements
%% Written by Erik Meijer
@@ -150,6 +150,12 @@
\renewcommand{\BCBT}{}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting
\renewcommand{\APACmonth}[1]{\ifcase #1\or januari\or februari\or maart\or
diff --git a/Master/texmf-dist/tex/latex/apacite/english.apc b/Master/texmf-dist/tex/latex/apacite/english.apc
index 13fd688bd23..a9dc4fb84f2 100644
--- a/Master/texmf-dist/tex/latex/apacite/english.apc
+++ b/Master/texmf-dist/tex/latex/apacite/english.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{english.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% english.apc - english version of apacite elements
%% Written by Erik Meijer
@@ -136,6 +136,12 @@
\renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting
\renewcommand{\APACmonth}[1]{\ifcase #1\or January\or February\or March\or
diff --git a/Master/texmf-dist/tex/latex/apacite/finnish.apc b/Master/texmf-dist/tex/latex/apacite/finnish.apc
index 4dda6f36ef6..628ea9185eb 100644
--- a/Master/texmf-dist/tex/latex/apacite/finnish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/finnish.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{finnish.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% finnish.apc - finnish version of apacite elements
%% Written by Kari Pyykk\"o, with some minor edits by Erik Meijer.
@@ -215,6 +215,12 @@
\renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting, adapted from babel's finnish.dtx
\renewcommand{\APACmonth}[1]{\ifcase #1\or
diff --git a/Master/texmf-dist/tex/latex/apacite/french.apc b/Master/texmf-dist/tex/latex/apacite/french.apc
index 8c43e6b2199..47c5652e364 100644
--- a/Master/texmf-dist/tex/latex/apacite/french.apc
+++ b/Master/texmf-dist/tex/latex/apacite/french.apc
@@ -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.
@@ -137,6 +137,12 @@
\renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{~;}%
+\fi
%%
%% Date formatting
\renewcommand{\APACmonth}[1]{\ifcase #1\or janvier\or f\'evrier\or mars\or
diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc
index 5e61b9c8d54..9204ba23ead 100644
--- a/Master/texmf-dist/tex/latex/apacite/german.apc
+++ b/Master/texmf-dist/tex/latex/apacite/german.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{german.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% german.apc - Deutsche Uebersetzung der Apacite-Elemente
%% (German version of apacite elements)
@@ -148,6 +148,12 @@
\renewcommand{\BBN}{, }% Zwischen Zitat und Postfix (default ", ")
\renewcommand{\BCBT}{}% Zwischen 2 Autoren (zus. zu "&", default ",")
\renewcommand{\BCBL}{}% Zwischen 3 o. mehr Autoren (zus. zu "&", default ",")
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting, adapted from babel's germanb.dtx
\renewcommand{\APACmonth}[1]{\ifcase #1\or
diff --git a/Master/texmf-dist/tex/latex/apacite/greek.apc b/Master/texmf-dist/tex/latex/apacite/greek.apc
index df4f8011a4b..47ba7984990 100644
--- a/Master/texmf-dist/tex/latex/apacite/greek.apc
+++ b/Master/texmf-dist/tex/latex/apacite/greek.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{greek.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% greek.apc - Greek version of apacite elements
%% Greek translations by Athanassios Protopapas and Ioannis Dimakos
@@ -154,6 +154,12 @@
\renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting. Adapted from babel's greek.dtx
\renewcommand{\APACmonth}[1]{\textgreek{\ifcase #1\or
diff --git a/Master/texmf-dist/tex/latex/apacite/ngerman.apc b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
index dff41f890d8..73dc2536afd 100644
--- a/Master/texmf-dist/tex/latex/apacite/ngerman.apc
+++ b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{ngerman.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% ngerman.apc - german translation of apacite elements (new orthography)
%% Written by Erik Meijer, based on instructions of Andreas Poege.
diff --git a/Master/texmf-dist/tex/latex/apacite/norsk.apc b/Master/texmf-dist/tex/latex/apacite/norsk.apc
index 6924252af7e..96b0241fc48 100644
--- a/Master/texmf-dist/tex/latex/apacite/norsk.apc
+++ b/Master/texmf-dist/tex/latex/apacite/norsk.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{norsk.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements.
%% Version 1.1.
@@ -138,6 +138,12 @@
\renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting; adapted from babel's norsk.dtx
\renewcommand{\APACmonth}[1]{\ifcase #1\or
diff --git a/Master/texmf-dist/tex/latex/apacite/spanish.apc b/Master/texmf-dist/tex/latex/apacite/spanish.apc
index bd44d61228b..5d746ef7386 100644
--- a/Master/texmf-dist/tex/latex/apacite/spanish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/spanish.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{spanish.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% spanish.apc - Versi\'on espa\~nola de elementos en apacite
%% Escrito por Jorge L\'opez Puga
@@ -145,6 +145,12 @@
\renewcommand{\BCBT}{,}% comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{,}% comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting; adapted from babel's spanish.dtx
\renewcommand{\APACmonth}[1]{\ifcase #1\or enero\or febrero\or
diff --git a/Master/texmf-dist/tex/latex/apacite/swedish.apc b/Master/texmf-dist/tex/latex/apacite/swedish.apc
index 0f21f3f8d9c..10fed68e466 100644
--- a/Master/texmf-dist/tex/latex/apacite/swedish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/swedish.apc
@@ -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.
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{swedish.apc}
- [2012/02/25 v6.01 apacite language file]
+ [2013/07/04 v6.02 apacite language file]
%%
%% swedish.apc - swedish translation of apacite elements
%% Written by Stefan Bjork.
@@ -141,6 +141,12 @@
\renewcommand{\BCBT}{}% no comma between authors in ref. list when no. of
%% authors = 2
\renewcommand{\BCBL}{}% no comma before last author when no. of authors > 2
+%% Remove excess space with the natbibapa option
+\if@APAC@natbib@apa
+ \renewcommand{\BBAY}{,}%
+ \renewcommand{\BBYY}{,}%
+ \renewcommand{\BBC}{;}%
+\fi
%%
%% Date formatting; adapted from babel's swedish.dtx
\renewcommand{\APACmonth}[1]{\ifcase #1\or