summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/apacite
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/apacite')
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacdoc.sty413
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacite.sty933
-rw-r--r--Master/texmf-dist/tex/latex/apacite/dutch.apc33
-rw-r--r--Master/texmf-dist/tex/latex/apacite/english.apc26
-rw-r--r--Master/texmf-dist/tex/latex/apacite/finnish.apc26
-rw-r--r--Master/texmf-dist/tex/latex/apacite/french.apc22
-rw-r--r--Master/texmf-dist/tex/latex/apacite/german.apc26
-rw-r--r--Master/texmf-dist/tex/latex/apacite/greek.apc25
-rw-r--r--Master/texmf-dist/tex/latex/apacite/ngerman.apc14
-rw-r--r--Master/texmf-dist/tex/latex/apacite/norsk.apc24
-rw-r--r--Master/texmf-dist/tex/latex/apacite/spanish.apc78
-rw-r--r--Master/texmf-dist/tex/latex/apacite/swedish.apc24
12 files changed, 1196 insertions, 448 deletions
diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
index 3fd465e12e3..a83073cbfb6 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -42,40 +44,24 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{apacdoc}
- [2009/03/01 v4.05 apacite documentation style]
+ [2012/02/14 v6.00 apacite documentation style]
%%
%% apacdoc.sty : Style package that is used for the apacite documentation.
%% Written by Erik Meijer
-
\newif\if@APACdoc@AX
\DeclareOption{makeAX}{\@APACdoc@AXtrue}%
\@APACdoc@AXfalse
\ProcessOptions
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% DOCUMENT-SPECIFIC DEFINITIONS THAT MAY BE USEFUL FOR WIDER USE.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%\DeclareRobustCommand{\bibliteral}[1]{\string\bibliteral{#1}}
-%%\newcommand{\bibliteral}[1]{#1}
-%%\newcommand{\bibliteral}[1]{\string\bibliteral{#1}}
-%% This is the result of lots of trial and error. If I change something
-%% in another part, I typically have to change something here as well.
-%% The \space is necessary because in the current setup, an additional
-%% space is inserted in the bibliography, and MakeIndex is space-sensitive.
+%% \DeclareRobustCommand{\bibliteral}[1]{\string\bibliteral{#1}}
+%% \newcommand{\bibliteral}[1]{#1}
+%% \newcommand{\bibliteral}[1]{\string\bibliteral{#1}}
\newcommand{\bibliteral}[1]{\string\bibliteral\space{#1}}
\DeclareRobustCommand{\bibinitial}[1]{\string#1}
-
+%% \newcommand{\bibinitial}{\string\bibinitial\space}
\newcommand{\bibnodot}[1]{}
-
-\newcommand{\BOn}{On}
-
\newcommand{\SwapArgs}[2]{#2#1}
-
\newcommand{\bibreftext}[2]{#2}
-
\newcommand{\Dutchvon}[2]{#2}
-
\DeclareRobustCommand{\bibeditortype}[1]{\relax }%
\def\renewbibeditortype{%
\def\oldBED{}%
@@ -87,12 +73,11 @@
\global\def\BEDS{##1\global\let\BED\oldBED \global\let\BEDS\oldBEDS}%
}%
}
-
\newcommand{\bibInstring}[1]{%
\global\let\oldBIn\BIn
\global\def\BIn{#1\global\let\BIn\oldBIn}%
}
-
+\newcommand{\BOn}{On}
\global\def\BAbstractRetrieved#1{Abstract retrieved {#1}, from\ }%
\DeclareRobustCommand{\BmakeAbstractRetrieved}{%
\global\def\oldBRetrieved{}%
@@ -102,7 +87,6 @@
\global\let\BRetrieved\oldBRetrieved%
}%
}
-
\DeclareRobustCommand{\noedition}{%
\global\def\oldBEd{}%
\global\let\oldBEd\BEd
@@ -111,19 +95,18 @@
\global\let\BEd\oldBEd
}%
}
-
\def\swallownext#1{\relax}
\def\swallowdot{%
\@ifnextchar.%
{\swallownext}%
{\relax}%
}
-
+%% \def\bibskipbracenodot{\string\bibskipbracenodot}
+%% \def\bibskipbracenodot{\aftergroup\swallowdot}
+%% \let\bibskipbracenodot\relax
\def\bibskipbracenodot{\noexpand\bibskipbracenodot}
\def\indexskipbracenodot{\noexpand\indexskipbracenodot}
-
\newcommand{\APACmanBeforeBib}{%
- % Redefine commands that should be different in the bibliography.
\renewcommand{\bibreftext}[2]{##1}%
\renewcommand{\Dutchvon}[2]{##1}%
\renewbibeditortype
@@ -134,7 +117,6 @@
\global\let\oldbibinitial\bibinitial
\renewcommand{\bibinitial}[1]{##1}%
}
-
\def\APACbibstyle{%
\if@APAC@index
apacitex% with index option
@@ -142,48 +124,43 @@
apacite% without index option
\fi
}
-
\newcommand{\APACmanBeforeIndex}{%
\clearpage
- % Redefine commands that should be different in the author index.
\renewcommand{\bibeditortype}[1]{}%
\renewcommand{\bibliteral}[1]{\unskip}%
\global\let\indexskipbracenodot\bibskipbracenodot
}
-
\newcommand{\APACmanAfterIndex}{%
- % Revert to old definitions of commands.
\global\let\bibskipbracenodot\oldbibskipbracenodot
\global\def\indexskipbracenodot{\noexpand\indexskipbracenodot}%
\APACdocindex
}
-
-
-\@ifundefined{IndexPrologue}{}{%
- \IndexPrologue{\clearpage\section*{{Code Index}}%
- \addcontentsline{toc}{section}{Code Index}%
- \markboth{{Code Index}}{{Code Index}}%
- Numbers written in italic refer to the page
- where the corresponding entry is described;
- numbers underlined refer to the
- \ifcodeline@index
- code line of the
- \fi
- definition; numbers in roman refer to the
- \ifcodeline@index
- code lines
- \else
- pages
- \fi
- where the entry is used.
- }%
-}
-\@ifundefined{GlossaryPrologue}{}{%
- \GlossaryPrologue{\section{{Change History}}%
- \markboth{{Change History}}{{Change History}}%
- }%
-}
-
+\newcommand{\SetupAPACdocPrologues}{%
+ \@ifundefined{IndexPrologue}{}{%
+ \IndexPrologue{%
+ \clearpage\section*{{Code Index}}%
+ \addcontentsline{toc}{section}{Code Index}%
+ \markboth{{Code Index}}{{Code Index}}%
+ Numbers written in italic refer to the page where the corresponding
+ entry is described; numbers underlined refer to the
+ \ifcodeline@index
+ code line of the
+ \fi
+ definition; numbers in roman refer to the
+ \ifcodeline@index
+ code lines
+ \else
+ pages
+ \fi
+ where the entry is used.
+ }%
+ }%
+ \@ifundefined{GlossaryPrologue}{}{%
+ \GlossaryPrologue{\section{{Change History}}%
+ \markboth{{Change History}}{{Change History}}%
+ }%
+ }%
+}
\def\APACdocindex{%
\ifhave@multicol
\renewenvironment{theindex}
@@ -200,100 +177,58 @@
\def\endtheindex{\if@restonecol\onecolumn\else\clearpage\fi}
\fi
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% CITATIONS TO THE BIBLE
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% To define which Bible version you used.
\def\bibleversion#1{\gdef\@bibleversion{#1}}
\def\@bibleversion{Revised Standard Version}
-
\def\bibleciteA#1{%
- % If this is the first citation, add bible version.
{\@ifundefined{flag@bible}%
{\fullbibleciteA{#1}}%
{\shortbibleciteA{#1}}%
}%
}
-
\def\fullbibleciteA#1{%
- % Insert relevant chapter and verse.
{#1}%
{ \BBOP\@bibleversion\BBCP}%
- % Flag that bible has been cited.
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
\def\shortbibleciteA#1{%
- % Insert relevant chapter and verse.
{#1}%
- % Flag that bible has been cited (is this appropriate?).
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
\def\biblecite#1{%
- % If this is the first citation, add bible version.
{\@ifundefined{flag@bible}%
{\fullbiblecite{#1}}%
{\shortbiblecite{#1}}%
}%
}
-
\def\fullbiblecite#1{%
- % Open parenthesis.
{\BBOP}%
- % Insert relevant chapter and verse.
{#1}%
- % Add bible version.
{\BBAY{} \@bibleversion}%
- % Close parenthesis.
{\BBCP}%
- % Flag that bible has been cited.
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
\def\shortbiblecite#1{%
- % Open parenthesis.
{\BBOP}%
- % Insert relevant chapter and verse.
{#1}%
- % Close parenthesis.
{\BBCP}%
- % Flag that bible has been cited (is this appropriate?).
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
\def\bibleciteNP#1{%
- % If this is the first citation, add bible version.
{\@ifundefined{flag@bible}%
{\fullbibleciteNP{#1}}%
{\shortbibleciteNP{#1}}%
}%
}
-
\def\fullbibleciteNP#1{%
- % Insert relevant chapter and verse.
{#1}%
- % Add bible version.
{\BBAY{} \@bibleversion}%
- % Flag that bible has been cited.
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
\def\shortbibleciteNP#1{%
- % Insert relevant chapter and verse.
{#1}%
- % Flag that bible has been cited (is this appropriate?).
{\global\expandafter\def\csname flag@bible\endcsname{DUMMY}}%
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% COMMANDS TO CITE SONGS.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\newcommand{\bibsong}[4]{}
-
\newcommand{\citeAsong}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3} {\BBOP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
@@ -301,7 +236,6 @@
\citeauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\fullciteAsong}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3} {\BBOP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
@@ -309,7 +243,6 @@
\fullciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\shortciteAsong}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3} {\BBOP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
@@ -317,31 +250,30 @@
\shortciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\citesong}[1]{%
\def\bibsong##1##2##3##4{%
- {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
+ {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
+ {\BBCP}%
}%
\citeauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\fullcitesong}[1]{%
\def\bibsong##1##2##3##4{%
- {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
+ {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
+ {\BBCP}%
}%
\fullciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\shortcitesong}[1]{%
\def\bibsong##1##2##3##4{%
- {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}{\BBCP}%
+ {\BBOP}\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
+ {\BBCP}%
}%
\shortciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\citesongNP}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
@@ -349,7 +281,6 @@
\citeauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\fullcitesongNP}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
@@ -357,7 +288,6 @@
\fullciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
\newcommand{\shortcitesongNP}[1]{%
\def\bibsong##1##2##3##4{%
\APACciteatitle{##3},{\BAP}{##1}{\BBAY}{##2}{\BBN}{##4}%
@@ -365,52 +295,38 @@
\shortciteauthor{#1}%
\def\bibsong##1##2##3##4{}%
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% COMMANDS TO CITE DSM.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\DeclareRobustCommand{\bibDSM}[4]{#1}
-\def\origbibDSM{}
+\newcommand\origbibDSM{}
\let\origbibDSM\bibDSM
-
\newcommand{\DSMauthor}[1]{%
\def\bibDSM##1##2##3##4{##1}%
\citeauthor{#1}%
\let\bibDSM\origbibDSM
}
-
\newcommand{\DSMfulltitle}[1]{%
\def\bibDSM##1##2##3##4{##2}%
\citeauthor{#1}%
\let\bibDSM\origbibDSM
}
-
\newcommand{\DSMshorttitle}[1]{%
\def\bibDSM##1##2##3##4{##4}%
\citeauthor{#1}%
\let\bibDSM\origbibDSM
}
-
\newcommand{\DSMedition}[1]{%
\def\bibDSM##1##2##3##4{##3}%
\citeauthor{#1}%
\let\bibDSM\origbibDSM
}
-
\newcommand{\DSMciteA}[1]{%
\@for\@citeb:=#1\do{%
- % Removes a possible space before the citation key
\edef\@citeb{\expandafter\@firstofone\@citeb}%
- % Is this the first citation?
\@ifundefined{flag@\@citeb\APAC@extra@b@citeb}%
{\DSMfullciteA{#1}}%
{\DSMshortciteA{#1}}%
}%
}
-
\newcommand{\DSMfullciteA}[1]{%
- % \emph{Full Title} (edition; \emph{Short Title}; author, year)
\APACcitebtitle{\DSMfulltitle{#1}}
\BBOP
\DSMedition{#1};
@@ -418,25 +334,18 @@
\citeNP{#1}%
\BBCP
}
-
\newcommand{\DSMshortciteA}[1]{%
- % \emph{Short Title}
\APACcitebtitle{\DSMshorttitle{#1}}%
}
-
\newcommand{\DSMcite}[1]{%
\@for\@citeb:=#1\do{%
- % Removes a possible space before the citation key
\edef\@citeb{\expandafter\@firstofone\@citeb}%
- % Is this the first citation?
\@ifundefined{flag@\@citeb\APAC@extra@b@citeb}%
{\DSMfullcite{#1}}%
{\DSMshortcite{#1}}%
}%
}
-
\newcommand{\DSMfullcite}[1]{%
- % (\emph{Full Title}, edition; \emph{Short Title}; author, year)
\BBOP
\APACcitebtitle{\DSMfulltitle{#1}},
\DSMedition{#1};
@@ -444,148 +353,128 @@
\citeNP{#1}%
\BBCP
}
-
\newcommand{\DSMshortcite}[1]{%
- % (\emph{Short Title})
\BBOP\APACcitebtitle{\DSMshorttitle{#1}}\BBCP
}
-
\newcommand{\DSMciteNP}[1]{%
\@for\@citeb:=#1\do{%
- % Removes a possible space before the citation key
\edef\@citeb{\expandafter\@firstofone\@citeb}%
- % Is this the first citation?
\@ifundefined{flag@\@citeb\APAC@extra@b@citeb}%
{\DSMfullciteNP{#1}}%
{\DSMshortciteNP{#1}}%
}%
}
-
\newcommand{\DSMfullciteNP}[1]{%
- % (\emph{Full Title}, edition; \emph{Short Title}; author, year)
\APACcitebtitle{\DSMfulltitle{#1}},
\DSMedition{#1};
\APACcitebtitle{\DSMshorttitle{#1}};
\citeNP{#1}%
}
-
\newcommand{\DSMshortciteNP}[1]{%
- % (\emph{Short Title})
\APACcitebtitle{\DSMshorttitle{#1}}%
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% DOCUMENT-SPECIFIC DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\@ifundefined{BibTeX}{%
- \def\BibTeX{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
- T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}% copied from bibtex.web
-}{}
-\newcommand{\MakeIndex}{\textit{MakeIndex}}
-\newcommand{\latextohtml}{\textup{\LaTeX2\texttt{HTML}}}% from html.sty
-\newcommand{\LaTeXrtf}{\textup{\LaTeX2RTF}}%
-\newcommand{\TeXht}{\textup{\TeX4ht}}%
-\newcommand{\Perl}{\textsl{Perl}}%
-
-\newcommand{\EM}{\ensuremath{\triangleright\quad}}
-
-\newcommand{\APACversiondate}[1]{\relax [#1]}
-
-\newcommand{\LC}{\mbox{${}^{\dag}$}}% \LaTeX{} Companion
-\newcommand{\X}{\ensuremath{\times}}% for one table
-\newcommand{\Y}{\ensuremath{c}}% for one table
-\newcommand{\A}{\ensuremath{a}}% for one table
-
-\newcommand{\pkg}[1]{\textsf{#1}}% package name
-\newcommand{\fname}[1]{\texttt{#1}}% file name
-\newcommand{\fieldname}[1]{\texttt{#1}}% field name
-\newcommand{\entryname}[1]{\texttt{#1}}% entry type name
-\newcommand{\pkgoption}[1]{\texttt{#1}}% package option
-\newcommand{\envirname}[1]{\texttt{#1}}% environment name
-
-\AtBeginDocument{%
- \@ifundefined{cmd}{%
- \newcommand{\cmd}[1]{\texttt{\string#1}}% command, incl. `\'
- }{}%
-}
-
-\newcommand{\bs}{{\ttfamily \@backslashchar}}% backslash
-\newcommand{\opt}[1]{$\langle${\itshape #1}$\rangle$}% generic text
-
-\newcommand{\cmdtwo}[2]{{\mdseries\bs\texttt{#1\{}\opt{#2}%
- \texttt{\}}}}%
-\newcommand{\cmdthree}[3]{{\mdseries\bs\texttt{#1[}\opt{#2}%
- \texttt{]\{}\opt{#3}%
- \texttt{\}}}}%
-\newcommand{\cmdthreepre}[3]{{\mdseries\bs\texttt{#1<}\opt{#2}%
- \texttt{>\{}\opt{#3}%
- \texttt{\}}}}%
-\newcommand{\cmdthreealt}[3]{{\mdseries\bs\texttt{#1[}\opt{#2}%
- \texttt{]\{#3\}}}}%
-\newcommand{\cmdfour}[4]{{\mdseries\bs\texttt{#1<}\opt{#2}%
- \texttt{>[}\opt{#3}%
- \texttt{]\{}\opt{#4}%
- \texttt{\}}}}%
-
-\AtBeginDocument{%
- \@ifundefined{flqq}{%
- \newcommand{\flqq}{%
- {\fontencoding{T1}\fontfamily{cmr}\selectfont\symbol{19}}}%
- \newcommand{\frqq}{%
- {\fontencoding{T1}\fontfamily{cmr}\selectfont\symbol{20}}}%
- }{}%
-}%
-\newcommand{\simpleguillemots}{%
- \renewcommand{\flqq}{\raisebox{2.5pt}{\tiny{\ensuremath{\mathord{<\!\!<}}}}}%
- \renewcommand{\frqq}{\raisebox{2.5pt}{\tiny{\ensuremath{\mathord{>\!\!>}}}}}%
-}%
-
-\newcommand{\APACdocPageLayout}{%
- \normalsize
- \let\oldhoffset\hoffset
- \let\oldvoffset\voffset
- \let\oldoddsidemargin\oddsidemargin
- \let\oldevensidemargin\evensidemargin
- \let\oldtopmargin\topmargin
- \let\oldheadheight\headheight
- \let\oldheadsep\headsep
- \let\oldtextheight\textheight
- \let\oldfootskip\footskip
- \let\oldtextwidth\textwidth
- \let\oldlinewidth\linewidth
- \let\oldmarginparsep\marginparsep
- \let\oldmarginparwidth\marginparwidth
- \let\oldmarginparpush\marginparpush
- \setlength{\hoffset}{-1in} % top-left reference point is
- \setlength{\voffset}{-1in} % the top-left corner of the page
- \setlength{\oddsidemargin}{1.3in}
- \setlength{\evensidemargin}{1.3in}
- \setlength{\topmargin}{1.35in}
- %\setlength{\headheight}{\baselineskip}
- \setlength{\headheight}{0.12in}
- \setlength{\headsep}{0.24in}
- \setlength{\textheight}{7.9in}
- \setlength{\footskip}{30pt}
- \setlength{\textwidth}{5.9in}
- \setlength{\linewidth}{\textwidth}
- \setlength{\marginparsep}{0pt}
- \setlength{\marginparwidth}{0pt}
- \setlength{\marginparpush}{0pt}
-}
-
-\newcommand{\APACcodePageLayout}{%
- \let\hoffset\oldhoffset
- \let\oddsidemargin\oldoddsidemargin
- \let\evensidemargin\oldevensidemargin
- \let\textwidth\oldtextwidth
- \let\linewidth\oldlinewidth
- \let\marginparsep\oldmarginparsep
- \let\marginparwidth\oldmarginparwidth
- \let\marginparpush\oldmarginparpush
-}
-
-\APACdocPageLayout
+\newcommand{\SetupAPACdoc}{%
+ \newcommand{\MiKTeX}{MiK\TeX}
+ \@ifundefined{BibTeX}{%
+ \def\BibTeX{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
+ T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}% from bibtex.web
+ }{}
+ \newcommand{\MakeIndex}{\textit{MakeIndex}}
+ \newcommand{\latextohtml}{\textup{\LaTeX2\texttt{HTML}}}% from html.sty
+ \newcommand{\LaTeXrtf}{\textup{\LaTeX2RTF}}%
+ \newcommand{\TeXht}{\textup{\TeX4ht}}%
+ \newcommand{\Perl}{\textsl{Perl}}%
+ \newcommand{\EM}{\ensuremath{\triangleright\quad}}
+ \newcommand{\APACversiondate}[1]{\relax [##1]}
+ \newcommand{\LC}{\mbox{${}^{\dag}$}}% \LaTeX{} Companion
+ \newcommand{\X}{\ensuremath{\times}}% for one table
+ \newcommand{\Y}{\ensuremath{c}}% for one table
+ \newcommand{\A}{\ensuremath{a}}% for one table
+ \newcommand{\pkg}[1]{\textsf{##1}}% package name
+ \newcommand{\fname}[1]{\texttt{##1}}% file name
+ \newcommand{\fieldname}[1]{\texttt{##1}}% field name
+ \newcommand{\entryname}[1]{\texttt{##1}}% entry type name
+ \newcommand{\pkgoption}[1]{\texttt{##1}}% package option
+ \newcommand{\envirname}[1]{\texttt{##1}}% environment name
+ \AtBeginDocument{%
+ \@ifundefined{cmd}{%
+ \newcommand{\cmd}[1]{\texttt{\string##1}}% command, incl. `\'
+ }{}%
+ }
+ \newcommand{\bs}{{\ttfamily \@backslashchar}}% backslash
+ \newcommand{\opt}[1]{$\langle${\itshape ##1}$\rangle$}% generic text
+ \newcommand{\cmdtwo}[2]{{\mdseries\bs\texttt{##1\{}\opt{##2}%
+ \texttt{\}}}}%
+ \newcommand{\cmdthree}[3]{{\mdseries\bs\texttt{##1[}\opt{##2}%
+ \texttt{]\{}\opt{##3}%
+ \texttt{\}}}}%
+ \newcommand{\cmdthreepre}[3]{{\mdseries\bs\texttt{##1<}\opt{##2}%
+ \texttt{>\{}\opt{##3}%
+ \texttt{\}}}}%
+ \newcommand{\cmdthreealt}[3]{{\mdseries\bs\texttt{##1[}\opt{##2}%
+ \texttt{]\{##3\}}}}%
+ \newcommand{\cmdfour}[4]{{\mdseries\bs\texttt{##1<}\opt{##2}%
+ \texttt{>[}\opt{##3}%
+ \texttt{]\{}\opt{##4}%
+ \texttt{\}}}}%
+ \AtBeginDocument{%
+ \@ifundefined{flqq}{%
+ \newcommand{\flqq}{%
+ {\fontencoding{T1}\fontfamily{cmr}\selectfont\symbol{19}}}%
+ \newcommand{\frqq}{%
+ {\fontencoding{T1}\fontfamily{cmr}\selectfont\symbol{20}}}%
+ }{}%
+ }%
+ \newcommand{\simpleguillemots}{%
+ \renewcommand{\flqq}{\raisebox{2.5pt}{%
+ \tiny{\ensuremath{\mathord{<\!\!<}}}}}%
+ \renewcommand{\frqq}{\raisebox{2.5pt}{%
+ \tiny{\ensuremath{\mathord{>\!\!>}}}}}%
+ }%
+ \newcommand{\APACdocPageLayout}{%
+ \normalsize
+ \let\oldhoffset\hoffset
+ \let\oldvoffset\voffset
+ \let\oldoddsidemargin\oddsidemargin
+ \let\oldevensidemargin\evensidemargin
+ \let\oldtopmargin\topmargin
+ \let\oldheadheight\headheight
+ \let\oldheadsep\headsep
+ \let\oldtextheight\textheight
+ \let\oldfootskip\footskip
+ \let\oldtextwidth\textwidth
+ \let\oldlinewidth\linewidth
+ \let\oldmarginparsep\marginparsep
+ \let\oldmarginparwidth\marginparwidth
+ \let\oldmarginparpush\marginparpush
+ %%
+ %% \setlength{\hoffset}{-1in} % top-left reference point is
+ \setlength{\voffset}{-1in} % the top-left corner of the page
+ %% \setlength{\oddsidemargin}{1.3in}
+ %% \setlength{\evensidemargin}{1.3in}
+ \setlength{\topmargin}{1.35in}
+ %% %% \setlength{\headheight}{\baselineskip}
+ \setlength{\headheight}{0.12in}
+ \setlength{\headsep}{0.24in}
+ \setlength{\textheight}{7.9in}
+ \setlength{\footskip}{30pt}
+ %% \setlength{\textwidth}{5.9in}
+ %% \setlength{\linewidth}{\textwidth}
+ %% \setlength{\marginparsep}{0pt}
+ %% \setlength{\marginparwidth}{0pt}
+ %% \setlength{\marginparpush}{0pt}
+ }
+ \newcommand{\APACcodePageLayout}{%
+ \let\hoffset\oldhoffset
+ \let\oddsidemargin\oldoddsidemargin
+ \let\evensidemargin\oldevensidemargin
+ \let\textwidth\oldtextwidth
+ \let\linewidth\oldlinewidth
+ \let\marginparsep\oldmarginparsep
+ \let\marginparwidth\oldmarginparwidth
+ \let\marginparpush\oldmarginparpush
+ }
+}
%%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty
index 8dbaea3b725..040a7dd869b 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -42,7 +44,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{apacite}
- [2009/03/01 v4.05 APA citation]
+ [2012/02/14 v6.00 APA citation]
%%
%% apacite.sty : citation and reference list according to APA manual
%% Written by Erik Meijer
@@ -66,6 +68,67 @@
\DeclareOption{BCAY}{% compatibility with old .bbl files
\def\@year@\BCAY#1#2#3{#3}%
}
+\newif\if@APAC@classic@cite
+\newif\if@APAC@natbib@emu
+\newif\if@APAC@natbib@apa
+\newif\if@APAC@classic@or@emu
+\newif\if@APAC@any@natbib
+\newif\if@APAC@anycitation
+\DeclareOption{apaciteclassic}{%
+ \@APAC@classic@citetrue
+ \@APAC@natbib@emufalse
+ \@APAC@natbib@apafalse
+ \@APAC@classic@or@emutrue
+ \@APAC@any@natbibfalse
+ \@APAC@anycitationtrue
+}
+\DeclareOption{natbibemu}{%
+ \@APAC@classic@citefalse
+ \@APAC@natbib@emutrue
+ \@APAC@natbib@apafalse
+ \@APAC@classic@or@emutrue
+ \@APAC@any@natbibtrue
+ \@APAC@anycitationtrue
+}
+\DeclareOption{natbibapa}{%
+ \@APAC@classic@citefalse
+ \@APAC@natbib@emufalse
+ \@APAC@natbib@apatrue
+ \@APAC@classic@or@emufalse
+ \@APAC@any@natbibtrue
+ \@APAC@anycitationtrue
+}
+\DeclareOption{nocitation}{%
+ \@APAC@classic@citefalse
+ \@APAC@natbib@emufalse
+ \@APAC@natbib@apafalse
+ \@APAC@classic@or@emufalse
+ \@APAC@any@natbibfalse
+ \@APAC@anycitationfalse
+}
+\newif\if@APAC@mask
+\DeclareOption{mask}{\@APAC@masktrue}
+\DeclareOption{unmask}{\@APAC@maskfalse}
+%% ^^A \cmd{\if} somehow gives an error
+\newif\if@numberedbib
+\DeclareOption{numberedbib}{\@numberedbibtrue}
+\DeclareOption{unnumberedbib}{\@numberedbibfalse}
+\DeclareOption{sectionbib}{%
+ \@ifundefined{@sectionbibtrue}{\newif\if@sectionbib}{}%
+ \@sectionbibtrue
+}
+\DeclareOption{nosectionbib}{%
+ \@ifundefined{@sectionbibfalse}{\newif\if@sectionbib}{}%
+ \@sectionbibfalse
+}
+\newif\if@tocbib
+\DeclareOption{tocbib}{\@tocbibtrue}
+\DeclareOption{notocbib}{\@tocbibfalse}
+\DeclareOption{bibnewpage}{\def\@bibnewpage{\bibnewpage}}
+\DeclareOption{nobibnewpage}{\let\@bibnewpage\relax}
+\newif\if@doi
+\DeclareOption{doi}{\@doitrue}
+\DeclareOption{nodoi}{\@doifalse}
%% ^^A \cmd{\if} somehow gives an error
\newif\if@APAC@index
\DeclareOption{noindex}{\@APAC@indexfalse}%
@@ -99,23 +162,6 @@
\AtEndOfPackage{\APACltxemindex}% EM's index environment without the index
%% package (see below)
}
-%% ^^A \cmd{\if} somehow gives an error
-\newif\if@numberedbib
-\DeclareOption{numberedbib}{\@numberedbibtrue}
-\DeclareOption{unnumberedbib}{\@numberedbibfalse}
-\DeclareOption{sectionbib}{%
- \@ifundefined{@sectionbibtrue}{\newif\if@sectionbib}{}%
- \@sectionbibtrue
-}
-\DeclareOption{nosectionbib}{%
- \@ifundefined{@sectionbibfalse}{\newif\if@sectionbib}{}%
- \@sectionbibfalse
-}
-\newif\if@tocbib
-\DeclareOption{tocbib}{\@tocbibtrue}
-\DeclareOption{notocbib}{\@tocbibfalse}
-\DeclareOption{bibnewpage}{\def\@bibnewpage{\bibnewpage}}
-\DeclareOption{nobibnewpage}{\let\@bibnewpage\relax}
\DeclareOption{hyper}{%
\PackageWarningNoLine{apacite}{Obsolete option `hyper' ignored}%
}
@@ -128,12 +174,84 @@
\DeclareOption{noaccentfix}{%
\PackageWarningNoLine{apacite}{Obsolete option `noaccentfix' ignored}%
}
-\ExecuteOptions{noindex,indexpackage,unnumberedbib,tocbib,%
- nobibnewpage,suppresscorporate}
+\ExecuteOptions{apaciteclassic,noindex,indexpackage,unnumberedbib,tocbib,%
+ nobibnewpage,suppresscorporate,doi,unmask}
\ProcessOptions
+\AtBeginDocument{%
+ \@ifundefined{citeauthoryear}{\def\citeauthoryear#1#2#3{}}{}%
+}
+\AtBeginDocument{%
+ \@ifundefined{themaskedRefs}{\newcounter{maskedRefs}}{}}
\newif\if@F@cite\@F@citetrue
\newif\if@A@cite\@A@citefalse
\newif\if@Y@cite\@Y@citefalse
+\if@APAC@classic@or@emu
+\def\nocite#1{%
+ \@bsphack
+ \ifx\@onlypreamble\document
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \if@filesw
+ \immediate\write\@newciteauxhandle{\string\citation{\@citeb}}%
+ \fi
+ \@ifundefined{b@\@citeb\APAC@extra@b@citeb}{%
+ \edef\B@my@dummy{*}%
+ \ifx\@citeb\B@my@dummy
+ \else
+ \G@refundefinedtrue
+ \@latex@warning{Citation `\@citeb' undefined}%
+ \fi
+ }{}%
+ }%
+ \else
+ \AtBeginDocument{\nocite{#1}}%
+ \fi
+ \@esphack
+ \@restore@auxhandle
+}
+\global\def\B@my@dummy{*}%
+\def\@ifauthorsequalc@de#1{%
+ \if@F@cite
+ \@F@citefalse
+ \else
+ \if@Y@cite
+ {\@BBY}%
+ \fi
+ \fi
+ \if@Y@cite
+ \hyper@natlinkstart{#1}%
+ {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
+ \fi
+}
+\def\@ifauthorsunequalc@de#1{%
+ \if@F@cite
+ \@F@citefalse
+ \else
+ \if@Y@cite
+ {\@BAY}%
+ \fi
+ {\@BBC}%
+ \fi
+ \edef\@cite@undefined{?}%
+ \def\BBA{\@BBA}%
+ \if@A@cite
+ \hyper@natlinkstart{#1}%
+ {\csname b@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
+ \if@Y@cite
+ {\@BBAY}%
+ \fi
+ \fi
+ \if@Y@cite
+ \hyper@natlinkstart{#1}%
+ {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
+ \fi
+ \let\BBA\relax
+}
+\fi
+\if@APAC@classic@cite
\def\cite{%
\def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
\def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
@@ -350,46 +468,6 @@
{\@@cite<#1>}%
{\@@cite<#1>[]}%
}
-\def\@ifauthorsequalc@de#1{%
- \if@F@cite%
- \@F@citefalse%
- \else%
- \if@Y@cite%
- {\@BBY}%
- \fi%
- \fi%
- \if@Y@cite%
- \hyper@natlinkstart{#1}%
- {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
- \hyper@natlinkend
- \fi%
-}
-\def\@ifauthorsunequalc@de#1{%
- \if@F@cite%
- \@F@citefalse%
- \else%
- \if@Y@cite%
- {\@BAY}%
- \fi%
- {\@BBC}%
- \fi%
- \edef\@cite@undefined{?}%
- \def\BBA{\@BBA}%
- \if@A@cite%
- \hyper@natlinkstart{#1}%
- {\csname b@\@citeb\APAC@extra@b@citeb\endcsname}%
- \hyper@natlinkend
- \if@Y@cite%
- {\@BBAY}%
- \fi%
- \fi%
- \if@Y@cite%
- \hyper@natlinkstart{#1}%
- {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
- \hyper@natlinkend
- \fi%
- \let\BBA\relax%
-}
\def\@@cite<#1>[#2]#3{%
\nocite{#3}%
\edef\@citeP{}%
@@ -436,44 +514,626 @@
{\@BBCP}%
\@F@citetrue %
}
-\def\nocite#1{%
+\newcommand{\maskcitations}{%
+ \def\masknocite##1{}%
+ \def\maskcite{%
+ \@ifnextchar<% % >
+ {\mask@cite}%
+ {\mask@cite<>}%
+ }%
+ \def\mask@cite<##1>{%
+ \@ifnextchar[% % ]
+ {\mask@@cite<##1>}%
+ {\mask@@cite<##1>[]}%
+ }%
+ \def\mask@@cite<##1>[##2]##3{%
+ \relax
+ \setcounter{maskedRefs}{0}%
+ \@for\@citeb:=##3\do{%
+ \addtocounter{maskedRefs}{1}%
+ }%
+ \ifnum\value{maskedRefs} = 1%
+ \onemaskedcitationmsg{\themaskedRefs}%
+ \else
+ \maskedcitationsmsg{\themaskedRefs}%
+ \fi
+ }%
+ \let\maskfullcite\maskcite
+ \let\maskshortcite\maskcite
+ \let\maskciteNP\maskcite
+ \let\maskfullciteNP\maskciteNP
+ \let\maskshortciteNP\maskciteNP
+ \let\maskciteA\maskcite
+ \let\maskfullciteA\maskciteA
+ \let\maskshortciteA\maskciteA
+ \let\maskciteauthor\maskcite
+ \let\maskfullciteauthor\maskciteauthor
+ \let\maskshortciteauthor\maskciteauthor
+ \let\maskciteauthorNP\maskciteauthor
+ \let\maskfullciteauthorNP\maskciteauthorNP
+ \let\maskshortciteauthorNP\maskciteauthorNP
+ \let\maskciteyear\maskcite
+ \let\maskciteyearNP\maskciteyear
+ \DeclareRobustCommand{\masktext}[2][]{##1}%
+}
+\newcommand{\unmaskcitations}{%
+ \let\masknocite\nocite
+ \let\maskcite\cite
+ \let\maskfullcite\fullcite
+ \let\maskshortcite\shortcite
+ \let\maskciteNP\citeNP
+ \let\maskfullciteNP\fullciteNP
+ \let\maskshortciteNP\shortciteNP
+ \let\maskciteA\citeA
+ \let\maskfullciteA\fullciteA
+ \let\maskshortciteA\shortciteA
+ \let\maskciteauthor\citeauthor
+ \let\maskfullciteauthor\fullciteauthor
+ \let\maskshortciteauthor\shortciteauthor
+ \let\maskciteauthorNP\citeauthorNP
+ \let\maskfullciteauthorNP\fullciteauthorNP
+ \let\maskshortciteauthorNP\shortciteauthorNP
+ \let\maskciteyear\citeyear
+ \let\maskciteyearNP\citeyearNP
+ \DeclareRobustCommand{\masktext}[2][]{##2}
+}
+\fi
+\newif\if@APAC@alias@cite
+\@APAC@alias@citefalse
+\if@APAC@natbib@emu
+\DeclareRobustCommand\citep{%
+ \@ifstar{% full cite
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \def\@BBOP{\BBOP}% % open parenthesis
+ \def\@BBCP{\BBCP}% % close parenthesis
+ \@ifnextchar[% % ]
+ {\APACNAT@citep}%
+ {\APACNAT@citep[]}%
+}
+\DeclareRobustCommand\shortcitep{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \def\@BBOP{\BBOP}% % open parenthesis
+ \def\@BBCP{\BBCP}% % close parenthesis
+ \@ifnextchar[% % ]
+ {\APACNAT@citep}%
+ {\APACNAT@citep[]}%
+}
+\DeclareRobustCommand\citealp{%
+ \@ifstar{% full cite
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BBCP{}% % close parenthesis
+ \@ifnextchar[%% ]
+ {\APACNAT@citep}%
+ {\APACNAT@citep[]}%
+}
+\DeclareRobustCommand\shortcitealp{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BBCP{}% % close parenthesis
+ \@ifnextchar[%% ]
+ {\APACNAT@citep}%
+ {\APACNAT@citep[]}%
+}
+\newcommand\APACNAT@citep{}
+\def\APACNAT@citep[#1]{%
+ \def\@BAP{\BAP}% % after precitation [=#1] before first citation
+ \def\@BBA{\BBAA}% % `and' between authors
+ \def\@BBAY{\BBAY}% % between author and year
+ \def\@BAY{}% % after year
+ \def\@BBY{\BBYY}% % between years of multiple citations with same author
+ \def\@BBC{\BBC}% % between cites
+ \def\@BBN{\BBN}% % after last citation before note/postcitation [=#2]
+ \def\@BAstyle{\BAstyle}% text style of authors
+ \@A@citetrue% % cite authors
+ \@Y@citetrue% % cite years
+ \@ifnextchar[% % ]
+ {\@citex[#1]}%
+ {\@citex[][#1]}%
+}
+\DeclareRobustCommand\citet{%
+ \@ifstar{%
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \def\@BBAY{ \BBOP}%% between author and year
+ \@ifnextchar[% %]
+ {\APACNAT@citet}%
+ {\APACNAT@citet[]}%
+}
+\DeclareRobustCommand\shortcitet{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \def\@BBAY{ \BBOP}%% between author and year
+ \@ifnextchar[% %]
+ {\APACNAT@citet}%
+ {\APACNAT@citet[]}%
+}
+\DeclareRobustCommand\citealt{%
+ \@ifstar{% full cite
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BBCP{}% % close parenthesis
+ \def\@BBAY{ }%% between author and year
+ \@ifnextchar[%% ]
+ {\APACNAT@citet}%
+ {\APACNAT@citet[]}%
+}
+\DeclareRobustCommand\shortcitealt{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BBCP{}% % close parenthesis
+ \def\@BBAY{ }%% between author and year
+ \@ifnextchar[%% ]
+ {\APACNAT@citet}%
+ {\APACNAT@citet[]}%
+}
+\newcommand\APACNAT@citet{}
+\def\APACNAT@citet[#1]{%
+ \def\@BBOP{}% % open parenthesis.
+ \def\@BAP{\BAP}% % after precitation [=#1] before first citation
+ \def\@BBA{\BBAB}% % `and' between authors
+%% \def\@BBAY{ \BBOP}%% between author and year
+ \def\@BAY{\BBCP}% % after year
+ \def\@BBY{\BBYY}% % between years of multiple citations with same author
+ \def\@BBC{\BBC}% % between cites
+ \def\@BBN{\BBN}% % after last citation before note/postcitation [=#2]
+ \def\@BBCP{}% % close parenthesis
+ \def\@BAstyle{\BAstyle}% text style of authors
+ \@A@citetrue% % cite authors
+ \@Y@citetrue% % cite years
+ \@ifnextchar[% % ]
+ {\@citex[#1]}%
+ {\@citex[][#1]}%
+}
+\DeclareRobustCommand\citeauthort{%
+ \@ifstar{%
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \@ifnextchar[% %]
+ {\APACNAT@citeauthort}%
+ {\APACNAT@citeauthort[]}%
+}
+\DeclareRobustCommand\shortciteauthort{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \@ifnextchar[% %]
+ {\APACNAT@citeauthort}%
+ {\APACNAT@citeauthort[]}%
+}
+\DeclareRobustCommand\citeauthorp{%
+ \@ifstar{%
+ \def\BCAY##1##2##3{\BCA{##1}{##1}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##1}}%
+ }{% else
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ }%
+ \@ifnextchar[% %]
+ {\APACNAT@citeauthorp}%
+ {\APACNAT@citeauthorp[]}%
+}
+\DeclareRobustCommand\shortciteauthorp{%
+ \def\BCAY##1##2##3{\BCA{##2}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##2}{##2}}%
+ \@ifnextchar[% %]
+ {\APACNAT@citeauthorp}%
+ {\APACNAT@citeauthorp[]}%
+}
+\DeclareRobustCommand\citeauthor{\citeauthort}
+\DeclareRobustCommand\citefullauthor{\citeauthort*}
+\DeclareRobustCommand\shortciteauthor{\shortciteauthort}
+\newcommand\APACNAT@citeauthort{}
+\def\APACNAT@citeauthort[#1]{%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BAP{\BAP}% % after precitation [=#1] before first citation
+ \def\@BBA{\BBAB}% % `and' between authors
+ \def\@BBAY{}% % between author and year
+ \def\@BAY{}% % after year
+ \def\@BBY{}% % between years of multiple citations with same author
+ \def\@BBC{\BBC}% % between cites
+ \def\@BBN{\BBN}% % after last citation before note/postcitation [=#2]
+ \def\@BBCP{}% % close parenthesis
+ \def\@BAstyle{\BAastyle}% text style of authors
+ \@A@citetrue% % cite authors
+ \@Y@citefalse% % do not cite years
+ \@ifnextchar[% % ]
+ {\@citex[#1]}%
+ {\@citex[][#1]}%
+}
+\newcommand\APACNAT@citeauthorp{}
+\def\APACNAT@citep[#1]{%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BAP{\BAP}% % after precitation [=#1] before first citation
+ \def\@BBA{\BBAA}% % `and' between authors
+ \def\@BBAY{}% % between author and year
+ \def\@BAY{}% % after year
+ \def\@BBY{}% % between years of multiple citations with same author
+ \def\@BBC{\BBC}% % between cites
+ \def\@BBN{\BBN}% % after last citation before note/postcitation [=#2]
+ \def\@BBCP{}% % close parenthesis
+ \def\@BAstyle{\BAastyle}% text style of authors
+ \@A@citetrue% % cite authors
+ \@Y@citefalse% % do not cite years
+ \@ifnextchar[% % ]
+ {\@citex[#1]}%
+ {\@citex[][#1]}%
+}
+\DeclareRobustCommand\citeyearpar{%
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ \def\@BBOP{\BBOP}% % open parenthesis
+ \def\@BBCP{\BBCP}% % close parenthesis
+ \@ifnextchar[% % ]
+ {\APACNAT@citeyear}%
+ {\APACNAT@citeyear[]}%
+}
+\DeclareRobustCommand\citeyear{%
+ \def\BCAY##1##2##3{\BCA{##1}{##2}}% kept for compat. with prev. versions
+ \def\citeauthoryear##1##2##3{\BCA{##1}{##2}}%
+ \def\@BBOP{}% % open parenthesis
+ \def\@BBCP{}% % close parenthesis
+ \@ifnextchar[% % ]
+ {\APACNAT@citeyear}%
+ {\APACNAT@citeyear[]}%
+}
+\newcommand\APACNAT@citeyear{}
+\def\APACNAT@citeyear[#1]{%
+ \def\@BAP{\BAP}% % after precitation [=#1] before first citation
+ \def\@BBA{}% % `and' between authors
+ \def\@BBAY{}% % between author and year
+ \def\@BAY{}% % after year
+ \def\@BBY{\BBYY}% % between years of multiple citations with same author
+ \def\@BBC{\BBC}% % between cites
+ \def\@BBN{\BBN}% % after last citation before note/postcitation [=#2]
+ \def\@BAstyle{}% % text style of authors
+ \@A@citefalse% % do not cite authors
+ \@Y@citetrue% % cite years
+ \@ifnextchar[% % ]
+ {\@citex[#1]}%
+ {\@citex[][#1]}%
+}
+\newcommand\APACNAT@citex{}
+\def\APACNAT@citex[#1][#2]#3{%
+ \nocite{#3}%
+ \edef\@citeP{}%
+ \mbox{\@BBOP}%
+ \ifx\@empty#1\@empty
+ \else%
+ {\ignorespaces #1\@BAP}%
+ \fi%
+ \@for\@citeb:=#3\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \back@cite{\@citeb}%
+ \if@APAC@alias@cite
+ \@ifundefined{al@\@citeb\APAC@extra@b@citeb}%
+ {\PackageWarning{apacite}{Undefined alias for citation \@citeb}
+ \expandafter\def\csname al@\@citeb\APAC@extra@b@citeb\endcsname{?}%
+ }{}%
+ \@Y@citefalse % do not cite years
+ \def\BCA##1##2{{\@BAstyle \csname
+ al@\@citeb\APAC@extra@b@citeb\endcsname}}%
+ \@ifauthorsunequalc@de{\@citeb\APAC@extra@b@citeb}%
+ \else
+ \@ifundefined{b@\@citeb\APAC@extra@b@citeb}%
+ {\expandafter\def\csname b@\@citeb\APAC@extra@b@citeb\endcsname{?}%
+ \expandafter\def\csname Y@\@citeb\APAC@extra@b@citeb\endcsname{?}%
+ }%
+ {\@ifundefined{flag@\@citeb\APAC@extra@b@citeb}%
+ {\global\expandafter
+ \def\csname flag@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
+ \def\BCA##1##2{{\@BAstyle ##1}}%
+ }%
+ {\def\BCA##1##2{{\@BAstyle ##2}}%
+ }%
+ }%
+ \protected@edef\B@my@dummy{\csname
+ b@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \ifx\@citeP\B@my@dummy
+ \@ifauthorsequalc@de{\@citeb\APAC@extra@b@citeb}%
+ \else
+ \@ifauthorsunequalc@de{\@citeb\APAC@extra@b@citeb}%
+ \fi
+ \protected@edef\@citeP{\csname
+ b@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \let\BCA\relax
+ \fi
+ }%
+ \ifx\@empty#2\@empty
+ \else%
+ {\@BBN #2}%
+ \fi%
+ \if@Y@cite%
+ {\@BAY}%
+ \fi%
+ {\@BBCP}%
+ \@F@citetrue %
+}
+\newcommand\citetext[1]{\mbox{}\BBOP{}#1\BBCP}
+\let\@citex\APACNAT@citex
+\DeclareRobustCommand\cite{%
+ \@ifstar{%
+ \@ifnextchar[% %]
+ {\citep*}%
+ {\citet*}%
+ }{%
+ \@ifnextchar[% %]
+ {\citep}%
+ {\citet}%
+ }%
+}
+\DeclareRobustCommand\Citet{\citet}
+\DeclareRobustCommand\Citep{\citep}
+\DeclareRobustCommand\Citealt{\citealt}
+\DeclareRobustCommand\Citealp{\citealp}
+\DeclareRobustCommand\Citeauthort{\citeauthort}
+\DeclareRobustCommand\Citeauthorp{\citeauthorp}
+\DeclareRobustCommand\Citeauthor{\citeauthor}
+\DeclareRobustCommand\Citefullauthor{\citefullauthor}
+\DeclareRobustCommand\Cite{\cite}
+\DeclareRobustCommand\shortCitet{\shortcitet}
+\DeclareRobustCommand\shortCitep{\shortcitep}
+\DeclareRobustCommand\shortCitealt{\shortcitealt}
+\DeclareRobustCommand\shortCitealp{\shortcitealp}
+\DeclareRobustCommand\shortCiteauthort{\shortciteauthort}
+\DeclareRobustCommand\shortCiteauthorp{\shortciteauthorp}
+\DeclareRobustCommand\shortCiteauthor{\shortciteauthor}
+\newcommand\shortcites[1]{%
\@bsphack
- \ifx\@onlypreamble\document
\@for\@citeb:=#1\do{%
\edef\@citeb{\expandafter\@firstofone\@citeb}%
- \if@filesw
- \immediate\write\@newciteauxhandle{\string\citation{\@citeb}}%
- \fi
- \@ifundefined{b@\@citeb\APAC@extra@b@citeb}{%
- \edef\B@my@dummy{*}%
- \ifx\@citeb\B@my@dummy
- \else
- \G@refundefinedtrue
- \@latex@warning{Citation `\@citeb' undefined}%
- \fi
- }{}%
+ \global\expandafter
+ \def\csname flag@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
}%
+ \@esphack
+}
+\newcommand\defcitealias[2]{%
+ \@ifundefined{al@#1\APAC@extra@b@citeb}{}
+ {\PackageWarning{apacite}{Overwriting existing alias for citation #1}}
+ \@namedef{al@#1\APAC@extra@b@citeb}{#2}}
+\DeclareRobustCommand\citetalias{%
+ \@APAC@alias@citetrue
+ \citet
+}
+\DeclareRobustCommand\citepalias{%
+ \@APAC@alias@citetrue
+ \citep
+}
+\newif\ifciteindex \citeindexfalse
+\newcommand\citeindextype{default}
+\let\citenumfont=\@empty
+\newcommand\bibpunct[7][, ]%
+ {\gdef\BBOP{#2}\gdef\BBCP{#3}\gdef\BBC{#4}%
+ \gdef\BBAY{#6}\gdef\BBYY{#7}\gdef\BBN{#1}%
+ }
+\newcommand\bibstyle@apacite{%
+ \bibpunct[, ]{(}{)}{; }{a}{, }{, }%
+ \setlength{\bibhang}{2.5em}%
+ \setlength{\bibsep}{0pt}%
+}
+\let\bibstyle@apa=\bibstyle@apacite
+\newcommand\citestyle[1]{\csname bibstyle@#1\endcsname}
+\newcommand\setcitestyle[1]{%
+ \@for\@tempa:=#1\do
+ {\def\@tempb{round}\ifx\@tempa\@tempb
+ \renewcommand\BBOP{(}\renewcommand\BBCP{)}\fi
+ \def\@tempb{square}\ifx\@tempa\@tempb
+ \renewcommand\BBOP{[}\renewcommand\BBCP{]}\fi
+ \def\@tempb{angle}\ifx\@tempa\@tempb
+ \renewcommand\BBOP{$<$}\renewcommand\BBCP{$>$}\fi
+ \def\@tempb{curly}\ifx\@tempa\@tempb
+ \renewcommand\BBOP{\{}\renewcommand\BBCP{\}}\fi
+ \def\@tempb{semicolon}\ifx\@tempa\@tempb
+ \renewcommand\BBC{; }\fi
+ \def\@tempb{colon}\ifx\@tempa\@tempb
+ \renewcommand\BBC{: }\fi
+ \def\@tempb{comma}\ifx\@tempa\@tempb
+ \renewcommand\BBC{, }\fi
+ \def\@tempb{authoryear}\ifx\@tempa\@tempb
+ \fi
+ \def\@tempb{numbers}\ifx\@tempa\@tempb
+ \fi
+ \def\@tempb{super}\ifx\@tempa\@tempb
+ \fi
+ \expandafter\APAC@find@eq\@tempa=\relax\@nil
+ \if\@tempc\relax\else
+ \expandafter\APAC@rem@eq\@tempc
+ \def\@tempb{open}\ifx\@tempa\@tempb
+ \xdef\BBOP{\@tempc}\fi
+ \def\@tempb{close}\ifx\@tempa\@tempb
+ \xdef\BBCP{\@tempc}\fi
+ \def\@tempb{aysep}\ifx\@tempa\@tempb
+ \xdef\BBAY{\@tempc}\fi
+ \def\@tempb{yysep}\ifx\@tempa\@tempb
+ \xdef\BBYY{\@tempc}\fi
+ \def\@tempb{notesep}\ifx\@tempa\@tempb
+ \xdef\BBN{\@tempc}\fi
+ \def\@tempb{citesep}\ifx\@tempa\@tempb
+ \xdef\BBC{\@tempc}\fi
+ \fi
+ }%
+}
+\def\APAC@find@eq#1=#2\@nil{\def\@tempa{#1}\def\@tempc{#2}}
+\def\APAC@rem@eq#1={\def\@tempc{#1}}
+\fi
+\newcommand{\BBA@nat}{%
+ \ifNAT@swa
+ \BBAA
\else
- \AtBeginDocument{\nocite{#1}}%
+ \BBAB
\fi
+}
+\if@APAC@natbib@apa
+\AtEndOfPackage{%
+\RequirePackage[longnamesfirst,sort]{natbib}
+\renewcommand\NAT@parse@date{}
+\def\NAT@parse@date#1#2#3#4#5#6@@{%
+ \def\NAT@year{#1#2}\def\NAT@exlab{{#3}}}
+\DeclareRobustCommand{\BBA}{\BBA@nat}
+\let\orig@nat@@lbibitem\@lbibitem
+\def\@lbibitem{\NAT@swatrue\orig@nat@@lbibitem}
+\renewcommand\citetext[1]{\NAT@open\begingroup\NAT@swatrue
+ #1\endgroup\NAT@close}
+\DeclareRobustCommand\citeauthort{\citeauthor}
+\DeclareRobustCommand\Citeauthort{\Citeauthor}
+\DeclareRobustCommand\citeauthorp
+ {\begingroup\NAT@swatrue\let\NAT@ctype\@ne\NAT@parfalse
+ \@ifstar{\NAT@fulltrue\NAT@citetp}{\NAT@fullfalse\NAT@citetp}}
+\DeclareRobustCommand\Citeauthorp
+ {\begingroup\NAT@swatrue\let\NAT@ctype\@ne\NAT@parfalse
+ \let\NAT@up\NAT@Up
+ \@ifstar{\NAT@fulltrue\NAT@citetp}{\NAT@fullfalse\NAT@citetp}}
+\DeclareRobustCommand{\Citefullauthor}{\Citeauthor*}
+\DeclareRobustCommand{\citefullauthort}{\citeauthort*}
+\DeclareRobustCommand{\citefullauthorp}{\citeauthorp*}
+\DeclareRobustCommand{\Citefullauthort}{\Citeauthort*}
+\DeclareRobustCommand{\Citefullauthorp}{\Citeauthorp*}
+\providecommand\bibstyle@apacite{%
+ \renewcommand{\BBAY}{,\ignorespaces }%
+ \bibpunct[\BBN ]{\BBOP }{\BBCP }{\BBC }{a}{\BBAY }{\BBYY }%
+ \setlength{\bibhang}{2.5em}%
+ \setlength{\bibsep}{0pt}%
+}
+\providecommand\bibstyle@apa{\bibstyle@apacite}
+\citestyle{apacite}
+}% end \cmd{\AtEndOfPackage}
+\fi
+\if@APAC@any@natbib
+\newcommand{\maskcitations}{%
+ \def\masknocite##1{}%
+ \DeclareRobustCommand\maskcite{%
+ \@ifnextchar[% % ]
+ {\mask@cite}%
+ {\mask@cite[]}%
+ }%
+ \def\mask@cite[##1]{%
+ \@ifnextchar[% % ]
+ {\mask@@cite[##1]}%
+ {\mask@@cite[##1][]}%
+ }%
+ \def\mask@@cite[##1][##2]##3{%
+ \relax
+ \setcounter{maskedRefs}{0}%
+ \@for\@citeb:=##3\do{%
+ \addtocounter{maskedRefs}{1}%
+ }%
+ \ifnum\value{maskedRefs} = 1%
+ \onemaskedcitationmsg{\themaskedRefs}%
+ \else
+ \maskedcitationsmsg{\themaskedRefs}%
+ \fi
+ }%
+ \let\maskcitep\maskcite
+ \let\maskcitealp\maskcite
+ \let\maskcitet\maskcite
+ \let\maskcitealt\maskcite
+ \let\maskciteauthor\maskcite
+ \let\maskcitefullauthor\maskcite
+ \let\maskciteyearpar\maskcite
+ \let\maskciteyear\maskcite
+ \let\maskcitetalias\maskcite
+ \let\maskcitepalias\maskcite
+ \let\maskCitet\maskcite
+ \let\maskCitep\maskcite
+ \let\maskCitealt\maskcite
+ \let\maskCitealp\maskcite
+ \let\maskCiteauthor\maskcite
+ \let\maskcitenum\maskcite
+ \let\maskciteauthort\maskcite
+ \let\maskciteauthorp\maskcite
+ \let\maskCitefullauthor\maskcite
+ \let\maskCiteauthort\maskcite
+ \let\maskCiteauthorp\maskcite
+ \DeclareRobustCommand{\masktext}[2][]{##1}%
+}
+\newcommand{\unmaskcitations}{%
+ \let\masknocite\nocite
+ \let\maskcitep\citep
+ \let\maskcitealp\citealp
+ \let\maskcitet\citet
+ \let\maskcitealt\citealt
+ \let\maskciteauthor\citeauthor
+ \let\maskcitefullauthor\citefullauthor
+ \let\maskciteyearpar\citeyearpar
+ \let\maskciteyear\citeyear
+ \let\maskcite\cite
+ \let\maskcitetalias\citetalias
+ \let\maskcitepalias\citepalias
+ \let\maskCitet\Citet
+ \let\maskCitep\Citep
+ \let\maskCitealt\Citealt
+ \let\maskCitealp\Citealp
+ \let\maskCiteauthor\Citeauthor
+ \let\maskcitenum\citenum
+ \let\maskciteauthort\citeauthort
+ \let\maskciteauthorp\citeauthorp
+ \let\maskCitefullauthor\Citefullauthor
+ \let\maskCiteauthort\Citeauthort
+ \let\maskCiteauthorp\Citeauthorp
+ \DeclareRobustCommand{\masktext}[2][]{##2}
+}
+\fi
+\if@APAC@anycitation
+ \AtEndOfPackage{%
+ \if@APAC@mask
+ \maskcitations
+ \else
+ \unmaskcitations
+ \fi
+ }%
+\fi
+\def\definemetaflag#1{%
+ \@bsphack
+ \expandafter\global\expandafter\def
+ \csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname{%
+ \APACmetaprenote}%
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \@ifundefined{flagmeta@\@citeb\APAC@extra@b@citeb}%
+ {\global\expandafter
+ \def\csname flagmeta@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
+ }%
+ {}%
+ }%
\@esphack
- \@restore@auxhandle
}
\def\nocitemeta#1{%
\nocite{#1}%
- \@bsphack%
- \expandafter\global\expandafter\def
- \csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname{%
- \APACmetaprenote}%
- \@for\@citeb:=#1\do{%
- \edef\@citeb{\expandafter\@firstofone\@citeb}%
- \@ifundefined{flagmeta@\@citeb\APAC@extra@b@citeb}%
- {\global\expandafter
- \def\csname flagmeta@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
- }%
- {}%
+ \@bsphack
+ \if@filesw
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \immediate\write
+ \@newciteauxhandle{\string\definemetaflag{\@citeb}}%
}%
- \@esphack%
+ \fi
+ \@esphack
+ \@restore@auxhandle
}
\def\bibnewpage{\clearpage}%
\def\@biblabel#1{}
@@ -544,15 +1204,15 @@
\fi
}%
}%
- \bibliographytypesize% e.g., to put the bibliography in \small type
- \bibliographyprenote% some explanatory note before the references
+ \bibliographytypesize % e.g., to put the bibliography in \small type
+ \bibliographyprenote % some explanatory note before the references
\@ifundefined{APAC@metaprenote@\APAC@extra@b@citeb}%
{}% skip
{\csname APAC@metaprenote@\APAC@extra@b@citeb\endcsname}%
- \list{\relax}{\labelsep=0em%
- \parsep=\bibparsep%
- \itemsep=\bibitemsep%
- \leftmargin=\bibleftmargin%
+ \list{\relax}{\labelsep=\biblabelsep
+ \parsep=\bibparsep
+ \itemsep=\bibitemsep
+ \leftmargin=\bibleftmargin
\itemindent=\bibindent}% changed to cope with 4th ed.
\def\newblock{\hskip .11em plus .33em minus .07em}%
\sloppy\clubpenalty4000\widowpenalty4000
@@ -589,6 +1249,9 @@
{{\APACmetastar}}%
}%
}
+\newenvironment{APACrefauthors}{%
+ \begingroup \APACrefauthstyle
+}{\endgroup }
\newcommand{\APACrefYear}[1]{%
{\BBOP}{#1}{\BBCP}%
}
@@ -637,11 +1300,19 @@
\let\APAChowpublished\relax
\newenvironment{APACrefURL}[1][]{%
\ifx\@empty#1\@empty
- \BAvailFrom % Available from
+ \BRetrievedFrom % Retrieved from
\else
- \BRetrieved{#1}% Retrieved <date>, from
+ \BRetrieved{#1}% Retrieved <date>, from
\fi
}{}
+\newenvironment{APACrefDOI}{%
+ \global\let\old@doi\doi
+ \if@doi
+ \doiprefix
+ \else
+ \global\let\doi\@gobble
+ \fi
+ }{\global\let\doi\old@doi }
\newenvironment{APACrefURLmsg}{%
\BMsgPostedTo
}{}
@@ -762,6 +1433,7 @@
}{\end{quotation}}
\newcommand{\BAstyle}{}%
\newcommand{\BAastyle}{}%
+\newcommand{\APACrefauthstyle}{}%
\newcommand{\APACciteatitle}[1]{``#1''}
\newcommand{\APACcitebtitle}[1]{{\em #1\/}}
\newcommand{\APACyear}[1]{{#1}}%
@@ -777,10 +1449,12 @@
\newskip{\bibindent}
\newskip{\bibparsep}
\newskip{\bibitemsep}
-\bibleftmargin=2.5em
-\bibindent=-\bibleftmargin
-\bibparsep=0pt%
-\bibitemsep\z@ \@plus .3\p@\relax
+\newskip{\biblabelsep}
+\setlength{\bibleftmargin}{2.5em}
+\setlength{\bibindent}{-\bibleftmargin}
+\setlength{\bibparsep}{0pt}
+\setlength{\bibitemsep}{0pt plus .3pt}
+\setlength{\biblabelsep}{0pt}
\let\bibcorporate\relax
\newcommand{\BBA}{\BBAA}% `\&'
\let\Bem\emph
@@ -1076,16 +1750,31 @@
\def\url#1{\texttt{#1}}%
}{}%
}
+\AtBeginDocument{%
+ \expandafter\ifx\csname urlstyle\endcsname\relax
+ \providecommand{\doi}[1]{#1}\else
+ \providecommand{\doi}{\begingroup \urlstyle{APACsame}\Url}\fi
+}
+\@ifundefined{doiprefix}{%
+ \newcommand{\doiprefix}{doi:\penalty0{}}%
+}{}%
\@ifundefined{bbl@cite@choice}{}{%
\g@addto@macro\bbl@cite@choice{%
\let\bibcite\APACbibcite
}%
}
+\if@APAC@natbib@apa
+\else
\AtBeginDocument{%
\@ifpackageloaded{natbib}{%
\def\NAT@parse@date#1#2#3#4#5#6@@{%
\def\NAT@year{{#1}}\def\NAT@exlab{{#2}}%
}%
+ }{}%
+}
+\fi
+\AtBeginDocument{%
+ \@ifpackageloaded{natbib}{%
\let\@oldbibpreamble\bibpreamble
\def\bibpreamble{%
\@oldbibpreamble%
@@ -1274,17 +1963,39 @@
\AtBeginDocument{%
\@ifundefined{newcites}{\global\let\@restore@auxhandle\relax}{}%
}
+\if@APAC@classic@cite
\def\@mb@citenamelist{%
cite,fullcite,shortcite,citeNP,fullciteNP,shortciteNP,%
citeA,fullciteA,shortciteA,citeauthor,fullciteauthor,shortciteauthor,%
citeauthorNP,fullciteauthorNP,shortciteauthorNP,%
- citeyear,citeyearNP,nocite,nocitemeta%
-}%
-\AtBeginDocument{%
- \@ifpackageloaded{splitbib}{%
- \def\citeauthoryear{\string\citeauthoryear}%
- }{}%
+ citeyear,citeyearNP,nocite,nocitemeta,%
+ maskcite,maskfullcite,maskshortcite,maskciteNP,maskfullciteNP,%
+ maskshortciteNP,maskciteA,maskfullciteA,maskshortciteA,%
+ maskciteauthor,maskfullciteauthor,maskshortciteauthor,%
+ maskciteauthorNP,maskfullciteauthorNP,maskshortciteauthorNP,%
+ maskciteauthorA,maskfullciteauthorA,maskshortciteauthorA,%
+ maskciteyear,maskciteyearNP,masknocite%
}
+\fi
+\if@APAC@natbib@apa
+\AtEndOfPackage{%
+\let\orig@mb@citenamelist\@mb@citenamelist
+\edef\@mb@citenamelist{%
+ \orig@mb@citenamelist,%
+ citeauthort,citeauthorp,citefullauthort,citefullauthorp,Citeauthort,%
+ Citeauthorp,Citefullauthort,Citefullauthorp,%
+ masknocite,maskcitep,maskcitealp,maskcitet,maskcitealt,%
+ maskciteauthor,maskcitefullauthor,maskciteyearpar,maskciteyear,%
+ maskcite,maskcitetalias,maskcitepalias,maskCitet,maskCitep,%
+ maskCitealt,maskCitealp,maskCiteauthor,maskcitenum,maskciteauthort,%
+ maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp%
+}
+}
+\fi
+\newcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}
+\newcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}
\def\refname{References}% Name of ref. list if it's a section.
\def\bibname{References}% Name of ref. list if it's a chapter.
\newcommand{\authorindexname}{Author Index}
@@ -1337,6 +2048,7 @@
\newcommand{\BAvailFrom}{Available from\ }% Websites; note the space.
%% The argument is the date on which it was last checked.
\newcommand{\BRetrieved}[1]{Retrieved {#1}, from\ }% Websites; note the space.
+\newcommand{\BRetrievedFrom}{Retrieved from\ }% Websites; note the space.
\newcommand{\BMsgPostedTo}{Message posted to\ }% Messages; note the space.
\newcommand{\BBOP}{(} % opening parenthesis
\newcommand{\BBCP}{)} % closing parenthesis
@@ -1355,6 +2067,7 @@
\newcommand{\BCBT}{,} % comma between authors in ref. list when no. of
%% authors = 2
\newcommand{\BCBL}{,} % comma before last author when no. of authors > 2
+\newcommand{\BDBL}{, \dots{} }% dots before last author when no. of authors > 7
\newcommand{\APACmonth}[1]{\ifcase #1\or January\or February\or March\or
April\or May\or June\or July\or August\or September\or October\or
November\or December\or Winter\or Spring\or Summer\or Fall\else
diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc
index 7f6e5c25514..846fec859c7 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{dutch.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% dutch.apc - dutch translation of apacite elements
%% Written by Erik Meijer
@@ -50,8 +52,15 @@
%% NTPG = Nederlands Tijdschrift voor de Psychologie en haar Grensgebieden
%% SW = Schrijfwijzer
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
%%
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
\renewcommand{\refname}{Literatuur}% Name of ref. list if it's a section.
\renewcommand{\bibname}{Literatuur}% Name of ref. list if it's a chapter.
\renewcommand{\authorindexname}{Auteursindex}% Name of author index
@@ -113,11 +122,13 @@
\renewcommand{\BOWP}{Oorspronkelijke editie}% Original work published
\renewcommand{\BREPR}{Overgenomen uit}% Reprinted from
%%
+%% THE NEXT FOUR ARE MY OWN TRANSLATIONS. CHECK!!!
%% Websites and newsgroups; note the spaces.
-\newcommand{\BAvailFrom}{Available from\ }% ??? CHECK!!!
+\renewcommand{\BAvailFrom}{Verkrijgbaar van\ }%
%% The argument is the date on which it was last checked.
-\newcommand{\BRetrieved}[1]{Retrieved {#1}, from\ }% ??? CHECK!!!
-\newcommand{\BMsgPostedTo}{Message posted to\ }% ??? CHECK!!!
+\renewcommand{\BRetrieved}[1]{Op {#1} verkregen van\ }%
+\renewcommand{\BRetrievedFrom}{Verkregen van\ }%
+\renewcommand{\BMsgPostedTo}{Bericht geplaatst op\ }%
%%
%% Punctuation
\renewcommand{\BBOP}{(}% opening parenthesis
@@ -138,7 +149,7 @@
%% No commas according to DP and SW. NTPG uses the US/APA comma.
\renewcommand{\BCBT}{}% comma between authors in ref. list when no. of
%% authors = 2
-\newcommand{\BCBL}{}% comma before last author when no. of authors > 2
+\renewcommand{\BCBL}{}% comma before last author when no. of authors > 2
%%
%% Date formatting
\renewcommand{\APACmonth}[1]{\ifcase #1\or januari\or februari\or maart\or
@@ -193,7 +204,7 @@
\ifcase#1e\else e\fi
\fi
}%
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `dutch.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/english.apc b/Master/texmf-dist/tex/latex/apacite/english.apc
index 6217e9d91fa..7d9327d3b38 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,12 +43,19 @@
%% the generated files.
%%
\ProvidesFile{english.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% english.apc - english version of apacite elements
%% Written by Erik Meijer
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}%
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}%
\renewcommand{\refname}{References}% Name of ref. list if it's a section.
\renewcommand{\bibname}{References}% Name of ref. list if it's a chapter.
\renewcommand{\authorindexname}{Author Index}% Name of Author Index
@@ -106,6 +115,7 @@
\renewcommand{\BAvailFrom}{Available from\ }% Websites; note the space.
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Retrieved {#1}, from\ }% Websites; note the space.
+\renewcommand{\BRetrievedFrom}{Retrieved from\ }% Websites; note the space.
\renewcommand{\BMsgPostedTo}{Message posted to\ }% Messages; note the space.
%%
%% Punctuation
@@ -239,12 +249,10 @@
\fi
{\BBCP}% closing parenthesis
}%
-\else
- \immediate\typeout{NOT AUSTRALIAN!!!}% for checking that it works
\fi
\let\APAC@tempa\@undefined
\let\APAC@tempb\@undefined
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `english.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/finnish.apc b/Master/texmf-dist/tex/latex/apacite/finnish.apc
index f9bdaa5cb80..5ad1f550cf3 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,12 +43,19 @@
%% the generated files.
%%
\ProvidesFile{finnish.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% finnish.apc - finnish version of apacite elements
-%% Written by Kari Pyykk\"o
+%% Written by Kari Pyykk\"o, with some minor edits by Erik Meijer.
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
\renewcommand{\refname}{Viitteet}% Name of ref. list if it's a section.
\renewcommand{\bibname}{Viitteet}% Name of ref. list if it's a chapter.
\renewcommand{\authorindexname}{Tekij\"ahakemisto}% Name of Author Index
@@ -180,6 +189,7 @@
%% (websites) Retrieved ... from; note the space.
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Lainattu {#1}, saatavilla\ }%
+\renewcommand{\BRetrievedFrom}{Lainattu saatavilla\ }%
%%
%% (newsgroups \& forums) Message posted to; note the space.
\renewcommand{\BMsgPostedTo}{Viesti l\"ahetetty\ }%
@@ -263,7 +273,7 @@
\ifcase#1.\else .\fi
\fi
}%
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `finnish.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/french.apc b/Master/texmf-dist/tex/latex/apacite/french.apc
index 69b82ece570..8c43e6b2199 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -44,7 +46,14 @@
%% french.apc - french version of apacite elements
%% Adapted from english.apc by \'Eric Raufaste
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
%%
\renewcommand{\refname}{R\'ef\'erences}% Name of ref. list if it's a section.
\renewcommand{\bibname}{R\'ef\'erences}% Name of ref. list if it's a chapter.
@@ -107,6 +116,7 @@
%% Websites; note the space.
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Consult\'e le {#1}, sur\ }%
+\renewcommand{\BRetrievedFrom}{Consult\'e sur\ }%
\renewcommand{\BMsgPostedTo}{Message post\'e sur\ }% Messages; note the space.
%%
%% Punctuation
@@ -236,7 +246,7 @@
\fi
}%
\let\APACaddressInstitutionEqAuth\APACaddressPublisherEqAuth
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `french.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc
index 1b2f7aa6892..313ee53e660 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,14 +43,21 @@
%% the generated files.
%%
\ProvidesFile{german.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% german.apc - Deutsche Uebersetzung der Apacite-Elemente
%% (German version of apacite elements)
%% Written by Andreas Poege
%% Some additions and adaptations by Erik Meijer.
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
%% Bezeichnung fuer das Literaturverzeichnis, falls Section
\renewcommand{\refname}{Literatur}%
%% Bezeichnung fuer das Literaturverzeichnis, falls Chapter
@@ -118,6 +127,7 @@
\renewcommand{\BAvailFrom}{Verf\"ugbar unter\ }%
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Zugriff am {#1} auf\ }%
+\renewcommand{\BRetrievedFrom}{Zugriff auf\ }%
%% Note that here the English phrase is left untranslated in German.
\renewcommand{\BMsgPostedTo}{Message posted to\ }%
%%
@@ -131,7 +141,7 @@
\renewcommand{\BAnd}{\&}%% Zwischen Hg. und Uebers., falls gleich (default "\&")
\DeclareRobustCommand{\BPBI}{.~}% Period between initials
\DeclareRobustCommand{\BHBI}{.-}% Hyphen between initials
-\renewcommand{\BAP}{}% % Zeichen zw. Prefix und Zitat (default Leerzeichen)
+\renewcommand{\BAP}{ }% % Zeichen zw. Prefix und Zitat (default Leerzeichen)
\renewcommand{\BBAY}{, }% Zwischen Autoren und Jahr(en) (default ", ")
\renewcommand{\BBYY}{, }% Zwischen Jahren, wenn ein Author und mehrere Jahre
\renewcommand{\BBC}{; }% Zwischen Autoren (mehrere Zitate) (default "; ")
@@ -241,7 +251,7 @@
Winter\or Fr\"uhjahr\or Sommer\or Herbst\else {#1}\fi}%
\fi
\let\APACaustrian\undefined
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `german.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/greek.apc b/Master/texmf-dist/tex/latex/apacite/greek.apc
index 6b721a757a8..bee6f81c1b9 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,12 +43,19 @@
%% the generated files.
%%
\ProvidesFile{greek.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% greek.apc - Greek version of apacite elements
%% Greek translations by Athanassios Protopapas and Ioannis Dimakos
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
%% Name of ref. list if it's a section.
\renewcommand{\refname}{\textgreek{Bibliograf'ia}}%
%% Name of ref. list if it's a chapter.
@@ -122,6 +131,8 @@
%% Correct only when ``date'' is full, not just month or year
\renewcommand{\BRetrieved}[1]{%
\textgreek{Anakt'hjhke stis} {#1}, \textgreek{ap'o}\ }%
+\renewcommand{\BRetrievedFrom}{%
+ \textgreek{Anakt'hjhke stis} \textgreek{ap'o}\ }%
%% Newsgroups, forums, etc.; ``Message posted to ''; note the space.
\renewcommand{\BMsgPostedTo}{\textgreek{M'hnyma anarthm'eno se}\ }%
%%
@@ -200,7 +211,7 @@
\ifcase#1\textgreek{h}\or \textgreek{h}\else \textgreek{h}\fi
\fi
}%
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `greek.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/ngerman.apc b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
index 7b04475abd3..fc37248af59 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{ngerman.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 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 990e49d62fc..81ce7295f41 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,13 +43,20 @@
%% the generated files.
%%
\ProvidesFile{norsk.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements.
%% Version 1.1.
%% Written by Karl Ove Hufthammer.
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
\renewcommand{\refname}{Referanser}% Name of ref. list if it's a section.
\renewcommand{\bibname}{Referanser}% Name of ref. list if it's a chapter.
%% The name (heading) of the Author Index
@@ -108,6 +117,7 @@
\renewcommand{\BAvailFrom}{Tilgjengelig fra\ }% Websites; note the space.
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Hentet {#1} fra\ }% Websites; note the space.
+\renewcommand{\BRetrievedFrom}{Hentet fra\ }% Websites; note the space.
\renewcommand{\BMsgPostedTo}{Innlegg p\aa \ }% Messages; note the space.
%%
%% Punctuation
@@ -214,7 +224,7 @@
{#1}\fi}%
\fi
\let\APACnynorsk\undefined
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `norsk.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/spanish.apc b/Master/texmf-dist/tex/latex/apacite/spanish.apc
index 6428c8d3764..6538dac8d2d 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,11 +43,14 @@
%% the generated files.
%%
\ProvidesFile{spanish.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% spanish.apc - Versi\'on espa\~nola de elementos en apacite
%% Escrito por Jorge L\'opez Puga
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
%% El nombre (del encabezado) de la Lista Referencias
%% Nombre de la lista de ref. si es una secci\'on.
@@ -118,6 +123,7 @@
\renewcommand{\BAvailFrom}{Disponible en\ }% Available from
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{Descargado {#1}, de\ }% Retrieved ... from
+\renewcommand{\BRetrievedFrom}{Descargado de\ }% Retrieved from
\renewcommand{\BMsgPostedTo}{Mensaje colgado en\ }% Message posted to
%%
%% Punctuation
@@ -194,7 +200,65 @@
\ifcase#1\sptext{a}\else \sptext{a}\fi
\fi
}%
-%%
+\def\usespanishe#1{%
+ \@bsphack
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \@ifundefined{spanishe@\@citeb\APAC@extra@b@citeb}%
+ {\global\expandafter
+ \def\csname spanishe@\@citeb\APAC@extra@b@citeb\endcsname{DUMMY}%
+ }%
+ {}%
+ }%
+ \@esphack
+}
+\def\APACinsertmetastar#1{%
+ \@for\@citeb:=#1\do{%
+ \edef\@citeb{\expandafter\@firstofone\@citeb}%
+ \@ifundefined{flagmeta@\@citeb\APAC@extra@b@citeb}%
+ {}% skip
+ {{\APACmetastar}}%
+ \@ifundefined{spanishe@\@citeb\APAC@extra@b@citeb}%
+ {}% skip
+ {{% Use `e' instead of `y' in Spanish
+ \global\let\oldBBA\BBA
+ \global\def\BBA{e\global\let\BBA\oldBBA}%
+ }}%
+ }%
+}%
+\def\@ifauthorsunequalc@de#1{%
+ \if@F@cite
+ \@F@citefalse
+ \else
+ \if@Y@cite
+ {\@BAY}%
+ \fi
+ {\@BBC}%
+ \fi
+ \edef\@cite@undefined{?}%
+ \def\BBA{\@BBA}%
+ \@ifundefined{spanishe@\@citeb\APAC@extra@b@citeb}%
+ {}% skip
+ {{% Use `e' instead of `y' in Spanish
+ \global\let\oldBBA\BBA
+ \global\def\BBA{e\global\let\BBA\oldBBA}%
+ }}%
+ \if@A@cite
+ \hyper@natlinkstart{#1}%
+ {\csname b@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
+ \if@Y@cite
+ {\@BBAY}%
+ \fi
+ \fi
+ \if@Y@cite
+ \hyper@natlinkstart{#1}%
+ {\csname Y@\@citeb\APAC@extra@b@citeb\endcsname}%
+ \hyper@natlinkend
+ \fi
+ \let\BBA\relax
+}%
+\APACrestoreAtCode
\endinput
%%
%% End of file `spanish.apc'.
diff --git a/Master/texmf-dist/tex/latex/apacite/swedish.apc b/Master/texmf-dist/tex/latex/apacite/swedish.apc
index 2eb3e876e6a..964f90b7308 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-2009 Erik Meijer and any individual authors listed
+%% Copyright (C) 1994-8888 Erik Meijer and any individual authors listed
%% elsewhere in this file.
%%
%% This file is part of the `apacite' package.
@@ -26,10 +26,12 @@
%%
%% The `apacite' package consists of the files apacite.dtx and
%% apacite.ins, and the following generated files:
-%% apacite.sty, apacite.bst, apacitex.bst, apa5ex.bib,
-%% apacite.drv, apacdoc.sty, apacann.bst, apacannx.bst,
-%% english.apc, dutch.apc, finnish.apc, french.apc, german.apc,
-%% ngerman.apc, greek.apc, norsk.apc, spanish.apc, swedish.apc.
+%% apacite.sty, apacdoc.sty, apacite.drv,
+%% apacite.bst, apacitex.bst, apacann.bst, apacannx.bst,
+%% apa5ex.bib, apacxmpl.tex,
+%% english.apc, dutch.apc, finnish.apc, french.apc,
+%% german.apc, ngerman.apc, greek.apc, norsk.apc,
+%% spanish.apc, swedish.apc.
%%
%% This work has the LPPL maintenance status `maintained'
%%
@@ -41,13 +43,20 @@
%% the generated files.
%%
\ProvidesFile{swedish.apc}
- [2009/03/01 v4.05 apacite language file]
+ [2012/02/14 v6.00 apacite language file]
%%
%% swedish.apc - swedish translation of apacite elements
%% Written by Stefan Bjork.
%% Small adaptations by Erik Meijer
%%
+\edef\APACrestoreAtCode{%
+ \catcode`@=\the\catcode`@\relax
+}%
\makeatletter
+\renewcommand{\onemaskedcitationmsg}[1]{%
+ \emph{(#1\ citation removed for masked review)}}% !!! CHANGE
+\renewcommand{\maskedcitationsmsg}[1]{%
+ \emph{(#1\ citations removed for masked review)}}% !!! CHANGE
%%
%% Name of ref. list if it's a section.
\renewcommand{\refname}{Referenser}%
@@ -111,6 +120,7 @@
\renewcommand{\BAvailFrom}{Tillg\"anglig fr{\aa}n\ }% Websites; note the space.
%% The argument is the date on which it was last checked.
\renewcommand{\BRetrieved}[1]{H\"amtad {#1}, fr{\aa}n\ }% Websites; note the space.
+\renewcommand{\BRetrievedFrom}{H\"amtad fr{\aa}n\ }% Websites; note the space.
\renewcommand{\BMsgPostedTo}{Meddelande postat till\ }% Messages; note the space.
%%
%% Punctuation
@@ -200,7 +210,7 @@
:e\else :e\fi
\fi
}%
-%%
+\APACrestoreAtCode
\endinput
%%
%% End of file `swedish.apc'.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 19:08:05 +0000